[VBSCRIPT]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61471

diff --git a/reactos/dll/win32/vbscript/CMakeLists.txt b/reactos/dll/win32/vbscript/CMakeLists.txt
index 7ba9cb2..1a9fa7c 100644 (file)
--- a/reactos/dll/win32/vbscript/CMakeLists.txt
+++ b/reactos/dll/win32/vbscript/CMakeLists.txt
@@ -31,7 +31,7 @@ add_idl_headers(vbscript_idlheader vbscript_classes.idl vbsglobal.idl vbsregexp5
 add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl)
 add_library(vbscript SHARED ${SOURCE} vbscript.rc)
 set_module_type(vbscript win32dll)
-target_link_libraries(vbscript wine)
+target_link_libraries(vbscript uuid wine)
 add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_dependencies(vbscript vbscript_idlheader stdole2)
 add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/vbscript/compile.c b/reactos/dll/win32/vbscript/compile.c
index efb8e91..8ee9831 100644 (file)
--- a/reactos/dll/win32/vbscript/compile.c
+++ b/reactos/dll/win32/vbscript/compile.c
@@ -16,15 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "vbscript.h"
-#include "parse.h"
-//#include "parser.tab.h"
-
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
 WINE_DECLARE_DEBUG_CHANNEL(vbscript_disas);
 
 typedef struct _statement_ctx_t {

diff --git a/reactos/dll/win32/vbscript/error.c b/reactos/dll/win32/vbscript/error.c
index 8753bba..12c2680 100644 (file)
--- a/reactos/dll/win32/vbscript/error.c
+++ b/reactos/dll/win32/vbscript/error.c
@@ -17,11 +17,6 @@
  */
 
 #include "vbscript.h"
-#include "vbscript_defs.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
 
 static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)
 {

diff --git a/reactos/dll/win32/vbscript/global.c b/reactos/dll/win32/vbscript/global.c
index 4c2f697..40439a4 100644 (file)
--- a/reactos/dll/win32/vbscript/global.c
+++ b/reactos/dll/win32/vbscript/global.c
@@ -16,18 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-#include <math.h>
-
 #include "vbscript.h"
-#include "vbscript_defs.h"
-
-#include <mshtmhst.h>
-#include <objsafe.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
+#include <math.h>
 
 #define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5))
 

diff --git a/reactos/dll/win32/vbscript/interp.c b/reactos/dll/win32/vbscript/interp.c
index bbbf226..4223a7f 100644 (file)
--- a/reactos/dll/win32/vbscript/interp.c
+++ b/reactos/dll/win32/vbscript/interp.c
@@ -16,14 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "vbscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
-
 static DISPID propput_dispid = DISPID_PROPERTYPUT;
 
 typedef struct {

diff --git a/reactos/dll/win32/vbscript/lex.c b/reactos/dll/win32/vbscript/lex.c
index a858b76..264c74c 100644 (file)
--- a/reactos/dll/win32/vbscript/lex.c
+++ b/reactos/dll/win32/vbscript/lex.c
@@ -16,16 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <assert.h>
-
 #include "vbscript.h"
-#include "parse.h"
 #include "parser.tab.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
-
 static const WCHAR andW[] = {'a','n','d',0};
 static const WCHAR byrefW[] = {'b','y','r','e','f',0};
 static const WCHAR byvalW[] = {'b','y','v','a','l',0};

diff --git a/reactos/dll/win32/vbscript/parser.tab.c b/reactos/dll/win32/vbscript/parser.tab.c
index 76ce2a8..87caa7a 100644 (file)
--- a/reactos/dll/win32/vbscript/parser.tab.c
+++ b/reactos/dll/win32/vbscript/parser.tab.c
@@ -76,13 +76,7 @@
 /* Line 268 of yacc.c  */
 #line 19 "parser.y"
 
-
 #include "vbscript.h"
-#include "parse.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
 
 static int parser_error(parser_ctx_t *,const char*);
 

diff --git a/reactos/dll/win32/vbscript/regexp.c b/reactos/dll/win32/vbscript/regexp.c
index e26dac3..724e8de 100644 (file)
--- a/reactos/dll/win32/vbscript/regexp.c
+++ b/reactos/dll/win32/vbscript/regexp.c
@@ -31,14 +31,7 @@
  * the Initial Developer. All Rights Reserved.
  */
 
-#include <assert.h>
-
 #include "vbscript.h"
-#include "regexp.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
 
 /* FIXME: Better error handling */
 #define ReportRegExpError(a,b,c)

diff --git a/reactos/dll/win32/vbscript/vbdisp.c b/reactos/dll/win32/vbscript/vbdisp.c
index 77cdcb9..67b54da 100644 (file)
--- a/reactos/dll/win32/vbscript/vbdisp.c
+++ b/reactos/dll/win32/vbscript/vbdisp.c
@@ -16,14 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "vbscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
-
 #define FDEX_VERSION_MASK 0xf0000000
 
 static inline BOOL is_func_id(vbdisp_t *This, DISPID id)

diff --git a/reactos/dll/win32/vbscript/vbregexp.c b/reactos/dll/win32/vbscript/vbregexp.c
index 9171ec7..6379028 100644 (file)
--- a/reactos/dll/win32/vbscript/vbregexp.c
+++ b/reactos/dll/win32/vbscript/vbregexp.c
@@ -17,12 +17,9 @@
  */
 
 #include "vbscript.h"
-#include "regexp.h"
-#include "vbsregexp55.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
+#include <initguid.h>
+#include <vbsregexp55.h>
 
 #define REGEXP_TID_LIST \
     XDIID(RegExp2), \

diff --git a/reactos/dll/win32/vbscript/vbscript.c b/reactos/dll/win32/vbscript/vbscript.c
index 3f21d80..25be31a 100644 (file)
--- a/reactos/dll/win32/vbscript/vbscript.c
+++ b/reactos/dll/win32/vbscript/vbscript.c
@@ -16,15 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
-//#include <assert.h>
-
 #include "vbscript.h"
-#include <objsafe.h>
-
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
+#include <vbscript_classes.h>
 
 #ifdef _WIN64
 

diff --git a/reactos/dll/win32/vbscript/vbscript.h b/reactos/dll/win32/vbscript/vbscript.h
index 98a7ed3..a1208af 100644 (file)
--- a/reactos/dll/win32/vbscript/vbscript.h
+++ b/reactos/dll/win32/vbscript/vbscript.h
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <assert.h>
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -27,14 +28,17 @@
 #include <windef.h>
 #include <winbase.h>
 #include <ole2.h>
+#include <objsafe.h>
 #include <dispex.h>
 #include <activscp.h>
-
-#include <vbscript_classes.h>
+#include <mshtmhst.h>
 
 #include <wine/list.h>
 #include <wine/unicode.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
+
 typedef struct {
     void **blocks;
     DWORD block_cnt;
@@ -410,3 +414,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
 
     return ret;
 }
+
+#include "parse.h"
+#include "regexp.h"
+#include "vbscript_defs.h"

diff --git a/reactos/dll/win32/vbscript/vbscript_main.c b/reactos/dll/win32/vbscript/vbscript_main.c
index eea6c80..224f06d 100644 (file)
--- a/reactos/dll/win32/vbscript/vbscript_main.c
+++ b/reactos/dll/win32/vbscript/vbscript_main.c
@@ -16,23 +16,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <initguid.h>
+#include "vbscript.h"
 
-#include <vbscript.h>
-#include <objsafe.h>
-#include <mshtmhst.h>
 #include <rpcproxy.h>
-//#include "vbscript_classes.h"
-#include "vbsglobal.h"
-#include "vbsregexp55.h"
-
-#include <wine/debug.h>
+#include <initguid.h>
+#include <vbscript_classes.h>
+#include <vbsglobal.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
 WINE_DECLARE_DEBUG_CHANNEL(heap);
 
-DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
-
 static HINSTANCE vbscript_hinstance;
 
 static ITypeLib *typelib;