Author: akhaldi Date: Fri Dec 27 11:14:56 2013 New Revision: 61442
URL: http://svn.reactos.org/svn/reactos?rev=61442&view=rev Log: [SCRRUN] * 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. * Improve the GUIDs situation. CORE-7716
Added: trunk/reactos/dll/win32/scrrun/guid.c (with props) Modified: trunk/reactos/dll/win32/scrrun/CMakeLists.txt trunk/reactos/dll/win32/scrrun/dictionary.c trunk/reactos/dll/win32/scrrun/filesystem.c trunk/reactos/dll/win32/scrrun/scrrun.c trunk/reactos/dll/win32/scrrun/scrrun_private.h
Modified: trunk/reactos/dll/win32/scrrun/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/scrrun/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/CMakeLists.txt [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -10,6 +10,7 @@ dictionary.c filesystem.c scrrun.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def)
Modified: trunk/reactos/dll/win32/scrrun/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/dictionary... ============================================================================== --- trunk/reactos/dll/win32/scrrun/dictionary.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/dictionary.c [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -15,21 +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 */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "dispex.h" -#include "scrrun.h" + #include "scrrun_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
typedef struct {
Modified: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesystem... ============================================================================== --- trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -16,25 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COBJMACROS - -#include "config.h" -#include <stdarg.h> -#include <limits.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "olectl.h" -#include "dispex.h" -#include "ntsecapi.h" -#include "scrrun.h" #include "scrrun_private.h"
-#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +#include <winver.h> +#include <olectl.h> +#include <ntsecapi.h>
struct folder { IFolder IFolder_iface;
Added: trunk/reactos/dll/win32/scrrun/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/guid.c?rev... ============================================================================== --- trunk/reactos/dll/win32/scrrun/guid.c (added) +++ trunk/reactos/dll/win32/scrrun/guid.c [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -0,0 +1,15 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <scrrun.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Propchange: trunk/reactos/dll/win32/scrrun/guid.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/scrrun/scrrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.c?r... ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -15,23 +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 */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "rpcproxy.h" - -#include <initguid.h> -#include "scrrun.h" + #include "scrrun_private.h"
-#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +#include <rpcproxy.h>
static HINSTANCE scrrun_instance;
Modified: trunk/reactos/dll/win32/scrrun/scrrun_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_pri... ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -18,6 +18,28 @@
#ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ + +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <oleauto.h> +#include <dispex.h> +#include <scrrun.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;