April 2015 - Wine-Commits - list.winehq.org

Bruno Jesus : ws2_32: Fix copy & paste error in fd_sets_to_poll (Coverity) .
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 5c8aad8d76828dd60a4e9d3639d546eaa586d68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8aad8d76828dd60a4e9d363… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 5 11:48:57 2015 -0300 ws2_32: Fix copy & paste error in fd_sets_to_poll (Coverity). --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d8d724b..7f3134e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4625,7 +4625,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set } else { - release_sock_fd( readfds->fd_array[i], fds[j].fd ); + release_sock_fd( writefds->fd_array[i], fds[j].fd ); fds[j].fd = -1; fds[j].events = 0; } @@ -4650,7 +4650,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set } else { - release_sock_fd( readfds->fd_array[i], fds[j].fd ); + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); fds[j].fd = -1; fds[j].events = 0; }

1 0

Nikolay Sivov : browseui: Return interface pointer instead of impl pointer.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 77a63b724564514f41da29aecc595c7ef323e716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a63b724564514f41da29aec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:39:26 2015 +0300 browseui: Return interface pointer instead of impl pointer. --- dlls/browseui/aclmulti.c | 2 +- dlls/browseui/aclsource.c | 2 +- dlls/browseui/compcatcachedaemon.c | 2 +- dlls/browseui/progressdlg.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index e7edece..6deb30d 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -325,7 +325,7 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IEnumString_iface; BROWSEUI_refCount++; return S_OK; } diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index aa31d08..07033cc 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -147,6 +147,6 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IACList2_iface; return S_OK; } diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 5ed9f37..a5c97e9 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -158,7 +158,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs"); TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IRunnableTask_iface; InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 7d07ee9..70c78c9 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -579,7 +579,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IProgressDialog_iface; InterlockedIncrement(&BROWSEUI_refCount); return S_OK; }

1 0

Nikolay Sivov : dmscript: Implement GetClassID() for IDirectMusicTrack.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 52251ac6da29c261501029c8868368c37840a69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52251ac6da29c261501029c88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:07:00 2015 +0300 dmscript: Implement GetClassID() for IDirectMusicTrack. --- dlls/dmscript/scripttrack.c | 12 ++++++++++-- dlls/dmscript/tests/dmscript.c | 8 ++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index ddae8b5..bc8e8ce 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -264,7 +264,15 @@ static ULONG WINAPI IPersistStreamImpl_Release(IPersistStream *iface) static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID *pClassID) { - return E_NOTIMPL; + DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, pClassID); + + if (!pClassID) + return E_POINTER; + + *pClassID = This->desc.guidClass; + return S_OK; } static HRESULT WINAPI IPersistStreamImpl_IsDirty(IPersistStream *iface) @@ -319,7 +327,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->desc.dwSize = sizeof(track->desc); - track->desc.dwValidData |= DMUS_OBJ_CLASS; + track->desc.dwValidData = DMUS_OBJ_CLASS; track->desc.guidClass = CLSID_DirectMusicScriptTrack; track->ref = 1; diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 59858d5..82e874c 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -217,9 +217,13 @@ static void test_scripttrack(void) /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + + hr = IPersistStream_GetClassID(ps, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */

1 0

Sebastian Lackner : include: Automatically detect if tests are running under Wine when WINETEST_PLATFORM is not specified.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 61b8a189c531ab1712039355267c45fca5b5d032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b8a189c531ab17120393552… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Nov 23 22:50:34 2014 +0100 include: Automatically detect if tests are running under Wine when WINETEST_PLATFORM is not specified. --- include/wine/test.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index f8b608f..567229a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -618,6 +618,14 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_EXECUTE_HANDLER; } +/* check if we're running under wine */ +static BOOL running_under_wine(void) +{ + HMODULE module = GetModuleHandleA( "ntdll.dll" ); + if (!module) return FALSE; + return (GetProcAddress( module, "wine_server_call" ) != NULL); +} + #ifdef __GNUC__ void _fpreset(void) {} /* override the mingw fpu init code */ #endif @@ -632,7 +640,11 @@ int main( int argc, char **argv ) winetest_argc = argc; winetest_argv = argv; - if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) winetest_platform = strdup(p); + if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) + winetest_platform = strdup(p); + else if (running_under_wine()) + winetest_platform = "wine"; + if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p);

