Changeset 22 for trunk/src/shell32/shell32.cpp

Timestamp:

Jun 1, 1999, 10:05:43 AM (26 years ago)

Author:

phaller

Message:

Added ShellMessageBoxA=SHELL32.183, ShellMessageBoxW=SHELL32.182

File:

• trunk/src/shell32/shell32.cpp (modified) (3 diffs)

trunk/src/shell32/shell32.cpp

@@ -1 @@
-/* $Id: shell32.cpp,v 1.1 1999-05-24 20:19:57 ktk Exp $ */
+/* $Id: shell32.cpp,v 1.2 1999-06-01 08:05:42 phaller Exp $ */
 
 /*
@@ -1143 +1143 @@
 
 /*************************************************************************
- *           SHELL32_183            [SHELL32.183]
- * Format and output errormessage.
- */
-//void __cdecl SHELL32_183(HMODULE hmod,
-// CDECL ? really ?
-void WIN32API SHELL32_183(HMODULE hmod,
-                             HWND    hwnd,
-                             DWORD   id,
-                             DWORD   x,
-                             DWORD   type,
-                             LPVOID  arglist)
-{
-  char   buf[100],
-         buf2[100],
-         *buf3;
-  LPVOID args = &arglist;
-
-  dprintf(("SHELL32: .183 (%08xh, %08xh, %08xh, %08xh, %08xh, %08xh) not implemented.\n",
-           hmod,
-           hwnd,
-           id,
-           x,
-           type,
-           arglist));
-
-  if (!LoadStringA(hmod,
-                     x,
-                     buf,
-                     100))
-    strcpy(buf,
-           "Desktop");
-
-  LoadStringA(hmod,
-                id,
-                buf2,
-                100);
-
-  /* FIXME: the varargs handling doesn't. */
-  FormatMessageA(0x500,
-                   buf2,
-                   0,
-                   0,
-                   (LPSTR)&buf3,
-                   256,
-                   (LPDWORD)&args);
-
-  MessageBoxA(hwnd,
-                buf3,
-                buf,
-                id|0x10000);
-}
-
-
-/*************************************************************************
  *           SHELL32_100            [SHELL32.100]
  * walks through policy table, queries <app> key, <type> value, returns
@@ -1663 +1609 @@
 }
 
+
+/*****************************************************************************
+ * Name      : DWORD ShellMessageBoxW
+ * Purpose   : display a messagebox, retrieve message text from resources
+ * Parameters: HMODULE hmod
+ *             HWND    hwnd
+ *             DWORD   idText
+ *             DWORD   idTitle
+ *             DWORD   uType
+ *             LPCVOID arglist
+ * Variables :
+ * Result    :
+ * Remark    : SHELL32.182
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Tue, 1999/06/01 09:00]
+ *****************************************************************************/
+
+DWORD WIN32API ShellMessageBoxW(HMODULE hmod,
+                                HWND    hwnd,
+                                DWORD   idText,
+                                DWORD   idTitle,
+                                DWORD   uType,
+                                LPCVOID arglist) 
+{       
+  WCHAR  szText[100],
+         szTitle[100],
+         szTemp[256];
+  LPWSTR pszText = &szText[0], 
+         pszTitle = &szTitle[0];
+  LPVOID args = &arglist;
+
+  dprintf(("SHELL32: ShellMessageBoxW(%08lx,%08lx,%08lx,%08lx,%08lx,%p)\n",
+           hmod,
+           hwnd,
+           idText,
+           idTitle,
+           uType,
+           arglist));
+
+  if (!HIWORD (idTitle))
+    LoadStringW(hmod,
+                idTitle,
+                pszTitle,
+                100);
+  else
+    pszTitle = (LPWSTR)idTitle;
+
+  if (! HIWORD (idText))
+    LoadStringW(hmod,idText,pszText,100);
+  else
+    pszText = (LPWSTR)idText;
+
+  FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                 szText,
+                 0,
+                 0,
+                 szTemp,
+                 256,
+                 (LPDWORD)args);
+
+  return MessageBoxW(hwnd,
+                     szTemp,
+                     szTitle,
+                     uType);
+}
+
+/*****************************************************************************
+ * Name      : DWORD ShellMessageBoxA
+ * Purpose   : display a messagebox, retrieve message text from resources
+ * Parameters: HMODULE hmod
+ *             HWND    hwnd
+ *             DWORD   idText
+ *             DWORD   idTitle
+ *             DWORD   uType
+ *             LPCVOID arglist
+ * Variables :
+ * Result    :
+ * Remark    : SHELL32.183
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Tue, 1999/06/01 09:00]
+ *****************************************************************************/
+
+DWORD WIN32API ShellMessageBoxA(HMODULE hmod,
+                                HWND    hwnd,
+                                DWORD   idText,
+                                DWORD   idTitle,
+                                DWORD   uType,
+                                LPCVOID arglist) 
+{
+  char   szText[100],
+         szTitle[100],
+         szTemp[256];
+  LPSTR  pszText = &szText[0], 
+         pszTitle = &szTitle[0];
+  LPVOID args = &arglist;
+
+  dprintf(("SHELL32: ShellMessageBoxA (%08lx,%08lx,%08lx,%08lx,%08lx,%p)\n", 
+           hmod,
+           hwnd,
+           idText,
+           idTitle,
+           uType,
+           arglist));
+
+  if (!HIWORD (idTitle))
+    LoadStringA(hmod,idTitle,pszTitle,100);
+  else
+    pszTitle = (LPSTR)idTitle;
+
+  if (! HIWORD (idText))
+    LoadStringA(hmod,idText,pszText,100);
+  else
+    pszText = (LPSTR)idText;
+
+  FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                 pszText,
+                 0,
+                 0,
+                 szTemp,
+                 256,
+                 (LPDWORD)args);
+
+  return MessageBoxA(hwnd,
+                     szTemp,
+                     pszTitle,
+                     uType);
+}