Release 980413

Sun Apr 12 12:22:23 1997  Andreas Mohr <100.30936@germany.net>

	* [files/drive.c]
	Fixed "no free space" problem with partition sizes between 1 and 2 GB
	(cluster_sectors may not exceed 0x40).

	* [windows/msgbox.c] [if1632/user.spec] [include/windows.h]
	Implemented MessageBoxIndirect16, corrected MSGBOXPARAMS16.

	* [loader/task.c]
	DOS environment strings may never exceed 127 chars
	-> truncate Unix environment strings if necessary.

Sun Apr 12 02:51:44 1998  Dimitrie O. Paun  <dimi@mail.cs.toronto.edu>

	* [files/*.c]
	All fprintf statements were converted to appropriate debug
	messages.

	* [tools/find_debug_channels]
	Updated comments at the beginning of the file.

Sat Apr 11 15:27:21 1998  Alexandre Julliard  <julliard@lrc.epfl.ch>

	* [loader/module.c] [loader/task.c] [scheduler/process.c]
	Moved some code around to prepare the ground for CreateProcess().

	* [memory/environ.c] [loader/task.c]
	Moved Win32 environment strings functions to environ.c.
	Unified Win16 and Win32 environment management.

	* [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/*.c]
	Implemented handle inheritance and DuplicateHandle().

	* [scheduler/thread.c]
	Create a 16-bit stack for all threads.

	* [windows/dialog.c]
	Implemented DIALOGEX resource format.

Fri Apr 10 20:21:51 1998  Marcus Meissner <marcus@mud.de>

	* [configure.in][include/acconfig.h][*/*][multimedia/*]
	Cleaned up the OSS detection stuff, added some more checks for
	headerfiles/functions.
	Removed a lot of OS specific #ifdefs.
	Lots of dependend multimedia cleanups.

	* [loader/pe_image.c]
	Enhanced comment, added missing reference count increase.

	* [ole/compobj.c]
	Replaced broken StringFromGUID2 by working one.

	* [misc/winsock.c]
	SO_LINGER uses unsigned 16 bit in Win16 and Win32, but unsigned
	int (32bit) for UNIX.

	* [memory/global.c]
	Allow realloc for lockcount 1 too.

Fri Apr 10 15:27:34 1998  Morten Welinder  <terra@diku.dk>

	* [graphics/x11drv/text.c]
	Handle control characters in trace.  Ignore terminating newline.

	* [multimedia/init.c]
	(MULTIMEDIA_Init): Correct allocations.

	* [tools/examine-relay]
 	Tidy up.

	* [windows/syscolor.c]
	Change highlight colour from lightblue to lightgray.  This
	looks correct for menus.

Fri Apr 10 01:49:58 1998  Douglas Ridgway  <ridgway@winehq.com>

	* [configure.in] [Make.rules.in]
	Add check for c2man before using it.

Fri Apr 10 02:59:21 1998  Douglas Ridgway  <ridgway@winehq.com>

	* [DEVELOPERS-HINTS]
	Simple description of adding API calls.

	* [include/wintypes.h] [include/windows.h]
	Get rid of Winelib16, avoid declaring some illegal functions in
	Winelib, add prototypes for some enhanced metafile functions, fix
	GetTextExtentPoint32 declarations.

	* [relay32/gdi32.spec] [objects/enhmetafile.c]
	Cosmetic and functional improvements.

	* [include/wincon.h] [programs/view/*]
	Fixes, improved compatibility with native compilers.

Thu Apr  9 15:48:49 1998  Ulrich Weigand <weigand@informatik.uni-erlangen.de>

	* [win32/kernel32.c]
	Implemented FT_Thunk / FT_Prolog / FT_Exit / FT_PrologPrime.
	Fixed Common32ThkLS thunk function.

	* [tools/build.c] [relay32/relay386.c] [if1632/relay.c]
	Changed relay code to allow register functions to modify stack layout.

	* [memory/selector.c]
	Implemented AllocMappedBuffer / FreeMappedBuffer.

	* [relay32/kernel32.spec] [if1632/kernel.spec] [win32/ordinals.c]
	Added names for undocumented functions.

	* [loader/module.c]
	Bugfix: LoadLibrary16 should *not* silently load 32-bit DLL.

Thu Apr  9 03:54:58 1998  Jim Peterson <jspeter@birch.ee.vt.edu>

	* [windows/keyboard.c]
	Fix an erroneous test in TranslateAccelerator{16,32} for the end
	of the accelerator table.

Thu Apr  8 20:36:28 1998  Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> 

	* [misc/crtdll.c]
	Implement getenv.

	* [misc/commdlg.c]
	Make Get[Save/Open]FileName work in most situations.

	* [misc/lstr.c]
	Use wvsprintf32A instead of vsprintf in FormatMessage32X

	* [misc/version]
	Make NT3.50 a recognised version

	* [graphics/x11drv/graphics.c]
	Change the algorithme to draw arcs

	* [loader/resource.c]
	Return an empty buffer in LoadString32A if no resource found.

	* [win32/code_page.c]
	Try harder to get the right size in MultiByteToWideChar.

	* [win32/process.c]
	Call WinExec32 for CreateProcess32A.

	* [windows/user.c]
	Install default Int0 Handler in InitApp().

Thu Apr  8 19:29:48 1998  Eric Kohl <ekohl@abo.rhein-zeitung.de>

	* [misc/imagelist.c]
	Preliminary fix for drawing selected images.
	Various improvements.

	* [controls/progress.c][include/progress.c][include/commctrl.h]
	Added progress bar messages and styles for IE4.01 (dll version 4.72)
	compatibility.
	Fixed led size problem.

	* [controls/updown.c][include/commctrl.h]
	Added UDM_GETRANGE32 and UDM_SETRANGE32.

	* [objects/oembitmaps.c][include/windows.h][include/bitmaps/*]
	Added Win95 icons and fixed Win95 cursor and restore button bug.
	Now they should be visible. Sorry!!!

	* [relay32/comctl32.spec]
	Added most missing function names.

Tue Apr  6 18:48:36 1998  Matthew Becker <mbecker@glasscity.net>

	* [objects/font.c] [if1632/gdi.spec]
	GetOutlineTextMetrics: stub

	* [objects/text.c]
	GetTextCharset should just call GetTextCharsetInfo.

	* [misc/mpr.c] [relay32/mpr.spec]
	WNetCachePassword: stub

	* [scheduler/thread.c] [relay32/user32.spec]
	AttachThreadInput: stub
	Updated documentation.

	* [objects/palette.c]
	Updated documentation.

Tue Mar 31 17:06:30 1998  James Juran <jrj120@psu.edu>

	* [*/*.c]
	Finished fixing USER32 ordinal numbers in function documentation.

