mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 15:34:13 +00:00
Sync to Wine-20050628:
Dmitry Timoshkov <dmitry@codeweavers.com> - Make remaining OLE interface vtables const. Mike McCormack <mike@codeweavers.com> - Stub implementation for GetSoftwareUpdateInfo. - Declare functions and correct prototypes. Maarten Lankhorst <m.b.lankhorst@gmail.com> - Improved ObtainUserAgentString stub. Stefan Huehner <stefan@huehner.org> - Fix some more -Wstrict-prototypes warnings. svn path=/trunk/; revision=17079
This commit is contained in:
Gé van Geldorp
parent
bb1f81a0fc
commit
ccf9cf1d90
|
|
@ -2221,6 +2221,22 @@ void __RPC_STUB IInternetZoneManager_CopyTemplatePoliciesToZone_Stub(
|
|||
|
||||
#endif /* __IInternetZoneManager_INTERFACE_DEFINED__ */
|
||||
|
||||
typedef struct _tagSOFTDISTINFO {
|
||||
ULONG cbSize;
|
||||
DWORD dwFlags;
|
||||
DWORD dwAdState;
|
||||
LPWSTR szTitle;
|
||||
LPWSTR szAbstract;
|
||||
LPWSTR szHREF;
|
||||
DWORD dwInstalledVersionMS;
|
||||
DWORD dwInstalledVersionLS;
|
||||
DWORD dwUpdateVersionMS;
|
||||
DWORD dwUpdateVersionLS;
|
||||
DWORD dwAdvertisedVersionMS;
|
||||
DWORD dwAdvertisedVersionLS;
|
||||
DWORD dwReserved;
|
||||
} SOFTDISTINFO, *LPSOFTDISTINFO;
|
||||
|
||||
DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);
|
||||
DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4);
|
||||
DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
|
|||
*/
|
||||
typedef struct SecManagerImpl{
|
||||
|
||||
IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/
|
||||
const IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/
|
||||
|
||||
ULONG ref; /* reference counter for this object */
|
||||
|
||||
|
|
@ -174,7 +174,7 @@ static HRESULT WINAPI SecManagerImpl_GetZoneMappings(IInternetSecurityManager *i
|
|||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static IInternetSecurityManagerVtbl VT_SecManagerImpl =
|
||||
static const IInternetSecurityManagerVtbl VT_SecManagerImpl =
|
||||
{
|
||||
SecManagerImpl_QueryInterface,
|
||||
SecManagerImpl_AddRef,
|
||||
|
|
@ -209,7 +209,7 @@ HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
|
|||
*
|
||||
*/
|
||||
typedef struct {
|
||||
IInternetZoneManagerVtbl* lpVtbl;
|
||||
const IInternetZoneManagerVtbl* lpVtbl;
|
||||
ULONG ref;
|
||||
} ZoneMgrImpl;
|
||||
|
||||
|
|
@ -430,7 +430,7 @@ static HRESULT WINAPI ZoneMgrImpl_CopyTemplatePoliciesToZone(IInternetZoneManage
|
|||
/********************************************************************
|
||||
* IInternetZoneManager_Construct
|
||||
*/
|
||||
static IInternetZoneManagerVtbl ZoneMgrImplVtbl = {
|
||||
static const IInternetZoneManagerVtbl ZoneMgrImplVtbl = {
|
||||
ZoneMgrImpl_QueryInterface,
|
||||
ZoneMgrImpl_AddRef,
|
||||
ZoneMgrImpl_Release,
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ static const WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e',
|
|||
/*static BOOL registered_wndclass = FALSE;*/
|
||||
|
||||
typedef struct {
|
||||
IBindingVtbl *lpVtbl;
|
||||
const IBindingVtbl *lpVtbl;
|
||||
|
||||
ULONG ref;
|
||||
|
||||
|
|
@ -273,7 +273,7 @@ static void Binding_FinishedDownload(Binding *This, HRESULT hr)
|
|||
This->pbscb = 0;
|
||||
}
|
||||
|
||||
static IBindingVtbl BindingVtbl =
|
||||
static const IBindingVtbl BindingVtbl =
|
||||
{
|
||||
Binding_QueryInterface,
|
||||
Binding_AddRef,
|
||||
|
|
@ -289,7 +289,7 @@ static IBindingVtbl BindingVtbl =
|
|||
/* filemoniker data structure */
|
||||
typedef struct {
|
||||
|
||||
IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/
|
||||
const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/
|
||||
|
||||
ULONG ref; /* reference counter for this object */
|
||||
|
||||
|
|
@ -1103,7 +1103,7 @@ static HRESULT WINAPI URLMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdM
|
|||
/********************************************************************************/
|
||||
/* Virtual function table for the URLMonikerImpl class which include IPersist,*/
|
||||
/* IPersistStream and IMoniker functions. */
|
||||
static IMonikerVtbl VT_URLMonikerImpl =
|
||||
static const IMonikerVtbl VT_URLMonikerImpl =
|
||||
{
|
||||
URLMonikerImpl_QueryInterface,
|
||||
URLMonikerImpl_AddRef,
|
||||
|
|
@ -1735,3 +1735,12 @@ HRESULT WINAPI HlinkNavigateString( IUnknown *pUnk, LPCWSTR szTarget )
|
|||
return HlinkSimpleNavigateToString(
|
||||
szTarget, NULL, NULL, pUnk, NULL, NULL, 0, 0 );
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* GetSoftwareUpdateInfo (URLMON.@)
|
||||
*/
|
||||
HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi )
|
||||
{
|
||||
FIXME("%s %p\n", debugstr_w(szDistUnit), psdi );
|
||||
return E_FAIL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
@ stub GetClassURL
|
||||
@ stub GetComponentIDFromCLSSPEC
|
||||
@ stub GetMarkOfTheWeb
|
||||
@ stub GetSoftwareUpdateInfo
|
||||
@ stdcall GetSoftwareUpdateInfo(ptr ptr)
|
||||
@ stub HlinkGoBack
|
||||
@ stub HlinkGoForward
|
||||
@ stub HlinkNavigateMoniker
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ static HRESULT WINAPI CF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static IClassFactoryVtbl CF_Vtbl =
|
||||
static const IClassFactoryVtbl CF_Vtbl =
|
||||
{
|
||||
CF_QueryInterface,
|
||||
CF_AddRef,
|
||||
|
|
@ -250,7 +250,7 @@ HRESULT WINAPI URLMON_DllRegisterServerEx(void)
|
|||
/**************************************************************************
|
||||
* UrlMkSetSessionOption (URLMON.@)
|
||||
*/
|
||||
HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBufferLength,
|
||||
HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength,
|
||||
DWORD Reserved)
|
||||
{
|
||||
FIXME("(%#lx, %p, %#lx): stub\n", dwOption, pBuffer, dwBufferLength);
|
||||
|
|
@ -261,7 +261,7 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBu
|
|||
/**************************************************************************
|
||||
* UrlMkGetSessionOption (URLMON.@)
|
||||
*/
|
||||
HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBufferLength,
|
||||
HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength,
|
||||
DWORD* pdwBufferLength, DWORD dwReserved)
|
||||
{
|
||||
FIXME("(%#lx, %p, %#lx, %p): stub\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength);
|
||||
|
|
@ -269,10 +269,12 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBu
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static const CHAR Agent[] = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)";
|
||||
|
||||
/**************************************************************************
|
||||
* ObtainUserAgentString (URLMON.@)
|
||||
*/
|
||||
HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPCSTR pcszUAOut, DWORD *cbSize)
|
||||
HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize)
|
||||
{
|
||||
FIXME("(%ld, %p, %p): stub\n", dwOption, pcszUAOut, cbSize);
|
||||
|
||||
|
|
@ -280,6 +282,10 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPCSTR pcszUAOut, DWORD *cb
|
|||
ERR("dwOption: %ld, must be zero\n", dwOption);
|
||||
}
|
||||
|
||||
if (sizeof(Agent) < *cbSize)
|
||||
*cbSize = sizeof(Agent);
|
||||
lstrcpynA(pcszUAOut, Agent, *cbSize);
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
|
|||
* Dll lifetime tracking declaration for urlmon.dll
|
||||
*/
|
||||
extern LONG URLMON_refCount;
|
||||
static inline void URLMON_LockModule() { InterlockedIncrement( &URLMON_refCount ); }
|
||||
static inline void URLMON_UnlockModule() { InterlockedDecrement( &URLMON_refCount ); }
|
||||
static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); }
|
||||
static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); }
|
||||
|
||||
#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue