Changeset 7502 for trunk/src/shell32

Timestamp:

Nov 30, 2001, 6:49:22 PM (24 years ago)

Author:

phaller

Message:

Fixed out-of-scope FIXME,TRACE,WARN macros

Location:

trunk/src/shell32

Files:

• pidl.c (modified) (1 diff)
• shelllink.c (modified) (1 diff)
• shellord.c (modified) (3 diffs)

trunk/src/shell32/pidl.c

@@ -797 +797 @@
               LPITEMIDLIST, pidl)
 {
+#ifdef __WIN32OS2__
+  return HEAP_free(pidl);
+#else
   if(!pidl) 
     return FALSE;
   SHFree(pidl);
   return TRUE;
+#endif
 }
 /*************************************************************************

trunk/src/shell32/shelllink.c

@@ -34 +34 @@
 #undef TRACE
 #ifdef DEBUG
+// PH 2001-11-30
+// this macro definition causes the control leave the scope of a
+// non-curly-braced preceeding if statement. Therefore,
+//   if (p!=NULL) 
+//      TRACE("p->a=%d", p->a)
+// crashes.
+//
+// !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT 
+// !!! ARE PUT INTO CURLY BRACES
 #define TRACE WriteLog("SHELL32: %s", __FUNCTION__); WriteLog
 #define WARN WriteLog("WARNING: SHELL32: %s", __FUNCTION__); WriteLog

trunk/src/shell32/shellord.c

@@ -24 +24 @@
 #include "debugtools.h"
 #include "winnls.h"
+
+#ifdef __WIN32OS2__
+#include "heapstring.h"
+#else
 #include "heap.h"
+#endif
 
 #include "shlwapi.h"
@@ -347 +352 @@
         TRACE("%p\n",x);
 #endif
-        HeapFree(GetProcessHeap(), 0, x);
+  
+#if __WIN32OS2_
+  HEAP_free(x);
+#else
+  HeapFree(GetProcessHeap(), 0, x);
+#endif
 }
 
@@ -361 +371 @@
 {
         LPBYTE ret;
-
+  
+#ifdef __WIN32OS2__
+#if MEM_DEBUG
+        ret = (LPVOID) HEAP_malloc(len+6);
+#else
+        ret = (LPVOID) HEAP_malloc(len);
+#endif
+#else
 #if MEM_DEBUG
         ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len+6);
 #else
         ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len);
+#endif
 #endif