[akhaldi] 61471: [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 i...
Author: akhaldi Date: Wed Jan 1 18:29:51 2014 New Revision: 61471
URL: http://svn.reactos.org/svn/reactos?rev=61471&view=rev Log: [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
Modified: trunk/reactos/dll/win32/vbscript/CMakeLists.txt trunk/reactos/dll/win32/vbscript/compile.c trunk/reactos/dll/win32/vbscript/error.c trunk/reactos/dll/win32/vbscript/global.c trunk/reactos/dll/win32/vbscript/interp.c trunk/reactos/dll/win32/vbscript/lex.c trunk/reactos/dll/win32/vbscript/parser.tab.c trunk/reactos/dll/win32/vbscript/regexp.c trunk/reactos/dll/win32/vbscript/vbdisp.c trunk/reactos/dll/win32/vbscript/vbregexp.c trunk/reactos/dll/win32/vbscript/vbscript.c trunk/reactos/dll/win32/vbscript/vbscript.h trunk/reactos/dll/win32/vbscript/vbscript_main.c
Modified: trunk/reactos/dll/win32/vbscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/vbscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -31,7 +31,7 @@ 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)
Modified: trunk/reactos/dll/win32/vbscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/compile.... ============================================================================== --- trunk/reactos/dll/win32/vbscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/compile.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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 {
Modified: trunk/reactos/dll/win32/vbscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/error.c?... ============================================================================== --- trunk/reactos/dll/win32/vbscript/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/error.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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) {
Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.c... ============================================================================== --- trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,18 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> +#include "vbscript.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);
#define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5))
Modified: trunk/reactos/dll/win32/vbscript/interp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/interp.c... ============================================================================== --- trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,13 +16,7 @@ * 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;
Modified: trunk/reactos/dll/win32/vbscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/lex.c?re... ============================================================================== --- trunk/reactos/dll/win32/vbscript/lex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/lex.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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);
static const WCHAR andW[] = {'a','n','d',0}; static const WCHAR byrefW[] = {'b','y','r','e','f',0};
Modified: trunk/reactos/dll/win32/vbscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.t... ============================================================================== --- trunk/reactos/dll/win32/vbscript/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/parser.tab.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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*);
Modified: trunk/reactos/dll/win32/vbscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/regexp.c... ============================================================================== --- trunk/reactos/dll/win32/vbscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/regexp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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)
Modified: trunk/reactos/dll/win32/vbscript/vbdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.c... ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,13 +16,7 @@ * 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
Modified: trunk/reactos/dll/win32/vbscript/vbregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbregexp... ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbregexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbregexp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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), \
Modified: trunk/reactos/dll/win32/vbscript/vbscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscript... ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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
Modified: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscript... ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -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,13 +28,16 @@ #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; @@ -410,3 +414,7 @@
return ret; } + +#include "parse.h" +#include "regexp.h" +#include "vbscript_defs.h"
Modified: trunk/reactos/dll/win32/vbscript/vbscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscript... ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,22 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "vbscript.h" + +#include <rpcproxy.h> #include <initguid.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> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#include <vbscript_classes.h> +#include <vbsglobal.h> + WINE_DECLARE_DEBUG_CHANNEL(heap); - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static HINSTANCE vbscript_hinstance;
-
akhaldi＠svn.reactos.org