Re[2]: Convert MessageBox family functions to unicode. Take 2.

[Dmitry Timoshkov <dmitry@baikal.ru>]

Hello.

Alexandre, please use this one instead.

Changelog:
    Restore setting of caption "Error".

diff -u cvs/hq/wine/dlls/user/resources/user32.rc wine/dlls/user/resources/user32.rc
--- cvs/hq/wine/dlls/user/resources/user32.rc	Tue Mar 12 13:38:44 2002
+++ wine/dlls/user/resources/user32.rc	Sun Oct 20 22:35:36 2002
@@ -24,7 +24,8 @@
 #include "dlgs.h"
 
 #define MDI_IDC_LISTBOX         100
-#define MDI_IDS_MOREWINDOWS     13
+#define IDS_MDI_MOREWINDOWS     13
+#define IDS_ERROR               2
 
 /*
  * Everything that does not depend on language,
diff -u cvs/hq/wine/dlls/user/resources/user32_En.rc wine/dlls/user/resources/user32_En.rc
--- cvs/hq/wine/dlls/user/resources/user32_En.rc	Mon Jun  3 13:01:17 2002
+++ wine/dlls/user/resources/user32_En.rc	Sun Oct 20 22:35:36 2002
@@ -77,5 +77,6 @@
 
 STRINGTABLE DISCARDABLE
 {
-    MDI_IDS_MOREWINDOWS  "&More Windows..." /* defined in mdi.h */
+    IDS_ERROR "Error"
+    IDS_MDI_MOREWINDOWS "&More Windows..."
 }
diff -u cvs/hq/wine/dlls/user/resources/user32_Ru.rc wine/dlls/user/resources/user32_Ru.rc
--- cvs/hq/wine/dlls/user/resources/user32_Ru.rc	Tue Mar 12 13:38:44 2002
+++ wine/dlls/user/resources/user32_Ru.rc	Sun Oct 20 22:35:36 2002
@@ -64,3 +64,8 @@
         PUSHBUTTON "&Íåò", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
+STRINGTABLE DISCARDABLE
+{
+    IDS_ERROR "Îøèáêà"
+    IDS_MDI_MOREWINDOWS "&More Windows..."
+}
diff -u cvs/hq/wine/dlls/user/resources/user32_Sk.rc wine/dlls/user/resources/user32_Sk.rc
--- cvs/hq/wine/dlls/user/resources/user32_Sk.rc	Mon Jun  3 13:01:17 2002
+++ wine/dlls/user/resources/user32_Sk.rc	Sun Oct 20 22:35:36 2002
@@ -77,5 +77,6 @@
 
 STRINGTABLE DISCARDABLE
 {
-    MDI_IDS_MOREWINDOWS  "&Viac okien..." /* defined in mdi.h */
+    IDS_ERROR "Error"
+    IDS_MDI_MOREWINDOWS "&Viac okien..."
 }
diff -u cvs/hq/wine/dlls/user/resources/user32_Zh.rc wine/dlls/user/resources/user32_Zh.rc
--- cvs/hq/wine/dlls/user/resources/user32_Zh.rc	Sat Aug 17 18:42:26 2002
+++ wine/dlls/user/resources/user32_Zh.rc	Sun Oct 20 22:39:29 2002
@@ -72,7 +72,8 @@
 
 STRINGTABLE DISCARDABLE
 {
-    MDI_IDS_MOREWINDOWS  "¸ü¶à´°¿Ú(&M)..." /* defined in mdi.h */
+    IDS_ERROR "Error"
+    IDS_MDI_MOREWINDOWS  "¸ü¶à´°¿Ú(&M)..." /* defined in mdi.h */
 }
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
@@ -132,7 +133,8 @@
 
 STRINGTABLE DISCARDABLE
 {
-    MDI_IDS_MOREWINDOWS  "¸ü¶àÒ•´°(&M)..." /* defined in mdi.h */
+    IDS_ERROR "Error"
+    IDS_MDI_MOREWINDOWS "¸ü¶àÒ•´°(&M)..."
 }
 
 #pragma code_page(default)
diff -u cvs/hq/wine/windows/mdi.c wine/windows/mdi.c
--- cvs/hq/wine/windows/mdi.c	Sat Oct 19 18:08:57 2002
+++ wine/windows/mdi.c	Sun Oct 20 22:35:36 2002
@@ -114,7 +114,7 @@
 #define MDI_MOREWINDOWSLIMIT    9       /* after this number of windows, a "More Windows..."
                                            option will appear under the Windows menu */
 #define MDI_IDC_LISTBOX         100
-#define MDI_IDS_MOREWINDOWS     13
+#define IDS_MDI_MOREWINDOWS     13
 
 #define MDIF_NEEDUPDATE		0x0001
 
@@ -279,7 +279,7 @@
     if (clientInfo->nActiveChildren - 1 > MDI_MOREWINDOWSLIMIT)
     {
         WCHAR szTmp[50];
-        LoadStringW(GetModuleHandleA("USER32"), MDI_IDS_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
+        LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
         AppendMenuW(clientInfo->hWindowMenu, MF_STRING, clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT, szTmp);
     }
     return TRUE;
@@ -596,7 +596,7 @@
         if (ci->nActiveChildren == MDI_MOREWINDOWSLIMIT + 1)
         {
             WCHAR szTmp[50];
-            LoadStringW(GetModuleHandleA("USER32"), MDI_IDS_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
+            LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
 
             ModifyMenuW(ci->hWindowMenu,
                         ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
diff -u cvs/hq/wine/windows/msgbox.c wine/windows/msgbox.c
--- cvs/hq/wine/windows/msgbox.c	Sun Oct 20 11:08:07 2002
+++ wine/windows/msgbox.c	Sun Oct 20 22:38:43 2002
@@ -34,6 +34,7 @@
 
 #define MSGBOX_IDICON 1088
 #define MSGBOX_IDTEXT 100
+#define IDS_ERROR     2
 
 static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
 {
@@ -61,8 +62,17 @@
     if (HIWORD(lpmb->lpszCaption)) {
        SetWindowTextW(hwnd, lpmb->lpszCaption);
     } else {
-       if (LoadStringW(lpmb->hInstance, LOWORD(lpmb->lpszCaption), buf, 256))
-	  SetWindowTextW(hwnd, buf);
+       UINT res_id = LOWORD(lpmb->lpszCaption);
+       if (res_id)
+       {
+           if (LoadStringW(lpmb->hInstance, res_id, buf, 256))
+               SetWindowTextW(hwnd, buf);
+       }
+       else
+       {
+           if (LoadStringW(0, IDS_ERROR, buf, 256))
+               SetWindowTextW(hwnd, buf);
+       }
     }
     if (HIWORD(lpmb->lpszText)) {
        lpszText = lpmb->lpszText;