[akhaldi] 61386: [JSCRIPT] * 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...
Author: akhaldi Date: Tue Dec 24 21:47:58 2013 New Revision: 61386
URL: http://svn.reactos.org/svn/reactos?rev=61386&view=rev Log: [JSCRIPT] * 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/resource file. CORE-7716
Modified: trunk/reactos/dll/win32/jscript/activex.c trunk/reactos/dll/win32/jscript/array.c trunk/reactos/dll/win32/jscript/bool.c trunk/reactos/dll/win32/jscript/compile.c trunk/reactos/dll/win32/jscript/date.c trunk/reactos/dll/win32/jscript/decode.c trunk/reactos/dll/win32/jscript/dispex.c trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/error.c trunk/reactos/dll/win32/jscript/function.c trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript_main.c trunk/reactos/dll/win32/jscript/jsregexp.c trunk/reactos/dll/win32/jscript/jsstr.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc trunk/reactos/dll/win32/jscript/lang/jscript_De.rc trunk/reactos/dll/win32/jscript/lang/jscript_En.rc trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc trunk/reactos/dll/win32/jscript/lang/jscript_He.rc trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc trunk/reactos/dll/win32/jscript/lang/jscript_It.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc trunk/reactos/dll/win32/jscript/lang/jscript_No.rc trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc trunk/reactos/dll/win32/jscript/lex.c trunk/reactos/dll/win32/jscript/math.c trunk/reactos/dll/win32/jscript/number.c trunk/reactos/dll/win32/jscript/object.c trunk/reactos/dll/win32/jscript/parser.tab.c trunk/reactos/dll/win32/jscript/regexp.c trunk/reactos/dll/win32/jscript/resource.h trunk/reactos/dll/win32/jscript/rsrc.rc trunk/reactos/dll/win32/jscript/string.c trunk/reactos/dll/win32/jscript/vbarray.c
Modified: trunk/reactos/dll/win32/jscript/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/activex.c... ============================================================================== --- trunk/reactos/dll/win32/jscript/activex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/activex.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,16 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -//#include "wine/port.h" - #include "jscript.h" + #include <objsafe.h> #include <mshtmhst.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY =
Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?r... ============================================================================== --- trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,16 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <wine/config.h> -#include <wine/port.h> - -#include <math.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct { jsdisp_t dispex;
Modified: trunk/reactos/dll/win32/jscript/bool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/bool.c?re... ============================================================================== --- trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -19,10 +19,6 @@
#include "jscript.h"
-#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); - typedef struct { jsdisp_t dispex;
Modified: trunk/reactos/dll/win32/jscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/compile.c... ============================================================================== --- trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,15 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <math.h> -#include <assert.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); + WINE_DECLARE_DEBUG_CHANNEL(jscript_disas);
typedef struct _statement_ctx_t {
Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?re... ============================================================================== --- trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,18 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -#include <wine/port.h> - -//#include <limits.h> -//#include <math.h> -#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* 1601 to 1970 is 369 years plus 89 leap days */ #define TIME_EPOCH ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000)
Modified: trunk/reactos/dll/win32/jscript/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/decode.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/decode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/decode.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,10 +17,6 @@ */
#include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* * This file implements algorithm for decoding scripts encoded by
Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,14 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> - #include "jscript.h" - -//#include "wine/unicode.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* * This IID is used to get jsdisp_t objecto from interface.
Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,18 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <assert.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0};
Modified: trunk/reactos/dll/win32/jscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/error.c?r... ============================================================================== --- trunk/reactos/dll/win32/jscript/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/error.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,16 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <math.h>
#include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0};
Modified: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function.... ============================================================================== --- trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,14 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct { jsdisp_t dispex;
Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,18 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -#include <wine/port.h> - -//#include <math.h> -//#include <limits.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff)
Modified: trunk/reactos/dll/win32/jscript/jscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.c... ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> - #include "jscript.h" -#include "engine.h" + #include <objsafe.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
#ifdef _WIN64
Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.h... ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,12 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <wine/config.h> +#include <wine/port.h> + +#include <assert.h> +#include <math.h> +#include <stdarg.h> +#include <stdio.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H - -#include <stdarg.h> -#include <stdio.h>
#define COBJMACROS
@@ -32,10 +37,13 @@ #include <dispex.h> #include <activscp.h>
-#include "resource.h" - #include <wine/unicode.h> #include <wine/list.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +#include "resource.h"
typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; @@ -545,3 +553,6 @@ { InterlockedDecrement(&module_ref); } + +#include "engine.h" +#include "regexp.h"
Modified: trunk/reactos/dll/win32/jscript/jscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_m... ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript_main.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,21 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <initguid.h> - #include "jscript.h"
-#include <winreg.h> -#include <advpub.h> -#include <activaut.h> -#include <objsafe.h> -#include <mshtmhst.h> +#include <initguid.h> #include <rpcproxy.h> #include <jscript_classes.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
LONG module_ref = 0;
Modified: trunk/reactos/dll/win32/jscript/jsregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsregexp.... ============================================================================== --- trunk/reactos/dll/win32/jscript/jsregexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsregexp.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,14 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <math.h> - #include "jscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct { jsdisp_t dispex;
Modified: trunk/reactos/dll/win32/jscript/jsstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsstr.c?r... ============================================================================== --- trunk/reactos/dll/win32/jscript/jsstr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsstr.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,11 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h>
/* * This is the length of a string that is considered to be long enough to be
Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.c... ============================================================================== --- trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,18 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <assert.h> - #include "jscript.h" -//#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); + WINE_DECLARE_DEBUG_CHANNEL(heap);
const char *debugstr_variant(const VARIANT *v)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_De.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_En.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/*UTF-8*/ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_He.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_It.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_No.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
#pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jscr... ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?rev... ============================================================================== --- trunk/reactos/dll/win32/jscript/lex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lex.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,22 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -//#include <limits.h> - #include "jscript.h" -//#include "activscp.h" -//#include "objsafe.h" -#include "engine.h"
#include "parser.tab.h" - -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff)
Modified: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?re... ============================================================================== --- trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,18 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -#include <wine/port.h> - -//#include <math.h> -//#include <limits.h> - #include "jscript.h" + #include <ntsecapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
static const WCHAR EW[] = {'E',0}; static const WCHAR LOG2EW[] = {'L','O','G','2','E',0};
Modified: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct { jsdisp_t dispex;
Modified: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0};
Modified: trunk/reactos/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.ta... ============================================================================== --- trunk/reactos/dll/win32/jscript/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/parser.tab.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -76,13 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "parser.y"
- #include "jscript.h" -#include "engine.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
static int parser_error(parser_ctx_t*,const char*); static void set_error(parser_ctx_t*,UINT);
Modified: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -31,14 +31,7 @@ * the Initial Developer. All Rights Reserved. */
-#include <assert.h> - #include "jscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* FIXME: Better error handling */ #define ReportRegExpError(a,b,c)
Modified: trunk/reactos/dll/win32/jscript/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/resource.... ============================================================================== --- trunk/reactos/dll/win32/jscript/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/resource.h [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> +#pragma once
#define JSCRIPT_MAJOR_VERSION 5 #define JSCRIPT_MINOR_VERSION 8
Modified: trunk/reactos/dll/win32/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/rsrc.rc?r... ============================================================================== --- trunk/reactos/dll/win32/jscript/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/rsrc.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,6 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <windef.h> + +#include "resource.h"
/* @makedep: jscript.rgs */ 2 WINE_REGISTRY jscript.rgs
Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,15 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - #include "jscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript);
#define UINT32_MAX 0xffffffff
Modified: trunk/reactos/dll/win32/jscript/vbarray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/vbarray.c... ============================================================================== --- trunk/reactos/dll/win32/jscript/vbarray.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/vbarray.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -18,10 +18,6 @@
#include "jscript.h"
-#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); - typedef struct { jsdisp_t dispex;
-
akhaldi＠svn.reactos.org