November 2022 - Wine-Commits

Alexandre Julliard : winecrt0: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: e85f5aa6de9779aa3e61b958ee569da30e8adc37 URL: https://gitlab.winehq.org/wine/wine/-/commit/e85f5aa6de9779aa3e61b958ee569d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 10:23:26 2022 +0100 winecrt0: Build without -DWINE_NO_LONG_TYPES. --- dlls/winecrt0/Makefile.in | 1 - dlls/winecrt0/debug.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6915e69eb4b..17da4da29c6 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES STATICLIB = libwinecrt0.a C_SRCS = \ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 918fb67b140..2ac4505fb85 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -191,11 +191,11 @@ static int __cdecl fallback__wine_dbg_header( enum __wine_debug_class cls, if (TRACE_ON(timestamp)) { - ULONG ticks = GetTickCount(); + UINT ticks = GetTickCount(); pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); } - if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); - pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", (UINT)GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", (UINT)GetCurrentThreadId() ); if (function && cls < ARRAY_SIZE( debug_classes )) snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", debug_classes[cls], channel->name, function );

1 0

Alexandre Julliard : wineusb.sys: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 46341ec62b2baff1c67812a26c63c74f15bb3c04 URL: https://gitlab.winehq.org/wine/wine/-/commit/46341ec62b2baff1c67812a26c63c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 11:17:42 2022 +0100 wineusb.sys: Build without -DWINE_NO_LONG_TYPES. --- dlls/wineusb.sys/Makefile.in | 1 - dlls/wineusb.sys/unixlib.c | 2 +- dlls/wineusb.sys/wineusb.c | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index 66a9f56b213..a7c93f24c8e 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineusb.sys UNIXLIB = wineusb.so IMPORTS = ntoskrnl diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index f2356fcb06a..f269d3e96fd 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -502,7 +502,7 @@ static NTSTATUS usb_submit_urb(void *args) if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) req_type |= LIBUSB_ENDPOINT_IN; if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN) - FIXME("Unhandled flags %#x.\n", req->TransferFlags); + FIXME("Unhandled flags %#x.\n", (int)req->TransferFlags); if (req->TransferBufferMDL) FIXME("Unhandled MDL output buffer.\n"); diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 2f918cdeeb7..63b723503c9 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -119,7 +119,7 @@ static void add_unix_device(const struct usb_add_device_event *event) if ((status = IoCreateDevice(driver_obj, sizeof(*device), &string, FILE_DEVICE_USB, 0, FALSE, &device_obj))) { - ERR("Failed to create device, status %#x.\n", status); + ERR("Failed to create device, status %#lx.\n", status); return; } @@ -586,7 +586,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp NTSTATUS status = STATUS_NOT_IMPLEMENTED; BOOL removed; - TRACE("device_obj %p, irp %p, code %#x.\n", device_obj, irp, code); + TRACE("device_obj %p, irp %p, code %#lx.\n", device_obj, irp, code); EnterCriticalSection(&wineusb_cs); removed = device->removed; @@ -606,7 +606,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp break; default: - FIXME("Unhandled ioctl %#x (device %#x, access %#x, function %#x, method %#x).\n", + FIXME("Unhandled ioctl %#lx (device %#lx, access %#lx, function %#lx, method %#lx).\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); } @@ -626,7 +626,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *p if ((ret = IoCreateDevice(driver, 0, NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &bus_fdo))) { - ERR("Failed to create FDO, status %#x.\n", ret); + ERR("Failed to create FDO, status %#lx.\n", ret); return ret; } @@ -652,7 +652,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) if ((status = NtQueryVirtualMemory(GetCurrentProcess(), instance, MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL))) { - ERR("Failed to initialize Unix library, status %#x.\n", status); + ERR("Failed to initialize Unix library, status %#lx.\n", status); return status; }

1 0

Alexandre Julliard : opengl32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: ce951c9ca73aff0adfdc46fed854993fdc4f16bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ce951c9ca73aff0adfdc46fed85499… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 11:14:28 2022 +0100 opengl32: Build without -DWINE_NO_LONG_TYPES. --- dlls/opengl32/Makefile.in | 2 +- dlls/opengl32/make_opengl | 14 +- dlls/opengl32/thunks.c | 6240 ++++++++++++++++++++++----------------------- dlls/opengl32/unix_wgl.c | 10 +- dlls/opengl32/wgl.c | 19 +- 5 files changed, 3143 insertions(+), 3142 deletions(-)

1 0

