January 2024 - Wine-commits

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

22 Jan '24

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 22 Jan '24

22 Jan '24

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

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

22 Jan '24

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

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

22 Jan '24

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

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

22 Jan '24

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

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

22 Jan '24

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

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

22 Jan '24

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 22 Jan '24

22 Jan '24

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

Alexandre Julliard : ntdll: Use a .seh handler for KiUserCallbackDispatcher exceptions.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 78c2b7dfe2f2d5d76400564be547fd8287d62d67 URL: https://gitlab.winehq.org/wine/wine/-/commit/78c2b7dfe2f2d5d76400564be547fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 11:35:47 2024 +0100 ntdll: Use a .seh handler for KiUserCallbackDispatcher exceptions. --- dlls/ntdll/exception.c | 21 +++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 15 ++++++++++++--- dlls/ntdll/signal_arm64.c | 14 +++++++++----- dlls/ntdll/signal_arm64ec.c | 14 +++++++++----- dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 6 files changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 98733045e17..69f061768bd 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -185,6 +185,26 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) } +#if defined(__WINE_PE_BUILD) && !defined(__i386__) + +/******************************************************************* + * user_callback_handler + * + * Exception handler for KiUserCallbackDispatcher. + */ +EXCEPTION_DISPOSITION WINAPI user_callback_handler( EXCEPTION_RECORD *record, void *frame, + CONTEXT *context, void *dispatch ) +{ + if (!(record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + ERR( "ignoring exception %lx\n", record->ExceptionCode ); + RtlUnwind( frame, KiUserCallbackDispatcherReturn, record, ULongToPtr(record->ExceptionCode) ); + } + return ExceptionContinueSearch; +} + +#else + /******************************************************************* * dispatch_user_callback * @@ -208,6 +228,7 @@ NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ) return status; } +#endif /******************************************************************* * raise_status diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1512bc17132..da49c14e682 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -50,6 +50,8 @@ extern UINT_PTR page_size; /* exceptions */ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ); extern NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ); +extern EXCEPTION_DISPOSITION WINAPI user_callback_handler( EXCEPTION_RECORD *record, void *frame, + CONTEXT *context, void *dispatch ); extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ); extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ); diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index ccb3f10b9f5..78db61fc764 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -585,10 +585,19 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, __ASM_EHABI(".save {sp, pc}\n\t") __ASM_EHABI(".save {lr}\n\t") __ASM_EHABI(".pad #0x0c\n\t") - "ldr r0, [sp]\n\t" /* args */ - "ldr r1, [sp, #0x04]\n\t" /* len */ - "ldr r2, [sp, #0x08]\n\t" /* id */ + "ldr r0, [sp]\n\t" /* args */ + "ldr r1, [sp, #0x04]\n\t" /* len */ + "ldr r2, [sp, #0x08]\n\t" /* id */ +#ifdef __WINE_PE_BUILD + "mrc p15, 0, r3, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "ldr r3, [r3, 0x30]\n\t" /* peb */ + "ldr r3, [r3, 0x2c]\n\t" /* peb->KernelCallbackTable */ + "ldr ip, [r3, r2, lsl #3]\n\t" + "blx ip\n\t" + ".seh_handler " __ASM_NAME("user_callback_handler") ", %except\n\t" +#else "bl " __ASM_NAME("dispatch_user_callback") "\n\t" +#endif ".globl " __ASM_NAME("KiUserCallbackDispatcherReturn") "\n" __ASM_NAME("KiUserCallbackDispatcherReturn") ":\n\t" "mov r2, r0\n\t" /* status */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8a59f9050b1..2d150528610 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -606,15 +606,19 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, * KiUserCallbackDispatcher (NTDLL.@) */ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, - __ASM_SEH(".seh_pushframe\n\t") + ".seh_pushframe\n\t" "nop\n\t" - __ASM_SEH(".seh_stackalloc 0x20\n\t") + ".seh_stackalloc 0x20\n\t" "nop\n\t" - __ASM_SEH(".seh_save_reg lr, 0x18\n\t") - __ASM_SEH(".seh_endprologue\n\t") + ".seh_save_reg lr, 0x18\n\t" + ".seh_endprologue\n\t" + ".seh_handler " __ASM_NAME("user_callback_handler") ", @except\n\t" "ldr x0, [sp]\n\t" /* args */ "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ - "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + "ldr x3, [x18, 0x60]\n\t" /* peb */ + "ldr x3, [x3, 0x58]\n\t" /* peb->KernelCallbackTable */ + "ldr x15, [x3, x2, lsl #3]\n\t" + "blr x15\n\t" ".globl " __ASM_NAME("KiUserCallbackDispatcherReturn") "\n" __ASM_NAME("KiUserCallbackDispatcherReturn") ":\n\t" "mov x2, x0\n\t" /* status */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index fb6654f4340..a54a5eeaceb 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1717,15 +1717,19 @@ __ASM_GLOBAL_FUNC( "#KiUserApcDispatcher", * KiUserCallbackDispatcher (NTDLL.@) */ __ASM_GLOBAL_FUNC( "#KiUserCallbackDispatcher", - __ASM_SEH(".seh_pushframe\n\t") + ".seh_pushframe\n\t" "nop\n\t" - __ASM_SEH(".seh_stackalloc 0x20\n\t") + ".seh_stackalloc 0x20\n\t" "nop\n\t" - __ASM_SEH(".seh_save_reg lr, 0x18\n\t") - __ASM_SEH(".seh_endprologue\n\t") + ".seh_save_reg lr, 0x18\n\t" + ".seh_endprologue\n\t" + ".seh_handler " __ASM_NAME("user_callback_handler") ", @except\n\t" "ldr x0, [sp]\n\t" /* args */ "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ - "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + "ldr x3, [x18, 0x60]\n\t" /* peb */ + "ldr x3, [x3, 0x58]\n\t" /* peb->KernelCallbackTable */ + "ldr x15, [x3, x2, lsl #3]\n\t" + "blr x15\n\t" ".globl \"#KiUserCallbackDispatcherReturn\"\n" "\"#KiUserCallbackDispatcherReturn\":\n\t" "mov x2, x0\n\t" /* status */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c56552a74a7..b253c0b4f17 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -702,7 +702,17 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, "movq 0x20(%rsp),%rcx\n\t" /* args */ "movl 0x28(%rsp),%edx\n\t" /* len */ "movl 0x2c(%rsp),%r8d\n\t" /* id */ +#ifdef __WINE_PE_BUILD + "movq %gs:0x30,%rax\n\t" /* NtCurrentTeb() */ + "movq 0x60(%rax),%rax\n\t" /* peb */ + "movq 0x58(%rax),%rax\n\t" /* peb->KernelCallbackTable */ + "call *(%rax,%r8,8)\n\t" /* KernelCallbackTable[id] */ + ".seh_handler " __ASM_NAME("user_callback_handler") ", @except\n\t" + ".globl " __ASM_NAME("KiUserCallbackDispatcherReturn") "\n" + __ASM_NAME("KiUserCallbackDispatcherReturn") ":\n\t" +#else "call " __ASM_NAME("dispatch_user_callback") "\n\t" +#endif "xorq %rcx,%rcx\n\t" /* ret_ptr */ "xorl %edx,%edx\n\t" /* ret_len */ "movl %eax,%r8d\n\t" /* status */

