January 2024 - Wine-Commits

Piotr Caban : winex11.drv: Fix xim_set_focus no IC condition check.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: dd44e2e6d6464433beb794b3b8556c5e53205f5b URL: https://gitlab.winehq.org/wine/wine/-/commit/dd44e2e6d6464433beb794b3b8556c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 22 18:08:55 2024 +0100 winex11.drv: Fix xim_set_focus no IC condition check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56236 --- dlls/winex11.drv/xim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d304dbb26fa..c6a93eb5e16 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -484,7 +484,7 @@ XIC X11DRV_get_ic( HWND hwnd ) void xim_set_focus( HWND hwnd, BOOL focus ) { XIC xic; - if ((xic = X11DRV_get_ic( hwnd ))) return; + if (!(xic = X11DRV_get_ic( hwnd ))) return; if (focus) XSetICFocus( xic ); else XUnsetICFocus( xic ); }

1 0

Rémi Bernon : setupapi: Don't clobber the original filename if .inf is found.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: 35ac0e7ac0511ef766f3f35220869565ce07906e URL: https://gitlab.winehq.org/wine/wine/-/commit/35ac0e7ac0511ef766f3f352208695… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 22 18:46:40 2024 +0100 setupapi: Don't clobber the original filename if .inf is found. --- dlls/setupapi/misc.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 701801f7380..b1083fca665 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1068,23 +1068,20 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, if (!(ret = CopyFileW( source, target, TRUE ))) return ret; + wcscpy(pnf_path, target); + PathRemoveExtensionW(pnf_path); + PathAddExtensionW(pnf_path, L".pnf"); + if ((pnf_file = _wfopen(pnf_path, L"w"))) + { + fputws(PNF_HEADER, pnf_file); + fputws(source, pnf_file); + fclose(pnf_file); + } + done: if (style & SP_COPY_DELETESOURCE) DeleteFileW( source ); - if (ret) - { - wcscpy(pnf_path, target); - PathRemoveExtensionW(pnf_path); - PathAddExtensionW(pnf_path, L".pnf"); - if ((pnf_file = _wfopen(pnf_path, L"w"))) - { - fputws(PNF_HEADER, pnf_file); - fputws(source, pnf_file); - fclose(pnf_file); - } - } - size = lstrlenW( target ) + 1; if (dest) {

1 0

Dmitry Timoshkov : oleaut32: Factor out stream creation from OleLoadPicturePath.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: 176fa9ad27ffbfcafa937cc84733841aa1ae7fbf URL: https://gitlab.winehq.org/wine/wine/-/commit/176fa9ad27ffbfcafa937cc8473384… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Mar 27 16:26:47 2016 +0800 oleaut32: Factor out stream creation from OleLoadPicturePath. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 75 +++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index f6bf36c414c..33d2a12f88b 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2306,6 +2306,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) return E_NOTIMPL; } +static HRESULT create_stream(const WCHAR *filename, IStream **stream) +{ + HANDLE hFile; + DWORD dwFileSize; + HGLOBAL hGlobal = NULL; + DWORD dwBytesRead; + HRESULT hr = S_OK; + + hFile = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + dwFileSize = GetFileSize(hFile, NULL); + if (dwFileSize != INVALID_FILE_SIZE) + { + hGlobal = GlobalAlloc(GMEM_FIXED, dwFileSize); + if (!hGlobal) + hr = E_OUTOFMEMORY; + else + { + if (!ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL)) + { + GlobalFree(hGlobal); + hr = HRESULT_FROM_WIN32(GetLastError()); + } + } + } + + CloseHandle(hFile); + + if (FAILED(hr)) return hr; + + hr = CreateStreamOnHGlobal(hGlobal, TRUE, stream); + if (FAILED(hr)) + GlobalFree(hGlobal); + + return hr; +} + /*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ @@ -2322,12 +2361,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ) { - HANDLE hFile; - DWORD dwFileSize; - HGLOBAL hGlobal = NULL; - DWORD dwBytesRead; IStream *stream; - BOOL bRead; HRESULT hRes; WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; @@ -2355,36 +2389,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, /* Handle candidate DOS paths separately. */ if (file_candidate[1] == ':') { - hFile = CreateFileW(file_candidate, GENERIC_READ, 0, NULL, OPEN_EXISTING, - 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return INET_E_RESOURCE_NOT_FOUND; - - dwFileSize = GetFileSize(hFile, NULL); - if (dwFileSize != INVALID_FILE_SIZE ) - { - hGlobal = GlobalAlloc(GMEM_FIXED,dwFileSize); - if ( hGlobal) - { - bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL) && dwBytesRead == dwFileSize; - if (!bRead) - { - GlobalFree(hGlobal); - hGlobal = 0; - } - } - } - CloseHandle(hFile); - - if (!hGlobal) + hRes = create_stream(file_candidate, &stream); + if (FAILED(hRes)) return INET_E_RESOURCE_NOT_FOUND; - - hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); - if (FAILED(hRes)) - { - GlobalFree(hGlobal); - return hRes; - } } else { IMoniker *pmnk; IBindCtx *pbc;

1 0

Dmitry Timoshkov : oleaut32: Implement OleLoadPictureFile.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: a9cc6f0218594d72fdd7406f7c72345feb7cb8e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9cc6f0218594d72fdd7406f7c7234… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Mar 27 16:28:33 2016 +0800 oleaut32: Implement OleLoadPictureFile. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 36 ++++++++++++++++++++------- dlls/oleaut32/tests/olepicture.c | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 33d2a12f88b..36de9c355f3 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2297,15 +2297,6 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return hr; } -/*********************************************************************** - * OleLoadPictureFile (OLEAUT32.422) - */ -HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) -{ - FIXME("(%s %p): stub\n", wine_dbgstr_variant(&file), picture); - return E_NOTIMPL; -} - static HRESULT create_stream(const WCHAR *filename, IStream **stream) { HANDLE hFile; @@ -2345,6 +2336,33 @@ static HRESULT create_stream(const WCHAR *filename, IStream **stream) return hr; } +/*********************************************************************** + * OleLoadPictureFile (OLEAUT32.422) + */ +HRESULT WINAPI OleLoadPictureFile(VARIANT filename, IDispatch **picture) +{ + IStream *stream; + HRESULT hr; + + TRACE("(%s,%p)\n", wine_dbgstr_variant(&filename), picture); + + if (V_VT(&filename) != VT_BSTR) + return CTL_E_FILENOTFOUND; + + hr = create_stream(V_BSTR(&filename), &stream); + if (hr != S_OK) + { + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + return CTL_E_FILENOTFOUND; + + return CTL_E_PATHFILEACCESSERROR; + } + + hr = OleLoadPicture(stream, 0, FALSE, &IID_IDispatch, (void **)picture); + IStream_Release(stream); + return hr; +} + /*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 210fea4d4c1..c6ab4ed0a19 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -948,6 +948,7 @@ static void test_OleLoadPicturePath(void) HANDLE file; DWORD size; WCHAR *ptr; + VARIANT var; const struct { @@ -1014,6 +1015,14 @@ static void test_OleLoadPicturePath(void) if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW + 8); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == S_OK, "OleLoadPictureFile error %#lx\n", hres); + IPicture_Release(pic); + VariantClear(&var); + /* Try a DOS path with tacked on "file:". */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || @@ -1022,6 +1031,13 @@ static void test_OleLoadPicturePath(void) if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#lx\n", hres); + VariantClear(&var); + DeleteFileA(temp_file); /* Try with a nonexistent file. */ @@ -1031,12 +1047,26 @@ static void test_OleLoadPicturePath(void) broken(hres == E_FAIL), /*Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08lx\n", hres); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW + 8); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_FILENOTFOUND, "wrong error %#lx\n", hres); + VariantClear(&var); + hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08lx\n", hres); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#lx\n", hres); + VariantClear(&var); + file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); WriteFile(file, bmpimage, sizeof(bmpimage), &size, NULL); @@ -1058,6 +1088,13 @@ static void test_OleLoadPicturePath(void) if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#lx\n", hres); + VariantClear(&var); + DeleteFileA(temp_file); /* Try with a nonexistent file. */ @@ -1066,6 +1103,22 @@ static void test_OleLoadPicturePath(void) broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08lx\n", hres); + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#lx\n", hres); + VariantClear(&var); + + VariantInit(&var); + V_VT(&var) = VT_INT; + V_INT(&var) = 762; + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_FILENOTFOUND, "wrong error %#lx\n", hres); + + if (0) /* crashes under Windows */ + hres = OleLoadPictureFile(var, NULL); } static void test_himetric(void)

