August 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : jscript: Call the getter with the proper 'this' in invoke_prop_func.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 1b1d09724a94b1d5a6d266f259c20cbfaa4b3888 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b1d09724a94b1d5a6d266f259c20c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 31 18:50:59 2023 +0300 jscript: Call the getter with the proper 'this' in invoke_prop_func. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 18 +++++++++--------- dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2da2270fb0f..0dd575434c1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -442,7 +442,7 @@ static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t * return S_OK; } -static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) +static HRESULT prop_get(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, jsval_t *r) { jsdisp_t *prop_obj = This; HRESULT hres; @@ -461,7 +461,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) break; case PROP_ACCESSOR: if(prop->u.accessor.getter) { - hres = jsdisp_call_value(prop->u.accessor.getter, jsval_obj(This), + hres = jsdisp_call_value(prop->u.accessor.getter, jsval_disp(jsthis), DISPATCH_METHOD, 0, NULL, r); }else { *r = jsval_undefined(); @@ -579,7 +579,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t case PROP_IDX: { jsval_t val; - hres = prop_get(This, prop, &val); + hres = prop_get(This, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, prop, &val); if(FAILED(hres)) return hres; @@ -1973,7 +1973,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc jsval_t r; if(prop) - hres = prop_get(This, prop, &r); + hres = prop_get(This, to_disp(This), prop, &r); else { hres = to_primitive(This->ctx, jsval_obj(This), &r, NO_HINT); if(hres == JS_E_TO_PRIMITIVE) @@ -2305,7 +2305,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built if(SUCCEEDED(hres) && prop && prop->type!=PROP_DELETED) { jsval_t val; - hres = prop_get(constr, prop, &val); + hres = prop_get(constr, to_disp(constr), prop, &val); if(FAILED(hres)) { ERR("Could not get prototype\n"); return hres; @@ -2754,7 +2754,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val) return S_OK; } - return prop_get(obj, prop, val); + return prop_get(obj, to_disp(obj), prop, val); } HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r) @@ -2774,7 +2774,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r) return DISP_E_UNKNOWNNAME; } - return prop_get(obj, prop, r); + return prop_get(obj, to_disp(obj), prop, r); } HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, jsval_t *val) @@ -2785,7 +2785,7 @@ HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, jsval_t *val) if(!prop) return DISP_E_MEMBERNOTFOUND; - return prop_get(jsdisp, prop, val); + return prop_get(jsdisp, to_disp(jsdisp), prop, val); } HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val) @@ -2981,7 +2981,7 @@ HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_onl desc->mask |= PROPF_WRITABLE; desc->explicit_value = TRUE; if(!flags_only) { - hres = prop_get(obj, prop, &desc->value); + hres = prop_get(obj, to_disp(obj), prop, &desc->value); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e86ab1dbe77..cef3c77c207 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -794,6 +794,7 @@ sync_test("defineProperty", function() { /* call prop with getter */ desc = { get: function() { + ok(this === obj, "this != obj"); return function(x) { ok(x === 100, "x = " + x); return 10; @@ -804,6 +805,10 @@ sync_test("defineProperty", function() { test_accessor_prop_desc(obj, "funcprop", desc); ok(obj.funcprop(100) === 10, "obj.funcprop() = " + obj.funcprop(100)); + Object.defineProperty(child.prototype, "funcprop_prot", desc); + test_accessor_prop_desc(child.prototype, "funcprop_prot", desc); + ok(obj.funcprop_prot(100) === 10, "obj.funcprop_prot() = " + obj.funcprop_prot(100)); + expect_exception(function() { Object.defineProperty(null, "funcprop", desc); }, JS_E_OBJECT_EXPECTED);

1 0

Paul Gofman : iphlpapi: Link NotifyAddrChange and CancelIPChangeNotify to nsi implementation.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 4098a05ea84ca8587690f8d0b124b3e07c3c4a9f URL: https://gitlab.winehq.org/wine/wine/-/commit/4098a05ea84ca8587690f8d0b124b3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 26 19:19:30 2023 -0600 iphlpapi: Link NotifyAddrChange and CancelIPChangeNotify to nsi implementation. --- dlls/iphlpapi/iphlpapi_main.c | 21 +++++++++------------ dlls/iphlpapi/tests/iphlpapi.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f8ecb89c328..f30ed03d5e6 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -127,14 +127,15 @@ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask IpMask, DWORD IfIndex, PULONG N * RETURNS * Success: TRUE * Failure: FALSE - * - * FIXME - * Stub, returns FALSE. */ BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped) { - FIXME("(overlapped %p): stub\n", overlapped); - return FALSE; + DWORD err; + + TRACE("overlapped %p.\n", overlapped); + + if ((err = NsiCancelChangeNotification( overlapped ))) SetLastError( err ); + return !err; } @@ -3786,16 +3787,12 @@ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * FIXME - * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) { - FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); - if (Handle) *Handle = INVALID_HANDLE_VALUE; - if (overlapped) ((IO_STATUS_BLOCK *) overlapped)->Status = STATUS_PENDING; - return ERROR_IO_PENDING; + TRACE("Handle %p, overlapped %p.\n", Handle, overlapped); + + return NsiRequestChangeNotification(0, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, overlapped, Handle); } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 4def00730fc..6ac7b88778e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1670,9 +1670,11 @@ static void testNotifyAddrChange(void) ret = NotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %ld, expected ERROR_IO_PENDING\n", ret); ret = GetLastError(); - todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %ld, expected ERROR_IO_PENDING\n", ret); + ok(ret == ERROR_IO_PENDING, "GetLastError returned %ld, expected ERROR_IO_PENDING\n", ret); success = CancelIPChangeNotify(&overlapped); - todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + success = GetOverlappedResult( handle, &overlapped, &bytes, TRUE ); + ok( !success && GetLastError() == ERROR_OPERATION_ABORTED, "got bret %d, err %lu.\n", success, GetLastError() ); ZeroMemory(&overlapped, sizeof(overlapped)); success = CancelIPChangeNotify(&overlapped); @@ -1683,13 +1685,15 @@ static void testNotifyAddrChange(void) overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); ret = NotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %ld, expected ERROR_IO_PENDING\n", ret); - todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); + ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); ret = GetLastError(); ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %ld, expected ERROR_IO_INCOMPLETE\n", ret); success = CancelIPChangeNotify(&overlapped); - todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + success = GetOverlappedResult( handle, &overlapped, &bytes, TRUE ); + ok( !success && GetLastError() == ERROR_OPERATION_ABORTED, "got bret %d, err %lu.\n", success, GetLastError() ); if (winetest_interactive) { @@ -1710,7 +1714,7 @@ static void testNotifyAddrChange(void) trace("Testing synchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); ret = NotifyAddrChange(NULL, NULL); - todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %ld, expected NO_ERROR\n", ret); + ok(ret == NO_ERROR, "NotifyAddrChange returned %ld, expected NO_ERROR\n", ret); } }

1 0

Michael Stefaniuc : shell32/tests: Get rid of the a2bstr() helper.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: dbe9f348d48a6ffbb3448931887925d347b6b3a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbe9f348d48a6ffbb3448931887925… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 23:27:06 2023 +0200 shell32/tests: Get rid of the a2bstr() helper. --- dlls/shell32/tests/shelldispatch.c | 48 ++++++++++++++------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 7dfbd476372..1038603551e 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -47,22 +47,10 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); /* Updated Windows 7 has a new IShellDispatch6 in its typelib */ DEFINE_GUID(IID_IWin7ShellDispatch6, 0x34936ba1, 0x67ad, 0x4c41, 0x99,0xb8, 0x8c,0x12,0xdf,0xf1,0xe9,0x74); -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - -static void variant_set_string(VARIANT *v, const char *s) +static void variant_set_string(VARIANT *v, const WCHAR *s) { V_VT(v) = VT_BSTR; - V_BSTR(v) = a2bstr(s); + V_BSTR(v) = SysAllocString(s); } static void init_function_pointers(void) @@ -356,7 +344,7 @@ static void test_items(void) { static const struct { - char name[32]; + WCHAR name[32]; enum { DIRECTORY, @@ -366,8 +354,8 @@ static void test_items(void) } file_defs[] = { - { "00-Myfolder", DIRECTORY }, - { "01-empty.bin", EMPTY_FILE }, + { L"00-Myfolder", DIRECTORY }, + { L"01-empty.bin", EMPTY_FILE }, }; WCHAR path[MAX_PATH], cur_dir[MAX_PATH], orig_dir[MAX_PATH]; HRESULT r; @@ -384,7 +372,7 @@ static void test_items(void) IUnknown *unk; HANDLE file; BSTR bstr; - char cstr[64]; + WCHAR cstr[64]; BOOL ret; int i; @@ -475,16 +463,16 @@ static void test_items(void) switch (file_defs[i].type) { case DIRECTORY: - r = CreateDirectoryA(file_defs[i].name, NULL); + r = CreateDirectoryW(file_defs[i].name, NULL); ok(r, "CreateDirectory failed: %08lx\n", GetLastError()); - PathCombineA(cstr, file_defs[i].name, "foo.txt"); - file = CreateFileA(cstr, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + PathCombineW(cstr, file_defs[i].name, L"foo.txt"); + file = CreateFileW(cstr, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08lx\n", GetLastError()); CloseHandle(file); break; case EMPTY_FILE: - file = CreateFileA(file_defs[i].name, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + file = CreateFileW(file_defs[i].name, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08lx\n", GetLastError()); CloseHandle(file); break; @@ -644,7 +632,7 @@ static void test_items(void) "file_defs[%d]: expected %s, got %s\n", i, wine_dbgstr_w(path), wine_dbgstr_w(bstr)); SysFreeString(bstr); - bstr = a2bstr(file_defs[i].name); + bstr = SysAllocString(file_defs[i].name); r = FolderItem_get_Name(item, &name); ok(r == S_OK, "Failed to get item name, hr %#lx.\n", r); /* Returned display name does not have to strictly match file name, e.g. extension could be omitted. */ @@ -678,7 +666,7 @@ static void test_items(void) if (file_defs[i].type == DIRECTORY) { /* test that getting an item object for a file in a subdirectory succeeds */ - PathCombineA(cstr, file_defs[i].name, "foo.txt"); + PathCombineW(cstr, file_defs[i].name, L"foo.txt"); variant_set_string(&str_index2, cstr); item2 = NULL; r = FolderItems_Item(items, str_index2, &item2); @@ -688,13 +676,13 @@ static void test_items(void) VariantClear(&str_index2); /* delete the file in the subdirectory */ - ret = DeleteFileA(cstr); + ret = DeleteFileW(cstr); ok(ret, "file_defs[%d]: DeleteFile failed: %08lx\n", i, GetLastError()); /* test that getting an item object via a relative path fails */ - strcpy(cstr, file_defs[i].name); - strcat(cstr, "\\..\\"); - strcat(cstr, file_defs[i].name); + wcscpy(cstr, file_defs[i].name); + wcscat(cstr, L"\\..\\"); + wcscat(cstr, file_defs[i].name); variant_set_string(&str_index2, cstr); item2 = (FolderItem*)0xdeadbeef; r = FolderItems_Item(items, str_index2, &item2); @@ -703,12 +691,12 @@ static void test_items(void) VariantClear(&str_index2); /* remove the directory */ - ret = RemoveDirectoryA(file_defs[i].name); + ret = RemoveDirectoryW(file_defs[i].name); ok(ret, "file_defs[%d]: RemoveDirectory failed: %08lx\n", i, GetLastError()); } else { - ret = DeleteFileA(file_defs[i].name); + ret = DeleteFileW(file_defs[i].name); ok(ret, "file_defs[%d]: DeleteFile failed: %08lx\n", i, GetLastError()); }

1 0

Michael Stefaniuc : vbscript/tests: Avoid using a2bstr() in the vbscript.c helpers.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: c8a72b458c5f51300b542b8248b010ed4d3807e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8a72b458c5f51300b542b8248b010… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 19:38:29 2023 +0200 vbscript/tests: Avoid using a2bstr() in the vbscript.c helpers. --- dlls/vbscript/tests/vbscript.c | 86 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 42 deletions(-)

1 0

Michael Stefaniuc : vbscript/tests: Avoid using a2bstr() in the run.c helpers.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: a489b7ef307f724eb59c1a17f9a1ac42ab17724b URL: https://gitlab.winehq.org/wine/wine/-/commit/a489b7ef307f724eb59c1a17f9a1ac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 18:14:29 2023 +0200 vbscript/tests: Avoid using a2bstr() in the run.c helpers. --- dlls/vbscript/tests/run.c | 190 +++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 95 deletions(-)

1 0

Michael Stefaniuc : vbscript/tests: Avoid using a2bstr() for static strings.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 23e2eb398424b192161e3516ab22e559b30d7121 URL: https://gitlab.winehq.org/wine/wine/-/commit/23e2eb398424b192161e3516ab22e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 15:47:52 2023 +0200 vbscript/tests: Avoid using a2bstr() for static strings. --- dlls/vbscript/tests/run.c | 92 +++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-)

1 0

Michael Stefaniuc : vbscript/tests: Remove the last usage of a2bstr() in vbscript.c.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: a16cf63858480afa3844ecb7777b54d79bdf45da URL: https://gitlab.winehq.org/wine/wine/-/commit/a16cf63858480afa3844ecb7777b54… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 19:44:35 2023 +0200 vbscript/tests: Remove the last usage of a2bstr() in vbscript.c. --- dlls/vbscript/tests/vbscript.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 8281548c5b6..68157c9695b 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -109,18 +109,6 @@ DEFINE_EXPECT(testCall); DEFINE_GUID(CLSID_VBScript, 0xb54f3741, 0x5b07, 0x11cf, 0xa4,0xb0, 0x00,0xaa,0x00,0x4a,0x55,0xe8); DEFINE_GUID(CLSID_VBScriptRegExp, 0x3f4daca4, 0x160d, 0x11d2, 0xa8,0xe9, 0x00,0x10,0x4b,0x36,0x5c,0x9f); -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - #define test_state(s,ss) _test_state(__LINE__,s,ss) static void _test_state(unsigned line, IActiveScript *script, SCRIPTSTATE exstate) { @@ -2634,22 +2622,22 @@ static void test_RegExp_Replace(void) { static const struct { - const char *pattern; - const char *replace; - const char *source; - const char *result; + const WCHAR *pattern; + const WCHAR *replace; + const WCHAR *source; + const WCHAR *result; BOOL global; } test[] = { - { "abc", "", "123abc456", "123456", FALSE }, - { "abc", "dcba", "123abc456", "123dcba456", FALSE }, - { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello\rNew\fWorld\t!", FALSE }, - { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello New World !", TRUE }, + { L"abc", L"", L"123abc456", L"123456", FALSE }, + { L"abc", L"dcba", L"123abc456", L"123dcba456", FALSE }, + { L"[\r\n\t\f]+", L" ", L"\nHello\rNew\fWorld\t!", L" Hello\rNew\fWorld\t!", FALSE }, + { L"[\r\n\t\f]+", L" ", L"\nHello\rNew\fWorld\t!", L" Hello New World !", TRUE }, }; HRESULT hr; IRegExp2 *regexp; VARIANT var; - BSTR str, ret, result; + BSTR str, ret; int i; hr = CoCreateInstance(&CLSID_VBScriptRegExp, NULL, @@ -2667,19 +2655,18 @@ static void test_RegExp_Replace(void) hr = IRegExp2_put_Global(regexp, test[i].global ? VARIANT_TRUE : VARIANT_FALSE); ok(hr == S_OK, "got %#lx\n", hr); - str = a2bstr(test[i].pattern); + str = SysAllocString(test[i].pattern); hr = IRegExp2_put_Pattern(regexp, str); ok(hr == S_OK, "got %#lx\n", hr); SysFreeString(str); - str = a2bstr(test[i].source); + str = SysAllocString(test[i].source); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = a2bstr(test[i].replace); + V_BSTR(&var) = SysAllocString(test[i].replace); hr = IRegExp2_Replace(regexp, str, var, &ret); ok(hr == S_OK, "got %#lx\n", hr); - result = a2bstr(test[i].result); - ok(!wcscmp(ret, result), "got %s, expected %s\n", wine_dbgstr_w(ret), wine_dbgstr_w(result)); - SysFreeString(result); + ok(!wcscmp(ret, test[i].result), "got %s, expected %s\n", wine_dbgstr_w(ret), + wine_dbgstr_w(test[i].result)); SysFreeString(ret); SysFreeString(V_BSTR(&var)); SysFreeString(str);

1 0

Michael Stefaniuc : vbscript/tests: Remove the need for a2bstr() in createobj.c.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 2ca50c0817d9fa75dc3b8f7186297acbb38d6e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ca50c0817d9fa75dc3b8f7186297a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 15:59:31 2023 +0200 vbscript/tests: Remove the need for a2bstr() in createobj.c. --- dlls/vbscript/tests/createobj.c | 62 +++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 37 deletions(-)

1 0

Michael Skorokhodov : win32u: Add DriverVersion string for GPUs to registry.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 973ed2579186385a97fc51520de75d175cc738a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/973ed2579186385a97fc51520de75d… Author: Michael Skorokhodov <mykhailo.skorokhodov(a)globallogic.com> Date: Mon Jun 19 21:26:02 2023 +0300 win32u: Add DriverVersion string for GPUs to registry. Some applications (e.g. UE4) require the DriverVersion string in the registry. Signed-off-by: Mykhailo Skorokhodov <mykhailo.skorokhodov(a)globallogic.com> --- dlls/win32u/sysparams.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 233e5bb934b..fed309ff3d8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1230,6 +1230,8 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; + static const WCHAR driver_versionW[] = + {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; TRACE( "%s %04X %04X %08X %02X\n", debugstr_w(gpu->name), gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id ); @@ -1374,6 +1376,31 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) set_reg_value( hkey, chip_typeW, REG_BINARY, desc, size ); set_reg_value( hkey, dac_typeW, REG_BINARY, ramdacW, sizeof(ramdacW) ); + if (gpu->vendor_id && gpu->device_id) + { + /* The last seven digits are the driver number. */ + switch (gpu->vendor_id) + { + /* Intel */ + case 0x8086: + sprintf( buffer, "31.0.101.4576" ); + break; + /* AMD */ + case 0x1002: + sprintf( buffer, "31.0.14051.5006" ); + break; + /* Nvidia */ + case 0x10de: + sprintf( buffer, "31.0.15.3625" ); + break; + /* Default value for any other vendor. */ + default: + sprintf( buffer, "31.0.10.1000" ); + break; + } + set_reg_value( hkey, driver_versionW, REG_SZ, bufferW, asciiz_to_unicode( bufferW, buffer ) ); + } + NtClose( hkey ); link_device( ctx->gpuid, guid_devinterface_display_adapterW );

1 0

Jacek Caban : win32u: Move packed structures declaration from ntuser.h.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 99f0d3d790dec274f94ebb29e5714d066f13ea79 URL: https://gitlab.winehq.org/wine/wine/-/commit/99f0d3d790dec274f94ebb29e5714d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 31 16:00:45 2023 +0200 win32u: Move packed structures declaration from ntuser.h. --- dlls/win32u/message.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 163 -------------------------------------------------- 2 files changed, 163 insertions(+), 163 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6cf507f5bee..9ca3eab23b6 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -66,6 +66,169 @@ struct packed_hook_extra_info ULONGLONG lparam; }; +/* the various structures that can be sent in messages, in platform-independent layout */ +struct packed_CREATESTRUCTW +{ + ULONGLONG lpCreateParams; + ULONGLONG hInstance; + user_handle_t hMenu; + DWORD __pad1; + user_handle_t hwndParent; + DWORD __pad2; + INT cy; + INT cx; + INT y; + INT x; + LONG style; + ULONGLONG lpszName; + ULONGLONG lpszClass; + DWORD dwExStyle; + DWORD __pad3; +}; + +struct packed_DRAWITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + UINT itemID; + UINT itemAction; + UINT itemState; + user_handle_t hwndItem; + DWORD __pad1; + user_handle_t hDC; + DWORD __pad2; + RECT rcItem; + ULONGLONG itemData; +}; + +struct packed_MEASUREITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + UINT itemID; + UINT itemWidth; + UINT itemHeight; + ULONGLONG itemData; +}; + +struct packed_DELETEITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + UINT itemID; + user_handle_t hwndItem; + DWORD __pad; + ULONGLONG itemData; +}; + +struct packed_COMPAREITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + user_handle_t hwndItem; + DWORD __pad1; + UINT itemID1; + ULONGLONG itemData1; + UINT itemID2; + ULONGLONG itemData2; + DWORD dwLocaleId; + DWORD __pad2; +}; + +struct packed_WINDOWPOS +{ + UINT hwnd; + DWORD __pad1; + user_handle_t hwndInsertAfter; + DWORD __pad2; + INT x; + INT y; + INT cx; + INT cy; + UINT flags; + DWORD __pad3; +}; + +struct packed_COPYDATASTRUCT +{ + ULONGLONG dwData; + DWORD cbData; + ULONGLONG lpData; +}; + +struct packed_HELPINFO +{ + UINT cbSize; + INT iContextType; + INT iCtrlId; + user_handle_t hItemHandle; + DWORD __pad; + ULONGLONG dwContextId; + POINT MousePos; +}; + +struct packed_NCCALCSIZE_PARAMS +{ + RECT rgrc[3]; + ULONGLONG __pad1; + user_handle_t hwnd; + DWORD __pad2; + user_handle_t hwndInsertAfter; + DWORD __pad3; + INT x; + INT y; + INT cx; + INT cy; + UINT flags; + DWORD __pad4; +}; + +struct packed_MSG +{ + user_handle_t hwnd; + DWORD __pad1; + UINT message; + ULONGLONG wParam; + ULONGLONG lParam; + DWORD time; + POINT pt; + DWORD __pad2; +}; + +struct packed_MDINEXTMENU +{ + user_handle_t hmenuIn; + DWORD __pad1; + user_handle_t hmenuNext; + DWORD __pad2; + user_handle_t hwndNext; + DWORD __pad3; +}; + +struct packed_MDICREATESTRUCTW +{ + ULONGLONG szClass; + ULONGLONG szTitle; + ULONGLONG hOwner; + INT x; + INT y; + INT cx; + INT cy; + DWORD style; + ULONGLONG lParam; +}; + +struct packed_COMBOBOXINFO +{ + DWORD cbSize; + RECT rcItem; + RECT rcButton; + DWORD stateButton; + ULONGLONG hwndCombo; + ULONGLONG hwndItem; + ULONGLONG hwndList; +}; + /* the structures are unpacked on top of the packed ones, so make sure they fit */ C_ASSERT( sizeof(struct packed_CREATESTRUCTW) >= sizeof(CREATESTRUCTW) ); C_ASSERT( sizeof(struct packed_DRAWITEMSTRUCT) >= sizeof(DRAWITEMSTRUCT) ); diff --git a/include/ntuser.h b/include/ntuser.h index 7d679e9ede1..9077ebbb589 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -515,169 +515,6 @@ struct ime_driver_call_params #define WM_SYSTIMER 0x0118 -/* the various structures that can be sent in messages, in platform-independent layout */ -struct packed_CREATESTRUCTW -{ - ULONGLONG lpCreateParams; - ULONGLONG hInstance; - UINT hMenu; - DWORD __pad1; - UINT hwndParent; - DWORD __pad2; - INT cy; - INT cx; - INT y; - INT x; - LONG style; - ULONGLONG lpszName; - ULONGLONG lpszClass; - DWORD dwExStyle; - DWORD __pad3; -}; - -struct packed_DRAWITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT itemID; - UINT itemAction; - UINT itemState; - UINT hwndItem; - DWORD __pad1; - UINT hDC; - DWORD __pad2; - RECT rcItem; - ULONGLONG itemData; -}; - -struct packed_MEASUREITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT itemID; - UINT itemWidth; - UINT itemHeight; - ULONGLONG itemData; -}; - -struct packed_DELETEITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT itemID; - UINT hwndItem; - DWORD __pad; - ULONGLONG itemData; -}; - -struct packed_COMPAREITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT hwndItem; - DWORD __pad1; - UINT itemID1; - ULONGLONG itemData1; - UINT itemID2; - ULONGLONG itemData2; - DWORD dwLocaleId; - DWORD __pad2; -}; - -struct packed_WINDOWPOS -{ - UINT hwnd; - DWORD __pad1; - UINT hwndInsertAfter; - DWORD __pad2; - INT x; - INT y; - INT cx; - INT cy; - UINT flags; - DWORD __pad3; -}; - -struct packed_COPYDATASTRUCT -{ - ULONGLONG dwData; - DWORD cbData; - ULONGLONG lpData; -}; - -struct packed_HELPINFO -{ - UINT cbSize; - INT iContextType; - INT iCtrlId; - UINT hItemHandle; - DWORD __pad; - ULONGLONG dwContextId; - POINT MousePos; -}; - -struct packed_NCCALCSIZE_PARAMS -{ - RECT rgrc[3]; - ULONGLONG __pad1; - UINT hwnd; - DWORD __pad2; - UINT hwndInsertAfter; - DWORD __pad3; - INT x; - INT y; - INT cx; - INT cy; - UINT flags; - DWORD __pad4; -}; - -struct packed_MSG -{ - UINT hwnd; - DWORD __pad1; - UINT message; - ULONGLONG wParam; - ULONGLONG lParam; - DWORD time; - POINT pt; - DWORD __pad2; -}; - -struct packed_MDINEXTMENU -{ - UINT hmenuIn; - DWORD __pad1; - UINT hmenuNext; - DWORD __pad2; - UINT hwndNext; - DWORD __pad3; -}; - -struct packed_MDICREATESTRUCTW -{ - ULONGLONG szClass; - ULONGLONG szTitle; - ULONGLONG hOwner; - INT x; - INT y; - INT cx; - INT cy; - DWORD style; - ULONGLONG lParam; -}; - -struct packed_COMBOBOXINFO -{ - DWORD cbSize; - RECT rcItem; - RECT rcButton; - DWORD stateButton; - ULONGLONG hwndCombo; - ULONGLONG hwndItem; - ULONGLONG hwndList; -}; - HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ); BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd );

1 0