1 0

Sebastian Lackner : secur32: Return more context attributes in schan_InitializeSecurityContextW.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 8729575112802b34c6509642187b67d6873d2c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8729575112802b34c65096421… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 11 08:50:46 2014 +0100 secur32: Return more context attributes in schan_InitializeSecurityContextW. --- dlls/secur32/schannel.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5b86a75..12d4c8d 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -908,8 +908,16 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } *pfContextAttr = 0; + if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT) + *pfContextAttr |= ISC_RET_REPLAY_DETECT; + if (ctx->req_ctx_attr & ISC_REQ_SEQUENCE_DETECT) + *pfContextAttr |= ISC_RET_SEQUENCE_DETECT; + if (ctx->req_ctx_attr & ISC_REQ_CONFIDENTIALITY) + *pfContextAttr |= ISC_RET_CONFIDENTIALITY; if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; + if (ctx->req_ctx_attr & ISC_REQ_STREAM) + *pfContextAttr |= ISC_RET_STREAM; return ret; }

1 0

Sebastian Lackner : user32: Check for NULL pointer in ToUnicodeEx.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1059ee3cba030988091b54254a13d5899621e3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1059ee3cba030988091b54254… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 6 10:18:04 2015 +0200 user32: Check for NULL pointer in ToUnicodeEx. --- dlls/user32/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0ed4218..b6eecbe 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1022,6 +1022,7 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWSTR lpwStr, int size, UINT flags, HKL hkl) { + if (!lpKeyState) return 0; return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl); }

1 0

Mark Harmstone : kernel32: Stub out GetFileMUIPath.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: ed0c6746dd66f88939ee7623c521f81aa6704f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c6746dd66f88939ee7623c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 4 17:09:09 2015 +0100 kernel32: Stub out GetFileMUIPath. --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index e2a7bed..d5daa65 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -12,7 +12,7 @@ @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo -@ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath @ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index 32d2c76..50e113e 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -13,7 +13,7 @@ @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo -@ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath @ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d94c307..130affc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -677,7 +677,7 @@ @ stdcall GetFileInformationByHandle(long ptr) @ stdcall GetFileInformationByHandleEx(long long ptr long) # @ stub GetFileMUIInfo -# @ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7798b91..9896872 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5300,3 +5300,18 @@ BOOL WINAPI GetUserPreferredUILanguages(DWORD flags, PULONG numlangs, PZZWSTR la FIXME( "stub: %u %p %p %p\n", flags, numlangs, langbuffer, bufferlen ); return FALSE; } + +/****************************************************************************** + * GetFileMUIPath (KERNEL32.@) + */ + +BOOL WINAPI GetFileMUIPath(DWORD flags, PCWSTR filepath, PWSTR language, PULONG languagelen, + PWSTR muipath, PULONG muipathlen, PULONGLONG enumerator) +{ + FIXME("stub: 0x%x, %s, %s, %p, %p, %p, %p\n", flags, debugstr_w(filepath), + debugstr_w(language), languagelen, muipath, muipathlen, enumerator); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +}

1 0

Nikolay Sivov : dwrite: Add cluster metrics entry for inline objects too.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: b16432f2c293e6f122ebf83cc893152ca2e3714d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16432f2c293e6f122ebf83cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:05:52 2015 +0300 dwrite: Add cluster metrics entry for inline objects too. --- dlls/dwrite/layout.c | 172 +++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 12 ++-- 2 files changed, 115 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b16432f2c293e6f122ebf…

1 0

