Marcus Meissner : winedump: Fixed minidump processor revision decoding ( Coverity).
Alexandre Julliard
julliard at winehq.org
Thu May 12 13:57:51 CDT 2011
Module: wine
Branch: master
Commit: 16d13f24a0c7d1afd46e898c1f74ab6cf5bd2099
URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d13f24a0c7d1afd46e898c1f74ab6cf5bd2099
Author: Marcus Meissner <meissner at suse.de>
Date: Thu May 5 15:27:06 2011 +0200
winedump: Fixed minidump processor revision decoding (Coverity).
---
programs/winedbg/tgt_minidump.c | 14 +++++++-------
tools/winedump/minidump.c | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c
index 142d5ca..f5750e8 100644
--- a/programs/winedbg/tgt_minidump.c
+++ b/programs/winedbg/tgt_minidump.c
@@ -238,18 +238,18 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data)
strcat(tmp, str);
if (msi->ProcessorLevel == 3 || msi->ProcessorLevel == 4)
{
- if (HIWORD(msi->ProcessorRevision) == 0xFF)
+ if (HIBYTE(msi->ProcessorRevision) == 0xFF)
sprintf(tmp + strlen(tmp), " (%c%d)",
- 'A' + HIBYTE(LOWORD(msi->ProcessorRevision)),
- LOBYTE(LOWORD(msi->ProcessorRevision)));
+ 'A' + ((msi->ProcessorRevision>>4)&0xf)-0x0a,
+ ((msi->ProcessorRevision&0xf)));
else
sprintf(tmp + strlen(tmp), " (%c%d)",
- 'A' + HIWORD(msi->ProcessorRevision),
- LOWORD(msi->ProcessorRevision));
+ 'A' + HIBYTE(msi->ProcessorRevision),
+ LOBYTE(msi->ProcessorRevision));
}
else sprintf(tmp + strlen(tmp), " (%d.%d)",
- HIWORD(msi->ProcessorRevision),
- LOWORD(msi->ProcessorRevision));
+ HIBYTE(msi->ProcessorRevision),
+ LOBYTE(msi->ProcessorRevision));
str = tmp;
break;
case PROCESSOR_ARCHITECTURE_MIPS:
diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c
index d860768..4cd04f3 100644
--- a/tools/winedump/minidump.c
+++ b/tools/winedump/minidump.c
@@ -267,12 +267,12 @@ void mdmp_dump(void)
strcat(tmp, " (");
if (msi->ProcessorLevel == 3 || msi->ProcessorLevel == 4)
{
- if (HIWORD(msi->ProcessorRevision) == 0xFF)
- sprintf(tmp + strlen(tmp), "%c%d", 'A' + HIBYTE(LOWORD(msi->ProcessorRevision)), LOBYTE(LOWORD(msi->ProcessorRevision)));
+ if (HIBYTE(msi->ProcessorRevision) == 0xFF)
+ sprintf(tmp + strlen(tmp), "%c%d", 'A' + ((msi->ProcessorRevision>>4)&0xf)-0x0a, msi->ProcessorRevision&0xf);
else
- sprintf(tmp + strlen(tmp), "%c%d", 'A' + HIWORD(msi->ProcessorRevision), LOWORD(msi->ProcessorRevision));
+ sprintf(tmp + strlen(tmp), "%c%d", 'A' + HIBYTE(msi->ProcessorRevision), LOBYTE(msi->ProcessorRevision));
}
- else sprintf(tmp + strlen(tmp), "%d.%d", HIWORD(msi->ProcessorRevision), LOWORD(msi->ProcessorRevision));
+ else sprintf(tmp + strlen(tmp), "%d.%d", HIBYTE(msi->ProcessorRevision), LOBYTE(msi->ProcessorRevision));
str = tmp;
break;
case PROCESSOR_ARCHITECTURE_MIPS:
More information about the wine-cvs
mailing list