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/windows/msgbox.c b/windows/msgbox.c
index 6cfb59f..9708381 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -9,11 +9,11 @@
#include <malloc.h>
#include "windows.h"
#include "dlgs.h"
+#include "heap.h"
#include "module.h"
#include "win.h"
#include "resource.h"
#include "task.h"
-#include "string32.h"
typedef struct {
LPCSTR title;
@@ -213,8 +213,8 @@
MSGBOX mbox;
int ret;
- mbox.title = title?STRING32_DupUniToAnsi(title):NULL;
- mbox.text = text?STRING32_DupUniToAnsi(text):NULL;
+ mbox.title = HEAP_strdupWtoA( GetProcessHeap(), 0, title );
+ mbox.text = HEAP_strdupWtoA( GetProcessHeap(), 0, text );
mbox.type = type;
fprintf(stderr,"MessageBox(%s,%s)\n",mbox.text,mbox.title);
@@ -225,8 +225,8 @@
MODULE_GetWndProcEntry16("SystemMessageBoxProc"),
(LONG)&mbox );
SYSRES_FreeResource( handle );
- if (title) free(mbox.title);
- if (text) free(mbox.text);
+ HeapFree( GetProcessHeap(), 0, mbox.title );
+ HeapFree( GetProcessHeap(), 0, mbox.text );
return ret;
}
