wine-commits July 2021

1 participants
728 discussions

by Alexandre Julliard

Module: website Branch: master Commit: cba670a3c147a21deb2fb7cf735ab8257836206b URL: https://source.winehq.org/git/website.git/?a=commit;h=cba670a3c147a21deb2fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 21:21:25 2021 +0200 Wine release 6.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021073001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2021073001.xml b/news/en/2021073001.xml new file mode 100644 index 00000000..5dccdf69 --- /dev/null +++ b/news/en/2021073001.xml @@ -0,0 +1,16 @@ +<news> +<date>July 30, 2021</date> +<title>Wine 6.14 Released</title> +<body> + The Wine development release 6.14 is now available. + <a href="{$root}/announce/6.14">What's new</a> in this release: +<ul> + <li>Mono engine updated to version 6.3.0, with upstream updates.</li> + <li>32->64-bit thunks implemented in WOW64 dll.</li> + <li>More preparation work for the GDI syscall interface.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

2 years, 8 months

Tag wine-6.14 : Alexandre Julliard : Release 6.14

by Alexandre Julliard

Module: wine Branch: refs/tags/wine-6.14 Tag: 278f9bdd783bcadf9ef81f7fc58cf3ede40cfe80 URL: https://source.winehq.org/git/wine.git/?a=tag;h=278f9bdd783bcadf9ef81f7fc58… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 21:19:29 2021 +0200 Release 6.14

2 years, 8 months

Alexandre Julliard : Release 6.14.

by Alexandre Julliard

Module: wine Branch: master Commit: 7bedd313c88d7b1fd4fe7b04c20bb0ec91605cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bedd313c88d7b1fd4fe7b04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 21:19:29 2021 +0200 Release 6.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 730 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 3 +- VERSION | 2 +- configure | 18 +- 4 files changed, 357 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bedd313c88d7b1fd4fe…

2 years, 8 months

André Zwing : maintainers: Change my name.

by Alexandre Julliard

Module: wine Branch: master Commit: ea8d20af620c4f0b50b6f93e9acad278261436bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8d20af620c4f0b50b6f93e… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jul 30 18:41:40 2021 +0200 maintainers: Change my name. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e85151e9bd2..c36a70958ed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,7 @@ Maintainers List ----------------------------------- ARM, ARM64 -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/dbghelp/cpu_arm* F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm* @@ -175,7 +175,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/msi/ Netstat -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: programs/netstat/ Network @@ -302,7 +302,7 @@ P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ Winemaker -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: tools/winemaker/ WinHTTP @@ -314,7 +314,7 @@ P: Jacek Caban <jacek(a)codeweavers.com> F: dlls/wininet/ WPcap -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/wpcap/ X11 Driver

2 years, 8 months

Paul Gofman : jscript: Store the head of statement list instead of the list structure.

by Alexandre Julliard

