Sync to Wine-20050419:

Mike McCormack <mike@codeweavers.com>
- Add stub for FaultInIEFeature.

svn path=/trunk/; revision=15023
This commit is contained in:
Gé van Geldorp 2005-05-05 21:07:02 +00:00
parent fe7b55c2c1
commit ee1685bd2e
3 changed files with 44 additions and 1 deletions

View file

@ -33,7 +33,7 @@
@ stdcall -private DllRegisterServerEx() URLMON_DllRegisterServerEx @ stdcall -private DllRegisterServerEx() URLMON_DllRegisterServerEx
@ stdcall -private DllUnregisterServer() URLMON_DllUnregisterServer @ stdcall -private DllUnregisterServer() URLMON_DllUnregisterServer
@ stdcall Extract(long ptr) cabinet.Extract @ stdcall Extract(long ptr) cabinet.Extract
@ stub FaultInIEFeature @ stdcall FaultInIEFeature(long ptr ptr long)
@ stub FindMediaType @ stub FindMediaType
@ stub FindMediaTypeClass @ stub FindMediaTypeClass
@ stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) @ stdcall FindMimeFromData(long ptr ptr long ptr long ptr long)

View file

@ -329,3 +329,15 @@ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved)
return S_OK; return S_OK;
} }
/**************************************************************************
* FaultInIEFeature (URLMON.@)
*
* Undocumented. Appears to be used by native shdocvw.dll.
*/
HRESULT WINAPI FaultInIEFeature( HWND hwnd, uCLSSPEC * pClassSpec,
QUERYCONTEXT *pQuery, DWORD flags )
{
FIXME("%p %p %p %08lx\n", hwnd, pClassSpec, pQuery, flags);
return E_NOTIMPL;
}

View file

@ -160,6 +160,37 @@ typedef struct tagDEC {
}; };
} DECIMAL; } DECIMAL;
typedef void *HMETAFILEPICT; typedef void *HMETAFILEPICT;
typedef struct tagCSPLATFORM {
DWORD dwPlatformId;
DWORD dwVersionHi;
DWORD dwVersionLo;
DWORD dwProcessorArch;
} CSPLATFORM;
typedef struct tagQUERYCONTEXT {
DWORD dwContext;
CSPLATFORM Platform;
LCID Locale;
DWORD dwVersionHi;
DWORD dwVersionLo;
} QUERYCONTEXT;
typedef struct {
DWORD tyspec;
union {
CLSID clsid;
LPOLESTR pFileExt;
LPOLESTR pMimeType;
LPOLESTR pProgId;
LPOLESTR pFileName;
struct {
LPOLESTR pPackageName;
GUID PolicyId;
} ByName;
struct {
GUID ObjectId;
GUID PolicyId;
} ByObjectId;
} tagged_union;
} uCLSSPEC;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif