May 2022 - Wine-Commits - list.winehq.org

Esme Povirk : wmphoto: Zero user buffer before calling jxrlib Copy.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 5aa05728a5fb998a3c9dd7aebc9e3ab75acc7742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa05728a5fb998a3c9dd7ae… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 21 15:17:35 2022 -0500 wmphoto: Zero user buffer before calling jxrlib Copy. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51788 --- dlls/wmphoto/jxrlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index 3d7dedb869d..d4ac02e5918 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -271,7 +271,7 @@ static HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, pkrect.Width = This->frame.width; pkrect.Height = This->frame.height; This->frame_stride = (This->frame.width * This->frame.bpp + 7) / 8; - if (!(frame_data = RtlAllocateHeap(GetProcessHeap(), 0, This->frame.height * This->frame_stride))) + if (!(frame_data = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, This->frame.height * This->frame_stride))) return E_FAIL; if (This->decoder->Copy(This->decoder, &pkrect, frame_data, stride)) {

1 0

Alexandre Julliard : gitlab-to-mail: Ignore MR if it doesn't contain any patch.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: tools Branch: master Commit: 4c4d3b7870d1124af36d6e2c9767012930551fd5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4c4d3b7870d1124af36d6e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 23 10:47:31 2022 +0200 gitlab-to-mail: Ignore MR if it doesn't contain any patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index bd56033..d426cc9 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -581,6 +581,12 @@ def process_mr(mr, update_db): # last sha1 matches a known version and then we use that. updated_at = parse_gitlab_datetime(mr['updated_at']) patches = split_mbox_into_messages(fetch_mr_patches(iid)) + if not patches: + log(f"Warning: MR {iid} doesn't contain any patch") + if update_db: + db.set_last_mr_updated_at(updated_at) + return + sha1s = [get_patch_sha1(patch) for patch in patches] versions = fetch_mr_versions(iid) version = get_mr_version(versions, sha1s[-1])

1 0

Alexandre Julliard : Wine release 7.9
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: website Branch: master Commit: 6b5db863ddd25300b20955b4b16491eef8de910f URL: https://source.winehq.org/git/website.git/?a=commit;h=6b5db863ddd25300b2095… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 22:27:26 2022 +0200 Wine release 7.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022052001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2022052001.xml b/news/en/2022052001.xml new file mode 100644 index 00000000..47dfe33d --- /dev/null +++ b/news/en/2022052001.xml @@ -0,0 +1,15 @@ +<news> +<date>May 20, 2022</date> +<title>Wine 7.9 Released</title> +<body> + The Wine development release 7.9 is now available. + <a href="{$root}/announce/7.9">What's new</a> in this release: +<ul> + <li>Preliminary work towards PE conversion of macOS driver.</li> + <li>A number of fixes for test failures on Windows.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : winemac: Directly use win32u for GDI functions in mouse.c.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 8534fe2d714d71a748b3f2da38bfb558fdb82a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8534fe2d714d71a748b3f2da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:15:28 2022 +0200 winemac: Directly use win32u for GDI functions in mouse.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/mouse.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index d101d2513c8..e22cbe5e23f 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -290,7 +290,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, } xor_bits = (unsigned long*)((char*)and_bits + info->bmiHeader.biSizeImage / 2); - if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, and_bits, info, DIB_RGB_COLORS)) + if (!NtGdiGetDIBitsInternal(hdc, icon->hbmMask, 0, height * 2, and_bits, info, DIB_RGB_COLORS, 0, 0)) { WARN("GetDIBits failed\n"); HeapFree(GetProcessHeap(), 0, and_bits); @@ -579,7 +579,8 @@ static CFArrayRef create_color_cursor(HDC hdc, const ICONINFOEXW *iinfo, HANDLE info->bmiHeader.biBitCount = 32; color_size = width * height * 4; info->bmiHeader.biSizeImage = color_size; - hbmColor = CreateDIBSection(hdc, info, DIB_RGB_COLORS, (VOID **) &color_bits, NULL, 0); + hbmColor = NtGdiCreateDIBSection(hdc, NULL, 0, info, DIB_RGB_COLORS, + 0, 0, 0, (void **)&color_bits); if (!hbmColor) { WARN("failed to create DIB section for cursor color data\n"); @@ -597,7 +598,8 @@ static CFArrayRef create_color_cursor(HDC hdc, const ICONINFOEXW *iinfo, HANDLE mask_size = ((width + 31) / 32 * 4) * height; /* width_bytes * height */ info->bmiHeader.biSizeImage = mask_size; - hbmMask = CreateDIBSection(hdc, info, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0); + hbmMask = NtGdiCreateDIBSection(hdc, NULL, 0, info, DIB_RGB_COLORS, + 0, 0, 0, (void **)&mask_bits); if (!hbmMask) { WARN("failed to create DIB section for cursor mask data\n"); @@ -625,8 +627,8 @@ cleanup: else TRACE("returning cursor with %d frames\n", nFrames); /* Cleanup all of the resources used to obtain the frame data */ - if (hbmColor) DeleteObject(hbmColor); - if (hbmMask) DeleteObject(hbmMask); + if (hbmColor) NtGdiDeleteObjectApp(hbmColor); + if (hbmMask) NtGdiDeleteObjectApp(hbmMask); HeapFree(GetProcessHeap(), 0, info); return frames; } @@ -748,15 +750,15 @@ void macdrv_SetCursor(HCURSOR cursor) if ((cursor_name = copy_system_cursor_name(&info))) { - DeleteObject(info.hbmColor); - DeleteObject(info.hbmMask); + NtGdiDeleteObjectApp(info.hbmColor); + NtGdiDeleteObjectApp(info.hbmMask); } else { BITMAP bm; HDC hdc; - GetObjectW(info.hbmMask, sizeof(bm), &bm); + NtGdiExtGetObjectW(info.hbmMask, sizeof(bm), &bm); if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); /* make sure hotspot is valid */ @@ -766,18 +768,18 @@ void macdrv_SetCursor(HCURSOR cursor) info.yHotspot = bm.bmHeight / 2; } - hdc = CreateCompatibleDC(0); + hdc = NtGdiCreateCompatibleDC(0); if (info.hbmColor) { cursor_frames = create_color_cursor(hdc, &info, cursor, bm.bmWidth, bm.bmHeight); - DeleteObject(info.hbmColor); + NtGdiDeleteObjectApp(info.hbmColor); } else cursor_frames = create_monochrome_cursor(hdc, &info, bm.bmWidth, bm.bmHeight); - DeleteObject(info.hbmMask); - DeleteDC(hdc); + NtGdiDeleteObjectApp(info.hbmMask); + NtGdiDeleteObjectApp(hdc); } if (cursor_name || cursor_frames)

1 0

Jacek Caban : winemac: Directly use win32u for GDI functions in surface.c.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 2f66b367b703d0e1bdd8f5d9ae1d7fb2fb685ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f66b367b703d0e1bdd8f5d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:18:11 2022 +0200 winemac: Directly use win32u for GDI functions in surface.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/surface.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 6b0abb10780..9605e704c92 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -82,14 +82,14 @@ static void update_blit_data(struct macdrv_window_surface *surface) if (surface->drawn) { - HRGN blit = CreateRectRgn(0, 0, 0, 0); + HRGN blit = NtGdiCreateRectRgn(0, 0, 0, 0); - if (CombineRgn(blit, surface->drawn, 0, RGN_COPY) > NULLREGION && - (!surface->region || CombineRgn(blit, blit, surface->region, RGN_AND) > NULLREGION) && + if (NtGdiCombineRgn(blit, surface->drawn, 0, RGN_COPY) > NULLREGION && + (!surface->region || NtGdiCombineRgn(blit, blit, surface->region, RGN_AND) > NULLREGION) && OffsetRgn(blit, surface->header.rect.left, surface->header.rect.top) > NULLREGION) surface->blit_data = get_region_data(blit, 0); - DeleteObject(blit); + NtGdiDeleteObjectApp(blit); } } @@ -148,12 +148,12 @@ static void macdrv_surface_set_region(struct window_surface *window_surface, HRG if (region) { - if (!surface->region) surface->region = CreateRectRgn(0, 0, 0, 0); - CombineRgn(surface->region, region, 0, RGN_COPY); + if (!surface->region) surface->region = NtGdiCreateRectRgn(0, 0, 0, 0); + NtGdiCombineRgn(surface->region, region, 0, RGN_COPY); } else { - if (surface->region) DeleteObject(surface->region); + if (surface->region) NtGdiDeleteObjectApp(surface->region); surface->region = 0; } update_blit_data(surface); @@ -178,12 +178,14 @@ static void macdrv_surface_flush(struct window_surface *window_surface) rect = cgrect_from_rect(surface->bounds); rect = CGRectOffset(rect, surface->header.rect.left, surface->header.rect.top); - if (!IsRectEmpty(&surface->bounds) && (region = CreateRectRgnIndirect(&surface->bounds))) + if (!IsRectEmpty(&surface->bounds) && + (region = NtGdiCreateRectRgn(surface->bounds.left, surface->bounds.top, + surface->bounds.right, surface->bounds.bottom))) { if (surface->drawn) { - CombineRgn(surface->drawn, surface->drawn, region, RGN_OR); - DeleteObject(region); + NtGdiCombineRgn(surface->drawn, surface->drawn, region, RGN_OR); + NtGdiDeleteObjectApp(region); } else surface->drawn = region; @@ -205,8 +207,8 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) struct macdrv_window_surface *surface = get_mac_surface(window_surface); TRACE("freeing %p bits %p\n", surface, surface->bits); - if (surface->region) DeleteObject(surface->region); - if (surface->drawn) DeleteObject(surface->drawn); + if (surface->region) NtGdiDeleteObjectApp(surface->region); + if (surface->drawn) NtGdiDeleteObjectApp(surface->drawn); HeapFree(GetProcessHeap(), 0, surface->blit_data); HeapFree(GetProcessHeap(), 0, surface->bits); pthread_mutex_destroy(&surface->mutex); @@ -283,11 +285,11 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, reset_bounds(&surface->bounds); if (old_mac_surface && old_mac_surface->drawn) { - surface->drawn = CreateRectRgnIndirect(rect); + surface->drawn = NtGdiCreateRectRgn(rect->left, rect->top, rect->right, rect->bottom); OffsetRgn(surface->drawn, -rect->left, -rect->top); - if (CombineRgn(surface->drawn, surface->drawn, old_mac_surface->drawn, RGN_AND) <= NULLREGION) + if (NtGdiCombineRgn(surface->drawn, surface->drawn, old_mac_surface->drawn, RGN_AND) <= NULLREGION) { - DeleteObject(surface->drawn); + NtGdiDeleteObjectApp(surface->drawn); surface->drawn = 0; } } @@ -456,10 +458,10 @@ void surface_clip_to_visible_rect(struct window_surface *window_surface, const R rect = *visible_rect; OffsetRect(&rect, -rect.left, -rect.top); - if ((region = CreateRectRgnIndirect(&rect))) + if ((region = NtGdiCreateRectRgn(rect.left, rect.top, rect.right, rect.bottom))) { - CombineRgn(surface->drawn, surface->drawn, region, RGN_AND); - DeleteObject(region); + NtGdiCombineRgn(surface->drawn, surface->drawn, region, RGN_AND); + NtGdiDeleteObjectApp(region); update_blit_data(surface); }

1 0

Jacek Caban : winemac: Directly use win32u for GDI functions in opengl.c.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 948bd8e6c5c1d3950a824c14f004c148c15f99b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948bd8e6c5c1d3950a824c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:16:30 2022 +0200 winemac: Directly use win32u for GDI functions in opengl.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f553b93da5a..bf7effa7aeb 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3071,7 +3071,7 @@ static HDC macdrv_wglGetPbufferDCARB(struct wgl_pbuffer *pbuffer) HDC hdc; struct wgl_pbuffer *prev; - hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdc = NtGdiOpenDCW(NULL, NULL, NULL, 0, TRUE, NULL, NULL, NULL); if (!hdc) return 0; pthread_mutex_lock(&dc_pbuffers_mutex); @@ -3932,7 +3932,7 @@ static int macdrv_wglReleasePbufferDCARB(struct wgl_pbuffer *pbuffer, HDC hdc) pthread_mutex_unlock(&dc_pbuffers_mutex); - return hdc && DeleteDC(hdc); + return hdc && NtGdiDeleteObjectApp(hdc); }

1 0

Brendan Shanks : ntdll: Use 32-bit stack in alloc_fs_sel().
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 57c04fd07c5653ac0606587ea2b233b46fe40eb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c04fd07c5653ac0606587e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 17 13:50:24 2022 -0700 ntdll: Use 32-bit stack in alloc_fs_sel(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 34334f72ff0..cd50df0c805 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -94,7 +94,7 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, "pushq %rbx\n\t" "pushq %rdi\n\t" "movq %rsp,%rdi\n\t" - "movq %gs:0x8,%rsp\n\t" /* NtCurrentTeb()->Tib.StackBase */ + "movl 0x4(%rdx),%esp\n\t" /* Tib.StackBase */ "subl $0x10,%esp\n\t" /* setup modify_ldt struct on 32-bit stack */ "movl %ecx,(%rsp)\n\t" /* entry_number */

1 0

Jacek Caban : winemac: Implement DesktopWindowProc driver entry point.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: b34018db20bcd55cb1266d4aa3c7e5257ca96a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34018db20bcd55cb1266d4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:09:13 2022 +0200 winemac: Implement DesktopWindowProc driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/window.c | 9 ++------- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 673dca40270..151bb144da1 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -268,6 +268,7 @@ static const struct user_driver_funcs macdrv_funcs = .pClipCursor = macdrv_ClipCursor, .pCreateDesktopWindow = macdrv_CreateDesktopWindow, .pCreateWindow = macdrv_CreateWindow, + .pDesktopWindowProc = macdrv_DesktopWindowProc, .pDestroyCursorIcon = macdrv_DestroyCursorIcon, .pDestroyWindow = macdrv_DestroyWindow, .pEnumDisplaySettingsEx = macdrv_EnumDisplaySettingsEx, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 71a8d9f5bd2..79ae074dac6 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -137,6 +137,7 @@ extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_ClipCursor(LPCRECT clip) DECLSPEC_HIDDEN; extern BOOL macdrv_CreateDesktopWindow(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL macdrv_CreateWindow(HWND hwnd) DECLSPEC_HIDDEN; +extern LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; extern void macdrv_DestroyWindow(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_SetFocus(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 147c979ebde..d5bcce654e8 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1557,11 +1557,9 @@ BOOL macdrv_CreateDesktopWindow(HWND hwnd) } -static WNDPROC desktop_orig_wndproc; - #define WM_WINE_NOTIFY_ACTIVITY WM_USER -static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) { @@ -1580,7 +1578,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, break; } } - return desktop_orig_wndproc( hwnd, msg, wp, lp ); + return NtUserMessageCall(hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE); } /********************************************************************** @@ -1590,9 +1588,6 @@ BOOL macdrv_CreateWindow(HWND hwnd) { if (hwnd == GetDesktopWindow()) { - desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), - GWLP_WNDPROC, (LONG_PTR)desktop_wndproc_wrapper ); - macdrv_init_clipboard(); } return TRUE;

1 0

Alexandre Julliard : Release 7.9.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 230e953e31f7228d10c8b0a0d2e8cf4f9af9a231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=230e953e31f7228d10c8b0a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 22:24:58 2022 +0200 Release 7.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 1022 ++++++++++++++++++++++++++----------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 5 files changed, 457 insertions(+), 590 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=230e953e31f7228d10c8…

1 0

Jacek Caban : winemac: Directly use win32u for GDI functions in image.c.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: d71abff141f9cd361bcabf90d492e31fb91cf8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d71abff141f9cd361bcabf90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:14:06 2022 +0200 winemac: Directly use win32u for GDI functions in image.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/image.c | 24 +++++++++++++----------- dlls/winemac.drv/macdrv.h | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index e5f3a4c0fa6..d501b27a3c3 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -69,7 +69,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol /* draw the cursor frame to a temporary buffer then create a CGImage from that */ memset(color_bits, 0x00, color_size); - SelectObject(hdc, hbmColor); + NtGdiSelectBitmap(hdc, hbmColor); if (!DrawIconEx(hdc, 0, 0, icon, width, height, istep, NULL, DI_NORMAL)) { WARN("Could not draw frame %d (walk past end of frames).\n", istep); @@ -128,7 +128,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol /* draw the cursor mask to a temporary buffer */ memset(mask_bits, 0xFF, mask_size); - SelectObject(hdc, hbmMask); + NtGdiSelectBitmap(hdc, hbmMask); if (!DrawIconEx(hdc, 0, 0, icon, width, height, istep, NULL, DI_MASK)) { WARN("Failed to draw frame mask %d.\n", istep); @@ -202,17 +202,17 @@ CGImageRef create_cgimage_from_icon(HANDLE icon, int width, int height) if (!GetIconInfo(icon, &info)) return NULL; - GetObjectW(info.hbmMask, sizeof(bm), &bm); + NtGdiExtGetObjectW(info.hbmMask, sizeof(bm), &bm); if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); width = bm.bmWidth; height = bm.bmHeight; TRACE("new width %d height %d\n", width, height); - DeleteObject(info.hbmColor); - DeleteObject(info.hbmMask); + NtGdiDeleteObjectApp(info.hbmColor); + NtGdiDeleteObjectApp(info.hbmMask); } - hdc = CreateCompatibleDC(0); + hdc = NtGdiCreateCompatibleDC(0); bitmapinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bitmapinfo->bmiHeader.biWidth = width; @@ -226,7 +226,8 @@ CGImageRef create_cgimage_from_icon(HANDLE icon, int width, int height) bitmapinfo->bmiHeader.biBitCount = 32; color_size = width * height * 4; bitmapinfo->bmiHeader.biSizeImage = color_size; - hbmColor = CreateDIBSection(hdc, bitmapinfo, DIB_RGB_COLORS, (VOID **) &color_bits, NULL, 0); + hbmColor = NtGdiCreateDIBSection(hdc, NULL, 0, bitmapinfo, DIB_RGB_COLORS, + 0, 0, 0, (void **)&color_bits); if (!hbmColor) { WARN("failed to create DIB section for cursor color data\n"); @@ -244,7 +245,8 @@ CGImageRef create_cgimage_from_icon(HANDLE icon, int width, int height) bitmapinfo->bmiColors[1].rgbReserved = 0; mask_size = ((width + 31) / 32 * 4) * height; bitmapinfo->bmiHeader.biSizeImage = mask_size; - hbmMask = CreateDIBSection(hdc, bitmapinfo, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0); + hbmMask = NtGdiCreateDIBSection(hdc, NULL, 0, bitmapinfo, DIB_RGB_COLORS, + 0, 0, 0, (void **)&mask_bits); if (!hbmMask) { WARN("failed to create DIB section for cursor mask data\n"); @@ -255,9 +257,9 @@ CGImageRef create_cgimage_from_icon(HANDLE icon, int width, int height) mask_bits, mask_size, width, height, 0); cleanup: - if (hbmColor) DeleteObject(hbmColor); - if (hbmMask) DeleteObject(hbmMask); - DeleteDC(hdc); + if (hbmColor) NtGdiDeleteObjectApp(hbmColor); + if (hbmMask) NtGdiDeleteObjectApp(hbmMask); + NtGdiDeleteObjectApp(hdc); return ret; } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 79ae074dac6..29fbe8a8cb9 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -30,7 +30,7 @@ #include "macdrv_cocoa.h" #include "windef.h" #include "winbase.h" -#include "wingdi.h" +#include "ntgdi.h" #include "wine/debug.h" #include "wine/gdi_driver.h"

1 0