December 2019 - Wine-Commits

Alexandre Julliard : ntdll: Fix RtlQueryUnbiasedInterruptTime() prototype.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 8b0a7b25036f74ebe60b3bd5b7b6ecd37f5f1385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0a7b25036f74ebe60b3bd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 18:44:07 2019 +0100 ntdll: Fix RtlQueryUnbiasedInterruptTime() prototype. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48239 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntdll/time.c | 9 +++++++-- include/winternl.h | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 5faabd36e1..28312bac3c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -1027,6 +1027,38 @@ static void test_GetTickCount(void) ok(t2 <= t3, "out of order %d %d\n", t2, t3); } +BOOL (WINAPI *pQueryUnbiasedInterruptTime)(ULONGLONG *time); +BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)(ULONGLONG *time); + +static void test_QueryUnbiasedInterruptTime(void) +{ + ULONGLONG time; + BOOL ret; + + if (pQueryUnbiasedInterruptTime) + { + SetLastError( 0xdeadbeef ); + ret = pQueryUnbiasedInterruptTime( &time ); + ok( ret, "QueryUnbiasedInterruptTime failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pQueryUnbiasedInterruptTime( NULL ); + ok( !ret, "QueryUnbiasedInterruptTime succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + else win_skip( "QueryUnbiasedInterruptTime not supported\n" ); + if (pRtlQueryUnbiasedInterruptTime) + { + SetLastError( 0xdeadbeef ); + ret = pRtlQueryUnbiasedInterruptTime( &time ); + ok( ret, "RtlQueryUnbiasedInterruptTime failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pRtlQueryUnbiasedInterruptTime( NULL ); + ok( !ret, "RtlQueryUnbiasedInterruptTime succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + else win_skip( "RtlQueryUnbiasedInterruptTime not supported\n" ); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); @@ -1039,7 +1071,9 @@ START_TEST(time) pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); pGetTimeZoneInformationForYear = (void *)GetProcAddress(hKernel, "GetTimeZoneInformationForYear"); + pQueryUnbiasedInterruptTime = (void *)GetProcAddress(hKernel, "QueryUnbiasedInterruptTime"); pNtGetTickCount = (void *)GetProcAddress(hntdll, "NtGetTickCount"); + pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(hntdll, "RtlQueryUnbiasedInterruptTime"); test_conversions(); test_invalid_arg(); @@ -1055,4 +1089,5 @@ START_TEST(time) test_GetSystemTimePreciseAsFileTime(); test_GetTimeZoneInformationForYear(); test_GetTickCount(); + test_QueryUnbiasedInterruptTime(); } diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 4e3d5583c7..7f79c3e4ff 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -1121,8 +1121,13 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old /*********************************************************************** * RtlQueryUnbiasedInterruptTime [NTDLL.@] */ -NTSTATUS WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG *time) +BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG *time) { + if (!time) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + return FALSE; + } *time = monotonic_counter(); - return STATUS_SUCCESS; + return TRUE; } diff --git a/include/winternl.h b/include/winternl.h index 9e7e2bad93..0122684483 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2849,7 +2849,7 @@ NTSYSAPI BOOL WINAPI RtlQueryPerformanceFrequency(LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*); -NTSYSAPI NTSTATUS WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); +NTSYSAPI BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); NTSYSAPI NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); NTSYSAPI void WINAPI RtlRaiseException(PEXCEPTION_RECORD); NTSYSAPI void WINAPI RtlRaiseStatus(NTSTATUS);

1 0

