Skip to content

W
wine-cw
Commit 55252b97 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

dmloader: Just use dump_DMUS_OBJECTDESC().

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@winehq.org> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c538d4ad
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
dlls/dmloader/container.c
View file @ 55252b97
...@@ -307,23 +307,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -307,23 +307,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
TRACE_(dmfile)(": GUID chunk\n"); TRACE_(dmfile)(": GUID chunk\n");
IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL);
This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT;
TRACE_(dmdump)(": GUID: %s\n", debugstr_guid(&This->dmobj.desc.guidObject));
break; break;
} }
case DMUS_FOURCC_VERSION_CHUNK: { case DMUS_FOURCC_VERSION_CHUNK: {
TRACE_(dmfile)(": version chunk\n"); TRACE_(dmfile)(": version chunk\n");
IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL);
This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION;
TRACE_(dmdump)(": version: %s\n", debugstr_dmversion(&This->dmobj.desc.vVersion));
break; break;
} }
case DMUS_FOURCC_DATE_CHUNK: { case DMUS_FOURCC_DATE_CHUNK: {
TRACE_(dmfile)(": date chunk\n"); TRACE_(dmfile)(": date chunk\n");
IStream_Read (pStm, &This->dmobj.desc.ftDate, Chunk.dwSize, NULL); IStream_Read (pStm, &This->dmobj.desc.ftDate, Chunk.dwSize, NULL);
This->dmobj.desc.dwValidData |= DMUS_OBJ_DATE; This->dmobj.desc.dwValidData |= DMUS_OBJ_DATE;
TRACE_(dmdump)(": date: %s\n", debugstr_filetime(&This->dmobj.desc.ftDate));
break; break;
} }
case DMUS_FOURCC_CATEGORY_CHUNK: { case DMUS_FOURCC_CATEGORY_CHUNK: {
TRACE_(dmfile)(": category chunk\n"); TRACE_(dmfile)(": category chunk\n");
/* if it happens that string is too long, /* if it happens that string is too long,
...@@ -336,7 +333,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -336,7 +333,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL);
} }
This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY;
TRACE_(dmdump)(": category: %s\n", debugstr_w(This->dmobj.desc.wszCategory));
break; break;
} }
case FOURCC_LIST: { case FOURCC_LIST: {
...@@ -367,7 +363,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -367,7 +363,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL);
} }
This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME;
TRACE_(dmdump)(": name: %s\n", debugstr_w(This->dmobj.desc.wszName));
break; break;
} }
default: { default: {
...@@ -606,6 +601,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -606,6 +601,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
} }
TRACE_(dmfile)(": reading finished\n"); TRACE_(dmfile)(": reading finished\n");
This->dmobj.desc.dwValidData |= DMUS_OBJ_LOADED; This->dmobj.desc.dwValidData |= DMUS_OBJ_LOADED;
dump_DMUS_OBJECTDESC(&This->dmobj.desc);
break; break;
} }
default: { default: {
......
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