March 2019 - Wine-devel - list.winehq.org

[PATCH] dbghelp: Make minidump_add_memory64_block() static.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/minidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index b096476aaf3..6a2525f8e1f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -294,7 +294,7 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } -void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) +static void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) { if (!dc->mem64) { -- 2.20.1

1 0

[PATCH] ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/tests/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7f2e68c3ded..ae15df38129 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -126,7 +126,7 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m __ms_va_end(args); } -void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +static void vskip_(const char *file, int line, const char *msg, __ms_va_list args) { const char *current_file; @@ -141,7 +141,7 @@ void vskip_(const char *file, int line, const char *msg, __ms_va_list args) skipped++; } -void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +static void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) { __ms_va_list args; __ms_va_start(args, msg); @@ -185,7 +185,7 @@ static unsigned int strlenW( const WCHAR *str ) return s - str; } -void *kmemcpy(void *dest, const void *src, SIZE_T n) +static void *kmemcpy(void *dest, const void *src, SIZE_T n) { const char *s = src; char *d = dest; -- 2.20.1

1 0

[PATCH] kernel32/tests: A spelling fix in a win_skip() message.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4c7df3d9899..3f30cce5353 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3680,7 +3680,7 @@ static void test_multiple_instances(void) if(!pCancelIoEx) { - win_skip("Skiping multiple instance tests on too old Windows\n"); + win_skip("Skipping multiple instance tests on too old Windows\n"); return; } -- 2.20.1

1 0

[PATCH] ntdll: Fix unwinding from leaf function on x86_64.
by Derek Lesho 16 Mar '19

16 Mar '19

--- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 54871b8302..21e7098876 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4232,7 +4232,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec new_context.Rip = *(ULONG64 *)context->Rsp; new_context.Rsp = context->Rsp + sizeof(ULONG64); - dispatch.EstablisherFrame = new_context.Rsp; + dispatch.EstablisherFrame = context->Rsp; dispatch.LanguageHandler = NULL; unwind_done: -- 2.20.1

3 5

[PATCH v1] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Jon Doron 16 Mar '19

16 Mar '19

There are certain applications which try to traverse the environement being returned, but this is problematic since they cannot acquire the PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve the issue provide a copy of the current environment same as in GetEnvironmentStringsA . Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/environ.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 99bf706e95..c8f32aa0fb 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -139,7 +139,22 @@ LPSTR WINAPI GetEnvironmentStringsA(void) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->Environment; + LPWSTR ret, ptrW; + unsigned len; + + RtlAcquirePebLock(); + + ptrW = NtCurrentTeb()->Peb->ProcessParameters->Environment; + while (*ptrW) + ptrW += strlenW(ptrW) + 1; + + len = (ULONG_PTR)ptrW - (ULONG_PTR)NtCurrentTeb()->Peb->ProcessParameters->Environment; + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + (sizeof(WCHAR) * 2)); + if (ret) + memcpy(ret, NtCurrentTeb()->Peb->ProcessParameters->Environment, len); + + RtlReleasePebLock(); + return ret; } @@ -157,7 +172,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { - return TRUE; + return HeapFree( GetProcessHeap(), 0, ptr ); } -- 2.19.2

2 1

[PATCH 1/4] quartz/systemclock: Avoid using the sink structure pointer as a cookie.
by Zebediah Figura 16 Mar '19

16 Mar '19

The same pointer address may be allocated to multiple different structures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 0cc6d87f84..f41cdbe534 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -26,11 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +static int cookie_counter; + struct advise_sink { struct list entry; HANDLE handle; REFERENCE_TIME due_time, period; + int cookie; }; typedef struct SystemClockImpl { @@ -228,6 +231,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, sink->handle = (HANDLE)event; sink->due_time = base + offset; sink->period = 0; + sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->single_sinks); @@ -235,7 +239,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, notify_thread(clock); - *cookie = (DWORD_PTR)sink; + *cookie = sink->cookie; return S_OK; } @@ -263,6 +267,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, sink->handle = (HANDLE)semaphore; sink->due_time = start; sink->period = period; + sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->periodic_sinks); @@ -270,7 +275,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, notify_thread(clock); - *cookie = (DWORD_PTR)sink; + *cookie = sink->cookie; return S_OK; } @@ -285,7 +290,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR LIST_FOR_EACH_ENTRY(sink, &clock->single_sinks, struct advise_sink, entry) { - if (sink == (struct advise_sink *)cookie) + if (sink->cookie == cookie) { list_remove(&sink->entry); heap_free(sink); @@ -296,7 +301,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR LIST_FOR_EACH_ENTRY(sink, &clock->periodic_sinks, struct advise_sink, entry) { - if (sink == (struct advise_sink *)cookie) + if (sink->cookie == cookie) { list_remove(&sink->entry); heap_free(sink); -- 2.20.1

2 4

[PATCH 2/2] msvcrt: Don't detect overflow in atol implementation.
by Piotr Caban 16 Mar '19

16 Mar '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46845 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 4 ++++ dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+)

1 0

[PATCH 1/2] msvcrt: Fix long limits in _atol_l.
by Piotr Caban 16 Mar '19

16 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v2 3/3] po: Update Tamil translation.
by Isira Seneviratne 16 Mar '19

16 Mar '19

1 0

[PATCH v2 2/3] po: Update French translation.
by Isira Seneviratne 16 Mar '19

16 Mar '19

1 0