ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert broken strict aliasing fix.

This commit is contained in:
Marcus Meissner 2004-05-21 20:52:57 +00:00 committed by Alexandre Julliard
parent 8efa774003
commit e3a37c8a26
13 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/surface.c
View File

@ -269,7 +269,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKE
/** Dirtify Container if needed */ /** Dirtify Container if needed */
if (NULL != This->Container) { if (NULL != This->Container) {
IDirect3DBaseTexture8* cont = NULL; IDirect3DBaseTexture8* cont = NULL;
hr = IUnknown_QueryInterface(This->Container, &IID_IDirect3DBaseTexture8, (void**)(char*) &cont); hr = IUnknown_QueryInterface(This->Container, &IID_IDirect3DBaseTexture8, (void**) &cont);
if (SUCCEEDED(hr) && NULL != cont) { if (SUCCEEDED(hr) && NULL != cont) {
IDirect3DBaseTexture8Impl_SetDirty(cont, TRUE); IDirect3DBaseTexture8Impl_SetDirty(cont, TRUE);

4
dlls/ole32/compobj.c
View File

@ -1015,7 +1015,7 @@ _LocalServerThread(LPVOID param) {
strcpy(pipefn,PIPEPREF); strcpy(pipefn,PIPEPREF);
WINE_StringFromCLSID(&newClass->classIdentifier,pipefn+strlen(PIPEPREF)); WINE_StringFromCLSID(&newClass->classIdentifier,pipefn+strlen(PIPEPREF));
hres = IUnknown_QueryInterface(newClass->classObject,&IID_IClassFactory,(LPVOID*)(char*)&classfac); hres = IUnknown_QueryInterface(newClass->classObject,&IID_IClassFactory,(LPVOID*)&classfac);
if (hres) return hres; if (hres) return hres;
hres = CreateStreamOnHGlobal(0,TRUE,&pStm); hres = CreateStreamOnHGlobal(0,TRUE,&pStm);
@ -1543,7 +1543,7 @@ HRESULT WINAPI CoCreateInstanceEx(
pUnkOuter, pUnkOuter,
dwClsContext, dwClsContext,
&IID_IUnknown, &IID_IUnknown,
(VOID**)(char*)&pUnk); (VOID**)&pUnk);
if (hr) if (hr)
return hr; return hr;

4
dlls/ole32/datacache.c
View File

@ -1085,7 +1085,7 @@ static HRESULT WINAPI DataCache_GetData(
{ {
/* Get the Persist Storage */ /* Get the Persist Storage */
hr = IDataObject_QueryInterface(iface, &IID_IPersistStorage, (void**)(char*)&pPersistStorage); hr = IDataObject_QueryInterface(iface, &IID_IPersistStorage, (void**)&pPersistStorage);
if (hr != S_OK) if (hr != S_OK)
goto cleanup; goto cleanup;
@ -1214,7 +1214,7 @@ static HRESULT WINAPI DataCache_IDataObject_SetData(
TRACE("(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease); TRACE("(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
hres = IDataObject_QueryInterface(iface, &IID_IOleCache2, (void**)(char*)&oleCache); hres = IDataObject_QueryInterface(iface, &IID_IOleCache2, (void**)&oleCache);
if (FAILED(hres)) if (FAILED(hres))
return E_UNEXPECTED; return E_UNEXPECTED;

8
dlls/ole32/defaulthandler.c
View File

@ -1103,7 +1103,7 @@ static HRESULT WINAPI DefaultHandler_GetExtent(
TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel); TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel);
hres = IUnknown_QueryInterface(this->dataCache, &IID_IViewObject2, (void**)(char*)&cacheView); hres = IUnknown_QueryInterface(this->dataCache, &IID_IViewObject2, (void**)&cacheView);
if (FAILED(hres)) if (FAILED(hres))
return E_UNEXPECTED; return E_UNEXPECTED;
@ -1337,7 +1337,7 @@ static HRESULT WINAPI DefaultHandler_GetData(
hres = IUnknown_QueryInterface(this->dataCache, hres = IUnknown_QueryInterface(this->dataCache,
&IID_IDataObject, &IID_IDataObject,
(void**)(char*)&cacheDataObject); (void**)&cacheDataObject);
if (FAILED(hres)) if (FAILED(hres))
return E_UNEXPECTED; return E_UNEXPECTED;
@ -1381,7 +1381,7 @@ static HRESULT WINAPI DefaultHandler_QueryGetData(
hres = IUnknown_QueryInterface(this->dataCache, hres = IUnknown_QueryInterface(this->dataCache,
&IID_IDataObject, &IID_IDataObject,
(void**)(char*)&cacheDataObject); (void**)&cacheDataObject);
if (FAILED(hres)) if (FAILED(hres))
return E_UNEXPECTED; return E_UNEXPECTED;
@ -1434,7 +1434,7 @@ static HRESULT WINAPI DefaultHandler_SetData(
hres = IUnknown_QueryInterface(this->dataCache, hres = IUnknown_QueryInterface(this->dataCache,
&IID_IDataObject, &IID_IDataObject,
(void**)(char*)&cacheDataObject); (void**)&cacheDataObject);
if (FAILED(hres)) if (FAILED(hres))
return E_UNEXPECTED; return E_UNEXPECTED;

6
dlls/ole32/filemoniker.c
View File

@ -587,7 +587,7 @@ HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,
res=GetClassFile(This->filePathName,&clsID); res=GetClassFile(This->filePathName,&clsID);
if (SUCCEEDED(res)){ if (SUCCEEDED(res)){
res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IPersistFile,(void**)(char*)&ppf); res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IPersistFile,(void**)&ppf);
if (SUCCEEDED(res)){ if (SUCCEEDED(res)){
res=IPersistFile_Load(ppf,This->filePathName,STGM_READ); res=IPersistFile_Load(ppf,This->filePathName,STGM_READ);
@ -602,11 +602,11 @@ HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,
} }
} }
else{ else{
res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IClassFactory,(void**)(char*)&pcf); res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IClassFactory,(void**)&pcf);
if (res==E_NOINTERFACE){ if (res==E_NOINTERFACE){
res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IClassActivator,(void**)(char*)&pca); res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IClassActivator,(void**)&pca);
if (res==E_NOINTERFACE) if (res==E_NOINTERFACE)
return MK_E_INTERMEDIATEINTERFACENOTSUPPORTED; return MK_E_INTERMEDIATEINTERFACENOTSUPPORTED;

18
dlls/ole32/ifs.c
View File

@ -144,7 +144,7 @@ static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVO
TRACE("(%s,%p)\n",debugstr_guid(refiid),obj); TRACE("(%s,%p)\n",debugstr_guid(refiid),obj);
if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMalloc,refiid)) { if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMalloc,refiid)) {
*obj = (LPMALLOC)(char*)&Malloc32; *obj = (LPMALLOC)&Malloc32;
return S_OK; return S_OK;
} }
return E_NOINTERFACE; return E_NOINTERFACE;
@ -380,7 +380,7 @@ static HRESULT WINAPI IMallocSpy_fnQueryInterface(LPMALLOCSPY iface,REFIID refii
TRACE("(%s,%p)\n",debugstr_guid(refiid),obj); TRACE("(%s,%p)\n",debugstr_guid(refiid),obj);
if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMallocSpy,refiid)) { if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMallocSpy,refiid)) {
*obj = (LPMALLOC)(char*)&MallocSpy; *obj = (LPMALLOC)&MallocSpy;
return S_OK; return S_OK;
} }
return E_NOINTERFACE; return E_NOINTERFACE;
@ -530,7 +530,7 @@ static ICOM_VTABLE(IMallocSpy) VT_IMallocSpy =
*/ */
HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc) HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc)
{ {
*lpMalloc = (LPMALLOC)(char*)&Malloc32; *lpMalloc = (LPMALLOC)&Malloc32;
return S_OK; return S_OK;
} }
@ -541,14 +541,14 @@ HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc)
*/ */
LPVOID WINAPI CoTaskMemAlloc(ULONG size) LPVOID WINAPI CoTaskMemAlloc(ULONG size)
{ {
return IMalloc_Alloc((LPMALLOC)(char*)&Malloc32,size); return IMalloc_Alloc((LPMALLOC)&Malloc32,size);
} }
/*********************************************************************** /***********************************************************************
* CoTaskMemFree [OLE32.@] * CoTaskMemFree [OLE32.@]
*/ */
VOID WINAPI CoTaskMemFree(LPVOID ptr) VOID WINAPI CoTaskMemFree(LPVOID ptr)
{ {
IMalloc_Free((LPMALLOC)(char*)&Malloc32, ptr); IMalloc_Free((LPMALLOC)&Malloc32, ptr);
} }
/*********************************************************************** /***********************************************************************
@ -558,7 +558,7 @@ VOID WINAPI CoTaskMemFree(LPVOID ptr)
*/ */
LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size)
{ {
return IMalloc_Realloc((LPMALLOC)(char*)&Malloc32, pvOld, size); return IMalloc_Realloc((LPMALLOC)&Malloc32, pvOld, size);
} }
/*********************************************************************** /***********************************************************************
@ -576,13 +576,13 @@ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy)
TRACE("\n"); TRACE("\n");
/* HACK TO ACTIVATE OUT SPY */ /* HACK TO ACTIVATE OUT SPY */
if (pMallocSpy == (LPVOID)-1) pMallocSpy =(IMallocSpy*)(char*)&MallocSpy; if (pMallocSpy == (LPVOID)-1) pMallocSpy =(IMallocSpy*)&MallocSpy;
if(Malloc32.pSpy) return CO_E_OBJISREG; if(Malloc32.pSpy) return CO_E_OBJISREG;
EnterCriticalSection(&IMalloc32_SpyCS); EnterCriticalSection(&IMalloc32_SpyCS);
if (SUCCEEDED(IUnknown_QueryInterface(pMallocSpy, &IID_IMallocSpy, (LPVOID*)(char*)&pSpy))) { if (SUCCEEDED(IUnknown_QueryInterface(pMallocSpy, &IID_IMallocSpy, (LPVOID*)&pSpy))) {
Malloc32.pSpy = pSpy; Malloc32.pSpy = pSpy;
hres = S_OK; hres = S_OK;
} }
@ -607,7 +607,7 @@ HRESULT WINAPI CoRevokeMallocSpy(void)
EnterCriticalSection(&IMalloc32_SpyCS); EnterCriticalSection(&IMalloc32_SpyCS);
/* if it's our spy it's time to dump the leaks */ /* if it's our spy it's time to dump the leaks */
if (Malloc32.pSpy == (IMallocSpy*)(char*)&MallocSpy) { if (Malloc32.pSpy == (IMallocSpy*)&MallocSpy) {
MallocSpyDumpLeaks(); MallocSpyDumpLeaks();
} }

