Changeset 1670 for trunk/src/kernel32/heapstring.cpp

Timestamp:

Nov 9, 1999, 8:22:33 PM (26 years ago)

Author:

sandervl

Message:

thread fixes + heap wrappers

File:

• trunk/src/kernel32/heapstring.cpp (modified) (23 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.18 1999-11-09 14:19:46 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.19 1999-11-09 19:22:32 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
  * Includes                                                                  *
  *****************************************************************************/
-#undef DEBUG
 
 #include <odin.h>
@@ -69 +68 @@
       return FALSE;
     }
-    dprintf(("KERNEL32: HeapString: UniCreateUconvObject(%d)\n",
+    dprintf2(("KERNEL32: HeapString: UniCreateUconvObject(%d)\n",
              rc));
   }
@@ -90 +89 @@
 int WIN32API lstrlenA(LPCSTR arg1)
 {
-  dprintf(("KERNEL32: lstrlenA(%s)\n",
+  dprintf2(("KERNEL32: lstrlenA(%s)\n",
            arg1));
 
@@ -114 +113 @@
 
   rc = UniStrlen( (UniChar*)arg1);
-  dprintf(("KERNEL32: lstrlenW(%08xh) returns %d\n",
+  dprintf2(("KERNEL32: lstrlenW(%08xh) returns %d\n",
            arg1,
            rc));
@@ -135 +134 @@
 LPSTR WIN32API lstrcatA(LPSTR arg1, LPCSTR arg2)
 {
-  dprintf(("KERNEL32: lstrcat(%s,%s)\n",
+  dprintf2(("KERNEL32: lstrcat(%s,%s)\n",
            arg1,
            arg2));
@@ -157 +156 @@
 LPWSTR WIN32API lstrcatW(LPWSTR arg1, LPCWSTR arg2)
 {
-  dprintf(("KERNEL32: OS2lstrcatW(%08xh,%08xh)\n",
+  dprintf2(("KERNEL32: OS2lstrcatW(%08xh,%08xh)\n",
            arg1,
            arg2));
@@ -180 +179 @@
 int WIN32API lstrcmpA(LPCSTR arg1, LPCSTR  arg2)
 {
-  dprintf(("KERNEL32: OS2lstrcmpA(%s,%s)\n",
+  dprintf2(("KERNEL32: OS2lstrcmpA(%s,%s)\n",
            arg1,
            arg2));
@@ -202 +201 @@
 int WIN32API lstrncmpA(LPCSTR arg1, LPCSTR  arg2, int l)
 {
-  dprintf(("KERNEL32: OS2lstrncmpA(%s,%s,%d)\n",
+  dprintf2(("KERNEL32: OS2lstrncmpA(%s,%s,%d)\n",
            arg1,
            arg2,
@@ -277 +276 @@
 int WIN32API lstrcmpW(LPCWSTR arg1, LPCWSTR arg2)
 {
-    dprintf(("KERNEL32: lstrcmpW (%08xh-%ls, %08xh-%ls)\n",
+    dprintf2(("KERNEL32: lstrcmpW (%08xh-%ls, %08xh-%ls)\n",
              arg1,
              arg1,
@@ -307 +306 @@
 int WIN32API lstrncmpW(LPCWSTR arg1, LPCWSTR  arg2, int l)
 {
-  dprintf(("KERNEL32: OS2lstrncmpW(%08xh,%08xh,%d)\n",
+  dprintf2(("KERNEL32: OS2lstrncmpW(%08xh,%08xh,%d)\n",
            arg1,
            arg2,
@@ -380 +379 @@
   register LPSTR p2 = (LPSTR)arg2;
 
-  dprintf(("KERNEL32: OS2lstrcpyA(%08xh, %08xh, %08xh)\n",
+  dprintf2(("KERNEL32: OS2lstrcpyA(%08xh, %08xh, %08xh)\n",
            arg1,
            arg2,
@@ -413 +412 @@
 LPWSTR WIN32API lstrcpynW(LPWSTR dest, LPCWSTR src, int arg3)
 {
-  dprintf(("KERNEL32: lstrcpynW(%08xh,%08xh,%08xh)",
+  dprintf2(("KERNEL32: lstrcpynW(%08xh,%08xh,%08xh)",
            dest,
            src,
@@ -443 +442 @@
 int WIN32API lstrcmpiA(LPCSTR arg1, LPCSTR  arg2)
 {
-  dprintf(("KERNEL32: lstrcmpiA(%s,%s)\n",
+  dprintf2(("KERNEL32: lstrcmpiA(%s,%s)\n",
            arg1,
            arg2));
@@ -474 +473 @@
   int   rc;
 
-  dprintf(("KERNEL32: lstrcmpiW(%08xh,%08xh)\n",
+  dprintf2(("KERNEL32: lstrcmpiW(%08xh,%08xh)\n",
            arg1,
            arg2));
@@ -600 +599 @@
   char*    in_buf;
 
-  dprintf(("KERNEL32: HeapString: lstrcpynAtoW(%s,%08xh,%d)\n",
+  dprintf2(("KERNEL32: HeapString: lstrcpynAtoW(%s,%08xh,%d)\n",
            ascii,
            unicode,
@@ -751 +750 @@
   if (!p)
   {
-    dprintf(("KERNEL32: HEAP_xalloc(%08xh,%08xh,%08xh) out of memory.\n",
+    dprintf2(("KERNEL32: HEAP_xalloc(%08xh,%08xh,%08xh) out of memory.\n",
              heap,
              flags,
@@ -777 +776 @@
   if (!p)
   {
-    dprintf(("KERNEL32: HEAP_xrealloc(%08xh,%08xh,%08xh,%08xh) out of memory.\n",
+    dprintf2(("KERNEL32: HEAP_xrealloc(%08xh,%08xh,%08xh,%08xh) out of memory.\n",
              heap,
              flags,
@@ -804 +803 @@
   if (!p)
   {
-    dprintf(("KERNEL32: HEAP_malloc(%08xh) out of memory.\n",
+    dprintf2(("KERNEL32: HEAP_malloc(%08xh) out of memory.\n",
              size));
   }
@@ -828 +827 @@
   if (!p)
   {
-    dprintf(("KERNEL32: HEAP_realloc(%08xh,%08xh) out of memory.\n",
+    dprintf2(("KERNEL32: HEAP_realloc(%08xh,%08xh) out of memory.\n",
              lpMem,
              size));
@@ -850 +849 @@
 VOID WIN32API HEAP_free(LPVOID lpMem)
 {
-  dprintf(("KERNEL32: HEAP_free(%08xh)\n",
+  dprintf2(("KERNEL32: HEAP_free(%08xh)\n",
            lpMem));
 
@@ -958 +957 @@
 INT WIN32API WideCharToLocal(LPSTR pLocal, LPWSTR pWide, INT dwChars)
 {
-  dprintf(("KERNEL32: WideCharToLocal(%08xh,%08xh,%08xh)\n",
+  dprintf2(("KERNEL32: WideCharToLocal(%08xh,%08xh,%08xh)\n",
            pLocal,
            pWide,
@@ -993 +992 @@
   *pWide = 0;
 
-  dprintf(("KERNEL32: LocalToWideChar(%08xh,%08xh,%08xh)\n",
+  dprintf2(("KERNEL32: LocalToWideChar(%08xh,%08xh,%08xh)\n",
            pLocal,
            pWide,