Synchronize with trunk revision 59636 (just before Alex's CreateProcess revamp).

[reactos.git] / dll / win32 / netshell / precomp.h

diff --git a/dll/win32/netshell/precomp.h b/dll/win32/netshell/precomp.h
index fa75e02..44bb11d 100644 (file)
--- a/dll/win32/netshell/precomp.h
+++ b/dll/win32/netshell/precomp.h
@@ -1,46 +1,34 @@
 #ifndef _PRECOMP_H__
 #define _PRECOMP_H__
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
-#include <malloc.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
+#include <stdio.h>
+#include <windef.h>
+#include <winreg.h>
+#include <winbase.h>
+#include <winnls.h>
 #include <winsock2.h>
-#include <windows.h>
-
-#include <shlguid.h>
 #include <shlwapi.h>
 #include <shlobj.h>
-#include <shldisp.h>
-#include <cpl.h>
-#include <objbase.h>
-#include <ole2.h>
-#include <ocidl.h>
-#include <shobjidl.h>
 #include <shellapi.h>
 #include <olectl.h>
 #include <iphlpapi.h>
-#include <shtypes.h>
 #include <setupapi.h>
 #include <devguid.h>
 #include <netcon.h>
-#include <docobj.h>
 #include <netcfgx.h>
 #include <netcfgn.h>
-#include <prsht.h>
+#include <wine/debug.h>
 
-
-#include "wine/debug.h"
-#include "wine/unicode.h"
 #include "resource.h"
 
+#if defined(_MSC_VER) && _MSC_VER < 1700
+#define final sealed
+#endif
+
 #define NCF_VIRTUAL                     0x1
 #define NCF_SOFTWARE_ENUMERATED         0x2
 #define NCF_PHYSICAL                    0x4
@@ -59,17 +47,11 @@ typedef struct {
     int cxChar;
 } shvheader;
 
-typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
-typedef struct {
-    REFIID riid;
-    LPFNCREATEINSTANCE lpfnCI;
-} INTERFACE_TABLE;
-
 typedef struct tagVALUEStruct
 {
     BYTE dummy;
     INetConnection * pItem;
-}VALUEStruct;
+} VALUEStruct;
 
 /* globals */
 extern HINSTANCE netshell_hInstance;
@@ -78,33 +60,33 @@ extern const GUID CLSID_LANConnectUI;
 extern const GUID CLSID_LanConnectStatusUI;
 extern const GUID GUID_DEVCLASS_NET;
 
-
 /* shfldr_netconnect.c */
 HRESULT ShowNetConnectionProperties(INetConnection * pNetConnect, HWND hwnd);
-HRESULT WINAPI ISF_NetConnect_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
+HRESULT WINAPI ISF_NetConnect_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
 
 /* enumlist.c */
-IEnumIDList * IEnumIDList_Constructor(void);
-LPITEMIDLIST _ILCreateNetConnect();
-LPITEMIDLIST ILCreateNetConnectItem(INetConnection * pItem);
-BOOL _ILIsNetConnect (LPCITEMIDLIST pidl);
-BOOL AddToEnumList(IEnumIDList * iface, LPITEMIDLIST pidl);
+LPITEMIDLIST _ILCreateNetConnect(void);
+LPITEMIDLIST ILCreateNetConnectItem(INetConnection *pItem);
+BOOL _ILIsNetConnect(LPCITEMIDLIST pidl);
+//BOOL AddToEnumList(IEnumIDList *iface, LPITEMIDLIST pidl);
 VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl);
 
 /* classfactory.c */
-IClassFactory * IClassFactory_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst);
+HRESULT IClassFactory_fnConstructor(REFCLSID rclsid, REFIID riid, LPVOID *ppvOut);
 
 /* connectmanager.c */
-HRESULT WINAPI INetConnectionManager_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
+HRESULT WINAPI INetConnectionManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv);
 BOOL GetAdapterIndexFromNetCfgInstanceId(PIP_ADAPTER_INFO pAdapterInfo, LPWSTR szNetCfg, PDWORD pIndex);
 
 /* lanconnectui.c */
 HPROPSHEETPAGE InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle);
-HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
+HRESULT WINAPI LanConnectUI_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv);
 
 /* lanstatusui.c */
-HRESULT WINAPI LanConnectStatusUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
+HRESULT WINAPI LanConnectStatusUI_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv);
 
 #define NCCF_NOTIFY_DISCONNECTED 0x100000
 
+#include "enumlist.h"
+
 #endif