Changeset 1280 for trunk/src

Timestamp:

Oct 14, 1999, 11:21:43 AM (26 years ago)

Author:

sandervl

Message:

Heap fixes + dll load bugfixes

Location:

trunk/src/kernel32

Files:

• heapstring.cpp (modified) (3 diffs)
• makefile (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.13 1999-10-04 20:52:33 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.14 1999-10-14 09:21:41 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
  * Includes                                                                  *
  *****************************************************************************/
+#undef DEBUG
 
 #include <os2win.h>
@@ -275 +276 @@
              arg2,
              arg2));
-//    return UniStrcmp( (UniChar*)arg1,
-//                      (UniChar*)arg2 );
+
+    if(arg1 == NULL)
+      return -1;
+    if(arg2 == NULL)
+      return 1;
+
     return wcscmp( (wchar_t*)arg1,
                    (wchar_t*)arg2 );

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.43 1999-10-09 15:03:10 sandervl Exp $
+# $Id: makefile,v 1.44 1999-10-14 09:21:42 sandervl Exp $
 
 #
@@ -176 +176 @@
     $(PDWIN32_INCLUDE)\versionos2.h \
     $(PDWIN32_INCLUDE)\wprocess.h \
+    $(PDWIN32_INCLUDE)\win\thread.h \
     console2.h \
     mmap.h \

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.5 1999-10-08 16:27:48 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.6 1999-10-14 09:21:42 sandervl Exp $ */
 
 /*
@@ -1068 +1068 @@
                     return(FALSE);
                 }
+                WinDll->AddRef();
         }
         fout << "**********************************************************************" << endl;

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.36 1999-10-09 13:33:25 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.37 1999-10-14 09:21:43 sandervl Exp $ */
 
 /*
@@ -307 +307 @@
  Win32DllBase *module;
 
+  module = Win32DllBase::findModule((LPSTR)lpszLibFile);
+  if(module) {
+        module->AddRef();
+        return module->getInstanceHandle();
+  }
+
   hDll = O32_LoadLibrary(lpszLibFile);
   dprintf(("KERNEL32:  iLoadLibraryA %s returned %X (%d)\n",