November 2019 - Wine-Devel - list.winehq.org

[PATCH] ntoskrnl.exe: Remove a superfluous condition.
by Zebediah Figura Nov. 28, 2019

Nov. 28, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 365ddc069f..647d427ee5 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1251,7 +1251,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG lock->Common.Removed = TRUE; - if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed) + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); else if (count < 0) ERR("Lock %p is not acquired!\n", lock); -- 2.24.0

1 0

[PATCH] kernelbase: Implement GetOverlappedResultEx().
by Zebediah Figura Nov. 28, 2019

Nov. 28, 2019

Mentioned in https://bugs.winehq.org/show_bug.cgi?id=38830. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/pipe.c | 54 +++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 23 ++++++++++++-- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 5 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 82e10850a8..172be2a6e2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -760,6 +760,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall -import GetOEMCP() @ stdcall -import GetOverlappedResult(long ptr ptr long) +@ stdcall -import GetOverlappedResultEx(long ptr ptr long long) @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFullName(long ptr ptr) @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index d8d5726f1a..20f3450c6d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -42,6 +42,7 @@ static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerSessionId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetOverlappedResultEx)(HANDLE,OVERLAPPED *,DWORD *,DWORD,BOOL); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -4065,6 +4066,57 @@ static void test_nowait(DWORD pipe_type) ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); } +static void test_GetOverlappedResultEx(void) +{ + HANDLE client, server; + OVERLAPPED ovl; + char buffer[8000]; + DWORD ret_size; + BOOL ret; + + if (!pGetOverlappedResultEx) + { + win_skip("GetOverlappedResultEx() is not available\n"); + return; + } + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + overlapped_write_async(client, buffer, sizeof(buffer), &ovl); + + user_apc_ran = FALSE; + QueueUserAPC(user_apc, GetCurrentThread(), 0); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_IO_COMPLETION, "wrong error %u\n", GetLastError()); + ok(user_apc_ran, "APC should have run\n"); + + CloseHandle(ovl.hEvent); + + CloseHandle(client); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -4080,6 +4132,7 @@ START_TEST(pipe) pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); pGetNamedPipeServerSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeServerSessionId"); + pGetOverlappedResultEx = (void *)GetProcAddress(hmod, "GetOverlappedResultEx"); argc = winetest_get_mainargs(&argv); @@ -4134,4 +4187,5 @@ START_TEST(pipe) test_wait_pipe(); test_nowait(PIPE_TYPE_BYTE); test_nowait(PIPE_TYPE_MESSAGE); + test_GetOverlappedResultEx(); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index aa2ebfcc69..8e601c7cb2 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2002,21 +2002,38 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFileType( HANDLE file ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResult( HANDLE file, LPOVERLAPPED overlapped, LPDWORD result, BOOL wait ) +{ + return GetOverlappedResultEx( file, overlapped, result, wait ? INFINITE : 0, FALSE ); +} + + +/*********************************************************************** + * GetOverlappedResultEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *overlapped, + DWORD *result, DWORD timeout, BOOL alertable ) { NTSTATUS status; + DWORD ret; - TRACE( "(%p %p %p %x)\n", file, overlapped, result, wait ); + TRACE( "(%p %p %p %u %d)\n", file, overlapped, result, timeout, alertable ); status = overlapped->Internal; if (status == STATUS_PENDING) { - if (!wait) + if (!timeout) { SetLastError( ERROR_IO_INCOMPLETE ); return FALSE; } - if (WaitForSingleObject( overlapped->hEvent ? overlapped->hEvent : file, INFINITE ) == WAIT_FAILED) + ret = WaitForSingleObjectEx( overlapped->hEvent ? overlapped->hEvent : file, timeout, alertable ); + if (ret == WAIT_FAILED) return FALSE; + else if (ret) + { + SetLastError(ret); + return FALSE; + } status = overlapped->Internal; if (status == STATUS_PENDING) status = STATUS_SUCCESS; diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 14ee402089..ed5d1f73f8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -584,7 +584,7 @@ # @ stub GetOsManufacturingMode # @ stub GetOsSafeBootMode @ stdcall GetOverlappedResult(long ptr ptr long) -# @ stub GetOverlappedResultEx +@ stdcall GetOverlappedResultEx(long ptr ptr long long) # @ stub GetPackageApplicationContext # @ stub GetPackageApplicationIds # @ stub GetPackageApplicationProperty diff --git a/include/winbase.h b/include/winbase.h index 8b30c5a69a..2d01dcb606 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2215,6 +2215,7 @@ WINBASEAPI BOOL WINAPI GetNumaProximityNodeEx(ULONG,PUSHORT); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL); +WINBASEAPI BOOL WINAPI GetOverlappedResultEx(HANDLE,OVERLAPPED*,DWORD*,DWORD,BOOL); WINBASEAPI DWORD WINAPI GetPriorityClass(HANDLE); WINADVAPI BOOL WINAPI GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD); WINBASEAPI UINT WINAPI GetPrivateProfileIntA(LPCSTR,LPCSTR,INT,LPCSTR); -- 2.24.0