Alexandre Julliard : kernel32: Duplicate OutputDebugStringA implementation.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 4ac3cbd6ccba52ad8d528ee7456207defc8fdcdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac3cbd6ccba52ad8d528ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 12:00:36 2019 +0100 kernel32: Duplicate OutputDebugStringA implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48059 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 3a2e988741..f9d398fd35 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -33,6 +33,108 @@ WINE_DEFAULT_DEBUG_CHANNEL(debugstr); +static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + +/*********************************************************************** + * OutputDebugStringA (KERNEL32.@) + * + * Duplicate since IMVU doesn't like it if we call kernelbase.OutputDebugStringA. + */ +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) +{ + static HANDLE DBWinMutex = NULL; + static BOOL mutex_inited = FALSE; + BOOL caught_by_dbg = TRUE; + + if (!str) str = ""; + WARN( "%s\n", debugstr_a(str) ); + + /* raise exception, WaitForDebugEvent() will generate a corresponding debug event */ + __TRY + { + ULONG_PTR args[2]; + args[0] = strlen(str) + 1; + args[1] = (ULONG_PTR)str; + RaiseException( DBG_PRINTEXCEPTION_C, 0, 2, args ); + } + __EXCEPT(debug_exception_handler) + { + caught_by_dbg = FALSE; + } + __ENDTRY + if (caught_by_dbg) return; + + /* send string to a system-wide monitor */ + if (!mutex_inited) + { + /* first call to OutputDebugString, initialize mutex handle */ + static const WCHAR mutexname[] = {'D','B','W','i','n','M','u','t','e','x',0}; + HANDLE mutex = CreateMutexExW( NULL, mutexname, 0, SYNCHRONIZE ); + if (mutex) + { + if (InterlockedCompareExchangePointer( &DBWinMutex, mutex, 0 ) != 0) + /* someone beat us here... */ + CloseHandle( mutex ); + } + mutex_inited = TRUE; + } + + if (DBWinMutex) + { + static const WCHAR shmname[] = {'D','B','W','I','N','_','B','U','F','F','E','R',0}; + static const WCHAR eventbuffername[] = {'D','B','W','I','N','_','B','U','F','F','E','R','_','R','E','A','D','Y',0}; + static const WCHAR eventdataname[] = {'D','B','W','I','N','_','D','A','T','A','_','R','E','A','D','Y',0}; + HANDLE mapping; + + mapping = OpenFileMappingW( FILE_MAP_WRITE, FALSE, shmname ); + if (mapping) + { + LPVOID buffer; + HANDLE eventbuffer, eventdata; + + buffer = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); + eventbuffer = OpenEventW( SYNCHRONIZE, FALSE, eventbuffername ); + eventdata = OpenEventW( EVENT_MODIFY_STATE, FALSE, eventdataname ); + + if (buffer && eventbuffer && eventdata) + { + /* monitor is present, synchronize with other OutputDebugString invocations */ + WaitForSingleObject( DBWinMutex, INFINITE ); + + /* acquire control over the buffer */ + if (WaitForSingleObject( eventbuffer, 10000 ) == WAIT_OBJECT_0) + { + int str_len = strlen( str ); + struct _mon_buffer_t + { + DWORD pid; + char buffer[1]; + } *mon_buffer = (struct _mon_buffer_t*) buffer; + + if (str_len > (4096 - sizeof(DWORD) - 1)) str_len = 4096 - sizeof(DWORD) - 1; + mon_buffer->pid = GetCurrentProcessId(); + memcpy( mon_buffer->buffer, str, str_len ); + mon_buffer->buffer[str_len] = 0; + + /* signal data ready */ + SetEvent( eventdata ); + } + ReleaseMutex( DBWinMutex ); + } + + if (buffer) UnmapViewOfFile( buffer ); + if (eventbuffer) CloseHandle( eventbuffer ); + if (eventdata) CloseHandle( eventdata ); + CloseHandle( mapping ); + } + } +} + + /*********************************************************************** * DebugBreakProcess (KERNEL32.@) * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 408ea41540..b580021706 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1136,7 +1136,7 @@ @ stdcall -i386 OpenVxDHandle(long) @ stdcall OpenWaitableTimerA(long long str) @ stdcall -import OpenWaitableTimerW(long long wstr) -@ stdcall -import OutputDebugStringA(str) +@ stdcall OutputDebugStringA(str) @ stdcall -import OutputDebugStringW(wstr) @ stdcall -import PeekConsoleInputA(ptr ptr long ptr) @ stdcall -import PeekConsoleInputW(ptr ptr long ptr)

1 0

Michael Stefaniuc : dswave/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 3d62a461d0cdd77ba82b1af9b01d18ba0868ce9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d62a461d0cdd77ba82b1af9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:41 2019 +0100 dswave/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/tests/dswave.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index d9bdc85ea7..62a76f1806 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -190,7 +190,6 @@ static void test_parsedescriptor(void) IStream *stream; DMUS_OBJECTDESC desc = {0}; HRESULT hr; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, mmioFOURCC('W','A','V','E'), DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -279,7 +278,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -291,7 +290,7 @@ static void test_parsedescriptor(void) ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Alistair Leslie-Hughes : dmloader: Release objects on error paths (Coverity).
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 6e986bbd810890339569f82aca39273e41427f24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e986bbd810890339569f82a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 16 20:49:38 2019 +0100 dmloader: Release objects on error paths (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 12 ++++++++++++ dlls/dmloader/loaderstream.c | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index a267d2d6b2..51eeb57879 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -384,18 +384,24 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* create object */ result = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(result)) { + IStream_Release(pStream); ERR(": could not create object\n"); return result; } /* acquire PersistStream interface */ result = IDirectMusicObject_QueryInterface (pObject, &IID_IPersistStream, (LPVOID*)&pPersistStream); if (FAILED(result)) { + IStream_Release(pStream); + IDirectMusicObject_Release(pObject); ERR("failed to Query\n"); return result; } /* load */ result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { + IStream_Release(pStream); + IPersistStream_Release(pPersistStream); + IDirectMusicObject_Release(pObject); WARN(": failed to (completely) load object (%08x)\n", result); return result; } @@ -408,6 +414,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac lstrcpyW (GotDesc.wszFileName, pDesc->wszFileName); } if (FAILED(result)) { + IStream_Release(pStream); + IPersistStream_Release(pPersistStream); + IDirectMusicObject_Release(pObject); ERR(": failed to get descriptor\n"); return result; } @@ -524,6 +533,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* create object */ hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(hr)) { + IStream_Release(pStream); ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr); return DMUS_E_LOADER_FAILEDOPEN; } @@ -537,6 +547,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { + IStream_Release(pStream); + IDirectMusicObject_Release(pObject); ERR(": couldn't parse descriptor\n"); return DMUS_E_LOADER_FORMATNOTSUPPORTED; } diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 855203ec3e..150a53524a 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -663,10 +663,11 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if TRACE("(%p, %p)\n", iface, ppstm); result = DMUSIC_CreateDirectMusicLoaderGenericStream ((LPVOID*)&pOther); if (FAILED(result)) return result; - - if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) + + if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) { + IStream_Release(pOther); return E_FAIL; - + } IDirectMusicLoaderGenericStream_Attach (pOther, pLowLevel, This->pLoader); TRACE(": succeeded\n");

