March 2018 - Wine-commits - list.winehq.org

Alex Henrie : advapi32: Add stub for LsaLookupPrivilegeName.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 6c71e0f52fd8562294517dcf9d401308df461937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c71e0f52fd8562294517dcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 19 09:10:28 2017 -0600 advapi32: Add stub for LsaLookupPrivilegeName. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 252385db7f8d83c4512955875e2d36592e7442c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0ecd4e9..600255d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -446,7 +446,7 @@ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) @ stdcall LsaLookupNames(long long ptr ptr ptr) @ stub LsaLookupPrivilegeDisplayName -# @ stub LsaLookupPrivilegeName +@ stdcall LsaLookupPrivilegeName(long ptr ptr) # @ stub LsaLookupPrivilegeValue @ stdcall LsaLookupSids(ptr long ptr ptr ptr) # @ stub LsaManageSidNameMapping diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 2a8b791..28d9061 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -961,3 +961,16 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification( FIXME("(%d,%p) stub\n", class, event); return STATUS_SUCCESS; } + +/****************************************************************************** + * LsaLookupPrivilegeName [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaLookupPrivilegeName( + LSA_HANDLE handle, + LUID *luid, + UNICODE_STRING **name) +{ + FIXME("(%p,%p,%p) stub\n", handle, luid, name); + return STATUS_NO_SUCH_PRIVILEGE; +}

1 0

Nikolay Sivov : advapi32: Partially implement LsaLookupPrivilegeName().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: f13ad9e3169bf365cbe4a82c7301edba5acc0d48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f13ad9e3169bf365cbe4a82c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:19 2017 +0300 advapi32: Partially implement LsaLookupPrivilegeName(). Based on patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c8427e0dc59edcbafc3d664d92f04063c69c30c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 1 + dlls/advapi32/lsa.c | 32 ++++++++++++++++++++++++++------ dlls/advapi32/security.c | 9 +++++++++ dlls/advapi32/tests/lsa.c | 36 ++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntlsa.h | 19 +++++++++++++++++++ 6 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 425a7be..240abc8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -34,6 +34,7 @@ WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; +const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* heap allocation helpers */ static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 28d9061..47ed8e5 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -966,11 +966,31 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification( * LsaLookupPrivilegeName [ADVAPI32.@] * */ -NTSTATUS WINAPI LsaLookupPrivilegeName( - LSA_HANDLE handle, - LUID *luid, - UNICODE_STRING **name) +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE handle, LUID *luid, LSA_UNICODE_STRING **name) { - FIXME("(%p,%p,%p) stub\n", handle, luid, name); - return STATUS_NO_SUCH_PRIVILEGE; + const WCHAR *privnameW; + DWORD length; + WCHAR *strW; + + TRACE("(%p,%p,%p)\n", handle, luid, name); + + if (!luid || !handle) + return STATUS_INVALID_PARAMETER; + + *name = NULL; + + if (!(privnameW = get_wellknown_privilege_name(luid))) + return STATUS_NO_SUCH_PRIVILEGE; + + length = strlenW(privnameW); + *name = heap_alloc(sizeof(**name) + (length + 1) * sizeof(WCHAR)); + if (!*name) + return STATUS_NO_MEMORY; + + strW = (WCHAR *)(*name + 1); + memcpy(strW, privnameW, length * sizeof(WCHAR)); + strW[length] = 0; + RtlInitUnicodeString(*name, strW); + + return STATUS_SUCCESS; } diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7e41c0a..9c419a3 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1872,6 +1872,15 @@ static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = SE_CREATE_GLOBAL_NAME_W, }; +const WCHAR *get_wellknown_privilege_name(const LUID *luid) +{ + if (luid->HighPart || luid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE || + luid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE || !WellKnownPrivNames[luid->LowPart]) + return NULL; + + return WellKnownPrivNames[luid->LowPart]; +} + /****************************************************************************** * LookupPrivilegeValueW [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 1a0d211..6e3694a 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -32,6 +32,8 @@ #include "objbase.h" #include "initguid.h" #include "wine/test.h" +#include "winternl.h" +#include "ntlsa.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -405,6 +407,39 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); } +static void test_LsaLookupPrivilegeName(void) +{ + LSA_OBJECT_ATTRIBUTES attrs; + LSA_UNICODE_STRING *name; + LSA_HANDLE policy; + NTSTATUS status; + LUID luid; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "Failed to open policy, %#x.\n", status); + + name = (void *)0xdeadbeef; + status = LsaLookupPrivilegeName(policy, NULL, &name); + ok(status != STATUS_SUCCESS, "Unexpected status %#x.\n", status); + ok(name == (void *)0xdeadbeef, "Unexpected name pointer.\n"); + + name = (void *)0xdeadbeef; + luid.HighPart = 1; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == STATUS_NO_SUCH_PRIVILEGE, "Unexpected status %#x.\n", status); + ok(name == NULL, "Unexpected name pointer.\n"); + + luid.HighPart = 0; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == 0, "got %#x.\n", status); + LsaFreeMemory(name); +} + START_TEST(lsa) { if (!init()) { @@ -415,4 +450,5 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); + test_LsaLookupPrivilegeName(); } diff --git a/include/Makefile.in b/include/Makefile.in index 0b5e6ad..94d8f75 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -521,6 +521,7 @@ HEADER_SRCS = \ ntddstor.h \ ntdef.h \ ntdsapi.h \ + ntlsa.h \ ntquery.h \ ntsecapi.h \ ntsecpkg.h \ diff --git a/include/ntlsa.h b/include/ntlsa.h new file mode 100644 index 0000000..468c14e --- /dev/null +++ b/include/ntlsa.h @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * 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 + */ + +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Zebediah Figura : dinput/tests: Don't pump messages in test_acquire().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 292e43263f60c602ae35658f29cba3eda85272e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=292e43263f60c602ae35658f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 17:26:59 2017 -0500 dinput/tests: Don't pump messages in test_acquire(). This causes intermittent failures due to implementation of our window drivers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51895145fd67d3dd055888caaba7af413e4753f6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/mouse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 262ed0e..0f9e375 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -93,7 +93,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; - MSG msg; int i; if (! SetForegroundWindow(hwnd)) @@ -132,7 +131,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