Mon Mar 30 20:27:38 1998  Morten Welinder  <terra@diku.dk>

	* [misc/debugstr.c] [include/debugstr.h]
	Moved _dumpstr from relay32/relay386.c.  Improved control
	character handling.

	* [msdos/int21.c]
	Implement 215E00 -- get machine name.

	* [windows/winpos.c]
	SetWindowPos32: Make an extra sync when mapping managed
	windows.  This makes sure the reconfigure event has been
	handled.  See Mshearts' what's-your-name window.

Mon Mar 30 01:13:50 1998  Alexander V. Lukyanov <lav@long.yar.ru>

	* [Makefile.in]
	Install includes from TOPSRCDIR.
diff --git a/windows/dialog.c b/windows/dialog.c
index c6ad70c..a1b67f9 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -29,11 +29,12 @@
 {
     DWORD      style;
     DWORD      exStyle;
+    DWORD      helpId;
     INT16      x;
     INT16      y;
     INT16      cx;
     INT16      cy;
-    UINT16     id;
+    UINT32     id;
     LPCSTR     className;
     LPCSTR     windowName;
     LPVOID     data;
@@ -44,6 +45,7 @@
 {
     DWORD      style;
     DWORD      exStyle;
+    DWORD      helpId;
     UINT16     nbItems;
     INT16      x;
     INT16      y;
@@ -53,7 +55,10 @@
     LPCSTR     className;
     LPCSTR     caption;
     WORD       pointSize;
+    WORD       weight;
+    BOOL32     italic;
     LPCSTR     faceName;
+    BOOL32     dialogEx;
 } DLG_TEMPLATE;
 
   /* Dialog base units */
@@ -166,32 +171,57 @@
  * Return the class and text of the control pointed to by ptr,
  * fill the header structure and return a pointer to the next control.
  */
-static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info )
+static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info,
+                                        BOOL32 dialogEx )
 {
-    static WCHAR buffer[10];
-    int int_id;
-
-    info->style   = GET_DWORD(p); p += 2;
-    info->exStyle = GET_DWORD(p); p += 2;
+    if (dialogEx)
+    {
+        info->helpId  = GET_DWORD(p); p += 2;
+        info->exStyle = GET_DWORD(p); p += 2;
+        info->style   = GET_DWORD(p); p += 2;
+    }
+    else
+    {
+        info->helpId  = 0;
+        info->style   = GET_DWORD(p); p += 2;
+        info->exStyle = GET_DWORD(p); p += 2;
+    }
     info->x       = GET_WORD(p); p++;
     info->y       = GET_WORD(p); p++;
     info->cx      = GET_WORD(p); p++;
     info->cy      = GET_WORD(p); p++;
-    info->id      = GET_WORD(p); p++;
+
+    if (dialogEx)
+    {
+        /* id is a DWORD for DIALOGEX */
+        info->id = GET_DWORD(p);
+        p += 2;
+    }
+    else
+    {
+        info->id = GET_WORD(p);
+        p++;
+    }
 
     if (GET_WORD(p) == 0xffff)
     {
-        switch(GET_WORD(p+1))
+        static const WCHAR class_names[6][10] =
         {
-            case 0x80: lstrcpyAtoW( buffer, "Button" ); break;
-            case 0x81: lstrcpyAtoW( buffer, "Edit" ); break;
-            case 0x82: lstrcpyAtoW( buffer, "Static" ); break;
-            case 0x83: lstrcpyAtoW( buffer, "ListBox" ); break;
-            case 0x84: lstrcpyAtoW( buffer, "ScrollBar" ); break;
-            case 0x85: lstrcpyAtoW( buffer, "ComboBox" ); break;
-            default:   buffer[0] = '\0'; break;
+            { 'B','u','t','t','o','n', },             /* 0x80 */
+            { 'E','d','i','t', },                     /* 0x81 */
+            { 'S','t','a','t','i','c', },             /* 0x82 */
+            { 'L','i','s','t','B','o','x', },         /* 0x83 */
+            { 'S','c','r','o','l','l','B','a','r', }, /* 0x84 */
+            { 'C','o','m','b','o','B','o','x', }      /* 0x85 */
+        };
+        WORD id = GET_WORD(p+1);
+        if ((id >= 0x80) && (id <= 0x85))
+            info->className = (LPCSTR)class_names[id - 0x80];
+        else
+        {
+            info->className = NULL;
+            ERR( dialog, "Unknown built-in class id %04x\n", id );
         }
-        info->className = (LPCSTR)buffer;
         p += 2;
     }
     else
@@ -200,10 +230,9 @@
         p += lstrlen32W( (LPCWSTR)p ) + 1;
     }
 
