January 2007 - Wine-Commits

Vitaliy Margolen : winex11drv/user32: Add ClipCursor to x11drv to pass clip rectangle to x11drv.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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

Vitaliy Margolen : dinput: Fix possible NULL deference.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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 : dinput: Fix mouse to use proper offset when queuing new events. Add handling of X-buttons.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 30e2fbcb6ee30213538dd06918b49738500f9fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e2fbcb6ee30213538dd0691… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jan 5 17:14:55 2007 -0700 dinput: Fix mouse to use proper offset when queuing new events. Add handling of X-buttons. We should use instance IDs instead of sequential numbers to get correct offset. --- dlls/dinput/device.c | 12 +++++- dlls/dinput/device_private.h | 1 + dlls/dinput/mouse.c | 88 +++++++++++++++++++++--------------------- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 469f3d8..530f746 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -493,7 +493,7 @@ int offset_to_object(LPCDIDATAFORMAT df, int i; for (i = 0; i < df->dwNumObjs; i++) - if (df->rgodf[i].dwOfs == offset) + if (dataformat_to_odf(df, i)->dwOfs == offset) return i; return -1; @@ -503,13 +503,21 @@ static int id_to_object(LPCDIDATAFORMAT { int i; + id &= 0x00ffffff; for (i = 0; i < df->dwNumObjs; i++) - if ((df->rgodf[i].dwType & 0x00ffffff) == (id & 0x00ffffff)) + if ((dataformat_to_odf(df, i)->dwType & 0x00ffffff) == id) return i; return -1; } +int id_to_offset(DataFormat *df, int id) +{ + int obj = id_to_object(df->wine_df, id); + + return obj >= 0 && df->offsets ? df->offsets[obj] : -1; +} + int find_property(LPCDIDATAFORMAT df, LPCDIPROPHEADER ph) { switch (ph->dwHow) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index e35c9f4..638661a 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -74,6 +74,7 @@ extern void release_DataFormat(DataForma extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */ extern int offset_to_object(LPCDIDATAFORMAT df, int offset); +extern int id_to_offset(DataFormat *df, int id); extern int find_property(LPCDIDATAFORMAT df, LPCDIPROPHEADER ph); /** diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6465482..f8eea4c 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -42,18 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /* Wine mouse driver object instances */ #define WINE_MOUSE_X_AXIS_INSTANCE 0 #define WINE_MOUSE_Y_AXIS_INSTANCE 1 - -/* ------------------------------- */ -/* Wine mouse internal data format */ -/* ------------------------------- */ - -/* Constants used to access the offset array */ -#define WINE_MOUSE_X_POSITION 0 -#define WINE_MOUSE_Y_POSITION 1 -#define WINE_MOUSE_Z_POSITION 2 -#define WINE_MOUSE_L_POSITION 3 -#define WINE_MOUSE_R_POSITION 4 -#define WINE_MOUSE_M_POSITION 5 +#define WINE_MOUSE_Z_AXIS_INSTANCE 2 +#define WINE_MOUSE_BUTTONS_INSTANCE 3 static const IDirectInputDevice8AVtbl SysMouseAvt; static const IDirectInputDevice8WVtbl SysMouseWvt; @@ -298,7 +288,7 @@ static LRESULT CALLBACK dinput_mouse_hoo MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = (SysMouseImpl*) current_lock; DWORD dwCoop; - int wdata; + int wdata = 0, inst_id = -1; if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); @@ -322,58 +312,68 @@ static LRESULT CALLBACK dinput_mouse_hoo pt1 = pt; if (pt.x) - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_X_POSITION], + queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, + DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS), pt1.x, hook->time, This->dinput->evsequence); if (pt.y) - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Y_POSITION], - pt1.y, hook->time, This->dinput->evsequence); + { + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS; + wdata = pt1.y; + } This->need_warp = (pt.x || pt.y) && dwCoop & DISCL_EXCLUSIVE; break; } + case WM_MOUSEWHEEL: + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS; + This->m_state.lZ += wdata = (short)HIWORD(hook->mouseData); + break; case WM_LBUTTONDOWN: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_L_POSITION], - 0x80, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[0] = 0x80; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 0) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[0] = wdata = 0x80; break; case WM_LBUTTONUP: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_L_POSITION], - 0x00, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[0] = 0x00; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 0) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[0] = wdata = 0x00; break; case WM_RBUTTONDOWN: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_R_POSITION], - 0x80, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[1] = 0x80; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 1) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[1] = wdata = 0x80; break; case WM_RBUTTONUP: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_R_POSITION], - 0x00, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[1] = 0x00; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 1) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[1] = wdata = 0x00; break; case WM_MBUTTONDOWN: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_M_POSITION], - 0x80, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[2] = 0x80; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2] = wdata = 0x80; break; case WM_MBUTTONUP: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_M_POSITION], - 0x00, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[2] = 0x00; - break; - case WM_MOUSEWHEEL: - wdata = (short)HIWORD(hook->mouseData); - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Z_POSITION], - wdata, hook->time, This->dinput->evsequence); - This->m_state.lZ += wdata; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2] = wdata = 0x00; break; + case WM_XBUTTONDOWN: + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x80; + break; + case WM_XBUTTONUP: + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x00; + break; } - TRACE("msg %x @ (%d %d): (X: %d - Y: %d L: %02x M: %02x R: %02x)\n", - wparam, hook->pt.x, hook->pt.y, This->m_state.lX, This->m_state.lY, - This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]); + if (TRACE_ON(dinput)) + { + int i; - This->dinput->evsequence++; + TRACE("msg %x @ (%d %d): (X: %d Y: %d Z: %d\n", wparam, hook->pt.x, hook->pt.y, + This->m_state.lX, This->m_state.lY, This->m_state.lZ); + for (i = 0; i < 5; i++) TRACE(" B%d: %02x", i, This->m_state.rgbButtons[i]); + TRACE(")\n"); + } + if (inst_id != -1) + queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, inst_id), + wdata, hook->time, This->dinput->evsequence++); /* Mouse moved -> send event if asked */ if (This->base.hEvent) SetEvent(This->base.hEvent);

1 0

Vitaliy Margolen : dinput: Fix memory leak.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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

Eric Pouech : winedump: Add support for derived types in codeview type info .
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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: Dump S_SSEARCH_V1 symbols.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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: Added for dumping sstAlignSym and sstGlobalTypes COFF sections.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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 : dbghelp: Handling of S_SALIGN symbols.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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: Fix a couple of issues with types table walking.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

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: Added dumping of RSDS header from module.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 4141eafb8fb7cf688054b14b93fdd425b112506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4141eafb8fb7cf688054b14b9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:39 2007 +0100 winedump: Added dumping of RSDS header from module. --- tools/winedump/debug.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 10ec2d5..d141e9f 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -45,6 +45,7 @@ #include "winbase.h" #include "winedump.h" #include "cvinclude.h" +#include "wine/mscvpdb.h" /* * .DBG File Layout: @@ -420,19 +421,33 @@ static void dump_codeview_headers(unsign if (memcmp(signature->Signature, "NB10", 4) == 0) { - const struct {DWORD TimeStamp; DWORD Dunno; char Name[1];} *pdb_data; + const CODEVIEW_PDB_DATA* pdb_data; pdb_data = (const void *)(signature + 1); printf(" TimeStamp: %08X (%s)\n", - pdb_data->TimeStamp, get_time_str(pdb_data->TimeStamp)); - printf(" Dunno: %08X\n", pdb_data->Dunno); - printf(" Filename: %s\n", pdb_data->Name); + pdb_data->timestamp, get_time_str(pdb_data->timestamp)); + printf(" Dunno: %08X\n", pdb_data->unknown); + printf(" Filename: %s\n", pdb_data->name); + return; + } + if (memcmp(signature->Signature, "RSDS", 4) == 0) + { + const CODEVIEW_HEADER_RSDS* rsds_data; + char guid_str[40]; + + rsds_data = (const void *)signature; + printf(" Signature: %08X\n", + rsds_data->dwSignature); + printf(" Guid: %s\n", + guid_to_string(&rsds_data->guid, guid_str, sizeof(guid_str))); + printf(" Dunno: %08X\n", rsds_data->unknown); + printf(" Filename: %s\n", rsds_data->name); return; } if (memcmp(signature->Signature, "NB09", 4) != 0 && memcmp(signature->Signature, "NB11", 4) != 0) { - printf("Unsupported signature, aborting\n"); + printf("Unsupported signature (%.4s), aborting\n", signature->Signature); return; }

1 0