1 0

Fabian Maurer : include: Add Windows.UI.ViewManagement.InputPane definitions.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 5de5ae4eb112cceb3a5deeb563b686497dd19fe7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5de5ae4eb112cceb3a5deeb563b686… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 2 05:47:00 2023 +0100 include: Add Windows.UI.ViewManagement.InputPane definitions. --- include/Makefile.in | 1 + include/inputpaneinterop.idl | 27 +++++++++ include/windows.ui.viewmanagement.idl | 100 ++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index bd72fe86975..f70aeb9414b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -375,6 +375,7 @@ SOURCES = \ inaddr.h \ indexsrv.idl \ initguid.h \ + inputpaneinterop.idl \ inputscope.idl \ inseng.idl \ inspectable.idl \ diff --git a/include/inputpaneinterop.idl b/include/inputpaneinterop.idl new file mode 100644 index 00000000000..bd327c66cd4 --- /dev/null +++ b/include/inputpaneinterop.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2023 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "inspectable.idl"; + +[ + uuid(75cf2c57-9195-4931-8332-f0b409e916af) +] +interface IInputPaneInterop : IInspectable +{ + HRESULT GetForWindow([in] HWND window, [in] REFIID riid, [out, retval, iid_is(riid)] void **inputpane); +} diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl index b98d34ff685..1076d287183 100644 --- a/include/windows.ui.viewmanagement.idl +++ b/include/windows.ui.viewmanagement.idl @@ -45,10 +45,20 @@ namespace Windows.UI.ViewManagement interface IUISettings5; interface IUISettings6; + interface IInputPane; + interface IInputPane2; + interface IInputPaneControl; + interface IInputPaneVisibilityEventArgs; + interface IInputPaneStatics; + interface IInputPaneStatics2; + runtimeclass UISettings; + runtimeclass InputPane; + runtimeclass InputPaneVisibilityEventArgs; declare { interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *>; + interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.InputPane*, Windows.UI.ViewManagement.InputPaneVisibilityEventArgs*>; } [ @@ -171,6 +181,74 @@ namespace Windows.UI.ViewManagement [eventremove] HRESULT ColorValuesChanged([in] EventRegistrationToken cookie); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.InputPane), + uuid(640ada70-06f3-4c87-a678-9829c9127c28) + ] + interface IInputPane : IInspectable + { + [eventadd] HRESULT Showing([in] Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.InputPane*, Windows.UI.ViewManagement.InputPaneVisibilityEventArgs*> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Showing([in] EventRegistrationToken token); + [eventadd] HRESULT Hiding([in] Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.InputPane*, Windows.UI.ViewManagement.InputPaneVisibilityEventArgs*> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Hiding([in] EventRegistrationToken token); + [propget] HRESULT OccludedRect([out, retval] Windows.Foundation.Rect *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.InputPane), + uuid(8a6b3f26-7090-4793-944c-c3f2cde26276) + ] + interface IInputPane2 : IInspectable + { + HRESULT TryShow([out, retval] boolean *result); + HRESULT TryHide([out, retval] boolean *result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.InputPane), + uuid(088bb24f-962f-489d-aa6e-c6be1a0a6e52) + ] + interface IInputPaneControl : IInspectable + { + [propget] HRESULT Visible([out, retval] boolean *value); + [propput] HRESULT Visible([in] boolean value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.InputPaneVisibilityEventArgs), + uuid(d243e016-d907-4fcc-bb8d-f77baa5028f1) + ] + interface IInputPaneVisibilityEventArgs : IInspectable + { + [propget] HRESULT OccludedRect([out, retval] Windows.Foundation.Rect *value); + [propput] HRESULT EnsuredFocusedElementInView([in] boolean value); + [propget] HRESULT EnsuredFocusedElementInView([out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.InputPane), + uuid(95f4af3a-ef47-424a-9741-fd2815eba2bd) + ] + interface IInputPaneStatics : IInspectable + { + HRESULT GetForCurrentView([out, retval] Windows.UI.ViewManagement.InputPane **input_pane); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.UI.ViewManagement.InputPane), + uuid(1b63529b-d9ec-4531-8445-71bab9fb828e) + ] + interface IInputPaneStatics2 : IInspectable + { + HRESULT GetForUIContext([in] Windows.UI.UIContext *context, [out, retval] Windows.UI.ViewManagement.InputPane **result); + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -182,4 +260,26 @@ namespace Windows.UI.ViewManagement [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IUISettings2; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IUISettings3; } + + [ + static(Windows.UI.ViewManagement.IInputPaneStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.UI.ViewManagement.IInputPaneStatics2, Windows.Foundation.UniversalApiContract, 8.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(standard) + ] + runtimeclass InputPane + { + [default] interface Windows.UI.ViewManagement.IInputPane; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IInputPane2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IInputPaneControl; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(standard) + ] + runtimeclass InputPaneVisibilityEventArgs + { + [default] interface Windows.UI.ViewManagement.IInputPaneVisibilityEventArgs; + } }

1 0