Eric Pouech : dbghelp: Fix handling of BA_OP_ChangeCodeLength (PDB).
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: de3a836629dbce1324c1bc35894ca4756197cbe7 URL: https://gitlab.winehq.org/wine/wine/-/commit/de3a836629dbce1324c1bc35894ca4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 10:49:35 2022 +0100 dbghelp: Fix handling of BA_OP_ChangeCodeLength (PDB). This op is heavily used by clang with PDB debug info, while MSVC barely uses it. This fixes a bunch of problems when loading PDB files generated by clang (eg. the PDB files from wine-gecko). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 85d12063076..5e7a1badadf 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2199,8 +2199,9 @@ static struct symt_function* codeview_create_inline_site(const struct msc_debug_ inlined->ranges[index++].high = top_func->ranges[0].low + offset; break; case BA_OP_ChangeCodeLength: - /* this op doesn't seem widely used... */ - inline_site_update_last_range(inlined, index, inlined->ranges[index - 1].low + cvba.arg1); + /* this op isn't widely used by MSVC, but clang uses it a lot... */ + offset += cvba.arg1; + inline_site_update_last_range(inlined, index, top_func->ranges[0].low + offset); break; case BA_OP_ChangeFile: chksms = CV_RECORD_GAP(hdr_files, cvba.arg1);

1 0

Nikolay Sivov : vbscript: Handle index read access to array properties.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: eeecf6f034ff72cb3ba3285227beb70bd9b82a37 URL: https://gitlab.winehq.org/wine/wine/-/commit/eeecf6f034ff72cb3ba3285227beb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 17 10:27:53 2022 +0300 vbscript: Handle index read access to array properties. Described by Jason Millard. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53867 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/interp.c | 6 +++--- dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ dlls/vbscript/vbdisp.c | 13 +++++++++++-- dlls/vbscript/vbscript.h | 1 + 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4cfe9596b0c..77875ee7f44 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -535,7 +535,7 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, BOOL is_propput, DI } } -static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) +HRESULT array_access(SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) { unsigned i, argc = arg_cnt(dp); LONG *indices; @@ -611,7 +611,7 @@ static HRESULT variant_call(exec_ctx_t *ctx, VARIANT *v, unsigned arg_cnt, VARIA } vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); - hres = array_access(ctx, array, &dp, &v); + hres = array_access(array, &dp, &v); if(FAILED(hres)) return hres; @@ -894,7 +894,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * return E_FAIL; } - hres = array_access(ctx, array, dp, &v); + hres = array_access(array, dp, &v); if(FAILED(hres)) return hres; }else if(V_VT(v) == (VT_ARRAY|VT_BYREF|VT_VARIANT)) { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 61258355496..beb7c7e86c9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1004,6 +1004,7 @@ Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x)) Class TestClass Public publicProp + Public publicArrayProp Private privateProp @@ -1058,6 +1059,11 @@ Class TestClass Public Sub Class_Initialize publicProp2 = 2 + ReDim publicArrayProp(2) + + publicArrayProp(0) = 1 + publicArrayProp(1) = 2 + privateProp = true Call ok(getVT(privateProp) = "VT_BOOL*", "getVT(privateProp) = " & getVT(privateProp)) Call ok(getVT(publicProp2) = "VT_I2*", "getVT(publicProp2) = " & getVT(publicProp2)) @@ -1110,6 +1116,13 @@ Call ok(funcCalled = "GetDefVal", "funcCalled = " & funcCalled) Call obj.Class_Initialize Call ok(obj.getPrivateProp() = true, "obj.getPrivateProp() = " & obj.getPrivateProp()) +'Accessing array property by index +Call ok(obj.publicArrayProp(0) = 1, "obj.publicArrayProp(0) = " & obj.publicArrayProp(0)) +Call ok(obj.publicArrayProp(1) = 2, "obj.publicArrayProp(1) = " & obj.publicArrayProp(1)) +x = obj.publicArrayProp(2) +Call ok(getVT(x) = "VT_EMPTY*", "getVT(x) = " & getVT(x)) +Call ok(obj.publicArrayProp("0") = 1, "obj.publicArrayProp(0) = " & obj.publicArrayProp("0")) + x = (New testclass).publicProp Class TermTest diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 92468d37ef2..e19ed2b53d4 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -122,8 +122,17 @@ static HRESULT invoke_variant_prop(script_ctx_t *ctx, VARIANT *v, WORD flags, DI case DISPATCH_PROPERTYGET|DISPATCH_METHOD: case DISPATCH_PROPERTYGET: if(dp->cArgs) { - WARN("called with arguments\n"); - return DISP_E_MEMBERNOTFOUND; /* That's what tests show */ + if (!V_ISARRAY(v)) + { + WARN("called with arguments for non-array property\n"); + return DISP_E_MEMBERNOTFOUND; /* That's what tests show */ + } + + if (FAILED(hres = array_access(V_ARRAY(v), dp, &v))) + { + WARN("failed to access array element\n"); + return hres; + } } hres = VariantCopyInd(res, v); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2d51c3297f6..3690fc4f0e2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -383,6 +383,7 @@ void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; +HRESULT array_access(SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) DECLSPEC_HIDDEN; void release_regexp_typelib(void) DECLSPEC_HIDDEN; HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN;

