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

Timestamp:

Feb 14, 2002, 1:10:12 PM (24 years ago)

Author:

sandervl

Message:

extended logging added

File:

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

trunk/src/shell32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.11 2001-04-04 09:02:15 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.12 2002-02-14 12:10:08 sandervl Exp $ */
 
 /*
@@ -76 +76 @@
  *****************************************************************************/
 
-ODINFUNCTION3(HICON,     ExtractAssociatedIconExA,
-              HINSTANCE, hInst,
-              LPSTR,     lpIconPath,
-              LPWORD,    lpiIcon)
+HICON WIN32API ExtractAssociatedIconExA(HINSTANCE hInst, LPSTR lpIconPath,
+                                        LPWORD lpiIcon)
 {
   dprintf(("SHELL32: undoc ExtractAssociatedIconExA\n"));
@@ -99 +97 @@
  *****************************************************************************/
 
-ODINFUNCTION3(HICON,     ExtractAssociatedIconW,
-              HINSTANCE, hInst,
-              LPWSTR,    lpIconPath,
-              LPWORD,    lpiIcon)
+HICON WIN32API ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath,
+                                      LPWORD lpiIcon)
 {
   LPSTR lpIconPathAscii = UnicodeToAsciiString(lpIconPath);
@@ -129 +125 @@
  *****************************************************************************/
 
-ODINFUNCTION3(HICON,     ExtractAssociatedIconExW,
-              HINSTANCE, hInst,
-              LPWSTR,    lpIconPath,
-              LPWORD,    lpiIcon)
+HICON WIN32API ExtractAssociatedIconExW(HINSTANCE hInst, LPWSTR lpIconPath,
+                                        LPWORD lpiIcon)
 {
   dprintf(("SHELL32: undoc ExtractAssociatedIconExW\n"));
@@ -152 +146 @@
  *****************************************************************************/
 
-ODINFUNCTION4(BOOL,    OleStrToStrN,
-              LPSTR,   lpMulti,
-              INT,     nMulti,
-              LPCWSTR, lpWide,
-              INT,     nWide)
+BOOL WIN32API OleStrToStrN(LPSTR lpMulti, INT nMulti, LPCWSTR lpWide,
+                           INT nWide)
 {
   return WideCharToMultiByte (0,
@@ -181 +172 @@
  *****************************************************************************/
 
-ODINFUNCTION4(BOOL,   StrToOleStrN,
-              LPWSTR, lpWide,
-              INT,    nWide,
-              LPCSTR, lpMulti,
-              INT,    nMulti)
+BOOL WIN32API StrToOleStrN(LPWSTR lpWide, INT nWide, LPCSTR lpMulti,
+                           INT nMulti)
 {
   return MultiByteToWideChar (0,
@@ -208 +196 @@
  *****************************************************************************/
 
-ODINFUNCTION2(HRESULT, SHELL32_654,
-              DWORD,   x,
-              DWORD,   y)
+HRESULT WIN32API SHELL32_654(DWORD x, DWORD y)
 {
   dprintf(("SHELL32: SHELL32_654(%08xh,%08xh) not implemented.\n",
@@ -231 +217 @@
  *****************************************************************************/
 
-ODINFUNCTION2(int,    StrToOleStr,
-              LPWSTR, lpWideCharStr,
-              LPCSTR, lpMultiByteString)
+int WIN32API StrToOleStr(LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
 {
   return MultiByteToWideChar(0,
@@ -255 +239 @@
  *****************************************************************************/
 
-ODINFUNCTION1(DWORD, InternalExtractIconListA, DWORD, dwArg1)
+DWORD WIN32API InternalExtractIconListA(DWORD dwArg1)
 {
   dprintf(("SHELL32: undoc InternalExtractIconListA \n"));
@@ -273 +257 @@
  *****************************************************************************/
 
-ODINFUNCTION1(DWORD, InternalExtractIconListW, DWORD, dwArg1)
+DWORD WIN32API InternalExtractIconListW(DWORD dwArg1)
 {
   dprintf(("SHELL32: undoc InternalExtractIconListW\n"));
@@ -291 +275 @@
  *****************************************************************************/
 
-ODINFUNCTION1(DWORD, ExtractIconResInfoA, DWORD, dwArg1)
+DWORD WIN32API ExtractIconResInfoA(DWORD dwArg1)
 {
   dprintf(("SHELL32: undoc ExtractIconResInfoA\n"));
@@ -309 +293 @@
  *****************************************************************************/
 
-ODINFUNCTION1(DWORD, ExtractIconResInfoW, DWORD, dwArg1)
+DWORD WIN32API ExtractIconResInfoW( DWORD dwArg1)
 {
   dprintf(("SHELL32: undoc ExtractIconResInfoW\n"));
@@ -327 +311 @@
  *****************************************************************************/
 
-ODINPROCEDURE2(CheckEscapesA,
-               DWORD, x1,
-               DWORD, x2)
+void WIN32API CheckEscapesA(DWORD x1, DWORD x2)
 {
   dprintf(("SHELL32: undoc CheckEscapesA\n"));
@@ -346 +328 @@
  *****************************************************************************/
 
-ODINPROCEDURE2(CheckEscapesW,
-               DWORD, x1,
-               DWORD, x2)
+void WIN32API CheckEscapesW(DWORD x1, DWORD x2)
 {
   dprintf(("SHELL32: undoc CheckEscapesW\n"));
@@ -365 +345 @@
  *****************************************************************************/
 
-ODINFUNCTION1(DWORD, DuplicateIcon,
-              DWORD, x1)
+DWORD WIN32API DuplicateIcon(DWORD x1)
 {
   dprintf(("SHELL32: undoc DuplicateIcon\n"));