2 1

[PATCH 1/4] quartz/systemclock: Support COM aggregation.
by Zebediah Figura Nov. 28, 2019

Nov. 28, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 121 +++++++++++++++++++++----------- dlls/quartz/tests/systemclock.c | 108 +++++++++++++++++++++++++++- 2 files changed, 186 insertions(+), 43 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 652008cd01..77e569d437 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -38,7 +38,9 @@ struct advise_sink struct system_clock { IReferenceClock IReferenceClock_iface; - LONG ref; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; BOOL thread_created; HANDLE thread, notify_event, stop_event; @@ -48,6 +50,72 @@ struct system_clock struct list sinks; }; +static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct system_clock, IUnknown_inner); +} + +static HRESULT WINAPI system_clock_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct system_clock *clock = impl_from_IUnknown(iface); + TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else if (IsEqualGUID(iid, &IID_IReferenceClock)) + *out = &clock->IReferenceClock_iface; + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI system_clock_inner_AddRef(IUnknown *iface) +{ + struct system_clock *clock = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&clock->refcount); + + TRACE("%p increasing refcount to %u.\n", clock, refcount); + + return refcount; +} + +static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) +{ + struct system_clock *clock = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&clock->refcount); + + TRACE("%p decreasing refcount to %u.\n", clock, refcount); + + if (!refcount) + { + if (clock->thread) + { + SetEvent(clock->stop_event); + WaitForSingleObject(clock->thread, INFINITE); + CloseHandle(clock->thread); + CloseHandle(clock->notify_event); + CloseHandle(clock->stop_event); + } + clock->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&clock->cs); + heap_free(clock); + } + return refcount; +} + +static const IUnknownVtbl system_clock_inner_vtbl = +{ + system_clock_inner_QueryInterface, + system_clock_inner_AddRef, + system_clock_inner_Release, +}; + static inline struct system_clock *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct system_clock, IReferenceClock_iface); @@ -112,52 +180,19 @@ static void notify_thread(struct system_clock *clock) static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) { struct system_clock *clock = impl_from_IReferenceClock(iface); - TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); - - if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IReferenceClock)) - { - IReferenceClock_AddRef(iface); - *out = iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - *out = NULL; - return E_NOINTERFACE; + return IUnknown_QueryInterface(clock->outer_unk, iid, out); } static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) { struct system_clock *clock = impl_from_IReferenceClock(iface); - ULONG refcount = InterlockedIncrement(&clock->ref); - - TRACE("%p increasing refcount to %u.\n", clock, refcount); - - return refcount; + return IUnknown_AddRef(clock->outer_unk); } static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) { struct system_clock *clock = impl_from_IReferenceClock(iface); - ULONG refcount = InterlockedDecrement(&clock->ref); - - TRACE("%p decreasing refcount to %u.\n", clock, refcount); - - if (!refcount) - { - if (clock->thread) - { - SetEvent(clock->stop_event); - WaitForSingleObject(clock->thread, INFINITE); - CloseHandle(clock->thread); - CloseHandle(clock->notify_event); - CloseHandle(clock->stop_event); - } - clock->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&clock->cs); - heap_free(clock); - } - return refcount; + return IUnknown_Release(clock->outer_unk); } static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) @@ -281,7 +316,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR return S_FALSE; } -static const IReferenceClockVtbl SystemClock_Vtbl = +static const IReferenceClockVtbl SystemClock_vtbl = { SystemClockImpl_QueryInterface, SystemClockImpl_AddRef, @@ -304,10 +339,16 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) return E_OUTOFMEMORY; } - object->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; + object->IReferenceClock_iface.lpVtbl = &SystemClock_vtbl; + object->IUnknown_inner.lpVtbl = &system_clock_inner_vtbl; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + object->refcount = 1; list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); - return SystemClockImpl_QueryInterface(&object->IReferenceClock_iface, &IID_IReferenceClock, out); + TRACE("Created system clock %p.\n", object); + *out = &object->IUnknown_inner; + + return S_OK; } diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index fa1ab6856b..08faa1ef73 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -26,11 +26,18 @@ static ULONGLONG (WINAPI *pGetTickCount64)(void); static IReferenceClock *create_system_clock(void) { - IReferenceClock *filter = NULL; + IReferenceClock *clock = NULL; HRESULT hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, - &IID_IReferenceClock, (void **)&filter); + &IID_IReferenceClock, (void **)&clock); ok(hr == S_OK, "Got hr %#x.\n", hr); - return filter; + return clock; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -62,6 +69,100 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IReferenceClock) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IReferenceClock *clock, *clock2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + clock = (IReferenceClock *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_SystemClock, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IReferenceClock, (void **)&clock); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!clock, "Got interface %p.\n", clock); + + hr = CoCreateInstance(&CLSID_SystemClock, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IReferenceClock, (void **)&clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IReferenceClock_QueryInterface(clock, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IReferenceClock_QueryInterface(clock, &IID_IReferenceClock, (void **)&clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock2 == (IReferenceClock *)0xdeadbeef, "Got unexpected IReferenceClock %p.\n", clock2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IReferenceClock_QueryInterface(clock, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IReferenceClock_Release(clock); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + static void test_get_time(void) { IReferenceClock *clock = create_system_clock(); @@ -185,6 +286,7 @@ START_TEST(systemclock) pGetTickCount64 = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetTickCount64"); test_interfaces(); + test_aggregation(); test_get_time(); test_advise(); -- 2.24.0

1 3

[PATCH] dmloader: Support DMUS_OBJ_MEMORY cache lookups
by Alistair Leslie-Hughes Nov. 28, 2019

Nov. 28, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 42209def94..9048c02dfc 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -191,8 +191,18 @@ static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_ if (desc->dwValidData & DMUS_OBJ_STREAM) FIXME("Finding DMUS_OBJ_STREAM cached objects currently not supported.\n"); - if (desc->dwValidData & DMUS_OBJ_MEMORY) - FIXME("Finding DMUS_OBJ_MEMORY cached objects currently not supported.\n"); + if (desc->dwValidData & DMUS_OBJ_MEMORY) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (existing->Desc.dwValidData & DMUS_OBJ_MEMORY && + desc->llMemLength == existing->Desc.llMemLength && + (desc->pbMemData == existing->Desc.pbMemData || + !memcmp(desc->pbMemData, existing->Desc.pbMemData, desc->llMemLength)) ) { + TRACE("Found by DMUS_OBJ_MEMORY (%d)\n", + desc->pbMemData == existing->Desc.pbMemData); + return existing; + } + } + } if ((desc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) { -- 2.24.0

2 1

[PATCH v2] dmime: Trace pbMemData/llMemLength on the same line.
by Michael Stefaniuc Nov. 28, 2019

Nov. 28, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Removed trailing whitespace dlls/dmband/dmutils.c | 4 ++-- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmime/dmutils.c | 2 +- dlls/dmloader/debug.c | 2 +- dlls/dmscript/dmscript_main.c | 2 +- dlls/dmstyle/dmutils.c | 2 +- dlls/dmusic/dmusic_main.c | 2 +- dlls/dswave/dswave_main.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c76bde1146..a1dc7e28a5 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -137,7 +137,7 @@ static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); @@ -525,7 +525,7 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", pDesc->pStream); } else { diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 21e896cc3e..3428a58b91 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -468,7 +468,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 7b3bcec079..cd955fd8a5 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -455,7 +455,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30b23c2ade..10ba0bce93 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -491,7 +491,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7a96679302..55bc11b29a 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -498,7 +498,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index fd3abe5209..70b810a8df 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -509,7 +509,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 295cd84b82..0951cb9e95 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -468,7 +468,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index bb554deaa4..4f3a73d9e9 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -437,7 +437,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); -- 2.20.1

1 0

[PATCH] msvcrt: Make strlwr/strupr write to the string only if necessary.
by Ambrož Bizjak Nov. 28, 2019

Nov. 28, 2019

Hi, This patch fixes a crash in IL-2 Sturmovik: Battle of Stanlingrad (with some other tweaks the game runs well). Without this, the game crashes when starting a mission: Unhandled exception: page fault on write access to 0x1408b81bc in 64-bit code (0x00007f783f3ad8e4). ... Backtrace: =>0 0x00007f783f3ad8e4 MSVCRT__strlwr_s_l+0x64() in ucrtbase (0x000000004a77ccf0) 1 0x00007f783f3ad96f MSVCRT__strlwr+0x1e(str="idle") [Z:\build\wine-4.16\dlls\ucrtbase\..\msvcrt\string.c:111] in ucrtbase (0x000000004a77cd30) 2 0x000000014045a782 EntryPoint+0xffbf1fd1() in il-2 (0x000000004a77cee0) 0x00007f783f3ad8e4 MSVCRT__strlwr_s_l+0x64 in ucrtbase: movb %al,0xffffffffffffffff(%rbx) Based on this backtrace, my hypothesis was that the game is calling strlwr on a read-only string that is already lower-case. I have then changed strlwr to not assign characters to the string when the value is unchanged, which fixed the crash. To me this is sufficient evidence to confirm the hypothesis.

3 2

[PATCH 1/2] ucrtbase: Correct behavior of strftime format %c.
by Jeff Smith Nov. 28, 2019

Nov. 28, 2019

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msvcrt/time.c | 28 +++++++++++++++++++++------- dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4283566102..d8043f459d 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1234,13 +1234,27 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, switch(*format) { case 'c': - if(!strftime_format(str, &ret, max, mstm, time_data, - alternate ? STRFTIME_TD(time_data, date) : STRFTIME_TD(time_data, short_date))) - return 0; - if(ret < max) - str[ret++] = ' '; - if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) - return 0; +#if _MSVCR_VER>=140 + if(time_data == MSVCRT_locale->locinfo->lc_time_curr && !alternate) + { + static const WCHAR datetime_format[] = + { '%','a',' ','%','b',' ','%','e',' ','%','T',' ','%','Y',0 }; + tmp = strftime_impl(str+ret, max-ret, datetime_format, mstm, time_data, loc); + if(!tmp) + return 0; + ret += tmp; + } + else +#endif + { + if(!strftime_format(str, &ret, max, mstm, time_data, + alternate ? STRFTIME_TD(time_data, date) : STRFTIME_TD(time_data, short_date))) + return 0; + if(ret < max) + str[ret++] = ' '; + if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) + return 0; + } break; case 'x': if(!strftime_format(str, &ret, max, mstm, time_data, diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c1ab7f216a..5ff1d1e44e 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -999,8 +999,8 @@ static void test_strftime(void) {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }}, {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }}, {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }}, - {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, - {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE, TRUE}, + {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#c", "Thursday, February 30, 1970 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, -- 2.23.0

3 3

[PATCH] msvcrt: Fix the spelling of a couple of TRACE() messages.
by Francois Gouget Nov. 28, 2019

Nov. 28, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcrt/except_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 73a0d6a2b66..e2515c77784 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -371,7 +371,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } @@ -590,7 +590,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } -- 2.20.1

2 1

[PATCH] msvcp120/tests: Tweak two ok() messages and fix their spelling.
by Francois Gouget Nov. 28, 2019

Nov. 28, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d484cdd7ed7..9c3f22a3674 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1444,7 +1444,7 @@ static void test_tr2_sys__Copy_file(void) ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), - "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); + "test_tr2_sys__Copy_file(): test %d failed, mismatched file sizes\n", i+1); } ret = p_tr2_sys__Copy_file_wchar(testW, testW2, TRUE); ok(ret == ERROR_SUCCESS, "test_tr2_sys__Copy_file_wchar() expect ERROR_SUCCESS, got %d\n", ret); @@ -1886,7 +1886,7 @@ static void test_tr2_sys__Link(void) ok(errno == 0xdeadbeef, "tr2_sys__Link(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].existing_path) == p_tr2_sys__File_size(tests[i].new_path), - "tr2_sys__Link(): test %d failed, two files' size are not equal\n", i+1); + "tr2_sys__Link(): test %d failed, mismatched file sizes\n", i+1); } ok(DeleteFileA("f1"), "expect f1 to exist\n"); -- 2.20.1

2 1

[PATCH] riched20/tests: Fix a function name in an ok() message.
by Francois Gouget Nov. 28, 2019

Nov. 28, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/riched20/tests/txtsrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index dd290e3fb2f..eea01b7833b 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -992,7 +992,7 @@ static void test_TxGetScroll(void) return; ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); - ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); -- 2.20.1

3 2