Changeset 436 for trunk/src

Timestamp:

Aug 6, 1999, 2:15:25 PM (26 years ago)

Author:

phaller

Message:

Fix: Heap changes

Location:

trunk/src/kernel32

Files:

• misc.cpp (modified) (5 diffs)
• profile.cpp (modified) (5 diffs)

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.5 1999-08-06 12:14:12 phaller Exp $ */
+/* $Id: misc.cpp,v 1.6 1999-08-06 12:15:25 phaller Exp $ */
 
 /*
@@ -246 +246 @@
 int SYSTEM EXPORT WriteLog(char *tekst, ...)
 {
-//  USHORT  sel = RestoreOS2FS();
+  USHORT  sel = RestoreOS2FS();
   va_list argptr;
 
@@ -269 +269 @@
   }
 
-//  SetFS(sel);
+  SetFS(sel);
   return 1;
 }
@@ -275 +275 @@
 int SYSTEM EXPORT WriteLogError(char *tekst, ...)
 {
-//  USHORT  sel = RestoreOS2FS();
+  USHORT  sel = RestoreOS2FS();
   va_list argptr;
 
@@ -285 +285 @@
     printf("\n");
 
-//  SetFS(sel);
+  SetFS(sel);
   return 1;
 }

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.7 1999-08-04 21:22:24 phaller Exp $ */
+/* $Id: profile.cpp,v 1.8 1999-08-06 12:14:12 phaller Exp $ */
 
 /*
@@ -18 +18 @@
 #include <stdio.h>
 #include <unicode.h>
-//#include "heap.h"
+#include "heap.h"
+#include "heapstring.h"
 
 #include <sys/stat.h>
@@ -26 +27 @@
 #include "winuser.h"
 #include "winnls.h"
-//#include "heap.h"
-//#include "debugtools.h"
-//#include "options.h"
 
 
@@ -39 +37 @@
 #endif
 
-#define HeapFree(a,b,c)          free(c)
-#define HEAP_xalloc(a,b,c)       malloc(c)
-#define HEAP_strdupA(a,b,c)      strdup(c)
+#define SystemHeap               GetProcessHeap()
 #define strcasecmp               strcmp
 #define DOSFS_GetFullName(a,b,c) strcpy(c,a)
-#define HEAP_strdupAtoW(a,b,c)   AsciiToUnicodeString((char *)c)
-#define HEAP_strdupWtoA(a,b,c)   UnicodeToAsciiString((LPWSTR)c)
-#define lstrcpynAtoW(a,b,c)      AsciiToUnicodeN((char*)a,(LPWSTR)b,(int)c)
-#define lstrcpynWtoA(a,b,c)      UnicodeToAsciiN((LPWSTR)a,(char*)b,(int)c)
 //#define lstrcpynA(a,b,c)         strncpy((char*)a,(char*)b,(int)c)
 #define CharLowerA(a)            (a)
@@ -1335 +1327 @@
     INT ret = GetPrivateProfileStructA( sectionA, keyA, bufferA,
                len, filenameA );
-    lstrcpynAtoW( buffer, bufferA, len );
+    lstrcpynAtoW( (LPWSTR)buffer, bufferA, len );
     HeapFree( GetProcessHeap(), 0, bufferA);
     HeapFree( GetProcessHeap(), 0, sectionA );