[JSCRIPT]

* 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

diff --git a/reactos/dll/win32/jscript/activex.c b/reactos/dll/win32/jscript/activex.c
index 30d7869..0bdf80e 100644 (file)
--- a/reactos/dll/win32/jscript/activex.c
+++ b/reactos/dll/win32/jscript/activex.c
@@ -18,7 +18,6 @@
 
 #include "jscript.h"
 
-#include <objsafe.h>
 #include <mshtmhst.h>
 
 /* Defined as extern in urlmon.idl, but not exported by uuid.lib */

diff --git a/reactos/dll/win32/jscript/engine.h b/reactos/dll/win32/jscript/engine.h
index 618c6f0..cb135bd 100644 (file)
--- a/reactos/dll/win32/jscript/engine.h
+++ b/reactos/dll/win32/jscript/engine.h
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 typedef struct _source_elements_t source_elements_t;
 typedef struct _expression_t expression_t;
 typedef struct _statement_t statement_t;

diff --git a/reactos/dll/win32/jscript/jscript.c b/reactos/dll/win32/jscript/jscript.c
index dda7051..01639fb 100644 (file)
--- a/reactos/dll/win32/jscript/jscript.c
+++ b/reactos/dll/win32/jscript/jscript.c
@@ -18,8 +18,6 @@
 
 #include "jscript.h"
 
-#include <objsafe.h>
-
 #ifdef _WIN64
 
 #define CTXARG_T DWORDLONG

diff --git a/reactos/dll/win32/jscript/jscript.h b/reactos/dll/win32/jscript/jscript.h
index 4c4e03c..7d29493 100644 (file)
--- a/reactos/dll/win32/jscript/jscript.h
+++ b/reactos/dll/win32/jscript/jscript.h
@@ -20,9 +20,7 @@
 #include <wine/port.h>
 
 #include <assert.h>
-#include <math.h>
 #include <stdarg.h>
-#include <stdio.h>
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
@@ -32,15 +30,16 @@
 
 #include <windef.h>
 #include <winbase.h>
-#include <winuser.h>
-#include <ole2.h>
+#include <objbase.h>
+#include <oleauto.h>
 #include <dispex.h>
 #include <activscp.h>
+#include <objsafe.h>
 
-#include <wine/unicode.h>
+#include <wine/debug.h>
 #include <wine/list.h>
+#include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 #include "resource.h"

diff --git a/reactos/dll/win32/jscript/jscript_main.c b/reactos/dll/win32/jscript/jscript_main.c
index 9cfb2e5..03f1f56 100644 (file)
--- a/reactos/dll/win32/jscript/jscript_main.c
+++ b/reactos/dll/win32/jscript/jscript_main.c
@@ -18,14 +18,12 @@
 
 #include "jscript.h"
 
-#include <initguid.h>
 #include <rpcproxy.h>
+#include <initguid.h>
 #include <jscript_classes.h>
 
 LONG module_ref = 0;
 
-DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
-
 HINSTANCE jscript_hinstance;
 
 static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)

diff --git a/reactos/dll/win32/jscript/jsstr.h b/reactos/dll/win32/jscript/jsstr.h
index 2ad03f1..c30a830 100644 (file)
--- a/reactos/dll/win32/jscript/jsstr.h
+++ b/reactos/dll/win32/jscript/jsstr.h
@@ -33,6 +33,9 @@
  *
  * In the future more layouts and transformations may be added.
  */
+
+#pragma once
+
 struct _jsstr_t {
     unsigned length_flags;
     unsigned ref;

diff --git a/reactos/dll/win32/jscript/jsval.h b/reactos/dll/win32/jscript/jsval.h
index 963f59f..1121425 100644 (file)
--- a/reactos/dll/win32/jscript/jsval.h
+++ b/reactos/dll/win32/jscript/jsval.h
@@ -246,4 +246,4 @@ HRESULT jsval_to_variant(jsval_t,VARIANT*) DECLSPEC_HIDDEN;
 void jsval_release(jsval_t) DECLSPEC_HIDDEN;
 HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* JSVAL_H */

diff --git a/reactos/dll/win32/jscript/regexp.h b/reactos/dll/win32/jscript/regexp.h
index de86aa2..5a13a00 100644 (file)
--- a/reactos/dll/win32/jscript/regexp.h
+++ b/reactos/dll/win32/jscript/regexp.h
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 /*
  * Code in this file is based on files:
  * js/src/jsregexp.h