1 0

Rémi Bernon : win32u: Avoid truncating ToUnicodeEx result if there's room.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: a823177ccbd241c231034fdd79a2088440923758 URL: https://gitlab.winehq.org/wine/wine/-/commit/a823177ccbd241c231034fdd79a208… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 10:03:09 2024 +0100 win32u: Avoid truncating ToUnicodeEx result if there's room. --- dlls/win32u/input.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 3ee46f0bfcf..aaaac12ce36 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1187,27 +1187,25 @@ INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ) { const KBDTABLES *kbd_tables; - WCHAR buffer[2] = {0}; INT len; TRACE_(keyboard)( "virt %#x, scan %#x, state %p, str %p, size %d, flags %#x, layout %p.\n", virt, scan, state, str, size, flags, layout ); - if (!state) return 0; + if (!state || !size) return 0; if ((len = user_driver->pToUnicodeEx( virt, scan, state, str, size, flags, layout )) >= -1) return len; if (!(kbd_tables = user_driver->pKbdLayerDescriptor( layout ))) kbd_tables = &kbdus_tables; - if (scan & 0x8000) buffer[0] = 0; /* key up */ - else buffer[0] = kbd_tables_vkey_to_wchar( kbd_tables, virt, state ); + if (scan & 0x8000) str[0] = 0; /* key up */ + else str[0] = kbd_tables_vkey_to_wchar( kbd_tables, virt, state ); + if (size > 1) str[1] = 0; - if (buffer[0] != WCH_NONE) len = 1; - else buffer[0] = len = 0; - - lstrcpynW( str, buffer, size ); + if (str[0] != WCH_NONE) len = 1; + else str[0] = len = 0; if (kbd_tables != &kbdus_tables) user_driver->pReleaseKbdTables( kbd_tables ); - TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(str) ); + TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_wn(str, len) ); return len; }

