August 2021 - Wine-commits - list.winehq.org

Francois Gouget : wineusb.sys: Fix a potential buffer overflow in add_usb_device().
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 9fe40c9f58412f210c1eb453f87b9fa871403183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe40c9f58412f210c1eb453… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 22 18:19:35 2021 +0200 wineusb.sys: Fix a potential buffer overflow in add_usb_device(). name needs to be able to hold 15 characters plus an unsigned int, potentially up to 10 characters even if it is unlikely, plus the trailing nul character. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 441ed338f1e..085acf77e6f 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -94,7 +94,7 @@ static void add_usb_device(libusb_device *libusb_device) DEVICE_OBJECT *device_obj; UNICODE_STRING string; NTSTATUS status; - WCHAR name[20]; + WCHAR name[26]; int ret; libusb_get_device_descriptor(libusb_device, &device_desc);

1 0

Francois Gouget : kernel32/tests: Don't allow the pre-Vista locale results.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 6c58776d0df0ce96c9056c091c9433437f155a01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c58776d0df0ce96c9056c09… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 22 18:21:45 2021 +0200 kernel32/tests: Don't allow the pre-Vista locale results. This simplifies the Get*Format() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4625283035c..d738089064f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -479,9 +479,8 @@ static void test_GetTimeFormatA(void) STRINGSA("m1s2m3s4", ""); /* TIME_NOMINUTESORSECONDS/complex format */ ret = GetTimeFormatA(lcid, TIME_NOMINUTESORSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlen(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "" ) || broken( !strcmp( buffer, "4" )), /* win9x */ - "Expected '', got '%s'\n", buffer ); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; STRINGSA("", "8:56 AM"); /* TIME_NOSECONDS/Default format */ ret = GetTimeFormatA(lcid, NUO|TIME_NOSECONDS, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); @@ -497,14 +496,12 @@ static void test_GetTimeFormatA(void) STRINGSA("h.@:m.@:s.@:tt", "8.@:56AM"); /* Multiple delimiters */ ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "8.@:56AM" ) || broken( !strcmp( buffer, "8.@:56.@:AM" )) /* win9x */, - "Expected '8.@:56AM', got '%s'\n", buffer ); + EXPECT_LENA; EXPECT_EQA; STRINGSA("s1s2s3", ""); /* Duplicate tokens */ ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlen(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "" ) || broken( !strcmp( buffer, "3" )), /* win9x */ - "Expected '', got '%s'\n", buffer ); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; STRINGSA("t/tt", "A/AM"); /* AM time marker */ ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); @@ -829,7 +826,6 @@ static void test_GetDateFormatA(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); char buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; - char Broken[BUFFER_SIZE]; char short_day[10], month[10], genitive_month[10]; memset(&curtime, 2, sizeof(SYSTEMTIME)); /* Invalid time */ @@ -947,21 +943,15 @@ static void test_GetDateFormatA(void) STRINGSA("MMMMdd", ""); sprintf(Expected, "%s04", genitive_month); - sprintf(Broken, "%s04", month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; STRINGSA("MMMMdd ddd", ""); sprintf(Expected, "%s04 %s", genitive_month, short_day); - sprintf(Broken, "%s04 %s", month, short_day); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; STRINGSA("dd dddMMMM", ""); sprintf(Expected, "04 %s%s", short_day, month); @@ -971,22 +961,16 @@ static void test_GetDateFormatA(void) STRINGSA("dd dddMMMM ddd MMMMdd", ""); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); - sprintf(Broken, "04 %s%s %s %s04", short_day, month, short_day, month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; /* with literal part */ STRINGSA("ddd',' MMMM dd", ""); sprintf(Expected, "%s, %s 04", short_day, genitive_month); - sprintf(Broken, "%s, %s 04", short_day, month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; } static void test_GetDateFormatEx(void) @@ -1221,7 +1205,7 @@ static void test_GetCurrencyFormatA(void) SetLastError(0xdeadbeef); ret = GetCurrencyFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSA("2353",""); /* Invalid format --> Error */ @@ -1477,7 +1461,7 @@ static void test_GetNumberFormatA(void) SetLastError(0xdeadbeef); ret = GetNumberFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSA("2353",""); /* Invalid format --> Error */ @@ -1662,7 +1646,7 @@ static void test_GetNumberFormatEx(void) STRINGSW("2353",""); /* Format and flags given --> Error */ ret = pGetNumberFormatEx(enW, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSW("2353",""); /* Invalid format --> Error */

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetTimeFormatA() tests.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 68a38634709e7a449dd918311c88accdedbd9157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a38634709e7a449dd91831… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 22 18:21:49 2021 +0200 kernel32/tests: Remove the macros from the GetTimeFormatA() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 248 +++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68a38634709e7a449dd9…

1 0

Francois Gouget : services/tests: Vista+ returns fixed 1024x768 WinDisc monitor information.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 37f492ae550f937c9c76fe74b0498126bfa66847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37f492ae550f937c9c76fe74… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 23 11:30:11 2021 +0800 services/tests: Vista+ returns fixed 1024x768 WinDisc monitor information. Unlike Windows XP which returned the actual display information to non-interactive services. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 6 +++--- programs/services/tests/service.c | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 24e39206746..d6f08654ab0 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3980,12 +3980,12 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Fallback to report one monitor */ if (handle == NULLDRV_DEFAULT_HMONITOR) { - RECT default_rect = {0, 0, 640, 480}; + RECT default_rect = {0, 0, 1024, 768}; info->rcMonitor = default_rect; info->rcWork = default_rect; info->dwFlags = MONITORINFOF_PRIMARY; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"\\\\.\\DISPLAY1" ); + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"WinDisc" ); return TRUE; } @@ -4145,7 +4145,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro } /* Fallback to report one monitor if using SetupAPI failed */ - SetRect( &monitor_rect, 0, 0, 640, 480 ); + SetRect( &monitor_rect, 0, 0, 1024, 768 ); if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; return TRUE; diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index aa9878b9769..4eebbc432df 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -131,6 +131,7 @@ static void test_create_window(void) static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { + static const RECT expected_rect = {0, 0, 1024, 768}; BOOL r; MONITORINFOEXA mi; @@ -148,16 +149,12 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR r = GetMonitorInfoA(hmon, (MONITORINFO*)&mi); service_ok(r, "GetMonitorInfo failed.\n"); - service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, - "Unexpected monitor rcMonitor values: {%d,%d,%d,%d}\n", - mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); - - service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, - "Unexpected monitor rcWork values: {%d,%d,%d,%d}\n", - mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); - - service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\\\.\\DISPLAY1"), - "Unexpected szDevice received: %s\n", mi.szDevice); + service_ok(EqualRect(lprc, &expected_rect), "Unexpected rect: %s\n", wine_dbgstr_rect(lprc)); + service_ok(EqualRect(&mi.rcMonitor, &expected_rect), "Unexpected rcMonitor: %s\n", + wine_dbgstr_rect(&mi.rcMonitor)); + service_ok(EqualRect(&mi.rcWork, &expected_rect), "Unexpected rcWork: %s\n", + wine_dbgstr_rect(&mi.rcWork)); + service_ok(!strcmp(mi.szDevice, "WinDisc"), "Unexpected szDevice received: %s\n", mi.szDevice); service_ok(mi.dwFlags == MONITORINFOF_PRIMARY, "Unexpected secondary monitor info.\n");

