Sync to Wine-20050419: Mike McCormack mike@codeweavers.com - Add stub for FaultInIEFeature. Modified: trunk/reactos/lib/urlmon/urlmon.spec Modified: trunk/reactos/lib/urlmon/urlmon_main.c Modified: trunk/reactos/w32api/include/wtypes.h _____
Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2005-05-05 20:52:14 UTC (rev 15022) +++ trunk/reactos/lib/urlmon/urlmon.spec 2005-05-05 21:07:02 UTC (rev 15023) @@ -33,7 +33,7 @@
@ stdcall -private DllRegisterServerEx() URLMON_DllRegisterServerEx @ stdcall -private DllUnregisterServer() URLMON_DllUnregisterServer @ stdcall Extract(long ptr) cabinet.Extract -@ stub FaultInIEFeature +@ stdcall FaultInIEFeature(long ptr ptr long) @ stub FindMediaType @ stub FindMediaTypeClass @ stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) _____
Modified: trunk/reactos/lib/urlmon/urlmon_main.c --- trunk/reactos/lib/urlmon/urlmon_main.c 2005-05-05 20:52:14 UTC (rev 15022) +++ trunk/reactos/lib/urlmon/urlmon_main.c 2005-05-05 21:07:02 UTC (rev 15023) @@ -329,3 +329,15 @@
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; +} _____
Modified: trunk/reactos/w32api/include/wtypes.h --- trunk/reactos/w32api/include/wtypes.h 2005-05-05 20:52:14 UTC (rev 15022) +++ trunk/reactos/w32api/include/wtypes.h 2005-05-05 21:07:02 UTC (rev 15023) @@ -160,6 +160,37 @@
}; } DECIMAL; 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 } #endif