[PATCH v6 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

--
  v6: user.exe: Pass resource ID as a string in DIALOG_CreateControls16.

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

[PATCH v6 1/1] user.exe: Pass resource ID as a string in DIALOG_CreateControls16.

[Jacek Caban]

From: Jacek Caban

Based on commit 0739aa610cc07.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646
---
 dlls/user.exe16/dialog.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c
index ecd7acb9bfc..315f70dd6f3 100644
--- a/dlls/user.exe16/dialog.c
+++ b/dlls/user.exe16/dialog.c
@@ -181,13 +181,25 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template,
     TRACE(" BEGIN\n" );
     while (items--)
     {
+        char *caption, caption_buf[4];
         HINSTANCE16 instance = hInst;
         SEGPTR segptr;

template = DIALOG_GetControl16( template, &info );
         segptr = MapLS( info.data );
+
+        caption = (char *)info.windowName;
+        if (caption && IS_INTRESOURCE(caption))
+        {
+            caption_buf[0] = 0xff;
+            caption_buf[1] = PtrToUlong( caption );
+            caption_buf[2] = PtrToUlong( caption ) >> 8;
+            caption_buf[3] = 0;
+            caption = caption_buf;
+        }
+
         hwndCtrl = WIN_Handle32( CreateWindowEx16( WS_EX_NOPARENTNOTIFY,
-                                                   info.className, info.windowName,
+                                                   info.className, caption,
                                                    info.style | WS_CHILD,
                                                    MulDiv(info.x, dlgInfo->xBaseUnit, 4),
                                                    MulDiv(info.y, dlgInfo->yBaseUnit, 8),

[PATCH v6 1/1] user.exe: Pass resource ID as a string in DIALOG_CreateControls16.

[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=125086

Your paranoid android.

=== debian11 (32 bit report) ===

d3d9:
device.c:5963: Test failed: Failed to create a D3D object.

ddraw:
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x1000.
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x3000.

=== debian11 (build log) ===

02b0:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.
02b0:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.
02b0:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.
02b0:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.
02b0:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.
02b0:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.

=== debian11 (build log) ===

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

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

[Alistair Leslie-Hughes (＠alesliehughes)]

This merge request was approved by Alistair Leslie-Hughes.