1 0

Jacek Caban : gdi32: Introduce NtGdiCreateMetafileDC.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 59670ffb2d7b3fb698c9c54d04c497474148cc91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59670ffb2d7b3fb698c9c54d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:50:32 2021 +0200 gdi32: Introduce NtGdiCreateMetafileDC. And use it in CreateEnhMetaFileW. 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/enhmfdrv/init.c | 165 ++++++++++++++++++++++++++------------------- 1 file changed, 96 insertions(+), 69 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 09a9a901086..c47ddcbd41b 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -281,6 +281,47 @@ static inline BOOL devcap_is_valid( int cap ) return FALSE; } +/********************************************************************** + * NtGdiCreateMetafileDC (win32u.@) + */ +HDC WINAPI NtGdiCreateMetafileDC( HDC hdc ) +{ + EMFDRV_PDEVICE *physDev; + HDC ref_dc, ret; + int cap; + DC *dc; + + if (!(dc = alloc_dc_ptr( NTGDI_OBJ_ENHMETADC ))) return 0; + + physDev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev) ); + if (!physDev) + { + free_dc_ptr( dc ); + return 0; + } + dc->attr->emf = physDev; + + push_dc_driver( &dc->physDev, &physDev->dev, &emfdrv_driver ); + + if (hdc) /* if no ref, use current display */ + ref_dc = hdc; + else + ref_dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + + memset( physDev->dev_caps, 0, sizeof(physDev->dev_caps) ); + for (cap = 0; cap < ARRAY_SIZE( physDev->dev_caps ); cap++) + if (devcap_is_valid( cap )) + physDev->dev_caps[cap] = NtGdiGetDeviceCaps( ref_dc, cap ); + + if (!hdc) NtGdiDeleteObjectApp( ref_dc ); + + NtGdiSetVirtualResolution( dc->hSelf, 0, 0, 0, 0 ); + + ret = dc->hSelf; + release_dc_ptr( dc ); + return ret; +} + /********************************************************************** * CreateEnhMetaFileW (GDI32.@) */ @@ -291,23 +332,23 @@ HDC WINAPI CreateEnhMetaFileW( LPCWSTR description /* [in] optional description */ ) { - HDC ret, ref_dc; - DC *dc; - EMFDRV_PDEVICE *physDev; + HDC ret; + EMFDRV_PDEVICE *emf; + DC_ATTR *dc_attr; HANDLE hFile; DWORD size = 0, length = 0; - int cap; TRACE("(%p %s %s %s)\n", hdc, debugstr_w(filename), wine_dbgstr_rect(rect), debugstr_w(description) ); - if (!(dc = alloc_dc_ptr( NTGDI_OBJ_ENHMETADC ))) return 0; + if (!(ret = NtGdiCreateMetafileDC( hdc ))) return 0; - physDev = HeapAlloc(GetProcessHeap(),0,sizeof(*physDev)); - if (!physDev) { - free_dc_ptr( dc ); + if (!(dc_attr = get_dc_attr( ret ))) + { + DeleteDC( ret ); return 0; } - dc->attr->emf = physDev; + emf = dc_attr->emf; + if(description) { /* App name\0Title\0\0 */ length = lstrlenW(description); length += lstrlenW(description + length + 1); @@ -316,93 +357,79 @@ HDC WINAPI CreateEnhMetaFileW( } size = sizeof(ENHMETAHEADER) + (length + 3) / 4 * 4; - if (!(physDev->emh = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size))) { - HeapFree( GetProcessHeap(), 0, physDev ); - free_dc_ptr( dc ); + if (!(emf->emh = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size))) + { + DeleteDC( ret ); return 0; } - push_dc_driver( &dc->physDev, &physDev->dev, &emfdrv_driver ); + emf->handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + HANDLE_LIST_INC * sizeof(emf->handles[0]) ); + emf->handles_size = HANDLE_LIST_INC; + emf->cur_handles = 1; + emf->hFile = 0; + emf->dc_brush = 0; + emf->dc_pen = 0; + emf->path = FALSE; - physDev->handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(physDev->handles[0])); - physDev->handles_size = HANDLE_LIST_INC; - physDev->cur_handles = 1; - physDev->hFile = 0; - physDev->dc_brush = 0; - physDev->dc_pen = 0; - physDev->path = FALSE; + emf->emh->iType = EMR_HEADER; + emf->emh->nSize = size; - if (hdc) /* if no ref, use current display */ - ref_dc = hdc; - else - ref_dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + emf->emh->rclBounds.left = emf->emh->rclBounds.top = 0; + emf->emh->rclBounds.right = emf->emh->rclBounds.bottom = -1; - memset( physDev->dev_caps, 0, sizeof(physDev->dev_caps) ); - for (cap = 0; cap < ARRAY_SIZE( physDev->dev_caps ); cap++) - if (devcap_is_valid( cap )) - physDev->dev_caps[cap] = GetDeviceCaps( ref_dc, cap ); - - if (!hdc) DeleteDC( ref_dc ); - - NtGdiSetVirtualResolution(physDev->dev.hdc, 0, 0, 0, 0); - - physDev->emh->iType = EMR_HEADER; - physDev->emh->nSize = size; - - physDev->emh->rclBounds.left = physDev->emh->rclBounds.top = 0; - physDev->emh->rclBounds.right = physDev->emh->rclBounds.bottom = -1; - - if(rect) { - physDev->emh->rclFrame.left = rect->left; - physDev->emh->rclFrame.top = rect->top; - physDev->emh->rclFrame.right = rect->right; - physDev->emh->rclFrame.bottom = rect->bottom; - } else { /* Set this to {0,0 - -1,-1} and update it at the end */ - physDev->emh->rclFrame.left = physDev->emh->rclFrame.top = 0; - physDev->emh->rclFrame.right = physDev->emh->rclFrame.bottom = -1; + if (rect) + { + emf->emh->rclFrame.left = rect->left; + emf->emh->rclFrame.top = rect->top; + emf->emh->rclFrame.right = rect->right; + emf->emh->rclFrame.bottom = rect->bottom; + } + else + { + /* Set this to {0,0 - -1,-1} and update it at the end */ + emf->emh->rclFrame.left = emf->emh->rclFrame.top = 0; + emf->emh->rclFrame.right = emf->emh->rclFrame.bottom = -1; } - physDev->emh->dSignature = ENHMETA_SIGNATURE; - physDev->emh->nVersion = 0x10000; - physDev->emh->nBytes = physDev->emh->nSize; - physDev->emh->nRecords = 1; - physDev->emh->nHandles = 1; + emf->emh->dSignature = ENHMETA_SIGNATURE; + emf->emh->nVersion = 0x10000; + emf->emh->nBytes = emf->emh->nSize; + emf->emh->nRecords = 1; + emf->emh->nHandles = 1; - physDev->emh->sReserved = 0; /* According to docs, this is reserved and must be 0 */ - physDev->emh->nDescription = length / 2; + emf->emh->sReserved = 0; /* According to docs, this is reserved and must be 0 */ + emf->emh->nDescription = length / 2; - physDev->emh->offDescription = length ? sizeof(ENHMETAHEADER) : 0; + emf->emh->offDescription = length ? sizeof(ENHMETAHEADER) : 0; - physDev->emh->nPalEntries = 0; /* I guess this should start at 0 */ + emf->emh->nPalEntries = 0; /* I guess this should start at 0 */ /* Size in pixels */ - physDev->emh->szlDevice.cx = physDev->dev_caps[HORZRES]; - physDev->emh->szlDevice.cy = physDev->dev_caps[VERTRES]; + emf->emh->szlDevice.cx = GetDeviceCaps( ret, HORZRES ); + emf->emh->szlDevice.cy = GetDeviceCaps( ret, VERTRES ); /* Size in millimeters */ - physDev->emh->szlMillimeters.cx = physDev->dev_caps[HORZSIZE]; - physDev->emh->szlMillimeters.cy = physDev->dev_caps[VERTSIZE]; + emf->emh->szlMillimeters.cx = GetDeviceCaps( ret, HORZSIZE ); + emf->emh->szlMillimeters.cy = GetDeviceCaps( ret, VERTSIZE ); /* Size in micrometers */ - physDev->emh->szlMicrometers.cx = physDev->emh->szlMillimeters.cx * 1000; - physDev->emh->szlMicrometers.cy = physDev->emh->szlMillimeters.cy * 1000; + emf->emh->szlMicrometers.cx = emf->emh->szlMillimeters.cx * 1000; + emf->emh->szlMicrometers.cy = emf->emh->szlMillimeters.cy * 1000; - memcpy((char *)physDev->emh + sizeof(ENHMETAHEADER), description, length); + memcpy( (char *)emf->emh + sizeof(ENHMETAHEADER), description, length ); if (filename) /* disk based metafile */ { if ((hFile = CreateFileW(filename, GENERIC_WRITE | GENERIC_READ, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { - free_dc_ptr( dc ); + DeleteDC( ret ); return 0; } - physDev->hFile = hFile; + emf->hFile = hFile; } - TRACE("returning %p\n", physDev->dev.hdc); - ret = physDev->dev.hdc; - release_dc_ptr( dc ); - + TRACE( "returning %p\n", ret ); return ret; }

1 0

Jacek Caban : gdi32: Store EMF bounds in DC_ATTR.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: c0e7df8b42bc278a600b59f4c24efb9e453b1d13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0e7df8b42bc278a600b59f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:50:39 2021 +0200 gdi32: Store EMF bounds in DC_ATTR. 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/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 9 ++++++--- include/ntgdi.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 6613d0b5489..334bd41e357 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -35,6 +35,7 @@ typedef struct { struct gdi_physdev dev; ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ + DC_ATTR *dc_attr; UINT handles_size, cur_handles; HGDIOBJ *handles; HANDLE hFile; /* Handle for disk based MetaFile */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index c47ddcbd41b..026583c40b1 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -193,7 +193,7 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) void EMFDRV_UpdateBBox( PHYSDEV dev, RECTL *rect ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - RECTL *bounds = &physDev->emh->rclBounds; + RECTL *bounds = &physDev->dc_attr->emf_bounds; RECTL vportRect = *rect; LPtoDP( dev->hdc, (LPPOINT)&vportRect, 2 ); @@ -362,6 +362,7 @@ HDC WINAPI CreateEnhMetaFileW( DeleteDC( ret ); return 0; } + emf->dc_attr = dc_attr; emf->handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(emf->handles[0]) ); @@ -375,8 +376,8 @@ HDC WINAPI CreateEnhMetaFileW( emf->emh->iType = EMR_HEADER; emf->emh->nSize = size; - emf->emh->rclBounds.left = emf->emh->rclBounds.top = 0; - emf->emh->rclBounds.right = emf->emh->rclBounds.bottom = -1; + dc_attr->emf_bounds.left = dc_attr->emf_bounds.top = 0; + dc_attr->emf_bounds.right = dc_attr->emf_bounds.bottom = -1; if (rect) { @@ -473,6 +474,8 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ emr.nSizeLast = emr.emr.nSize; EMFDRV_WriteRecord( &physDev->dev, &emr.emr ); + physDev->emh->rclBounds = dc->attr->emf_bounds; + /* Update rclFrame if not initialized in CreateEnhMetaFile */ if(physDev->emh->rclFrame.left > physDev->emh->rclFrame.right) { physDev->emh->rclFrame.left = physDev->emh->rclBounds.left * diff --git a/include/ntgdi.h b/include/ntgdi.h index 14808593501..cec0d3d10f1 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -157,6 +157,7 @@ typedef struct DC_ATTR SIZE virtual_res; SIZE virtual_size; UINT font_code_page; + RECTL emf_bounds; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use NtGdiResetDC for ResetDCW.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: e33cdf89c5a071c652584c24a46ab9ecf4d5a750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e33cdf89c5a071c652584c24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:50:47 2021 +0200 gdi32: Use NtGdiResetDC for ResetDCW. 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 | 17 +++++++++-------- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/wineps.drv/init.c | 4 ++-- include/ntgdi.h | 4 +++- include/wine/gdi_driver.h | 4 ++-- 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e4f643389d5..fa15b43fc8b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -770,17 +770,18 @@ BOOL WINAPI DeleteDC( HDC hdc ) /*********************************************************************** - * ResetDCW (GDI32.@) + * NtGdiResetDC (win32u.@) */ -HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) +BOOL WINAPI NtGdiResetDC( HDC hdc, const DEVMODEW *devmode, BOOL *banding, + DRIVER_INFO_2W *driver_info, void *dev ) { DC *dc; - HDC ret = 0; + BOOL ret = FALSE; if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pResetDC ); - ret = physdev->funcs->pResetDC( physdev, devmode ); + ret = physdev->funcs->pResetDC( physdev, devmode ) != 0; if (ret) /* reset the visible region */ { dc->dirty = 0; @@ -788,7 +789,7 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) dc->attr->vis_rect.top = 0; dc->attr->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); dc->attr->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); - if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); + if (dc->hVisRgn) NtGdiDeleteObjectApp( dc->hVisRgn ); dc->hVisRgn = 0; update_dc_clipping( dc ); } @@ -996,7 +997,7 @@ BOOL WINAPI CombineTransform( LPXFORM xformResult, const XFORM *xform1, /*********************************************************************** - * SetDCHook (GDI32.@) + * SetDCHook (win32u.@) * * Note: this doesn't exist in Win32, we add it here because user32 needs it. */ @@ -1014,7 +1015,7 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) /*********************************************************************** - * GetDCHook (GDI32.@) + * GetDCHook (win32u.@) * * Note: this doesn't exist in Win32, we add it here because user32 needs it. */ @@ -1032,7 +1033,7 @@ DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc ) /*********************************************************************** - * SetHookFlags (GDI32.@) + * SetHookFlags (win32u.@) * * Note: this doesn't exist in Win32, we add it here because user32 needs it. */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 23bfc87a761..1df4660211e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -720,9 +720,9 @@ static BOOL CDECL nulldrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, return TRUE; } -static HDC CDECL nulldrv_ResetDC( PHYSDEV dev, const DEVMODEW *devmode ) +static BOOL CDECL nulldrv_ResetDC( PHYSDEV dev, const DEVMODEW *devmode ) { - return 0; + return FALSE; } static BOOL CDECL nulldrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 68bffdfbac3..0b005944f93 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -112,6 +112,14 @@ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) return ret; } +/*********************************************************************** + * ResetDCW (GDI32.@) + */ +HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) +{ + return NtGdiResetDC( hdc, devmode, NULL, NULL, NULL ) ? hdc : 0; +} + /*********************************************************************** * SaveDC (GDI32.@) */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 7b6a8f3d67b..58542c19811 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -448,7 +448,7 @@ static BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) /********************************************************************** * ResetDC (WINEPS.@) */ -static HDC CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) +static BOOL CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -457,7 +457,7 @@ static HDC CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)lpInitData, physDev->pi); PSDRV_UpdateDevCaps(physDev); } - return dev->hdc; + return TRUE; } /*********************************************************************** diff --git a/include/ntgdi.h b/include/ntgdi.h index cec0d3d10f1..03b476e349c 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -20,6 +20,7 @@ #define _NTGDI_ #include <wingdi.h> +#include <winspool.h> typedef struct _GDI_HANDLE_ENTRY { @@ -268,7 +269,8 @@ BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y ); BOOL WINAPI NtGdiRectInRegion( HRGN hrgn, const RECT *rect ); BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ); BOOL WINAPI NtGdiRectangle( HDC hdc, INT left, INT top, INT right, INT bottom ); -HDC WINAPI NtGdiResetDC( HDC hdc, const DEVMODEW *devmode ); +BOOL WINAPI NtGdiResetDC( HDC hdc, const DEVMODEW *devmode, BOOL *banding, + DRIVER_INFO_2W *driver_info, void *dev ); BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count ); BOOL WINAPI NtGdiRestoreDC( HDC hdc, INT level ); BOOL WINAPI NtGdiRoundRect( HDC hdc, INT left, INT top, INT right, diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 641d74ea82e..5ca84ccf56c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -137,7 +137,7 @@ struct gdi_dc_funcs UINT (CDECL *pRealizeDefaultPalette)(PHYSDEV); UINT (CDECL *pRealizePalette)(PHYSDEV,HPALETTE,BOOL); BOOL (CDECL *pRectangle)(PHYSDEV,INT,INT,INT,INT); - HDC (CDECL *pResetDC)(PHYSDEV,const DEVMODEW*); + BOOL (CDECL *pResetDC)(PHYSDEV,const DEVMODEW*); BOOL (CDECL *pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); HBITMAP (CDECL *pSelectBitmap)(PHYSDEV,HBITMAP); HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); @@ -169,7 +169,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 63 +#define WINE_GDI_DRIVER_VERSION 64 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */

