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

[PATCH] quartz/systemclock: Avoid a use-after-free (Coverity).
by Zebediah Figura 06 Apr '19

06 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 15f8ea0c02..6bb1f47e6f 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -85,6 +85,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) SetEvent(sink->handle); list_remove(&sink->entry); heap_free(sink); + continue; } } -- 2.20.1

1 0

[PATCH 1/5] mfplat: Fix early return from GetString() (Coverity).
by Nikolay Sivov 06 Apr '19

06 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8303bf2f74..13c48cfe23 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1260,9 +1260,9 @@ HRESULT attributes_GetString(struct attributes *attributes, REFGUID key, WCHAR * *length = len; if (size <= len) - return STRSAFE_E_INSUFFICIENT_BUFFER; - - memcpy(value, attribute->value.u.pwszVal, (len + 1) * sizeof(WCHAR)); + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + memcpy(value, attribute->value.u.pwszVal, (len + 1) * sizeof(WCHAR)); } else hr = MF_E_INVALIDTYPE; -- 2.20.1

2 5

[PATCH 2/4] include: Fix standard call types for ARM
by André Hentschel 06 Apr '19

06 Apr '19

This fixes compilation of dbgeng on arm Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- include/basetyps.h | 8 ++++++++ include/winnt.h | 15 +++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index d55005fbd79..662d5b68791 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -26,10 +26,18 @@ # define EXTERN_C extern #endif +#if defined(__arm__) && defined (__GNUC__) +#define STDMETHODCALLTYPE __attribute__((pcs("aapcs-vfp"))) +#define STDMETHODVCALLTYPE __attribute__((pcs("aapcs"))) +#define STDAPICALLTYPE __attribute__((pcs("aapcs-vfp"))) +#define STDAPIVCALLTYPE __attribute__((pcs("aapcs"))) +#else #define STDMETHODCALLTYPE __stdcall #define STDMETHODVCALLTYPE __cdecl #define STDAPICALLTYPE __stdcall #define STDAPIVCALLTYPE __cdecl +#endif + #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(t) EXTERN_C t STDAPICALLTYPE #define STDMETHODIMP HRESULT STDMETHODCALLTYPE diff --git a/include/winnt.h b/include/winnt.h index 29a7372c89e..d936b60981f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -412,10 +412,17 @@ extern "C++" { \ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#if defined(__arm__) && defined (__GNUC__) +#define STDMETHODCALLTYPE __attribute__((pcs("aapcs-vfp"))) +#define STDMETHODVCALLTYPE __attribute__((pcs("aapcs"))) +#define STDAPICALLTYPE __attribute__((pcs("aapcs-vfp"))) +#define STDAPIVCALLTYPE __attribute__((pcs("aapcs"))) +#else +#define STDMETHODCALLTYPE __stdcall +#define STDMETHODVCALLTYPE __cdecl +#define STDAPICALLTYPE __stdcall +#define STDAPIVCALLTYPE __cdecl +#endif #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(type) EXTERN_C type STDAPICALLTYPE -- 2.17.1

2 1

[PATCH 4/4] wineboot: Remove superfluous fixme
by André Hentschel 06 Apr '19

06 Apr '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/wineboot/wineboot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b85a3b6b6ea..01c85508430 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -197,7 +197,6 @@ __ASM_GLOBAL_FUNC( do_cpuid, #else void do_cpuid( unsigned int ax, unsigned int *p ) { - FIXME("\n"); } #endif -- 2.17.1

1 0

[PATCH 3/4] ntdll: Translate signal to trap when trap code is 0 on ARM
by André Hentschel 06 Apr '19

06 Apr '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index db9cb80f336..5db3c51301f 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -142,10 +142,24 @@ struct UNWIND_INFO * * Get the trap code for a signal. */ -static inline enum arm_trap_code get_trap_code( const ucontext_t *sigcontext ) +static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *sigcontext ) { #ifdef TRAP_sig - return TRAP_sig(sigcontext); + enum arm_trap_code trap = TRAP_sig(sigcontext); + if (trap) + return trap; + /* trap is 0 on arm64 kernel */ + switch (signal) + { + case SIGILL: + return TRAP_ARM_PRIVINFLT; + case SIGSEGV: + return TRAP_ARM_PAGEFLT; + case SIGBUS: + return TRAP_ARM_ALIGNFLT; + default: + return trap; + } #else return TRAP_ARM_UNKNOWN; /* unknown trap code */ #endif @@ -718,7 +732,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) ucontext_t *context = ucontext; /* check for page fault inside the thread stack */ - if (get_trap_code(context) == TRAP_ARM_PAGEFLT && + if (get_trap_code(signal, context) == TRAP_ARM_PAGEFLT && (char *)info->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && (char *)info->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && virtual_handle_stack_fault( info->si_addr )) @@ -735,7 +749,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; - switch(get_trap_code(context)) + switch(get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; @@ -756,7 +770,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec->ExceptionInformation[1] = 0xffffffff; break; default: - ERR("Got unexpected trap %d\n", get_trap_code(context)); + ERR("Got unexpected trap %d\n", get_trap_code(signal, context)); rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } -- 2.17.1

1 0

[PATCH 1/4] kernel32: Add forward for RtlInstallFunctionTableCallback on ARM/ARM64
by André Hentschel 06 Apr '19

06 Apr '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- forgot that, sorry dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c8d52cec587..10858790cbe 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1292,7 +1292,7 @@ @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader -- 2.17.1

1 0

[PATCH] configure: Use a separate cache variable for the cross-compiler flags.
by Huw Davies 06 Apr '19

06 Apr '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 0b4ff86eb0..a812648f21 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -156,7 +156,7 @@ dnl dnl The default action-if-yes is to append the flags to EXTRACROSSCFLAGS. dnl AC_DEFUN([WINE_TRY_CROSSCFLAGS], -[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl +[AS_VAR_PUSHDEF([ac_var], ac_cv_crosscflags_[[$1]])dnl AC_CACHE_CHECK([whether the cross-compiler supports $1], ac_var, [ac_wine_try_cflags_saved=$CFLAGS ac_wine_try_cflags_saved_cc=$CC -- 2.18.0

1 0

[PATCH 2/2] ws2_32/socket: changed interface_bind to dgram_apply_restrictions
by Michel van Langen 06 Apr '19

06 Apr '19

The new name and signature reflect the real behaviour of this function --- dlls/ws2_32/socket.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)

1 0

[PATCH] devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist.
by Zebediah Figura 06 Apr '19

06 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46316 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 18 +++++++++++++++++- dlls/devenum/tests/devenum.c | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 44d478d325..2db5491190 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -861,7 +861,23 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( else if (IsEqualGUID(class, &CLSID_VideoInputDeviceCategory)) register_avicap_devices(); - return create_EnumMoniker(class, out); + if (SUCCEEDED(hr = create_EnumMoniker(class, out))) + { + IMoniker *mon; + hr = IEnumMoniker_Next(*out, 1, &mon, NULL); + if (hr == S_OK) + { + IMoniker_Release(mon); + IEnumMoniker_Reset(*out); + } + else + { + IEnumMoniker_Release(*out); + *out = NULL; + } + } + + return hr; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 9fcfdcf316..945bc67919 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -69,6 +69,7 @@ static void test_devenum(IBindCtx *bind_ctx) WCHAR *displayname; VARIANT var; HRESULT hr; + int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); @@ -105,6 +106,8 @@ static void test_devenum(IBindCtx *bind_ctx) if (hr == S_OK) { + count = 0; + while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); @@ -136,8 +139,11 @@ static void test_devenum(IBindCtx *bind_ctx) CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); + count++; } IEnumMoniker_Release(enum_moniker); + + ok(count > 0, "CreateClassEnumerator() returned S_OK but no devices were enumerated.\n"); } } -- 2.20.1

1 0

[PATCH] comctl32/button: Use WM_GETTEXTLENGTH to see if the button has any text
by Gabriel Ivăncescu 05 Apr '19

05 Apr '19

There's no reason to allocate and then parse the entire string just to see if its length is zero. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This also keeps it consistent with SB_GetIdealSize's style and simplifies the code. dlls/comctl32/button.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 213ab29..18b7430 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1257,20 +1257,16 @@ static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) { LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); - WCHAR *text = get_button_text(infoPtr); HDC hdc; HFONT hfont; SIZE labelSize; INT textOffset; - INT textLength = 0; double scaleX; double scaleY; LONG checkboxWidth, checkboxHeight; LONG maxWidth = 0; - if (text) textLength = lstrlenW(text); - heap_free(text); - if (textLength == 0) + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) { BUTTON_GetClientRectSize(infoPtr, size); return TRUE; @@ -1306,26 +1302,18 @@ static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) { - WCHAR *text = get_button_text(infoPtr); SIZE labelSize; - INT textLength = 0; - - if (text) textLength = lstrlenW(text); - if (textLength == 0) - { + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) BUTTON_GetClientRectSize(infoPtr, size); - heap_free(text); - return TRUE; - } - heap_free(text); - - /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ - BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); - - size->cx = labelSize.cx; - size->cy = labelSize.cy; + else + { + /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); + size->cx = labelSize.cx; + size->cy = labelSize.cy; + } return TRUE; } -- 2.20.1

2 1