1 0

Dmitry Timoshkov : oleaut32: Do not reimplement OleLoadPicture in OleLoadPicturePath.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: d451842d16a91680764e38c35b965a077387ddf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d451842d16a91680764e38c35b965a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Mar 27 12:30:00 2016 +0800 oleaut32: Do not reimplement OleLoadPicture in OleLoadPicturePath. punkCaller is ignored by StdPicture ClassFactory implementation anyway. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index b2ad6cb473a..f6bf36c414c 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2322,16 +2322,13 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ) { - IPicture *ipicture; HANDLE hFile; DWORD dwFileSize; HGLOBAL hGlobal = NULL; DWORD dwBytesRead; IStream *stream; BOOL bRead; - IPersistStream *pStream; HRESULT hRes; - HRESULT init_res; WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; @@ -2407,32 +2404,10 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, return hRes; } - init_res = CoInitialize(NULL); - - hRes = CoCreateInstance(&CLSID_StdPicture, punkCaller, CLSCTX_INPROC_SERVER, - &IID_IPicture, (LPVOID*)&ipicture); - if (SUCCEEDED(hRes)) { - hRes = IPicture_QueryInterface(ipicture, &IID_IPersistStream, (LPVOID*)&pStream); - - if (SUCCEEDED(hRes)) { - hRes = IPersistStream_Load(pStream, stream); - - if (SUCCEEDED(hRes)) { - hRes = IPicture_QueryInterface(ipicture, riid, ppvRet); - - if (FAILED(hRes)) - ERR("Failed to get interface %s from IPicture.\n", debugstr_guid(riid)); - } - IPersistStream_Release(pStream); - } - IPicture_Release(ipicture); - } + hRes = OleLoadPicture(stream, 0, FALSE, riid, ppvRet); IStream_Release(stream); - if (SUCCEEDED(init_res)) - CoUninitialize(); - return hRes; }

1 0

