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

Jacek Caban : winemac: Directly use win32u for user functions in opengl.c.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 46af1ada38e95a5adb77202c68f9992463f53908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46af1ada38e95a5adb77202c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 21:25:08 2022 +0200 winemac: Directly use win32u for user functions in opengl.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index bf7effa7aeb..3aa5c340e30 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1330,7 +1330,7 @@ static int get_dc_pixel_format(HDC hdc) int format; HWND hwnd; - if ((hwnd = WindowFromDC(hdc))) + if ((hwnd = NtUserWindowFromDC(hdc))) { struct macdrv_win_data *data; @@ -1526,12 +1526,12 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) { struct macdrv_win_data *data; const pixel_format *pf; - HWND hwnd = WindowFromDC(hdc); + HWND hwnd = NtUserWindowFromDC(hdc); BOOL ret = FALSE; TRACE("hdc %p format %d\n", hdc, fmt); - if (!hwnd || hwnd == GetDesktopWindow()) + if (!hwnd || hwnd == NtUserGetDesktopWindow()) { WARN("not a proper window DC %p/%p\n", hdc, hwnd); return FALSE; @@ -3485,7 +3485,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return TRUE; } - if ((hwnd = WindowFromDC(draw_hdc))) + if ((hwnd = NtUserWindowFromDC(draw_hdc))) { if (!(data = get_win_data(hwnd))) { @@ -3555,7 +3555,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w context->read_pbuffer = NULL; if (read_hdc && read_hdc != draw_hdc) { - if ((hwnd = WindowFromDC(read_hdc))) + if ((hwnd = NtUserWindowFromDC(read_hdc))) { if ((data = get_win_data(hwnd))) { @@ -4543,7 +4543,7 @@ static BOOL WINAPI macdrv_wglSwapBuffers(HDC hdc) sync_context(context); } - if ((hwnd = WindowFromDC(hdc))) + if ((hwnd = NtUserWindowFromDC(hdc))) { struct macdrv_win_data *data;

1 0

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

23 May '22

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 20 May '22

20 May '22

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

Robert Wilhelm : vbscript: Implement CDate().
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 6899d16c1642bcbc64908ea19ac8044f63516802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6899d16c1642bcbc64908ea1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri May 20 15:28:35 2022 +0200 vbscript: Implement CDate(). Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 27 +++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5280730f19f..9a24657c848 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -742,8 +742,31 @@ static HRESULT Global_CByte(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_CDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&v, &v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + + if(!res) + return DISP_E_BADVARTYPE; + *res = v; + return S_OK; } static HRESULT Global_CDbl(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e5b0ee6d37..3b67e920c3d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1183,6 +1183,39 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDateError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDate(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDate(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDate(Empty) = 0, "CDate(Empty) = " & CDate(Empty)) +Call ok(getVT(CDate(Empty)) = "VT_DATE", "getVT(CDate(Empty)) = " & getVT(CDate(Empty))) +Call ok(CDate(0) = 0, "CDate(0) = " & CDate(0)) +Call ok(getVT(CDate(0)) = "VT_DATE", "getVT(CDate(0)) = " & getVT(CDate(0))) +Call ok(CDate(1) = #1899-12-31#, "CDate(1) = " & CDate(1)) +Call ok(getVT(CDate(1)) = "VT_DATE", "getVT(CDate(1)) = " & getVT(CDate(1))) +Call ok(CDate("1") = #1899-12-31#, "CDate(""1"") = " & CDate("1")) +Call ok(getVT(CDate("1")) = "VT_DATE", "getVT(CDate(""1"")) = " & getVT(CDate("1"))) +If isEnglishLang Then + Call ok(CDate("1/1/2000") = #2000-1-1#, "CDate(""1/1/2000"") = " & CDate("1/1/2000")) + Call ok(getVT(CDate("1/1/2000")) = "VT_DATE", "getVT(CDate(""1/1/2000"")) = " & getVT(CDate("1/1/2000"))) +End If +Call ok(CDate(-1) = #1899-12-29#, "CDate(-1) = " & CDate(-1)) +Call ok(getVT(CDate(-1)) = "VT_DATE", "getVT(CDate(-1)) = " & getVT(CDate(-1))) +Call ok(CDate(100000) = #2173-10-14#, "CDate(100000) = " & CDate(100000)) +Call ok(getVT(CDate(100000)) = "VT_DATE", "getVT(CDate(100000)) = " & getVT(CDate(100000))) +Call testCDateError("", 13, 13) +Call testCDateError(null, 94, 94) +Call testCDateError(1, 0, 458) + Sub testCDblError(strings, error_num1, error_num2) on error resume next Dim x

1 0

Matteo Bruni : d3dx9/xfile: Don't unnecessarily use long integer type.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 29a84c9c337673256c4e4484118992e17c359327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a84c9c337673256c4e4484… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 26 11:16:00 2022 +0200 d3dx9/xfile: Don't unnecessarily use long integer type. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/xfile.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 4f7d3eefd60..c845ac289c5 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -56,7 +56,7 @@ struct d3dx9_file_enum_object { ID3DXFileEnumObject ID3DXFileEnumObject_iface; LONG ref; - ULONG nb_children; + unsigned int child_count; ID3DXFileData **children; }; @@ -66,7 +66,7 @@ struct d3dx9_file_data LONG ref; BOOL reference; IDirectXFileData *dxfile_data; - ULONG nb_children; + unsigned int child_count; ID3DXFileData **children; }; @@ -124,7 +124,7 @@ static ULONG WINAPI d3dx9_file_data_Release(ID3DXFileData *iface) { ULONG i; - for (i = 0; i < file_data->nb_children; ++i) + for (i = 0; i < file_data->child_count; ++i) { ID3DXFileData *child = file_data->children[i]; child->lpVtbl->Release(child); @@ -256,7 +256,7 @@ static HRESULT WINAPI d3dx9_file_data_GetChildren(ID3DXFileData *iface, SIZE_T * if (!children) return E_POINTER; - *children = file_data->nb_children; + *children = file_data->child_count; return S_OK; } @@ -337,7 +337,7 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi while (SUCCEEDED(ret = IDirectXFileData_GetNextObject(object->dxfile_data, &data_object))) { - if (object->nb_children >= children_array_size) + if (object->child_count >= children_array_size) { ID3DXFileData **new_children; @@ -359,11 +359,11 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi } object->children = new_children; } - ret = d3dx9_file_data_create(data_object, &object->children[object->nb_children]); + ret = d3dx9_file_data_create(data_object, &object->children[object->child_count]); IUnknown_Release(data_object); if (FAILED(ret)) break; - object->nb_children++; + ++object->child_count; } if (ret != DXFILEERR_NOMOREOBJECTS) { @@ -375,12 +375,12 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi ID3DXFileData **new_children; new_children = HeapReAlloc(GetProcessHeap(), 0, object->children, - sizeof(*object->children) * object->nb_children); + sizeof(*object->children) * object->child_count); if (new_children) object->children = new_children; } - TRACE("Found %u children\n", object->nb_children); + TRACE("Found %u children.\n", object->child_count); *ret_iface = &object->ID3DXFileData_iface; @@ -426,7 +426,7 @@ static ULONG WINAPI d3dx9_file_enum_object_Release(ID3DXFileEnumObject *iface) { ULONG i; - for (i = 0; i < file_enum->nb_children; ++i) + for (i = 0; i < file_enum->child_count; ++i) { ID3DXFileData *child = file_enum->children[i]; child->lpVtbl->Release(child); @@ -454,7 +454,7 @@ static HRESULT WINAPI d3dx9_file_enum_object_GetChildren(ID3DXFileEnumObject *if if (!children) return E_POINTER; - *children = file_enum->nb_children; + *children = file_enum->child_count; return S_OK; } @@ -615,7 +615,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * /* Fill enum object with top level data objects */ while (SUCCEEDED(ret = IDirectXFileEnumObject_GetNextDataObject(dxfile_enum_object, &data_object))) { - if (object->nb_children >= children_array_size) + if (object->child_count >= children_array_size) { ID3DXFileData **new_children; @@ -638,18 +638,18 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * object->children = new_children; } ret = d3dx9_file_data_create((IDirectXFileObject*)data_object, - &object->children[object->nb_children]); + &object->children[object->child_count]); IUnknown_Release(data_object); if (FAILED(ret)) break; - object->nb_children++; + ++object->child_count; } if (object->children) { ID3DXFileData **new_children; new_children = HeapReAlloc(GetProcessHeap(), 0, object->children, - sizeof(*object->children) * object->nb_children); + sizeof(*object->children) * object->child_count); if (new_children) object->children = new_children; } @@ -659,7 +659,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * if (ret != DXFILEERR_NOMOREOBJECTS) WARN("Cannot get all top level data objects\n"); - TRACE("Found %u children\n", object->nb_children); + TRACE("Found %u children.\n", object->child_count); *enum_object = &object->ID3DXFileEnumObject_iface;

1 0

Matteo Bruni : d3dx9: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 24a4b8caf1bb486c2f66389c4b312eb754ae160f URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a4b8caf1bb486c2f66389c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 26 10:59:38 2022 +0200 d3dx9: Build without -DWINE_NO_LONG_TYPES. Based on a patch by Eric Pouech. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/animation.c | 22 ++--- dlls/d3dx9_36/core.c | 8 +- dlls/d3dx9_36/effect.c | 179 ++++++++++++++++++++------------------- dlls/d3dx9_36/font.c | 8 +- dlls/d3dx9_36/line.c | 10 +-- dlls/d3dx9_36/math.c | 30 +++---- dlls/d3dx9_36/mesh.c | 143 ++++++++++++++++---------------- dlls/d3dx9_36/preshader.c | 8 +- dlls/d3dx9_36/render.c | 50 +++++------ dlls/d3dx9_36/shader.c | 65 ++++++++------- dlls/d3dx9_36/skin.c | 112 +++++++++++++------------ dlls/d3dx9_36/sprite.c | 12 +-- dlls/d3dx9_36/surface.c | 61 +++++++------- dlls/d3dx9_36/texture.c | 207 ++++++++++++++++++++-------------------------- dlls/d3dx9_36/volume.c | 87 +++++++------------ dlls/d3dx9_36/xfile.c | 28 +++---- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- 36 files changed, 514 insertions(+), 556 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24a4b8caf1bb486c2f66…

1 0

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

20 May '22

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

Brendan Shanks : ntdll: Avoid truncating pointer to 32-bits in get_cpu_area().
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: fe52b067bf9a9733e4c6929f63ab13363b87d39e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe52b067bf9a9733e4c6929f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 17 13:32:29 2022 -0700 ntdll: Avoid truncating pointer to 32-bits in get_cpu_area(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 2 +- dlls/ntdll/unix/thread.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 7b36c988e81..0b4245fdd42 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -161,7 +161,7 @@ NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, for (i = 0; i < ARRAY_SIZE(data); i++) { -#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((align) - 1))) +#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((ULONG_PTR)(align) - 1))) if (data[i].machine != cpu->Machine) continue; info->Context = ALIGN( cpu + 1, data[i].align ); info->ContextEx = ALIGN( (char *)info->Context + data[i].size, sizeof(void *) ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 503230e4634..6d937675bcb 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1111,7 +1111,7 @@ void *get_cpu_area( USHORT machine ) case IMAGE_FILE_MACHINE_ARM64: align = TYPE_ALIGNMENT(ARM64_NT_CONTEXT); break; default: return NULL; } - return (void *)(((ULONG_PTR)(cpu + 1) + align - 1) & ~(align - 1)); + return (void *)(((ULONG_PTR)(cpu + 1) + align - 1) & ~((ULONG_PTR)align - 1)); }

1 0

Jacek Caban : winemac: Implement DesktopWindowProc driver entry point.
by Alexandre Julliard 20 May '22

20 May '22

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

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

20 May '22

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