Jacek Caban : jscript: Compile tests with -D__WINESRC__.

Alexandre Julliard julliard at winehq.org
Mon Oct 14 12:39:30 CDT 2013


Module: wine
Branch: master
Commit: 71d1df73b5e87bc6490ac4798ad8816ec824be45
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=71d1df73b5e87bc6490ac4798ad8816ec824be45

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Oct 14 16:05:34 2013 +0200

jscript: Compile tests with -D__WINESRC__.

---

 dlls/jscript/tests/Makefile.in |    1 -
 dlls/jscript/tests/activex.c   |    2 +-
 dlls/jscript/tests/run.c       |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in
index 65fc985..a3ad0ea 100644
--- a/dlls/jscript/tests/Makefile.in
+++ b/dlls/jscript/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = jscript.dll
 IMPORTS   = oleaut32 ole32 advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	activex.c \
diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c
index a04d27c..b4a8bdc 100644
--- a/dlls/jscript/tests/activex.c
+++ b/dlls/jscript/tests/activex.c
@@ -1088,7 +1088,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/jscript/tests/run.c b/dlls/jscript/tests/run.c
index 82d9310..0db3660 100644
--- a/dlls/jscript/tests/run.c
+++ b/dlls/jscript/tests/run.c
@@ -1739,7 +1739,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