December 2019 - Wine-commits

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

16 Dec '19

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

Michael Stefaniuc : dmime/tests: Use wide-char string literals.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 604b874b20b625a9ee127d86e4a69b5725ed50e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=604b874b20b625a9ee127d86… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:39 2019 +0100 dmime/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/dmime/tests/dmime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 5bb3a8b5b3..99295f391b 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -956,8 +956,6 @@ static void test_parsedescriptor(void) HRESULT hr; DWORD valid; unsigned int i; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; - const WCHAR s_inam[] = {'I','\0'}; /* fourcc ~0 will be replaced later on */ FOURCC alldesc[] = { @@ -1092,7 +1090,7 @@ static void test_parsedescriptor(void) "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); if (forms[i].form != mmioFOURCC('W','A','V','E')) - 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); @@ -1130,7 +1128,7 @@ static void test_parsedescriptor(void) valid |= DMUS_OBJ_NAME; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'I'\n", + ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

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

16 Dec '19

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

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

16 Dec '19

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 16 Dec '19

16 Dec '19

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

Alexandre Julliard : libport: Fix the Cygwin build.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 802803a028ba754267f7be2ea677a7186ac871b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=802803a028ba754267f7be2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 11:59:46 2019 +0100 libport: Fix the Cygwin build. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47959 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- include/wine/port.h | 2 +- libs/port/spawn.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0450cb04fb..61327c673d 100755 --- a/configure +++ b/configure @@ -17442,7 +17442,7 @@ fi ;; MSVCRTFLAGS="" case $host_os in - cygwin*|mingw32*) ;; + mingw32*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if ${ac_cv_cflags__fno_builtin+:} false; then : diff --git a/configure.ac b/configure.ac index 2117e500f9..8a121bce01 100644 --- a/configure.ac +++ b/configure.ac @@ -2054,7 +2054,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"") case $host_os in - cygwin*|mingw32*) ;; + mingw32*) ;; *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac diff --git a/include/wine/port.h b/include/wine/port.h index 264f282837..feb0558655 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -47,7 +47,7 @@ * Hard-coded values for the Windows platform */ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #include <direct.h> #include <io.h> diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 9292005ead..e19aa615a5 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#if !defined(HAVE__SPAWNVP) && !defined(_WIN32) +#if !defined(HAVE__SPAWNVP) && (!defined(_WIN32) || defined(__CYGWIN__)) #include <errno.h> #include <signal.h>

1 0

Alexandre Julliard : kernel32: Duplicate OutputDebugStringA implementation.
by Alexandre Julliard 16 Dec '19

16 Dec '19

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

Alexandre Julliard : api-ms-win-core-localization: Add spec entry for FindNLSString().
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 6233add31021c3da7e9f9584471757068eb1b574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6233add31021c3da7e9f9584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 12:30:29 2019 +0100 api-ms-win-core-localization: Add spec entry for FindNLSString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec index 90f68c52cd..81db61b945 100644 --- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall GetACP() kernel32.GetACP @ stub GetCPFileNameFromRegistry 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 16584834a9..94971021d8 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 @@ -2,7 +2,7 @@ @ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA @ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA @ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW 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 da8825b8ba..9b5f70eb21 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 @@ -3,7 +3,7 @@ @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA @ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx @ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA @ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW

1 0

Alexandre Julliard : ntdll: Fix RtlQueryUnbiasedInterruptTime() prototype.
by Alexandre Julliard 16 Dec '19

16 Dec '19

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

André Hentschel : kernel32: Fix some spec file entries.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 9367475f288acdbdf1a0405d06adb5a3dab3f57e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9367475f288acdbdf1a0405d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 15:46:20 2019 +0100 kernel32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index fd1a0bcf0a..4998af04d9 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -64,6 +64,6 @@ @ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW @ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW @ stdcall UnregisterWait(long) kernel32.UnregisterWait -@ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW +@ stdcall VerifyVersionInfoW(ptr long int64) kernel32.VerifyVersionInfoW @ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects @ stdcall WTSGetActiveConsoleSessionId() kernel32.WTSGetActiveConsoleSessionId diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b580021706..1fcd0c1f61 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1558,8 +1558,8 @@ @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @ stdcall VerifyConsoleIoHandle(long) # @ stub VerifyScripts -@ stdcall VerifyVersionInfoA(long long int64) -@ stdcall VerifyVersionInfoW(long long int64) +@ stdcall VerifyVersionInfoA(ptr long int64) +@ stdcall VerifyVersionInfoW(ptr long int64) @ stdcall -import VirtualAlloc(ptr long long long) @ stdcall -import VirtualAllocEx(long ptr long long long) @ stdcall -import VirtualAllocExNuma(long ptr long long long long) @@ -1632,7 +1632,7 @@ @ stdcall WritePrivateProfileStructW(wstr wstr ptr long wstr) @ stdcall -import WriteProcessMemory(long ptr ptr long ptr) @ stdcall WriteProfileSectionA(str str) -@ stdcall WriteProfileSectionW(str str) +@ stdcall WriteProfileSectionW(wstr wstr) @ stdcall WriteProfileStringA(str str str) @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long)

1 0