rewritten MessageBox functions, added MessageBoxTimeout()

svn path=/trunk/; revision=6285

reactos/lib/user32/include/resource.h

@@ -6,3 +6,17 @@
  */
 
 #define DF_HATCH	30000
+
+#define IDS_ERROR	(2)
+#define IDS_OK	(800)
+#define IDS_CANCEL	(801)
+#define IDS_ABORT	(802)
+#define IDS_RETRY	(803)
+#define IDS_IGNORE	(804)
+#define IDS_YES	(805)
+#define IDS_NO	(806)
+#define IDS_HELP	(808)
+#define IDS_TRYAGAIN	(809)
+#define IDS_CONTINUE	(810)
+
+

reactos/lib/user32/misc/stubs.c

@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.44 2003/10/04 22:36:36 weiden Exp $
+/* $Id: stubs.c,v 1.45 2003/10/12 00:39:50 weiden Exp $
  *
  * COPYRIGHT:       See COPYING WINBOOLthe top level directory
  * PROJECT:         ReactOS user32.dll
@@ -1569,40 +1569,6 @@ SendIMEMessageExA(HWND hwnd, LPARAM lparam)
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-int
-STDCALL
-MessageBoxTimeoutW(
-    HWND hWnd,
-    LPCWSTR lpText,
-    LPCWSTR lpCaption,
-    UINT uType,
-    WORD wLanguageId,
-    DWORD dwTime)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-int
-STDCALL
-MessageBoxTimeoutA(
-    HWND hWnd,
-    LPCSTR lpText,
-    LPCSTR lpCaption,
-    UINT uType,
-    WORD wLanguageId,
-    DWORD dwTime)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */

reactos/lib/user32/user32.rc

@@ -85,16 +85,6 @@ DF_HATCH BITMAP "resources/df_hatch.bmp"
 // Dialogs
 //
 
-MSGBOX DIALOG DISCARDABLE  100, 80, 180, 77
-STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-FONT 8, "MS Sans Serif"
-CAPTION "Error"
-BEGIN
-        ICON "", 1088, 9, 20, 16, 16, WS_CHILD | WS_VISIBLE
-        LTEXT "", 100, 48, 16, 124, 48, WS_CHILD | WS_VISIBLE
-END
-
 SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
@@ -126,15 +116,39 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
-  MENUITEM "&Restore", 61728
-  MENUITEM "&Move", 61456
-  MENUITEM "&Size", 61440
-  MENUITEM "Mi&nimize", 61472
-  MENUITEM "Ma&ximize", 61488
-  MENUITEM SEPARATOR
-  MENUITEM "&Close\tAlt-F4", 61536
-//MENUITEM SEPARATOR
-//MENUITEM "&Switch to ...\tCtrl-Esc", 61744
-//MENUITEM SEPARATOR
-//MENUITEM "&About ReactOS ...", 61761
+  POPUP ""
+  {
+    MENUITEM "&Restore", 61728
+    MENUITEM "&Move", 61456
+    MENUITEM "&Size", 61440
+    MENUITEM "Mi&nimize", 61472
+    MENUITEM "Ma&ximize", 61488
+    MENUITEM SEPARATOR
+    MENUITEM "&Close\tAlt-F4", 61536
+  //MENUITEM SEPARATOR
+  //MENUITEM "&Switch to ...\tCtrl-Esc", 61744
+  //MENUITEM SEPARATOR
+  //MENUITEM "&About ReactOS ...", 61761
+  }
 }
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Strings
+//
+
+STRINGTABLE
+{
+  IDS_ERROR,    "Error"
+  IDS_OK,       "OK"
+  IDS_CANCEL,   "Cancel"
+  IDS_ABORT,    "&Abort"
+  IDS_RETRY,    "&Retry"
+  IDS_IGNORE,   "&Ignore"
+  IDS_YES,      "&Yes"
+  IDS_NO,       "&No"
+  IDS_HELP,     "Help"
+  IDS_TRYAGAIN, "&Try Again"
+  IDS_CONTINUE, "&Continue"
+}
+