Changeset 1605 for trunk/src

Timestamp:

Nov 5, 1999, 10:16:57 AM (26 years ago)

Author:

sandervl

Message:

EBs fixes + added export for msacm32

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• atom.cpp (modified) (2 diffs)
• heapstring.cpp (modified) (4 diffs)
• kernel32exp.def (modified) (1 diff)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.47 1999-10-28 12:01:11 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.48 1999-11-05 09:16:56 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -1043 +1043 @@
 ;shared memory allocation
     _smalloc__FUi                                                 @1271
+
+;Export for MSACM32
+    _wsnprintfA                                                   @2000

trunk/src/kernel32/atom.cpp

@@ -1 @@
-/* $Id: atom.cpp,v 1.5 1999-10-14 01:47:39 bird Exp $ */
+/* $Id: atom.cpp,v 1.6 1999-11-05 09:16:57 sandervl Exp $ */
 
 /*
@@ -138 +138 @@
 ATOM WIN32API GlobalFindAtomA( LPCSTR arg1)
 {
-    dprintf(("KERNEL32:  OS2GlobalFindAtomA\n"));
+    if (arg1 < (LPCSTR)0x10000)
+      dprintf(("KERNEL32:  GlobalFindAtomA %#4x\n", arg1));
+    else
+      dprintf(("KERNEL32:  GlobalFindAtomA %s\n", arg1));
     return O32_GlobalFindAtom(arg1);
 }

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.16 1999-10-27 18:36:36 phaller Exp $ */
+/* $Id: heapstring.cpp,v 1.17 1999-11-05 09:16:57 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
  * Includes                                                                  *
  *****************************************************************************/
+#undef DEBUG
 
 #include <odin.h>
@@ -446 +447 @@
            arg2));
 
+  if(arg1 == NULL)
+      return -1;
+
+  if(arg2 == NULL)
+      return 1;
+
   return O32_lstrcmpi(arg1, arg2);
 }
@@ -471 +478 @@
            arg2));
 
+  if(arg1 == NULL)
+      return -1;
+
+  if(arg2 == NULL)
+      return 1;
+
   // NOTE: This function has no equivalent in uunidef.h
   astr1 = UnicodeToAsciiString((LPWSTR)arg1);
   astr2 = UnicodeToAsciiString((LPWSTR)arg2);
-  rc = O32_lstrcmpi(astr1, astr2);
+  rc = lstrcmpiA(astr1, astr2);
   FreeAsciiString(astr2);
   FreeAsciiString(astr1);

trunk/src/kernel32/kernel32exp.def

@@ -652 +652 @@
     _PROFILE_SetOdinIniBool@12                @1269
     _PROFILE_SaveOdinIni@0                    @1270
+    _smalloc__FUi                             @1271
+    _wsnprintfA                               @2000