Changeset 2032 for trunk/src

Timestamp:

Dec 9, 1999, 1:52:21 AM (26 years ago)

Author:

sandervl

Message:

code heap added + changed back winres fix (breaks Notes) + heapstring fixes

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• heap.cpp (modified) (1 diff)
• heapcode.cpp (added)
• heapstring.cpp (modified) (4 diffs)
• initterm.cpp (modified) (4 diffs)
• makefile (modified) (4 diffs)
• mmap.cpp (modified) (3 diffs)
• winres.cpp (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.55 1999-12-05 21:11:40 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.56 1999-12-09 00:52:19 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -1052 +1052 @@
     _smalloc__FUi                                                 @1271
 
+;code memory allocation
+    _cmalloc__FUi                                                 @1272
+
 ;Export for MSACM32
     _wsnprintfA                                                   @2000

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.16 1999-11-13 14:21:30 sandervl Exp $ */
+/* $Id: heap.cpp,v 1.17 1999-12-09 00:52:20 sandervl Exp $ */
 
 /*
- * Project Odin Software License can be found in LICENSE.TXT
- *
  * Win32 heap API functions for OS/2
  *
- * Copyright 1998 Sander van Leeuwen
+ * Copyright 1999 Sander van Leeuwen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.21 1999-12-06 20:39:38 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.22 1999-12-09 00:52:20 sandervl Exp $ */
 
 /*
@@ -552 +552 @@
     astring[unilen] = 0; //terminate
 
-    return unilen;
-
+    return unilen; //length of string (excluding terminator)
   }
   else
@@ -628 +627 @@
     //SvL: Determine length of ascii string
     in_bytes_left = strlen(in_buf)+1;
-    in_bytes_left = min(in_bytes_left, asciilen); //buffer size in bytes
+    in_bytes_left = asciilen = min(in_bytes_left, asciilen); //buffer size in bytes
     
     out_buf = (UniChar*)unicode;
@@ -639 +638 @@
                         &num_subs );
 
-    //@@@PH what's this?
-    //unicode[asciilen-1-in_bytes_left] = 0;
-
-    //@@@PH what's this?
-    //return asciilen - 1;
-    return asciilen;
+    asciilen -= 1+uni_chars_left; //end + left bytes
+
+    unicode[asciilen] = 0; // always terminate string
+    return asciilen; //length of string (excluding terminator)
   }
   else

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.28 1999-11-23 20:01:18 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.29 1999-12-09 00:52:20 sandervl Exp $ */
 
 /*
@@ -42 +42 @@
 #include "oslibmisc.h"
 #include <heapshared.h>
+#include <heapcode.h>
 #include "mmap.h"
 #include "directory.h"
@@ -111 +112 @@
                 return 0UL;
 
+            if(InitializeCodeHeap() == FALSE)
+                return 0UL;
+
             PROFILE_LoadOdinIni();
             if(RegisterLxDll(hModule, 0, 0) == FALSE)
@@ -171 +175 @@
     DestroyTIB();
     DestroySharedHeap();
+    DestroyCodeHeap();
     _ctordtorTerm();
 

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.66 1999-12-01 18:40:48 sandervl Exp $
+# $Id: makefile,v 1.67 1999-12-09 00:52:20 sandervl Exp $
 
 #
@@ -32 +32 @@
 CONBUFFER.OBJ CONOUT.OBJ UNICODE.OBJ network.OBJ HMDEVIO.OBJ \
 profile.obj THREAD.OBJ virtual.obj THUNK.OBJ OBSOLETE.OBJ COMM.OBJ\
-MESSAGE.OBJ RESOURCE.OBJ EXCEPTIONS.OBJ heapshared.obj cpuhlp.obj \
+MESSAGE.OBJ RESOURCE.OBJ EXCEPTIONS.OBJ heapshared.obj cpuhlp.obj heapcode.obj \
 LFILE.OBJ NPIPE.OBJ oslibdos.obj oslibmisc.obj MISC.OBJ EXCEPTUTIL.OBJ \
 LANG.OBJ ICCIO.OBJ MAP.OBJ WIN32UTIL.OBJ heap.OBJ heapstring.obj \
@@ -151 +151 @@
     initterm.h
 
-initterm.OBJ: .\initterm.cpp initterm.h  $(PDWIN32_INCLUDE)\heapshared.h  mmap.h directory.h hmdevio.h cpuhlp.h
+initterm.OBJ: .\initterm.cpp initterm.h  $(PDWIN32_INCLUDE)\heapshared.h  mmap.h directory.h hmdevio.h cpuhlp.h $(PDWIN32_INCLUDE)\heapcode.h
 
 thunk.OBJ: \
@@ -387 +387 @@
 
 heapshared.obj: heapshared.cpp $(PDWIN32_INCLUDE)\heapshared.h
+heapcode.obj: heapcode.cpp $(PDWIN32_INCLUDE)\heapshared.h $(PDWIN32_INCLUDE)\heapcode.h
 cpu.obj: cpu.cpp cpuhlp.h
 cpuhlp.obj: cpuhlp.asm

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.25 1999-12-07 12:28:41 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.26 1999-12-09 00:52:21 sandervl Exp $ */
 
 /*
@@ -327 +327 @@
                 goto fail;
         }
-        if(hMemFile == -1 && !image) {//commit memory
+        if(hMemFile == -1 && !image && (mProtFlags & SEC_COMMIT)) {//commit memory
                 VirtualAlloc(pMapping, mSize, MEM_COMMIT, PAGE_READWRITE);
         }
@@ -336 +336 @@
   }
   if(mapview->everythingOk() == FALSE) {
+        dprintf(("Win32MemMap::mapFileView: !mapview->everythingOk"));
         delete mapview;
         goto fail;

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.23 1999-12-07 12:28:41 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.24 1999-12-09 00:52:21 sandervl Exp $ */
 
 /*
@@ -71 +71 @@
   this->type     = type;
   this->ressize  = size;
-  winresdata     = (char *)malloc(size+sizeof(WCHAR)); //+2 for 0 terminator (string res)
+  winresdata     = (char *)malloc(size+sizeof(WCHAR));
   if(winresdata == NULL) {
     DebugInt3();
@@ -80 +80 @@
   if(type == NTRT_STRING) {
         memcpy(winresdata, resdata, size);
-        ((USHORT *)winresdata)[size/sizeof(WCHAR)] = 0;
+        ((USHORT *)winresdata)[size/sizeof(WCHAR)-1] = 0;
   }
   else  memcpy(winresdata, resdata, size);