October 2021 - Wine-commits

Piotr Caban : imm32: Add ImmSetActiveContext implementation.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 80ac0b9af4302a3d7be4868b7507740abbe5e0d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ac0b9af4302a3d7be4868b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:26:50 2021 +0200 imm32: Add ImmSetActiveContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 28 ++++++++++++++++++++++ dlls/imm32/imm32.spec | 2 +- dlls/imm32/tests/imm32.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 20633041871..d933ca06c2f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -550,6 +550,34 @@ static BOOL IMM_IsCrossThreadAccess(HWND hWnd, HIMC hIMC) return FALSE; } +/*********************************************************************** + * ImmSetActiveContext (IMM32.@) + */ +BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) +{ + InputContextData *data = get_imc_data(himc); + + TRACE("(%p, %p, %x)\n", hwnd, himc, activate); + + if (himc && !data && activate) + return FALSE; + + if (data) + { + data->IMC.hWnd = activate ? hwnd : NULL; + + if (data->immKbd->hIME && data->immKbd->pImeSetActiveContext) + data->immKbd->pImeSetActiveContext(himc, activate); + } + + if (IsWindow(hwnd)) + { + SendMessageW(hwnd, WM_IME_SETCONTEXT, activate, ISC_SHOWUIALL); + /* TODO: send WM_IME_NOTIFY */ + } + return TRUE; +} + /*********************************************************************** * ImmAssociateContext (IMM32.@) */ diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 4197bb81e21..25876de873d 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -86,7 +86,7 @@ @ stub ImmSendIMEMessageExA @ stub ImmSendIMEMessageExW @ stub ImmSendMessageToActiveDefImeWndW -@ stub ImmSetActiveContext +@ stdcall ImmSetActiveContext(long long long) @ stub ImmSetActiveContextConsoleIME @ stdcall ImmSetCandidateWindow(long ptr) @ stdcall ImmSetCompositionFontA(long ptr) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index cc9e0e8c01f..18d69724e58 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -26,10 +26,44 @@ #include "imm.h" #include "ddk/imm.h" +BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); + static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE, enabled_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + if (enabled_ ## func) {\ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + } \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define SET_ENABLE(func, val) \ + enabled_ ## func = (val) + +DEFINE_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); +DEFINE_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + /* * msgspy - record and analyse message traces sent to a certain window */ @@ -182,6 +216,9 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) switch (msg) { case WM_IME_SETCONTEXT: + if (wParam) CHECK_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + else CHECK_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + ok(lParam == ISC_SHOWUIALL || !lParam, "lParam = %lx\n", lParam); return TRUE; case WM_NCCREATE: default_ime_wnd = get_ime_window(); @@ -737,6 +774,19 @@ static void test_ImmThreads(void) ok(himc != otherHimc, "Windows from other threads should have different himc\n"); ok(otherHimc == threadinfo.himc, "Context from other thread should not change in main thread\n"); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + rc = ImmSetActiveContext(hwnd, otherHimc, TRUE); + ok(rc, "ImmSetActiveContext failed\n"); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + rc = ImmSetActiveContext(hwnd, otherHimc, FALSE); + ok(rc, "ImmSetActiveContext failed\n"); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + h1 = ImmAssociateContext(hwnd,otherHimc); ok(h1 == NULL, "Should fail to be able to Associate a default context from a different thread\n"); h1 = ImmGetContext(hwnd); @@ -1680,6 +1730,7 @@ static void test_InvalidIMC(void) CHAR buffer[1000]; INPUTCONTEXT *ic; LOGFONTA lf; + BOOL r; memset(&lf, 0, sizeof(lf)); @@ -1697,6 +1748,17 @@ static void test_InvalidIMC(void) imc2 = ImmGetContext(hwnd); ok(imc1 == imc2, "imc should not changed! imc1 %p, imc2 %p\n", imc1, imc2); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + r = ImmSetActiveContext(hwnd, imc_destroy, TRUE); + ok(!r, "ImmSetActiveContext succeeded\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + r = ImmSetActiveContext(hwnd, imc_destroy, FALSE); + ok(r, "ImmSetActiveContext failed\n"); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); + /* Test associating NULL imc, which is different from an invalid imc */ oldimc = ImmAssociateContext(hwnd, imc_null); ok(oldimc != NULL, "Associating to NULL imc should success!\n");

