Release 961222
Sun Dec 22 13:30:18 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [graphics/metafiledrv/init.c] [graphisc/metafiledrv/mapping.c]
Added mapping functions.
* [if1632/gdi.spec] [objects/*.c] [include/windows.h]
Added a lot of Win32 functions.
* [memory/heap.c]
Added HEAP_strdupAtoW and HEAP_strdupWtoA.
* [misc/lstr.c] [memory/string.c]
Moved OEM<->Ansi conversion to string.c. Fixed a couple of bugs.
* [object/font.c]
Avoid uppercasing font names.
* [windows/hook.c]
Set ds = ss before calling hook procedure.
Sat Dec 21 21:44:17 1996 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [objects/color.c]
Use colors allocated by other clients.
* [windows/caret.c]
Set default blink time to 500.
* [windows/win.c] [windows/event.c]
Delete X context before XDestroyWindow().
* [windows/keyboard.c]
Fixed GetKeyState() once more.
Fri Dec 20 08:26:33 1996 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*.c]
Lots of built-in debugger improvements: parse Win32 EXEs debug
information, display local variables, source files and line
numbers, get symbols directly from the Wine executable, etc.
Tue Dec 17 22:39:42 1996 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/winsock_async.c]
Extern declaration added for h_errno.
Tue Dec 17 21:29:34 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/message.c]
Added two more CBT hook calls: HCBT_CLICKSKIPPED/HCBT_KEYSKIPPED.
diff --git a/win32/code_page.c b/win32/code_page.c
index f181ad3..da1d7e0 100644
--- a/win32/code_page.c
+++ b/win32/code_page.c
@@ -9,9 +9,9 @@
#include "windows.h"
#include "winerror.h"
#include "winnls.h"
+#include "heap.h"
#include "stddebug.h"
#include "debug.h"
-#include "string32.h"
/***********************************************************************
@@ -102,14 +102,14 @@
* EnumSystemCodePages32W (KERNEL32.93)
*/
BOOL32
-EnumSystemCodePages32W(CODEPAGE_ENUMPROC32W lpfnCodePageEnum,DWORD flags) {
- WCHAR *cp;
- dprintf_win32(stddeb,"EnumSystemCodePages32W(%p,%08lx)\n",
- lpfnCodePageEnum,flags
- );
+EnumSystemCodePages32W( CODEPAGE_ENUMPROC32W lpfnCodePageEnum, DWORD flags)
+{
+ WCHAR *cp;
+ dprintf_win32(stddeb,"EnumSystemCodePages32W(%p,%08lx)\n",
+ lpfnCodePageEnum,flags );
- cp=STRING32_DupAnsiToUni("437");
- lpfnCodePageEnum(cp);
- free(cp);
- return TRUE;
+ cp = HEAP_strdupAtoW( GetProcessHeap(), 0, "437" );
+ lpfnCodePageEnum(cp);
+ HeapFree( GetProcessHeap(), 0, cp );
+ return TRUE;
}
