[PATCH v2 0/1] MR1011: user32: Correctly detect and assign an int resource

[Alistair Leslie-Hughes (＠alesliehughes)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646

Signed-off-by: Alistair Leslie-Hughes

--
  v2: user32: Correctly detect and assign an int resource

https://gitlab.winehq.org/wine/wine/-/merge_requests/1011

[PATCH v2 1/1] user32: Correctly detect and assign an int resource

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646
---
 dlls/user32/win.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 0605f94abe1..5ad3347ea5b 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -381,7 +381,14 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
     {
         const char *nameA = (const char *)cs->lpszName;
         /* resource ID string is a special case */
-        if (nameA[0] == '\xff')
+        if (IS_INTRESOURCE(cs->lpszName))
+        {
+            name_buf[0] = 0xffff;
+            name_buf[1] = PtrToUlong(cs->lpszName);
+            name_buf[2] = 0;
+            RtlInitUnicodeString( &window_name, name_buf );
+        }
+        else if (nameA[0] == '\xff')
         {
             name_buf[0] = 0xffff;
             name_buf[1] = MAKEWORD( nameA[1], nameA[2] );

[PATCH v2 1/1] user32: Correctly detect and assign an int resource

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=124884

Your paranoid android.

=== debian11 (build log) ===

Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24687.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24687.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24687.

[Alistair Leslie-Hughes (＠alesliehughes)]

On Mon Oct 10 04:36:02 2022 +0000, Jacek Caban wrote:
> That doesn't look right, AFAIR such window names just crash on Windows.
> See commits like 0739aa610c, f28824eb58 and test failures in this MR.
> Where is this window name coming from?

01a0:fixme:msg:create_window16 
01a0:trace:win:WIN_CreateWindowEx #1b59 L"STATIC" ....
01a0:trace:win:dump_window_styles style: WS_CHILD WS_VISIBLE 00000003
01a0:trace:win:dump_window_styles exstyle: WS_EX_NOPARENTNOTIFY
01a0:trace:seh:dispatch_exception code=c0000005
01a0:warn:seh:dispatch_exception EXCEPTION_ACCESS_VIOLATION

Above is the callstack, parameter lists cut down to make it easier to read.

Updated patchset to fix the current test suite.