1 0

Michael Stefaniuc : dmband/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 9d03ce02b471566f80ee57dad2fd05ae7409b81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d03ce02b471566f80ee57da… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:37 2019 +0100 dmband/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index dce8a47ba4..4b8aaf6120 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -392,8 +392,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc = {0}; HRESULT hr; DWORD valid; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -477,7 +475,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, @@ -492,7 +490,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -513,7 +511,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Akihiro Sagawa : kernelbase: Use translated Unicode default char to check invalid chars.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: a85bc781d380754a576db573959d4c76b5a32e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a85bc781d380754a576db573… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 16 22:39:41 2019 +0900 kernelbase: Use translated Unicode default char to check invalid chars. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48288 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 3 +++ dlls/kernelbase/locale.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index dc25c55652..2c081586f2 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1005,12 +1005,15 @@ static void test_undefined_byte_char(void) LPCSTR str; BOOL is_error; } testset[] = { + { 37, "\x6f", FALSE }, { 874, "\xdd", TRUE }, { 932, "\xfe", TRUE }, { 932, "\x80", FALSE }, + { 932, "\x81\x45", FALSE }, { 936, "\xff", TRUE }, { 949, "\xff", TRUE }, { 950, "\xff", TRUE }, + { 1252, "?", FALSE }, { 1252, "\x90", FALSE }, { 1253, "\xaa", TRUE }, { 1255, "\xff", TRUE }, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index fba15555d2..c250c97968 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1044,12 +1044,12 @@ static int check_invalid_chars( const CPTABLEINFO *info, const unsigned char *sr { if (srclen == 1) break; /* partial char, error */ if (info->DBCSOffsets[off + src[1]] == info->UniDefaultChar && - ((src[0] << 8) | src[1]) != info->TransDefaultChar) break; + ((src[0] << 8) | src[1]) != info->TransUniDefaultChar) break; src++; srclen--; continue; } - if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransDefaultChar) + if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransUniDefaultChar) break; if (is_private_use_area_char( info->MultiByteTable[*src] )) break; } @@ -1058,7 +1058,7 @@ static int check_invalid_chars( const CPTABLEINFO *info, const unsigned char *sr { for ( ; srclen; src++, srclen-- ) { - if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransDefaultChar) + if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransUniDefaultChar) break; if (is_private_use_area_char( info->MultiByteTable[*src] )) break; }

