January 2007 - Wine-commits

Vitaliy Margolen : dinput: Fix memory leak.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: b223b021a5b08c3736bdf40aa2b586fb681600d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b223b021a5b08c3736bdf40aa… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jan 5 17:15:05 2007 -0700 dinput: Fix memory leak. --- dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b77e258..7288462 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -286,6 +286,7 @@ static ULONG WINAPI SysKeyboardAImpl_Rel HeapFree(GetProcessHeap(), 0, This->base.data_queue); /* Free data format */ + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df->rgodf); HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df); release_DataFormat(&This->base.data_format); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index f8eea4c..2d2ed44 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -273,6 +273,7 @@ static ULONG WINAPI SysMouseAImpl_Releas HeapFree(GetProcessHeap(), 0, This->base.data_queue); /* Free data format */ + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df->rgodf); HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df); release_DataFormat(&This->base.data_format);

1 0

Vitaliy Margolen : dinput: Fix possible NULL deference.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: 005bb87342f8824fb17a82ebb33ec590af6dc947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005bb87342f8824fb17a82ebb… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jan 5 17:15:09 2007 -0700 dinput: Fix possible NULL deference. --- dlls/dinput/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 530f746..d1efa6d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1041,7 +1041,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_ odf = dataformat_to_odf(This->data_format.wine_df, idx); memset(pdidoi, 0, pdidoi->dwSize); pdidoi->dwSize = dwSize; - pdidoi->guidType = *odf->pguid; + if (odf->pguid) pdidoi->guidType = *odf->pguid; pdidoi->dwOfs = This->data_format.offsets ? This->data_format.offsets[idx] : odf->dwOfs; pdidoi->dwType = odf->dwType; pdidoi->dwFlags = odf->dwFlags;

1 0

Vitaliy Margolen : winex11drv/user32: Add ClipCursor to x11drv to pass clip rectangle to x11drv.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: c3dc692b20bc5b3c2e1437763f5979597efe0d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dc692b20bc5b3c2e1437763… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jan 4 12:24:50 2007 -0700 winex11drv/user32: Add ClipCursor to x11drv to pass clip rectangle to x11drv. --- dlls/user32/cursoricon.c | 4 +++ dlls/user32/driver.c | 13 +++++++++++ dlls/user32/tests/input.c | 34 +++++++++++++++++++++++++---- dlls/user32/user_private.h | 1 + dlls/winex11.drv/mouse.c | 42 +++++++++++++++++++++++++++++-------- dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 8 files changed, 83 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3dc692b20bc5b3c2e143…

1 0