-    int_id = (GET_WORD(p) == 0xffff);
-    if (int_id)
+    if (GET_WORD(p) == 0xffff)  /* Is it an integer id? */
     {
-	info->windowName = (LPCSTR)(p + 1);
+	info->windowName = (LPCSTR)(UINT32)GET_WORD(p + 1);
 	p += 2;
     }
     else
@@ -212,25 +241,29 @@
         p += lstrlen32W( (LPCWSTR)p ) + 1;
     }
 
+    TRACE(dialog,"    %s %s %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n", 
+          debugstr_w( (LPCWSTR)info->className ),
+          debugres_w( (LPCWSTR)info->windowName ),
+          info->id, info->x, info->y, info->cx, info->cy,
+          info->style, info->exStyle, info->helpId );
+
     if (GET_WORD(p))
     {
+        if (TRACE_ON(dialog))
+        {
+            WORD i, count = GET_WORD(p) / sizeof(WORD);
+            TRACE(dialog, "  BEGIN\n");
+            TRACE(dialog, "    ");
+            for (i = 0; i < count; i++) DUMP( "%04x,", GET_WORD(p+i+1) );
+            DUMP("\n");
+            TRACE(dialog, "  END\n" );
+        }
         info->data = (LPVOID)(p + 1);
         p += GET_WORD(p) / sizeof(WORD);
     }
     else info->data = NULL;
     p++;
 
