Sync to Wine-20050628: Marcus Meissner marcus@jet.franken.de - Move static variables out of header file, also the local interface implementations. Dmitry Timoshkov dmitry@codeweavers.com - Make remaining OLE interface vtables const. cjacek cjacek@gmail.com - Fix typo in comment about Wine registry key. Alexandre Julliard julliard@winehq.org - 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 stefan@huehner.org - Fix more -Wstrict-prototypes warnings. Modified: trunk/reactos/lib/shdocvw/classinfo.c Modified: trunk/reactos/lib/shdocvw/events.c Modified: trunk/reactos/lib/shdocvw/factory.c Modified: trunk/reactos/lib/shdocvw/misc.c Modified: trunk/reactos/lib/shdocvw/oleobject.c Modified: trunk/reactos/lib/shdocvw/persist.c Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw.spec Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c Modified: trunk/reactos/lib/shdocvw/webbrowser.c _____
Modified: trunk/reactos/lib/shdocvw/classinfo.c --- trunk/reactos/lib/shdocvw/classinfo.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/classinfo.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -72,7 +72,7 @@
* 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 @@ * IProvideClassInfo virtual function table for IE Web Browser component */
-static IProvideClassInfo2Vtbl WBPCI2_Vtbl = +static const IProvideClassInfo2Vtbl WBPCI2_Vtbl = { WBPCI2_QueryInterface, WBPCI2_AddRef, _____
Modified: trunk/reactos/lib/shdocvw/events.c --- trunk/reactos/lib/shdocvw/events.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/events.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -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 @@ * 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 @@ * 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 @@ WBCP_EnumConnections };
-IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl}; +static IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl}; _____
Modified: trunk/reactos/lib/shdocvw/factory.c --- trunk/reactos/lib/shdocvw/factory.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/factory.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -105,7 +105,7 @@
return S_OK; }
-static IClassFactoryVtbl WBCF_Vtbl = +static const IClassFactoryVtbl WBCF_Vtbl = { WBCF_QueryInterface, WBCF_AddRef, _____
Modified: trunk/reactos/lib/shdocvw/misc.c --- trunk/reactos/lib/shdocvw/misc.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/misc.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -78,7 +78,7 @@
* IQuickActivate virtual function table for IE Web Browser component */
-static IQuickActivateVtbl WBQA_Vtbl = +static const IQuickActivateVtbl WBQA_Vtbl = { WBQA_QueryInterface, WBQA_AddRef, _____
Modified: trunk/reactos/lib/shdocvw/oleobject.c --- trunk/reactos/lib/shdocvw/oleobject.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/oleobject.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -30,6 +30,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 * * Based on DefaultHandler code in dlls/ole32/defaulthandler.c. @@ -407,7 +431,7 @@ * 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 @@ * 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 @@ WBOIPO_ReactivateAndUndo };
-IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject = {&WBOIPO_Vtbl}; +static IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject = {&WBOIPO_Vtbl};
/********************************************************************** @@ -594,7 +618,7 @@ * 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 @@ WBOC_FreezeEvents };
-IOleControlImpl SHDOCVW_OleControl = {&WBOC_Vtbl}; +static IOleControlImpl SHDOCVW_OleControl = {&WBOC_Vtbl}; _____
Modified: trunk/reactos/lib/shdocvw/persist.c --- trunk/reactos/lib/shdocvw/persist.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/persist.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -92,7 +92,7 @@
* 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 @@ * IPersistStreamInit virtual function table for IE Web Browser component */
-static IPersistStreamInitVtbl WBPSI_Vtbl = +static const IPersistStreamInitVtbl WBPSI_Vtbl = { WBPSI_QueryInterface, WBPSI_AddRef, _____
Modified: trunk/reactos/lib/shdocvw/shdocvw.h --- trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-05 08:02:09 UTC (rev 17061) @@ -41,7 +41,7 @@
typedef struct { /* IUnknown fields */ - IClassFactoryVtbl *lpVtbl; + const IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl;
@@ -54,46 +54,19 @@ 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 @@ typedef struct { /* IUnknown fields */ - IProvideClassInfoVtbl *lpVtbl; + const IProvideClassInfoVtbl *lpVtbl; DWORD ref; } IProvideClassInfoImpl;
@@ -119,7 +92,7 @@ typedef struct { /* IUnknown fields */ - IProvideClassInfo2Vtbl *lpVtbl; + const IProvideClassInfo2Vtbl *lpVtbl; DWORD ref; } IProvideClassInfo2Impl;
@@ -132,7 +105,7 @@ typedef struct { /* IUnknown fields */ - IPersistStorageVtbl *lpVtbl; + const IPersistStorageVtbl *lpVtbl; DWORD ref; } IPersistStorageImpl;
@@ -145,7 +118,7 @@ typedef struct { /* IUnknown fields */ - IPersistStreamInitVtbl *lpVtbl; + const IPersistStreamInitVtbl *lpVtbl; DWORD ref; } IPersistStreamInitImpl;
@@ -158,7 +131,7 @@ typedef struct { /* IUnknown fields */ - IQuickActivateVtbl *lpVtbl; + const IQuickActivateVtbl *lpVtbl; DWORD ref; } IQuickActivateImpl;
@@ -171,7 +144,7 @@ typedef struct { /* IUnknown fields */ - IConnectionPointContainerVtbl *lpVtbl; + const IConnectionPointContainerVtbl *lpVtbl; DWORD ref; } IConnectionPointContainerImpl;
@@ -184,17 +157,15 @@ 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 */ _____
Modified: trunk/reactos/lib/shdocvw/shdocvw.spec --- trunk/reactos/lib/shdocvw/shdocvw.spec 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/shdocvw.spec 2005-08-05 08:02:09 UTC (rev 17061) @@ -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 Property changes on: trunk/reactos/lib/shdocvw/shdocvw.spec ___________________________________________________________________ Name: svn:eol-style + native _____
Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -151,7 +151,7 @@
* SHDOCVW_TryDownloadMozillaControl */ typedef struct _IBindStatusCallbackImpl { - IBindStatusCallbackVtbl *vtbl; + const IBindStatusCallbackVtbl *vtbl; DWORD ref; HWND hDialog; BOOL *pbCancelled; @@ -275,7 +275,7 @@ return S_OK; }
-struct IBindStatusCallbackVtbl dlVtbl = +static const IBindStatusCallbackVtbl dlVtbl = { dlQueryInterface, dlAddRef, @@ -318,7 +318,8 @@
/* 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 @@ } }
-static BOOL SHDOCVW_TryDownloadMozillaControl() +static BOOL SHDOCVW_TryDownloadMozillaControl(void) { DWORD r; WCHAR buf[0x100]; @@ -413,7 +414,7 @@ return TRUE; }
-static BOOL SHDOCVW_TryLoadMozillaControl() +static BOOL SHDOCVW_TryLoadMozillaControl(void) { WCHAR szPath[MAX_PATH]; BOOL bTried = FALSE; _____
Modified: trunk/reactos/lib/shdocvw/webbrowser.c --- trunk/reactos/lib/shdocvw/webbrowser.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/webbrowser.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -239,7 +239,7 @@
* IWebBrowser virtual function table for IE Web Browser component */
-static IWebBrowserVtbl WB_Vtbl = +static const IWebBrowserVtbl WB_Vtbl = { WB_QueryInterface, WB_AddRef,