Detlef Riekenberg : winspool: Support the local computername as servername for OpenPrinter.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: 58d1e2fa4daf2cba3556c469e21249513f6a0226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d1e2fa4daf2cba3556c469e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 5 01:09:02 2007 +0100 winspool: Support the local computername as servername for OpenPrinter. --- dlls/winspool.drv/info.c | 144 ++++++++++++++++++++++++++++++++------- dlls/winspool.drv/tests/info.c | 2 - 2 files changed, 118 insertions(+), 28 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f357c3c..201d3df 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -115,6 +115,7 @@ typedef struct { typedef struct { LPWSTR name; + LPWSTR printername; jobqueue_t *queue; started_doc_t *doc; } opened_printer_t; @@ -1297,6 +1298,68 @@ static DWORD get_ports_from_all_monitors } /****************************************************************** + * get_servername_from_name (internal) + * + * for an external server, a copy of the serverpart from the full name is returned + * + */ +static LPWSTR get_servername_from_name(LPCWSTR name) +{ + LPWSTR server; + LPWSTR ptr; + WCHAR buffer[MAX_PATH]; + DWORD len; + + if (name == NULL) return NULL; + if ((name[0] != '\\') || (name[1] != '\\')) return NULL; + + server = strdupW(&name[2]); /* skip over both backslash */ + if (server == NULL) return NULL; + + /* strip '\' and the printername */ + ptr = strchrW(server, '\\'); + if (ptr) ptr[0] = '\0'; + + TRACE("found %s\n", debugstr_w(server)); + + len = sizeof(buffer)/sizeof(buffer[0]); + if (GetComputerNameW(buffer, &len)) { + if (lstrcmpW(buffer, server) == 0) { + /* The requested Servername is our computername */ + HeapFree(GetProcessHeap(), 0, server); + return NULL; + } + } + return server; +} + +/****************************************************************** + * get_basename_from_name (internal) + * + * skip over the serverpart from the full name + * + */ +static LPCWSTR get_basename_from_name(LPCWSTR name) +{ + if (name == NULL) return NULL; + if ((name[0] == '\\') && (name[1] == '\\')) { + /* skip over the servername and search for the following '\' */ + name = strchrW(&name[2], '\\'); + if ((name) && (name[1])) { + /* found a seperator ('\') followed by a name: + skip over the seperator and return the rest */ + name++; + } + else + { + /* no basename present (we found only a servername) */ + return NULL; + } + } + return name; +} + +/****************************************************************** * get_opened_printer_entry * Get the first place empty in the opened printer table * @@ -1308,6 +1371,27 @@ static HANDLE get_opened_printer_entry(L UINT_PTR handle = nb_printer_handles, i; jobqueue_t *queue = NULL; opened_printer_t *printer = NULL; + LPWSTR servername; + LPCWSTR printername; + HKEY hkeyPrinters; + HKEY hkeyPrinter; + + servername = get_servername_from_name(name); + if (servername) { + FIXME("server %s not supported\n", debugstr_w(servername)); + HeapFree(GetProcessHeap(), 0, servername); + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + printername = get_basename_from_name(name); + if (name != printername) TRACE("converted %s to %s\n", debugstr_w(name), debugstr_w(printername)); + + /* an empty printername is invalid */ + if (printername && (!printername[0])) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } EnterCriticalSection(&printer_handles_cs); @@ -1350,13 +1434,39 @@ static HANDLE get_opened_printer_entry(L goto end; } - if(name) { - printer->name = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1) * sizeof(WCHAR)); - if (!printer->name) { + + /* clone the base name. This is NULL for the printserver */ + printer->printername = strdupW(printername); + + /* clone the full name */ + printer->name = strdupW(name); + if (name && (!printer->name)) { + handle = 0; + goto end; + } + + if (printername) { + + /* Does the Printer exist? */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { + ERR("Can't create Printers key\n"); + handle = 0; + goto end; + } + if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { + WARN("Printer not found in Registry: '%s'\n", debugstr_w(printername)); + RegCloseKey(hkeyPrinters); + SetLastError(ERROR_INVALID_PRINTER_NAME); handle = 0; goto end; } - strcpyW(printer->name, name); + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + + } + else + { + TRACE("using the local printserver\n"); } if(queue) @@ -1378,7 +1488,8 @@ static HANDLE get_opened_printer_entry(L end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { - /* Something Failed: Free the Buffers */ + /* Something failed: Free all resources */ + HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); HeapFree(GetProcessHeap(), 0, printer); @@ -1812,8 +1923,6 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinter */ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault) { - HKEY hkeyPrinters = NULL; - HKEY hkeyPrinter = NULL; TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); if (pDefault) { @@ -1821,25 +1930,6 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinte debugstr_w(pDefault->pDatatype), pDefault->pDevMode, pDefault->DesiredAccess); } - if(lpPrinterName != NULL) - { - /* Check any Printer exists */ - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - if((lpPrinterName[0] == '\0') || /* explicitly exclude "" */ - (RegOpenKeyW(hkeyPrinters, lpPrinterName, &hkeyPrinter) != ERROR_SUCCESS)) { - - WARN("Printer not found in Registry: '%s'\n", debugstr_w(lpPrinterName)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); - return FALSE; - } - RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); - } if(!phPrinter) { /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */ SetLastError(ERROR_INVALID_PARAMETER); @@ -1848,6 +1938,7 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinte /* Get the unique handle of the printer or Printserver */ *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + TRACE("returning %d with 0x%x and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); return (*phPrinter != 0); } @@ -2788,6 +2879,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter } HeapFree(GetProcessHeap(), 0, printer->queue); } + HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); HeapFree(GetProcessHeap(), 0, printer); printer_handles[i - 1] = NULL; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3bf59aa..0963e3e 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1294,11 +1294,9 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = OpenPrinter(local_server, &hprinter, NULL); - todo_wine { ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); - } if(res) ClosePrinter(hprinter); }

1 0

Eric Pouech : dbghelp: Handling of S_SALIGN symbols.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: c6e8c2aab13db4dfdcc9481eda6aaa856977ad46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e8c2aab13db4dfdcc9481ed… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:43:00 2007 +0100 dbghelp: Handling of S_SALIGN symbols. --- dlls/dbghelp/msc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d4d5edf..3099f0d 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1646,6 +1646,10 @@ static int codeview_snarf(const struct m sym->ssearch_v1.segment, sym->ssearch_v1.offset); break; + case S_ALIGN_V1: + TRACE("S-Align V1\n"); + break; + default: FIXME("Unsupported symbol id %x\n", sym->generic.id); dump(sym, 2 + sym->generic.len);

1 0

Eric Pouech : winedump: Added for dumping sstAlignSym and sstGlobalTypes COFF sections.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: fbb9d5f7d9f0768919701c2c63fac3ec166bf6d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb9d5f7d9f0768919701c2c6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:43:06 2007 +0100 winedump: Added for dumping sstAlignSym and sstGlobalTypes COFF sections. --- tools/winedump/debug.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 3202c25..3ca944b 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -173,7 +173,25 @@ static int dump_cv_sst_libraries(const O static int dump_cv_sst_global_types(const OMFDirEntry* omfde) { - /*** NOT YET IMPLEMENTED ***/ + long fileoffset; + const OMFGlobalTypes*types; + const BYTE* data; + unsigned sz; + + fileoffset = Offset(cv_base) + omfde->lfo; + printf (" GlobalTypes section starts at file offset 0x%lx\n", fileoffset); + + printf ("\n ----- Begin Global Types Table -----\n"); + + types = PRD(fileoffset, sizeof(OMFGlobalTypes)); + if (!types) {printf("Can't get OMF-GlobalTypes, aborting\n");return FALSE;} + + sz = omfde->cb - sizeof(OMFGlobalTypes) - sizeof(DWORD) * types->cTypes; + data = PRD(fileoffset + sizeof(OMFGlobalTypes) + sizeof(DWORD) * types->cTypes, sz); + if (!data) {printf("Can't OMF-SymHash details, aborting\n"); return FALSE;} + + codeview_dump_types(data, sz); + return TRUE; } @@ -306,7 +324,11 @@ static int dump_cv_sst_src_module(const static int dump_cv_sst_align_sym(const OMFDirEntry* omfde) { - /*** NOT YET IMPLEMENTED ***/ + const char* rawdata = PRD(Offset(cv_base) + omfde->lfo, omfde->cb); + + if (!rawdata) {printf("Can't get srcAlignSym subsection details, aborting\n");return FALSE;} + if (omfde->cb < sizeof(DWORD)) return TRUE; + codeview_dump_symbols(rawdata + sizeof(DWORD), omfde->cb - sizeof(DWORD)); return TRUE; }

1 0

Eric Pouech : winedump: Dump S_SSEARCH_V1 symbols.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: f2ef7cf4421a52e656d4e061ba458452dde56462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ef7cf4421a52e656d4e061b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:43:17 2007 +0100 winedump: Dump S_SSEARCH_V1 symbols. --- tools/winedump/msc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index a516afb..178c3d4 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1162,6 +1162,11 @@ int codeview_dump_symbols(const void* ro /* simply skip it */ break; + case S_SSEARCH_V1: + printf("\tSSearch V1: (%04x:%08x)\n", + sym->ssearch_v1.segment, sym->ssearch_v1.offset); + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : winedump: Fix a couple of issues with types table walking.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: b8ae9dccbe06d3f92e165f094390c63e8ef302af URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ae9dccbe06d3f92e165f094… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:43:23 2007 +0100 winedump: Fix a couple of issues with types table walking. Align types to DWORD boundaries. Split types dumping functions into two versions (one without offsets table, the second one with offset table). --- tools/winedump/debug.c | 7 +- tools/winedump/msc.c | 537 +++++++++++++++++++++++---------------------- tools/winedump/pdb.c | 2 +- tools/winedump/winedump.h | 3 +- 4 files changed, 285 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8ae9dccbe06d3f92e165…

1 0

Eric Pouech : winedump: Add support for derived types in codeview type info .
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: 9d10c66dc8db958c02058c19f532072930744e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d10c66dc8db958c02058c19f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:43:33 2007 +0100 winedump: Add support for derived types in codeview type info. --- include/wine/mscvpdb.h | 15 +++++++++++++++ tools/winedump/msc.c | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index abbd539..1aa70a8 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -403,6 +403,21 @@ union codeview_reftype unsigned args[1]; } arglist_v2; + struct + { + unsigned short int len; + short int id; + unsigned short num; + unsigned short drvdcls[1]; + } derived_v1; + + struct + { + unsigned short int len; + short int id; + unsigned num; + unsigned drvdcls[1]; + } derived_v2; }; union codeview_fieldtype diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 95de7d5..91ad8c1 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -775,6 +775,24 @@ static void codeview_dump_one_type(unsig } break; + case LF_DERIVED_V1: + printf("\t%x => Derived V1(#%u):", curr_type, reftype->derived_v1.num); + for (i = 0; i < reftype->derived_v1.num; i++) + { + printf(" %x", reftype->derived_v1.drvdcls[i]); + } + printf("\n"); + break; + + case LF_DERIVED_V2: + printf("\t%x => Derived V2(#%u):", curr_type, reftype->derived_v2.num); + for (i = 0; i < reftype->derived_v2.num; i++) + { + printf(" %x", reftype->derived_v2.drvdcls[i]); + } + printf("\n"); + break; + default: printf(">>> Unsupported type-id %x for %x\n", type->generic.id, curr_type); dump_data((const void*)type, type->generic.len + 2, "");

1 0

Eric Pouech : winedump: Added helper to convert a guid to a string.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: 07d681b0d95ea758e6112c1e8939b69b41ec3fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d681b0d95ea758e6112c1e8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:32 2007 +0100 winedump: Added helper to convert a guid to a string. --- tools/winedump/dump.c | 9 +++++++++ tools/winedump/lnk.c | 16 +++------------- tools/winedump/pdb.c | 8 ++++---- tools/winedump/winedump.h | 1 + 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 21074d1..bdd9e93 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -131,6 +131,15 @@ void dump_unicode_str( const WCHAR *str, printf( "\"" ); } +char* guid_to_string(const GUID* guid, char* str, size_t sz) +{ + snprintf(str, sz, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return str; +} + const void* PRD(unsigned long prd, unsigned long len) { return (prd + len > dump_total_len) ? NULL : (const char*)dump_base + prd; diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 13f3542..91f109c 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -106,14 +106,6 @@ typedef struct lnk_string_tag static unsigned offset; -static void guid_to_string(const GUID* guid, char *str) -{ - sprintf(str, "{%08x-%04x-%04x-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); -} - static const void* fetch_block(void) { const unsigned* u; @@ -292,7 +284,7 @@ static int dump_advertise_info(const cha GUID guid; if (base85_to_guid(avt->bufA, &guid)) - guid_to_string( &guid, prod_str ); + guid_to_string( &guid, prod_str, sizeof(prod_str) ); else strcpy( prod_str, "?" ); @@ -311,7 +303,7 @@ static int dump_advertise_info(const cha } if (feat && feat[0] == '>' && base85_to_guid( &feat[1], &guid )) - guid_to_string( &guid, feat_str ); + guid_to_string( &guid, feat_str, sizeof(feat_str) ); else feat_str[0] = 0; @@ -345,12 +337,10 @@ void lnk_dump(void) offset = 0; hdr = fetch_block(); - guid_to_string(&hdr->MagicGuid, guid); - printf("Header\n"); printf("------\n\n"); printf("Size: %04x\n", hdr->dwSize); - printf("GUID: %s\n", guid); + printf("GUID: %s\n", guid_to_string(&hdr->MagicGuid, guid, sizeof(guid))); printf("FileAttr: %08x\n", hdr->dwFileAttr); printf("FileLength: %08x\n", hdr->dwFileLength); diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 9243b18..3074745 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -625,18 +625,18 @@ static void pdb_ds_dump(void) if (root) { const char* ptr; + char guid_str[40]; + printf("Root:\n" "\tVersion: %u\n" "\tTimeDateStamp: %08x\n" "\tAge: %08x\n" - "\tguid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n" + "\tguid %s\n" "\tcbNames: %08x\n", root->Version, root->TimeDateStamp, root->Age, - root->guid.Data1, root->guid.Data2, root->guid.Data3, - root->guid.Data4[0], root->guid.Data4[1], root->guid.Data4[2], root->guid.Data4[3], - root->guid.Data4[4], root->guid.Data4[5], root->guid.Data4[6], root->guid.Data4[7], + guid_to_string(&root->guid, guid_str, sizeof(guid_str)), root->cbNames); for (ptr = &root->names[0]; ptr < &root->names[0] + root->cbNames; ptr += strlen(ptr) + 1) printf("\tString: %s\n", ptr); diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 540bbd0..8aee2f9 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -239,6 +239,7 @@ void dump_unicode_str( const void dump_file_header(const IMAGE_FILE_HEADER *); void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); void dump_section(const IMAGE_SECTION_HEADER *); +char* guid_to_string(const GUID* guid, char *str, size_t sz); enum FileSig get_kind_exec(void); void dos_dump( void );

1 0