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

ole32: Fix the free threaded marshaller data for 64-bit pointers.

This commit is contained in:
Alexandre Julliard 2010-04-06 21:45:38 +02:00
parent afac75ef0f
commit 9b471fbd14
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/ole32/ftmarshal.c
View File

@ -204,8 +204,11 @@ FTMarshalImpl_MarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, vo
hres = IStream_Write (pStm, &object, sizeof (object), NULL); hres = IStream_Write (pStm, &object, sizeof (object), NULL);
if (hres != S_OK) return STG_E_MEDIUMFULL; if (hres != S_OK) return STG_E_MEDIUMFULL;
hres = IStream_Write (pStm, &constant, sizeof (constant), NULL); if (sizeof(object) == sizeof(DWORD))
if (hres != S_OK) return STG_E_MEDIUMFULL; {
hres = IStream_Write (pStm, &constant, sizeof (constant), NULL);
if (hres != S_OK) return STG_E_MEDIUMFULL;
}
hres = IStream_Write (pStm, &unknown_guid, sizeof (unknown_guid), NULL); hres = IStream_Write (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
if (hres != S_OK) return STG_E_MEDIUMFULL; if (hres != S_OK) return STG_E_MEDIUMFULL;
@ -237,10 +240,13 @@ FTMarshalImpl_UnmarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid,
hres = IStream_Read (pStm, &object, sizeof (object), NULL); hres = IStream_Read (pStm, &object, sizeof (object), NULL);
if (hres != S_OK) return STG_E_READFAULT; if (hres != S_OK) return STG_E_READFAULT;
hres = IStream_Read (pStm, &constant, sizeof (constant), NULL); if (sizeof(object) == sizeof(DWORD))
if (hres != S_OK) return STG_E_READFAULT; {
if (constant != 0) hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
FIXME("constant is 0x%x instead of 0\n", constant); if (hres != S_OK) return STG_E_READFAULT;
if (constant != 0)
FIXME("constant is 0x%x instead of 0\n", constant);
}
hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL); hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
if (hres != S_OK) return STG_E_READFAULT; if (hres != S_OK) return STG_E_READFAULT;
@ -267,10 +273,13 @@ static HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream
hres = IStream_Read (pStm, &object, sizeof (object), NULL); hres = IStream_Read (pStm, &object, sizeof (object), NULL);
if (hres != S_OK) return STG_E_READFAULT; if (hres != S_OK) return STG_E_READFAULT;
hres = IStream_Read (pStm, &constant, sizeof (constant), NULL); if (sizeof(object) == sizeof(DWORD))
if (hres != S_OK) return STG_E_READFAULT; {
if (constant != 0) hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
FIXME("constant is 0x%x instead of 0\n", constant); if (hres != S_OK) return STG_E_READFAULT;
if (constant != 0)
FIXME("constant is 0x%x instead of 0\n", constant);
}
hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL); hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
if (hres != S_OK) return STG_E_READFAULT; if (hres != S_OK) return STG_E_READFAULT;