From: Connor McAdams cmcadams@codeweavers.com
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/user32/static.c | 4 ++-- dlls/win32u/class.c | 30 +++++++++++++++++++++++++++--- dlls/win32u/message.c | 26 ++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 8 ++++++++ dlls/win32u/tests/win32u.c | 4 ++-- include/ntuser.h | 1 + 6 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/dlls/user32/static.c b/dlls/user32/static.c index f3953f7610a..8bbdb52c048 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -324,6 +324,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam LONG style = full_style & SS_TYPEMASK;
if (!IsWindow( hwnd )) return 0; + if (uMsg != WM_NCCREATE) NtUserMessageCall( hwnd, uMsg, wParam, lParam, 0, NtUserStaticWndProc, !unicode );
switch (uMsg) { @@ -467,8 +468,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam /* SS_ENHMETAFILE: Despite what MSDN says, Windows does not load the enhanced metafile that was specified as the window text. */ } - return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : - DefWindowProcA(hwnd, uMsg, wParam, lParam); + return NtUserMessageCall( hwnd, uMsg, wParam, lParam, 0, NtUserStaticWndProc, !unicode );
case WM_SETTEXT: if (hasTextStyle( full_style )) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 396e2285797..8e640ddb525 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -612,13 +612,18 @@ ULONG WINAPI NtUserGetAtomName( ATOM atom, UNICODE_STRING *name ) return size / sizeof(WCHAR); }
+static const WCHAR real_class_id_str[][MAX_ATOM_LEN + 1] = { + { 'S', 't', 'a', 't', 'i', 'c', 0, }, /* REAL_CLASS_ID_STATIC */ +}; + /*********************************************************************** * NtUserGetClassName (win32u.@) */ INT WINAPI NtUserGetClassName( HWND hwnd, BOOL real, UNICODE_STRING *name ) { + const WCHAR *basename = NULL; CLASS *class; - int ret; + int ret = 0;
TRACE( "%p %x %p\n", hwnd, real, name );
@@ -648,9 +653,28 @@ INT WINAPI NtUserGetClassName( HWND hwnd, BOOL real, UNICODE_STRING *name ) return NtUserGetAtomName( atom, name ); }
- ret = min( name->MaximumLength / sizeof(WCHAR) - 1, lstrlenW(class->basename) ); - if (ret) memcpy( name->Buffer, class->basename, ret * sizeof(WCHAR) ); + if (real) + { + WND *wnd; + + if (!(wnd = get_win_ptr( hwnd ))) + { + RtlSetLastWin32Error( ERROR_INVALID_WINDOW_HANDLE ); + goto exit; + } + + if (wnd->real_class_id) + basename = real_class_id_str[wnd->real_class_id - 1]; + release_win_ptr(wnd); + } + + if (!basename) + basename = (const WCHAR *)class->basename; + + ret = min( name->MaximumLength / sizeof(WCHAR) - 1, lstrlenW(basename) ); + if (ret) memcpy( name->Buffer, basename, ret * sizeof(WCHAR) ); name->Buffer[ret] = 0; +exit: release_class_ptr( class ); return ret; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d2909339983..7c2919506e9 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -4241,6 +4241,27 @@ BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPAR return put_message_in_queue( &info, NULL ); }
+static void set_real_window_class_id( HWND hwnd, unsigned int real_class_id ) +{ + WND *win; + + if (!(win = get_win_ptr( hwnd )) || (win == WND_OTHER_PROCESS || win == WND_DESKTOP)) + { + if (win == WND_OTHER_PROCESS || win == WND_DESKTOP) + ERR("Tried to set real window class on a window belonging to another process.\n"); + return; + } + + if (!win->real_class_id) + { + FIXME("Real class ID currently set in-process only.\n"); + win->real_class_id = real_class_id; + } + else if (win->real_class_id != real_class_id) + ERR("Tried to change real class ID value after it was already set.\n"); + release_win_ptr( win ); +} + LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, void *result_info, DWORD type, BOOL ansi ) { @@ -4307,6 +4328,11 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa case NtUserImeDriverCall: return ime_driver_call( hwnd, msg, wparam, lparam, result_info );
+ case NtUserStaticWndProc: + set_real_window_class_id( hwnd, REAL_CLASS_ID_STATIC ); + if (msg == WM_NCCREATE) return default_window_proc( hwnd, msg, wparam, lparam, ansi ); + return 0; + default: FIXME( "%p %x %lx %lx %p %x %x\n", hwnd, msg, (long)wparam, lparam, result_info, (int)type, ansi ); } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index b39e38db5d6..92b78453b24 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -86,6 +86,7 @@ typedef struct tagWND struct tagDIALOGINFO *dlgInfo; /* Dialog additional info (dialogs only) */ int pixel_format; /* Pixel format set by the graphics driver */ int internal_pixel_format; /* Internal pixel format set via WGL_WINE_pixel_format_passthrough */ + unsigned int real_class_id; /* "Real" window class ID, set by user32 standard control window procedures. */ int cbWndExtra; /* class cbWndExtra at window creation */ DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */ @@ -176,6 +177,13 @@ enum builtin_winprocs NB_BUILTIN_AW_WINPROCS = WINPROC_DESKTOP };
+/* Real window class ID values. */ +enum wine_real_class_id +{ + REAL_CLASS_ID_NONE = 0, + REAL_CLASS_ID_STATIC, +}; + /* FIXME: make it private to scroll.c */
/* data for a single scroll bar */ diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index e1b21917682..ec051d806bd 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -254,10 +254,10 @@ static void test_class(void) name.Length = 0xdead; name.MaximumLength = sizeof(buf); ret = NtUserGetClassName( hwnd, TRUE, &name ); - todo_wine ok( ret == 6, "NtUserGetClassName returned %lu\n", ret ); + ok( ret == 6, "NtUserGetClassName returned %lu\n", ret ); ok( name.Length == 0xdead, "Length = %u\n", name.Length ); ok( name.MaximumLength == sizeof(buf), "MaximumLength = %u\n", name.MaximumLength ); - todo_wine ok( !wcscmp( buf, L"Static" ), "buf = %s\n", debugstr_w(buf) ); + ok( !wcscmp( buf, L"Static" ), "buf = %s\n", debugstr_w(buf) );
/* Get normal class instead of real class. */ memset( buf, 0xcc, sizeof(buf) ); diff --git a/include/ntuser.h b/include/ntuser.h index 171d32abe6e..777b4e8fd58 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -306,6 +306,7 @@ enum NtUserSpyEnter = 0x0303, NtUserSpyExit = 0x0304, NtUserImeDriverCall = 0x0305, + NtUserStaticWndProc = 0x0306, };
/* NtUserThunkedMenuItemInfo codes */