wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Jacek Caban : win32u: Move NtUserGetIconSize implementation from user32.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 9e4be5467cca9f8ce9bf2c8c97c6198c113c2641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e4be5467cca9f8ce9bf2c8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:39:47 2022 +0100 win32u: Move NtUserGetIconSize implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 13 +++---------- dlls/win32u/cursoricon.c | 35 +++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index e97d4f1e0d9..26c82c2c70c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -334,16 +334,9 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, */ BOOL get_icon_size( HICON handle, SIZE *size ) { - struct cursoricon_object *info; - struct cursoricon_frame *frame; - - if (!(info = get_icon_ptr( handle ))) return FALSE; - frame = get_icon_frame( info, 0 ); - size->cx = frame->width; - size->cy = frame->height; - release_icon_frame( info, frame); - release_user_handle_ptr( info ); - return TRUE; + BOOL ret = NtUserGetIconSize( handle, 0, &size->cx, &size->cy ); + if (ret) size->cy /= 2; + return ret; } struct png_wrapper diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index c83f3790c11..f0a9c1b0609 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -212,6 +212,22 @@ HICON alloc_cursoricon_handle( BOOL is_icon ) return handle; } +static struct cursoricon_object *get_icon_frame_ptr( HICON handle, UINT step ) +{ + struct cursoricon_object *obj, *ret; + + if (!(obj = get_icon_ptr( handle ))) return NULL; + if (!obj->is_ani) return obj; + if (step >= obj->ani.num_steps) + { + release_user_handle_ptr( obj ); + return NULL; + } + ret = get_icon_ptr( obj->ani.frames[step] ); + release_user_handle_ptr( obj ); + return ret; +} + static BOOL free_icon_handle( HICON handle ) { struct cursoricon_object *obj = free_user_handle( handle, NTUSER_OBJ_ICON ); @@ -403,3 +419,22 @@ HICON WINAPI NtUserFindExistingCursorIcon( UNICODE_STRING *module, UNICODE_STRIN user_unlock(); return ret; } + +/*********************************************************************** + * NtUserGetIconSize (win32u.@) + */ +BOOL WINAPI NtUserGetIconSize( HICON handle, UINT step, LONG *width, LONG *height ) +{ + struct cursoricon_object *obj; + + if (!(obj = get_icon_frame_ptr( handle, step ))) + { + SetLastError( ERROR_INVALID_CURSOR_HANDLE ); + return FALSE; + } + + *width = obj->frame.width; + *height = obj->frame.height * 2; + release_user_handle_ptr( obj ); + return TRUE; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index b4255449b83..54d9d6ea754 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -117,6 +117,7 @@ static void * const syscalls[] = NtUserGetDoubleClickTime, NtUserGetDpiForMonitor, NtUserGetForegroundWindow, + NtUserGetIconSize, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardLayoutName, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 20ee7a3cebd..dddc3a5b187 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -935,7 +935,7 @@ @ stub NtUserGetHDevName @ stub NtUserGetHimetricScaleFactorFromPixelLocation @ stub NtUserGetIconInfo -@ stub NtUserGetIconSize +@ stdcall -syscall NtUserGetIconSize(long long ptr ptr) @ stub NtUserGetImeHotKey @ stub NtUserGetImeInfoEx @ stub NtUserGetInputContainerId diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 0141a216ee9..0908c2db019 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -104,6 +104,7 @@ SYSCALL_ENTRY( NtUserGetDoubleClickTime ) \ SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \ SYSCALL_ENTRY( NtUserGetForegroundWindow ) \ + SYSCALL_ENTRY( NtUserGetIconSize ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index cd345429af7..6b50f545948 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -279,6 +279,16 @@ NTSTATUS WINAPI wow64_NtUserFindExistingCursorIcon( UINT *args ) return HandleToUlong( ret ); } +NTSTATUS WINAPI wow64_NtUserGetIconSize( UINT *args ) +{ + HICON handle = get_handle( &args ); + UINT step = get_ulong( &args ); + LONG *width = get_ptr( &args ); + LONG *height = get_ptr( &args ); + + return NtUserGetIconSize( handle, step, width, height ); +} + NTSTATUS WINAPI wow64_NtUserAttachThreadInput( UINT *args ) { DWORD from = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index f385f91f8ce..6c6e6518297 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -204,6 +204,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path UINT WINAPI NtUserGetDoubleClickTime(void); BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ); HWND WINAPI NtUserGetForegroundWindow(void); +BOOL WINAPI NtUserGetIconSize( HICON handle, UINT step, LONG *width, LONG *height ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Jacek Caban : win32u: Move NtUserSetCursor implementation from user32.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 744853fd56c6a48c10fb3a1bea5fd9f1858e8b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=744853fd56c6a48c10fb3a1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:39:35 2022 +0100 win32u: Move NtUserSetCursor implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 38 ------------------------------- dlls/user32/driver.c | 12 +--------- dlls/user32/nonclient.c | 12 +++++----- dlls/user32/scroll.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 2 +- dlls/win32u/cursoricon.c | 53 +++++++++++++++++++++++++++++++++++--------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 1 + 12 files changed, 62 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=744853fd56c6a48c10fb…

1 0

Nikolay Sivov : comctl32/listview: Initialize subitem text buffer before drawing each subitem.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 4f1853c57633629ad81a233ab75a85b6f41399ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1853c57633629ad81a233a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 13:48:23 2022 +0300 comctl32/listview: Initialize subitem text buffer before drawing each subitem. Notification handler for LVN_GETDISPINFO is not guaranteed to touch text buffer. When it doesn't, it can lead to already queried text to be reused for subitems. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52583 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2cb96367551..730bf4aaddd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4800,6 +4800,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT lvItem.lParam = 0; lvItem.cchTextMax = DISP_TEXT_SIZE; lvItem.pszText = szDispText; + szDispText[0] = 0; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; if (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED);

1 0

Alistair Leslie-Hughes : mfuuid: Add more schema CLSIDs.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: f67bc47693279e0cd5a56a4f418c659a6b018563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67bc47693279e0cd5a56a4f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 23 13:00:29 2022 +0300 mfuuid: Add more schema CLSIDs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 4 ++++ libs/mfuuid/mfuuid.c | 1 + 2 files changed, 5 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 4df1d0c85ba..7034378f585 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1634,3 +1634,7 @@ cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2 cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") cpp_quote("EXTERN_GUID(CLSID_WMADecMediaObject, 0x2eeb4adf, 0x4578, 0x4d10, 0xbc, 0xa7, 0xbb, 0x95, 0x5f, 0x56, 0x32, 0x0a);") + +cpp_quote("EXTERN_GUID(CLSID_HttpSchemePlugin, 0x44cb442b, 0x9da9, 0x49df, 0xb3, 0xfd, 0x02, 0x37, 0x77, 0xb1, 0x6e, 0x50);") +cpp_quote("EXTERN_GUID(CLSID_NetSchemePlugin, 0xe9f4ebab, 0xd97b, 0x463e, 0xa2, 0xb1, 0xc5, 0x4e, 0xe3, 0xf9, 0x41, 0x4d);") +cpp_quote("EXTERN_GUID(CLSID_UrlmonSchemePlugin, 0x9ec4b4f9, 0x3029, 0x45ad, 0x94, 0x7b, 0x34, 0x4d, 0xe2, 0xa2, 0x49, 0xe2);") diff --git a/libs/mfuuid/mfuuid.c b/libs/mfuuid/mfuuid.c index 537eaef6427..ce50eedb0a0 100644 --- a/libs/mfuuid/mfuuid.c +++ b/libs/mfuuid/mfuuid.c @@ -35,3 +35,4 @@ DEFINE_GUID(MF_SCRUBBING_SERVICE, 0xdd0ac3d8,0x40e3,0x4128,0xac,0x48,0xc0,0xad,0xd0,0x67,0xb7,0x14); DEFINE_GUID(CLSID_FileSchemePlugin, 0x477ec299,0x1421,0x4bdd,0x97,0x1f,0x7c,0xcb,0x93,0x3f,0x21,0xad); +DEFINE_GUID(CLSID_SecureHttpSchemePlugin, 0x37a61c8b,0x7f8e,0x4d08,0xb1,0x2b,0x24,0x8d,0x73,0xe9,0xab,0x4f);

1 0

Alistair Leslie-Hughes : mfplat: Correctly calculate url scheme length.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 4662dbd796a8feac494de1ae26c6ab6005e829da URL: https://source.winehq.org/git/wine.git/?a=commit;h=4662dbd796a8feac494de1ae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 23 12:23:34 2022 +0300 mfplat: Correctly calculate url scheme length. When a url is passed in, for example "http://..." We need to include the : in the scheme string not exclude it. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7991152f7a7..cee052defeb 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -6469,10 +6469,11 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch if (ptr == url || *ptr != ':') { url = fileschemeW; - ptr = fileschemeW + ARRAY_SIZE(fileschemeW) - 1; + len = ARRAY_SIZE(fileschemeW) - 1; } + else + len = ptr - url + 1; - len = ptr - url; scheme = malloc((len + 1) * sizeof(WCHAR)); if (!scheme) return E_OUTOFMEMORY;

1 0

Rafał Harabień : user32/tests: Remove now unused TODO_COUNT in static tests.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: a3cd6220e4a96317840e18104e13da6e5c4602bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3cd6220e4a96317840e1810… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Fri Feb 18 01:41:41 2022 +0100 user32/tests: Remove now unused TODO_COUNT in static tests. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 48 ++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index cc5654485bd..0899f4c6187 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -28,14 +28,9 @@ #include "wine/test.h" -#define TODO_COUNT 1 - #define CTRL_ID 1995 static HWND hMainWnd; - -#define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " fmt " got " fmt "\n", (value), val); } - static int g_nReceivedColorStatic = 0; /* try to make sure pending X events have been processed before continuing */ @@ -78,7 +73,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_updates(int style, int flags) +static void test_updates(int style) { RECT r1 = {5, 5, 30, 30}, rcClient; HWND hStatic = build_static(style); @@ -126,12 +121,7 @@ static void test_updates(int style, int flags) else exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ - if (flags & TODO_COUNT) - todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } - else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok( g_nReceivedColorStatic == exp, "expected %u got %u\n", exp, g_nReceivedColorStatic ); - else - expect_eq(g_nReceivedColorStatic, exp, int, "%d"); + ok( g_nReceivedColorStatic == exp, "expected %u, got %u\n", exp, g_nReceivedColorStatic ); DestroyWindow(hStatic); } @@ -343,23 +333,23 @@ START_TEST(static) hMainWnd = CreateWindowA(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - test_updates(0, 0); - test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, 0); - test_updates(SS_WHITERECT, 0); - test_updates(SS_BLACKFRAME, 0); - test_updates(SS_WHITEFRAME, 0); - test_updates(SS_USERITEM, 0); - test_updates(SS_SIMPLE, 0); - test_updates(SS_OWNERDRAW, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_BLACKRECT, 0); - test_updates(SS_WHITERECT, 0); - test_updates(SS_ETCHEDHORZ, 0); - test_updates(SS_ETCHEDVERT, 0); - test_updates(SS_ETCHEDFRAME, 0); - test_updates(SS_SUNKEN, 0); + test_updates(0); + test_updates(SS_ICON); + test_updates(SS_BLACKRECT); + test_updates(SS_WHITERECT); + test_updates(SS_BLACKFRAME); + test_updates(SS_WHITEFRAME); + test_updates(SS_USERITEM); + test_updates(SS_SIMPLE); + test_updates(SS_OWNERDRAW); + test_updates(SS_BITMAP); + test_updates(SS_BITMAP | SS_CENTERIMAGE); + test_updates(SS_BLACKRECT); + test_updates(SS_WHITERECT); + test_updates(SS_ETCHEDHORZ); + test_updates(SS_ETCHEDVERT); + test_updates(SS_ETCHEDFRAME); + test_updates(SS_SUNKEN); test_set_text(); test_set_image(); test_STM_SETIMAGE();

1 0

Rafał Harabień : user32/tests: Fix invalidation in static control tests.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 9584e0d8e3227a2504d3a3421fb3c4057b121f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9584e0d8e3227a2504d3a342… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Fri Feb 18 01:41:40 2022 +0100 user32/tests: Fix invalidation in static control tests. Rectangle used for invalidation was outside of windows rect of static controls with SS_ETCHEDHORZ/SS_ETCHEDVERT style because they resize after creation. Improve test by changing the invalidated rect and add more details in comment about SS_ETCHEDHORZ/SS_ETCHEDVERT styles. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index f879a803c32..cc5654485bd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -80,7 +80,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { - RECT r1 = {20, 20, 30, 30}, rcClient; + RECT r1 = {5, 5, 30, 30}, rcClient; HWND hStatic = build_static(style); int exp; LONG exstyle; @@ -124,7 +124,7 @@ static void test_updates(int style, int flags) if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; else - exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ if (flags & TODO_COUNT) todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); }

1 0

Rafał Harabień : user32: Send WM_CTLCOLORSTATIC for all static control types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 9e0aa5ef81155b7eb88f13186c2600ac0e96279d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e0aa5ef81155b7eb88f1318… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Fri Feb 18 01:41:39 2022 +0100 user32: Send WM_CTLCOLORSTATIC for all static control types. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/static.c | 143 +++++++++++++++++++++------------------------ dlls/user32/tests/static.c | 20 +++---- 2 files changed, 75 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e0aa5ef81155b7eb88f…

1 0

Rafał Harabień : user32: Fix handling of SS_ETCHEDHORZ/SS_ETCHEDVERT static control styles.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: a6faf54b16e9f72665d71021f23f5fbadded7ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6faf54b16e9f72665d71021… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Fri Feb 18 01:41:38 2022 +0100 user32: Fix handling of SS_ETCHEDHORZ/SS_ETCHEDVERT static control styles. Instead of drawing the frame in WM_PAINT use WS_EX_STATICEDGE style that adds the frame outside of the client rect and change control size after creation to make it look like a line. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/static.c | 31 ++++++++++++++++--------------- dlls/user32/tests/static.c | 6 +++--- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 35bdc2490c0..39fb4250b22 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -74,8 +74,8 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ - STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ - STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ + NULL, /* SS_ETCHEDHORZ */ + NULL, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; @@ -410,10 +410,22 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - if (full_style & SS_SUNKEN) + if (full_style & SS_SUNKEN || style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) SetWindowLongW( hwnd, GWL_EXSTYLE, GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) + { + RECT rc; + GetClientRect(hwnd, &rc); + if (style == SS_ETCHEDHORZ) + rc.bottom = rc.top; + else + rc.right = rc.left; + AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER); + } + switch (style) { case SS_ICON: { @@ -794,16 +806,5 @@ static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); - switch (style & SS_TYPEMASK) - { - case SS_ETCHEDHORZ: - DrawEdge(hdc,&rc,EDGE_ETCHED,BF_TOP|BF_BOTTOM); - break; - case SS_ETCHEDVERT: - DrawEdge(hdc,&rc,EDGE_ETCHED,BF_LEFT|BF_RIGHT); - break; - case SS_ETCHEDFRAME: - DrawEdge (hdc, &rc, EDGE_ETCHED, BF_RECT); - break; - } + DrawEdge (hdc, &rc, EDGE_ETCHED, BF_RECT); } diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index fe6ca1243a7..961583b34d3 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -90,17 +90,17 @@ static void test_updates(int style, int flags) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); else ok(exstyle == 0, "expected 0, got %d\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); else ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); if (style == SS_ETCHEDHORZ) - todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); else ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom);

1 0

Rafał Harabień : user32/tests: Check client rect in static control tests.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: b52e0dc64a4c07e209e5b33acff289d58c2ee103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52e0dc64a4c07e209e5b33a… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Fri Feb 18 01:41:37 2022 +0100 user32/tests: Check client rect in static control tests. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index feb0c10c9e8..fe6ca1243a7 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -80,7 +80,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { - RECT r1 = {20, 20, 30, 30}; + RECT r1 = {20, 20, 30, 30}, rcClient; HWND hStatic = build_static(style); int exp; LONG exstyle; @@ -94,6 +94,16 @@ static void test_updates(int style, int flags) else ok(exstyle == 0, "expected 0, got %d\n", exstyle); + GetClientRect(hStatic, &rcClient); + if (style == SS_ETCHEDVERT) + todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + else + ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + if (style == SS_ETCHEDHORZ) + todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + else + ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ InvalidateRect(hMainWnd, NULL, FALSE);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022