10
dlls/ole32/itemmoniker.c
View File

@ -454,7 +454,7 @@ HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface,
*ppvResult=0; *ppvResult=0;
res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&refid,(void**)(char*)&poic); res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&refid,(void**)&poic);
if (SUCCEEDED(res)){ if (SUCCEEDED(res)){
@ -487,7 +487,7 @@ HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker* iface,
if(pmkToLeft==NULL) if(pmkToLeft==NULL)
return E_INVALIDARG; return E_INVALIDARG;
res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)(char*)&poic); res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic);
if (SUCCEEDED(res)){ if (SUCCEEDED(res)){
@ -715,7 +715,7 @@ HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface,
/* requesting an IOleItemContainer interface pointer. The method then calls IOleItemContainer::IsRunning,*/ /* requesting an IOleItemContainer interface pointer. The method then calls IOleItemContainer::IsRunning,*/
/* passing the string contained within this moniker. */ /* passing the string contained within this moniker. */
res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)(char*)&poic); res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic);
if (SUCCEEDED(res)){ if (SUCCEEDED(res)){
@ -876,11 +876,11 @@ HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,
/* Otherwise, the method calls IMoniker::BindToObject on the pmkToLeft parameter, requesting an */ /* Otherwise, the method calls IMoniker::BindToObject on the pmkToLeft parameter, requesting an */
/* IParseDisplayName interface pointer to the object identified by the moniker, and passes the display */ /* IParseDisplayName interface pointer to the object identified by the moniker, and passes the display */
/* name to IParseDisplayName::ParseDisplayName */ /* name to IParseDisplayName::ParseDisplayName */
res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)(char*)&poic); res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic);
if (SUCCEEDED(res)){ if (SUCCEEDED(res)){
res=IOleItemContainer_GetObject(poic,This->itemName,BINDSPEED_MODERATE,pbc,&IID_IParseDisplayName,(void**)(char*)&ppdn); res=IOleItemContainer_GetObject(poic,This->itemName,BINDSPEED_MODERATE,pbc,&IID_IParseDisplayName,(void**)&ppdn);
res=IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); res=IMoniker_GetDisplayName(iface,pbc,NULL,&displayName);

8
dlls/ole32/marshal.c
View File

@ -256,7 +256,7 @@ StdMarshalImpl_MarshalInterface(
IPSFactoryBuffer *psfacbuf; IPSFactoryBuffer *psfacbuf;
TRACE("(...,%s,...)\n",debugstr_guid(riid)); TRACE("(...,%s,...)\n",debugstr_guid(riid));
IUnknown_QueryInterface((LPUNKNOWN)pv,&IID_IUnknown,(LPVOID*)(char*)&pUnk); IUnknown_QueryInterface((LPUNKNOWN)pv,&IID_IUnknown,(LPVOID*)&pUnk);
mid.processid = GetCurrentProcessId(); mid.processid = GetCurrentProcessId();
mid.objectid = (DWORD)pUnk; /* FIXME */ mid.objectid = (DWORD)pUnk; /* FIXME */
IUnknown_Release(pUnk); IUnknown_Release(pUnk);
@ -280,7 +280,7 @@ StdMarshalImpl_MarshalInterface(
FIXME("Failed to create a stub for %s\n",debugstr_guid(riid)); FIXME("Failed to create a stub for %s\n",debugstr_guid(riid));
return hres; return hres;
} }
IUnknown_QueryInterface((LPUNKNOWN)pv,riid,(LPVOID*)(char*)&pUnk); IUnknown_QueryInterface((LPUNKNOWN)pv,riid,(LPVOID*)&pUnk);
MARSHAL_Register_Stub(&mid,pUnk,stub); MARSHAL_Register_Stub(&mid,pUnk,stub);
IUnknown_Release(pUnk); IUnknown_Release(pUnk);
return S_OK; return S_OK;
@ -448,7 +448,7 @@ CoMarshalInterface( IStream *pStm, REFIID riid, IUnknown *pUnk,
); );
STUBMGR_Start(); /* Just to be sure we have one running. */ STUBMGR_Start(); /* Just to be sure we have one running. */
mid.processid = GetCurrentProcessId(); mid.processid = GetCurrentProcessId();
IUnknown_QueryInterface(pUnk,&IID_IUnknown,(LPVOID*)(char*)&pUnknown); IUnknown_QueryInterface(pUnk,&IID_IUnknown,(LPVOID*)&pUnknown);
mid.objectid = (DWORD)pUnknown; mid.objectid = (DWORD)pUnknown;
IUnknown_Release(pUnknown); IUnknown_Release(pUnknown);
memcpy(&mid.iid,riid,sizeof(mid.iid)); memcpy(&mid.iid,riid,sizeof(mid.iid));
@ -523,7 +523,7 @@ CoUnmarshalInterface(IStream *pStm, REFIID riid, LPVOID *ppv) {
FIXME("Stream read 3 failed, %lx, (%ld of %d)\n",hres,res,sizeof(xclsid)); FIXME("Stream read 3 failed, %lx, (%ld of %d)\n",hres,res,sizeof(xclsid));
return hres; return hres;
} }
hres=CoCreateInstance(&xclsid,NULL,CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER,&IID_IMarshal,(void**)(char*)&pUnk); hres=CoCreateInstance(&xclsid,NULL,CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER,&IID_IMarshal,(void**)&pUnk);
if (hres) { if (hres) {
FIXME("Failed to create instance of unmarshaller %s.\n",debugstr_guid(&xclsid)); FIXME("Failed to create instance of unmarshaller %s.\n",debugstr_guid(&xclsid));
return hres; return hres;

2
dlls/ole32/moniker.c
View File

@ -505,7 +505,7 @@ HRESULT WINAPI OleRun(LPUNKNOWN pUnknown)
ICOM_THIS(IRunnableObject,pUnknown); ICOM_THIS(IRunnableObject,pUnknown);
LRESULT ret; LRESULT ret;
ret = IRunnableObject_QueryInterface(This,&IID_IRunnableObject,(LPVOID*)(char*)&runable); ret = IRunnableObject_QueryInterface(This,&IID_IRunnableObject,(LPVOID*)&runable);
if (ret) if (ret)
return 0; /* Appears to return no error. */ return 0; /* Appears to return no error. */
ret = IRunnableObject_Run(runable,NULL); ret = IRunnableObject_Run(runable,NULL);

18
dlls/ole32/ole2.c
View File

@ -710,7 +710,7 @@ HRESULT WINAPI OleSetContainedObject(
hres = IUnknown_QueryInterface(pUnknown, hres = IUnknown_QueryInterface(pUnknown,
&IID_IRunnableObject, &IID_IRunnableObject,
(void**)(char*)&runnable); (void**)&runnable);
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
@ -756,7 +756,7 @@ HRESULT WINAPI OleLoad(
NULL, NULL,
CLSCTX_INPROC_HANDLER, CLSCTX_INPROC_HANDLER,
&IID_IOleObject, &IID_IOleObject,
(void**)(char*)&oleObject); (void**)&oleObject);
/* /*
* If that fails, as it will most times, load the default * If that fails, as it will most times, load the default
@ -767,7 +767,7 @@ HRESULT WINAPI OleLoad(
hres = OleCreateDefaultHandler(&storageInfo.clsid, hres = OleCreateDefaultHandler(&storageInfo.clsid,
NULL, NULL,
&IID_IOleObject, &IID_IOleObject,
(void**)(char*)&oleObject); (void**)&oleObject);
} }
/* /*
@ -786,7 +786,7 @@ HRESULT WINAPI OleLoad(
*/ */
hres = IOleObject_QueryInterface(oleObject, hres = IOleObject_QueryInterface(oleObject,
&IID_IPersistStorage, &IID_IPersistStorage,
(void**)(char*)&persistStorage); (void**)&persistStorage);
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
@ -860,7 +860,7 @@ HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCl
hres = IUnknown_QueryInterface(pUnknown, hres = IUnknown_QueryInterface(pUnknown,
&IID_IRunnableObject, &IID_IRunnableObject,
(void**)(char*)&runnable); (void**)&runnable);
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
@ -2229,7 +2229,7 @@ HRESULT WINAPI OleDraw(
hres = IUnknown_QueryInterface(pUnk, hres = IUnknown_QueryInterface(pUnk,
&IID_IViewObject, &IID_IViewObject,
(void**)(char*)&viewobject); (void**)&viewobject);
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
@ -2284,20 +2284,20 @@ HRESULT WINAPI OleCreate(
FIXME("\n\t%s\n\t%s semi-stub!\n", debugstr_guid(rclsid), debugstr_guid(riid)); FIXME("\n\t%s\n\t%s semi-stub!\n", debugstr_guid(rclsid), debugstr_guid(riid));
if (SUCCEEDED((hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER|CLSCTX_LOCAL_SERVER , riid, (LPVOID*)(char*)&pUnk)))) if (SUCCEEDED((hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER|CLSCTX_LOCAL_SERVER , riid, (LPVOID*)&pUnk))))
{ {
if (pClientSite) if (pClientSite)
{ {
IOleObject * pOE; IOleObject * pOE;
IPersistStorage * pPS; IPersistStorage * pPS;
if (SUCCEEDED((hres = IUnknown_QueryInterface( pUnk, &IID_IOleObject, (LPVOID*)(char*)&pOE)))) if (SUCCEEDED((hres = IUnknown_QueryInterface( pUnk, &IID_IOleObject, (LPVOID*)&pOE))))
{ {
TRACE("trying to set clientsite %p\n", pClientSite); TRACE("trying to set clientsite %p\n", pClientSite);
hres1 = IOleObject_SetClientSite(pOE, pClientSite); hres1 = IOleObject_SetClientSite(pOE, pClientSite);
TRACE("-- result 0x%08lx\n", hres1); TRACE("-- result 0x%08lx\n", hres1);
IOleObject_Release(pOE); IOleObject_Release(pOE);
} }
if (SUCCEEDED((hres = IUnknown_QueryInterface( pUnk, &IID_IPersistStorage, (LPVOID*)(char*)&pPS)))) if (SUCCEEDED((hres = IUnknown_QueryInterface( pUnk, &IID_IPersistStorage, (LPVOID*)&pPS))))
{ {
TRACE("trying to set stg %p\n", pStg); TRACE("trying to set stg %p\n", pStg);
hres1 = IPersistStorage_InitNew(pPS, pStg); hres1 = IPersistStorage_InitNew(pPS, pStg);

4
dlls/ole32/ole2impl.c
View File

@ -151,7 +151,7 @@ HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObject, REFIID riid,
/* Create default handler for Persist storage */ /* Create default handler for Persist storage */
if (hr1 == S_OK) if (hr1 == S_OK)
hr1 = OleCreateDefaultHandler(&clsID, NULL, &IID_IPersistStorage, (LPVOID*)(char*)&pPersistStorage); hr1 = OleCreateDefaultHandler(&clsID, NULL, &IID_IPersistStorage, (LPVOID*)&pPersistStorage);
/* Load the storage to Persist storage */ /* Load the storage to Persist storage */
@ -161,7 +161,7 @@ HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObject, REFIID riid,
/* Query for IOleObject */ /* Query for IOleObject */
if (hr1 == S_OK) if (hr1 == S_OK)
hr1 = IPersistStorage_QueryInterface(pPersistStorage, &IID_IOleObject, (LPVOID*)(char*)&pOleObject); hr1 = IPersistStorage_QueryInterface(pPersistStorage, &IID_IOleObject, (LPVOID*)&pOleObject);
/* Set client site with the IOleObject */ /* Set client site with the IOleObject */

4
dlls/ole32/oleproxy.c
View File

@ -155,12 +155,12 @@ CFStub_Invoke(
} }
memcpy(&iid,msg->Buffer,sizeof(iid)); memcpy(&iid,msg->Buffer,sizeof(iid));
TRACE("->CreateInstance(%s)\n",debugstr_guid(&iid)); TRACE("->CreateInstance(%s)\n",debugstr_guid(&iid));
hres = IUnknown_QueryInterface(This->pUnkServer,&IID_IClassFactory,(LPVOID*)(char*)&classfac); hres = IUnknown_QueryInterface(This->pUnkServer,&IID_IClassFactory,(LPVOID*)&classfac);
if (hres) { if (hres) {
FIXME("Ole server does not provide a IClassFactory?\n"); FIXME("Ole server does not provide a IClassFactory?\n");
return hres; return hres;
} }
hres = IClassFactory_CreateInstance(classfac,NULL,&iid,(LPVOID*)(char*)&ppv); hres = IClassFactory_CreateInstance(classfac,NULL,&iid,(LPVOID*)&ppv);
IClassFactory_Release(classfac); IClassFactory_Release(classfac);
if (hres) { if (hres) {
msg->cbBuffer = 0; msg->cbBuffer = 0;

2
dlls/ole32/storage32.c
View File

@ -5901,7 +5901,7 @@ HRESULT WINAPI OleLoadFromStream(IStream *pStm,REFIID iidInterface,void** ppvOb
res=CoCreateInstance(&clsid,NULL,CLSCTX_INPROC_SERVER,iidInterface,ppvObj); res=CoCreateInstance(&clsid,NULL,CLSCTX_INPROC_SERVER,iidInterface,ppvObj);
if (!SUCCEEDED(res)) if (!SUCCEEDED(res))
return res; return res;
res=IUnknown_QueryInterface((IUnknown*)*ppvObj,&IID_IPersistStream,(LPVOID*)(char*)&xstm); res=IUnknown_QueryInterface((IUnknown*)*ppvObj,&IID_IPersistStream,(LPVOID*)&xstm);
if (!SUCCEEDED(res)) { if (!SUCCEEDED(res)) {
IUnknown_Release((IUnknown*)*ppvObj); IUnknown_Release((IUnknown*)*ppvObj);
return res; return res;