Commit 96ad6881 authored by Alexandre Julliard's avatar Alexandre Julliard

ole32: Don't use sizeof in traces to avoid printf format warnings.

parent a62dca58
...@@ -159,7 +159,7 @@ CFStub_Invoke( ...@@ -159,7 +159,7 @@ CFStub_Invoke(
ULONG res; ULONG res;
if (msg->cbBuffer < sizeof(IID)) { if (msg->cbBuffer < sizeof(IID)) {
FIXME("Not enough bytes in buffer (%ld instead of %d)?\n",msg->cbBuffer,sizeof(IID)); FIXME("Not enough bytes in buffer (%ld)?\n",msg->cbBuffer);
return E_FAIL; return E_FAIL;
} }
memcpy(&iid,msg->Buffer,sizeof(iid)); memcpy(&iid,msg->Buffer,sizeof(iid));
......
...@@ -1159,7 +1159,7 @@ static HRESULT PropertyStorage_ReadHeaderFromStream(IStream *stm, ...@@ -1159,7 +1159,7 @@ static HRESULT PropertyStorage_ReadHeaderFromStream(IStream *stm,
{ {
if (count != sizeof(buf)) if (count != sizeof(buf))
{ {
WARN("read %ld, expected %d\n", count, sizeof(buf)); WARN("read only %ld\n", count);
hr = STG_E_INVALIDHEADER; hr = STG_E_INVALIDHEADER;
} }
else else
...@@ -1194,7 +1194,7 @@ static HRESULT PropertyStorage_ReadFmtIdOffsetFromStream(IStream *stm, ...@@ -1194,7 +1194,7 @@ static HRESULT PropertyStorage_ReadFmtIdOffsetFromStream(IStream *stm,
{ {
if (count != sizeof(buf)) if (count != sizeof(buf))
{ {
WARN("read %ld, expected %d\n", count, sizeof(buf)); WARN("read only %ld\n", count);
hr = STG_E_INVALIDHEADER; hr = STG_E_INVALIDHEADER;
} }
else else
...@@ -1223,7 +1223,7 @@ static HRESULT PropertyStorage_ReadSectionHeaderFromStream(IStream *stm, ...@@ -1223,7 +1223,7 @@ static HRESULT PropertyStorage_ReadSectionHeaderFromStream(IStream *stm,
{ {
if (count != sizeof(buf)) if (count != sizeof(buf))
{ {
WARN("read %ld, expected %d\n", count, sizeof(buf)); WARN("read only %ld\n", count);
hr = STG_E_INVALIDHEADER; hr = STG_E_INVALIDHEADER;
} }
else else
...@@ -1325,8 +1325,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) ...@@ -1325,8 +1325,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This)
/* The section size includes the section header, so check it */ /* The section size includes the section header, so check it */
if (sectionHdr.cbSection < sizeof(PROPERTYSECTIONHEADER)) if (sectionHdr.cbSection < sizeof(PROPERTYSECTIONHEADER))
{ {
WARN("section header too small, got %ld, expected at least %d\n", WARN("section header too small, got %ld\n", sectionHdr.cbSection);
sectionHdr.cbSection, sizeof(PROPERTYSECTIONHEADER));
hr = STG_E_INVALIDHEADER; hr = STG_E_INVALIDHEADER;
goto end; goto end;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment