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

[PATCH] oleaut32: Fix Var*FromDec() prototypes.
by Nikolay Sivov 02 Mar '21

02 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/vartype.c | 26 +++++++++++++------------- include/oleauto.h | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 90b3fcaa1a9..06bc70e0a89 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -517,7 +517,7 @@ HRESULT WINAPI VarI1FromUI4(ULONG ulIn, signed char* pcOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI1FromDec(DECIMAL *pdecIn, signed char* pcOut) +HRESULT WINAPI VarI1FromDec(const DECIMAL *pdecIn, signed char* pcOut) { LONG64 i64; HRESULT hRet; @@ -828,7 +828,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI1FromDec(DECIMAL *pdecIn, BYTE* pbOut) +HRESULT WINAPI VarUI1FromDec(const DECIMAL *pdecIn, BYTE* pbOut) { LONG64 i64; HRESULT hRet; @@ -1125,7 +1125,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG ulIn, SHORT* psOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI2FromDec(DECIMAL *pdecIn, SHORT* psOut) +HRESULT WINAPI VarI2FromDec(const DECIMAL *pdecIn, SHORT* psOut) { LONG64 i64; HRESULT hRet; @@ -1422,7 +1422,7 @@ HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* pusOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI2FromDec(DECIMAL *pdecIn, USHORT* pusOut) +HRESULT WINAPI VarUI2FromDec(const DECIMAL *pdecIn, USHORT* pusOut) { LONG64 i64; HRESULT hRet; @@ -1714,7 +1714,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG *piOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI4FromDec(DECIMAL *pdecIn, LONG *piOut) +HRESULT WINAPI VarI4FromDec(const DECIMAL *pdecIn, LONG *piOut) { LONG64 i64; HRESULT hRet; @@ -2006,7 +2006,7 @@ HRESULT WINAPI VarUI4FromUI2(USHORT usIn, ULONG *pulOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI4FromDec(DECIMAL *pdecIn, ULONG *pulOut) +HRESULT WINAPI VarUI4FromDec(const DECIMAL *pdecIn, ULONG *pulOut) { LONG64 i64; HRESULT hRet; @@ -2329,7 +2329,7 @@ HRESULT WINAPI VarI8FromUI4(ULONG ulIn, LONG64* pi64Out) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn, LONG64* pi64Out) +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn, LONG64* pi64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2664,7 +2664,7 @@ HRESULT WINAPI VarUI8FromUI4(ULONG ulIn, ULONG64* pui64Out) * with DISP_E_OVERFLOW. This bug has been fixed in Wine's implementation * (use VarAbs() on pDecIn first if you really want this behaviour). */ -HRESULT WINAPI VarUI8FromDec(DECIMAL *pdecIn, ULONG64* pui64Out) +HRESULT WINAPI VarUI8FromDec(const DECIMAL *pdecIn, ULONG64* pui64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2940,7 +2940,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG ulIn, float *pFltOut) * Success: S_OK. * Failure: E_INVALIDARG, if the source value is invalid. */ -HRESULT WINAPI VarR4FromDec(DECIMAL* pDecIn, float *pFltOut) +HRESULT WINAPI VarR4FromDec(const DECIMAL* pDecIn, float *pFltOut) { BYTE scale = DEC_SCALE(pDecIn); double divisor = 1.0; @@ -3698,7 +3698,7 @@ HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pCyOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarCyFromDec(DECIMAL* pdecIn, CY* pCyOut) +HRESULT WINAPI VarCyFromDec(const DECIMAL* pdecIn, CY* pCyOut) { DECIMAL rounded; HRESULT hRet; @@ -6269,7 +6269,7 @@ HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL *pBoolOut) * Success: S_OK. * Failure: E_INVALIDARG, if pDecIn is invalid. */ -HRESULT WINAPI VarBoolFromDec(DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) +HRESULT WINAPI VarBoolFromDec(const DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) { if (DEC_SCALE(pDecIn) > DEC_MAX_SCALE || (DEC_SIGN(pDecIn) & ~DECIMAL_NEG)) return E_INVALIDARG; @@ -6984,7 +6984,7 @@ HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO * Failure: E_INVALIDARG, if pbstrOut is invalid. * E_OUTOFMEMORY, if memory allocation fails. */ -HRESULT WINAPI VarBstrFromDec(DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) +HRESULT WINAPI VarBstrFromDec(const DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { WCHAR buff[256]; VARIANT_DI temp; @@ -7998,7 +7998,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut) * RETURNS * S_OK. */ -HRESULT WINAPI VarDateFromDec(DECIMAL *pdecIn, DATE* pdateOut) +HRESULT WINAPI VarDateFromDec(const DECIMAL *pdecIn, DATE* pdateOut) { return VarR8FromDec(pdecIn, pdateOut); } diff --git a/include/oleauto.h b/include/oleauto.h index 45edfbb84af..f00bfa0c7f8 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -239,7 +239,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG,BYTE*); HRESULT WINAPI VarUI1FromUI8(ULONG64,BYTE*); HRESULT WINAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); HRESULT WINAPI VarUI1FromCy(CY,BYTE*); -HRESULT WINAPI VarUI1FromDec(DECIMAL*,BYTE*); +HRESULT WINAPI VarUI1FromDec(const DECIMAL*,BYTE*); HRESULT WINAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*); HRESULT WINAPI VarI2FromUI1(BYTE,SHORT*); @@ -255,7 +255,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG,SHORT*); HRESULT WINAPI VarI2FromUI8(ULONG64,SHORT*); HRESULT WINAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); HRESULT WINAPI VarI2FromCy(CY,SHORT*); -HRESULT WINAPI VarI2FromDec(DECIMAL*,SHORT*); +HRESULT WINAPI VarI2FromDec(const DECIMAL*,SHORT*); HRESULT WINAPI VarI2FromDisp(IDispatch*,LCID,SHORT*); HRESULT WINAPI VarI4FromUI1(BYTE,LONG*); @@ -271,7 +271,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG,LONG*); HRESULT WINAPI VarI4FromUI8(ULONG64,LONG*); HRESULT WINAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); HRESULT WINAPI VarI4FromCy(CY,LONG*); -HRESULT WINAPI VarI4FromDec(DECIMAL*,LONG*); +HRESULT WINAPI VarI4FromDec(const DECIMAL*,LONG*); HRESULT WINAPI VarI4FromDisp(IDispatch*,LCID,LONG*); HRESULT WINAPI VarI8FromUI1(BYTE,LONG64*); @@ -286,7 +286,7 @@ HRESULT WINAPI VarI8FromI1(signed char,LONG64*); HRESULT WINAPI VarI8FromUI2(USHORT,LONG64*); HRESULT WINAPI VarI8FromUI4(ULONG,LONG64*); HRESULT WINAPI VarI8FromUI8(ULONG64,LONG64*); -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn,LONG64*); +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn,LONG64*); HRESULT WINAPI VarI8FromInt(INT intIn,LONG64*); HRESULT WINAPI VarI8FromCy(CY,LONG64*); HRESULT WINAPI VarI8FromDisp(IDispatch*,LCID,LONG64*); @@ -304,7 +304,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG,FLOAT*); HRESULT WINAPI VarR4FromUI8(ULONG64,FLOAT*); HRESULT WINAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); HRESULT WINAPI VarR4FromCy(CY,FLOAT*); -HRESULT WINAPI VarR4FromDec(DECIMAL*,FLOAT*); +HRESULT WINAPI VarR4FromDec(const DECIMAL*,FLOAT*); HRESULT WINAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*); HRESULT WINAPI VarR8FromUI1(BYTE,double*); @@ -336,7 +336,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG,DATE*); HRESULT WINAPI VarDateFromUI8(ULONG64,DATE*); HRESULT WINAPI VarDateFromBool(VARIANT_BOOL,DATE*); HRESULT WINAPI VarDateFromCy(CY,DATE*); -HRESULT WINAPI VarDateFromDec(DECIMAL*,DATE*); +HRESULT WINAPI VarDateFromDec(const DECIMAL*,DATE*); HRESULT WINAPI VarDateFromDisp(IDispatch*,LCID,DATE*); HRESULT WINAPI VarCyFromUI1(BYTE,CY*); @@ -352,7 +352,7 @@ HRESULT WINAPI VarCyFromI1(signed char,CY*); HRESULT WINAPI VarCyFromUI2(USHORT,CY*); HRESULT WINAPI VarCyFromUI4(ULONG,CY*); HRESULT WINAPI VarCyFromUI8(ULONG64,CY*); -HRESULT WINAPI VarCyFromDec(DECIMAL*,CY*); +HRESULT WINAPI VarCyFromDec(const DECIMAL*,CY*); HRESULT WINAPI VarCyFromDisp(IDispatch*,LCID,CY*); HRESULT WINAPI VarBstrFromUI1(BYTE,LCID,ULONG,BSTR*); @@ -368,7 +368,7 @@ HRESULT WINAPI VarBstrFromUI2(USHORT,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI8(ULONG64,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI4(ULONG,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromCy(CY,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromDec(DECIMAL*,LCID,ULONG,BSTR*); +HRESULT WINAPI VarBstrFromDec(const DECIMAL*,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromDisp(IDispatch*,LCID,ULONG,BSTR*); HRESULT WINAPI VarBoolFromUI1(BYTE,VARIANT_BOOL*); @@ -384,7 +384,7 @@ HRESULT WINAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI8(ULONG64,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromCy(CY,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromDec(DECIMAL*,VARIANT_BOOL*); +HRESULT WINAPI VarBoolFromDec(const DECIMAL*,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromDisp(IDispatch*,LCID,VARIANT_BOOL*); HRESULT WINAPI VarI1FromUI1(BYTE,signed char*); @@ -400,7 +400,7 @@ HRESULT WINAPI VarI1FromUI2(USHORT,signed char*); HRESULT WINAPI VarI1FromUI4(ULONG,signed char*); HRESULT WINAPI VarI1FromUI8(ULONG64,signed char*); HRESULT WINAPI VarI1FromCy(CY,signed char*); -HRESULT WINAPI VarI1FromDec(DECIMAL*,signed char*); +HRESULT WINAPI VarI1FromDec(const DECIMAL*,signed char*); HRESULT WINAPI VarI1FromDisp(IDispatch*,LCID,signed char*); HRESULT WINAPI VarUI2FromUI1(BYTE,USHORT*); @@ -416,7 +416,7 @@ HRESULT WINAPI VarUI2FromI1(signed char,USHORT*); HRESULT WINAPI VarUI2FromUI4(ULONG,USHORT*); HRESULT WINAPI VarUI2FromUI8(ULONG64,USHORT*); HRESULT WINAPI VarUI2FromCy(CY,USHORT*); -HRESULT WINAPI VarUI2FromDec(DECIMAL*,USHORT*); +HRESULT WINAPI VarUI2FromDec(const DECIMAL*,USHORT*); HRESULT WINAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*); HRESULT WINAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); @@ -432,7 +432,7 @@ HRESULT WINAPI VarUI4FromI1(signed char,ULONG*); HRESULT WINAPI VarUI4FromUI2(USHORT,ULONG*); HRESULT WINAPI VarUI4FromUI8(ULONG64,ULONG*); HRESULT WINAPI VarUI4FromCy(CY,ULONG*); -HRESULT WINAPI VarUI4FromDec(DECIMAL*,ULONG*); +HRESULT WINAPI VarUI4FromDec(const DECIMAL*,ULONG*); HRESULT WINAPI VarUI4FromDisp(IDispatch*,LCID,ULONG*); HRESULT WINAPI VarUI8FromUI1(BYTE,ULONG64*); @@ -447,7 +447,7 @@ HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); HRESULT WINAPI VarUI8FromI1(signed char,ULONG64*); HRESULT WINAPI VarUI8FromUI2(USHORT,ULONG64*); HRESULT WINAPI VarUI8FromUI4(ULONG,ULONG64*); -HRESULT WINAPI VarUI8FromDec(DECIMAL*,ULONG64*); +HRESULT WINAPI VarUI8FromDec(const DECIMAL*,ULONG64*); HRESULT WINAPI VarUI8FromInt(INT,ULONG64*); HRESULT WINAPI VarUI8FromCy(CY,ULONG64*); HRESULT WINAPI VarUI8FromDisp(IDispatch*,LCID,ULONG64*); -- 2.30.1

2 1

[PATCH 2/5] comctl32/button: Use themed painting when possible for handling WM_SETTEXT.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Fix an issue that themed buttons are drawn unthemed after receiving a WM_SETTEXT message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 ++ dlls/comctl32/tests/button.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0dcbb38d202..b5a9ee7f7f6 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -743,6 +743,8 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); if (btn_type == BS_GROUPBOX) /* Yes, only for BS_GROUPBOX */ InvalidateRect( hWnd, NULL, TRUE ); + else if (GetWindowTheme( hWnd )) + RedrawWindow( hWnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW ); else paint_button( infoPtr, btn_type, ODA_DRAWENTIRE ); return 1; /* success. FIXME: check text length */ diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index b5e145077e7..f30e9f665e5 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2359,8 +2359,7 @@ static void test_visual(void) SelectObject(mem_dc2, mem_bitmap2); BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); - todo_wine_if(type == BS_PUSHBOX || (is_theme_active && !(type == BS_OWNERDRAW - || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK))) + todo_wine_if(type == BS_PUSHBOX || (is_theme_active && type == BS_GROUPBOX)) ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#x: Expected content unchanged.\n", type); DeleteObject(mem_bitmap2); -- 2.27.0

2 1

[PATCH 1/5] comctl32/tests: Test themed painting after a WM_SETTEXT message.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 93b6ddcec36..b5e145077e7 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -29,6 +29,8 @@ #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16)) +static BOOL is_theme_active; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); @@ -118,6 +120,22 @@ static BOOL ignore_message( UINT message ) message == WM_GETTEXT); } +static BOOL equal_dc(HDC hdc1, HDC hdc2, int width, int height) +{ + int x, y; + + for (x = 0; x < width; ++x) + { + for (y = 0; y < height; ++y) + { + if (GetPixel(hdc1, x, y) != GetPixel(hdc2, x, y)) + return FALSE; + } + } + + return TRUE; +} + static LRESULT CALLBACK button_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR id, DWORD_PTR ref_data) { static LONG defwndproc_counter = 0; @@ -2304,14 +2322,77 @@ static void test_style(void) } } +static void test_visual(void) +{ + HBITMAP mem_bitmap1, mem_bitmap2; + HDC mem_dc1, mem_dc2, button_dc; + HWND button, parent; + int width, height; + DWORD type; + RECT rect; + + parent = CreateWindowA("TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok(!!parent, "Failed to create the parent window.\n"); + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; ++type) + { + /* Use WS_DISABLED to avoid glowing animations on Vista and Win7 */ + button = create_button(type | WS_VISIBLE | WS_DISABLED, parent); + flush_events(); + + button_dc = GetDC(button); + GetClientRect(button, &rect); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + mem_dc1 = CreateCompatibleDC(button_dc); + mem_bitmap1 = CreateCompatibleBitmap(button_dc, width, height); + SelectObject(mem_dc1, mem_bitmap1); + BitBlt(mem_dc1, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); + + /* Send WM_SETTEXT with the same window name */ + SendMessageA(button, WM_SETTEXT, 0, (LPARAM)"test"); + flush_events(); + + mem_dc2 = CreateCompatibleDC(button_dc); + mem_bitmap2 = CreateCompatibleBitmap(button_dc, width, height); + SelectObject(mem_dc2, mem_bitmap2); + BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); + + todo_wine_if(type == BS_PUSHBOX || (is_theme_active && !(type == BS_OWNERDRAW + || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK))) + ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#x: Expected content unchanged.\n", type); + + DeleteObject(mem_bitmap2); + DeleteObject(mem_bitmap1); + DeleteDC(mem_dc2); + DeleteDC(mem_dc1); + ReleaseDC(button, button_dc); + DestroyWindow(button); + } + + DestroyWindow(parent); +} + START_TEST(button) { + BOOL (WINAPI * pIsThemeActive)(VOID); ULONG_PTR ctx_cookie; + HMODULE uxtheme; HANDLE hCtx; if (!load_v6_module(&ctx_cookie, &hCtx)) return; + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pIsThemeActive = (void*)GetProcAddress(uxtheme, "IsThemeActive"); + if (pIsThemeActive) + is_theme_active = pIsThemeActive(); + FreeLibrary(uxtheme); + } + register_parent_class(); init_functions(); @@ -2327,6 +2408,7 @@ START_TEST(button) test_state(); test_bcm_get_ideal_size(); test_style(); + test_visual(); unload_v6_module(ctx_cookie, hCtx); } -- 2.27.0

2 1

[PATCH 5/5] comctl32/edit: Call GetWindowTheme() only when necessary.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 05920893c93..639443bc338 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4597,7 +4597,6 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW(hwnd, 0); - HTHEME theme = GetWindowTheme(hwnd); LRESULT result = 0; RECT *rect; @@ -4905,7 +4904,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_ENABLE: es->bEnableState = (BOOL) wParam; EDIT_UpdateText(es, NULL, TRUE); - if (theme) + if (GetWindowTheme(hwnd)) RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); break; @@ -4935,7 +4934,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_KILLFOCUS: - result = EDIT_WM_KillFocus(theme, es); + result = EDIT_WM_KillFocus(GetWindowTheme(hwnd), es); break; case WM_LBUTTONDBLCLK: @@ -4972,7 +4971,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_SETFOCUS: - EDIT_WM_SetFocus(theme, es); + EDIT_WM_SetFocus(GetWindowTheme(hwnd), es); break; case WM_SETFONT: @@ -5096,7 +5095,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_THEMECHANGED: - CloseThemeData (theme); + CloseThemeData(GetWindowTheme(hwnd)); OpenThemeData(hwnd, WC_EDITW); break; -- 2.27.0

2 1

[PATCH 4/5] comctl32/ipaddress: Do not open theme data in IPADDRESS_Draw().
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index c7b9ada1f6a..b6302a89ba6 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -145,7 +145,7 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) GetClientRect (infoPtr->Self, &rect); - theme = OpenThemeData(infoPtr->Self, WC_EDITW); + theme = GetWindowTheme (infoPtr->Self); if (theme) { DWORD dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE); @@ -193,9 +193,6 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) DrawTextW(hdc, L".", 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); } - if (theme) - CloseThemeData(theme); - return 0; } @@ -255,6 +252,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) } IPADDRESS_UpdateText (infoPtr); + OpenThemeData (infoPtr->Self, WC_EDITW); return 0; } @@ -262,6 +260,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) { + HTHEME theme; int i; TRACE("\n"); @@ -272,6 +271,8 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) } SetWindowLongPtrW (infoPtr->Self, 0, 0); + theme = GetWindowTheme (infoPtr->Self); + CloseThemeData (theme); heap_free (infoPtr); return 0; } @@ -456,6 +457,13 @@ static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int return FALSE; } +static LRESULT IPADDRESS_ThemeChanged (const IPADDRESS_INFO *infoPtr) +{ + HTHEME theme = GetWindowTheme (infoPtr->Self); + CloseThemeData (theme); + theme = OpenThemeData (theme, WC_EDITW); + return 0; +} /* * period: move and select the text in the next field to the right if @@ -618,6 +626,9 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) COMCTL32_RefreshSysColors(); return 0; + case WM_THEMECHANGED: + return IPADDRESS_ThemeChanged (infoPtr); + case IPM_CLEARADDRESS: return IPADDRESS_ClearAddress (infoPtr); -- 2.27.0

2 1

[PATCH 3/5] comctl32/combo: Subscribe to WM_MOUSELEAVE events.
by Zhiyi Zhang 02 Mar '21

02 Mar '21

Using WM_MOUSEMOVE events to determine whether the dropdown button is hovered is unreliable and thus the dropdown button may stay in hovered state even if mouse has left the window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/combo.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 572740b5cfd..887587a053b 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1632,6 +1632,13 @@ static void COMBO_MouseMove( LPHEADCOMBO lphc, WPARAM wParam, LPARAM lParam ) } } +static LRESULT COMBO_MouseLeave(LPHEADCOMBO lphc) +{ + lphc->wState &= ~CBF_HOT; + RedrawWindow(lphc->self, &lphc->buttonRect, 0, RDW_INVALIDATE | RDW_UPDATENOW); + return 0; +} + static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *pcbi) { if (!pcbi || (pcbi->cbSize < sizeof(COMBOBOXINFO))) @@ -1871,6 +1878,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam case WM_MOUSEMOVE: if (!IsRectEmpty(&lphc->buttonRect)) { + TRACKMOUSEEVENT event; POINT pt; pt.x = (short)LOWORD(lParam); @@ -1882,6 +1890,15 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam { lphc->wState |= CBF_HOT; RedrawWindow(hwnd, &lphc->buttonRect, 0, RDW_INVALIDATE | RDW_UPDATENOW); + + event.cbSize = sizeof(TRACKMOUSEEVENT); + event.dwFlags = TME_QUERY; + if (!TrackMouseEvent(&event) || event.hwndTrack != hwnd || !(event.dwFlags & TME_LEAVE)) + { + event.hwndTrack = hwnd; + event.dwFlags = TME_LEAVE; + TrackMouseEvent(&event); + } } } else if (lphc->wState & CBF_HOT) @@ -1895,6 +1912,9 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam COMBO_MouseMove( lphc, wParam, lParam ); return TRUE; + case WM_MOUSELEAVE: + return COMBO_MouseLeave(lphc); + case WM_MOUSEWHEEL: if (wParam & (MK_SHIFT | MK_CONTROL)) return DefWindowProcW(hwnd, message, wParam, lParam); -- 2.27.0

2 1

[PATCH] advapi32: Don't revoke ACCESS_DENIED_ACE.
by Adam Gashlin 01 Mar '21

01 Mar '21

REVOKE_ACCESS is only documented to remove ACCESS_ALLOWED_ACE and SYSTEM_AUDIT_ACE. Signed-off-by: Adam Gashlin <agashlin(a)gmail.com> --- I wasn't sure what to do with SYSTEM_ALARM_ACE, so I left it alone. This is my first patch to Wine, I hope it's not too far from acceptable! --- dlls/advapi32/security.c | 3 +-- dlls/advapi32/tests/security.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9f80a846966..6246cd21a62 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2314,8 +2314,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, add = FALSE; break; case ACCESS_DENIED_ACE_TYPE: - if (EqualSid(ppsid[j], &((ACCESS_DENIED_ACE *)old_ace_header)->SidStart)) - add = FALSE; + /* REVOKE_ACCESS does not affect ACCESS_DENIED_ACE. */ break; case SYSTEM_AUDIT_ACE_TYPE: if (EqualSid(ppsid[j], &((SYSTEM_AUDIT_ACE *)old_ace_header)->SidStart)) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f43ac2431e1..fdac67aecb8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7437,6 +7437,32 @@ static void test_GetExplicitEntriesFromAclW(void) ok(access2 == NULL, "access2 was not NULL\n"); LocalFree(new_acl); + /* Make the ACL both Allow and Deny Everyone. */ + res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, everyone_sid); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + res = AddAccessDeniedAce(old_acl, ACL_REVISION, KEY_WRITE, everyone_sid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); + /* Revoke Everyone. */ + access.Trustee.ptstrName = everyone_sid; + access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + access.grfAccessPermissions = 0; + new_acl = NULL; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + /* Deny Everyone should remain (along with Grant Users from earlier). */ + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_READ , "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions); + ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n"); + ok(access2[1].grfAccessMode == DENY_ACCESS, "Expected DENY_ACCESS, got %d\n", access2[1].grfAccessMode); + ok(access2[1].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[1].grfAccessPermissions); + ok(EqualSid(access2[1].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + FreeSid(users_sid); FreeSid(everyone_sid); HeapFree(GetProcessHeap(), 0, old_acl); -- 2.17.1

2 1

[PATCH] msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile
by Dmitry Kislyuk 01 Mar '21

01 Mar '21

2 2

[RFC] Wayland driver development update
by Alexandros Frantzis 01 Mar '21

01 Mar '21

Hi all, I would like to provide an update and get some feedback on the current state of the experimental Wayland driver, which was first announced two months ago [1]. The goal of this driver is to allow Windows applications to run directly on Wayland compositors, eventually removing the need for XWayland for many use cases. XWayland, like X11 in general, is receiving less and less developer attention and is unlikely to support modern features like improved fence synchronization or HDR. In addition, since it's yet another layer to go through, it's a source of complexity and potentially of inefficiency. Some more details and thoughts about XWayland vs direct Wayland in the context of Wine can be found here [2]. The focus of this update is to support a number of new features that are useful for applications and games, and which have also been considered potential integration pain points for the Wayland driver. These are copy/paste, drag-and-drop and support for changing the display mode. More detailed instructions for building were included in the first announcement email, but here is a quick version: $ git clone -b wayland https://gitlab.collabora.com/alf/wine/ $ ./configure --with-wayland $ DISPLAY= WAYLAND_DISPLAY=wayland-0 ./wine ... I have uploaded a video showcasing the new features here: https://youtu.be/rRss-Fdap7o Copy/paste support works well in both directions (native Wayland apps <=> Wine apps) with many common formats already supported. Drag and drop also works in the direction of native Wayland apps to Wine apps for many common formats, but not the other way around. My understanding is that drag and drop in both the X11 and Mac drivers also works only in one direction. Implementing the display mode change is particularly interesting since Wayland doesn't allow applications to directly change the display mode in the display hardware, but a similar effect can be achieved for particular surfaces by scaling in the compositor (typically using the GPU). In case of a Wine mode that doesn't match the current compositor mode, the driver instructs the compositor to scale the window contents so that they appear as if the hardware display mode had been changed while respecting the aspect ratio. There are still some rough edges in the implementation of display mode changes, like proper interactions with real mode changes from the Wayland side, which are being worked on. --- In previous discussions there were some concerns about accepting the Wayland driver into staging, unless there was more confidence that it would eventually be accepted upstream. What's the best way to get an answer to this question of (eventual) upstream acceptance? Even in this somewhat experimental state the driver is viable for many use cases. What would be required to drive this effort forward on the path to staging and, later, upstream inclusion? Thanks, Alexandros [1] https://www.winehq.org/pipermail/wine-devel/2020-December/178575.html [2] https://www.winehq.org/pipermail/wine-devel/2020-December/178633.html

5 11

[PATCH 5/5] ntdll: Use syscall frame for FPU and XMM contexts in NtSetContextThread.
by Jacek Caban 01 Mar '21

01 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 73 ++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 19 deletions(-)

1 0