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

Jacek Caban : gdi32: Use NtGdiGetRgnBox in emfdrv_stroke_and_fill_path.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 478fa71f5f658240ef658190613d4f77af7727f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=478fa71f5f658240ef658190… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:52:40 2021 +0200 gdi32: Use NtGdiGetRgnBox in emfdrv_stroke_and_fill_path. 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/graphics.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index f63308b579c..0c6d671c7d4 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -94,25 +94,21 @@ static void get_points_bounds( RECTL *bounds, const POINT *pts, UINT count, DC_A /* helper for path stroke and fill functions */ static BOOL emfdrv_stroke_and_fill_path( struct emf *emf, INT type ) { - DC *dc = get_physdev_dc( &emf->dev ); EMRSTROKEANDFILLPATH emr; - struct gdi_path *path; - POINT *points; - BYTE *flags; + HRGN region; emr.emr.iType = type; emr.emr.nSize = sizeof(emr); + emr.rclBounds = empty_bounds; - if ((path = get_gdi_flat_path( dc, NULL ))) + if ((region = NtGdiPathToRegion( emf->dc_attr->hdc ))) { - int count = get_gdi_path_data( path, &points, &flags ); - get_points_bounds( &emr.rclBounds, points, count, 0 ); - free_gdi_path( path ); + NtGdiGetRgnBox( region, (RECT *)&emr.rclBounds ); + DeleteObject( region ); } - else emr.rclBounds = empty_bounds; if (!emfdc_record( emf, &emr.emr )) return FALSE; - if (!path) return FALSE; + if (!region) return FALSE; emfdc_update_bounds( emf, &emr.rclBounds ); return TRUE; }

1 0

Daniel Lehman : kernelbase/tests: Add more tests for combining the second path.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: ac7f6fda434d18349a84aea60751141e2576388b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7f6fda434d18349a84aea6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 23 11:05:34 2021 +0800 kernelbase/tests: Add more tests for combining the second path. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8d85542612f..f8712679eae 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -426,6 +426,7 @@ struct combine_test const CHAR *path1; const CHAR *path2; const CHAR *result; + BOOL todo; }; static const struct combine_test combine_tests[] = @@ -473,12 +474,21 @@ static const struct combine_test combine_tests[] = /* Second path is fully qualified */ {"X:\\", "C:", "C:\\"}, {"X:\\", "C:\\", "C:\\"}, + {"X:\\", "C:\\a", "C:\\a", TRUE}, {"X:\\", "\\\\", "\\\\"}, + {"X:\\", "\\\\a", "\\\\a", TRUE}, {"X:\\", "\\\\?\\C:", "C:\\"}, {"X:\\", "\\\\?\\C:\\", "C:\\"}, + {"X:\\", "\\\\?\\C:\\a", "C:\\a", TRUE}, + {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC", TRUE}, {"X:\\", "\\\\?\\UNC\\", "\\\\"}, + {"X:\\", "\\\\?\\UNC\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", TRUE}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", TRUE}, /* Canonicalization */ {"C:\\a", ".\\b", "C:\\a\\b"}, @@ -537,6 +547,7 @@ static void test_PathAllocCombine(void) if (SUCCEEDED(hr)) { WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + todo_wine_if(t->todo) ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, resultA); LocalFree(resultW); @@ -600,6 +611,7 @@ static void test_PathCchCombine(void) hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } @@ -668,6 +680,7 @@ static void test_PathCchCombineEx(void) hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); }

1 0