1 0

Jacek Caban : gdi32: Use NtGdiDeleteObjectApp for DeleteDC.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 9a53f3ae11a17dd218e69a51c9b5000071f084a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a53f3ae11a17dd218e69a51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:51:01 2021 +0200 gdi32: Use NtGdiDeleteObjectApp for DeleteDC. 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 | 73 ++++++++++++++++++++++------------------------------ dlls/gdi32/dib.c | 4 +-- dlls/gdi32/gdidc.c | 9 +++++++ dlls/gdi32/objects.c | 9 ++++++- 5 files changed, 54 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 09bb7a4c683..54c923236ee 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -827,8 +827,8 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, DeleteObject(hBitmap2); DeleteObject(hbrMask); - DeleteDC(hDC1); - DeleteDC(hDC2); + NtGdiDeleteObjectApp( hDC1 ); + NtGdiDeleteObjectApp( hDC2 ); return TRUE; } @@ -923,12 +923,12 @@ error: SetTextColor(hdcDest, oldForeground); if(hdcWork) { NtGdiSelectBitmap(hdcWork, oldWork); - DeleteDC(hdcWork); + NtGdiDeleteObjectApp( hdcWork ); } if(bmpWork) DeleteObject(bmpWork); if(hdcMask) { NtGdiSelectBitmap(hdcMask, oldMask); - DeleteDC(hdcMask); + NtGdiDeleteObjectApp( hdcMask ); } if(bmpMask) DeleteObject(bmpMask); return ret; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index fa15b43fc8b..2414c41d785 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -256,15 +256,6 @@ void update_dc( DC *dc ) } -/*********************************************************************** - * DC_DeleteObject - */ -static BOOL DC_DeleteObject( HGDIOBJ handle ) -{ - return DeleteDC( handle ); -} - - static void set_bk_color( DC *dc, COLORREF color ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetBkColor ); @@ -431,6 +422,37 @@ static BOOL reset_dc_state( HDC hdc ) } +/*********************************************************************** + * DC_DeleteObject + */ +static BOOL DC_DeleteObject( HGDIOBJ handle ) +{ + DC *dc; + + TRACE( "%p\n", handle ); + + GDI_CheckNotLock(); + + if (!(dc = get_dc_ptr( handle ))) return FALSE; + if (dc->refcount != 1) + { + FIXME( "not deleting busy DC %p refcount %u\n", dc->hSelf, dc->refcount ); + release_dc_ptr( dc ); + return FALSE; + } + + /* Call hook procedure to check whether is it OK to delete this DC */ + if (dc->hookProc && !dc->hookProc( dc->hSelf, DCHC_DELETEDC, dc->dwHookData, 0 )) + { + release_dc_ptr( dc ); + return TRUE; + } + reset_dc_state( handle ); + free_dc_ptr( dc ); + return TRUE; +} + + /*********************************************************************** * NtGdiSaveDC (win32u.@) */ @@ -736,39 +758,6 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) } -/*********************************************************************** - * DeleteDC (GDI32.@) - */ -BOOL WINAPI DeleteDC( HDC hdc ) -{ - DC * dc; - - TRACE("%p\n", hdc ); - - if (is_meta_dc( hdc )) return METADC_DeleteDC( hdc ); - - GDI_CheckNotLock(); - - if (!(dc = get_dc_ptr( hdc ))) return FALSE; - if (dc->refcount != 1) - { - FIXME( "not deleting busy DC %p refcount %u\n", dc->hSelf, dc->refcount ); - release_dc_ptr( dc ); - return FALSE; - } - - /* Call hook procedure to check whether is it OK to delete this DC */ - if (dc->hookProc && !dc->hookProc( dc->hSelf, DCHC_DELETEDC, dc->dwHookData, 0 )) - { - release_dc_ptr( dc ); - return TRUE; - } - reset_dc_state( hdc ); - free_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * NtGdiResetDC (win32u.@) */ diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7da248079b2..de1942894de 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1687,7 +1687,7 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) error: if (bmp) HeapFree( GetProcessHeap(), 0, bmp->color_table ); HeapFree( GetProcessHeap(), 0, bmp ); - DeleteDC( dc ); + NtGdiDeleteObjectApp( dc ); return STATUS_INVALID_PARAMETER; } @@ -1704,7 +1704,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *des if (GetObjectType( desc->hDc ) != OBJ_MEMDC || GetObjectType( desc->hBitmap ) != OBJ_BITMAP) return STATUS_INVALID_PARAMETER; DeleteObject( desc->hBitmap ); - DeleteDC( desc->hDc ); + NtGdiDeleteObjectApp( desc->hDc ); return STATUS_SUCCESS; } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0b005944f93..af529fdb8e9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -95,6 +95,15 @@ HDC WINAPI CreateICW( const WCHAR *driver, const WCHAR *device, const WCHAR *out return CreateDCW( driver, device, output, init_data ); } +/*********************************************************************** + * DeleteDC (GDI32.@) + */ +BOOL WINAPI DeleteDC( HDC hdc ) +{ + if (is_meta_dc( hdc )) return METADC_DeleteDC( hdc ); + return NtGdiDeleteObjectApp( hdc ); +} + /*********************************************************************** * ResetDCA (GDI32.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 3ae836612c4..3acafbc9331 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -153,7 +153,14 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) struct hdc_list *hdc_list = NULL; struct wine_rb_entry *entry; - if (is_meta_dc( obj )) return METADC_DeleteDC( obj ); + switch (gdi_handle_type( obj )) + { + case NTGDI_OBJ_DC: + case NTGDI_OBJ_MEMDC: + case NTGDI_OBJ_ENHMETADC: + case NTGDI_OBJ_METADC: + return DeleteDC( obj ); + } EnterCriticalSection( &obj_map_cs );

1 0

Jacek Caban : gdi32: Handle EMF recording clean up in DeleteDC.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 233af3fdbfa49c3a505a0aa0807ad96c3798f52d URL: https://source.winehq.org/git/wine.git/?a=commit;h=233af3fdbfa49c3a505a0aa0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:51:23 2021 +0200 gdi32: Handle EMF recording clean up in DeleteDC. 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 | 2 +- dlls/gdi32/enhmfdrv/init.c | 95 +++++++++++++++++++++------------------------ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++ dlls/gdi32/tests/metafile.c | 1 - 5 files changed, 50 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 2414c41d785..7e9dff645b1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -402,7 +402,7 @@ static BOOL reset_dc_state( HDC hdc ) NtGdiSetVirtualResolution( hdc, 0, 0, 0, 0 ); GDISelectPalette( hdc, GetStockObject( DEFAULT_PALETTE ), FALSE ); NtGdiSetBoundsRect( hdc, NULL, DCB_DISABLE ); - AbortPath( hdc ); + NtGdiAbortPath( hdc ); if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 026583c40b1..03df3d08547 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -142,18 +142,24 @@ static const struct gdi_dc_funcs emfdrv_driver = static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - UINT index; - - HeapFree( GetProcessHeap(), 0, physDev->emh ); - for(index = 0; index < physDev->handles_size; index++) - if(physDev->handles[index]) - GDI_hdc_not_using_object(physDev->handles[index], dev->hdc); - HeapFree( GetProcessHeap(), 0, physDev->handles ); HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; } +void EMFDC_DeleteDC( DC_ATTR *dc_attr ) +{ + EMFDRV_PDEVICE *emf = dc_attr->emf; + UINT index; + + HeapFree( GetProcessHeap(), 0, emf->emh ); + for (index = 0; index < emf->handles_size; index++) + if (emf->handles[index]) + GDI_hdc_not_using_object( emf->handles[index], emf->dev.hdc ); + HeapFree( GetProcessHeap(), 0, emf->handles ); +} + + /****************************************************************** * EMFDRV_WriteRecord * @@ -440,75 +446,62 @@ HDC WINAPI CreateEnhMetaFileW( HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ { HENHMETAFILE hmf; - EMFDRV_PDEVICE *physDev; - DC *dc; + EMFDRV_PDEVICE *emf; + DC_ATTR *dc_attr; EMREOF emr; HANDLE hMapping = 0; TRACE("(%p)\n", hdc ); - if (!(dc = get_dc_ptr( hdc ))) return NULL; - if (GetObjectType( hdc ) != OBJ_ENHMETADC) - { - release_dc_ptr( dc ); - return NULL; - } - if (dc->refcount != 1) - { - FIXME( "not deleting busy DC %p refcount %u\n", hdc, dc->refcount ); - release_dc_ptr( dc ); - return NULL; - } - physDev = get_emf_physdev( find_dc_driver( dc, &emfdrv_driver )); + if (!(dc_attr = get_dc_attr( hdc )) || !dc_attr->emf) return 0; + emf = dc_attr->emf; - if (dc->attr->save_level) + if (dc_attr->save_level) RestoreDC( hdc, 1 ); - if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); - if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); + if (emf->dc_brush) DeleteObject( emf->dc_brush ); + if (emf->dc_pen) DeleteObject( emf->dc_pen ); emr.emr.iType = EMR_EOF; emr.emr.nSize = sizeof(emr); emr.nPalEntries = 0; emr.offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); emr.nSizeLast = emr.emr.nSize; - EMFDRV_WriteRecord( &physDev->dev, &emr.emr ); + EMFDRV_WriteRecord( &emf->dev, &emr.emr ); - physDev->emh->rclBounds = dc->attr->emf_bounds; + emf->emh->rclBounds = dc_attr->emf_bounds; /* Update rclFrame if not initialized in CreateEnhMetaFile */ - if(physDev->emh->rclFrame.left > physDev->emh->rclFrame.right) { - physDev->emh->rclFrame.left = physDev->emh->rclBounds.left * - physDev->emh->szlMillimeters.cx * 100 / physDev->emh->szlDevice.cx; - physDev->emh->rclFrame.top = physDev->emh->rclBounds.top * - physDev->emh->szlMillimeters.cy * 100 / physDev->emh->szlDevice.cy; - physDev->emh->rclFrame.right = physDev->emh->rclBounds.right * - physDev->emh->szlMillimeters.cx * 100 / physDev->emh->szlDevice.cx; - physDev->emh->rclFrame.bottom = physDev->emh->rclBounds.bottom * - physDev->emh->szlMillimeters.cy * 100 / physDev->emh->szlDevice.cy; + if (emf->emh->rclFrame.left > emf->emh->rclFrame.right) + { + emf->emh->rclFrame.left = emf->emh->rclBounds.left * + emf->emh->szlMillimeters.cx * 100 / emf->emh->szlDevice.cx; + emf->emh->rclFrame.top = emf->emh->rclBounds.top * + emf->emh->szlMillimeters.cy * 100 / emf->emh->szlDevice.cy; + emf->emh->rclFrame.right = emf->emh->rclBounds.right * + emf->emh->szlMillimeters.cx * 100 / emf->emh->szlDevice.cx; + emf->emh->rclFrame.bottom = emf->emh->rclBounds.bottom * + emf->emh->szlMillimeters.cy * 100 / emf->emh->szlDevice.cy; } - if (physDev->hFile) /* disk based metafile */ + if (emf->hFile) /* disk based metafile */ { - if (!WriteFile(physDev->hFile, physDev->emh, physDev->emh->nBytes, - NULL, NULL)) + if (!WriteFile( emf->hFile, emf->emh, emf->emh->nBytes, NULL, NULL )) { - CloseHandle( physDev->hFile ); - free_dc_ptr( dc ); + CloseHandle( emf->hFile ); return 0; } - HeapFree( GetProcessHeap(), 0, physDev->emh ); - hMapping = CreateFileMappingA(physDev->hFile, NULL, PAGE_READONLY, 0, - 0, NULL); - TRACE("hMapping = %p\n", hMapping ); - physDev->emh = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0); - TRACE("view = %p\n", physDev->emh ); + HeapFree( GetProcessHeap(), 0, emf->emh ); + hMapping = CreateFileMappingA( emf->hFile, NULL, PAGE_READONLY, 0, 0, NULL ); + TRACE( "hMapping = %p\n", hMapping ); + emf->emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 ); + TRACE( "view = %p\n", emf->emh ); CloseHandle( hMapping ); - CloseHandle( physDev->hFile ); + CloseHandle( emf->hFile ); } - hmf = EMF_Create_HENHMETAFILE( physDev->emh, physDev->emh->nBytes, (physDev->hFile != 0) ); - physDev->emh = NULL; /* So it won't be deleted */ - free_dc_ptr( dc ); + hmf = EMF_Create_HENHMETAFILE( emf->emh, emf->emh->nBytes, emf->hFile != 0 ); + emf->emh = NULL; /* So it won't be deleted */ + DeleteDC( hdc ); return hmf; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bf7684b53a7..ce89dbc6ff5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -137,6 +137,7 @@ extern BOOL EMFDC_BeginPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_BitBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width, INT height, HDC hdc_src, INT x_src, INT y_src, DWORD rop ); extern BOOL EMFDC_CloseFigure( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern void EMFDC_DeleteDC( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_EndPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index af529fdb8e9..e12dbfeff03 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -100,7 +100,11 @@ HDC WINAPI CreateICW( const WCHAR *driver, const WCHAR *device, const WCHAR *out */ BOOL WINAPI DeleteDC( HDC hdc ) { + DC_ATTR *dc_attr; + if (is_meta_dc( hdc )) return METADC_DeleteDC( hdc ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf) EMFDC_DeleteDC( dc_attr ); return NtGdiDeleteObjectApp( hdc ); } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a7459a05ce0..b3e5e80acd9 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3219,7 +3219,6 @@ static void test_enhmetafile_file(void) SetLastError(0xdeadbeef); metafile = CloseEnhMetaFile(dc); - todo_wine ok(!metafile && GetLastError() == ERROR_INVALID_HANDLE, "CloseMetaFile returned %p (%u)\n", metafile, GetLastError());

1 0

Jacek Caban : gdi32: Move EMF driver to separated file.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 56efbd0212e84ceb18bd5c499e1d39eeb76fa203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56efbd0212e84ceb18bd5c49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:51:50 2021 +0200 gdi32: Move EMF driver to separated file. 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/Makefile.in | 1 + dlls/gdi32/emfdrv.c | 595 +++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/bitblt.c | 29 -- dlls/gdi32/enhmfdrv/dc.c | 9 - dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 48 --- dlls/gdi32/enhmfdrv/graphics.c | 388 ----------------------- dlls/gdi32/enhmfdrv/init.c | 172 ---------- dlls/gdi32/enhmfdrv/objects.c | 19 -- include/ntgdi.h | 1 + 9 files changed, 597 insertions(+), 665 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56efbd0212e84ceb18bd…

1 0