1 0

Piotr Caban : imm32: Exit on invalid window in ImmAssociateContext.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 266c1101b3e0e0297b6062a4d34b2b766b4c9d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=266c1101b3e0e0297b6062a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:26:57 2021 +0200 imm32: Exit on invalid window in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index d933ca06c2f..cbcc70daedf 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -583,12 +583,13 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { - HIMC old = NULL; InputContextData *data = get_imc_data(hIMC); + HIMC defaultContext; + HIMC old; TRACE("(%p, %p):\n", hWnd, hIMC); - if(hIMC && !data) + if (!IsWindow(hWnd) || (hIMC && !data)) return NULL; /* @@ -600,30 +601,26 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; - if (hWnd) - { - HIMC defaultContext = get_default_context( hWnd ); - old = RemovePropW(hWnd,szwWineIMCProperty); + defaultContext = get_default_context( hWnd ); + old = RemovePropW(hWnd, szwWineIMCProperty); + if (old == NULL) + old = defaultContext; + else if (old == (HIMC)-1) + old = NULL; - if (old == NULL) - old = defaultContext; - else if (old == (HIMC)-1) - old = NULL; - - if (hIMC != defaultContext) - { - if (hIMC == NULL) /* Meaning disable imm for that window*/ - SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); - else - SetPropW(hWnd,szwWineIMCProperty,hIMC); - } + if (hIMC != defaultContext) + { + if (hIMC == NULL) /* Meaning disable imm for that window*/ + SetPropW(hWnd, szwWineIMCProperty, (HANDLE)-1); + else + SetPropW(hWnd, szwWineIMCProperty, hIMC); + } - if (old) - { - InputContextData *old_data = old; - if (old_data->IMC.hWnd == hWnd) - old_data->IMC.hWnd = NULL; - } + if (old) + { + InputContextData *old_data = old; + if (old_data->IMC.hWnd == hWnd) + old_data->IMC.hWnd = NULL; } if (!hIMC)

1 0

Piotr Caban : imm32: Use ImmSetActiveContext in ImmAssociateContext.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: e6d53d63019a3344bed6b1cd561d463fcca9c761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6d53d63019a3344bed6b1cd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:03 2021 +0200 imm32: Use ImmSetActiveContext in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 34 ++++++++++++---------------------- dlls/imm32/tests/imm32.c | 26 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index cbcc70daedf..790afc34adc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -601,35 +601,25 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; + old = GetPropW(hWnd, szwWineIMCProperty); defaultContext = get_default_context( hWnd ); - old = RemovePropW(hWnd, szwWineIMCProperty); - if (old == NULL) + if (!old) old = defaultContext; else if (old == (HIMC)-1) old = NULL; - if (hIMC != defaultContext) - { - if (hIMC == NULL) /* Meaning disable imm for that window*/ - SetPropW(hWnd, szwWineIMCProperty, (HANDLE)-1); - else - SetPropW(hWnd, szwWineIMCProperty, hIMC); - } - - if (old) - { - InputContextData *old_data = old; - if (old_data->IMC.hWnd == hWnd) - old_data->IMC.hWnd = NULL; - } - - if (!hIMC) - return old; + if (old == hIMC) + return hIMC; - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); - data->IMC.hWnd = hWnd; - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); + if (!hIMC) /* Meaning disable imm for that window*/ + SetPropW(hWnd, szwWineIMCProperty, (HANDLE)-1); + else if (hIMC == defaultContext) + RemovePropW(hWnd, szwWineIMCProperty); + else + SetPropW(hWnd, szwWineIMCProperty, hIMC); + ImmSetActiveContext(hWnd, old, FALSE); + ImmSetActiveContext(hWnd, hIMC, TRUE); return old; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 18d69724e58..77df36b8e38 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -663,29 +663,55 @@ static void test_ImmAssociateContextEx(void) { HIMC retimc, newimc; + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + + ok(GetActiveWindow() == hwnd, "hwnd is not active\n"); newimc = ImmCreateContext(); ok(newimc != imc, "handles should not be the same\n"); rc = pImmAssociateContextEx(NULL, NULL, 0); ok(!rc, "ImmAssociateContextEx succeeded\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, NULL, 0); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); rc = pImmAssociateContextEx(NULL, imc, 0); ok(!rc, "ImmAssociateContextEx succeeded\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, imc, 0); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); retimc = ImmGetContext(hwnd); ok(retimc == imc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); + rc = pImmAssociateContextEx(hwnd, imc, 0); + ok(rc, "ImmAssociateContextEx failed\n"); + + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, newimc, 0); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); retimc = ImmGetContext(hwnd); ok(retimc == newimc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); + + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); } ImmReleaseContext(hwnd,imc); }

