Commit f20710d9 authored by Alexandre Julliard's avatar Alexandre Julliard

winedbg: Use nameless unions/structs.

parent 4368bd8e
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <assert.h> #include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "ntstatus.h" #include "ntstatus.h"
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
* http://sources.redhat.com/gdb/onlinedocs/gdb/Maintenance-Commands.html * http://sources.redhat.com/gdb/onlinedocs/gdb/Maintenance-Commands.html
*/ */
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <assert.h> #include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
......
...@@ -18,9 +18,6 @@ ...@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -308,8 +305,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) ...@@ -308,8 +305,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data)
break; break;
} }
dbg_printf(" %ls was running on #%d %s CPU%s", dbg_printf(" %ls was running on #%d %s CPU%s",
exec_name, msi->u.s.NumberOfProcessors, str, exec_name, msi->NumberOfProcessors, str,
msi->u.s.NumberOfProcessors < 2 ? "" : "s"); msi->NumberOfProcessors < 2 ? "" : "s");
switch (msi->MajorVersion) switch (msi->MajorVersion)
{ {
case 3: case 3:
...@@ -334,8 +331,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) ...@@ -334,8 +331,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data)
case 0: str = "2000"; break; case 0: str = "2000"; break;
case 1: str = "XP"; break; case 1: str = "XP"; break;
case 2: case 2:
if (msi->u.s.ProductType == 1) str = "XP"; if (msi->ProductType == 1) str = "XP";
else if (msi->u.s.ProductType == 3) str = "Server 2003"; else if (msi->ProductType == 3) str = "Server 2003";
else str = "5-????"; else str = "5-????";
break; break;
default: str = "5-????"; break; default: str = "5-????"; break;
...@@ -345,23 +342,23 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) ...@@ -345,23 +342,23 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data)
switch (msi->MinorVersion) switch (msi->MinorVersion)
{ {
case 0: case 0:
if (msi->u.s.ProductType == 1) str = "Vista"; if (msi->ProductType == 1) str = "Vista";
else if (msi->u.s.ProductType == 3) str = "Server 2008"; else if (msi->ProductType == 3) str = "Server 2008";
else str = "6-????"; else str = "6-????";
break; break;
case 1: case 1:
if (msi->u.s.ProductType == 1) str = "Win7"; if (msi->ProductType == 1) str = "Win7";
else if (msi->u.s.ProductType == 3) str = "Server 2008"; else if (msi->ProductType == 3) str = "Server 2008";
else str = "6-????"; else str = "6-????";
break; break;
case 2: case 2:
if (msi->u.s.ProductType == 1) str = "Win8"; if (msi->ProductType == 1) str = "Win8";
else if (msi->u.s.ProductType == 3) str = "Server 2012"; else if (msi->ProductType == 3) str = "Server 2012";
else str = "6-????"; else str = "6-????";
break; break;
case 3: case 3:
if (msi->u.s.ProductType == 1) str = "Win8.1"; if (msi->ProductType == 1) str = "Win8.1";
else if (msi->u.s.ProductType == 3) str = "Server 2012 R2"; else if (msi->ProductType == 3) str = "Server 2012 R2";
else str = "6-????"; else str = "6-????";
break; break;
default: str = "6-????"; break; default: str = "6-????"; break;
...@@ -371,7 +368,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) ...@@ -371,7 +368,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data)
switch (msi->MinorVersion) switch (msi->MinorVersion)
{ {
case 0: case 0:
if (msi->u.s.ProductType == 1) str = "Win10"; if (msi->ProductType == 1) str = "Win10";
else str = "10-????"; else str = "10-????";
break; break;
default: str = "10-????"; break; default: str = "10-????"; break;
......
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