From 9daaab54c7aae5d344ddcdcd430efc70f2746ab4 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 23 Jan 2006 16:47:07 +0100
Subject: [PATCH] winedbg: Use Win32 types instead of long long.

---
 dlls/dbghelp/stabs.c        | 4 ++--
 programs/winedbg/be_alpha.c | 2 +-
 programs/winedbg/be_cpu.h   | 2 +-
 programs/winedbg/be_i386.c  | 4 ++--
 programs/winedbg/be_ppc.c   | 2 +-
 programs/winedbg/memory.c   | 2 +-
 programs/winedbg/types.c    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index 76629b7e915..75517df615a 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -428,7 +428,7 @@ static int stabs_pts_read_type_reference(struct ParseTypedefData* ptd,
 
 struct pts_range_value
 {
-    unsigned long long  val;
+    ULONGLONG           val;
     int                 sign;
 };
 
@@ -483,7 +483,7 @@ static int stabs_pts_read_range(struct ParseTypedefData* ptd, const char* typena
     unsigned                    size;
     enum BasicType              bt;
     int                         i;
-    unsigned long long          v;
+    ULONGLONG                   v;
 
     /* type ';' <int> ';' <int> ';' */
     PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref) == -1);
diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c
index f4226b450fb..98bbe9af4c3 100644
--- a/programs/winedbg/be_alpha.c
+++ b/programs/winedbg/be_alpha.c
@@ -130,7 +130,7 @@ static int be_alpha_adjust_pc_for_break(CONTEXT* ctx, BOOL way)
 }
 
 static int be_alpha_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,
-                                  unsigned ext_sign, long long int* ret)
+                                  unsigned ext_sign, LONGLONG* ret)
 {
     dbg_printf("not done\n");
     return FALSE;
diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h
index c753d2fd1e7..d776cf1003d 100644
--- a/programs/winedbg/be_cpu.h
+++ b/programs/winedbg/be_cpu.h
@@ -103,7 +103,7 @@ struct backend_cpu
      * basic type read/write 
      * -------------------------------------------------------------------------------*/
     /* Reads an integer from memory and stores it inside a long long int */
-    int                 (*fetch_integer)(const struct dbg_lvalue* lvalue, unsigned size, unsigned is_signed, long long int*);
+    int                 (*fetch_integer)(const struct dbg_lvalue* lvalue, unsigned size, unsigned is_signed, LONGLONG*);
     /* Reads a real from memory and stores it inside a long double */
     int                 (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, long double*);
 };
diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c
index 4f340c7789a..f1ee7beb81a 100644
--- a/programs/winedbg/be_i386.c
+++ b/programs/winedbg/be_i386.c
@@ -496,7 +496,7 @@ static int be_i386_adjust_pc_for_break(CONTEXT* ctx, BOOL way)
 }
 
 static int be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,
-                                 unsigned ext_sign, long long int* ret)
+                                 unsigned ext_sign, LONGLONG* ret)
 {
     if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE;
 
@@ -509,7 +509,7 @@ static int be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,
     /* propagate sign information */
     if (ext_sign && size < 8 && (*ret >> (size * 8 - 1)) != 0)
     {
-        long long unsigned int neg = -1;
+        ULONGLONG neg = -1;
         *ret |= neg << (size * 8);
     }
     return TRUE;
diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c
index 04e3cdddc0e..e943dfa9d5c 100644
--- a/programs/winedbg/be_ppc.c
+++ b/programs/winedbg/be_ppc.c
@@ -154,7 +154,7 @@ static int be_ppc_adjust_pc_for_break(CONTEXT* ctx, BOOL way)
 }
 
 static int be_ppc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,
-                                unsigned ext_sign, long long int* ret)
+                                unsigned ext_sign, LONGLONG* ret)
 {
     dbg_printf("not done\n");
     return FALSE;
diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c
index 8e8b984ae58..8b042c93e3c 100644
--- a/programs/winedbg/memory.c
+++ b/programs/winedbg/memory.c
@@ -275,7 +275,7 @@ BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicod
 
 static void print_typed_basic(const struct dbg_lvalue* lvalue)
 {
-    long long int       val_int;
+    LONGLONG            val_int;
     void*               val_ptr;
     long double         val_real;
     DWORD64             size64;
diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c
index bb05422f1aa..052b8c63bda 100644
--- a/programs/winedbg/types.c
+++ b/programs/winedbg/types.c
@@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg);
 long int types_extract_as_integer(const struct dbg_lvalue* lvalue)
 {
     long int            rtn = 0;
-    long long int       val;
+    LONGLONG            val;
     DWORD               tag, bt;
     DWORD64             size;