1 0

Nikolay Sivov : d3dx9: Implement D3DXFrameFind().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 10bf711c021f66c818e66c37731f7ea852b2967c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bf711c021f66c818e66c37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 6 13:31:10 2017 +0300 d3dx9: Implement D3DXFrameFind(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6bae0a003e893072ab2b636d5b6c982d76b39f36) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/mesh.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 22 files changed, 176 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10bf711c021f66c818e6…

1 0

Nikolay Sivov : msvcrt: Implement _memicmp_l().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: beba04be54874e622136b2c923f70198f213260b URL: https://source.winehq.org/git/wine.git/?a=commit;h=beba04be54874e622136b2c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 8 10:26:16 2017 +0100 msvcrt: Implement _memicmp_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d045a5ea29aada4182689cd80f4b57a694322b42) Conflicts: dlls/msvcr100/tests/msvcr100.c dlls/msvcrt/tests/string.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr100/tests/msvcr100.c | 87 +++++++++++++ dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcr90/tests/msvcr90.c | 69 +++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/string.c | 34 ++++++ dlls/msvcrt/tests/string.c | 84 +++++++++++++ dlls/ucrtbase/tests/string.c | 134 ++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 4 +- 16 files changed, 425 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=beba04be54874e622136…

1 0

Akihiro Sagawa : imm32/tests: Add a skip message when composition string isn't available.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 9b0109da6230e93258d94f51a3aa687f8b8b9dc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0109da6230e93258d94f51… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:47 2017 +0900 imm32/tests: Add a skip message when composition string isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c1dac18c6ae9b19b1549242867e7707807041f2a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/tests/imm32.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index b02f85d..99d95c1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -361,11 +361,19 @@ static void test_ImmGetCompositionString(void) static const WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; char cstring[20]; WCHAR wstring[20]; - DWORD len; - DWORD alen,wlen; + LONG len; + LONG alen,wlen; + BOOL ret; imc = ImmGetContext(hwnd); - ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + if (!ret) { + win_skip("Composition isn't supported\n"); + ImmReleaseContext(hwnd, imc); + return; + } + msg_spy_flush_msgs(); + alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 20); /* windows machines without any IME installed just return 0 above */ @@ -376,6 +384,9 @@ static void test_ImmGetCompositionString(void) len = ImmGetCompositionStringA(imc, GCS_COMPATTR, NULL, 0); ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); } + else + win_skip("Composition string isn't available\n"); + ImmReleaseContext(hwnd, imc); }

