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

Francois Gouget : testbot/cgi: Take into account the form order in GetFirstErrField().
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: tools Branch: master Commit: b46bbedb3a402690812499d4c593427f00ffafcd URL: https://gitlab.winehq.org/winehq/tools/-/commit/b46bbedb3a402690812499d4c59… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 11 18:46:17 2022 +0200 testbot/cgi: Take into account the form order in GetFirstErrField(). The base Page class does not know in which order the fields are so its GetFirstErrField() method just returns the first invalid field in alphabetical order. But for FormPage it makes more sense to return the first invalid field in the form order. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 688ee13a..c299d54b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -211,6 +211,35 @@ sub DisplayProperty($$) =pod =over 12 +=item C<GetFirstErrField()> + +Returns the first invalid field in the form order. + +See Page::GetFirstErrField(). + +=back +=cut + +sub GetFirstErrField($) +{ + my ($self) = @_; + + if (defined $self->GetErrMessage()) + { + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) + { + if ($self->IsErrField($PropertyDescriptor->GetName())) + { + return $PropertyDescriptor->GetName(); + } + } + } + return undef; +} + +=pod +=over 12 + =item C<GetPropertyValue()> Returns the underlying property value.

1 0

David Kahurani : ieframe: Fix memory leak in open_dde_url.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: 6e32c011a2b977246f9ab2282d30b69cff90142b URL: https://gitlab.winehq.org/wine/wine/-/commit/6e32c011a2b977246f9ab2282d30b6… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jul 11 19:15:43 2022 +0300 ieframe: Fix memory leak in open_dde_url. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/ieframe/iexplore.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 1616d4d7f84..6eb86d93e5e 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1027,10 +1027,12 @@ static HDDEDATA open_dde_url(WCHAR *dde_url) } hres = IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &urlv, NULL, NULL, NULL, NULL); - if(FAILED(hres)) - return 0; + SysFreeString(V_BSTR(&urlv)); IWebBrowser2_Release(&ie->IWebBrowser2_iface); + + if(FAILED(hres)) + return 0; return ULongToHandle(DDE_FACK); }

1 0

Jacek Caban : wow64win: Sort user syscall thunks.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: 87a5c1bda526259ce03b16babef3274b39f7c727 URL: https://gitlab.winehq.org/wine/wine/-/commit/87a5c1bda526259ce03b16babef327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 17:13:06 2022 +0200 wow64win: Sort user syscall thunks. --- dlls/wow64win/user.c | 1238 +++++++++++++++++++++++++------------------------- 1 file changed, 619 insertions(+), 619 deletions(-)

1 0

Jacek Caban : win32u: Implement input context object.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: d9fc5b3f967f1c5126278565beb6b967f9d6d80a URL: https://gitlab.winehq.org/wine/wine/-/commit/d9fc5b3f967f1c5126278565beb6b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 22:06:03 2022 +0200 win32u: Implement input context object. --- dlls/win32u/Makefile.in | 1 + dlls/win32u/imm.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 4 ++ dlls/win32u/win32u.spec | 8 +-- dlls/wow64win/syscall.h | 4 ++ dlls/wow64win/user.c | 31 ++++++++++ include/ntuser.h | 13 +++++ 7 files changed, 205 insertions(+), 4 deletions(-)

1 0

Jacek Caban : imm32: Use win32u to manage input context handles.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: f6ddd4ca86672fe2739ea7d17015112bce677e21 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6ddd4ca86672fe2739ea7d1701511… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 13:26:46 2022 +0200 imm32: Use win32u to manage input context handles. --- dlls/imm32/Makefile.in | 2 +- dlls/imm32/imm.c | 55 ++++++++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 214b2b753d4..29de6063792 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -1,6 +1,6 @@ MODULE = imm32.dll IMPORTLIB = imm32 -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 win32u DELAYIMPORTS = ole32 C_SRCS = \ diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index bcb02b82c83..e27c658b930 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -29,7 +29,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" +#include "ntuser.h" #include "winerror.h" #include "wine/debug.h" #include "imm.h" @@ -73,6 +73,7 @@ typedef struct _tagImmHkl{ typedef struct tagInputContextData { + HIMC handle; DWORD dwLock; INPUTCONTEXT IMC; DWORD threadID; @@ -80,7 +81,6 @@ typedef struct tagInputContextData ImmHkl *immKbd; UINT lastVK; BOOL threadDefault; - DWORD magic; } InputContextData; #define WINE_IMC_VALID_MAGIC 0x56434D49 @@ -628,19 +628,13 @@ static HIMCC ImmCreateBlankCompStr(void) return rc; } -static InputContextData* get_imc_data(HIMC hIMC) +static InputContextData *get_imc_data(HIMC handle) { - InputContextData *data = hIMC; + InputContextData *ret; - if (hIMC == NULL) - return NULL; - - if(IsBadReadPtr(data, sizeof(InputContextData)) || data->magic != WINE_IMC_VALID_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return NULL; - } - return data; + if (!handle) return NULL; + ret = (void *)NtUserQueryInputContext( handle, NtUserInputContextClientPtr ); + return ret && ret->handle == handle ? ret : NULL; } static HIMC get_default_context( HWND hwnd ) @@ -668,7 +662,7 @@ static HIMC get_default_context( HWND hwnd ) ret = ImmCreateContext(); if (!ret) return 0; - ((InputContextData*)ret)->threadDefault = TRUE; + get_imc_data(ret)->threadDefault = TRUE; /* thread_data is in the current thread so we can assume it's still valid */ EnterCriticalSection(&threaddata_cs); @@ -903,16 +897,24 @@ HIMC WINAPI ImmCreateContext(void) InputContextData *new_context; LPGUIDELINE gl; LPCANDIDATEINFO ci; + HIMC handle; int i; new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); + if (!(handle = NtUserCreateInputContext((UINT_PTR)new_context))) + { + HeapFree(GetProcessHeap(),0,new_context); + return 0; + } + /* Load the IME */ new_context->immKbd = IMM_GetImmHkl(GetKeyboardLayout(0)); if (!new_context->immKbd->hIME) { TRACE("IME dll could not be loaded\n"); + NtUserDestroyInputContext(handle); HeapFree(GetProcessHeap(),0,new_context); return 0; } @@ -940,9 +942,10 @@ HIMC WINAPI ImmCreateContext(void) new_context->IMC.fdwConversion = new_context->immKbd->imeInfo.fdwConversionCaps; new_context->IMC.fdwSentence = new_context->immKbd->imeInfo.fdwSentenceCaps; - if (!new_context->immKbd->pImeSelect(new_context, TRUE)) + if (!new_context->immKbd->pImeSelect(handle, TRUE)) { TRACE("Selection of IME failed\n"); + NtUserDestroyInputContext(handle); IMM_DestroyContext(new_context); return 0; } @@ -952,8 +955,7 @@ HIMC WINAPI ImmCreateContext(void) new_context->immKbd->uSelected++; TRACE("Created context %p\n",new_context); - new_context->magic = WINE_IMC_VALID_MAGIC; - return new_context; + return new_context->handle = handle; } static BOOL IMM_DestroyContext(HIMC hIMC) @@ -975,7 +977,7 @@ static BOOL IMM_DestroyContext(HIMC hIMC) ImmDestroyIMCC(data->IMC.hPrivate); ImmDestroyIMCC(data->IMC.hMsgBuf); - data->magic = 0; + NtUserDestroyInputContext(data->handle); HeapFree(GetProcessHeap(),0,data); return TRUE; @@ -1730,8 +1732,9 @@ HIMC WINAPI ImmGetContext(HWND hWnd) if (rc) { - InputContextData *data = rc; - data->IMC.hWnd = hWnd; + InputContextData *data = get_imc_data(rc); + if (data) data->IMC.hWnd = hWnd; + else rc = 0; } TRACE("returning %p\n", rc); @@ -2218,7 +2221,7 @@ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) UINT WINAPI ImmGetVirtualKey(HWND hWnd) { OSVERSIONINFOA version; - InputContextData *data = ImmGetContext( hWnd ); + InputContextData *data = get_imc_data( ImmGetContext( hWnd )); TRACE("%p\n", hWnd); if ( data ) @@ -3233,10 +3236,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD TRACE("%p %x %x %x\n",hwnd, msg, (UINT)wParam, (UINT)lKeyData); - if (imc) - data = imc; - else - return FALSE; + if (!(data = get_imc_data( imc ))) return FALSE; if (!data->immKbd->hIME || !data->immKbd->pImeToAsciiEx || data->lastVK == VK_PROCESSKEY) return FALSE; @@ -3292,10 +3292,7 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD TRACE("%p %p %x %x %lx\n",hwnd, hKL, vKey, (UINT)lKeyData, unknown); - if (imc) - data = imc; - else - return FALSE; + if (!(data = get_imc_data( imc ))) return FALSE; /* Make sure we are inputting to the correct keyboard */ if (data->immKbd->hkl != hKL)

