mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 22:47:28 +00:00
[ITSS] Sync with Wine Staging 3.9. CORE-14656
This commit is contained in:
parent
1656f44ad3
commit
e64b032987
|
@ -105,20 +105,31 @@ static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter,
|
static HRESULT WINAPI ITSSCF_CreateInstance(IClassFactory *iface, IUnknown *outer,
|
||||||
REFIID riid, LPVOID *ppobj)
|
REFIID riid, void **ppv)
|
||||||
{
|
{
|
||||||
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
||||||
|
IUnknown *unk;
|
||||||
HRESULT hres;
|
HRESULT hres;
|
||||||
LPUNKNOWN punk;
|
|
||||||
|
|
||||||
TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj);
|
TRACE("(%p)->(%p %s %p)\n", This, outer, debugstr_guid(riid), ppv);
|
||||||
|
|
||||||
*ppobj = NULL;
|
if(outer && !IsEqualGUID(riid, &IID_IUnknown)) {
|
||||||
hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk);
|
*ppv = NULL;
|
||||||
if (SUCCEEDED(hres)) {
|
return CLASS_E_NOAGGREGATION;
|
||||||
hres = IUnknown_QueryInterface(punk, riid, ppobj);
|
}
|
||||||
IUnknown_Release(punk);
|
|
||||||
|
hres = This->pfnCreateInstance(outer, (void**)&unk);
|
||||||
|
if(FAILED(hres)) {
|
||||||
|
*ppv = NULL;
|
||||||
|
return hres;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!IsEqualGUID(riid, &IID_IUnknown)) {
|
||||||
|
hres = IUnknown_QueryInterface(unk, riid, ppv);
|
||||||
|
IUnknown_Release(unk);
|
||||||
|
}else {
|
||||||
|
*ppv = unk;
|
||||||
}
|
}
|
||||||
return hres;
|
return hres;
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,16 +36,23 @@
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(itss);
|
WINE_DEFAULT_DEBUG_CHANNEL(itss);
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
IUnknown IUnknown_inner;
|
||||||
IInternetProtocol IInternetProtocol_iface;
|
IInternetProtocol IInternetProtocol_iface;
|
||||||
IInternetProtocolInfo IInternetProtocolInfo_iface;
|
IInternetProtocolInfo IInternetProtocolInfo_iface;
|
||||||
|
|
||||||
LONG ref;
|
LONG ref;
|
||||||
|
IUnknown *outer;
|
||||||
|
|
||||||
ULONG offset;
|
ULONG offset;
|
||||||
struct chmFile *chm_file;
|
struct chmFile *chm_file;
|
||||||
struct chmUnitInfo chm_object;
|
struct chmUnitInfo chm_object;
|
||||||
} ITSProtocol;
|
} ITSProtocol;
|
||||||
|
|
||||||
|
static inline ITSProtocol *impl_from_IUnknown(IUnknown *iface)
|
||||||
|
{
|
||||||
|
return CONTAINING_RECORD(iface, ITSProtocol, IUnknown_inner);
|
||||||
|
}
|
||||||
|
|
||||||
static inline ITSProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface)
|
static inline ITSProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface)
|
||||||
{
|
{
|
||||||
return CONTAINING_RECORD(iface, ITSProtocol, IInternetProtocol_iface);
|
return CONTAINING_RECORD(iface, ITSProtocol, IInternetProtocol_iface);
|
||||||
|
@ -65,14 +72,13 @@ static void release_chm(ITSProtocol *This)
|
||||||
This->offset = 0;
|
This->offset = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv)
|
static HRESULT WINAPI ITSProtocol_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
|
||||||
{
|
{
|
||||||
ITSProtocol *This = impl_from_IInternetProtocol(iface);
|
ITSProtocol *This = impl_from_IUnknown(iface);
|
||||||
|
|
||||||
*ppv = NULL;
|
|
||||||
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
if(IsEqualGUID(&IID_IUnknown, riid)) {
|
||||||
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
|
||||||
*ppv = &This->IInternetProtocol_iface;
|
*ppv = &This->IUnknown_inner;
|
||||||
}else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
|
}else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
|
||||||
TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
|
TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
|
||||||
*ppv = &This->IInternetProtocol_iface;
|
*ppv = &This->IInternetProtocol_iface;
|
||||||
|
@ -82,28 +88,27 @@ static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFII
|
||||||
}else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) {
|
}else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) {
|
||||||
TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv);
|
TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv);
|
||||||
*ppv = &This->IInternetProtocolInfo_iface;
|
*ppv = &This->IInternetProtocolInfo_iface;
|
||||||
}
|
}else {
|
||||||
|
*ppv = NULL;
|
||||||
if(*ppv) {
|
|
||||||
IInternetProtocol_AddRef(iface);
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
WARN("not supported interface %s\n", debugstr_guid(riid));
|
WARN("not supported interface %s\n", debugstr_guid(riid));
|
||||||
return E_NOINTERFACE;
|
return E_NOINTERFACE;
|
||||||
|
}
|
||||||
|
|
||||||
|
IUnknown_AddRef((IUnknown*)*ppv);
|
||||||
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI ITSProtocol_AddRef(IInternetProtocol *iface)
|
static ULONG WINAPI ITSProtocol_AddRef(IUnknown *iface)
|
||||||
{
|
{
|
||||||
ITSProtocol *This = impl_from_IInternetProtocol(iface);
|
ITSProtocol *This = impl_from_IUnknown(iface);
|
||||||
LONG ref = InterlockedIncrement(&This->ref);
|
LONG ref = InterlockedIncrement(&This->ref);
|
||||||
TRACE("(%p) ref=%d\n", This, ref);
|
TRACE("(%p) ref=%d\n", This, ref);
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface)
|
static ULONG WINAPI ITSProtocol_Release(IUnknown *iface)
|
||||||
{
|
{
|
||||||
ITSProtocol *This = impl_from_IInternetProtocol(iface);
|
ITSProtocol *This = impl_from_IUnknown(iface);
|
||||||
LONG ref = InterlockedDecrement(&This->ref);
|
LONG ref = InterlockedDecrement(&This->ref);
|
||||||
|
|
||||||
TRACE("(%p) ref=%d\n", This, ref);
|
TRACE("(%p) ref=%d\n", This, ref);
|
||||||
|
@ -118,6 +123,30 @@ static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface)
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const IUnknownVtbl ITSProtocolUnkVtbl = {
|
||||||
|
ITSProtocol_QueryInterface,
|
||||||
|
ITSProtocol_AddRef,
|
||||||
|
ITSProtocol_Release
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT WINAPI ITSInternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv)
|
||||||
|
{
|
||||||
|
ITSProtocol *This = impl_from_IInternetProtocol(iface);
|
||||||
|
return IUnknown_QueryInterface(This->outer, riid, ppv);
|
||||||
|
}
|
||||||
|
|
||||||
|
static ULONG WINAPI ITSInternetProtocol_AddRef(IInternetProtocol *iface)
|
||||||
|
{
|
||||||
|
ITSProtocol *This = impl_from_IInternetProtocol(iface);
|
||||||
|
return IUnknown_AddRef(This->outer);
|
||||||
|
}
|
||||||
|
|
||||||
|
static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface)
|
||||||
|
{
|
||||||
|
ITSProtocol *This = impl_from_IInternetProtocol(iface);
|
||||||
|
return IUnknown_Release(This->outer);
|
||||||
|
}
|
||||||
|
|
||||||
static LPCWSTR skip_schema(LPCWSTR url)
|
static LPCWSTR skip_schema(LPCWSTR url)
|
||||||
{
|
{
|
||||||
static const WCHAR its_schema[] = {'i','t','s',':'};
|
static const WCHAR its_schema[] = {'i','t','s',':'};
|
||||||
|
@ -387,9 +416,9 @@ static HRESULT WINAPI ITSProtocol_UnlockRequest(IInternetProtocol *iface)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const IInternetProtocolVtbl ITSProtocolVtbl = {
|
static const IInternetProtocolVtbl ITSProtocolVtbl = {
|
||||||
ITSProtocol_QueryInterface,
|
ITSInternetProtocol_QueryInterface,
|
||||||
ITSProtocol_AddRef,
|
ITSInternetProtocol_AddRef,
|
||||||
ITSProtocol_Release,
|
ITSInternetProtocol_Release,
|
||||||
ITSProtocol_Start,
|
ITSProtocol_Start,
|
||||||
ITSProtocol_Continue,
|
ITSProtocol_Continue,
|
||||||
ITSProtocol_Abort,
|
ITSProtocol_Abort,
|
||||||
|
@ -520,21 +549,24 @@ static const IInternetProtocolInfoVtbl ITSProtocolInfoVtbl = {
|
||||||
ITSProtocolInfo_QueryInfo
|
ITSProtocolInfo_QueryInfo
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj)
|
HRESULT ITSProtocol_create(IUnknown *outer, void **ppv)
|
||||||
{
|
{
|
||||||
ITSProtocol *ret;
|
ITSProtocol *ret;
|
||||||
|
|
||||||
TRACE("(%p %p)\n", pUnkOuter, ppobj);
|
TRACE("(%p %p)\n", outer, ppv);
|
||||||
|
|
||||||
ITSS_LockModule();
|
ITSS_LockModule();
|
||||||
|
|
||||||
ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITSProtocol));
|
ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITSProtocol));
|
||||||
|
if(!ret)
|
||||||
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
ret->IUnknown_inner.lpVtbl = &ITSProtocolUnkVtbl;
|
||||||
ret->IInternetProtocol_iface.lpVtbl = &ITSProtocolVtbl;
|
ret->IInternetProtocol_iface.lpVtbl = &ITSProtocolVtbl;
|
||||||
ret->IInternetProtocolInfo_iface.lpVtbl = &ITSProtocolInfoVtbl;
|
ret->IInternetProtocolInfo_iface.lpVtbl = &ITSProtocolInfoVtbl;
|
||||||
ret->ref = 1;
|
ret->ref = 1;
|
||||||
|
ret->outer = outer ? outer : &ret->IUnknown_inner;
|
||||||
|
|
||||||
*ppobj = &ret->IInternetProtocol_iface;
|
*ppv = &ret->IUnknown_inner;
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,7 @@ reactos/dll/win32/initpki # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/inseng # Synced to WineStaging-3.3
|
reactos/dll/win32/inseng # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/iphlpapi # Out of sync
|
reactos/dll/win32/iphlpapi # Out of sync
|
||||||
reactos/dll/win32/itircl # Synced to WineStaging-3.3
|
reactos/dll/win32/itircl # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/itss # Synced to WineStaging-3.3
|
reactos/dll/win32/itss # Synced to WineStaging-3.9
|
||||||
reactos/dll/win32/jscript # Synced to WineStaging-3.3
|
reactos/dll/win32/jscript # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/jsproxy # Synced to WineStaging-3.3
|
reactos/dll/win32/jsproxy # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/loadperf # Synced to WineStaging-3.3
|
reactos/dll/win32/loadperf # Synced to WineStaging-3.3
|
||||||
|
|
Loading…
Reference in a new issue