Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 15:08:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[JSCRIPT]

Browse source 
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61771
This commit is contained in:
Amine Khaldi 2014-01-23 17:45:05 +00:00
parent a45f245075
commit 4ba913a711
8 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,6 @@
#include "jscript.h" #include "jscript.h"
#include <objsafe.h>
#include <mshtmhst.h> #include <mshtmhst.h>
/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ /* Defined as extern in urlmon.idl, but not exported by uuid.lib */

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

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once
typedef struct _source_elements_t source_elements_t; typedef struct _source_elements_t source_elements_t;
typedef struct _expression_t expression_t; typedef struct _expression_t expression_t;
typedef struct _statement_t statement_t; typedef struct _statement_t statement_t;

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

@ -18,8 +18,6 @@
#include "jscript.h" #include "jscript.h"
#include <objsafe.h>
#ifdef _WIN64 #ifdef _WIN64
#define CTXARG_T DWORDLONG #define CTXARG_T DWORDLONG

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

@ -20,9 +20,7 @@
#include <wine/port.h> #include <wine/port.h>
#include <assert.h> #include <assert.h>
#include <math.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
@ -32,15 +30,16 @@
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winuser.h> #include <objbase.h>
#include <ole2.h> #include <oleauto.h>
#include <dispex.h> #include <dispex.h>
#include <activscp.h> #include <activscp.h>
#include <objsafe.h>
#include <wine/unicode.h>
#include <wine/list.h>
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/list.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(jscript); WINE_DEFAULT_DEBUG_CHANNEL(jscript);
#include "resource.h" #include "resource.h"

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

@ -18,14 +18,12 @@
#include "jscript.h" #include "jscript.h"
#include <initguid.h>
#include <rpcproxy.h> #include <rpcproxy.h>
#include <initguid.h>
#include <jscript_classes.h> #include <jscript_classes.h>
LONG module_ref = 0; LONG module_ref = 0;
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
HINSTANCE jscript_hinstance; HINSTANCE jscript_hinstance;
static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)

3
reactos/dll/win32/jscript/jsstr.h
View file

@ -33,6 +33,9 @@
* *
* In the future more layouts and transformations may be added. * In the future more layouts and transformations may be added.
*/ */
#pragma once
struct _jsstr_t { struct _jsstr_t {
unsigned length_flags; unsigned length_flags;
unsigned ref; unsigned ref;

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

@ -246,4 +246,4 @@ HRESULT jsval_to_variant(jsval_t,VARIANT*) DECLSPEC_HIDDEN;
void jsval_release(jsval_t) DECLSPEC_HIDDEN; void jsval_release(jsval_t) DECLSPEC_HIDDEN;
HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN;
#endif #endif /* JSVAL_H */

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

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once
/* /*
* Code in this file is based on files: * Code in this file is based on files:
* js/src/jsregexp.h * js/src/jsregexp.h