Daniel Lehman : kernelbase: Don't add a backslash to the second path if not needed.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: f33bf35d9a395a17e83b4bf512c5434368a8218e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f33bf35d9a395a17e83b4bf5… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 23 11:06:12 2021 +0800 kernelbase: Don't add a backslash to the second path if not needed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 7 ++++--- dlls/kernelbase/tests/path.c | 18 +++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9387705e963..a9105341fad 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -401,7 +401,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { SIZE_T combined_length, length2; WCHAR *combined_path; - BOOL from_path2 = FALSE; + BOOL add_backslash = FALSE; HRESULT hr; TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); @@ -419,7 +419,8 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { path1 = path2; path2 = NULL; - from_path2 = TRUE; + add_backslash = (is_drive_spec(path1) && !path1[2]) + || (is_prefixed_disk(path1) && !path1[6]); } length2 = path2 ? lstrlenW(path2) : 0; @@ -435,7 +436,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl lstrcpyW(combined_path, path1); PathCchStripPrefix(combined_path, combined_length); - if (from_path2) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + if (add_backslash) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); if (path2 && path2[0]) { diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index f8712679eae..af511f500f3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -426,7 +426,6 @@ struct combine_test const CHAR *path1; const CHAR *path2; const CHAR *result; - BOOL todo; }; static const struct combine_test combine_tests[] = @@ -474,21 +473,21 @@ static const struct combine_test combine_tests[] = /* Second path is fully qualified */ {"X:\\", "C:", "C:\\"}, {"X:\\", "C:\\", "C:\\"}, - {"X:\\", "C:\\a", "C:\\a", TRUE}, + {"X:\\", "C:\\a", "C:\\a"}, {"X:\\", "\\\\", "\\\\"}, - {"X:\\", "\\\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\a", "\\\\a"}, {"X:\\", "\\\\?\\C:", "C:\\"}, {"X:\\", "\\\\?\\C:\\", "C:\\"}, - {"X:\\", "\\\\?\\C:\\a", "C:\\a", TRUE}, - {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC", TRUE}, + {"X:\\", "\\\\?\\C:\\a", "C:\\a"}, + {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC"}, {"X:\\", "\\\\?\\UNC\\", "\\\\"}, - {"X:\\", "\\\\?\\UNC\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\?\\UNC\\a", "\\\\a"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, /* Canonicalization */ {"C:\\a", ".\\b", "C:\\a\\b"}, @@ -547,7 +546,6 @@ static void test_PathAllocCombine(void) if (SUCCEEDED(hr)) { WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); - todo_wine_if(t->todo) ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, resultA); LocalFree(resultW); @@ -611,7 +609,6 @@ static void test_PathCchCombine(void) hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } @@ -680,7 +677,6 @@ static void test_PathCchCombineEx(void) hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); }

1 0

Jacek Caban : gdi32: Use struct emf for EMF helpers.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 1323ff842e653cf50429a0fbad92be3f5951474e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1323ff842e653cf50429a0fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:52:08 2021 +0200 gdi32: Use struct emf for EMF helpers. 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/bitblt.c | 18 ++++---- dlls/gdi32/enhmfdrv/dc.c | 72 +++++++++++++++--------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 8 ++-- dlls/gdi32/enhmfdrv/graphics.c | 65 ++++++++++++++------------- dlls/gdi32/enhmfdrv/init.c | 37 +++++++--------- dlls/gdi32/enhmfdrv/objects.c | 86 ++++++++++++++++++------------------ 6 files changed, 140 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1323ff842e653cf50429…

1 0

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

Aug. 23, 2021

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

Jacek Caban : gdi32: Store EMF bounds in DC_ATTR.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

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 NtGdiDeleteObjectApp for DeleteDC.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

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: Use NtGdiResetDC for ResetDCW.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

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: Introduce NtGdiCreateMetafileDC.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

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

Alistair Leslie-Hughes : ws2_32: Handle success in addrinfo_err_from_unix.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: d4f83ba77ffe32511005e346abadd5af92e03a51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4f83ba77ffe32511005e346… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 20 17:38:08 2021 +1000 ws2_32: Handle success in addrinfo_err_from_unix. When unix_getnameinfo is called, we end up with a warning fixme for no reason. 0740:fixme:winsock:addrinfo_err_from_unix unhandled error 0 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/unixlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index a9a2b6939d9..25a38b46758 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -410,6 +410,7 @@ static int addrinfo_err_from_unix( int err ) { switch (err) { + case 0: return 0; case EAI_AGAIN: return WS_EAI_AGAIN; case EAI_BADFLAGS: return WS_EAI_BADFLAGS; case EAI_FAIL: return WS_EAI_FAIL;

1 0