1 0

Akihiro Sagawa : imm32/tests: Add more composition string tests.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: cc550515d2818ac4597d1c0339b2f7153e0cbadd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc550515d2818ac4597d1c03… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:49 2017 +0900 imm32/tests: Add more composition string tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3955ce1e0a882cce7237920ad06d176a14da7a27) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/tests/imm32.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 99d95c1..bf0f4b2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -355,6 +355,63 @@ static void test_ImmNotifyIME(void) { } +static struct { + WNDPROC old_wnd_proc; + BOOL catch_result_str; + BOOL catch_ime_char; + DWORD start; + DWORD timer_id; +} ime_composition_test; + +static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_IME_COMPOSITION: + if ((lParam & GCS_RESULTSTR) && !ime_composition_test.catch_result_str) { + WCHAR wstring[20]; + HIMC imc; + LONG size; + LRESULT ret; + + ret = CallWindowProcA(ime_composition_test.old_wnd_proc, + hWnd, msg, wParam, lParam); + + imc = ImmGetContext(hWnd); + size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, + wstring, sizeof(wstring)); + todo_wine + ok(size > 0, "ImmGetCompositionString(GCS_RESULTSTR) is %d\n", size); + ImmReleaseContext(hwnd, imc); + + ime_composition_test.catch_result_str = TRUE; + return ret; + } + break; + case WM_IME_CHAR: + if (!ime_composition_test.catch_ime_char) + ime_composition_test.catch_ime_char = TRUE; + break; + case WM_TIMER: + if (wParam == ime_composition_test.timer_id) { + HWND parent = GetParent(hWnd); + char title[64]; + int left = 20 - (GetTickCount() - ime_composition_test.start) / 1000; + wsprintfA(title, "%sLeft %d sec. - IME composition test", + ime_composition_test.catch_result_str ? "[*] " : "", left); + SetWindowTextA(parent, title); + if (left <= 0) + DestroyWindow(parent); + else + SetTimer(hWnd, wParam, 100, NULL); + return TRUE; + } + break; + } + return CallWindowProcA(ime_composition_test.old_wnd_proc, + hWnd, msg, wParam, lParam); +} + static void test_ImmGetCompositionString(void) { HIMC imc; @@ -364,6 +421,7 @@ static void test_ImmGetCompositionString(void) LONG len; LONG alen,wlen; BOOL ret; + DWORD prop; imc = ImmGetContext(hwnd); ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); @@ -388,6 +446,89 @@ static void test_ImmGetCompositionString(void) win_skip("Composition string isn't available\n"); ImmReleaseContext(hwnd, imc); + + /* Test composition results input by IMM API */ + prop = ImmGetProperty(GetKeyboardLayout(0), IGP_SETCOMPSTR); + if (!(prop & SCS_CAP_COMPSTR)) { + /* Wine's IME doesn't support SCS_SETSTR in ImmSetCompositionString */ + skip("This IME doesn't support SCS_SETSTR\n"); + } + else { + ime_composition_test.old_wnd_proc = + (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)test_ime_wnd_proc); + imc = ImmGetContext(hwnd); + msg_spy_flush_msgs(); + + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, + string, sizeof(string), NULL,0); + ok(ret, "ImmSetCompositionStringW failed\n"); + wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, + wstring, sizeof(wstring)); + if (wlen > 0) { + ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ok(ret, "ImmNotifyIME(CPS_COMPLETE) failed\n"); + msg_spy_flush_msgs(); + ok(ime_composition_test.catch_result_str, + "WM_IME_COMPOSITION(GCS_RESULTSTR) isn't sent\n"); + ok(ime_composition_test.catch_ime_char, + "WM_IME_CHAR isn't sent\n"); + } + else + win_skip("Composition string isn't available\n"); + ImmReleaseContext(hwnd, imc); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)ime_composition_test.old_wnd_proc); + msg_spy_flush_msgs(); + } + + /* Test composition results input by hand */ + memset(&ime_composition_test, 0, sizeof(ime_composition_test)); + if (winetest_interactive) { + HWND hwndMain, hwndChild; + MSG msg; + const DWORD MY_TIMER = 0xcaffe; + + hwndMain = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, + "IME composition test", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 320, 160, + NULL, NULL, GetModuleHandleA(NULL), NULL); + hwndChild = CreateWindowExA(0, "static", + "Input a DBCS character here using IME.", + WS_CHILD | WS_VISIBLE | 0 + /* ES_AUTOHSCROLL | ES_MULTILINE */, + 0, 0, 320, 100, hwndMain, NULL, + GetModuleHandleA(NULL), NULL); + + ime_composition_test.old_wnd_proc = + (WNDPROC)SetWindowLongPtrA(hwndChild, GWLP_WNDPROC, + (LONG_PTR)test_ime_wnd_proc); + + SetFocus(hwndChild); + + /* FIXME: In wine, IME UI window is created in ImmSetOpenStatus(). + So, we prepare it here to generate WM_IME_CHAR messages. */ + imc = ImmGetContext(hwndChild); + ImmSetOpenStatus(imc, FALSE); + ImmReleaseContext(hwndChild, imc); + + ime_composition_test.timer_id = MY_TIMER; + ime_composition_test.start = GetTickCount(); + SetTimer(hwndChild, ime_composition_test.timer_id, 100, NULL); + while (GetMessageA(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + if (!IsWindow(hwndMain)) + break; + } + if (!ime_composition_test.catch_result_str) + skip("WM_IME_COMPOSITION(GCS_RESULTSTR) isn't tested\n"); + else + ok(ime_composition_test.catch_ime_char, + "WM_IME_CHAR isn't sent\n"); + msg_spy_flush_msgs(); + } } static void test_ImmSetCompositionString(void)