1 0

Alex Henrie : dinput/tests: Get rid of pDirectInputCreateEx.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: f3e9a1b789289f6728737c0a4d74b9e87fda5c39 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3e9a1b789289f6728737c0a4d74b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 21:23:45 2022 -0700 dinput/tests: Get rid of pDirectInputCreateEx. DirectInputCreateEx is available on all versions of Windows since XP at least. --- dlls/dinput/tests/dinput.c | 16 +++++----------- dlls/dinput/tests/dinput_test.h | 1 - dlls/dinput/tests/hid.c | 2 -- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 7df8f3ace85..682a5cbf97f 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -315,14 +315,8 @@ static void test_DirectInputCreateEx( DWORD version ) HRESULT hr; int i; - if (!pDirectInputCreateEx) - { - win_skip("DirectInputCreateEx is not available\n"); - return; - } - unknown = (void *)0xdeadbeef; - hr = pDirectInputCreateEx( instance, version, &IID_IDirectInputW, (void **)&unknown, &outer ); + hr = DirectInputCreateEx( instance, version, &IID_IDirectInputW, (void **)&unknown, &outer ); ok( hr == DI_OK, "DirectInputCreateW returned %#lx\n", hr ); ok( unknown == NULL, "got IUnknown %p\n", unknown ); @@ -330,8 +324,8 @@ static void test_DirectInputCreateEx( DWORD version ) { winetest_push_context( "%u", i ); unknown = (void *)0xdeadbeef; - hr = pDirectInputCreateEx( create_tests[i].instance, create_tests[i].version, create_tests[i].iid, - (void **)create_tests[i].out, NULL ); + hr = DirectInputCreateEx( create_tests[i].instance, create_tests[i].version, create_tests[i].iid, + (void **)create_tests[i].out, NULL ); todo_wine_if( version == 0x300 && i == 7 ) ok( hr == create_tests[i].expected_hr, "DirectInputCreateEx returned %#lx\n", hr ); if (SUCCEEDED(hr)) IUnknown_Release( unknown ); @@ -343,7 +337,7 @@ static void test_DirectInputCreateEx( DWORD version ) { winetest_push_context( "%u", i ); unknown = (void *)0xdeadbeef; - hr = pDirectInputCreateEx( instance, version, dinput8_interfaces[i], (void **)&unknown, NULL ); + hr = DirectInputCreateEx( instance, version, dinput8_interfaces[i], (void **)&unknown, NULL ); ok( hr == DIERR_NOINTERFACE, "DirectInputCreateEx returned %#lx\n", hr ); ok( unknown == (void *)0xdeadbeef, "got IUnknown %p\n", unknown ); winetest_pop_context(); @@ -353,7 +347,7 @@ static void test_DirectInputCreateEx( DWORD version ) { winetest_push_context( "%u", i ); unknown = NULL; - hr = pDirectInputCreateEx( instance, version, dinput7_interfaces[i], (void **)&unknown, NULL ); + hr = DirectInputCreateEx( instance, version, dinput7_interfaces[i], (void **)&unknown, NULL ); if (version < 0x800) ok( hr == DI_OK, "DirectInputCreateEx returned %#lx\n", hr ); else ok( hr == DIERR_OLDDIRECTINPUTVERSION, "DirectInputCreateEx returned %#lx\n", hr ); if (version < 0x800) ok( unknown != NULL, "got IUnknown NULL\n" ); diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index 04738cffb44..94c3df3710c 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -50,7 +50,6 @@ extern const GUID expect_guid_product; extern const WCHAR expect_path[]; extern const WCHAR expect_path_end[]; -extern typeof(DirectInputCreateEx) *pDirectInputCreateEx; extern HANDLE device_added, device_removed; extern HINSTANCE instance; extern BOOL localized; /* object names get translated */ diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 5467af32493..88565283735 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -60,7 +60,6 @@ #include "dinput_test.h" -typeof(DirectInputCreateEx) *pDirectInputCreateEx; HINSTANCE instance; BOOL localized; /* object names get translated */ @@ -3483,7 +3482,6 @@ void dinput_test_init_( const char *file, int line ) instance = GetModuleHandleW( NULL ); localized = GetUserDefaultLCID() != MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); pSignerSign = (void *)GetProcAddress( LoadLibraryW( L"mssign32" ), "SignerSign" ); - pDirectInputCreateEx = (void *)GetProcAddress( LoadLibraryW(L"dinput.dll"), "DirectInputCreateEx" ); if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) {

1 0

Evan Tang : mshtml: Hide things that were removed in IE11.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 0ba543acb4fda46ec045ebac39b2445bf7fcf572 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ba543acb4fda46ec045ebac39b244… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Nov 16 15:21:27 2022 -0600 mshtml: Hide things that were removed in IE11. --- dlls/mshtml/htmldoc.c | 17 +++++++++++++++-- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/htmlimg.c | 17 +++++++++++++++-- dlls/mshtml/htmlwindow.c | 21 ++++++++++++++++++--- dlls/mshtml/tests/documentmode.js | 24 ++++++++++++------------ 5 files changed, 64 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 81960f53400..85f2e0eaace 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -6149,6 +6149,19 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t {DISPID_IHTMLDOCUMENT2_LOCATION, HTMLDocumentNode_location_hook}, {DISPID_UNKNOWN} }; + static const dispex_hook_t document2_ie11_hooks[] = { + {DISPID_IHTMLDOCUMENT2_URL, NULL, L"URL"}, + {DISPID_IHTMLDOCUMENT2_LOCATION, HTMLDocumentNode_location_hook}, + {DISPID_IHTMLDOCUMENT2_CREATESTYLESHEET, NULL}, + {DISPID_IHTMLDOCUMENT2_FILESIZE, NULL}, + {DISPID_IHTMLDOCUMENT2_SELECTION, NULL}, + {DISPID_UNKNOWN} + }; + static const dispex_hook_t document3_ie11_hooks[] = { + {DISPID_IHTMLDOCUMENT3_ATTACHEVENT, NULL}, + {DISPID_IHTMLDOCUMENT3_DETACHEVENT, NULL}, + {DISPID_UNKNOWN} + }; static const dispex_hook_t document6_ie9_hooks[] = { {DISPID_IHTMLDOCUMENT6_ONSTORAGE}, {DISPID_UNKNOWN} @@ -6168,9 +6181,9 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t dispex_info_add_interface(info, IHTMLDocument6_tid, NULL); }else { dispex_info_add_interface(info, IHTMLDocument6_tid, mode >= COMPAT_MODE_IE9 ? document6_ie9_hooks : NULL); - dispex_info_add_interface(info, IHTMLDocument3_tid, NULL); + dispex_info_add_interface(info, IHTMLDocument3_tid, mode >= COMPAT_MODE_IE11 ? document3_ie11_hooks : NULL); } - dispex_info_add_interface(info, IHTMLDocument2_tid, document2_hooks); + dispex_info_add_interface(info, IHTMLDocument2_tid, mode >= COMPAT_MODE_IE11 ? document2_ie11_hooks : document2_hooks); } static dispex_static_data_t HTMLDocumentNode_dispex = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f1b039f05e5..541806fa8b2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7185,8 +7185,10 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) {DISPID_UNKNOWN} }; static const dispex_hook_t elem2_ie11_hooks[] = { - {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, - {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, + {DISPID_IHTMLELEMENT2_ATTACHEVENT, NULL}, + {DISPID_IHTMLELEMENT2_DETACHEVENT, NULL}, + {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, + {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, {DISPID_UNKNOWN} }; diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 966ea3f39c0..e779dd2dec7 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mshtmdid.h" #include "wine/debug.h" @@ -727,15 +728,27 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { static const tid_t HTMLImgElement_iface_tids[] = { HTMLELEMENT_TIDS, - IHTMLImgElement_tid, 0 }; + +static void HTMLImgElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + static const dispex_hook_t img_ie11_hooks[] = { + {DISPID_IHTMLIMGELEMENT_FILESIZE, NULL}, + {DISPID_UNKNOWN} + }; + + HTMLElement_init_dispex_info(info, mode); + + dispex_info_add_interface(info, IHTMLImgElement_tid, mode >= COMPAT_MODE_IE11 ? img_ie11_hooks : NULL); +} + static dispex_static_data_t HTMLImgElement_dispex = { L"HTMLImageElement", NULL, DispHTMLImg_tid, HTMLImgElement_iface_tids, - HTMLElement_init_dispex_info + HTMLImgElement_init_dispex_info }; HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c2475afd1f6..baaedb6b6d4 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3952,10 +3952,25 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa {DISPID_IHTMLWINDOW2_LOCATION, IHTMLWindow2_location_hook}, {DISPID_UNKNOWN} }; + static const dispex_hook_t window2_ie11_hooks[] = { + {DISPID_IHTMLWINDOW2_LOCATION, IHTMLWindow2_location_hook}, + {DISPID_IHTMLWINDOW2_EXECSCRIPT, NULL}, + {DISPID_UNKNOWN} + }; static const dispex_hook_t window3_hooks[] = { {DISPID_IHTMLWINDOW3_SETTIMEOUT, IHTMLWindow3_setTimeout_hook}, {DISPID_UNKNOWN} }; + static const dispex_hook_t window3_ie11_hooks[] = { + {DISPID_IHTMLWINDOW3_SETTIMEOUT, IHTMLWindow3_setTimeout_hook}, + {DISPID_IHTMLWINDOW3_ATTACHEVENT, NULL}, + {DISPID_IHTMLWINDOW3_DETACHEVENT, NULL}, + {DISPID_UNKNOWN} + }; + static const dispex_hook_t window4_ie11_hooks[] = { + {DISPID_IHTMLWINDOW4_CREATEPOPUP, NULL}, + {DISPID_UNKNOWN} + }; if(compat_mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLWindow7_tid, NULL); @@ -3965,8 +3980,9 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IWineHTMLWindowPrivate_tid, NULL); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); - dispex_info_add_interface(info, IHTMLWindow3_tid, window3_hooks); - dispex_info_add_interface(info, IHTMLWindow2_tid, window2_hooks); + dispex_info_add_interface(info, IHTMLWindow4_tid, compat_mode >= COMPAT_MODE_IE11 ? window4_ie11_hooks : NULL); + dispex_info_add_interface(info, IHTMLWindow3_tid, compat_mode >= COMPAT_MODE_IE11 ? window3_ie11_hooks : window3_hooks); + dispex_info_add_interface(info, IHTMLWindow2_tid, compat_mode >= COMPAT_MODE_IE11 ? window2_ie11_hooks : window2_hooks); EventTarget_init_dispex_info(info, compat_mode); } @@ -3996,7 +4012,6 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { }; static const tid_t HTMLWindow_iface_tids[] = { - IHTMLWindow4_tid, IHTMLWindow6_tid, 0 }; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2f02e17ba6c..6b74094110f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -274,8 +274,8 @@ sync_test("elem_props", function() { var v = document.documentMode; - test_exposed("attachEvent", v < 11, v >= 11); - test_exposed("detachEvent", v < 11, v >= 11); + test_exposed("attachEvent", v < 11); + test_exposed("detachEvent", v < 11); test_exposed("doScroll", v < 11); test_exposed("readyState", v < 11); test_exposed("clientTop", true); @@ -305,7 +305,7 @@ sync_test("elem_props", function() { test_exposed("classList", v >= 10); elem = document.createElement("img"); - test_exposed("fileSize", v < 11, v >= 11); + test_exposed("fileSize", v < 11); }); sync_test("doc_props", function() { @@ -320,11 +320,11 @@ sync_test("doc_props", function() { var v = document.documentMode; ok(document.mimeType === external.getExpectedMimeType("text/html"), "mimeType = " + document.mimeType); - test_exposed("attachEvent", v < 11, v >= 11); - test_exposed("detachEvent", v < 11, v >= 11); - test_exposed("createStyleSheet",v < 11, v >= 11); - test_exposed("fileSize", v < 11, v >= 11); - test_exposed("selection", v < 11, v >= 11); + test_exposed("attachEvent", v < 11); + test_exposed("detachEvent", v < 11); + test_exposed("createStyleSheet",v < 11); + test_exposed("fileSize", v < 11); + test_exposed("selection", v < 11); test_exposed("onstorage", v < 9); test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9); @@ -365,10 +365,10 @@ sync_test("window_props", function() { var v = document.documentMode; - test_exposed("attachEvent", v < 11, v >= 11); - test_exposed("detachEvent", v < 11, v >= 11); - test_exposed("execScript", v < 11, v >= 11); - test_exposed("createPopup", v < 11, v >= 11); + test_exposed("attachEvent", v < 11); + test_exposed("detachEvent", v < 11); + test_exposed("execScript", v < 11); + test_exposed("createPopup", v < 11); test_exposed("postMessage", true); test_exposed("sessionStorage", true); test_exposed("localStorage", true);

1 0

Jacek Caban : winevulkan: Convert dispatchable handle array struct members.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 2ad6d865d17f5dabe888a908030d44b29bad08d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ad6d865d17f5dabe888a908030d44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 01:15:53 2022 +0100 winevulkan: Convert dispatchable handle array struct members. --- dlls/winevulkan/make_vulkan | 6 +++++- dlls/winevulkan/vulkan_thunks.c | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d7349120e40..036ef755495 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1396,7 +1396,9 @@ class VkMember(VkVariable): count = self.array_len if direction == Direction.OUTPUT: # Needed by VkMemoryHeap.memoryHeaps - return "convert_{0}_array_host_to_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, win_type) + host_part = "host" if unwrap else "unwrapped_host" + return "convert_{0}_array_{6}_to_{5}({2}{1}, {3}{1}, {4});\n".format( + self.type, self.name, input, output, count, win_type, host_part) else: # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) @@ -1485,6 +1487,8 @@ class VkMember(VkVariable): if self.is_handle(): if unwrap and self.handle.is_wrapped(): return True + if conv and self.handle.is_dispatchable(): + return True elif self.is_generic_handle(): if unwrap: return True diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 32553aba432..db0978f9caa 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -16019,6 +16019,20 @@ static inline void convert_VkDebugMarkerObjectTagInfoEXT_win32_to_host(const VkD } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkPhysicalDevice_array_unwrapped_host_to_win32(const VkPhysicalDevice *in, VkPhysicalDevice *out, uint32_t count) +{ + unsigned int i; + + if (!in) return; + + for (i = 0; i < count; i++) + { + out[i] = in[i]; + } +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkPhysicalDeviceGroupProperties_win32_to_unwrapped_host(const VkPhysicalDeviceGroupProperties32 *in, VkPhysicalDeviceGroupProperties *out) { @@ -16035,7 +16049,7 @@ static inline void convert_VkPhysicalDeviceGroupProperties_unwrapped_host_to_win if (!in) return; out->physicalDeviceCount = in->physicalDeviceCount; - memcpy(out->physicalDevices, in->physicalDevices, VK_MAX_DEVICE_GROUP_SIZE * sizeof(VkPhysicalDevice)); + convert_VkPhysicalDevice_array_unwrapped_host_to_win32(in->physicalDevices, out->physicalDevices, VK_MAX_DEVICE_GROUP_SIZE); out->subsetAllocation = in->subsetAllocation; } #endif /* USE_STRUCT_CONVERSION */ @@ -16180,20 +16194,6 @@ static inline void convert_VkPerformanceCounterDescriptionKHR_array_host_to_win3 } #endif /* USE_STRUCT_CONVERSION */ -#if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkPhysicalDevice_array_unwrapped_host_to_win32(const VkPhysicalDevice *in, VkPhysicalDevice *out, uint32_t count) -{ - unsigned int i; - - if (!in) return; - - for (i = 0; i < count; i++) - { - out[i] = in[i]; - } -} -#endif /* USE_STRUCT_CONVERSION */ - #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemoryRange32 *in, VkMappedMemoryRange *out) {

1 0

Evan Tang : mshtml: Add tests for things removed in IE11.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: b45eca88f46f150f7a932327d647386042c360be URL: https://gitlab.winehq.org/wine/wine/-/commit/b45eca88f46f150f7a932327d64738… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Nov 16 14:17:28 2022 -0600 mshtml: Add tests for things removed in IE11. PS Elements installer needs this, as it picks attachEvent over addEventListener if it exists, and then tries to use it with a function that only works with addEventListener (needs the event object passed) --- dlls/mshtml/tests/documentmode.js | 52 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5da89349d6d..2f02e17ba6c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -264,15 +264,18 @@ sync_test("builtin_toString", function() { sync_test("elem_props", function() { var elem = document.documentElement; - function test_exposed(prop, expect) { + function test_exposed(prop, expect, is_todo) { + var ok_ = is_todo ? todo_wine.ok : ok; if(expect) - ok(prop in elem, prop + " not found in element."); + ok_(prop in elem, prop + " not found in element."); else - ok(!(prop in elem), prop + " found in element."); + ok_(!(prop in elem), prop + " found in element."); } var v = document.documentMode; + test_exposed("attachEvent", v < 11, v >= 11); + test_exposed("detachEvent", v < 11, v >= 11); test_exposed("doScroll", v < 11); test_exposed("readyState", v < 11); test_exposed("clientTop", true); @@ -285,7 +288,7 @@ sync_test("elem_props", function() { test_exposed("getElementsByClassName", v >= 9); test_exposed("removeAttributeNS", v >= 9); test_exposed("addEventListener", v >= 9); - if (v != 8 /* todo_wine */) test_exposed("hasAttribute", v >= 8); + test_exposed("hasAttribute", v >= 8, v === 8); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); test_exposed("msSetPointerCapture", v >= 10); @@ -300,19 +303,28 @@ sync_test("elem_props", function() { test_exposed("readyState", v < 11); test_exposed("styleSheet", v < 11); test_exposed("classList", v >= 10); + + elem = document.createElement("img"); + test_exposed("fileSize", v < 11, v >= 11); }); sync_test("doc_props", function() { - function test_exposed(prop, expect) { + function test_exposed(prop, expect, is_todo) { + var ok_ = is_todo ? todo_wine.ok : ok; if(expect) - ok(prop in document, prop + " not found in document."); + ok_(prop in document, prop + " not found in document."); else - ok(!(prop in document), prop + " found in document."); + ok_(!(prop in document), prop + " found in document."); } var v = document.documentMode; ok(document.mimeType === external.getExpectedMimeType("text/html"), "mimeType = " + document.mimeType); + test_exposed("attachEvent", v < 11, v >= 11); + test_exposed("detachEvent", v < 11, v >= 11); + test_exposed("createStyleSheet",v < 11, v >= 11); + test_exposed("fileSize", v < 11, v >= 11); + test_exposed("selection", v < 11, v >= 11); test_exposed("onstorage", v < 9); test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9); @@ -343,15 +355,20 @@ sync_test("docfrag_props", function() { }); sync_test("window_props", function() { - function test_exposed(prop, expect) { + function test_exposed(prop, expect, is_todo) { + var ok_ = is_todo ? todo_wine.ok : ok; if(expect) - ok(prop in window, prop + " not found in window."); + ok_(prop in window, prop + " not found in window."); else - ok(!(prop in window), prop + " found in window."); + ok_(!(prop in window), prop + " found in window."); } var v = document.documentMode; + test_exposed("attachEvent", v < 11, v >= 11); + test_exposed("detachEvent", v < 11, v >= 11); + test_exposed("execScript", v < 11, v >= 11); + test_exposed("createPopup", v < 11, v >= 11); test_exposed("postMessage", true); test_exposed("sessionStorage", true); test_exposed("localStorage", true); @@ -587,11 +604,12 @@ sync_test("createElement_inline_attr", function() { sync_test("JS objs", function() { var g = window; - function test_exposed(func, obj, expect) { + function test_exposed(func, obj, expect, is_todo) { + var ok_ = is_todo ? todo_wine.ok : ok; if(expect) - ok(func in obj, func + " not found in " + obj); + ok_(func in obj, func + " not found in " + obj); else - ok(!(func in obj), func + " found in " + obj); + ok_(!(func in obj), func + " found in " + obj); } function test_parses(code, expect) { @@ -622,11 +640,9 @@ sync_test("JS objs", function() { test_exposed("map", Array.prototype, v >= 9); /* FIXME: IE8 implements weird semi-functional property descriptors. */ - if(v != 8) { - test_exposed("getOwnPropertyDescriptor", Object, v >= 8); - test_exposed("defineProperty", Object, v >= 8); - test_exposed("defineProperties", Object, v >= 8); - } + test_exposed("getOwnPropertyDescriptor", Object, v >= 8, v === 8); + test_exposed("defineProperty", Object, v >= 8, v === 8); + test_exposed("defineProperties", Object, v >= 9); test_exposed("getPrototypeOf", Object, v >= 9);

1 0

Jacek Caban : winevulkan: Convert pointers to pointer-sized variables in 32-bit thunks.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: a8539fc979884a09edf96d40705bd97f7833fe29 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8539fc979884a09edf96d40705bd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 11 23:31:20 2022 +0100 winevulkan: Convert pointers to pointer-sized variables in 32-bit thunks. --- dlls/winevulkan/make_vulkan | 14 ++++++++++---- dlls/winevulkan/vulkan_thunks.c | 35 ++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 26a4f986c49..d7349120e40 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1617,16 +1617,20 @@ class VkParam(VkVariable): ret += " convert_{0}_{3}_to_{5}host({4}{1}{2}, {2}_host);\n".format(self.type, prefix, self.name, win_type, ctx_param, wrap_part) ret += " }\n" return ret - else: + elif self.is_struct(): return " convert_{0}_{3}_to_{5}host({4}{1}{2}, &{2}_host);\n".format(self.type, prefix, self.name, win_type, ctx_param, wrap_part) + else: + return " {1}_host = *{0}{1};\n".format(prefix, self.name) else: if self.is_dynamic_array(): return " convert_{0}_array_{1}host_to_{2}({3}_host, {4}{3}, {5});\n".format( self.type, wrap_part, win_type, self.name, prefix, self.get_dyn_array_len(prefix)) - else: + elif self.is_struct(): ref_part = "" if self.optional else "&" return " convert_{0}_host_to_{3}({4}{2}_host, {1}{2});\n".format( self.type, prefix, self.name, win_type, ref_part) + else: + return " *{0}{1} = {1}_host;\n".format(prefix, self.name) def definition(self, postfix=None, is_member=False, conv=False): """ Return prototype for the parameter. E.g. 'const char *foo' """ @@ -1684,9 +1688,9 @@ class VkParam(VkVariable): return self.struct.needs_conversion(conv, unwrap, direction, self.is_const()) if self.is_handle(): - # non-array handles are handled inline in thunks + # non-pointer handles are handled inline in thunks if not self.is_dynamic_array() and not self.is_static_array(): - return False + return conv and self.is_pointer() and self.handle.is_dispatchable() # vkAllocateCommandBuffers is a special case, we use it in our private thunk as an input param param_direction = (Direction.INPUT if self.is_const() else Direction.OUTPUT) @@ -1699,6 +1703,8 @@ class VkParam(VkVariable): return True if conv and self.handle.is_dispatchable(): return True + elif self.is_pointer() and self.is_pointer_size(): + return conv return False diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 25cfc4bed82..32553aba432 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -33296,13 +33296,16 @@ static NTSTATUS thunk32_vkCreateDevice(void *args) VkResult result; } *params = args; VkDeviceCreateInfo pCreateInfo_host; + VkDevice pDevice_host; struct conversion_context ctx; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pCreateInfo, params->pAllocator, params->pDevice); init_conversion_context(&ctx); convert_VkDeviceCreateInfo_win32_to_host(&ctx, params->pCreateInfo, &pCreateInfo_host); - params->result = wine_vkCreateDevice(params->physicalDevice, &pCreateInfo_host, params->pAllocator, params->pDevice, params->client_ptr); + pDevice_host = *params->pDevice; + params->result = wine_vkCreateDevice(params->physicalDevice, &pCreateInfo_host, params->pAllocator, &pDevice_host, params->client_ptr); + *params->pDevice = pDevice_host; free_conversion_context(&ctx); return STATUS_SUCCESS; } @@ -33610,13 +33613,16 @@ static NTSTATUS thunk32_vkCreateInstance(void *args) VkResult result; } *params = args; VkInstanceCreateInfo pCreateInfo_host; + VkInstance pInstance_host; struct conversion_context ctx; TRACE("%p, %p, %p\n", params->pCreateInfo, params->pAllocator, params->pInstance); init_conversion_context(&ctx); convert_VkInstanceCreateInfo_win32_to_host(&ctx, params->pCreateInfo, &pCreateInfo_host); - params->result = wine_vkCreateInstance(&pCreateInfo_host, params->pAllocator, params->pInstance, params->client_ptr); + pInstance_host = *params->pInstance; + params->result = wine_vkCreateInstance(&pCreateInfo_host, params->pAllocator, &pInstance_host, params->client_ptr); + *params->pInstance = pInstance_host; free_conversion_context(&ctx); return STATUS_SUCCESS; } @@ -37477,10 +37483,13 @@ static NTSTATUS thunk32_vkGetDeviceQueue(void *args) uint32_t queueIndex; VkQueue *pQueue; } *params = args; + VkQueue pQueue_host; TRACE("%p, %u, %u, %p\n", params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); - wine_vkGetDeviceQueue(params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); + pQueue_host = *params->pQueue; + wine_vkGetDeviceQueue(params->device, params->queueFamilyIndex, params->queueIndex, &pQueue_host); + *params->pQueue = pQueue_host; return STATUS_SUCCESS; } @@ -37509,11 +37518,14 @@ static NTSTATUS thunk32_vkGetDeviceQueue2(void *args) VkQueue *pQueue; } *params = args; VkDeviceQueueInfo2 pQueueInfo_host; + VkQueue pQueue_host; TRACE("%p, %p, %p\n", params->device, params->pQueueInfo, params->pQueue); convert_VkDeviceQueueInfo2_win32_to_host(params->pQueueInfo, &pQueueInfo_host); - wine_vkGetDeviceQueue2(params->device, &pQueueInfo_host, params->pQueue); + pQueue_host = *params->pQueue; + wine_vkGetDeviceQueue2(params->device, &pQueueInfo_host, &pQueue_host); + *params->pQueue = pQueue_host; return STATUS_SUCCESS; } @@ -39818,10 +39830,13 @@ static NTSTATUS thunk32_vkGetPipelineCacheData(void *args) void *pData; VkResult result; } *params = args; + size_t pDataSize_host; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); + pDataSize_host = *params->pDataSize; + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, &pDataSize_host, params->pData); + *params->pDataSize = pDataSize_host; return STATUS_SUCCESS; } @@ -40420,10 +40435,13 @@ static NTSTATUS thunk32_vkGetShaderInfoAMD(void *args) void *pInfo; VkResult result; } *params = args; + size_t pInfoSize_host; TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); + pInfoSize_host = *params->pInfoSize; + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, &pInfoSize_host, params->pInfo); + *params->pInfoSize = pInfoSize_host; return STATUS_SUCCESS; } @@ -40559,10 +40577,13 @@ static NTSTATUS thunk32_vkGetValidationCacheDataEXT(void *args) void *pData; VkResult result; } *params = args; + size_t pDataSize_host; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); + pDataSize_host = *params->pDataSize; + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, &pDataSize_host, params->pData); + *params->pDataSize = pDataSize_host; return STATUS_SUCCESS; }

1 0