-    if(int_id)
-      TRACE(dialog,"   %p %04x %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n", 
-		      info->className, LOWORD(info->windowName),
-		      info->id, info->x, info->y, info->cx, info->cy,
-		      info->style, info->exStyle, (DWORD)info->data);
-    else
-      TRACE(dialog,"   %p '%p' %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n", 
-		      info->className, info->windowName,
-		      info->id, info->x, info->y, info->cx, info->cy,
-		      info->style, info->exStyle, (DWORD)info->data);
-
     /* Next control is on dword boundary */
     return (const WORD *)((((int)p) + 3) & ~3);
 }
@@ -241,12 +274,14 @@
  *
  * Create the control windows for a dialog.
  */
-static BOOL32 DIALOG_CreateControls( WND *pWnd, LPCSTR template, INT32 items,
+static BOOL32 DIALOG_CreateControls( WND *pWnd, LPCSTR template,
+                                     const DLG_TEMPLATE *dlgTemplate,
                                      HINSTANCE32 hInst, BOOL32 win32 )
 {
     DIALOGINFO *dlgInfo = (DIALOGINFO *)pWnd->wExtra;
     DLG_CONTROL_INFO info;
     HWND32 hwndCtrl, hwndDefButton = 0;
+    INT32 items = dlgTemplate->nbItems;
 
     TRACE(dialog, " BEGIN\n" );
     while (items--)
@@ -284,7 +319,8 @@
         }
         else
         {
-            template = (LPCSTR)DIALOG_GetControl32( (WORD *)template, &info );
+            template = (LPCSTR)DIALOG_GetControl32( (WORD *)template, &info,
+                                                    dlgTemplate->dialogEx );
             hwndCtrl = CreateWindowEx32W( info.exStyle | WS_EX_NOPARENTNOTIFY,
                                           (LPCWSTR)info.className,
                                           (LPCWSTR)info.windowName,
@@ -397,17 +433,30 @@
 {
     const WORD *p = (const WORD *)template;
 
-    result->style   = GET_DWORD(p); p += 2;
-    result->exStyle = GET_DWORD(p); p += 2;
+    result->style = GET_DWORD(p); p += 2;
+    if (result->style == 0xffff0001)  /* DIALOGEX resource */
+    {
+        result->dialogEx = TRUE;
+        result->helpId   = GET_DWORD(p); p += 2;
+        result->exStyle  = GET_DWORD(p); p += 2;
+        result->style    = GET_DWORD(p); p += 2;
+    }
+    else
+    {
+        result->dialogEx = FALSE;
+        result->helpId   = 0;
+        result->exStyle  = GET_DWORD(p); p += 2;
+    }
     result->nbItems = GET_WORD(p); p++;
     result->x       = GET_WORD(p); p++;
     result->y       = GET_WORD(p); p++;
     result->cx      = GET_WORD(p); p++;
     result->cy      = GET_WORD(p); p++;
-    TRACE(dialog, "DIALOG %d, %d, %d, %d\n",
-                    result->x, result->y, result->cx, result->cy );
-    TRACE(dialog, " STYLE %08lx\n", result->style );
-    TRACE(dialog, " EXSTYLE %08lx\n", result->exStyle );
+    TRACE( dialog, "DIALOG%s %d, %d, %d, %d, %ld\n",
+           result->dialogEx ? "EX" : "", result->x, result->y,
+           result->cx, result->cy, result->helpId );
+    TRACE( dialog, " STYLE 0x%08lx\n", result->style );
+    TRACE( dialog, " EXSTYLE 0x%08lx\n", result->exStyle );
 
     /* Get the menu name */
 
@@ -424,7 +473,7 @@
         break;
     default:
         result->menuName = (LPCSTR)p;
-        TRACE(dialog, " MENU '%p'\n", p );
+        TRACE(dialog, " MENU %s\n", debugstr_w( (LPCWSTR)p ));
         p += lstrlen32W( (LPCWSTR)p ) + 1;
         break;
     }
@@ -444,7 +493,7 @@
         break;
     default:
         result->className = (LPCSTR)p;
-        TRACE(dialog, " CLASS '%p'\n", p );
+        TRACE(dialog, " CLASS %s\n", debugstr_w( (LPCWSTR)p ));
         p += lstrlen32W( (LPCWSTR)p ) + 1;
         break;
     }
@@ -453,7 +502,7 @@
 
     result->caption = (LPCSTR)p;
     p += lstrlen32W( (LPCWSTR)p ) + 1;
-    TRACE(dialog, " CAPTION '%p'\n", result->caption );
+    TRACE(dialog, " CAPTION %s\n", debugstr_w( (LPCWSTR)result->caption ) );
 
     /* Get the font name */
 
@@ -461,11 +510,23 @@
     {
 	result->pointSize = GET_WORD(p);
         p++;
+        if (result->dialogEx)
+        {
+            result->weight = GET_WORD(p); p++;
+            result->italic = LOBYTE(GET_WORD(p)); p++;
+        }
+        else
+        {
+            result->weight = FW_DONTCARE;
+            result->italic = FALSE;
+        }
 	result->faceName = (LPCSTR)p;
         p += lstrlen32W( (LPCWSTR)p ) + 1;
-	TRACE(dialog, " FONT %d,'%p'\n",
-                        result->pointSize, result->faceName );
+	TRACE(dialog, " FONT %d, %s, %d, %s\n",
+              result->pointSize, debugstr_w( (LPCWSTR)result->faceName ),
+              result->weight, result->italic ? "TRUE" : "FALSE" );
     }
+
     /* First control is on dword boundary */
     return (LPCSTR)((((int)p) + 3) & ~3);
 }
@@ -517,10 +578,10 @@
           /* The font height must be negative as it is a point size */
           /* (see CreateFont() documentation in the Windows SDK).   */
 	if (win32Template)
-	    hFont = CreateFont32W( -template.pointSize, 0, 0, 0, FW_DONTCARE,
-			    FALSE, FALSE, FALSE, DEFAULT_CHARSET, 0, 0,
-			    PROOF_QUALITY, FF_DONTCARE,
-                            (LPCWSTR)template.faceName );
+	    hFont = CreateFont32W( -template.pointSize, 0, 0, 0,
+                                   template.weight, template.italic, FALSE,
+                                   FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY,
+                                   FF_DONTCARE, (LPCWSTR)template.faceName );
 	else
 	    hFont = CreateFont16( -template.pointSize, 0, 0, 0, FW_DONTCARE,
 			    FALSE, FALSE, FALSE, DEFAULT_CHARSET, 0, 0,
@@ -602,6 +663,7 @@
     }
     wndPtr = WIN_FindWndPtr( hwnd );
     wndPtr->flags |= WIN_ISDIALOG;
+    wndPtr->helpContext = template.helpId;
 
       /* Initialise dialog extra data */
 
@@ -621,8 +683,8 @@
 
     /* Create controls */
 
-    if (DIALOG_CreateControls( wndPtr, dlgTemplate, template.nbItems,
-                                hInst, win32Template ))
+    if (DIALOG_CreateControls( wndPtr, dlgTemplate, &template,
+                               hInst, win32Template ))
     {
        /* Send initialisation messages and set focus */
 
@@ -669,7 +731,7 @@
     TRACE(dialog, "%04x,%08lx,%04x,%08lx,%ld\n",
                    hInst, (DWORD)dlgTemplate, owner, (DWORD)dlgProc, param );
 
-    if (!(hRsrc = FindResource16( hInst, dlgTemplate, RT_DIALOG ))) return 0;
+    if (!(hRsrc = FindResource16( hInst, dlgTemplate, RT_DIALOG16 ))) return 0;
     if (!(hmem = LoadResource16( hInst, hRsrc ))) return 0;
     if (!(data = LockResource16( hmem ))) hwnd = 0;
     else hwnd = CreateDialogIndirectParam16( hInst, data, owner,
@@ -680,7 +742,7 @@
 
 
 /***********************************************************************
- *           CreateDialogParam32A   (USER32.72)
+ *           CreateDialogParam32A   (USER32.73)
  */
 HWND32 WINAPI CreateDialogParam32A( HINSTANCE32 hInst, LPCSTR name,
                                     HWND32 owner, DLGPROC32 dlgProc,
@@ -698,13 +760,13 @@
 
 
 /***********************************************************************
- *           CreateDialogParam32W   (USER32.73)
+ *           CreateDialogParam32W   (USER32.74)
  */
 HWND32 WINAPI CreateDialogParam32W( HINSTANCE32 hInst, LPCWSTR name,
                                     HWND32 owner, DLGPROC32 dlgProc,
                                     LPARAM param )
 {
-    HANDLE32 hrsrc = FindResource32W( hInst, name, (LPWSTR)RT_DIALOG );
+    HANDLE32 hrsrc = FindResource32W( hInst, name, RT_DIALOG32W );
     if (!hrsrc) return 0;
     return CreateDialogIndirectParam32W( hInst,
                                          (LPVOID)LoadResource32(hInst, hrsrc),
@@ -749,7 +811,7 @@
 
 
 /***********************************************************************
- *           CreateDialogIndirectParam32W   (USER32.71)
+ *           CreateDialogIndirectParam32W   (USER32.72)
  */
 HWND32 WINAPI CreateDialogIndirectParam32W( HINSTANCE32 hInst,
                                             LPCVOID dlgTemplate,
@@ -818,7 +880,7 @@
 
 
 /***********************************************************************
- *           DialogBoxParam32A   (USER32.138)
+ *           DialogBoxParam32A   (USER32.139)
  */
 INT32 WINAPI DialogBoxParam32A( HINSTANCE32 hInst, LPCSTR name,
                                 HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
@@ -830,7 +892,7 @@
 
 
 /***********************************************************************
- *           DialogBoxParam32W   (USER32.139)
+ *           DialogBoxParam32W   (USER32.140)
  */
 INT32 WINAPI DialogBoxParam32W( HINSTANCE32 hInst, LPCWSTR name,
                                 HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
@@ -870,7 +932,7 @@
 
 
 /***********************************************************************
- *           DialogBoxIndirectParam32A   (USER32.135)
+ *           DialogBoxIndirectParam32A   (USER32.136)
  */
 INT32 WINAPI DialogBoxIndirectParam32A(HINSTANCE32 hInstance, LPCVOID template,
                                        HWND32 owner, DLGPROC32 dlgProc,
@@ -884,7 +946,7 @@
 
 
 /***********************************************************************
- *           DialogBoxIndirectParam32W   (USER32.137)
+ *           DialogBoxIndirectParam32W   (USER32.138)
  */
 INT32 WINAPI DialogBoxIndirectParam32W(HINSTANCE32 hInstance, LPCVOID template,
                                        HWND32 owner, DLGPROC32 dlgProc,
@@ -907,7 +969,7 @@
 
 
 /***********************************************************************
- *           EndDialog32   (USER32.173)
+ *           EndDialog32   (USER.88)
  */
 BOOL32 WINAPI EndDialog32( HWND32 hwnd, INT32 retval )
 {
@@ -1053,7 +1115,7 @@
 
 
 /***********************************************************************
- *           IsDialogMessage32A   (USER32.341)
+ *           IsDialogMessage32A   (USER32.342)
  */
 BOOL32 WINAPI IsDialogMessage32A( HWND32 hwndDlg, LPMSG32 msg )
 {
@@ -1072,7 +1134,7 @@
 
 
 /***********************************************************************
- *           IsDialogMessage32W   (USER32.342)
+ *           IsDialogMessage32W   (USER32.343)
  */
 BOOL32 WINAPI IsDialogMessage32W( HWND32 hwndDlg, LPMSG32 msg )
 {
@@ -1102,7 +1164,7 @@
  
 
 /****************************************************************
- *         GetDlgCtrlID32   (USER32.233)
+ *         GetDlgCtrlID32   (USER32.234)
  */
 INT32 WINAPI GetDlgCtrlID32( HWND32 hwnd )
 {
@@ -1127,7 +1189,7 @@
 
 
 /***********************************************************************
- *           GetDlgItem32   (USER32.234)
+ *           GetDlgItem32   (USER32.235)
  */
 HWND32 WINAPI GetDlgItem32( HWND32 hwndDlg, INT32 id )
 {
@@ -1153,7 +1215,7 @@
 
 
 /*******************************************************************
- *           SendDlgItemMessage32A   (USER32.451)
+ *           SendDlgItemMessage32A   (USER32.452)
  */
 LRESULT WINAPI SendDlgItemMessage32A( HWND32 hwnd, INT32 id, UINT32 msg,
                                       WPARAM32 wParam, LPARAM lParam )
@@ -1165,7 +1227,7 @@
 
 
 /*******************************************************************
- *           SendDlgItemMessage32W   (USER32.452)
+ *           SendDlgItemMessage32W   (USER32.453)
  */
 LRESULT WINAPI SendDlgItemMessage32W( HWND32 hwnd, INT32 id, UINT32 msg,
                                       WPARAM32 wParam, LPARAM lParam )
@@ -1186,7 +1248,7 @@
 
 
 /*******************************************************************
- *           SetDlgItemText32A   (USER32.477)
+ *           SetDlgItemText32A   (USER32.478)
  */
 void WINAPI SetDlgItemText32A( HWND32 hwnd, INT32 id, LPCSTR lpString )
 {
@@ -1195,7 +1257,7 @@
 
 
 /*******************************************************************
- *           SetDlgItemText32W   (USER32.478)
+ *           SetDlgItemText32W   (USER32.479)
  */
 void WINAPI SetDlgItemText32W( HWND32 hwnd, INT32 id, LPCWSTR lpString )
 {
@@ -1214,7 +1276,7 @@
 
 
 /***********************************************************************
- *           GetDlgItemText32A   (USER32.236)
+ *           GetDlgItemText32A   (USER32.237)
  */
 INT32 WINAPI GetDlgItemText32A( HWND32 hwnd, INT32 id, LPSTR str, UINT32 len )
 {
@@ -1224,7 +1286,7 @@
 
 
 /***********************************************************************
- *           GetDlgItemText32W   (USER32.237)
+ *           GetDlgItemText32W   (USER32.238)
  */
 INT32 WINAPI GetDlgItemText32W( HWND32 hwnd, INT32 id, LPWSTR str, UINT32 len )
 {
@@ -1243,7 +1305,7 @@
 
 
 /*******************************************************************
- *           SetDlgItemInt32   (USER32.476)
+ *           SetDlgItemInt32   (USER32.477)
  */
 void WINAPI SetDlgItemInt32( HWND32 hwnd, INT32 id, UINT32 value,
                              BOOL32 fSigned )
@@ -1282,7 +1344,7 @@
 
 
 /***********************************************************************
- *           GetDlgItemInt32   (USER32.235)
+ *           GetDlgItemInt32   (USER32.236)
  */
 UINT32 WINAPI GetDlgItemInt32( HWND32 hwnd, INT32 id, BOOL32 *translated,
                                BOOL32 fSigned )
@@ -1325,7 +1387,7 @@
 
 
 /***********************************************************************
- *           CheckDlgButton32   (USER32.44)
+ *           CheckDlgButton32   (USER32.45)
  */
 BOOL32 WINAPI CheckDlgButton32( HWND32 hwnd, INT32 id, UINT32 check )
 {
@@ -1344,7 +1406,7 @@
 
 
 /***********************************************************************
- *           IsDlgButtonChecked32   (USER32.343)
+ *           IsDlgButtonChecked32   (USER32.344)
  */
 UINT32 WINAPI IsDlgButtonChecked32( HWND32 hwnd, UINT32 id )
 {
@@ -1363,7 +1425,7 @@
 
 
 /***********************************************************************
- *           CheckRadioButton32   (USER32.47)
+ *           CheckRadioButton32   (USER32.48)
  */
 BOOL32 WINAPI CheckRadioButton32( HWND32 hwndDlg, UINT32 firstID,
                                   UINT32 lastID, UINT32 checkID )
@@ -1389,7 +1451,7 @@
 
 
 /***********************************************************************
- *           GetDialogBaseUnits   (USER.243) (USER32.232)
+ *           GetDialogBaseUnits   (USER.243) (USER32.233)
  */
 DWORD WINAPI GetDialogBaseUnits(void)
 {
@@ -1414,7 +1476,7 @@
 
 
 /***********************************************************************
- *           MapDialogRect32   (USER32.381)
+ *           MapDialogRect32   (USER32.382)
  */
 void WINAPI MapDialogRect32( HWND32 hwnd, LPRECT32 rect )
 {
@@ -1440,7 +1502,7 @@
 
 
 /***********************************************************************
- *           GetNextDlgGroupItem32   (USER32.274)
+ *           GetNextDlgGroupItem32   (USER32.275)
  */
 HWND32 WINAPI GetNextDlgGroupItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
                                      BOOL32 fPrevious )
@@ -1501,7 +1563,7 @@
 
 
 /***********************************************************************
- *           GetNextDlgTabItem32   (USER32.275)
+ *           GetNextDlgTabItem32   (USER32.276)
  */
 HWND32 WINAPI GetNextDlgTabItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
                                    BOOL32 fPrevious )
@@ -1759,7 +1821,7 @@
 
 
 /**********************************************************************
- *           DlgDirSelectEx32A    (USER32.148)
+ *           DlgDirSelectEx32A    (USER32.149)
  */
 BOOL32 WINAPI DlgDirSelectEx32A( HWND32 hwnd, LPSTR str, INT32 len, INT32 id )
 {
@@ -1768,7 +1830,7 @@
 
 
 /**********************************************************************
- *           DlgDirSelectEx32W    (USER32.149)
+ *           DlgDirSelectEx32W    (USER32.150)
  */
 BOOL32 WINAPI DlgDirSelectEx32W( HWND32 hwnd, LPWSTR str, INT32 len, INT32 id )
 {
@@ -1787,7 +1849,7 @@
 
 
 /**********************************************************************
- *           DlgDirSelectComboBoxEx32A    (USER32.146)
+ *           DlgDirSelectComboBoxEx32A    (USER32.147)
  */
 BOOL32 WINAPI DlgDirSelectComboBoxEx32A( HWND32 hwnd, LPSTR str, INT32 len,
                                          INT32 id )
@@ -1797,7 +1859,7 @@
 
 
 /**********************************************************************
- *           DlgDirSelectComboBoxEx32W    (USER32.147)
+ *           DlgDirSelectComboBoxEx32W    (USER32.148)
  */
 BOOL32 WINAPI DlgDirSelectComboBoxEx32W( HWND32 hwnd, LPWSTR str, INT32 len,
                                          INT32 id)
@@ -1817,7 +1879,7 @@
 
 
 /**********************************************************************
- *	    DlgDirList32A    (USER32.142)
+ *	    DlgDirList32A    (USER32.143)
  */
 INT32 WINAPI DlgDirList32A( HWND32 hDlg, LPSTR spec, INT32 idLBox,
                             INT32 idStatic, UINT32 attrib )
@@ -1827,7 +1889,7 @@
 
 
 /**********************************************************************
- *	    DlgDirList32W    (USER32.145)
+ *	    DlgDirList32W    (USER32.146)
  */
 INT32 WINAPI DlgDirList32W( HWND32 hDlg, LPWSTR spec, INT32 idLBox,
                             INT32 idStatic, UINT32 attrib )
@@ -1847,7 +1909,7 @@
 
 
 /**********************************************************************
- *	    DlgDirListComboBox32A    (USER32.143)
+ *	    DlgDirListComboBox32A    (USER32.144)
  */
 INT32 WINAPI DlgDirListComboBox32A( HWND32 hDlg, LPSTR spec, INT32 idCBox,
                                     INT32 idStatic, UINT32 attrib )
@@ -1857,7 +1919,7 @@
 
 
 /**********************************************************************
- *	    DlgDirListComboBox32W    (USER32.144)
+ *	    DlgDirListComboBox32W    (USER32.145)
  */
 INT32 WINAPI DlgDirListComboBox32W( HWND32 hDlg, LPWSTR spec, INT32 idCBox,
                                     INT32 idStatic, UINT32 attrib )