1 0

Piotr Caban : imm32: Only call ImmSetActiveContext for active window in ImmAssociateContext.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 01e072bb68166c235bfda20874b0fc0065a25e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01e072bb68166c235bfda208… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:10 2021 +0200 imm32: Only call ImmSetActiveContext for active window in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 14 ++++++-------- dlls/imm32/tests/imm32.c | 13 +++++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 790afc34adc..eea8cdb055e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -592,12 +592,6 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (!IsWindow(hWnd) || (hIMC && !data)) return NULL; - /* - * If already associated just return - */ - if (hIMC && data->IMC.hWnd == hWnd) - return hIMC; - if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; @@ -608,6 +602,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) else if (old == (HIMC)-1) old = NULL; + /* If already associated just return */ if (old == hIMC) return hIMC; @@ -618,8 +613,11 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) else SetPropW(hWnd, szwWineIMCProperty, hIMC); - ImmSetActiveContext(hWnd, old, FALSE); - ImmSetActiveContext(hWnd, hIMC, TRUE); + if (GetActiveWindow() == hWnd) + { + ImmSetActiveContext(hWnd, old, FALSE); + ImmSetActiveContext(hWnd, hIMC, TRUE); + } return old; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 77df36b8e38..f837e3da61b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -662,6 +662,7 @@ static void test_ImmAssociateContextEx(void) if (imc) { HIMC retimc, newimc; + HWND focus; SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); @@ -703,11 +704,19 @@ static void test_ImmAssociateContextEx(void) ok(retimc == newimc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); + focus = CreateWindowA("button", "button", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(focus != NULL, "CreateWindow failed\n"); SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SetFocus(focus); + todo_wine CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + rc = pImmAssociateContextEx(hwnd, imc, 0); + ok(rc, "ImmAssociateContextEx failed\n"); SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + DestroyWindow(focus); + todo_wine CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + SetFocus(hwnd); + rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); - CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); - CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE);

1 0

Piotr Caban : imm32: Initialize COM in ImmSetActiveContext.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: ea0c992fa5852d6236bf9977c774d7d40bdb113a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea0c992fa5852d6236bf9977… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:15 2021 +0200 imm32: Initialize COM in ImmSetActiveContext. Loosely based on a patch by Nikolay. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/Makefile.in | 2 +- dlls/imm32/imm.c | 161 ++++++++++++++++++++++++++++++++++++++++++- dlls/imm32/tests/Makefile.in | 2 +- dlls/imm32/tests/imm32.c | 145 +++++++++++++++++++++++++++++++++++--- 4 files changed, 298 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea0c992fa5852d6236bf…

1 0