Module: wine Branch: master Commit: cfeb815ff455b26f8e627416f7d160baf1c57bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfeb815ff455b26f8e627416… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 30 15:42:40 2021 +0300 jscript: Store the head of statement list instead of the list structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 6 +++--- dlls/jscript/parser.h | 9 ++------- dlls/jscript/parser.y | 14 +++++++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4672a8c31f1..482805cc52d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2510,7 +2510,7 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 s return S_OK; } -static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, function_expression_t *func_expr, +static HRESULT compile_function(compiler_ctx_t *ctx, statement_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { function_expression_t *iter; @@ -2568,7 +2568,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f return E_OUTOFMEMORY; } - hres = visit_block_statement(ctx, NULL, source ? source->head : NULL); + hres = visit_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; @@ -2609,7 +2609,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f ctx->current_function_expr = ctx->func_head; off = ctx->code_off; - hres = compile_block_statement(ctx, NULL, source ? source->head : NULL); + hres = compile_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index fde0b540d63..9e212138480 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -19,11 +19,6 @@ typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; -typedef struct _statement_list_t { - statement_t *head; - statement_t *tail; -} statement_list_t; - struct _bytecode_t; typedef struct { @@ -41,7 +36,7 @@ typedef struct _parser_ctx_t { script_ctx_t *script; struct _compiler_ctx_t *compiler; - statement_list_t *source; + statement_t *source; BOOL nl; BOOL implicit_nl_semicolon; BOOL is_html; @@ -301,7 +296,7 @@ typedef struct _function_expression_t { const WCHAR *identifier; const WCHAR *event_target; parameter_t *parameter_list; - statement_list_t *statement_list; + statement_t *statement_list; const WCHAR *src_str; DWORD src_len; unsigned func_id; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9fc7ea61dc3..0ebdc2b932b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -65,6 +65,11 @@ typedef struct _case_list_t { case_clausule_t *tail; } case_list_t; +typedef struct _statement_list_t { + statement_t *head; + statement_t *tail; +} statement_list_t; + static catch_block_t *new_catch_block(parser_ctx_t*,const WCHAR*,statement_t*); static case_clausule_t *new_case_clausule(parser_ctx_t*,unsigned,expression_t*,statement_list_t*); static case_list_t *new_case_list(parser_ctx_t*,case_clausule_t*); @@ -98,11 +103,6 @@ static statement_t *new_switch_statement(parser_ctx_t*,unsigned,expression_t*,ca static statement_t *new_throw_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_try_statement(parser_ctx_t*,statement_t*,catch_block_t*,statement_t*,unsigned); -struct statement_list_t { - statement_t *head; - statement_t *tail; -}; - static statement_list_t *new_statement_list(parser_ctx_t*,statement_t*); static statement_list_t *statement_list_add(statement_list_t*,statement_t*); @@ -249,7 +249,7 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t /* ECMA-262 10th Edition 15.1 */ Script - : ScriptBody HtmlComment { ctx->source = $1; } + : ScriptBody HtmlComment { ctx->source = $1 ? $1->head : NULL; } /* ECMA-262 10th Edition 15.1 */ ScriptBody @@ -1440,7 +1440,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->statement_list = statement_list; + ret->statement_list = statement_list ? statement_list->head : NULL; ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len;

2 years, 8 months

Jacek Caban : gdi32: Use NtGdiGetDeviceCaps for GetDeviceCaps implementation.

by Alexandre Julliard

Module: wine Branch: master Commit: c129d13cbd49417078878573bd5f34a0f8f7410e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c129d13cbd49417078878573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:03:15 2021 +0200 gdi32: Use NtGdiGetDeviceCaps for GetDeviceCaps implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 10 ++++++++++ dlls/gdi32/mfdrv/init.c | 8 +++++--- dlls/gdi32/tests/dc.c | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a51fac027d7..1faf83b3201 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -799,9 +799,9 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) /*********************************************************************** - * GetDeviceCaps (GDI32.@) + * NtGdiGetDeviceCaps (win32u.@) */ -INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) +INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ) { DC *dc; INT ret = 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 197ee8942c5..68d692fbab3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -53,6 +53,7 @@ extern BOOL METADC_ExtTextOut( HDC hdc, INT x, INT y, UINT flags, const RECT *re const WCHAR *str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern BOOL METADC_FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL METADC_FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; +extern INT METADC_GetDeviceCaps( HDC hdc, INT cap ); extern BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 6dd5940d45a..5dcc3be6baf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -125,6 +125,16 @@ INT WINAPI SaveDC( HDC hdc ) return NtGdiSaveDC( hdc ); } +/*********************************************************************** + * GetDeviceCaps (GDI32.@) + */ +INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) +{ + if (is_meta_dc( hdc )) return METADC_GetDeviceCaps( hdc, cap ); + if (!get_dc_attr( hdc )) return FALSE; + return NtGdiGetDeviceCaps( hdc, cap ); +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 91be4c1ef6c..73b3ce7365b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -78,12 +78,14 @@ static UINT CDECL MFDRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) /****************************************************************** - * MFDRV_GetDeviceCaps + * METADC_GetDeviceCaps * *A very simple implementation that returns DT_METAFILE */ -static INT CDECL MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) +INT METADC_GetDeviceCaps( HDC hdc, INT cap ) { + if (!get_metadc_ptr( hdc )) return 0; + switch(cap) { case TECHNOLOGY: @@ -137,7 +139,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ NULL, /* pGetCharWidthInfo */ - MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ + NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontRealizationInfo */ diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index bdc8186bf76..2e005f23f3c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -89,6 +89,11 @@ static void test_dc_values(void) attr = GetBkColor(ULongToHandle(0xdeadbeef)); ok(attr == CLR_INVALID, "attr = %x\n", attr); + SetLastError(0xdeadbeef); + attr = GetDeviceCaps(ULongToHandle(0xdeadbeef), TECHNOLOGY); + ok(!attr, "GetDeviceCaps rets %d\n", attr); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); + DeleteDC( hdc ); }

2 years, 8 months

Jacek Caban : gdi32: Use ntgdi name for CreateCompatibleDC.

by Alexandre Julliard

Module: wine Branch: master Commit: 2a6adcdc0f805bedc7574f3dcf66d956cb304a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6adcdc0f805bedc7574f3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:02:47 2021 +0200 gdi32: Use ntgdi name for CreateCompatibleDC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/dib.c | 3 ++- dlls/gdi32/enhmetafile.c | 10 +++++----- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/metafile.c | 4 ++-- include/ntgdi.h | 1 + 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4c80f1af611..7298be9e6e0 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -788,7 +788,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, hbrDst = NtGdiSelectBrush(hdcDest, GetStockObject(NULL_BRUSH)); /* make bitmap */ - hDC1 = CreateCompatibleDC(hdcDest); + hDC1 = NtGdiCreateCompatibleDC( hdcDest ); hBitmap1 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap1 = NtGdiSelectBitmap(hDC1, hBitmap1); @@ -799,7 +799,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, NtGdiSelectBrush(hDC1, hbrTmp); /* make bitmap */ - hDC2 = CreateCompatibleDC(hdcDest); + hDC2 = NtGdiCreateCompatibleDC( hdcDest ); hBitmap2 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap2 = NtGdiSelectBitmap(hDC2, hBitmap2); @@ -864,7 +864,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, oldStretchMode = GetStretchBltMode(hdcSrc); if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); - hdcWork = CreateCompatibleDC(hdcDest); + hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((GetObjectType( hdcDest ) != OBJ_MEMDC || GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) @@ -888,7 +888,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, SetBkColor(hdcWork, crTransparent); /* Create mask */ - hdcMask = CreateCompatibleDC(hdcDest); + hdcMask = NtGdiCreateCompatibleDC( hdcDest ); bmpMask = CreateCompatibleBitmap(hdcMask, widthDest, heightDest); oldMask = NtGdiSelectBitmap(hdcMask, bmpMask); if(!BitBlt(hdcMask, 0, 0, widthDest, heightDest, hdcWork, 0, 0, SRCCOPY)) { diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1d89d48d9c6..a51fac027d7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -684,9 +684,9 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, /*********************************************************************** - * CreateCompatibleDC (GDI32.@) + * NtGdiCreateCompatibleDC (win32u.@) */ -HDC WINAPI CreateCompatibleDC( HDC hdc ) +HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) { DC *dc, *origDC; HDC ret; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 432f33151d9..cf822440490 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1636,7 +1636,8 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) !desc->Pitch || desc->Pitch < get_dib_stride( desc->Width, format->bit_count ) || !desc->Height || desc->Height > UINT_MAX / desc->Pitch) return STATUS_INVALID_PARAMETER; - if (!desc->hDeviceDc || !(dc = CreateCompatibleDC( desc->hDeviceDc ))) return STATUS_INVALID_PARAMETER; + if (!desc->hDeviceDc || !(dc = NtGdiCreateCompatibleDC( desc->hDeviceDc ))) + return STATUS_INVALID_PARAMETER; if (!(bmp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*bmp) ))) goto error; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 1053a2ea104..99f692adb98 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1916,7 +1916,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( PatBlt(hdc, pBitBlt->xDest, pBitBlt->yDest, pBitBlt->cxDest, pBitBlt->cyDest, pBitBlt->dwRop); } else { /* BitBlt */ - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pBitBlt->offBmiSrc); @@ -1959,7 +1959,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( PatBlt(hdc, pStretchBlt->xDest, pStretchBlt->yDest, pStretchBlt->cxDest, pStretchBlt->cyDest, pStretchBlt->dwRop); } else { /* StretchBlt */ - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pStretchBlt->offBmiSrc); @@ -2002,7 +2002,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( if(pAlphaBlend->offBmiSrc == 0) { FIXME("EMR_ALPHABLEND: offBmiSrc == 0\n"); } else { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pAlphaBlend->offBmiSrc); void *bits; @@ -2028,7 +2028,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_MASKBLT: { const EMRMASKBLT *pMaskBlt = (const EMRMASKBLT *)mr; - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; @@ -2076,7 +2076,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_PLGBLT: { const EMRPLGBLT *pPlgBlt = (const EMRPLGBLT *)mr; - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index aef85c88d7d..6b1d0952bf2 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -44,7 +44,7 @@ @ stdcall CreateColorSpaceA(ptr) @ stdcall CreateColorSpaceW(ptr) @ stdcall CreateCompatibleBitmap(long long long) -@ stdcall CreateCompatibleDC(long) +@ stdcall CreateCompatibleDC(long) NtGdiCreateCompatibleDC @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) @ stdcall CreateDIBPatternBrush(long long) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 1b31e40bc14..b0428960b50 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -841,7 +841,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_STRETCHBLT: { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hbitmap = CreateBitmap(mr->rdParm[10], /*Width */ mr->rdParm[11], /*Height*/ mr->rdParm[13], /*Planes*/ @@ -859,7 +859,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_BITBLT: { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hbitmap = CreateBitmap(mr->rdParm[7]/*Width */, mr->rdParm[8]/*Height*/, mr->rdParm[10]/*Planes*/, diff --git a/include/ntgdi.h b/include/ntgdi.h index 22d1f9da187..94b180041c8 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -139,6 +139,7 @@ BOOL WINAPI NtGdiEndPath( HDC hdc ); HANDLE WINAPI NtGdiCreateClientObj( ULONG type ); HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3, ULONG unk4, void *data ); +HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen );

2 years, 8 months

Jacek Caban : gdi32: Don't use driver entry point for NtGdiSaveDC implementation.

by Alexandre Julliard

Module: wine Branch: master Commit: eefca28ed32742b9872458895531768ac2a5b556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefca28ed32742b987245889… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:02:30 2021 +0200 gdi32: Don't use driver entry point for NtGdiSaveDC implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 125 +++++++++++++++++++++----------------------- dlls/gdi32/dibdrv/dc.c | 2 - dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/font.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 1 - dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/gdi.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +- 14 files changed, 60 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eefca28ed32742b98724…

2 years, 8 months

Jacek Caban : gdi32: Use NtGdiSaveDC for SaveDC implementation.

by Alexandre Julliard

Module: wine Branch: master Commit: d423244c1befbe41073d19e77032505a0acade31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d423244c1befbe41073d19e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:56 2021 +0200 gdi32: Use NtGdiSaveDC for SaveDC implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/dc.c | 17 +++++------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 10 +++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/tests/dc.c | 5 +++++ 10 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 130a1ac99e1..6118e443a6f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -577,9 +577,9 @@ static BOOL reset_dc_state( HDC hdc ) /*********************************************************************** - * SaveDC (GDI32.@) + * NtGdiSaveDC (win32u.@) */ -INT WINAPI SaveDC( HDC hdc ) +INT WINAPI NtGdiSaveDC( HDC hdc ) { DC * dc; INT ret = 0; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 1faf777c47e..5148e03a231 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -22,19 +22,12 @@ #include <assert.h> #include "enhmfdrv/enhmetafiledrv.h" -INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) +BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSaveDC ); - INT ret = next->funcs->pSaveDC( next ); - - if (ret) - { - EMRSAVEDC emr; - emr.emr.iType = EMR_SAVEDC; - emr.emr.nSize = sizeof(emr); - EMFDRV_WriteRecord( dev, &emr.emr ); - } - return ret; + EMRSAVEDC emr; + emr.emr.iType = EMR_SAVEDC; + emr.emr.nSize = sizeof(emr); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 981cdea7887..35ff9af0e90 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -102,7 +102,6 @@ extern BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT righ extern BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 516c6c4e884..2291e22348f 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -118,7 +118,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pResetDC */ EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ - EMFDRV_SaveDC, /* pSaveDC */ + NULL, /* pSaveDC */ EMFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ EMFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 105d72b23f0..197ee8942c5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -66,6 +66,7 @@ extern BOOL METADC_Polyline( HDC hdc, const POINT *points,INT count) DECLSPEC_HI extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL METADC_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; @@ -114,6 +115,7 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 42df880f718..6dd5940d45a 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -112,6 +112,19 @@ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) return ret; } +/*********************************************************************** + * SaveDC (GDI32.@) + */ +INT WINAPI SaveDC( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SaveDC( hdc ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SaveDC( dc_attr )) return FALSE; + return NtGdiSaveDC( hdc ); +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 044e228b2bf..9513da7160c 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -20,9 +20,9 @@ #include "mfdrv/metafiledrv.h" -INT CDECL MFDRV_SaveDC( PHYSDEV dev ) +BOOL METADC_SaveDC( HDC hdc ) { - return MFDRV_MetaParam0( dev, META_SAVEDC ); + return metadc_param0( hdc, META_SAVEDC ); } BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 31a0297c9e3..70442fac20f 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -181,7 +181,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ - MFDRV_SaveDC, /* pSaveDC */ + NULL, /* pSaveDC */ MFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ MFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ @@ -613,6 +613,14 @@ BOOL metadc_param1( HDC hdc, short func, short param ) return MFDRV_MetaParam1( &dev->dev, func, param ); } +BOOL metadc_param0( HDC hdc, short func ) +{ + METAFILEDRV_PDEVICE *dev; + + if (!(dev = get_metadc_ptr( hdc ))) return FALSE; + return MFDRV_MetaParam0( &dev->dev, func ); +} + BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) { METAFILEDRV_PDEVICE *dev; diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 567b60158b2..b3104318223 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -60,6 +60,7 @@ extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; extern METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc ) DECLSPEC_HIDDEN; +extern BOOL metadc_param0( HDC hdc, short func ) DECLSPEC_HIDDEN; extern BOOL metadc_param1( HDC hdc, short func, short param ) DECLSPEC_HIDDEN; extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN; extern BOOL metadc_param4( HDC hdc, short func, short param1, short param2, @@ -95,7 +96,6 @@ extern BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD ro extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 054279bf46c..bdc8186bf76 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -234,6 +234,11 @@ static void test_savedc(void) "ret = %d\n", ret); DeleteDC(hdc); + + SetLastError(0xdeadbeef); + ret = SaveDC(ULongToHandle(0xdeadbeef)); + ok(!ret, "SaveDC returned %u\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } static void test_GdiConvertToDevmodeW(void)

2 years, 8 months

Jacek Caban : gdi32: Move more functions from dc.c.

by Alexandre Julliard

Module: wine Branch: master Commit: fa7c939d02903f3e06b6c41e571b5a623d0a64bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa7c939d02903f3e06b6c41e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:38 2021 +0200 gdi32: Move more functions from dc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 132 ---------------------------------------------------- dlls/gdi32/gdidc.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 132 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a0bc86d6337..130a1ac99e1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -690,65 +690,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, } -/*********************************************************************** - * CreateDCA (GDI32.@) - */ -HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output, - const DEVMODEA *initData ) -{ - UNICODE_STRING driverW, deviceW, outputW; - DEVMODEW *initDataW; - HDC ret; - - if (driver) RtlCreateUnicodeStringFromAsciiz(&driverW, driver); - else driverW.Buffer = NULL; - - if (device) RtlCreateUnicodeStringFromAsciiz(&deviceW, device); - else deviceW.Buffer = NULL; - - if (output) RtlCreateUnicodeStringFromAsciiz(&outputW, output); - else outputW.Buffer = NULL; - - initDataW = NULL; - if (initData) - { - /* don't convert initData for DISPLAY driver, it's not used */ - if (!driverW.Buffer || wcsicmp( driverW.Buffer, L"display" )) - initDataW = GdiConvertToDevmodeW(initData); - } - - ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, initDataW ); - - RtlFreeUnicodeString(&driverW); - RtlFreeUnicodeString(&deviceW); - RtlFreeUnicodeString(&outputW); - HeapFree(GetProcessHeap(), 0, initDataW); - return ret; -} - - -/*********************************************************************** - * CreateICA (GDI32.@) - */ -HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output, - const DEVMODEA* initData ) -{ - /* Nothing special yet for ICs */ - return CreateDCA( driver, device, output, initData ); -} - - -/*********************************************************************** - * CreateICW (GDI32.@) - */ -HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, - const DEVMODEW* initData ) -{ - /* Nothing special yet for ICs */ - return CreateDCW( driver, device, output, initData ); -} - - /*********************************************************************** * CreateCompatibleDC (GDI32.@) */ @@ -864,24 +805,6 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) } -/*********************************************************************** - * ResetDCA (GDI32.@) - */ -HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) -{ - DEVMODEW *devmodeW; - HDC ret; - - if (devmode) devmodeW = GdiConvertToDevmodeW(devmode); - else devmodeW = NULL; - - ret = ResetDCW(hdc, devmodeW); - - HeapFree(GetProcessHeap(), 0, devmodeW); - return ret; -} - - /*********************************************************************** * GetDeviceCaps (GDI32.@) */ @@ -1164,18 +1087,6 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) return ret; } -/*********************************************************************** - * SetICMMode (GDI32.@) - */ -INT WINAPI SetICMMode(HDC hdc, INT iEnableICM) -{ -/*FIXME: Assume that ICM is always off, and cannot be turned on */ - if (iEnableICM == ICM_OFF) return ICM_OFF; - if (iEnableICM == ICM_ON) return 0; - if (iEnableICM == ICM_QUERY) return ICM_OFF; - return 0; -} - /*********************************************************************** * GetDeviceGammaRamp (GDI32.@) */ @@ -1528,46 +1439,3 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) return oldClr; } - -/*********************************************************************** - * CancelDC (GDI32.@) - */ -BOOL WINAPI CancelDC(HDC hdc) -{ - FIXME("stub\n"); - return TRUE; -} - -/******************************************************************* - * GdiIsMetaPrintDC [GDI32.@] - */ -BOOL WINAPI GdiIsMetaPrintDC(HDC hdc) -{ - FIXME("%p\n", hdc); - return FALSE; -} - -/******************************************************************* - * GdiIsMetaFileDC [GDI32.@] - */ -BOOL WINAPI GdiIsMetaFileDC(HDC hdc) -{ - TRACE("%p\n", hdc); - - switch( GetObjectType( hdc ) ) - { - case OBJ_METADC: - case OBJ_ENHMETADC: - return TRUE; - } - return FALSE; -} - -/******************************************************************* - * GdiIsPlayMetafileDC [GDI32.@] - */ -BOOL WINAPI GdiIsPlayMetafileDC(HDC hdc) -{ - FIXME("%p\n", hdc); - return FALSE; -} diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index aec9ad48610..42df880f718 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -21,6 +21,8 @@ */ #include "gdi_private.h" +#include "winternl.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); @@ -37,6 +39,79 @@ static DC_ATTR *get_dc_attr( HDC hdc ) return dc_attr->disabled ? NULL : dc_attr; } +/*********************************************************************** + * CreateDCA (GDI32.@) + */ +HDC WINAPI CreateDCA( const char *driver, const char *device, const char *output, + const DEVMODEA *init_data ) +{ + UNICODE_STRING driverW, deviceW, outputW; + DEVMODEW *init_dataW = NULL; + HDC ret; + + if (driver) RtlCreateUnicodeStringFromAsciiz( &driverW, driver ); + else driverW.Buffer = NULL; + + if (device) RtlCreateUnicodeStringFromAsciiz( &deviceW, device ); + else deviceW.Buffer = NULL; + + if (output) RtlCreateUnicodeStringFromAsciiz( &outputW, output ); + else outputW.Buffer = NULL; + + if (init_data) + { + /* don't convert init_data for DISPLAY driver, it's not used */ + if (!driverW.Buffer || wcsicmp( driverW.Buffer, L"display" )) + init_dataW = GdiConvertToDevmodeW( init_data ); + } + + ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, init_dataW ); + + RtlFreeUnicodeString( &driverW ); + RtlFreeUnicodeString( &deviceW ); + RtlFreeUnicodeString( &outputW ); + HeapFree( GetProcessHeap(), 0, init_dataW ); + return ret; +} + +/*********************************************************************** + * CreateICA (GDI32.@) + */ +HDC WINAPI CreateICA( const char *driver, const char *device, const char *output, + const DEVMODEA *init_data ) +{ + /* Nothing special yet for ICs */ + return CreateDCA( driver, device, output, init_data ); +} + + +/*********************************************************************** + * CreateICW (GDI32.@) + */ +HDC WINAPI CreateICW( const WCHAR *driver, const WCHAR *device, const WCHAR *output, + const DEVMODEW *init_data ) +{ + /* Nothing special yet for ICs */ + return CreateDCW( driver, device, output, init_data ); +} + +/*********************************************************************** + * ResetDCA (GDI32.@) + */ +HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) +{ + DEVMODEW *devmodeW; + HDC ret; + + if (devmode) devmodeW = GdiConvertToDevmodeW( devmode ); + else devmodeW = NULL; + + ret = ResetDCW( hdc, devmodeW ); + + HeapFree( GetProcessHeap(), 0, devmodeW ); + return ret; +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ @@ -854,3 +929,61 @@ BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT format, const PIXELFORMATDESCRIPTOR TRACE( "(%p,%d,%p)\n", hdc, format, descr ); return NtGdiSetPixelFormat( hdc, format ); } + +/*********************************************************************** + * CancelDC (GDI32.@) + */ +BOOL WINAPI CancelDC(HDC hdc) +{ + FIXME( "stub\n" ); + return TRUE; +} + +/*********************************************************************** + * SetICMMode (GDI32.@) + */ +INT WINAPI SetICMMode( HDC hdc, INT mode ) +{ + /* FIXME: Assume that ICM is always off, and cannot be turned on */ + switch (mode) + { + case ICM_OFF: return ICM_OFF; + case ICM_ON: return 0; + case ICM_QUERY: return ICM_OFF; + } + return 0; +} + +/*********************************************************************** + * GdiIsMetaPrintDC (GDI32.@) + */ +BOOL WINAPI GdiIsMetaPrintDC( HDC hdc ) +{ + FIXME( "%p\n", hdc ); + return FALSE; +} + +/*********************************************************************** + * GdiIsMetaFileDC (GDI32.@) + */ +BOOL WINAPI GdiIsMetaFileDC( HDC hdc ) +{ + TRACE( "%p\n", hdc ); + + switch (GetObjectType( hdc )) + { + case OBJ_METADC: + case OBJ_ENHMETADC: + return TRUE; + } + return FALSE; +} + +/*********************************************************************** + * GdiIsPlayMetafileDC (GDI32.@) + */ +BOOL WINAPI GdiIsPlayMetafileDC( HDC hdc ) +{ + FIXME( "%p\n", hdc ); + return FALSE; +}

2 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021