Alexandre Julliard : winedump: Remove an unused flag.
Alexandre Julliard
julliard at winehq.org
Tue Jan 19 11:53:43 CST 2010
Module: wine
Branch: master
Commit: 4e640f8a2b0194fb5a04f602e23ad53df428ea5e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e640f8a2b0194fb5a04f602e23ad53df428ea5e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jan 19 13:06:19 2010 +0100
winedump: Remove an unused flag.
---
tools/winedump/pe.c | 6 ++----
tools/winedump/winedump.h | 3 ---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c
index 728253e..2c84bd5 100644
--- a/tools/winedump/pe.c
+++ b/tools/winedump/pe.c
@@ -1560,13 +1560,13 @@ static void do_grab_sym( void )
if (!pName) {printf("Can't grab functions' name table\n"); return;}
pOrdl = RVA(exportDir->AddressOfNameOrdinals, exportDir->NumberOfNames * sizeof(WORD));
if (!pOrdl) {printf("Can't grab functions' ordinal table\n"); return;}
+ pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD));
+ if (!pFunc) {printf("Can't grab functions' address table\n"); return;}
/* dll_close(); */
if (!(dll_symbols = malloc((exportDir->NumberOfFunctions + 1) * sizeof(dll_symbol))))
fatal ("Out of memory");
- if (exportDir->AddressOfFunctions != exportDir->NumberOfNames || exportDir->Base > 1)
- globals.do_ordinals = 1;
/* bit map of used funcs */
map = calloc(((exportDir->NumberOfFunctions + 31) & ~31) / 32, sizeof(DWORD));
@@ -1581,8 +1581,6 @@ static void do_grab_sym( void )
dll_symbols[j].ordinal = exportDir->Base + *pOrdl;
assert(dll_symbols[j].symbol);
}
- pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD));
- if (!pFunc) {printf("Can't grab functions' address table\n"); return;}
for (i = 0; i < exportDir->NumberOfFunctions; i++)
{
diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h
index 1f49369..d7e4e1d 100644
--- a/tools/winedump/winedump.h
+++ b/tools/winedump/winedump.h
@@ -136,9 +136,6 @@ typedef struct __globals
/* Option arguments: dump mode */
const char *dumpsect; /* -j */
-
- /* internal options */
- int do_ordinals;
} _globals;
extern _globals globals;
More information about the wine-cvs
mailing list