From 6a1354653ceaa6138a9a2cc73325365599c3cc93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9=20van=20Geldorp?= Date: Fri, 5 Aug 2005 08:02:09 +0000 Subject: [PATCH] Sync to Wine-20050628: Marcus Meissner - Move static variables out of header file, also the local interface implementations. Dmitry Timoshkov - Make remaining OLE interface vtables const. cjacek - Fix typo in comment about Wine registry key. Alexandre Julliard - Moved a few registry keys from HKLM\Software\Wine to HKCU\Software\Wine for consistency. - Added magic comments to all Wine-specific registry accesses to make them easier to grep. - Sort entry points in the same order as Windows. Stefan Huehner - Fix more -Wstrict-prototypes warnings. svn path=/trunk/; revision=17061 --- reactos/lib/shdocvw/classinfo.c | 4 +- reactos/lib/shdocvw/events.c | 7 +- reactos/lib/shdocvw/factory.c | 2 +- reactos/lib/shdocvw/misc.c | 2 +- reactos/lib/shdocvw/oleobject.c | 34 +++- reactos/lib/shdocvw/persist.c | 4 +- reactos/lib/shdocvw/shdocvw.h | 53 ++---- reactos/lib/shdocvw/shdocvw.spec | 258 ++++++++++++++--------------- reactos/lib/shdocvw/shdocvw_main.c | 11 +- reactos/lib/shdocvw/webbrowser.c | 2 +- 10 files changed, 187 insertions(+), 190 deletions(-) diff --git a/reactos/lib/shdocvw/classinfo.c b/reactos/lib/shdocvw/classinfo.c index 13c954e1617..9a15dae40c1 100644 --- a/reactos/lib/shdocvw/classinfo.c +++ b/reactos/lib/shdocvw/classinfo.c @@ -72,7 +72,7 @@ static HRESULT WINAPI WBPCI_GetClassInfo(LPPROVIDECLASSINFO iface, LPTYPEINFO *p * IProvideClassInfo virtual function table for IE Web Browser component */ -static IProvideClassInfoVtbl WBPCI_Vtbl = +static const IProvideClassInfoVtbl WBPCI_Vtbl = { WBPCI_QueryInterface, WBPCI_AddRef, @@ -154,7 +154,7 @@ static HRESULT WINAPI WBPCI2_GetGUID(LPPROVIDECLASSINFO2 iface, * IProvideClassInfo virtual function table for IE Web Browser component */ -static IProvideClassInfo2Vtbl WBPCI2_Vtbl = +static const IProvideClassInfo2Vtbl WBPCI2_Vtbl = { WBPCI2_QueryInterface, WBPCI2_AddRef, diff --git a/reactos/lib/shdocvw/events.c b/reactos/lib/shdocvw/events.c index 96ef64bb34d..7dd26561cb8 100644 --- a/reactos/lib/shdocvw/events.c +++ b/reactos/lib/shdocvw/events.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static IConnectionPointImpl SHDOCVW_ConnectionPoint; static const GUID IID_INotifyDBEvents = { 0xdb526cc0, 0xd188, 0x11cd, { 0xad, 0x48, 0x00, 0xaa, 0x00, 0x3c, 0x9c, 0xb6 } }; @@ -101,7 +102,7 @@ static HRESULT WINAPI WBCPC_FindConnectionPoint(LPCONNECTIONPOINTCONTAINER iface * IConnectionPointContainer virtual function table for IE Web Browser component */ -static IConnectionPointContainerVtbl WBCPC_Vtbl = +static const IConnectionPointContainerVtbl WBCPC_Vtbl = { WBCPC_QueryInterface, WBCPC_AddRef, @@ -193,7 +194,7 @@ static HRESULT WINAPI WBCP_EnumConnections(LPCONNECTIONPOINT iface, * IConnectionPoint virtual function table for IE Web Browser component */ -static IConnectionPointVtbl WBCP_Vtbl = +static const IConnectionPointVtbl WBCP_Vtbl = { WBCP_QueryInterface, WBCP_AddRef, @@ -205,4 +206,4 @@ static IConnectionPointVtbl WBCP_Vtbl = WBCP_EnumConnections }; -IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl}; +static IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl}; diff --git a/reactos/lib/shdocvw/factory.c b/reactos/lib/shdocvw/factory.c index afdf63f665f..44f48ff13a1 100644 --- a/reactos/lib/shdocvw/factory.c +++ b/reactos/lib/shdocvw/factory.c @@ -105,7 +105,7 @@ static HRESULT WINAPI WBCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) return S_OK; } -static IClassFactoryVtbl WBCF_Vtbl = +static const IClassFactoryVtbl WBCF_Vtbl = { WBCF_QueryInterface, WBCF_AddRef, diff --git a/reactos/lib/shdocvw/misc.c b/reactos/lib/shdocvw/misc.c index 398a466c7de..1a4e23c44d1 100644 --- a/reactos/lib/shdocvw/misc.c +++ b/reactos/lib/shdocvw/misc.c @@ -78,7 +78,7 @@ static HRESULT WINAPI WBQA_GetContentExtent(LPQUICKACTIVATE iface, LPSIZEL pSize * IQuickActivate virtual function table for IE Web Browser component */ -static IQuickActivateVtbl WBQA_Vtbl = +static const IQuickActivateVtbl WBQA_Vtbl = { WBQA_QueryInterface, WBQA_AddRef, diff --git a/reactos/lib/shdocvw/oleobject.c b/reactos/lib/shdocvw/oleobject.c index 8845b5ce277..824b7cad24c 100644 --- a/reactos/lib/shdocvw/oleobject.c +++ b/reactos/lib/shdocvw/oleobject.c @@ -29,6 +29,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +/********************************************************************** + * IOleControl declaration for SHDOCVW.DLL + */ +typedef struct +{ + /* IUnknown fields */ + const IOleControlVtbl *lpVtbl; + DWORD ref; +} IOleControlImpl; + +static IOleControlImpl SHDOCVW_OleControl; + +/********************************************************************** + * IOleInPlaceObject declaration for SHDOCVW.DLL + */ +typedef struct +{ + /* IUnknown fields */ + const IOleInPlaceObjectVtbl *lpVtbl; + DWORD ref; +} IOleInPlaceObjectImpl; + +static IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject; + /********************************************************************** * Implement the IOleObject interface for the web browser component * @@ -407,7 +431,7 @@ static HRESULT WINAPI WBOOBJ_SetColorScheme(LPOLEOBJECT iface, * IOleObject virtual function table for IE Web Browser component */ -static IOleObjectVtbl WBOOBJ_Vtbl = +static const IOleObjectVtbl WBOOBJ_Vtbl = { WBOOBJ_QueryInterface, WBOOBJ_AddRef, @@ -522,7 +546,7 @@ static HRESULT WINAPI WBOIPO_ReactivateAndUndo(LPOLEINPLACEOBJECT iface) * IOleInPlaceObject virtual function table for IE Web Browser component */ -static IOleInPlaceObjectVtbl WBOIPO_Vtbl = +static const IOleInPlaceObjectVtbl WBOIPO_Vtbl = { WBOIPO_QueryInterface, WBOIPO_AddRef, @@ -535,7 +559,7 @@ static IOleInPlaceObjectVtbl WBOIPO_Vtbl = WBOIPO_ReactivateAndUndo }; -IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject = {&WBOIPO_Vtbl}; +static IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject = {&WBOIPO_Vtbl}; /********************************************************************** @@ -594,7 +618,7 @@ static HRESULT WINAPI WBOC_FreezeEvents(LPOLECONTROL iface, BOOL bFreeze) * IOleControl virtual function table for IE Web Browser component */ -static IOleControlVtbl WBOC_Vtbl = +static const IOleControlVtbl WBOC_Vtbl = { WBOC_QueryInterface, WBOC_AddRef, @@ -605,4 +629,4 @@ static IOleControlVtbl WBOC_Vtbl = WBOC_FreezeEvents }; -IOleControlImpl SHDOCVW_OleControl = {&WBOC_Vtbl}; +static IOleControlImpl SHDOCVW_OleControl = {&WBOC_Vtbl}; diff --git a/reactos/lib/shdocvw/persist.c b/reactos/lib/shdocvw/persist.c index c07a914aed0..178efdee964 100644 --- a/reactos/lib/shdocvw/persist.c +++ b/reactos/lib/shdocvw/persist.c @@ -92,7 +92,7 @@ static HRESULT WINAPI WBPS_SaveCompleted(LPPERSISTSTORAGE iface, LPSTORAGE pStgN * IPersistStorage virtual function table for IE Web Browser component */ -static IPersistStorageVtbl WBPS_Vtbl = +static const IPersistStorageVtbl WBPS_Vtbl = { WBPS_QueryInterface, WBPS_AddRef, @@ -178,7 +178,7 @@ static HRESULT WINAPI WBPSI_InitNew(LPPERSISTSTREAMINIT iface) * IPersistStreamInit virtual function table for IE Web Browser component */ -static IPersistStreamInitVtbl WBPSI_Vtbl = +static const IPersistStreamInitVtbl WBPSI_Vtbl = { WBPSI_QueryInterface, WBPSI_AddRef, diff --git a/reactos/lib/shdocvw/shdocvw.h b/reactos/lib/shdocvw/shdocvw.h index 0c8ff470d43..cde58012bf1 100644 --- a/reactos/lib/shdocvw/shdocvw.h +++ b/reactos/lib/shdocvw/shdocvw.h @@ -41,7 +41,7 @@ typedef struct { /* IUnknown fields */ - IClassFactoryVtbl *lpVtbl; + const IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; @@ -54,46 +54,19 @@ extern IClassFactoryImpl SHDOCVW_ClassFactory; typedef struct { /* IUnknown fields */ - IOleObjectVtbl *lpVtbl; + const IOleObjectVtbl *lpVtbl; DWORD ref; } IOleObjectImpl; extern IOleObjectImpl SHDOCVW_OleObject; - -/********************************************************************** - * IOleInPlaceObject declaration for SHDOCVW.DLL - */ -typedef struct -{ - /* IUnknown fields */ - IOleInPlaceObjectVtbl *lpVtbl; - DWORD ref; -} IOleInPlaceObjectImpl; - -extern IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject; - - -/********************************************************************** - * IOleControl declaration for SHDOCVW.DLL - */ -typedef struct -{ - /* IUnknown fields */ - IOleControlVtbl *lpVtbl; - DWORD ref; -} IOleControlImpl; - -extern IOleControlImpl SHDOCVW_OleControl; - - /********************************************************************** * IWebBrowser declaration for SHDOCVW.DLL */ typedef struct { /* IUnknown fields */ - IWebBrowserVtbl *lpVtbl; + const IWebBrowserVtbl *lpVtbl; DWORD ref; } IWebBrowserImpl; @@ -106,7 +79,7 @@ extern IWebBrowserImpl SHDOCVW_WebBrowser; typedef struct { /* IUnknown fields */ - IProvideClassInfoVtbl *lpVtbl; + const IProvideClassInfoVtbl *lpVtbl; DWORD ref; } IProvideClassInfoImpl; @@ -119,7 +92,7 @@ extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo; typedef struct { /* IUnknown fields */ - IProvideClassInfo2Vtbl *lpVtbl; + const IProvideClassInfo2Vtbl *lpVtbl; DWORD ref; } IProvideClassInfo2Impl; @@ -132,7 +105,7 @@ extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2; typedef struct { /* IUnknown fields */ - IPersistStorageVtbl *lpVtbl; + const IPersistStorageVtbl *lpVtbl; DWORD ref; } IPersistStorageImpl; @@ -145,7 +118,7 @@ extern IPersistStorageImpl SHDOCVW_PersistStorage; typedef struct { /* IUnknown fields */ - IPersistStreamInitVtbl *lpVtbl; + const IPersistStreamInitVtbl *lpVtbl; DWORD ref; } IPersistStreamInitImpl; @@ -158,7 +131,7 @@ extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit; typedef struct { /* IUnknown fields */ - IQuickActivateVtbl *lpVtbl; + const IQuickActivateVtbl *lpVtbl; DWORD ref; } IQuickActivateImpl; @@ -171,7 +144,7 @@ extern IQuickActivateImpl SHDOCVW_QuickActivate; typedef struct { /* IUnknown fields */ - IConnectionPointContainerVtbl *lpVtbl; + const IConnectionPointContainerVtbl *lpVtbl; DWORD ref; } IConnectionPointContainerImpl; @@ -184,17 +157,15 @@ extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer; typedef struct { /* IUnknown fields */ - IConnectionPointVtbl *lpVtbl; + const IConnectionPointVtbl *lpVtbl; DWORD ref; } IConnectionPointImpl; -extern IConnectionPointImpl SHDOCVW_ConnectionPoint; - /********************************************************************** * Dll lifetime tracking declaration for shdocvw.dll */ extern LONG SHDOCVW_refCount; -static inline void SHDOCVW_LockModule() { InterlockedIncrement( &SHDOCVW_refCount ); } -static inline void SHDOCVW_UnlockModule() { InterlockedDecrement( &SHDOCVW_refCount ); } +static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } +static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } #endif /* __WINE_SHDOCVW_H */ diff --git a/reactos/lib/shdocvw/shdocvw.spec b/reactos/lib/shdocvw/shdocvw.spec index 0ad28c319d6..9092f05670d 100644 --- a/reactos/lib/shdocvw/shdocvw.spec +++ b/reactos/lib/shdocvw/shdocvw.spec @@ -1,129 +1,129 @@ -# ordinal exports -101 stub -noname IEWinMain -102 stub -noname CreateShortcutInDirA -103 stub -noname CreateShortcutInDirW -104 stub -noname WhichPlatformFORWARD -105 stub -noname CreateShortcutInDirEx -106 stub HlinkFindFrame -107 stub SetShellOfflineState -108 stub AddUrlToFavorites -110 stdcall -noname WinList_Init() -111 stub -noname WinList_Terminate -115 stub -noname CreateFromDesktop -116 stub -noname DDECreatePostNotify -117 stub -noname DDEHandleViewFolderNotify -@ stub IEAboutBox -118 stdcall -noname ShellDDEInit(long) -119 stub -noname SHCreateDesktop -120 stub -noname SHDesktopMessageLoop -121 stub -noname StopWatchModeFORWARD -122 stub -noname StopWatchFlushFORWARD -123 stub -noname StopWatchFORWARD -125 stdcall -noname RunInstallUninstallStubs() -130 stub -noname RunInstallUninstallStubs2 -131 stub -noname SHCreateSplashScreen -135 stub -noname IsFileUrl -136 stub -noname IsFileUrlW -137 stub -noname PathIsFilePath -138 stub -noname URLSubLoadString -139 stub -noname OpenPidlOrderStream -140 stub -noname DragDrop -141 stub -noname IEInvalidateImageList -142 stub -noname IEMapPIDLToSystemImageListIndex -143 stub -noname ILIsWeb -145 stub -noname IEGetAttributesOf -146 stub -noname IEBindToObject -147 stub -noname IEGetNameAndFlags -148 stub -noname IEGetDisplayName -149 stub -noname IEBindToObjectEx -150 stub -noname _GetStdLocation -151 stub -noname URLSubRegQueryA -152 stub -noname CShellUIHelper_CreateInstance2 -153 stub -noname IsURLChild -158 stub -noname SHRestricted2A -159 stub -noname SHRestricted2W -160 stub -noname SHIsRestricted2W -161 stub @ # CSearchAssistantOC::OnDraw -162 stub -noname CDDEAuto_Navigate -163 stub SHAddSubscribeFavorite -164 stub -noname ResetProfileSharing -165 stub -noname URLSubstitution -167 stub -noname IsIEDefaultBrowser -169 stub -noname ParseURLFromOutsideSourceA -170 stub -noname ParseURLFromOutsideSourceW -171 stub -noname _DeletePidlDPA -172 stub -noname IURLQualify -173 stub -noname SHIsRestricted -174 stub -noname SHIsGlobalOffline -175 stub -noname DetectAndFixAssociations -176 stub -noname EnsureWebViewRegSettings -177 stub -noname WinList_NotifyNewLocation -178 stub -noname WinList_FindFolderWindow -179 stub -noname WinList_GetShellWindows -180 stub -noname WinList_RegisterPending -181 stub -noname WinList_Revoke -183 stub -noname SHMapNbspToSp -185 stub -noname FireEvent_Quit -187 stub -noname SHDGetPageLocation -188 stub -noname SHIEErrorMsgBox -189 stub -noname IEGetDisplayName -190 stub -noname SHRunIndirectRegClientCommandForward -191 stub -noname SHIsRegisteredClient -192 stub -noname SHGetHistoryPIDL -194 stub -noname IECleanUpAutomationObject -195 stub -noname IEOnFirstBrowserCreation -196 stub -noname IEDDE_WindowDestroyed -197 stub -noname IEDDE_NewWindow -198 stub -noname IsErrorUrl -199 stub @ -200 stub -noname SHGetViewStream -203 stub -noname NavToUrlUsingIEA -204 stub -noname NavToUrlUsingIEW -208 stub -noname SearchForElementInHead -209 stub -noname JITCoCreateInstance -210 stub -noname UrlHitsNetW -211 stub -noname ClearAutoSuggestForForms -212 stub -noname GetLinkInfo -213 stub -noname UseCustomInternetSearch -214 stub -noname GetSearchAssistantUrlW -215 stub -noname GetSearchAssistantUrlA -216 stub -noname GetDefaultInternetSearchUrlW -217 stub -noname GetDefaultInternetSearchUrlA -218 stub -noname IEParseDisplayNameWithBCW -219 stub -noname IEILIsEqual -220 stub @ -221 stub -noname IECreateFromPathCPWithBCA -222 stub -noname IECreateFromPathCPWithBCW -223 stub -noname ResetWebSettings -224 stub -noname IsResetWebSettingsRequired -225 stub -noname PrepareURLForDisplayUTF8W -226 stub -noname IEIsLinkSafe -227 stub -noname SHUseClassicToolbarGlyphs -228 stub -noname SafeOpenPromptForShellExec -229 stub -noname SafeOpenPromptForPackager - -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(long long ptr) -@ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() -@ stub DllRegisterWindowClasses -@ stub DoAddToFavDlg -@ stub DoAddToFavDlgW -@ stub DoFileDownload -@ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW -@ stub DoPrivacyDlg -@ stub HlinkFrameNavigate -@ stub HlinkFrameNavigateNHL -@ stub ImportPrivacySettings -@ stub InstallReg_RunDLL -@ stub IEWriteErrorLog -@ stdcall OpenURL(long long str long) -@ stub SHGetIDispatchForFolder -@ stdcall SetQueryNetSessionCount(long) -@ stub SoftwareUpdateMessageBox -@ stub URLQualifyA -@ stub URLQualifyW +# ordinal exports +101 stub -noname IEWinMain +102 stub -noname CreateShortcutInDirA +103 stub -noname CreateShortcutInDirW +104 stub -noname WhichPlatformFORWARD +105 stub -noname CreateShortcutInDirEx +106 stub HlinkFindFrame +107 stub SetShellOfflineState +108 stub AddUrlToFavorites +110 stdcall -noname WinList_Init() +111 stub -noname WinList_Terminate +115 stub -noname CreateFromDesktop +116 stub -noname DDECreatePostNotify +117 stub -noname DDEHandleViewFolderNotify +118 stdcall -noname ShellDDEInit(long) +119 stub -noname SHCreateDesktop +120 stub -noname SHDesktopMessageLoop +121 stub -noname StopWatchModeFORWARD +122 stub -noname StopWatchFlushFORWARD +123 stub -noname StopWatchFORWARD +125 stdcall -noname RunInstallUninstallStubs() +130 stub -noname RunInstallUninstallStubs2 +131 stub -noname SHCreateSplashScreen +135 stub -noname IsFileUrl +136 stub -noname IsFileUrlW +137 stub -noname PathIsFilePath +138 stub -noname URLSubLoadString +139 stub -noname OpenPidlOrderStream +140 stub -noname DragDrop +141 stub -noname IEInvalidateImageList +142 stub -noname IEMapPIDLToSystemImageListIndex +143 stub -noname ILIsWeb +145 stub -noname IEGetAttributesOf +146 stub -noname IEBindToObject +147 stub -noname IEGetNameAndFlags +148 stub -noname IEGetDisplayName +149 stub -noname IEBindToObjectEx +150 stub -noname _GetStdLocation +151 stub -noname URLSubRegQueryA +152 stub -noname CShellUIHelper_CreateInstance2 +153 stub -noname IsURLChild +158 stub -noname SHRestricted2A +159 stub -noname SHRestricted2W +160 stub -noname SHIsRestricted2W +161 stub @ # CSearchAssistantOC::OnDraw +162 stub -noname CDDEAuto_Navigate +163 stub SHAddSubscribeFavorite +164 stub -noname ResetProfileSharing +165 stub -noname URLSubstitution +167 stub -noname IsIEDefaultBrowser +169 stub -noname ParseURLFromOutsideSourceA +170 stub -noname ParseURLFromOutsideSourceW +171 stub -noname _DeletePidlDPA +172 stub -noname IURLQualify +173 stub -noname SHIsRestricted +174 stub -noname SHIsGlobalOffline +175 stub -noname DetectAndFixAssociations +176 stub -noname EnsureWebViewRegSettings +177 stub -noname WinList_NotifyNewLocation +178 stub -noname WinList_FindFolderWindow +179 stub -noname WinList_GetShellWindows +180 stub -noname WinList_RegisterPending +181 stub -noname WinList_Revoke +183 stub -noname SHMapNbspToSp +185 stub -noname FireEvent_Quit +187 stub -noname SHDGetPageLocation +188 stub -noname SHIEErrorMsgBox +189 stub -noname IEGetDisplayName +190 stub -noname SHRunIndirectRegClientCommandForward +191 stub -noname SHIsRegisteredClient +192 stub -noname SHGetHistoryPIDL +194 stub -noname IECleanUpAutomationObject +195 stub -noname IEOnFirstBrowserCreation +196 stub -noname IEDDE_WindowDestroyed +197 stub -noname IEDDE_NewWindow +198 stub -noname IsErrorUrl +199 stub @ +200 stub -noname SHGetViewStream +203 stub -noname NavToUrlUsingIEA +204 stub -noname NavToUrlUsingIEW +208 stub -noname SearchForElementInHead +209 stub -noname JITCoCreateInstance +210 stub -noname UrlHitsNetW +211 stub -noname ClearAutoSuggestForForms +212 stub -noname GetLinkInfo +213 stub -noname UseCustomInternetSearch +214 stub -noname GetSearchAssistantUrlW +215 stub -noname GetSearchAssistantUrlA +216 stub -noname GetDefaultInternetSearchUrlW +217 stub -noname GetDefaultInternetSearchUrlA +218 stub -noname IEParseDisplayNameWithBCW +219 stub -noname IEILIsEqual +220 stub @ +221 stub -noname IECreateFromPathCPWithBCA +222 stub -noname IECreateFromPathCPWithBCW +223 stub -noname ResetWebSettings +224 stub -noname IsResetWebSettingsRequired +225 stub -noname PrepareURLForDisplayUTF8W +226 stub -noname IEIsLinkSafe +227 stub -noname SHUseClassicToolbarGlyphs +228 stub -noname SafeOpenPromptForShellExec +229 stub -noname SafeOpenPromptForPackager + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(long long ptr) +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stub DllRegisterWindowClasses +@ stdcall -private DllUnregisterServer() +@ stub DoAddToFavDlg +@ stub DoAddToFavDlgW +@ stub DoFileDownload +@ stub DoFileDownloadEx +@ stub DoOrganizeFavDlg +@ stub DoOrganizeFavDlgW +@ stub DoPrivacyDlg +@ stub HlinkFrameNavigate +@ stub HlinkFrameNavigateNHL +@ stub IEAboutBox +@ stub IEWriteErrorLog +@ stub ImportPrivacySettings +@ stub InstallReg_RunDLL +@ stdcall OpenURL(long long str long) +@ stub SHGetIDispatchForFolder +@ stdcall SetQueryNetSessionCount(long) +@ stub SoftwareUpdateMessageBox +@ stub URLQualifyA +@ stub URLQualifyW diff --git a/reactos/lib/shdocvw/shdocvw_main.c b/reactos/lib/shdocvw/shdocvw_main.c index 03c4470e354..1b7dd45759f 100644 --- a/reactos/lib/shdocvw/shdocvw_main.c +++ b/reactos/lib/shdocvw/shdocvw_main.c @@ -151,7 +151,7 @@ HRESULT WINAPI DllCanUnloadNow(void) * SHDOCVW_TryDownloadMozillaControl */ typedef struct _IBindStatusCallbackImpl { - IBindStatusCallbackVtbl *vtbl; + const IBindStatusCallbackVtbl *vtbl; DWORD ref; HWND hDialog; BOOL *pbCancelled; @@ -275,7 +275,7 @@ dlOnObjectAvailable( IBindStatusCallback* iface, REFIID riid, IUnknown* punk) return S_OK; } -struct IBindStatusCallbackVtbl dlVtbl = +static const IBindStatusCallbackVtbl dlVtbl = { dlQueryInterface, dlAddRef, @@ -318,7 +318,8 @@ static DWORD WINAPI ThreadFunc( LPVOID info ) /* find the name of the thing to download */ szUrl[0] = 0; - r = RegOpenKeyW( HKEY_LOCAL_MACHINE, szMozDlPath, &hkey ); + /* @@ Wine registry key: HKCU\Software\Wine\shdocvw */ + r = RegOpenKeyW( HKEY_CURRENT_USER, szMozDlPath, &hkey ); if( r == ERROR_SUCCESS ) { sz = MAX_PATH; @@ -387,7 +388,7 @@ dlProc ( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } } -static BOOL SHDOCVW_TryDownloadMozillaControl() +static BOOL SHDOCVW_TryDownloadMozillaControl(void) { DWORD r; WCHAR buf[0x100]; @@ -413,7 +414,7 @@ static BOOL SHDOCVW_TryDownloadMozillaControl() return TRUE; } -static BOOL SHDOCVW_TryLoadMozillaControl() +static BOOL SHDOCVW_TryLoadMozillaControl(void) { WCHAR szPath[MAX_PATH]; BOOL bTried = FALSE; diff --git a/reactos/lib/shdocvw/webbrowser.c b/reactos/lib/shdocvw/webbrowser.c index bcc8d84efd4..d750f10359a 100644 --- a/reactos/lib/shdocvw/webbrowser.c +++ b/reactos/lib/shdocvw/webbrowser.c @@ -239,7 +239,7 @@ static HRESULT WINAPI WB_get_Busy(IWebBrowser *iface, VARIANT_BOOL *pBool) * IWebBrowser virtual function table for IE Web Browser component */ -static IWebBrowserVtbl WB_Vtbl = +static const IWebBrowserVtbl WB_Vtbl = { WB_QueryInterface, WB_AddRef, -- 2.17.1