[VBSCRIPT_WINETEST] Sync with Wine Staging 3.3. CORE-14434

diff --git a/modules/rostests/winetests/vbscript/createobj.c b/modules/rostests/winetests/vbscript/createobj.c
index 4ff0ea7..1c72ed2 100644 (file)
--- a/modules/rostests/winetests/vbscript/createobj.c
+++ b/modules/rostests/winetests/vbscript/createobj.c
@@ -18,25 +18,17 @@
 
 #include <stdio.h>
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 #define CONST_VTABLE
 
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winnls.h>
 #include <ole2.h>
 #include <dispex.h>
 #include <activscp.h>
 #include <objsafe.h>
-//#include <urlmon.h>
-//#include <mshtmhst.h>
+#include <urlmon.h>
+#include <mshtmhst.h>
 
-#include <wine/test.h>
+#include "wine/test.h"
 
 #ifdef _WIN64
 

diff --git a/modules/rostests/winetests/vbscript/run.c b/modules/rostests/winetests/vbscript/run.c
index 382cffc..ee811c6 100644 (file)
--- a/modules/rostests/winetests/vbscript/run.c
+++ b/modules/rostests/winetests/vbscript/run.c
@@ -18,23 +18,16 @@
 
 #include <stdio.h>
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 #define CONST_VTABLE
 
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
 #include <ole2.h>
 #include <dispex.h>
 #include <activscp.h>
 
-#include <vbsregexp55.h>
+#include "vbsregexp55.h"
 
-#include <wine/test.h>
+#include "wine/test.h"
 
 #ifdef _WIN64
 

diff --git a/modules/rostests/winetests/vbscript/vbscript.c b/modules/rostests/winetests/vbscript/vbscript.c
index 5f14d4b..9e86a5f 100644 (file)
--- a/modules/rostests/winetests/vbscript/vbscript.c
+++ b/modules/rostests/winetests/vbscript/vbscript.c
@@ -16,27 +16,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 #define CONST_VTABLE
 
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
 #include <initguid.h>
 #include <ole2.h>
 #include <activscp.h>
 #include <objsafe.h>
 #include <dispex.h>
 
-#include <vbsregexp55.h>
+#include "vbsregexp55.h"
 
-#include <wine/test.h>
+#include "wine/test.h"
 
 #ifdef _WIN64