From 1a541c9ebb424fe53c9509df52ec1cbd3ce0bac3 Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sun, 26 Sep 2004 10:43:00 +0000 Subject: [PATCH] enable PCH svn path=/trunk/; revision=11065 --- reactos/lib/shellext/slayer/.cvsignore | 3 +- reactos/lib/shellext/slayer/Makefile | 5 ++- reactos/lib/shellext/slayer/precomp.h | 15 +++++++++ reactos/lib/shellext/slayer/slayer.c | 44 ++++++++++++++++++-------- reactos/lib/shellext/slayer/slayer.h | 28 ---------------- 5 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 reactos/lib/shellext/slayer/precomp.h diff --git a/reactos/lib/shellext/slayer/.cvsignore b/reactos/lib/shellext/slayer/.cvsignore index ee6046a948c..ee4ee86551f 100644 --- a/reactos/lib/shellext/slayer/.cvsignore +++ b/reactos/lib/shellext/slayer/.cvsignore @@ -1,5 +1,6 @@ *.coff -*.cpl +*.dll +*.gch *.d *.a *.o diff --git a/reactos/lib/shellext/slayer/Makefile b/reactos/lib/shellext/slayer/Makefile index 5f26a89328a..ddace5aeb45 100644 --- a/reactos/lib/shellext/slayer/Makefile +++ b/reactos/lib/shellext/slayer/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 2004/09/26 09:56:23 weiden Exp $ +# $Id: Makefile,v 1.2 2004/09/26 10:43:00 weiden Exp $ PATH_TO_TOP = ../../.. @@ -11,7 +11,6 @@ TARGET_INSTALLDIR = system32 TARGET_BASE = 0x5C7E0000 TARGET_CFLAGS = \ - -I./include \ -DUNICODE \ -D_UNICODE \ -D__REACTOS__ \ @@ -27,7 +26,7 @@ TARGET_SDKLIBS = kernel32.a advapi32.a user32.a gdi32.a wine_uuid.a ole32.a \ TARGET_GCCLIBS = gcc -TARGET_PCH = +TARGET_PCH = precomp.h TARGET_CLEAN = diff --git a/reactos/lib/shellext/slayer/precomp.h b/reactos/lib/shellext/slayer/precomp.h new file mode 100644 index 00000000000..a145d3ab639 --- /dev/null +++ b/reactos/lib/shellext/slayer/precomp.h @@ -0,0 +1,15 @@ +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#define INITGUID +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "resource.h" +#include "slayer.h" + +/* EOF */ diff --git a/reactos/lib/shellext/slayer/slayer.c b/reactos/lib/shellext/slayer/slayer.c index 1a8a885780a..bbba2f09b1d 100644 --- a/reactos/lib/shellext/slayer/slayer.c +++ b/reactos/lib/shellext/slayer/slayer.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: slayer.c,v 1.1 2004/09/26 09:56:23 weiden Exp $ +/* $Id: slayer.c,v 1.2 2004/09/26 10:43:00 weiden Exp $ * * PROJECT: ReactOS Compatibility Layer Shell Extension * FILE: lib/shellext/cplsample/cplsample.c @@ -25,19 +25,7 @@ * UPDATE HISTORY: * 09/25/2004 Created */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ -#define INITGUID -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "resource.h" -#include "slayer.h" +#include "precomp.h" HINSTANCE hInstance = NULL; LONG dllrefs = 0; @@ -46,6 +34,34 @@ LONG dllrefs = 0; DEFINE_SHLGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); DEFINE_SHLGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); +static ifaceICompatibilityPageVbtl efvt = +{ + /* IUnknown methods */ + ICompatibilityPage_fnQueryInterface, + ICompatibilityPage_fnAddRef, + ICompatibilityPage_fnRelease, +}; + +static ifaceIShellPropSheetExtVbtl efvtIShellPropSheetExt = +{ + /* IShellPropSheetExt */ + ICompatibilityPage_fnAddPages, + ICompatibilityPage_fnReplacePage, +}; + +static ifaceIShellExtInitVbtl efvtIShellExtInit = +{ + /* IShellExtInit */ + ICompatibilityPage_fnInitialize, +}; + +static ifaceIClassFactoryVbtl efvtIClassFactory = +{ + /* IClassFactory */ + ICompatibilityPage_fnCreateInstance, + ICompatibilityPage_fnLockServer, +}; + /****************************************************************************** ICompatibilityPage ******************************************************************************/ diff --git a/reactos/lib/shellext/slayer/slayer.h b/reactos/lib/shellext/slayer/slayer.h index 6a141fe98e2..fcb61f00e7d 100644 --- a/reactos/lib/shellext/slayer/slayer.h +++ b/reactos/lib/shellext/slayer/slayer.h @@ -121,34 +121,6 @@ HRESULT STDMETHODCALLTYPE ICompatibilityPage_fnLockServer(LPCOMPATIBILITYPAGE th BOOL fLock); -static ifaceICompatibilityPageVbtl efvt = -{ - /* IUnknown methods */ - ICompatibilityPage_fnQueryInterface, - ICompatibilityPage_fnAddRef, - ICompatibilityPage_fnRelease, -}; - -static ifaceIShellPropSheetExtVbtl efvtIShellPropSheetExt = -{ - /* IShellPropSheetExt */ - ICompatibilityPage_fnAddPages, - ICompatibilityPage_fnReplacePage, -}; - -static ifaceIShellExtInitVbtl efvtIShellExtInit = -{ - /* IShellExtInit */ - ICompatibilityPage_fnInitialize, -}; - -static ifaceIClassFactoryVbtl efvtIClassFactory = -{ - /* IClassFactory */ - ICompatibilityPage_fnCreateInstance, - ICompatibilityPage_fnLockServer, -}; - #endif /* __SLAYER_H */ /* EOF */