dmloader: Dangling references fix.

This commit is contained in:
Andrew Talbot 2006-12-10 17:11:27 +00:00 committed by Alexandre Julliard
parent db299e3a3a
commit e6a0a09b88
1 changed files with 6 additions and 9 deletions

View File

@ -482,7 +482,7 @@ const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) {
const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {
if (pDesc) { if (pDesc) {
char buffer[1024] = "", *ptr = &buffer[0]; char buffer[1024], *ptr = buffer;
ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):", pDesc); ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):", pDesc);
ptr += sprintf(ptr, "\n - dwSize = 0x%08X", pDesc->dwSize); ptr += sprintf(ptr, "\n - dwSize = 0x%08X", pDesc->dwSize);
@ -498,8 +498,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {
wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData);
if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, "\n - pStream = %p", pDesc->pStream); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, "\n - pStream = %p", pDesc->pStream);
ptr = &buffer[0]; return wine_dbg_sprintf("%s", buffer);
return ptr;
} else { } else {
return wine_dbg_sprintf("(NULL)"); return wine_dbg_sprintf("(NULL)");
} }
@ -507,13 +506,12 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {
const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) {
if (pHeader) { if (pHeader) {
char buffer[1024] = "", *ptr = &buffer[0]; char buffer[1024], *ptr = buffer;
ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader);
ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags));
ptr = &buffer[0]; return wine_dbg_sprintf("%s", buffer);
return ptr;
} else { } else {
return wine_dbg_sprintf("(NULL)"); return wine_dbg_sprintf("(NULL)");
} }
@ -521,7 +519,7 @@ const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeade
const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) { const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) {
if (pHeader) { if (pHeader) {
char buffer[1024] = "", *ptr = &buffer[0]; char buffer[1024], *ptr = buffer;
ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader); ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader);
ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID)); ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID));
@ -529,8 +527,7 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT
ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid));
ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType));
ptr = &buffer[0]; return wine_dbg_sprintf("%s", buffer);
return ptr;
} else { } else {
return wine_dbg_sprintf("(NULL)"); return wine_dbg_sprintf("(NULL)");
} }