Rémi Bernon : user32/tests: Test that WH_KEYBOARD_LL are blocking SendInput.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: d5cfbf5da43388fb3a824b51f184a1293a77da47 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5cfbf5da43388fb3a824b51f184a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 15:30:17 2024 +0100 user32/tests: Test that WH_KEYBOARD_LL are blocking SendInput. --- dlls/user32/tests/input.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index a05b6a441c2..d48440a20be 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -5178,6 +5178,43 @@ static void test_ClipCursor( char **argv ) if (!EqualRect( &rect, &virtual_rect )) ok_ret( 1, ClipCursor( NULL ) ); } +static HANDLE ll_keyboard_event; + +static LRESULT CALLBACK ll_keyboard_event_wait(int code, WPARAM wparam, LPARAM lparam) +{ + if (code == HC_ACTION) + { + ok_ret( WAIT_TIMEOUT, WaitForSingleObject( ll_keyboard_event, 100 ) ); + return -123; + } + + return CallNextHookEx( 0, code, wparam, lparam ); +} + +static void test_keyboard_ll_hook_blocking(void) +{ + INPUT input = {.type = INPUT_KEYBOARD, .ki = {.wVk = VK_RETURN}}; + HHOOK hook; + HWND hwnd; + + hwnd = CreateWindowW( L"static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL ); + ok_ne( NULL, hwnd, HWND, "%p" ); + wait_messages( 100, FALSE ); + hook = SetWindowsHookExW( WH_KEYBOARD_LL, ll_keyboard_event_wait, GetModuleHandleW( NULL ), 0 ); + ok_ne( NULL, hook, HHOOK, "%p" ); + ll_keyboard_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok_ne( NULL, ll_keyboard_event, HANDLE, "%p" ); + + ok_ret( 1, SendInput( 1, &input, sizeof(input) ) ); + input.ki.dwFlags = KEYEVENTF_KEYUP; + ok_ret( 1, SendInput( 1, &input, sizeof(input) ) ); + ok_ret( 1, SetEvent( ll_keyboard_event ) ); + + ok_ret( 1, CloseHandle( ll_keyboard_event ) ); + ok_ret( 1, UnhookWindowsHookEx( hook ) ); + ok_ret( 1, DestroyWindow( hwnd ) ); +} + /* run the tests in a separate desktop to avoid interaction with other * tests, current desktop state, or user actions. */ static void test_input_desktop( char **argv ) @@ -5194,6 +5231,8 @@ static void test_input_desktop( char **argv ) test_SendInput( 'F', wch ); test_SendInput_keyboard_messages( 'F', scan, wch, wch_shift, '\x06' ); + test_keyboard_ll_hook_blocking(); + ok_ret( 1, SetCursorPos( pos.x, pos.y ) ); }

1 0

Rémi Bernon : user32/tests: Move KEYEVENTF_UNICODE to test_SendInput_keyboard_messages.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: ee74d202cd11698222da170facdc97dce56ab3a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee74d202cd11698222da170facdc97… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 12:14:09 2024 +0100 user32/tests: Move KEYEVENTF_UNICODE to test_SendInput_keyboard_messages. --- dlls/user32/tests/input.c | 362 +++++++++------------------------------------- 1 file changed, 69 insertions(+), 293 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Make the garbage collector thread-wide rather than per-ctx.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: bc45b43a4984d9df7117f841506524ad7cc0566e URL: https://gitlab.winehq.org/wine/wine/-/commit/bc45b43a4984d9df7117f841506524… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 12 19:57:37 2023 +0200 jscript: Make the garbage collector thread-wide rather than per-ctx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 31 ++++++++++++++++--------------- dlls/jscript/jscript.c | 12 +++--------- dlls/jscript/jscript.h | 12 +++++++----- dlls/jscript/jscript_main.c | 9 +++++++++ dlls/jscript/set.c | 6 +++--- 5 files changed, 38 insertions(+), 32 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Allow garbage collection between different jscript contexts.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

Module: wine Branch: master Commit: 64009b9c9f3a858ee36da5ec7ae952816f92d878 URL: https://gitlab.winehq.org/wine/wine/-/commit/64009b9c9f3a858ee36da5ec7ae952… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 12 19:57:37 2023 +0200 jscript: Allow garbage collection between different jscript contexts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 18 ++++++------ dlls/jscript/set.c | 5 ---- dlls/jscript/tests/run.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 88c63811386..57882bf499e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -820,13 +820,13 @@ HRESULT gc_run(script_ctx_t *ctx) for(prop = obj->props, props_end = prop + obj->prop_cnt; prop < props_end; prop++) { switch(prop->type) { case PROP_JSVAL: - if(is_object_instance(prop->u.val) && (link = to_jsdisp(get_object(prop->u.val))) && link->ctx == ctx) + if(is_object_instance(prop->u.val) && (link = to_jsdisp(get_object(prop->u.val)))) link->ref--; break; case PROP_ACCESSOR: - if(prop->u.accessor.getter && prop->u.accessor.getter->ctx == ctx) + if(prop->u.accessor.getter) prop->u.accessor.getter->ref--; - if(prop->u.accessor.setter && prop->u.accessor.setter->ctx == ctx) + if(prop->u.accessor.setter) prop->u.accessor.setter->ref--; break; default: @@ -834,7 +834,7 @@ HRESULT gc_run(script_ctx_t *ctx) } } - if(obj->prototype && obj->prototype->ctx == ctx) + if(obj->prototype) obj->prototype->ref--; if(obj->builtin_info->gc_traverse) obj->builtin_info->gc_traverse(&gc_ctx, GC_TRAVERSE_SPECULATIVELY, obj); @@ -870,12 +870,12 @@ HRESULT gc_run(script_ctx_t *ctx) default: continue; } - if(link && link->gc_marked && link->ctx == ctx) { + if(link && link->gc_marked) { hres = gc_stack_push(&gc_ctx, link); if(FAILED(hres)) break; } - if(link2 && link2->gc_marked && link2->ctx == ctx) { + if(link2 && link2->gc_marked) { hres = gc_stack_push(&gc_ctx, link2); if(FAILED(hres)) break; @@ -885,7 +885,7 @@ HRESULT gc_run(script_ctx_t *ctx) if(FAILED(hres)) break; - if(obj2->prototype && obj2->prototype->gc_marked && obj2->prototype->ctx == ctx) { + if(obj2->prototype && obj2->prototype->gc_marked) { hres = gc_stack_push(&gc_ctx, obj2->prototype); if(FAILED(hres)) break; @@ -974,8 +974,6 @@ HRESULT gc_process_linked_obj(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsd return S_OK; } - if(link->ctx != obj->ctx) - return S_OK; if(op == GC_TRAVERSE_SPECULATIVELY) link->ref--; else if(link->gc_marked) @@ -994,7 +992,7 @@ HRESULT gc_process_linked_val(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsd return S_OK; } - if(!is_object_instance(*link) || !(jsdisp = to_jsdisp(get_object(*link))) || jsdisp->ctx != obj->ctx) + if(!is_object_instance(*link) || !(jsdisp = to_jsdisp(get_object(*link)))) return S_OK; if(op == GC_TRAVERSE_SPECULATIVELY) jsdisp->ref--; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index bf2045c7c41..7e49e31a5d5 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -745,11 +745,6 @@ static HRESULT WeakMap_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne if(!key) return JS_E_KEY_NOT_OBJECT; - if(key->ctx != ctx) { - FIXME("different ctx not supported\n"); - return JS_E_KEY_NOT_OBJECT; - } - if((entry = get_weakmap_entry(weakmap, key))) { jsval_t val; hres = jsval_copy(value, &val); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 509f01e3211..db1e95dc844 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -3596,9 +3596,14 @@ static void test_destructors(void) "a.ref = { 'ref': Math, 'a': a }; b.ref = Math.ref;\n" "a.self = a; b.self = b; c.self = c;\n" "})(), true"; + static DISPID propput_dispid = DISPID_PROPERTYPUT; + IActiveScript *script, *script2; + IDispatchEx *dispex, *dispex2; IActiveScriptParse *parser; - IActiveScript *script; + DISPPARAMS dp = { 0 }; VARIANT v; + DISPID id; + BSTR str; HRESULT hres; V_VT(&v) = VT_EMPTY; @@ -3643,6 +3648,74 @@ static void test_destructors(void) CHECK_CALLED(testdestrobj); IActiveScript_Release(script); + + /* Create a cyclic ref across two jscript engines */ + V_VT(&v) = VT_EMPTY; + hres = parse_script_expr(cyclic_refs, &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08lx\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IActiveScriptParse_ParseScriptText(parser, L"Math.ref", NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &v, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(v) = NULL\n"); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = parse_script_expr(L"new Object()", &v, &script2); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(v) = NULL\n"); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex2); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); + VariantClear(&v); + + dp.cArgs = dp.cNamedArgs = 1; + dp.rgdispidNamedArgs = &propput_dispid; + dp.rgvarg = &v; + + str = SysAllocString(L"diff_ctx"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameEnsure, &id); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + SysFreeString(str); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)dispex2; + hres = IDispatchEx_Invoke(dispex, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + + str = SysAllocString(L"ref"); + hres = IDispatchEx_GetDispID(dispex2, str, fdexNameEnsure, &id); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + SysFreeString(str); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)dispex; + hres = IDispatchEx_Invoke(dispex2, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + + IDispatchEx_Release(dispex2); + IDispatchEx_Release(dispex); + + SET_EXPECT(testdestrobj); + V_VT(&v) = VT_EMPTY; + hres = IActiveScriptParse_ParseScriptText(parser, L"Math.ref = undefined, CollectGarbage(), true", + NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &v, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + IActiveScriptParse_Release(parser); + CHECK_CALLED(testdestrobj); + + IActiveScript_Release(script2); + IActiveScript_Release(script); } static void test_eval(void)

1 0