Changeset 1353 for trunk/src/shell32/misc.cpp

Timestamp:

Oct 19, 1999, 12:23:27 PM (26 years ago)

Author:

phaller

Message:

Fix: debug info

File:

• trunk/src/shell32/misc.cpp (modified) (23 diffs)

trunk/src/shell32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.5 1999-10-09 11:13:19 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.6 1999-10-19 10:23:26 phaller Exp $ */
 
 /*
@@ -16 +16 @@
 
 #include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
+
 #include <wchar.h>
 #include <wcstr.h>
@@ -30 +33 @@
 #include <heapstring.h>
 
+
 /*****************************************************************************
  * Types & Defines                                                           *
  *****************************************************************************/
 
-
-/*****************************************************************************
- * Name      : HICON WIN32API ExtractAssociatedIconExA
+ODINDEBUGCHANNEL(SHELL32-MISC)
+
+
+/*****************************************************************************
+ * Name      : ExtractAssociatedIconExA
  * Purpose   : Return icon for given file (either from file itself or from associated
  *             executable) and patch parameters if needed.
@@ -48 +54 @@
  *****************************************************************************/
 
-HICON WIN32API ExtractAssociatedIconExA(HINSTANCE hInst,
-                                      LPSTR     lpIconPath,
-                                      LPWORD    lpiIcon)
+ODINFUNCTION3(HICON,     ExtractAssociatedIconExA,
+              HINSTANCE, hInst,
+              LPSTR,     lpIconPath,
+              LPWORD,    lpiIcon)
 {
   dprintf(("SHELL32: undoc ExtractAssociatedIconExA\n"));
@@ -58 +65 @@
 
 /*****************************************************************************
- * Name      : HICON WIN32API ExtractAssociatedIconW
+ * Name      : ExtractAssociatedIconW
  * Purpose   : Return icon for given file (either from file itself or from associated
  *             executable) and patch parameters if needed.
@@ -70 +77 @@
  *****************************************************************************/
 
-HICON WIN32API ExtractAssociatedIconW(HINSTANCE hInst,
-                                      LPWSTR    lpIconPath,
-                                      LPWORD    lpiIcon)
+ODINFUNCTION3(HICON,     ExtractAssociatedIconW,
+              HINSTANCE, hInst,
+              LPWSTR,    lpIconPath,
+              LPWORD,    lpiIcon)
 {
   LPSTR lpIconPathAscii = UnicodeToAsciiString(lpIconPath);
   HICON hIcon;
-
-  dprintf(("SHELL32: ExtractAssociatedIconW(%08xh,%s,%08xh)\n",
-           hInst,
-           lpIconPathAscii,
-           lpiIcon));
 
   hIcon = ExtractAssociatedIconA(hInst,
@@ -92 +95 @@
 
 /*****************************************************************************
- * Name      : HICON WIN32API ExtractAssociatedIconExW
+ * Name      : ExtractAssociatedIconExW
  * Purpose   : Return icon for given file (either from file itself or from associated
  *             executable) and patch parameters if needed.
@@ -104 +107 @@
  *****************************************************************************/
 
-HICON WIN32API ExtractAssociatedIconExW(HINSTANCE hInst,
-                                      LPWSTR     lpIconPath,
-                                      LPWORD    lpiIcon)
+ODINFUNCTION3(HICON,     ExtractAssociatedIconExW,
+              HINSTANCE, hInst,
+              LPWSTR,    lpIconPath,
+              LPWORD,    lpiIcon)
 {
   dprintf(("SHELL32: undoc ExtractAssociatedIconExW\n"));
@@ -126 +130 @@
  *****************************************************************************/
 
-BOOL WIN32API OleStrToStrN (LPSTR   lpMulti,
-                            INT     nMulti,
-                            LPCWSTR lpWide,
-                            INT     nWide)
-{
-  dprintf(("SHELL32: OleStrToStrN(%08xh,%08xh,%08xh,%08xh)\n",
-           lpMulti,
-           nMulti,
-           lpWide,
-           nWide));
-
+ODINFUNCTION4(BOOL,    OleStrToStrN,
+              LPSTR,   lpMulti,
+              INT,     nMulti,
+              LPCWSTR, lpWide,
+              INT,     nWide)
+{
   return WideCharToMultiByte (0,
                               0,
@@ -160 +159 @@
  *****************************************************************************/
 
-BOOL WIN32API StrToOleStrN (LPWSTR lpWide,
-                            INT    nWide,
-                            LPCSTR lpMulti,
-                            INT    nMulti)
-{
-  dprintf(("SHELL32: StrToOleStrN(%08xh,%08xh,%08xh,%08xh)\n",
-           lpWide,
-           nWide,
-           lpMulti,
-           nMulti));
-
+ODINFUNCTION4(BOOL,   StrToOleStrN,
+              LPWSTR, lpWide,
+              INT,    nWide,
+              LPCSTR, lpMulti,
+              INT,    nMulti)
+{
   return MultiByteToWideChar (0,
                               0,
@@ -192 +186 @@
  *****************************************************************************/
 
-HRESULT WIN32API StrRetToStrN (LPVOID       dest,
-                               DWORD        len,
-                               LPSTRRET     src,
-                               LPITEMIDLIST pidl)
-{
-  dprintf(("SHELL32: StrRetToStrN(%08xh,%08xh,%08xh,%08xh) not implemented.\n",
-           dest,
-           len,
-           src,
-           pidl));
-
+ODINFUNCTION4(HRESULT,      StrRetToStrN,
+              LPVOID,       dest,
+              DWORD,        len,
+              LPSTRRET,     src,
+              LPITEMIDLIST, pidl)
+{
   switch (src->uType)
   {
@@ -262 +251 @@
  *****************************************************************************/
 
-HRESULT WIN32API SHELL32_654 (DWORD x,
-                              DWORD y)
+ODINFUNCTION2(HRESULT, SHELL32_654,
+              DWORD,   x,
+              DWORD,   y)
 {
   dprintf(("SHELL32: SHELL32_654(%08xh,%08xh) not implemented.\n",
@@ -284 +274 @@
  *****************************************************************************/
 
-int WIN32API StrToOleStr (LPWSTR lpWideCharStr,
-                          LPCSTR lpMultiByteString)
-{
-  dprintf(("SHELL32: StrToOleStr(%08xh,%08xh)\n",
-           lpWideCharStr,
-           lpMultiByteString));
-
+ODINFUNCTION2(int,    StrToOleStr,
+              LPWSTR, lpWideCharStr,
+              LPCSTR, lpMultiByteString)
+{
   return MultiByteToWideChar(0,
                              0,
@@ -312 +299 @@
  *****************************************************************************/
 
-LPWSTR WIN32API StrCpyNW(LPWSTR lpString1,LPWSTR lpString2,int iMaxLength)
+ODINFUNCTION3(LPWSTR, StrCpyNW,
+              LPWSTR, lpString1,
+              LPWSTR, lpString2,
+              int,    iMaxLength)
 {
   dprintf(("SHELL32: undoc StrCpyNW\n"));
@@ -331 +321 @@
  *****************************************************************************/
 
-LPWSTR WIN32API StrNCpyW(LPWSTR lpString1,LPWSTR lpString2)
+ODINFUNCTION2(LPWSTR, StrNCpyW,
+              LPWSTR, lpString1,
+              LPWSTR, lpString2)
 {
   dprintf(("SHELL32: undoc StrNCpyW\n"));
@@ -351 +343 @@
  *****************************************************************************/
 
-void WIN32API InternalExtractIconListA(VOID)
+ODINFUNCTION1(DWORD, InternalExtractIconListA, DWORD, dwArg1)
 {
   dprintf(("SHELL32: undoc InternalExtractIconListA \n"));
+  return 0;
 }
 
@@ -368 +361 @@
  *****************************************************************************/
 
-void WIN32API InternalExtractIconListW(VOID)
+ODINFUNCTION1(DWORD, InternalExtractIconListW, DWORD, dwArg1)
 {
   dprintf(("SHELL32: undoc InternalExtractIconListW\n"));
+  return 0;
 }
 
@@ -385 +379 @@
  *****************************************************************************/
 
-void WIN32API ExtractIconResInfoA(VOID)
+ODINFUNCTION1(DWORD, ExtractIconResInfoA, DWORD, dwArg1)
 {
   dprintf(("SHELL32: undoc ExtractIconResInfoA\n"));
+  return 0;
 }
 
@@ -402 +397 @@
  *****************************************************************************/
 
-void WIN32API ExtractIconResInfoW(VOID)
+ODINFUNCTION1(DWORD, ExtractIconResInfoW, DWORD, dwArg1)
 {
   dprintf(("SHELL32: undoc ExtractIconResInfoW\n"));
+  return 0;
 }
 
@@ -442 +438 @@
  *****************************************************************************/
 
-void WIN32API CheckEscapesA(DWORD x1,DWORD x2)
+ODINPROCEDURE2(CheckEscapesA,
+               DWORD, x1,
+               DWORD, x2)
 {
   dprintf(("SHELL32: undoc CheckEscapesA\n"));
@@ -459 +457 @@
  *****************************************************************************/
 
-void WIN32API CheckEscapesW(DWORD x1,DWORD x2)
+ODINPROCEDURE2(CheckEscapesW,
+               DWORD, x1,
+               DWORD, x2)
 {
   dprintf(("SHELL32: undoc CheckEscapesW\n"));
@@ -476 +476 @@
  *****************************************************************************/
 
-DWORD WIN32API DuplicateIcon(DWORD x1)
+ODINFUNCTION1(DWORD, DuplicateIcon,
+              DWORD, x1)
 {
   dprintf(("SHELL32: undoc DuplicateIcon\n"));
@@ -482 +483 @@
   return 0;
 }
+