Commit 8aa5b996 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

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

parent 03f5f72c
...@@ -181,13 +181,25 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template, ...@@ -181,13 +181,25 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template,
TRACE(" BEGIN\n" ); TRACE(" BEGIN\n" );
while (items--) while (items--)
{ {
char *caption, caption_buf[4];
HINSTANCE16 instance = hInst; HINSTANCE16 instance = hInst;
SEGPTR segptr; SEGPTR segptr;
template = DIALOG_GetControl16( template, &info ); template = DIALOG_GetControl16( template, &info );
segptr = MapLS( info.data ); 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, hwndCtrl = WIN_Handle32( CreateWindowEx16( WS_EX_NOPARENTNOTIFY,
info.className, info.windowName, info.className, caption,
info.style | WS_CHILD, info.style | WS_CHILD,
MulDiv(info.x, dlgInfo->xBaseUnit, 4), MulDiv(info.x, dlgInfo->xBaseUnit, 4),
MulDiv(info.y, dlgInfo->yBaseUnit, 8), MulDiv(info.y, dlgInfo->yBaseUnit, 8),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment