Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[JSCRIPT]

Browse source 
* 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

svn path=/trunk/; revision=61386
This commit is contained in:
Amine Khaldi 2013-12-24 21:47:58 +00:00
parent afece00e5a
commit c36b4a7737
46 changed files with 25 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/jscript/activex.c
View file

@ -16,17 +16,11 @@
* 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 =
{0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}};

9
reactos/dll/win32/jscript/array.c
View file

@ -16,17 +16,8 @@
* 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;

4
reactos/dll/win32/jscript/bool.c
View file

@ -19,10 +19,6 @@
#include "jscript.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct {
jsdisp_t dispex;

7
reactos/dll/win32/jscript/compile.c
View file

@ -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 {

11
reactos/dll/win32/jscript/date.c
View file

@ -17,19 +17,8 @@
* 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)

4
reactos/dll/win32/jscript/decode.c
View file

@ -18,10 +18,6 @@
#include "jscript.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/*
* This file implements algorithm for decoding scripts encoded by
* screnc.exe. The 'secret' algorithm that's well documented here:

7
reactos/dll/win32/jscript/dispex.c
View file

@ -16,15 +16,8 @@
* 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.
* We might consider using private interface instead.

11
reactos/dll/win32/jscript/engine.c
View file

@ -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};

8
reactos/dll/win32/jscript/error.c
View file

@ -15,17 +15,9 @@
* 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};
static const WCHAR nameW[] = {'n','a','m','e',0};

7
reactos/dll/win32/jscript/function.c
View file

@ -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;

11
reactos/dll/win32/jscript/global.c
View file

@ -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)

8
reactos/dll/win32/jscript/jscript.c
View file

@ -16,16 +16,10 @@
* 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
#define CTXARG_T DWORDLONG

21
reactos/dll/win32/jscript/jscript.h
View file

@ -16,13 +16,18 @@
* 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
#include <windef.h>
@ -32,11 +37,14 @@
#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;
typedef struct _script_ctx_t script_ctx_t;
@ -545,3 +553,6 @@ static inline void unlock_module(void)
{
InterlockedDecrement(&module_ref);
}
#include "engine.h"
#include "regexp.h"

12
reactos/dll/win32/jscript/jscript_main.c
View file

@ -16,22 +16,12 @@
* 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;
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

7
reactos/dll/win32/jscript/jsregexp.c
View file

@ -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;

4
reactos/dll/win32/jscript/jsstr.c
View file

@ -16,12 +16,8 @@
* 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
* worth the rope to avoid copy.

10
reactos/dll/win32/jscript/jsutils.c
View file

@ -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)

2
reactos/dll/win32/jscript/lang/jscript_Da.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

2
reactos/dll/win32/jscript/lang/jscript_De.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

2
reactos/dll/win32/jscript/lang/jscript_En.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/jscript/lang/jscript_Es.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/*UTF-8*/
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_Fr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_He.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/jscript/lang/jscript_Hu.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_It.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_Ja.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_Ko.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_Lt.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_Nl.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_No.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

2
reactos/dll/win32/jscript/lang/jscript_Pl.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/jscript/lang/jscript_Pt.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

2
reactos/dll/win32/jscript/lang/jscript_Ro.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_Ru.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/jscript/lang/jscript_Si.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

2
reactos/dll/win32/jscript/lang/jscript_Uk.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)

13
reactos/dll/win32/jscript/lex.c
View file

@ -16,23 +16,10 @@
* 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)
static const WCHAR breakW[] = {'b','r','e','a','k',0};

11
reactos/dll/win32/jscript/math.c
View file

@ -17,19 +17,10 @@
* 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};
static const WCHAR LOG10EW[] = {'L','O','G','1','0','E',0};

10
reactos/dll/win32/jscript/number.c
View file

@ -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 <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct {
jsdisp_t dispex;

6
reactos/dll/win32/jscript/object.c
View file

@ -16,14 +16,8 @@
* 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};
static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0};

6
reactos/dll/win32/jscript/parser.tab.c
View file

@ -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);

7
reactos/dll/win32/jscript/regexp.c
View file

@ -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)

2
reactos/dll/win32/jscript/resource.h
View file

@ -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

4
reactos/dll/win32/jscript/rsrc.rc
View file

@ -16,6 +16,10 @@
* 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

8
reactos/dll/win32/jscript/string.c
View file

@ -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

4
reactos/dll/win32/jscript/vbarray.c
View file

@ -18,10 +18,6 @@
#include "jscript.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct {
jsdisp_t dispex;