Piotr Caban : imm32: Destroy default IME windows in ImmDisableIME.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 684d023faad9549c642274d02c1363d5d179a417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=684d023faad9549c642274d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:24 2021 +0200 imm32: Destroy default IME windows in ImmDisableIME. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 50 +++++++++++++++++++++++++++++++++++++------- dlls/imm32/tests/imm32.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 023d816a51e..1230c2e2b95 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -992,18 +992,58 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) return FALSE; } +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; + return to_destroy; +} + /*********************************************************************** * ImmDisableIME (IMM32.@) */ BOOL WINAPI ImmDisableIME(DWORD idThread) { + IMMThreadData *thread_data; + HWND to_destroy; + if (idThread == (DWORD)-1) + { disable_ime = TRUE; - else { - IMMThreadData *thread_data = IMM_GetThreadData(NULL, idThread); + + while (1) + { + to_destroy = 0; + EnterCriticalSection(&threaddata_cs); + LIST_FOR_EACH_ENTRY(thread_data, &ImmThreadDataList, IMMThreadData, entry) + { + if (thread_data->hwndDefault) + { + to_destroy = imm_detach_default_window(thread_data); + break; + } + } + LeaveCriticalSection(&threaddata_cs); + + if (!to_destroy) + break; + DestroyWindow(to_destroy); + } + } + else + { + thread_data = IMM_GetThreadData(NULL, idThread); if (!thread_data) return FALSE; thread_data->disableIME = TRUE; + to_destroy = imm_detach_default_window(thread_data); LeaveCriticalSection(&threaddata_cs); + + if (to_destroy) + DestroyWindow(to_destroy); } return TRUE; } @@ -1878,11 +1918,7 @@ void WINAPI __wine_unregister_window(HWND hwnd) /* Destroy default IME window */ if (thread_data->windowRefs == 0) - { - imm_couninit_thread(thread_data, TRUE); - to_destroy = thread_data->hwndDefault; - thread_data->hwndDefault = NULL; - } + to_destroy = imm_detach_default_window(thread_data); LeaveCriticalSection(&threaddata_cs); if (to_destroy) DestroyWindow( to_destroy ); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 759b564aba9..9e0e59d384d 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2241,6 +2241,57 @@ static void test_com_initialization(void) test_apttype(-1); } +static DWORD WINAPI disable_ime_thread(void *arg) +{ + HWND h, def; + MSG msg; + BOOL r; + + h = CreateWindowA("static", "static", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(h != NULL, "CreateWindow failed\n"); + def = ImmGetDefaultIMEWnd(h); + ok(def != NULL, "ImmGetDefaultIMEWnd returned NULL\n"); + + r = ImmDisableIME(arg ? GetCurrentThreadId() : 0); + ok(r, "ImmDisableIME failed\n"); + + if (arg) + { + def = ImmGetDefaultIMEWnd(h); + todo_wine ok(def != NULL, "ImmGetDefaultIMEWnd returned NULL\n"); + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + } + def = ImmGetDefaultIMEWnd(h); + ok(!def, "ImmGetDefaultIMEWnd returned %p\n", def); + return 0; +} + +static void test_ImmDisableIME(void) +{ + HANDLE thread; + HWND def; + BOOL r; + + def = ImmGetDefaultIMEWnd(hwnd); + ok(def != NULL, "ImmGetDefaultIMEWnd(hwnd) returned NULL\n"); + + thread = CreateThread(NULL, 0, disable_ime_thread, 0, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, disable_ime_thread, (void*)1, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + r = ImmDisableIME(-1); + ok(r, "ImmDisableIME(-1) failed\n"); + def = ImmGetDefaultIMEWnd(hwnd); + ok(!def, "ImmGetDefaultIMEWnd(hwnd) returned %p\n", def); +} + START_TEST(imm32) { if (!is_ime_enabled()) { @@ -2276,6 +2327,9 @@ START_TEST(imm32) { if (pSendInput) test_ime_processkey(); else win_skip("SendInput is not available\n"); + + /* there's no way of enabling IME - keep the test last */ + test_ImmDisableIME(); } cleanup(); }

1 0

Piotr Caban : winemac.drv: Silence ImeSetActiveContext fixme.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 30c6ab463fcb99d4a196e2c9c10e7af7c39898e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30c6ab463fcb99d4a196e2c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:33 2021 +0200 winemac.drv: Silence ImeSetActiveContext fixme. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index f2368c10743..8b89c0089fc 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -648,7 +648,10 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag) { - FIXME("(%p, %x): stub\n", hIMC, fFlag); + static int once; + + if (!once++) + FIXME("(%p, %x): stub\n", hIMC, fFlag); return TRUE; }

1 0

Piotr Caban : winex11.drv: Silence ImeSetActiveContext fixme.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 0925a730272ed0c97f64c3365ebe542401f60d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0925a730272ed0c97f64c336… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:40 2021 +0200 winex11.drv: Silence ImeSetActiveContext fixme. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index dfeed2cb1e6..c1584930861 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -620,7 +620,10 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) BOOL WINAPI ImeSetActiveContext(HIMC hIMC,BOOL fFlag) { - FIXME("(%p, %x): stub\n", hIMC, fFlag); + static int once; + + if (!once++) + FIXME("(%p, %x): stub\n", hIMC, fFlag); return TRUE; }

1 0

Jan Sikorski : wined3d: Make reference count decrementing functions thread safe.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 90cd8b0764638bffe2f50fccf989189016b1359f URL: https://source.winehq.org/git/wine.git/?a=commit;h=90cd8b0764638bffe2f50fcc… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:25:57 2021 +0200 wined3d: Make reference count decrementing functions thread safe. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 ++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/directx.c | 2 ++ dlls/wined3d/palette.c | 4 ++++ dlls/wined3d/query.c | 2 ++ dlls/wined3d/sampler.c | 2 ++ dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 6 ++++++ dlls/wined3d/stateblock.c | 2 ++ dlls/wined3d/texture.c | 7 +++++++ dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/view.c | 12 ++++++++++++ 13 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3430b8b1e97..d259b64bfaf 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -708,8 +708,10 @@ ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) if (!refcount) { + wined3d_mutex_lock(); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); buffer->resource.device->adapter->adapter_ops->adapter_destroy_buffer(buffer); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5934f36e1e9..f266e59b4b5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -99,7 +99,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { SIZE_T i; - wined3d_mutex_lock(); for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) @@ -109,6 +108,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b8c1630ee25..6b2f18c6996 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -263,8 +263,10 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) if (!refcount) { + wined3d_mutex_lock(); device->adapter->adapter_ops->adapter_destroy_device(device); TRACE("Destroyed device %p.\n", device); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 58aaf44fc45..c265bdc8c95 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -187,6 +187,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) { unsigned int i; + wined3d_mutex_lock(); for (i = 0; i < wined3d->adapter_count; ++i) { struct wined3d_adapter *adapter = wined3d->adapters[i]; @@ -194,6 +195,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) adapter->adapter_ops->adapter_destroy(adapter); } heap_free(wined3d); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 85105d1f8de..4bc453bde79 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -47,7 +47,11 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) + { + wined3d_mutex_lock(); wined3d_cs_destroy_object(palette->device->cs, wined3d_palette_destroy_object, palette); + wined3d_mutex_unlock(); + } return refcount; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8ee7ae07886..1b38eb5e311 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -444,9 +444,11 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) { struct wined3d_device *device = query->device; + wined3d_mutex_lock(); query->parent_ops->wined3d_object_destroyed(query->parent); wined3d_cs_destroy_object(device->cs, wined3d_query_destroy_object, query); device->adapter->adapter_ops->adapter_destroy_query(query); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 7eb3a2ae0be..bba3165316e 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -41,8 +41,10 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) if (!refcount) { + wined3d_mutex_lock(); sampler->parent_ops->wined3d_object_destroyed(sampler->parent); sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index fb7115a26dd..957710dbd43 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3439,8 +3439,10 @@ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) if (!refcount) { + wined3d_mutex_lock(); shader->parent_ops->wined3d_object_destroyed(shader->parent); wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8316269afcf..c7f041066d1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -62,8 +62,10 @@ ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -136,8 +138,10 @@ ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_stat if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -199,8 +203,10 @@ ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *sta if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 39a19984498..8590a2a1c1f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -585,8 +585,10 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { + wined3d_mutex_lock(); wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); heap_free(stateblock); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 339bf4e205a..f031daef373 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1536,6 +1536,11 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) if (!refcount) { + bool in_cs_thread = GetCurrentThreadId() == texture->resource.device->cs->thread_id; + + /* This is called from the CS thread to destroy temporary textures. */ + if (!in_cs_thread) + wined3d_mutex_lock(); /* Wait for the texture to become idle if it's using user memory, * since the application is allowed to free that memory once the * texture is destroyed. Note that this implies that @@ -1550,6 +1555,8 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) } } texture->resource.device->adapter->adapter_ops->adapter_destroy_texture(texture); + if (!in_cs_thread) + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 45a01f4bdd4..a778352d2cf 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -68,9 +68,11 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration if (!refcount) { + wined3d_mutex_lock(); declaration->parent_ops->wined3d_object_destroyed(declaration->parent); wined3d_cs_destroy_object(declaration->device->cs, wined3d_vertex_declaration_destroy_object, declaration); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8b3a7b4f75..94bbe27bd5c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -376,7 +376,11 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_rendertarget_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -923,7 +927,11 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -1441,7 +1449,11 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_unordered_access_view(view); + wined3d_mutex_unlock(); + } return refcount; }

1 0

Jan Sikorski : wined3d: Set render targets and UAVs atomically in wined3d.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 3f4e6673dcafcc30a6b6286203fe3a11043c32de URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4e6673dcafcc30a6b62862… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:25:58 2021 +0200 wined3d: Set render targets and UAVs atomically in wined3d. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 42 ++++++++++++++++++++++++++++-------------- dlls/wined3d/device.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 4 ++++ 4 files changed, 64 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 68b0333604f..31c68f62e68 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1140,7 +1140,11 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere ID3D11DepthStencilView *depth_stencil_view, UINT uav_start_idx, UINT uav_count, ID3D11UnorderedAccessView *const *uavs, const UINT *initial_counts) { + struct d3d_depthstencil_view *dsv = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view); + struct wined3d_rendertarget_view *wined3d_rtvs[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT] = {0}; + struct wined3d_unordered_access_view *wined3d_uavs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); + unsigned int wined3d_initial_counts[D3D11_PS_CS_UAV_REGISTER_COUNT]; unsigned int i; TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " @@ -1148,18 +1152,29 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere iface, render_target_view_count, render_target_views, depth_stencil_view, uav_start_idx, uav_count, uavs, initial_counts); - if (render_target_view_count != D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) + if (render_target_view_count == D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) + render_target_view_count = ~0u; + else { - d3d11_device_context_OMSetRenderTargets(iface, render_target_view_count, render_target_views, - depth_stencil_view); + if (render_target_view_count > ARRAY_SIZE(wined3d_rtvs)) + { + WARN("View count %u exceeds limit.\n", render_target_view_count); + render_target_view_count = ARRAY_SIZE(wined3d_rtvs); + } + + for (i = 0; i < render_target_view_count; ++i) + { + struct d3d_rendertarget_view *rtv = unsafe_impl_from_ID3D11RenderTargetView(render_target_views[i]); + + wined3d_rtvs[i] = rtv ? rtv->wined3d_view : NULL; + } } - if (uav_count != D3D11_KEEP_UNORDERED_ACCESS_VIEWS) + if (uav_count == D3D11_KEEP_UNORDERED_ACCESS_VIEWS) + uav_count = ~0u; + else { - struct wined3d_unordered_access_view *wined3d_views[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; - unsigned int wined3d_initial_counts[D3D11_PS_CS_UAV_REGISTER_COUNT]; - - if (!wined3d_bound_range(uav_start_idx, uav_count, ARRAY_SIZE(wined3d_views))) + if (!wined3d_bound_range(uav_start_idx, uav_count, ARRAY_SIZE(wined3d_uavs))) { WARN("View count %u exceeds limit; ignoring call.\n", uav_count); return; @@ -1172,15 +1187,14 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(uavs[i]); - wined3d_views[uav_start_idx + i] = view ? view->wined3d_view : NULL; + wined3d_uavs[uav_start_idx + i] = view ? view->wined3d_view : NULL; wined3d_initial_counts[uav_start_idx + i] = initial_counts ? initial_counts[i] : ~0u; } - - wined3d_mutex_lock(); - wined3d_device_context_set_unordered_access_views(context->wined3d_context, WINED3D_PIPELINE_GRAPHICS, - 0, ARRAY_SIZE(wined3d_views), wined3d_views, wined3d_initial_counts); - wined3d_mutex_unlock(); } + + wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, ARRAY_SIZE(wined3d_rtvs), + wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ARRAY_SIZE(wined3d_uavs), wined3d_uavs, + wined3d_initial_counts); } static void STDMETHODCALLTYPE d3d11_device_context_OMSetBlendState(ID3D11DeviceContext1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b2f18c6996..86945485e20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2110,6 +2110,37 @@ out: wined3d_mutex_unlock(); } +void CDECL wined3d_device_context_set_render_targets_and_unordered_access_views(struct wined3d_device_context *context, + unsigned int rtv_count, struct wined3d_rendertarget_view *const *render_target_views, + struct wined3d_rendertarget_view *depth_stencil_view, UINT uav_count, + struct wined3d_unordered_access_view *const *unordered_access_views, const unsigned int *initial_counts) +{ + wined3d_mutex_lock(); + if (rtv_count != ~0u) + { + if (depth_stencil_view && !(depth_stencil_view->resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) + { + WARN("View resource %p has incompatible %s bind flags.\n", + depth_stencil_view->resource, wined3d_debug_bind_flags(depth_stencil_view->resource->bind_flags)); + goto out; + } + + if (FAILED(wined3d_device_context_set_rendertarget_views(context, 0, rtv_count, + render_target_views, FALSE))) + goto out; + + wined3d_device_context_set_depth_stencil_view(context, depth_stencil_view); + } + + if (uav_count != ~0u) + { + wined3d_device_context_set_unordered_access_views(context, WINED3D_PIPELINE_GRAPHICS, 0, uav_count, + unordered_access_views, initial_counts); + } +out: + wined3d_mutex_unlock(); +} + static void wined3d_device_context_unbind_srv_for_rtv(struct wined3d_device_context *context, const struct wined3d_rendertarget_view *view, BOOL dsv) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1bce4def265..48bea5980ff 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -139,6 +139,7 @@ @ cdecl wined3d_device_context_set_stream_outputs(ptr ptr) @ cdecl wined3d_device_context_set_stream_sources(ptr long long ptr) @ cdecl wined3d_device_context_set_unordered_access_views(ptr long long long ptr ptr) +@ cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(ptr long ptr ptr long ptr ptr) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_device_context_unmap(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7be893b8f21..7a6588ea4f4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2544,6 +2544,10 @@ HRESULT __cdecl wined3d_device_context_set_stream_sources(struct wined3d_device_ void __cdecl wined3d_device_context_set_unordered_access_views(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int start_idx, unsigned int count, struct wined3d_unordered_access_view *const *uavs, const unsigned int *initial_counts); +void __cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(struct wined3d_device_context *context, + unsigned int rtv_count, struct wined3d_rendertarget_view *const *render_target_views, + struct wined3d_rendertarget_view *depth_stencil_view, UINT uav_count, + struct wined3d_unordered_access_view *const *unordered_access_views, const unsigned int *initial_counts); void __cdecl wined3d_device_context_set_vertex_declaration(struct wined3d_device_context *context, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,

1 0