Sebastian Lackner : kernel32: Fix calculation of returned buffer in get_registry_locale_info.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 51c21cca9848d65948d14bd70ddf37ca2e2faf83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c21cca9848d65948d14bd70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 3 14:25:57 2015 +0200 kernel32: Fix calculation of returned buffer in get_registry_locale_info. Fixes a regression introduced by 8826ba1bc86fefa22c543608585ae8f3b4310a5f. --- dlls/kernel32/locale.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index afc5b9d..7798b91 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1177,6 +1177,17 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + /* try again with a bigger buffer when we have to return the correct size */ + if (status == STATUS_BUFFER_OVERFLOW && !buffer && size > info_size) + { + KEY_VALUE_PARTIAL_INFORMATION *new_info; + if ((new_info = HeapReAlloc( GetProcessHeap(), 0, info, size ))) + { + info = new_info; + status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + } + } + NtClose( hkey ); if (!status) @@ -1207,8 +1218,6 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS if (status == STATUS_BUFFER_OVERFLOW && !buffer) { ret = (size - info_size) / sizeof(WCHAR); - if (!ret || ((WCHAR *)&info->Data)[ret-1]) - ret++; } else if (status == STATUS_OBJECT_NAME_NOT_FOUND) {

1 0

Sebastian Lackner : user32/tests: Add tests for ToUnicodeEx with a NULL pointer as keystate.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: a2695810e70d0d0147925e80eb4c21ee60eea409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2695810e70d0d0147925e80e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 6 10:23:26 2015 +0200 user32/tests: Add tests for ToUnicodeEx with a NULL pointer as keystate. --- dlls/user32/tests/input.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index a523f0a..6f20496 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1542,7 +1542,7 @@ static void test_ToUnicode(void) { WCHAR wStr[4]; BYTE state[256]; - const BYTE SC_RETURN = 0x1c, SC_TAB = 0x0f; + const BYTE SC_RETURN = 0x1c, SC_TAB = 0x0f, SC_A = 0x1e; const BYTE HIGHEST_BIT = 0x80; int i, ret; for(i=0; i<256; i++) @@ -1564,9 +1564,13 @@ static void test_ToUnicode(void) ok(wStr[1]==0 || broken(wStr[1]!=0) /* nt4 */, "ToUnicode didn't null-terminate the buffer when there was room.\n"); } + + ret = ToUnicode('A', SC_A, state, wStr, 4, 0); + ok(ret == 1, "ToUnicode for character A didn't return 1 (was %i)\n", ret); + ok(wStr[0] == 'a', "ToUnicode for character 'A' was %i (expected %i)\n", wStr[0], 'a'); + state[VK_CONTROL] |= HIGHEST_BIT; state[VK_LCONTROL] |= HIGHEST_BIT; - ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); @@ -1575,12 +1579,29 @@ static void test_ToUnicode(void) if(ret == 1) ok(wStr[0]=='\n', "ToUnicode for CTRL + Return was %i (expected 10)\n", wStr[0]); + ret = ToUnicode('A', SC_A, state, wStr, 4, 0); + ok(ret == 1, "ToUnicode for CTRL + character A didn't return 1 (was %i)\n", ret); + ok(wStr[0] == 1, "ToUnicode for CTRL + character 'A' was %i (expected 1)\n", wStr[0]); + state[VK_SHIFT] |= HIGHEST_BIT; state[VK_LSHIFT] |= HIGHEST_BIT; ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); ok(ret == 0, "ToUnicode for CTRL + SHIFT + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); + + ret = ToUnicode(VK_TAB, SC_TAB, NULL, wStr, 4, 0); + ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicode(VK_RETURN, SC_RETURN, NULL, wStr, 4, 0); + ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicode('A', SC_A, NULL, wStr, 4, 0); + ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicodeEx(VK_TAB, SC_TAB, NULL, wStr, 4, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToUnicodeEx with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicodeEx(VK_RETURN, SC_RETURN, NULL, wStr, 4, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToUnicodeEx with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicodeEx('A', SC_A, NULL, wStr, 4, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToUnicodeEx with NULL keystate didn't return 0 (was %i)\n", ret); } static void test_get_async_key_state(void)

1 0