wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

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

23 Aug '21

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

André Zwing : shell32: Add IApplicationDocumentLists stub.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 9323d33fa40350f27399ae7bda54ae5ec39c57d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9323d33fa40350f27399ae7b… Author: André Zwing <nerv(a)dawncrow.de> Date: Sun Aug 22 16:14:57 2021 +0200 shell32: Add IApplicationDocumentLists stub. Lets Cablabel S3 Lite 1.4.0.2 start, otherwise it shows a msgbox with the error and freezes. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 +++ dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shellpath.c | 112 +++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 31 +++++++++++ 5 files changed, 151 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index f2c5ed4a766..22ef49ae5c7 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -74,6 +74,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) ] coclass ApplicationDestinations { interface IApplicationDestinations; } +[ + helpstring("Application Document List"), + threading(apartment), + uuid(86bec222-30f2-47e0-9f25-60d11cd75c28) +] coclass ApplicationDocumentLists { interface IApplicationDocumentLists; } + [ helpstring("Shell Drag and Drop Helper"), threading(apartment), diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index da50e19de46..99e5d0d4288 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -112,6 +112,7 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationDocumentLists_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 64ae59fd283..9870afe162e 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -68,6 +68,7 @@ static const struct { {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, {&CLSID_ApplicationDestinations, ApplicationDestinations_Constructor}, + {&CLSID_ApplicationDocumentLists, ApplicationDocumentLists_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2ffd608f645..e438efb9e80 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1178,6 +1178,118 @@ HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, return hr; } +typedef struct +{ + IApplicationDocumentLists IApplicationDocumentLists_iface; + LONG ref; +} IApplicationDocumentListsImpl; + +static inline IApplicationDocumentListsImpl *impl_from_IApplicationDocumentLists( IApplicationDocumentLists *iface ) +{ + return CONTAINING_RECORD(iface, IApplicationDocumentListsImpl, IApplicationDocumentLists_iface); +} + +static HRESULT WINAPI ApplicationDocumentLists_QueryInterface(IApplicationDocumentLists *iface, + REFIID riid, LPVOID *ppv) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IApplicationDocumentLists, riid)) + { + *ppv = &This->IApplicationDocumentLists_iface; + IUnknown_AddRef((IUnknown*)*ppv); + + TRACE("Returning IApplicationDocumentLists: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s, %p) interface not supported.\n", This, debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationDocumentLists_AddRef(IApplicationDocumentLists *iface) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI ApplicationDocumentLists_Release(IApplicationDocumentLists *iface) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI ApplicationDocumentLists_SetAppID(IApplicationDocumentLists *iface, + const WCHAR *appid) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + FIXME("(%p, %s) stub!\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDocumentLists_GetList(IApplicationDocumentLists *iface, + APPDOCLISTTYPE list_type, UINT item_count, + REFIID riid, void **obj) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + FIXME("(%p, %u, %u, %s, %p): stub\n", This, list_type, item_count, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IApplicationDocumentListsVtbl ApplicationDocumentListsVtbl = +{ + ApplicationDocumentLists_QueryInterface, + ApplicationDocumentLists_AddRef, + ApplicationDocumentLists_Release, + ApplicationDocumentLists_SetAppID, + ApplicationDocumentLists_GetList +}; + +HRESULT WINAPI ApplicationDocumentLists_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationDocumentListsImpl *This; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationDocumentLists_iface.lpVtbl = &ApplicationDocumentListsVtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationDocumentLists_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + return hr; +} + typedef struct { const KNOWNFOLDERID *id; diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 52e0c5c9db1..92e4da36c77 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3485,6 +3485,29 @@ interface IApplicationDestinations : IUnknown HRESULT RemoveAllDestinations(); } +[ + object, + uuid(3c594f9f-9f30-47a1-979a-c9e83d3d0a06), + pointer_default(unique) +] +interface IApplicationDocumentLists : IUnknown +{ + typedef [v1_enum] enum APPDOCLISTTYPE + { + ADLT_RECENT = 0, + ADLT_FREQUENT = 1, + } APPDOCLISTTYPE; + + HRESULT SetAppID( + [in] LPCWSTR pszAppID); + + HRESULT GetList( + [in] APPDOCLISTTYPE list_type, + [in] UINT item_count, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); +} + [ uuid(6332debf-87b5-4670-90c0-5e57b408a49e), object, @@ -3825,6 +3848,14 @@ library ShellObjects interface IApplicationDestinations; } + [ + uuid(86bec222-30f2-47e0-9f25-60d11cd75c28) + ] + coclass ApplicationDocumentLists + { + interface IApplicationDocumentLists; + } + [ uuid(00021401-0000-0000-c000-000000000046) ]

1 0

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

23 Aug '21

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

Jacek Caban : gdi32: Separate EMFDRV_PDEVICE and struct emf.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 7f888ea093be8643d167eec999b55b09e82fae58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f888ea093be8643d167eec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:52:57 2021 +0200 gdi32: Separate EMFDRV_PDEVICE and struct emf. 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/emfdrv.c | 9 +++++++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 6 ++---- dlls/gdi32/enhmfdrv/graphics.c | 18 +++++++++--------- dlls/gdi32/enhmfdrv/init.c | 9 +++++---- dlls/gdi32/enhmfdrv/objects.c | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/emfdrv.c b/dlls/gdi32/emfdrv.c index e6421ff560c..006e70cbd2d 100644 --- a/dlls/gdi32/emfdrv.c +++ b/dlls/gdi32/emfdrv.c @@ -19,9 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "enhmfdrv/enhmetafiledrv.h" +#include "ntgdi_private.h" +typedef struct +{ + struct gdi_physdev dev; + INT dev_caps[COLORMGMTCAPS + 1]; +} EMFDRV_PDEVICE; + static inline EMFDRV_PDEVICE *get_emf_physdev( PHYSDEV dev ) { return CONTAINING_RECORD( dev, EMFDRV_PDEVICE, dev ); @@ -576,7 +582,6 @@ HDC WINAPI NtGdiCreateMetafileDC( HDC hdc ) free_dc_ptr( dc ); return 0; } - dc->attr->emf = physDev; push_dc_driver( &dc->physDev, &physDev->dev, &emfdrv_driver ); diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 288ceed518b..83c3bedfb7e 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -31,9 +31,8 @@ /* Enhanced Metafile driver physical DC */ -typedef struct emf +struct emf { - struct gdi_physdev dev; ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ DC_ATTR *dc_attr; UINT handles_size, cur_handles; @@ -42,8 +41,7 @@ typedef struct emf HBRUSH dc_brush; HPEN dc_pen; BOOL path; - INT dev_caps[COLORMGMTCAPS + 1]; -} EMFDRV_PDEVICE; +}; extern BOOL emfdc_record( struct emf *emf, EMR *emr ) DECLSPEC_HIDDEN; extern void emfdc_update_bounds( struct emf *emf, RECTL *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 0c6d671c7d4..9ff16f285f0 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -637,14 +637,14 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *l if (graphicsMode == GM_COMPATIBLE) { - const INT horzSize = GetDeviceCaps( emf->dev.hdc, HORZSIZE ); - const INT horzRes = GetDeviceCaps( emf->dev.hdc, HORZRES ); - const INT vertSize = GetDeviceCaps( emf->dev.hdc, VERTSIZE ); - const INT vertRes = GetDeviceCaps( emf->dev.hdc, VERTRES ); + const INT horzSize = GetDeviceCaps( dc_attr->hdc, HORZSIZE ); + const INT horzRes = GetDeviceCaps( dc_attr->hdc, HORZRES ); + const INT vertSize = GetDeviceCaps( dc_attr->hdc, VERTSIZE ); + const INT vertRes = GetDeviceCaps( dc_attr->hdc, VERTRES ); SIZE wndext, vportext; - GetViewportExtEx( emf->dev.hdc, &vportext ); - GetWindowExtEx( emf->dev.hdc, &wndext ); + GetViewportExtEx( dc_attr->hdc, &vportext ); + GetWindowExtEx( dc_attr->hdc, &wndext ); exScale = 100.0 * ((FLOAT)horzSize / (FLOAT)horzRes) / ((FLOAT)wndext.cx / (FLOAT)vportext.cx); eyScale = 100.0 * ((FLOAT)vertSize / (FLOAT)vertRes) / @@ -685,7 +685,7 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *l for (i = 0; i < count; i++) { textWidth += lpDx[i]; } - if (GetTextExtentPoint32W( emf->dev.hdc, str, count, &strSize )) + if (GetTextExtentPoint32W( dc_attr->hdc, str, count, &strSize )) textHeight = strSize.cy; } else { @@ -693,7 +693,7 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *l INT *dx = (INT *)((char*)pemr + pemr->emrtext.offDx); SIZE charSize; for (i = 0; i < count; i++) { - if (GetTextExtentPoint32W( emf->dev.hdc, str + i, 1, &charSize )) { + if (GetTextExtentPoint32W( dc_attr->hdc, str + i, 1, &charSize )) { dx[i] = charSize.cx; textWidth += charSize.cx; textHeight = max(textHeight, charSize.cy); @@ -729,7 +729,7 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *l switch (textAlign & (TA_TOP | TA_BOTTOM | TA_BASELINE)) { case TA_BASELINE: { TEXTMETRICW tm; - if (!GetTextMetricsW( emf->dev.hdc, &tm )) + if (!GetTextMetricsW( dc_attr->hdc, &tm )) tm.tmDescent = 0; /* Play safe here... it's better to have a bounding box */ /* that is too big than too small. */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 1c99b23984a..66701caa19b 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -41,7 +41,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) 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 ); + GDI_hdc_not_using_object( emf->handles[index], dc_attr->hdc ); HeapFree( GetProcessHeap(), 0, emf->handles ); } @@ -85,7 +85,7 @@ void emfdc_update_bounds( struct emf *emf, RECTL *rect ) RECTL *bounds = &emf->dc_attr->emf_bounds; RECTL vportRect = *rect; - LPtoDP( emf->dev.hdc, (POINT *)&vportRect, 2 ); + LPtoDP( emf->dc_attr->hdc, (POINT *)&vportRect, 2 ); /* The coordinate systems may be mirrored (LPtoDP handles points, not rectangles) */ @@ -173,12 +173,13 @@ HDC WINAPI CreateEnhMetaFileW( if (!(ret = NtGdiCreateMetafileDC( hdc ))) return 0; - if (!(dc_attr = get_dc_attr( ret ))) + if (!(dc_attr = get_dc_attr( ret )) || !(emf = HeapAlloc( GetProcessHeap(), 0, sizeof(*emf) ))) { DeleteDC( ret ); return 0; } - emf = dc_attr->emf; + + dc_attr->emf = emf; if(description) { /* App name\0Title\0\0 */ length = lstrlenW(description); diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 03172a0eb40..a37c2e03f87 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -284,7 +284,7 @@ static BOOL EMFDC_SelectFont( DC_ATTR *dc_attr, HFONT font ) if (!(index = emfdc_find_object( emf, font ))) { if (!(index = EMFDRV_CreateFontIndirect( emf, font ))) return FALSE; - GDI_hdc_using_object( font, emf->dev.hdc, EMFDC_DeleteObject ); + GDI_hdc_using_object( font, dc_attr->hdc, EMFDC_DeleteObject ); } found:

1 0

Jacek Caban : gdi32: Use NtGdiGetRgnBox in emfdrv_stroke_and_fill_path.
by Alexandre Julliard 23 Aug '21

23 Aug '21

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

Jacek Caban : gdi32: Avoid using EMFDRV_PDEVICE outside emfdev.c.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: wine Branch: master Commit: 0e8a7a505082e890dcaf5fcfb6113561c8c11b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8a7a505082e890dcaf5fcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 13:52:30 2021 +0200 gdi32: Avoid using EMFDRV_PDEVICE outside emfdev.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/emfdrv.c | 5 +++++ dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 5 ----- dlls/gdi32/enhmfdrv/graphics.c | 22 ++++++++++----------- dlls/gdi32/enhmfdrv/init.c | 4 ++-- dlls/gdi32/enhmfdrv/objects.c | 37 +++++++++++++++++------------------- 6 files changed, 36 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e8a7a505082e890dcaf…

1 0

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

23 Aug '21

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 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

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: 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

Jump to page:

2025

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 August 2021