Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-10 04:14:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SCRRUN]

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.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61442
This commit is contained in:
Amine Khaldi 2013-12-27 11:14:56 +00:00
parent 304f754fbf
commit 07f504790f
6 changed files with 42 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/scrrun/CMakeLists.txt
View file

@ -10,6 +10,7 @@ list(APPEND SOURCE
dictionary.c dictionary.c
filesystem.c filesystem.c
scrrun.c scrrun.c
guid.c
${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/scrrun.def) ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def)

13
reactos/dll/win32/scrrun/dictionary.c
View file

@ -15,22 +15,9 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "scrrun_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
typedef struct typedef struct
{ {
IDictionary IDictionary_iface; IDictionary IDictionary_iface;

20
reactos/dll/win32/scrrun/filesystem.c
View file

@ -16,25 +16,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "scrrun_private.h"
#include "wine/debug.h" #include <winver.h>
#include "wine/unicode.h" #include <olectl.h>
#include <ntsecapi.h>
WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
struct folder { struct folder {
IFolder IFolder_iface; IFolder IFolder_iface;

15
reactos/dll/win32/scrrun/guid.c Normal file
View file

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

15
reactos/dll/win32/scrrun/scrrun.c
View file

@ -15,23 +15,10 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "scrrun_private.h"
#include "wine/debug.h" #include <rpcproxy.h>
WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
static HINSTANCE scrrun_instance; static HINSTANCE scrrun_instance;

22
reactos/dll/win32/scrrun/scrrun_private.h
View file

@ -19,6 +19,28 @@
#ifndef _SCRRUN_PRIVATE_H_ #ifndef _SCRRUN_PRIVATE_H_
#define _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 FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;