- Wine-Commits - list.winehq.org

Zebediah Figura : ddraw: Do not check for DDRAW_NO3D in wined3d_resource_desc_from_ddraw().
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 379f592cca297649e653d399d636e3422f0c08c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/379f592cca297649e653d399d636e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 5 17:09:46 2023 -0500 ddraw: Do not check for DDRAW_NO3D in wined3d_resource_desc_from_ddraw(). NO3D implies SYSTEMMEMORY, and is incompatible with TEXTUREMANAGE, so this case is unreachable. --- dlls/ddraw/surface.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 33f38949c15..d242d460a1d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6189,15 +6189,12 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw, } else { - if (!(ddraw->flags & DDRAW_NO3D)) - { - if (caps & DDSCAPS_TEXTURE) - wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - if (caps & DDSCAPS_ZBUFFER) - wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL; - else if (caps & DDSCAPS_3DDEVICE) - wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET; - } + if (caps & DDSCAPS_TEXTURE) + wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + if (caps & DDSCAPS_ZBUFFER) + wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL; + else if (caps & DDSCAPS_3DDEVICE) + wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET; if (caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) {

1 0

Zebediah Figura : ddraw: Refactor how bind flags are computed.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 9cd6a43fefc87fb52960320468a323fda3b9311a URL: https://gitlab.winehq.org/wine/wine/-/commit/9cd6a43fefc87fb52960320468a323… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 5 17:19:08 2023 -0500 ddraw: Refactor how bind flags are computed. Try to do it in one place instead of two. --- dlls/ddraw/surface.c | 49 ++++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d242d460a1d..2be29834d78 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6182,6 +6182,13 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw, wined3d_desc->depth = 1; wined3d_desc->size = 0; + if ((caps & DDSCAPS_TEXTURE) || (caps2 & DDSCAPS2_CUBEMAP)) + wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + if (caps & DDSCAPS_ZBUFFER) + wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL; + else if (caps & DDSCAPS_3DDEVICE) + wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET; + if ((caps & DDSCAPS_SYSTEMMEMORY) && !(caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) { wined3d_desc->access = WINED3D_RESOURCE_ACCESS_CPU @@ -6189,23 +6196,15 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw, } else { - if (caps & DDSCAPS_TEXTURE) - wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - if (caps & DDSCAPS_ZBUFFER) - wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL; - else if (caps & DDSCAPS_3DDEVICE) - wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET; - if (caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { - wined3d_desc->bind_flags &= ~WINED3D_BIND_RENDER_TARGET; wined3d_desc->access |= WINED3D_RESOURCE_ACCESS_CPU; wined3d_desc->usage |= WINED3DUSAGE_MANAGED; } else if (caps & DDSCAPS_VIDEOMEMORY) { /* Dynamic resources can't be written by the GPU. */ - if (!(wined3d_desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) + if (!(caps & (DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER))) wined3d_desc->usage |= WINED3DUSAGE_DYNAMIC; } } @@ -6220,19 +6219,6 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw, wined3d_desc->usage |= WINED3DUSAGE_LEGACY_CUBEMAP; } -static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d_resource_desc *desc) -{ - if (!draw_bind_flags) - return false; - - /* If we have a GPU texture that includes all the necessary bind flags, we - * don't need a separate draw texture. */ - if ((desc->access & WINED3D_RESOURCE_ACCESS_GPU) && ((desc->bind_flags & draw_bind_flags) == draw_bind_flags)) - return false; - - return true; -} - static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *ddraw, unsigned int layers, unsigned int levels, bool sysmem_fallback, bool reserve_memory) { @@ -6242,7 +6228,7 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d struct wined3d_resource_desc wined3d_desc; struct wined3d_texture *wined3d_texture; struct ddraw_surface *parent, *root; - unsigned int bind_flags; + unsigned int draw_bind_flags; unsigned int pitch = 0; unsigned int i, j; HRESULT hr; @@ -6281,22 +6267,19 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d } } - bind_flags = 0; - if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - || (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) - bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + draw_bind_flags = wined3d_desc.bind_flags; - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - bind_flags |= WINED3D_BIND_DEPTH_STENCIL; - else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) - bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (!(wined3d_desc.access & WINED3D_RESOURCE_ACCESS_GPU)) + wined3d_desc.bind_flags = 0; + else if (wined3d_desc.usage & WINED3DUSAGE_MANAGED) + wined3d_desc.bind_flags &= ~WINED3D_BIND_RENDER_TARGET; - if (need_draw_texture(bind_flags, &wined3d_desc)) + if (draw_bind_flags && (wined3d_desc.bind_flags != draw_bind_flags)) { struct wined3d_resource_desc draw_texture_desc; draw_texture_desc = wined3d_desc; - draw_texture_desc.bind_flags = bind_flags; + draw_texture_desc.bind_flags = draw_bind_flags; draw_texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; draw_texture_desc.usage = 0;

1 0

Connor McAdams : win32u: Fix NtUserIsCurrent{Process/Thread}Window enum typo.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 285620b1778dd2050b2c7831d16ec50558c16dc3 URL: https://gitlab.winehq.org/wine/wine/-/commit/285620b1778dd2050b2c7831d16ec5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Oct 10 11:27:46 2023 -0400 win32u: Fix NtUserIsCurrent{Process/Thread}Window enum typo. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/win.c | 4 ++-- dlls/win32u/window.c | 4 ++-- include/ntuser.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7eaaa41e951..6459ddf9f28 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -113,7 +113,7 @@ static inline BOOL is_broadcast( HWND hwnd ) */ HWND WIN_IsCurrentProcess( HWND hwnd ) { - return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrehtProcessWindow )); + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrentProcessWindow )); } @@ -124,7 +124,7 @@ HWND WIN_IsCurrentProcess( HWND hwnd ) */ HWND WIN_IsCurrentThread( HWND hwnd ) { - return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrehtThreadWindow )); + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrentThreadWindow )); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index b3047e7299a..4a57e0abde7 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5474,10 +5474,10 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserGetFullWindowHandle: return HandleToUlong( get_full_window_handle( hwnd )); - case NtUserIsCurrehtProcessWindow: + case NtUserIsCurrentProcessWindow: return HandleToUlong( is_current_process_window( hwnd )); - case NtUserIsCurrehtThreadWindow: + case NtUserIsCurrentThreadWindow: return HandleToUlong( is_current_thread_window( hwnd )); default: diff --git a/include/ntuser.h b/include/ntuser.h index a8e8f4d6da0..171d32abe6e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1071,8 +1071,8 @@ enum NtUserCallHwnd_SetTaskmanWindow, /* temporary exports */ NtUserGetFullWindowHandle, - NtUserIsCurrehtProcessWindow, - NtUserIsCurrehtThreadWindow, + NtUserIsCurrentProcessWindow, + NtUserIsCurrentThreadWindow, }; static inline void NtUserActivateOtherWindow( HWND hwnd )

1 0

Alex Henrie : uninstaller: Don't overallocate in FetchFromRootKey.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 8943fcbca4963ac6740a5c6e13d5fc9b7748cad2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8943fcbca4963ac6740a5c6e13d5fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Sep 9 12:06:36 2023 -0600 uninstaller: Don't overallocate in FetchFromRootKey. --- programs/uninstaller/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 027937ba255..15f63976838 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -258,7 +258,7 @@ static int FetchFromRootKey(HKEY root) type == REG_DWORD && value == 1) { command = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName)) * sizeof(WCHAR)); + sizeof(L"msiexec /x") + wcslen(subKeyName) * sizeof(WCHAR)); wsprintfW(command, L"msiexec /x%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"UninstallString", NULL, NULL, NULL, &uninstlen))

1 0

Zebediah Figura : ddraw: Always create surfaces with WINED3D_BIND_SHADER_RESOURCE if possible.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: ee7d047dd55a4b2338eb2d64f85b7d984b39812f URL: https://gitlab.winehq.org/wine/wine/-/commit/ee7d047dd55a4b2338eb2d64f85b7d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 5 17:22:20 2023 -0500 ddraw: Always create surfaces with WINED3D_BIND_SHADER_RESOURCE if possible. --- dlls/ddraw/surface.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2be29834d78..f3c12bfccdb 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6182,8 +6182,9 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw, wined3d_desc->depth = 1; wined3d_desc->size = 0; - if ((caps & DDSCAPS_TEXTURE) || (caps2 & DDSCAPS2_CUBEMAP)) - wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + /* Always specify WINED3D_BIND_SHADER_RESOURCE. + * Surfaces without it can be bound on software devices on ddraw < 4. */ + wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (caps & DDSCAPS_ZBUFFER) wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL; else if (caps & DDSCAPS_3DDEVICE) @@ -6307,10 +6308,29 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d } else { + /* DDSCAPS_TEXTURE is not actually necessary to bind a surface as a + * texture for a software device. Worse, one can bind a hardware + * surface to a software device. However, some formats (e.g. YUY2) can + * live on the GPU but truly aren't texturable, and we don't want to + * fail to create them. + * + * Hence, if we fail to create a texture, and the user didn't + * explicitly ask for a texture, strip WINED3D_BIND_SHADER_RESOURCE and + * try again. */ + if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) - return hr; + { + if ((desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) || (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) + return hr; + + wined3d_desc.bind_flags &= ~WINED3D_BIND_SHADER_RESOURCE; + if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, + layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, + texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) + return hr; + } } if ((desc->dwFlags & DDSD_LPSURFACE) @@ -6788,19 +6808,11 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { if (!(desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) { - unsigned int bind_flags = 0; + unsigned int bind_flags = WINED3D_BIND_SHADER_RESOURCE; DWORD usage = 0; if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { usage |= WINED3DUSAGE_LEGACY_CUBEMAP; - bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - } - else if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - } - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) bind_flags |= WINED3D_BIND_DEPTH_STENCIL; else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)

1 0

Nikolay Sivov : gdi32/tests: Add some tests for FixBrushOrgEx().
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: e04e10b37bcba953f0b0e43caf0efca09da5a75c URL: https://gitlab.winehq.org/wine/wine/-/commit/e04e10b37bcba953f0b0e43caf0efc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 15:25:14 2023 +0200 gdi32/tests: Add some tests for FixBrushOrgEx(). It appears to be a stub on modern systems. Does not generate EMF output either. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/brush.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index b23e73ac65f..8df3c48a20d 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -411,16 +411,36 @@ static void test_brush_org( void ) { HDC hdc = GetDC( 0 ); POINT old, pt; + BOOL ret; - SetBrushOrgEx( hdc, 0, 0, &old ); + ret = SetBrushOrgEx( hdc, 0, 0, &old ); + ok(ret, "Unexpected return value %d.\n", ret); - SetBrushOrgEx( hdc, 1, 1, &pt ); + ret = SetBrushOrgEx( hdc, 1, 1, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y ); - SetBrushOrgEx( hdc, 0x10000, -1, &pt ); + ret = SetBrushOrgEx( hdc, 0x10000, -1, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); ok( pt.x == 1 && pt.y == 1, "got %ld,%ld\n", pt.x, pt.y ); - SetBrushOrgEx( hdc, old.x, old.y, &pt ); + ret = SetBrushOrgEx( hdc, old.x, old.y, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); ok( pt.x == 0x10000 && pt.y == -1, "got %ld,%ld\n", pt.x, pt.y ); + ret = GetBrushOrgEx( hdc, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); + ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y ); + pt.x = 10; + pt.y = 20; + ret = FixBrushOrgEx( hdc, 2, 3, &pt ); + todo_wine + ok(!ret, "Unexpected return value %d.\n", ret); + todo_wine + ok( pt.x == 10 && pt.y == 20, "got %ld,%ld\n", pt.x, pt.y ); + ret = GetBrushOrgEx( hdc, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); + todo_wine + ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y ); + ReleaseDC( 0, hdc ); }

1 0

Mohamad Al-Jaf : windows.security.credentials.ui.userconsentverifier: Implement IUserConsentVerifierStatics::CheckAvailabilityAsync().
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: a8f6183030d22bee01ac2bc6c8e9292837d8ea55 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8f6183030d22bee01ac2bc6c8e929… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:39:09 2023 -0400 windows.security.credentials.ui.userconsentverifier: Implement IUserConsentVerifierStatics::CheckAvailabilityAsync(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55709 --- .../Makefile.in | 4 +- .../async.c | 509 +++++++++++++++++++++ .../main.c | 11 +- .../private.h | 8 + .../provider.idl | 46 ++ 5 files changed, 575 insertions(+), 3 deletions(-)

1 0

Mohamad Al-Jaf : windows.security.credentials.ui.userconsentverifier/tests: Add IUserConsentVerifierStatics::CheckAvailabilityAsync() tests.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: a6a9419a3433c48f727ea9234d47b21e07889573 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6a9419a3433c48f727ea9234d47b2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:39:16 2023 -0400 windows.security.credentials.ui.userconsentverifier/tests: Add IUserConsentVerifierStatics::CheckAvailabilityAsync() tests. --- .../tests/verifier.c | 211 ++++++++++++++++++++- 1 file changed, 206 insertions(+), 5 deletions(-)

1 0

Mohamad Al-Jaf : windows.security.credentials.ui.userconsentverifier: Add stub DLL.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: d7b7114dd958adb3feea79eb86d29e1b8546f3b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7b7114dd958adb3feea79eb86d29e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:39:01 2023 -0400 windows.security.credentials.ui.userconsentverifier: Add stub DLL. --- configure | 3 + configure.ac | 2 + .../Makefile.in | 8 ++ .../classes.idl | 23 ++++ .../main.c | 138 +++++++++++++++++++++ .../private.h | 38 ++++++ .../tests/Makefile.in | 5 + .../tests/verifier.c | 85 +++++++++++++ ...ecurity.credentials.ui.userconsentverifier.spec | 3 + 9 files changed, 305 insertions(+)

1 0

Nikolay Sivov : gdi32/emf: Add SetBrushOrgEx() recording.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 86708b36f87b98d5689a19d8504fa6bc8ec7ebda URL: https://gitlab.winehq.org/wine/wine/-/commit/86708b36f87b98d5689a19d8504fa6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 12:46:30 2023 +0200 gdi32/emf: Add SetBrushOrgEx() recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/dc.c | 1 + dlls/gdi32/emfdc.c | 10 ++++++++++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 02c6a8c84cd..21005fa0719 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1060,6 +1060,7 @@ BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, POINT *oldorg ) { DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetBrushOrgEx( dc_attr, x, y )) return FALSE; if (oldorg) *oldorg = dc_attr->brush_org; dc_attr->brush_org.x = x; dc_attr->brush_org.y = y; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index e94f3c69b12..231b4ae217d 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2129,6 +2129,16 @@ BOOL EMFDC_SetBkColor( DC_ATTR *dc_attr, COLORREF color ) return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); } +BOOL EMFDC_SetBrushOrgEx( DC_ATTR *dc_attr, INT x, INT y ) +{ + EMRSETBRUSHORGEX emr; + + emr.emr.iType = EMR_SETBRUSHORGEX; + emr.emr.nSize = sizeof(emr); + emr.ptlOrigin.x = x; + emr.ptlOrigin.y = y; + return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); +} BOOL EMFDC_SetTextColor( DC_ATTR *dc_attr, COLORREF color ) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d9bf1c32895..8fa5c06e014 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -233,6 +233,7 @@ BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ); BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ); BOOL EMFDC_SetBkColor( DC_ATTR *dc_attr, COLORREF color ); BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ); +BOOL EMFDC_SetBrushOrgEx( DC_ATTR *dc_attr, INT x, INT y ); BOOL EMFDC_SetDCBrushColor( DC_ATTR *dc_attr, COLORREF color ); BOOL EMFDC_SetDCPenColor( DC_ATTR *dc_attr, COLORREF color ); INT EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dest, INT y_dest, DWORD width, DWORD height,

1 0