Jacek Caban : vbscript: Compile tests with -D__WINESRC__.
Alexandre Julliard
julliard at winehq.org
Mon Oct 14 12:39:30 CDT 2013
Module: wine
Branch: master
Commit: b1cf39d0814aac3d307b4ccee2b1f9cd06e1c9bd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cf39d0814aac3d307b4ccee2b1f9cd06e1c9bd
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Oct 14 16:05:48 2013 +0200
vbscript: Compile tests with -D__WINESRC__.
---
dlls/vbscript/tests/Makefile.in | 1 -
dlls/vbscript/tests/createobj.c | 2 +-
dlls/vbscript/tests/run.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/vbscript/tests/Makefile.in b/dlls/vbscript/tests/Makefile.in
index 6cd59d6..88a57f7 100644
--- a/dlls/vbscript/tests/Makefile.in
+++ b/dlls/vbscript/tests/Makefile.in
@@ -1,6 +1,5 @@
TESTDLL = vbscript.dll
IMPORTS = oleaut32 ole32 advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \
createobj.c \
diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c
index 4ae4208..fd59827 100644
--- a/dlls/vbscript/tests/createobj.c
+++ b/dlls/vbscript/tests/createobj.c
@@ -1042,7 +1042,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init)
DWORD res;
if(!init) {
- RegDeleteKey(HKEY_CLASSES_ROOT, key_name);
+ RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name);
return TRUE;
}
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index 37bbba4..7762323 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -1726,7 +1726,7 @@ static BSTR get_script_from_file(const char *filename)
size = GetFileSize(file, NULL);
- map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL);
+ map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL);
CloseHandle(file);
if(map == INVALID_HANDLE_VALUE) {
trace("Could not create file mapping: %u\n", GetLastError());
More information about the wine-cvs
mailing list