diff options
author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /loader/pe_image.c | |
parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'loader/pe_image.c')
-rw-r--r-- | loader/pe_image.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/loader/pe_image.c b/loader/pe_image.c index 85b56ab4f2..fed5780fb1 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -73,7 +73,7 @@ static void dump_exports( HMODULE hModule ) char *Module; unsigned int i, j; unsigned short *ordinal; - unsigned long *function,*functions; + unsigned long *function; unsigned char **name; unsigned int load_addr = hModule; @@ -84,14 +84,17 @@ static void dump_exports( HMODULE hModule ) IMAGE_EXPORT_DIRECTORY *pe_exports = (IMAGE_EXPORT_DIRECTORY*)RVA(rva_start); Module = (char*)RVA(pe_exports->Name); + (void)Module; //silence compiler warning TRACE("*******EXPORT DATA*******\n"); TRACE("Module name is %s, %ld functions, %ld names\n", Module, pe_exports->NumberOfFunctions, pe_exports->NumberOfNames); ordinal=(unsigned short*) RVA(pe_exports->AddressOfNameOrdinals); - functions=function=(unsigned long*) RVA(pe_exports->AddressOfFunctions); + function=(unsigned long*) RVA(pe_exports->AddressOfFunctions); name=(unsigned char**) RVA(pe_exports->AddressOfNames); + (void)name; //silence compiler warning + TRACE(" Ord RVA Addr Name\n" ); for (i=0;i<pe_exports->NumberOfFunctions;i++, function++) { @@ -135,7 +138,6 @@ FARPROC PE_FindExportedFunction( IMAGE_EXPORT_DIRECTORY *exports = pem->pe_export; unsigned int load_addr = wm->module; unsigned long rva_start, rva_end, addr; - char * forward; if (HIWORD(funcName)) TRACE("(%s)\n",funcName); @@ -152,7 +154,6 @@ FARPROC PE_FindExportedFunction( ordinals= (unsigned short*) RVA(exports->AddressOfNameOrdinals); function= (unsigned long*) RVA(exports->AddressOfFunctions); name = (unsigned char **) RVA(exports->AddressOfNames); - forward = NULL; rva_start = PE_HEADER(wm->module)->OptionalHeader .DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; rva_end = rva_start + PE_HEADER(wm->module)->OptionalHeader @@ -247,14 +248,9 @@ static DWORD fixup_imports( WINE_MODREF *wm ) PE_MODREF *pem; unsigned int load_addr = wm->module; int i,characteristics_detection=1; - char *modname; assert(wm->type==MODULE32_PE); pem = &(wm->binfmt.pe); - if (pem->pe_export) - modname = (char*) RVA(pem->pe_export->Name); - else - modname = "<unknown>"; TRACE("Dumping imports list\n"); |