1 0

Jacek Caban : imm32: Move default IMM window proc implementation from user32.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: 7babf7578927cd70941a3692552e945272c284a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7babf7578927cd70941a3692552e94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 00:43:21 2022 +0200 imm32: Move default IMM window proc implementation from user32. --- dlls/imm32/imm.c | 117 +++++++++++++++++++++++++++++++++++++++++-- dlls/imm32/imm32.spec | 2 +- dlls/user32/misc.c | 112 +++-------------------------------------- dlls/win32u/ntuser_private.h | 4 -- include/ntuser.h | 5 ++ 5 files changed, 126 insertions(+), 114 deletions(-)

1 0

Jacek Caban : imm32: Use a separated struct for COM initialization spy.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: d7d9344003edf5599a5190ada049461a2acca808 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7d9344003edf5599a5190ada04946… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 13:54:34 2022 +0200 imm32: Use a separated struct for COM initialization spy. --- dlls/imm32/imm.c | 149 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 86 insertions(+), 63 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index be4ff25a3f9..d290e580a23 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -107,8 +107,13 @@ typedef struct _tagIMMThreadData { HWND hwndDefault; BOOL disableIME; DWORD windowRefs; +} IMMThreadData; + +struct coinit_spy +{ IInitializeSpy IInitializeSpy_iface; - ULARGE_INTEGER spy_cookie; + LONG ref; + ULARGE_INTEGER cookie; enum { IMM_APT_INIT = 0x1, @@ -116,7 +121,9 @@ typedef struct _tagIMMThreadData { IMM_APT_CAN_FREE = 0x4, IMM_APT_BROKEN = 0x8 } apt_flags; -} IMMThreadData; +}; + +static LONG spy_tls = TLS_OUT_OF_INDEXES; static struct list ImmHklList = LIST_INIT(ImmHklList); static struct list ImmThreadDataList = LIST_INIT(ImmThreadDataList); @@ -249,62 +256,38 @@ static DWORD convert_candidatelist_AtoW( return ret; } -static void imm_coinit_thread(IMMThreadData *thread_data) +static void imm_couninit_thread(BOOL cleanup) { - HRESULT hr; - - TRACE("implicit COM initialization\n"); - - if (thread_data->threadID != GetCurrentThreadId()) - return; - - if (thread_data->apt_flags & (IMM_APT_INIT | IMM_APT_BROKEN)) - return; - thread_data->apt_flags |= IMM_APT_INIT; + struct coinit_spy *spy; - if(!thread_data->spy_cookie.QuadPart) - { - hr = CoRegisterInitializeSpy(&thread_data->IInitializeSpy_iface, - &thread_data->spy_cookie); - if (FAILED(hr)) - return; - } - - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - if (SUCCEEDED(hr)) - thread_data->apt_flags |= IMM_APT_CREATED; -} - -static void imm_couninit_thread(IMMThreadData *thread_data, BOOL cleanup) -{ TRACE("implicit COM deinitialization\n"); - if (thread_data->apt_flags & IMM_APT_BROKEN) + if (!(spy = TlsGetValue(spy_tls)) || (spy->apt_flags & IMM_APT_BROKEN)) return; - if (cleanup && thread_data->spy_cookie.QuadPart) + if (cleanup && spy->cookie.QuadPart) { - CoRevokeInitializeSpy(thread_data->spy_cookie); - thread_data->spy_cookie.QuadPart = 0; + CoRevokeInitializeSpy(spy->cookie); + spy->cookie.QuadPart = 0; } - if (!(thread_data->apt_flags & IMM_APT_INIT)) + if (!(spy->apt_flags & IMM_APT_INIT)) return; - thread_data->apt_flags &= ~IMM_APT_INIT; + spy->apt_flags &= ~IMM_APT_INIT; - if (thread_data->apt_flags & IMM_APT_CREATED) + if (spy->apt_flags & IMM_APT_CREATED) { - thread_data->apt_flags &= ~IMM_APT_CREATED; - if (thread_data->apt_flags & IMM_APT_CAN_FREE) + spy->apt_flags &= ~IMM_APT_CREATED; + if (spy->apt_flags & IMM_APT_CAN_FREE) CoUninitialize(); } if (cleanup) - thread_data->apt_flags = 0; + spy->apt_flags = 0; } -static inline IMMThreadData *impl_from_IInitializeSpy(IInitializeSpy *iface) +static inline struct coinit_spy *impl_from_IInitializeSpy(IInitializeSpy *iface) { - return CONTAINING_RECORD(iface, IMMThreadData, IInitializeSpy_iface); + return CONTAINING_RECORD(iface, struct coinit_spy, IInitializeSpy_iface); } static HRESULT WINAPI InitializeSpy_QueryInterface(IInitializeSpy *iface, REFIID riid, void **obj) @@ -323,24 +306,28 @@ static HRESULT WINAPI InitializeSpy_QueryInterface(IInitializeSpy *iface, REFIID static ULONG WINAPI InitializeSpy_AddRef(IInitializeSpy *iface) { - return 2; + struct coinit_spy *spy = impl_from_IInitializeSpy(iface); + return InterlockedIncrement(&spy->ref); } static ULONG WINAPI InitializeSpy_Release(IInitializeSpy *iface) { - return 1; + struct coinit_spy *spy = impl_from_IInitializeSpy(iface); + LONG ref = InterlockedDecrement(&spy->ref); + if (!ref) HeapFree(GetProcessHeap(), 0, spy); + return ref; } static HRESULT WINAPI InitializeSpy_PreInitialize(IInitializeSpy *iface, DWORD coinit, DWORD refs) { - IMMThreadData *thread_data = impl_from_IInitializeSpy(iface); + struct coinit_spy *spy = impl_from_IInitializeSpy(iface); - if ((thread_data->apt_flags & IMM_APT_CREATED) && + if ((spy->apt_flags & IMM_APT_CREATED) && !(coinit & COINIT_APARTMENTTHREADED) && refs == 1) { - imm_couninit_thread(thread_data, TRUE); - thread_data->apt_flags |= IMM_APT_BROKEN; + imm_couninit_thread(TRUE); + spy->apt_flags |= IMM_APT_BROKEN; } return S_OK; } @@ -348,12 +335,12 @@ static HRESULT WINAPI InitializeSpy_PreInitialize(IInitializeSpy *iface, static HRESULT WINAPI InitializeSpy_PostInitialize(IInitializeSpy *iface, HRESULT hr, DWORD coinit, DWORD refs) { - IMMThreadData *thread_data = impl_from_IInitializeSpy(iface); + struct coinit_spy *spy = impl_from_IInitializeSpy(iface); - if ((thread_data->apt_flags & IMM_APT_CREATED) && hr == S_FALSE && refs == 2) + if ((spy->apt_flags & IMM_APT_CREATED) && hr == S_FALSE && refs == 2) hr = S_OK; if (SUCCEEDED(hr)) - thread_data->apt_flags |= IMM_APT_CAN_FREE; + spy->apt_flags |= IMM_APT_CAN_FREE; return hr; } @@ -364,12 +351,14 @@ static HRESULT WINAPI InitializeSpy_PreUninitialize(IInitializeSpy *iface, DWORD static HRESULT WINAPI InitializeSpy_PostUninitialize(IInitializeSpy *iface, DWORD refs) { - IMMThreadData *thread_data = impl_from_IInitializeSpy(iface); + struct coinit_spy *spy = impl_from_IInitializeSpy(iface); + + TRACE("%lu %p\n", refs, ImmGetDefaultIMEWnd(0)); - if (refs == 1 && !thread_data->windowRefs) - imm_couninit_thread(thread_data, FALSE); + if (refs == 1 && !ImmGetDefaultIMEWnd(0)) + imm_couninit_thread(FALSE); else if (!refs) - thread_data->apt_flags &= ~IMM_APT_CAN_FREE; + spy->apt_flags &= ~IMM_APT_CAN_FREE; return S_OK; } @@ -384,6 +373,45 @@ static const IInitializeSpyVtbl InitializeSpyVtbl = InitializeSpy_PostUninitialize, }; +static void imm_coinit_thread(void) +{ + struct coinit_spy *spy; + HRESULT hr; + + TRACE("implicit COM initialization\n"); + + if (spy_tls == TLS_OUT_OF_INDEXES) + { + DWORD tls = TlsAlloc(); + if (tls == TLS_OUT_OF_INDEXES) return; + if (InterlockedCompareExchange(&spy_tls, tls, TLS_OUT_OF_INDEXES)) TlsFree(tls); + } + if (!(spy = TlsGetValue(spy_tls))) + { + if (!(spy = HeapAlloc(GetProcessHeap(), 0, sizeof(*spy)))) return; + spy->IInitializeSpy_iface.lpVtbl = &InitializeSpyVtbl; + spy->ref = 1; + spy->cookie.QuadPart = 0; + spy->apt_flags = 0; + TlsSetValue(spy_tls, spy); + } + + if (spy->apt_flags & (IMM_APT_INIT | IMM_APT_BROKEN)) + return; + spy->apt_flags |= IMM_APT_INIT; + + if(!spy->cookie.QuadPart) + { + hr = CoRegisterInitializeSpy(&spy->IInitializeSpy_iface, &spy->cookie); + if (FAILED(hr)) + return; + } + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + if (SUCCEEDED(hr)) + spy->apt_flags |= IMM_APT_CREATED; +} + static IMMThreadData *IMM_GetThreadData(HWND hwnd, DWORD thread) { IMMThreadData *data; @@ -410,7 +438,6 @@ static IMMThreadData *IMM_GetThreadData(HWND hwnd, DWORD thread) if (data->threadID == thread) return data; data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); - data->IInitializeSpy_iface.lpVtbl = &InitializeSpyVtbl; data->threadID = thread; list_add_head(&ImmThreadDataList,&data->entry); TRACE("Thread Data Created (%lx)\n",thread); @@ -429,6 +456,7 @@ static BOOL IMM_IsDefaultContext(HIMC imc) static void IMM_FreeThreadData(void) { + struct coinit_spy *spy; IMMThreadData *data; EnterCriticalSection(&threaddata_cs); @@ -439,13 +467,14 @@ static void IMM_FreeThreadData(void) list_remove(&data->entry); LeaveCriticalSection(&threaddata_cs); IMM_DestroyContext(data->defaultContext); - imm_couninit_thread(data, TRUE); HeapFree(GetProcessHeap(),0,data); TRACE("Thread Data Destroyed\n"); return; } } LeaveCriticalSection(&threaddata_cs); + + if ((spy = TlsGetValue(spy_tls))) IInitializeSpy_Release(&spy->IInitializeSpy_iface); } static HMODULE load_graphics_driver(void) @@ -704,19 +733,13 @@ static BOOL IMM_IsCrossThreadAccess(HWND hWnd, HIMC hIMC) BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) { InputContextData *data = get_imc_data(himc); - IMMThreadData *thread_data; TRACE("(%p, %p, %x)\n", hwnd, himc, activate); if (himc && !data && activate) return FALSE; - thread_data = IMM_GetThreadData(hwnd, 0); - if (thread_data) - { - imm_coinit_thread(thread_data); - LeaveCriticalSection(&threaddata_cs); - } + imm_coinit_thread(); if (data) { @@ -1002,10 +1025,10 @@ static HWND imm_detach_default_window(IMMThreadData *thread_data) { HWND to_destroy; - imm_couninit_thread(thread_data, TRUE); to_destroy = thread_data->hwndDefault; thread_data->hwndDefault = NULL; thread_data->windowRefs = 0; + imm_couninit_thread(TRUE); return to_destroy; }

1 0

Jacek Caban : imm32: Use default IME window WM_DESTROY to call imm_couninit_thread.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: 8f3e19a52f4cb373ef0225a1bcab4fb9ae06a851 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f3e19a52f4cb373ef0225a1bcab4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 14:20:52 2022 +0200 imm32: Use default IME window WM_DESTROY to call imm_couninit_thread. --- dlls/imm32/imm.c | 9 ++++++++- dlls/user32/tests/win.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index d290e580a23..42cf6a712f9 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1028,7 +1028,6 @@ static HWND imm_detach_default_window(IMMThreadData *thread_data) to_destroy = thread_data->hwndDefault; thread_data->hwndDefault = NULL; thread_data->windowRefs = 0; - imm_couninit_thread(TRUE); return to_destroy; } @@ -3470,6 +3469,14 @@ LRESULT WINAPI __wine_ime_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp init_messages(); return TRUE; + case WM_DESTROY: + { + HWND default_hwnd = ImmGetDefaultIMEWnd(0); + if (!default_hwnd || hwnd == default_hwnd) + imm_couninit_thread(TRUE); + } + return TRUE; + case WM_IME_INTERNAL: return ime_internal_msg(wparam, lparam); } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3727efb1b41..4c2af09d0c6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3760,7 +3760,6 @@ static void test_SetActiveWindow_0_proc( char **argv ) else /* < Win10 */ { ok( tmp == hwnd, "SetActiveWindow returned %p\n", tmp ); - todo_wine ok( GetLastError() == 0, "got error %lu\n", GetLastError() ); tmp = GetForegroundWindow();

1 0

Brendan Shanks : ntdll: Add ".globl" for asm labels referenced from C.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: b8ec1068baadc49051a1f762dc9f884bd160da58 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8ec1068baadc49051a1f762dc9f88… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 11 11:21:31 2022 -0700 ntdll: Add ".globl" for asm labels referenced from C. Fixes syscall faults on 32-bit macOS. Spotted by Stefan Dösinger. --- dlls/ntdll/unix/signal_arm.c | 3 ++- dlls/ntdll/unix/signal_arm64.c | 3 ++- dlls/ntdll/unix/signal_i386.c | 6 ++++-- dlls/ntdll/unix/signal_x86_64.c | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index c8edf22b170..73843ba56a6 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1261,7 +1261,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "5:\tmovw r0, #0x000d\n\t" /* STATUS_INVALID_PARAMETER */ "movt r0, #0xc000\n\t" "add sp, sp, #0x10\n\t" - "b 4b\n" + "b 4b\n\t" + ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "mov r8, r0\n\t" "mov r0, r1\n\t" diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 45cb3d1bf13..10543322a8f 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1382,7 +1382,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ret x16\n" "4:\tmov x0, #0xc0000000\n\t" /* STATUS_INVALID_PARAMETER */ "movk x0, #0x000d\n\t" - "b 3b\n" + "b 3b\n\t" + ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "mov sp, x0\n\t" "mov x0, x1\n\t" diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 7be0c39c424..5ddef2701c4 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2498,7 +2498,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movw $0,0x02(%ecx)\n\t" /* frame->restore_flags */ "popl 0x08(%ecx)\n\t" /* frame->eip */ "pushfl\n\t" - "popl 0x04(%ecx)\n" /* frame->eflags */ + "popl 0x04(%ecx)\n\t" /* frame->eflags */ + ".globl " __ASM_NAME("__wine_syscall_dispatcher_prolog_end") "\n" __ASM_NAME("__wine_syscall_dispatcher_prolog_end") ":\n\t" "movl %esp,0x0c(%ecx)\n\t" /* frame->esp */ "movw %cs,0x10(%ecx)\n\t" @@ -2611,7 +2612,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "popl %ds\n\t" "iret\n" "6:\tmovl $0xc000000d,%eax\n\t" /* STATUS_INVALID_PARAMETER */ - "jmp 5b\n" + "jmp 5b\n\t" + ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "movl 8(%esp),%eax\n\t" "movl 4(%esp),%esp\n\t" diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 54353e50e3d..bb7c9ab712e 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3295,6 +3295,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "pushfq\n\t" "popq 0x80(%rcx)\n\t" "movl $0,0x94(%rcx)\n\t" /* frame->restore_flags */ + ".globl " __ASM_NAME("__wine_syscall_dispatcher_prolog_end") "\n" __ASM_NAME("__wine_syscall_dispatcher_prolog_end") ":\n\t" "movq %rax,0x00(%rcx)\n\t" "movq %rbx,0x08(%rcx)\n\t" @@ -3424,7 +3425,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq 0x10(%rcx),%rcx\n" "iretq\n" "5:\tmovl $0xc000000d,%edx\n\t" /* STATUS_INVALID_PARAMETER */ - "movq %rsp,%rcx\n" + "movq %rsp,%rcx\n\t" + ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "movl 0xb0(%rcx),%r14d\n\t" /* frame->syscall_flags */ "movq %rdx,%rax\n\t"

1 0

Jinoh Kang : riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: wine Branch: master Commit: 73284ea18891a152dce989ffff59e2c527f94c73 URL: https://gitlab.winehq.org/wine/wine/-/commit/73284ea18891a152dce989ffff59e2… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 5 00:32:13 2022 +0900 riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/tests/richole.c | 486 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 486 insertions(+)

1 0