1 0

Akihiro Sagawa : winex11: Keep the result string in the IME UI window procedure.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0354a5f3e2559f5f6e62de4f90b44b702f46f161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0354a5f3e2559f5f6e62de4f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:51 2017 +0900 winex11: Keep the result string in the IME UI window procedure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8dc1e7cde64c212882958c0806b50911a360fb9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/tests/imm32.c | 1 - dlls/winex11.drv/ime.c | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index bf0f4b2..12e8f99 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -380,7 +380,6 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR imc = ImmGetContext(hWnd); size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, wstring, sizeof(wstring)); - todo_wine ok(size > 0, "ImmGetCompositionString(GCS_RESULTSTR) is %d\n", size); ImmReleaseContext(hwnd, imc); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0f4d2b2..d0746c5 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -906,6 +906,11 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, myPrivate->bInComposition = TRUE; } + /* clear existing result */ + newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + flags = GCS_COMPSTR; if (dwCompLen && lpComp) @@ -1256,7 +1261,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) LPCOMPOSITIONSTRING compstr; LPBYTE compdata; LPWSTR ResultStr; - HIMCC newCompStr; LPINPUTCONTEXT lpIMC; lpIMC = LockRealIMC(hIMC); @@ -1269,11 +1273,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); GenerateIMECHARMessages(hIMC, ResultStr, compstr->dwResultStrLen); ImmUnlockIMCC(lpIMC->hCompStr); - - /* clear the buffer */ - newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; UnlockRealIMC(hIMC); } else

1 0

Kimmo Myllyvirta : xaudio2: Add support for float formats with more than 2 channels.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 4081b2c2793bcdb207edaa4a85d4f5ce7c482a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4081b2c2793bcdb207edaa4a… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sun Nov 12 12:35:34 2017 +0200 xaudio2: Add support for float formats with more than 2 channels. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b94c5b51c2c706dd8fa42cec4631f386f3a8562) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b2a5e3b..f3a749c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -499,6 +499,14 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) return AL_FORMAT_MONO_FLOAT32; case 2: return AL_FORMAT_STEREO_FLOAT32; + case 4: + return AL_FORMAT_QUAD32; + case 6: + return AL_FORMAT_51CHN32; + case 7: + return AL_FORMAT_61CHN32; + case 8: + return AL_FORMAT_71CHN32; } } }

1 0

Huw Davies : comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 63be724f84cbb9815543e4462d8a52acbe69d302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63be724f84cbb9815543e446… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 30 18:54:07 2017 +0000 comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2dd0fb880c005cd5660928d1646a117407cec238) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/imagelist.c | 42 +++++++-- dlls/comctl32/tests/imagelist.c | 203 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 239 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63be724f84cbb9815543…

1 0