1 0

Michael Stefaniuc : dmstyle/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 7560f0c59d99c48f524573969e836d6f185cf914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7560f0c59d99c48f52457396… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:40 2019 +0100 dmstyle/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a63d1dbd1c..5130af773c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -475,8 +475,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc = {0}; HRESULT hr; DWORD valid; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -550,7 +548,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -562,7 +560,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -583,7 +581,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Chip Davis : kernel32: Forward OpenProcessToken() to kernelbase.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 27b9f6f6093826683063c16b8fee6ec4db9d987a URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b9f6f6093826683063c16b… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 11:49:00 2019 -0600 kernel32: Forward OpenProcessToken() to kernelbase. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index 753b20bf90..edec3d8812 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -24,7 +24,7 @@ @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index bf78530f29..e4cfec2b64 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -35,7 +35,7 @@ @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 9a986966d7..45d52ff171 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -40,7 +40,7 @@ @ stub IsProcessCritical @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 371e6c5865..a87747bf61 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1127,7 +1127,7 @@ # @ stub OpenPrivateNamespaceA # @ stub OpenPrivateNamespaceW @ stdcall -import OpenProcess(long long long) -# @ stub OpenProcessToken +@ stdcall -import OpenProcessToken(long long ptr) @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr)

1 0

Chip Davis : kernel32: Forward OpenThreadToken() to kernelbase.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 8834f123290063b1e75d50bdc113498ef8af0d24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8834f123290063b1e75d50bd… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 11:48:59 2019 -0600 kernel32: Forward OpenThreadToken() to kernelbase. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index eb2a4bdd6b..753b20bf90 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -26,7 +26,7 @@ @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 708a8eff09..bf78530f29 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -37,7 +37,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index a29ef43566..9a986966d7 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -42,7 +42,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1fcd0c1f61..371e6c5865 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1132,7 +1132,7 @@ @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr) @ stdcall -import OpenThread(long long long) -# @ stub OpenThreadToken +@ stdcall -import OpenThreadToken(long long long ptr) @ stdcall -i386 OpenVxDHandle(long) @ stdcall OpenWaitableTimerA(long long str) @ stdcall -import OpenWaitableTimerW(long long wstr)

1 0

Akihiro Sagawa : kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 3bb92d777385e229ed813397e2c7b57f7f5415bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb92d777385e229ed813397… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 16 22:39:39 2019 +0900 kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8fcc575a29..dc25c55652 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1001,7 +1001,7 @@ static void test_utf7_decoding(void) static void test_undefined_byte_char(void) { static const struct tag_testset { - INT codepage; + UINT codepage; LPCSTR str; BOOL is_error; } testset[] = { @@ -1017,6 +1017,7 @@ static void test_undefined_byte_char(void) { 1257, "\xa5", TRUE }, }; INT i, ret; + DWORD err; for (i = 0; i < ARRAY_SIZE(testset); i++) { if (! IsValidCodePage(testset[i].codepage)) @@ -1028,23 +1029,22 @@ static void test_undefined_byte_char(void) SetLastError(0xdeadbeef); ret = MultiByteToWideChar(testset[i].codepage, MB_ERR_INVALID_CHARS, testset[i].str, -1, NULL, 0); + err = GetLastError(); if (testset[i].is_error) { - ok(ret == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + ok(err == ERROR_NO_UNICODE_TRANSLATION, "Test %u: err is %u\n", i, err); + ok(ret == 0, "Test %u: ret is %d\n", i, ret); } else { - ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + ok(err == 0xdeadbeef, "Test %u: err is %u\n", i, err); + ok(ret == 2, "Test %u: ret is %d\n", i, ret); } SetLastError(0xdeadbeef); ret = MultiByteToWideChar(testset[i].codepage, 0, testset[i].str, -1, NULL, 0); - ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + err = GetLastError(); + ok(err == 0xdeadbeef, "Test %u: err is %u\n", i, err); + ok(ret == 2, "Test %u: ret is %d\n", i, ret); } }

1 0