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

Timestamp:

Jun 9, 1999, 11:05:24 PM (26 years ago)

Author:

phaller

Message:

Add: added support for ShellAboutW API :)

File:

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

trunk/src/shell32/shell32.cpp

@@ -1 @@
-/* $Id: shell32.cpp,v 1.4 1999-06-09 15:22:27 phaller Exp $ */
+/* $Id: shell32.cpp,v 1.5 1999-06-09 21:05:24 phaller Exp $ */
 
 /*
@@ -81 +81 @@
                          HICON   hIcon)
 {
-  dprintf(("SHELL32: ShellAboutA(%08xh,%08xh,%08xh,%08xh) not implemented.\n",
+  dprintf(("SHELL32: ShellAboutA(%08xh,%08xh,%08xh,%08xh) not implemented properly.\n",
            hwnd,
            szApp,
@@ -98 +98 @@
   return(TRUE);
 }
-//******************************************************************************
-//******************************************************************************
-int WIN32API ShellAboutW(HWND   hwnd,
+
+
+/*****************************************************************************
+ * Name      : DWORD ShellAboutW
+ * Purpose   : display a simple about box
+ * Parameters: HWND    hwnd
+ *             LPWSTR  szApplication
+ *             LPWSTR  szMoreInformation
+ *             HICON   hIcon
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1999/06/01 09:00]
+ *****************************************************************************/
+
+int WIN32API ShellAboutW(HWND    hwnd,
                          LPCWSTR szApp,
                          LPCWSTR szOtherStuff,
-                         HICON  hIcon)
-{
-  dprintf(("SHELL32: ShellAboutW(%08xh,%08xh,%08xh,%08xh) not implemented.\n",
+                         HICON   hIcon)
+{
+  LPSTR lpszApp;                     /* temporary buffers for A-W conversion */
+  LPSTR lpszOtherStuff;
+  int   iResult;
+
+  dprintf(("SHELL32: ShellAboutW(%08xh,%08xh,%08xh,%08xh).\n",
            hwnd,
            szApp,
@@ -111 +130 @@
            hIcon));
 
-  return(TRUE);
+  if (szApp != NULL)                             /* convert string on demand */
+    lpszApp = UnicodeToAsciiString((LPWSTR)szApp);
+  else
+    lpszApp = NULL;
+
+  if (szOtherStuff != NULL)
+    lpszOtherStuff = UnicodeToAsciiString((LPWSTR)szOtherStuff);
+  else
+    lpszOtherStuff = NULL;
+
+  iResult = ShellAboutA(hwnd,                          /* call ascii variant */
+                        lpszApp,
+                        lpszOtherStuff,
+                        hIcon);
+
+  if (lpszApp != NULL)                            /* free strings as created */
+     FreeAsciiString(lpszApp);
+
+  if (lpszOtherStuff != NULL)
+     FreeAsciiString(lpszOtherStuff);
+
+  return(iResult);
 }
 //******************************************************************************
@@ -1474 +1514 @@
 }
 
+
 /*****************************************************************************
  * Name      : DWORD ShellMessageBoxA