[akhaldi] 61771: [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

Author: akhaldi
Date: Thu Jan 23 17:45:05 2014
New Revision: 61771

URL: http://svn.reactos.org/svn/reactos?rev=61771&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/jscript/activex.c
    trunk/reactos/dll/win32/jscript/engine.h
    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/jsstr.h
    trunk/reactos/dll/win32/jscript/jsval.h
    trunk/reactos/dll/win32/jscript/regexp.h

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] Thu Jan 23 17:45:05 2014
@@ -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 */

Modified: trunk/reactos/dll/win32/jscript/engine.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h?...
==============================================================================
--- trunk/reactos/dll/win32/jscript/engine.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/engine.h	[iso-8859-1] Thu Jan 23 17:45:05 2014
@@ -15,6 +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
  */
+
+#pragma once

typedef struct _source_elements_t source_elements_t;
 typedef struct _expression_t expression_t;

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] Thu Jan 23 17:45:05 2014
@@ -17,8 +17,6 @@
  */

#include "jscript.h"
-
-#include <objsafe.h>

#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] Thu Jan 23 17:45:05 2014
@@ -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/debug.h>
+#include <wine/list.h>
 #include <wine/unicode.h>
-#include <wine/list.h>
-
-#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(jscript);

#include "resource.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] Thu Jan 23 17:45:05 2014
@@ -18,13 +18,11 @@

#include "jscript.h"

+#include <rpcproxy.h>
 #include <initguid.h>
-#include <rpcproxy.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;

Modified: trunk/reactos/dll/win32/jscript/jsstr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsstr.h?r...
==============================================================================
--- trunk/reactos/dll/win32/jscript/jsstr.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/jsstr.h	[iso-8859-1] Thu Jan 23 17:45:05 2014
@@ -33,6 +33,9 @@
  *
  * In the future more layouts and transformations may be added.
  */
+
+#pragma once
+
 struct _jsstr_t {
     unsigned length_flags;
     unsigned ref;

Modified: trunk/reactos/dll/win32/jscript/jsval.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsval.h?r...
==============================================================================
--- trunk/reactos/dll/win32/jscript/jsval.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/jsval.h	[iso-8859-1] Thu Jan 23 17:45:05 2014
@@ -246,4 +246,4 @@
 void jsval_release(jsval_t) DECLSPEC_HIDDEN;
 HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN;

-#endif
+#endif /* JSVAL_H */

Modified: trunk/reactos/dll/win32/jscript/regexp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.h?...
==============================================================================
--- trunk/reactos/dll/win32/jscript/regexp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/regexp.h	[iso-8859-1] Thu Jan 23 17:45:05 2014
@@ -15,6 +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
  */
+
+#pragma once

/*
  * Code in this file is based on files: