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

Timestamp:

Feb 9, 2002, 6:27:32 PM (24 years ago)

Author:

sandervl

Message:

logging updates

File:

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

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.50 2002-02-08 15:09:29 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.51 2002-02-09 17:27:31 sandervl Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -65 +65 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG1(int, lstrlenA,
-                   LPCSTR, arg1)
+int WIN32API lstrlenA(LPCSTR arg1)
 {
   dprintf2(("KERNEL32: lstrlenA(%s)\n",
@@ -91 +90 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG1(int, lstrlenW,
-                   LPCWSTR, str)
+int WIN32API lstrlenW(LPCWSTR str)
 {
   if(str == NULL) {
@@ -120 +118 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(LPSTR, lstrcatA,
-                   LPSTR, arg1, 
-                   LPCSTR, arg2)
+LPSTR WIN32API lstrcatA(LPSTR arg1, LPCSTR arg2)
 {
   dprintf2(("KERNEL32: lstrcat(%s,%s)\n",
@@ -147 +143 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(LPWSTR, lstrcatW,
-                   LPWSTR, dst,
-                   LPCWSTR, src)
-{
-    dprintf2(("KERNEL32: OS2lstrcatW(%08xh,%08xh)\n",
+LPWSTR WIN32API lstrcatW(LPWSTR dst, LPCWSTR src)
+{
+    dprintf2(("KERNEL32: lstrcatW(%08xh,%08xh)\n",
               dst, src));
 
@@ -174 +168 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(int, lstrcmpA,
-                   LPCSTR, arg1,
-                   LPCSTR, arg2)
-{
-  dprintf2(("KERNEL32: OS2lstrcmpA(%s,%s)\n",
+int WIN32API lstrcmpA(LPCSTR arg1, LPCSTR arg2)
+{
+  dprintf2(("KERNEL32: lstrcmpA(%s,%s)\n",
            arg1,
            arg2));
@@ -203 +195 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG3(int, lstrncmpA,
-                   LPCSTR, arg1, 
-                   LPCSTR, arg2,
-                   int, l)
-{
-  dprintf2(("KERNEL32: OS2lstrncmpA(%s,%s,%d)\n",
+int WIN32API lstrncmpA(LPCSTR arg1, LPCSTR arg2, int l)
+{
+  dprintf2(("KERNEL32: lstrncmpA(%s,%s,%d)\n",
            arg1,
            arg2,
@@ -227 +216 @@
  * Author    : Przemyslaw Dobrowolski
  *****************************************************************************/
-ODINFUNCTIONNODBG3(INT, lstrncmpiA,
-                   LPCSTR, str1,
-                   LPCSTR, str2,
-                   INT, n )
+int WIN32API lstrncmpiA(LPCSTR str1, LPCSTR str2, INT n )
 {
   INT firstch,lastch;
@@ -251 +237 @@
 }
 //TODO: Don't know if this is completely correct
-ODINFUNCTIONNODBG3(int, lstrncmpiW,
-                   LPCWSTR, str1, 
-                   LPCWSTR, str2,
-                   int, n)
+int WIN32API lstrncmpiW(LPCWSTR str1, LPCWSTR str2, int n)
 {
   INT firstch,lastch;
@@ -287 +270 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(int, lstrcmpW,
-                   LPCWSTR, arg1,
-                   LPCWSTR, arg2)
+int WIN32API lstrcmpW(LPCWSTR arg1, LPCWSTR arg2)
 {
     dprintf2(("KERNEL32: lstrcmpW (%08xh, %08xh)\n",
@@ -316 +297 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG3(int, lstrncmpW,
-                   LPCWSTR, arg1,
-                   LPCWSTR, arg2,
-                   int, l)
-{
-  dprintf2(("KERNEL32: OS2lstrncmpW(%08xh,%08xh,%d)\n",
+int WIN32API lstrncmpW(LPCWSTR arg1, LPCWSTR arg2, int l)
+{
+  dprintf2(("KERNEL32: lstrncmpW(%08xh,%08xh,%d)\n",
            arg1,
            arg2,
@@ -343 +321 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(LPSTR, lstrcpyA,
-                   LPSTR, dest,
-                   LPCSTR, src)
+LPSTR WIN32API lstrcpyA(LPSTR dest, LPCSTR src)
 {
     if ( (src == NULL) || (dest == NULL) ) // stupid parameter checking
@@ -366 +342 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(LPWSTR, lstrcpyW,
-                   LPWSTR, dest,
-                   LPCWSTR, src)
+LPWSTR WIN32API lstrcpyW(LPWSTR dest, LPCWSTR src)
 {
     if ( (src == NULL) || (dest == NULL) ) // stupid parameter checking
@@ -392 +366 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG3(LPSTR, lstrcpynA,
-                   LPSTR, arg1,
-                   LPCSTR, arg2,
-                   int, arg3)
+LPSTR WIN32API lstrcpynA(LPSTR arg1, LPCSTR arg2, int arg3)
 {
   register LPSTR p1 = arg1;
@@ -430 +401 @@
  *****************************************************************************/
 
-ODINFUNCTION3(LPWSTR, lstrcpynW,
-              LPWSTR, dst,
-              LPCWSTR, src,
-              int, n)
+LPWSTR WIN32API lstrcpynW(LPWSTR dst, LPCWSTR src, int n)
 {
     LPWSTR p = dst;
@@ -463 +431 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(int, lstrcmpiA,
-                   LPCSTR, arg1,
-                   LPCSTR, arg2)
+int WIN32API lstrcmpiA(LPCSTR arg1, LPCSTR arg2)
 {
   dprintf2(("KERNEL32: lstrcmpiA(%s,%s)\n",
@@ -661 +627 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG4(LPVOID, HEAP_xrealloc,
-                   HANDLE, heap,
-                   DWORD, flags,
-                   LPVOID, lpMem,
-                   DWORD, size )
+LPVOID WIN32API HEAP_xrealloc(HANDLE heap, DWORD flags, LPVOID lpMem,
+                              DWORD size )
 {
   LPVOID p = HeapReAlloc( heap, flags, lpMem, size );
@@ -692 +655 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG1(LPVOID, HEAP_malloc,
-                   DWORD, size )
+LPVOID WIN32API HEAP_malloc(DWORD size )
 {
   LPVOID p = HeapAlloc( GetProcessHeap(), 0, size );
@@ -717 +679 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG1(DWORD, HEAP_size,
-                   LPVOID, lpMem)
+DWORD WIN32API HEAP_size(LPVOID lpMem)
 {
   return HeapSize( GetProcessHeap(), 0, lpMem );
@@ -736 +697 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(LPVOID, HEAP_realloc,
-                   LPVOID, lpMem,
-                   DWORD, size )
+LPVOID WIN32API HEAP_realloc(LPVOID lpMem, DWORD size )
 {
   LPVOID p = HeapReAlloc( GetProcessHeap(), 0, lpMem, size );
@@ -763 +722 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG1(BOOL,   HEAP_free,
-                   LPVOID, lpMem)
+BOOL WIN32API HEAP_free(LPVOID lpMem)
 {
   return HeapFree( GetProcessHeap(), 0, lpMem);
@@ -782 +740 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG3(LPSTR, HEAP_strdupA,
-                   HANDLE, heap,
-                   DWORD, flags,
-                   LPCSTR, str )
+LPSTR WIN32API HEAP_strdupA(HANDLE heap, DWORD flags, LPCSTR str )
 {
   int iLength = lstrlenA(str) + 1;
@@ -806 +761 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG3(LPWSTR, HEAP_strdupW,
-                   HANDLE, heap,
-                   DWORD, flags,
-                   LPCWSTR, str )
+LPWSTR WIN32API HEAP_strdupW(HANDLE heap, DWORD flags, LPCWSTR str )
 {
     INT len = lstrlenW(str) + 1;
@@ -830 +782 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG3(LPWSTR, HEAP_strdupAtoW,
-                   HANDLE, heap,
-                   DWORD, flags,
-                   LPCSTR, str )
+LPWSTR WIN32API HEAP_strdupAtoW(HANDLE heap, DWORD flags, LPCSTR str )
 {
     LPWSTR ret;
@@ -860 +809 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG3(LPSTR, HEAP_strdupWtoA,
-                   HANDLE, heap,
-                   DWORD, flags,
-                   LPCWSTR, str )
+LPSTR WIN32API HEAP_strdupWtoA(HANDLE heap, DWORD flags, LPCWSTR str )
 {
     LPSTR ret;