March 2010 - Wine-commits - list.winehq.org

Nikolay Sivov : shlwapi: Fix IUnknown_AtomicRelease prototype and simplify body a bit.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 55b4e4e3543c1da0b4473e7ab9da34fb9fce0c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b4e4e3543c1da0b4473e7ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 03:16:42 2010 +0300 shlwapi: Fix IUnknown_AtomicRelease prototype and simplify body a bit. --- dlls/shlwapi/ordinal.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 7c2d87c..019502d 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1210,7 +1210,7 @@ HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL f /************************************************************************* * @ [SHLWAPI.169] * - * Release an interface. + * Release an interface and zero a supplied pointer. * * PARAMS * lpUnknown [I] Object to release @@ -1218,19 +1218,16 @@ HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL f * RETURNS * Nothing. */ -DWORD WINAPI IUnknown_AtomicRelease(IUnknown ** lpUnknown) +void WINAPI IUnknown_AtomicRelease(IUnknown ** lpUnknown) { - IUnknown *temp; + TRACE("(%p)\n", lpUnknown); - TRACE("(%p)\n",lpUnknown); - - if(!lpUnknown || !*((LPDWORD)lpUnknown)) return 0; - temp = *lpUnknown; - *lpUnknown = NULL; + if(!lpUnknown || !*lpUnknown) return; TRACE("doing Release\n"); - return IUnknown_Release(temp); + IUnknown_Release(*lpUnknown); + *lpUnknown = NULL; } /*************************************************************************

1 0

Nikolay Sivov : shlwapi: Fix interface leaks in SHIsSameObject.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 442364c1be573a869408759b7d55bb9e2b0ac35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=442364c1be573a869408759b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 03:31:59 2010 +0300 shlwapi: Fix interface leaks in SHIsSameObject. --- dlls/shlwapi/ordinal.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 019502d..70c3285 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1264,9 +1264,10 @@ LPCSTR WINAPI PathSkipLeadingSlashesA(LPCSTR lpszSrc) */ BOOL WINAPI SHIsSameObject(IUnknown* lpInt1, IUnknown* lpInt2) { - LPVOID lpUnknown1, lpUnknown2; + IUnknown *lpUnknown1, *lpUnknown2; + BOOL ret; - TRACE("%p %p\n", lpInt1, lpInt2); + TRACE("(%p %p)\n", lpInt1, lpInt2); if (!lpInt1 || !lpInt2) return FALSE; @@ -1274,16 +1275,21 @@ BOOL WINAPI SHIsSameObject(IUnknown* lpInt1, IUnknown* lpInt2) if (lpInt1 == lpInt2) return TRUE; - if (FAILED(IUnknown_QueryInterface(lpInt1, &IID_IUnknown, &lpUnknown1))) + if (IUnknown_QueryInterface(lpInt1, &IID_IUnknown, (void**)&lpUnknown1) != S_OK) return FALSE; - if (FAILED(IUnknown_QueryInterface(lpInt2, &IID_IUnknown, &lpUnknown2))) + if (IUnknown_QueryInterface(lpInt2, &IID_IUnknown, (void**)&lpUnknown2) != S_OK) + { + IUnknown_Release(lpUnknown1); return FALSE; + } - if (lpUnknown1 == lpUnknown2) - return TRUE; + ret = lpUnknown1 == lpUnknown2; - return FALSE; + IUnknown_Release(lpUnknown1); + IUnknown_Release(lpUnknown2); + + return ret; } /*************************************************************************

1 0

Alexandre Julliard : wine.inf: Some fake dlls should only be created for 32-bit.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: fc1fca5fbd1dadb9d0bac3e4c112254e9c87cc20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1fca5fbd1dadb9d0bac3e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 12:13:10 2010 +0100 wine.inf: Some fake dlls should only be created for 32-bit. --- tools/wine.inf.in | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7eac8b5..06f0707 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -28,7 +28,7 @@ signature="$CHICAGO$" [DefaultInstall] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDllsSection +WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni AddReg=\ Classes,\ @@ -53,7 +53,7 @@ AddReg=\ [DefaultInstall.NT] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDllsSection +WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni AddReg=\ Classes,\ @@ -79,7 +79,7 @@ AddReg=\ [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDllsSection +WineFakeDlls=FakeDlls UpdateInis=SystemIni AddReg=\ Classes,\ @@ -2521,7 +2521,19 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wuapi.dll,1 16422,Internet Explorer,iexplore.exe,1 -[FakeDllsSection] +; 32bit-only fake dlls +[FakeDllsWin32] +10,,twain.dll,twain.dll16 +10,,twain_32.dll +10,,winhelp.exe,winhelp.exe16 +10,,winhlp32.exe +10,command,start.exe +10,system,ddeml.dll,ddeml.dll16 +11,,ddhelp.exe +11,,dosx.exe +11,,dsound.vxd + +[FakeDlls] ; create some directories first 10,help, 10,inf, @@ -2534,18 +2546,9 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,hh.exe 10,,notepad.exe 10,,regedit.exe -10,,twain.dll,twain.dll16 -10,,twain_32.dll -10,,winhelp.exe,winhelp.exe16 -10,,winhlp32.exe -10,command,start.exe -10,system,ddeml.dll,ddeml.dll16 -11,,ddhelp.exe -11,,dosx.exe -11,,dsound.vxd +11,,explorer.exe 11,,notepad.exe 11,,winetest.exe,- -11,,winhlp32.exe 12,,mountmgr.sys 16422,Internet Explorer,iexplore.exe 11,,*

1 0

Vincent Povirk : mscoree: Stub ClrCreateManagedInstance.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 949730736b6736bcc59821648250d5106a27ca5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=949730736b6736bcc59821648… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 26 16:10:43 2010 -0500 mscoree: Stub ClrCreateManagedInstance. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 9365f18..8e25cec 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -7,7 +7,7 @@ @ stub CallFunctionShim @ stub CloseCtrs -@ stub ClrCreateManagedInstance +@ stdcall ClrCreateManagedInstance(wstr ptr ptr) @ stub CoEEShutDownCOM @ stdcall CoInitializeCor(long) @ stub CoInitializeEE diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index a19f103..5b20c85 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -343,6 +343,12 @@ HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID return E_NOTIMPL; } +STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) +{ + FIXME("(%s,%s,%p)\n", debugstr_w(pTypeName), debugstr_guid(riid), ppObject); + return E_NOTIMPL; +} + BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags) { FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags);

1 0

Eric Pouech : dbghelp: Keep the . debug_frame section mapped when parsing dwarf debug_info ( needed for CFA management).
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 9851ebf792459c4e0efbff8fdb5a4f51e2990644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9851ebf792459c4e0efbff8fd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:07:50 2010 +0100 dbghelp: Keep the .debug_frame section mapped when parsing dwarf debug_info (needed for CFA management). --- dlls/dbghelp/dwarf.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e3c9ed9..a1410b2 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -196,6 +196,8 @@ typedef struct dwarf2_parse_context_s struct dwarf2_module_info_s { dwarf2_section_t debug_loc; + dwarf2_section_t debug_frame; + dwarf2_section_t eh_frame; unsigned char word_size; }; @@ -2346,6 +2348,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect; + BOOL ret = TRUE; struct module_format* dwarf2_modfmt; @@ -2396,6 +2399,8 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_modfmt->module->format_info[DFI_DWARF] = dwarf2_modfmt; dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->eh_frame, fmap, ".eh_frame", NULL); while (mod_ctx.data < mod_ctx.end_data) {

1 0

Eric Pouech : dbghelp: Extend the CPU object in order to manipulate context 's registers (getting context's content & register names).
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 1d60aa6000e457b77e424bd63a2f95312efa4b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d60aa6000e457b77e424bd63… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:07:56 2010 +0100 dbghelp: Extend the CPU object in order to manipulate context's registers (getting context's content & register names). --- dlls/dbghelp/cpu_i386.c | 14 +++++ dlls/dbghelp/cpu_ppc.c | 14 +++++ dlls/dbghelp/cpu_x86_64.c | 124 ++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp_private.h | 4 + 4 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 32d600c..094b241 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -450,6 +450,18 @@ reg: fop 31 return reg; } +static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ + FIXME("NIY\n"); + return NULL; +} + +static const char* i386_fetch_regname(unsigned regno) +{ + FIXME("Unknown register %x\n", regno); + return NULL; +} + struct cpu cpu_i386 = { IMAGE_FILE_MACHINE_I386, 4, @@ -457,4 +469,6 @@ struct cpu cpu_i386 = { i386_stack_walk, NULL, i386_map_dwarf_register, + i386_fetch_context_reg, + i386_fetch_regname, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index 9a17aee..938e371 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -60,6 +60,18 @@ static unsigned ppc_map_dwarf_register(unsigned regno) return 0; } +static void* ppc_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ + FIXME("NIY\n"); + return NULL; +} + +static const char* ppc_fetch_regname(unsigned regno) +{ + FIXME("Unknown register %x\n", regno); + return NULL; +} + struct cpu cpu_ppc = { IMAGE_FILE_MACHINE_POWERPC, 4, @@ -67,4 +79,6 @@ struct cpu cpu_ppc = { ppc_stack_walk, NULL, ppc_map_dwarf_register, + ppc_fetch_context_reg, + ppc_fetch_regname, }; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 43af5e0..8d35d92 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -633,6 +633,128 @@ static unsigned x86_64_map_dwarf_register(unsigned regno) return reg; } +static void* x86_64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ +#ifdef __x86_64__ + switch (regno) + { + case CV_AMD64_RAX: *size = sizeof(ctx->Rax); return &ctx->Rax; + case CV_AMD64_RDX: *size = sizeof(ctx->Rdx); return &ctx->Rdx; + case CV_AMD64_RCX: *size = sizeof(ctx->Rcx); return &ctx->Rcx; + case CV_AMD64_RBX: *size = sizeof(ctx->Rbx); return &ctx->Rbx; + case CV_AMD64_RSI: *size = sizeof(ctx->Rsi); return &ctx->Rsi; + case CV_AMD64_RDI: *size = sizeof(ctx->Rdi); return &ctx->Rdi; + case CV_AMD64_RBP: *size = sizeof(ctx->Rbp); return &ctx->Rbp; + case CV_AMD64_RSP: *size = sizeof(ctx->Rsp); return &ctx->Rsp; + case CV_AMD64_R8: *size = sizeof(ctx->R8); return &ctx->R8; + case CV_AMD64_R9: *size = sizeof(ctx->R9); return &ctx->R9; + case CV_AMD64_R10: *size = sizeof(ctx->R10); return &ctx->R10; + case CV_AMD64_R11: *size = sizeof(ctx->R11); return &ctx->R11; + case CV_AMD64_R12: *size = sizeof(ctx->R12); return &ctx->R12; + case CV_AMD64_R13: *size = sizeof(ctx->R13); return &ctx->R13; + case CV_AMD64_R14: *size = sizeof(ctx->R14); return &ctx->R14; + case CV_AMD64_R15: *size = sizeof(ctx->R15); return &ctx->R15; + case CV_AMD64_RIP: *size = sizeof(ctx->Rip); return &ctx->Rip; + + case CV_AMD64_XMM0 + 0: *size = sizeof(ctx->u.s.Xmm0 ); return &ctx->u.s.Xmm0; + case CV_AMD64_XMM0 + 1: *size = sizeof(ctx->u.s.Xmm1 ); return &ctx->u.s.Xmm1; + case CV_AMD64_XMM0 + 2: *size = sizeof(ctx->u.s.Xmm2 ); return &ctx->u.s.Xmm2; + case CV_AMD64_XMM0 + 3: *size = sizeof(ctx->u.s.Xmm3 ); return &ctx->u.s.Xmm3; + case CV_AMD64_XMM0 + 4: *size = sizeof(ctx->u.s.Xmm4 ); return &ctx->u.s.Xmm4; + case CV_AMD64_XMM0 + 5: *size = sizeof(ctx->u.s.Xmm5 ); return &ctx->u.s.Xmm5; + case CV_AMD64_XMM0 + 6: *size = sizeof(ctx->u.s.Xmm6 ); return &ctx->u.s.Xmm6; + case CV_AMD64_XMM0 + 7: *size = sizeof(ctx->u.s.Xmm7 ); return &ctx->u.s.Xmm7; + case CV_AMD64_XMM8 + 0: *size = sizeof(ctx->u.s.Xmm8 ); return &ctx->u.s.Xmm8; + case CV_AMD64_XMM8 + 1: *size = sizeof(ctx->u.s.Xmm9 ); return &ctx->u.s.Xmm9; + case CV_AMD64_XMM8 + 2: *size = sizeof(ctx->u.s.Xmm10); return &ctx->u.s.Xmm10; + case CV_AMD64_XMM8 + 3: *size = sizeof(ctx->u.s.Xmm11); return &ctx->u.s.Xmm11; + case CV_AMD64_XMM8 + 4: *size = sizeof(ctx->u.s.Xmm12); return &ctx->u.s.Xmm12; + case CV_AMD64_XMM8 + 5: *size = sizeof(ctx->u.s.Xmm13); return &ctx->u.s.Xmm13; + case CV_AMD64_XMM8 + 6: *size = sizeof(ctx->u.s.Xmm14); return &ctx->u.s.Xmm14; + case CV_AMD64_XMM8 + 7: *size = sizeof(ctx->u.s.Xmm15); return &ctx->u.s.Xmm15; + + case CV_AMD64_ST0 + 0: *size = sizeof(ctx->u.s.Legacy[0]); return &ctx->u.s.Legacy[0]; + case CV_AMD64_ST0 + 1: *size = sizeof(ctx->u.s.Legacy[1]); return &ctx->u.s.Legacy[1]; + case CV_AMD64_ST0 + 2: *size = sizeof(ctx->u.s.Legacy[2]); return &ctx->u.s.Legacy[2]; + case CV_AMD64_ST0 + 3: *size = sizeof(ctx->u.s.Legacy[3]); return &ctx->u.s.Legacy[3]; + case CV_AMD64_ST0 + 4: *size = sizeof(ctx->u.s.Legacy[4]); return &ctx->u.s.Legacy[4]; + case CV_AMD64_ST0 + 5: *size = sizeof(ctx->u.s.Legacy[5]); return &ctx->u.s.Legacy[5]; + case CV_AMD64_ST0 + 6: *size = sizeof(ctx->u.s.Legacy[6]); return &ctx->u.s.Legacy[6]; + case CV_AMD64_ST0 + 7: *size = sizeof(ctx->u.s.Legacy[7]); return &ctx->u.s.Legacy[7]; + + case CV_AMD64_EFLAGS: *size = sizeof(ctx->EFlags); return &ctx->EFlags; + case CV_AMD64_ES: *size = sizeof(ctx->SegEs); return &ctx->SegEs; + case CV_AMD64_CS: *size = sizeof(ctx->SegCs); return &ctx->SegCs; + case CV_AMD64_SS: *size = sizeof(ctx->SegSs); return &ctx->SegSs; + case CV_AMD64_DS: *size = sizeof(ctx->SegDs); return &ctx->SegDs; + case CV_AMD64_FS: *size = sizeof(ctx->SegFs); return &ctx->SegFs; + case CV_AMD64_GS: *size = sizeof(ctx->SegGs); return &ctx->SegGs; + + } +#endif + FIXME("Unknown register %x\n", regno); + return NULL; +} + +static const char* x86_64_fetch_regname(unsigned regno) +{ + switch (regno) + { + case CV_AMD64_RAX: return "rax"; + case CV_AMD64_RDX: return "rdx"; + case CV_AMD64_RCX: return "rcx"; + case CV_AMD64_RBX: return "rbx"; + case CV_AMD64_RSI: return "rsi"; + case CV_AMD64_RDI: return "rdi"; + case CV_AMD64_RBP: return "rbp"; + case CV_AMD64_RSP: return "rsp"; + case CV_AMD64_R8: return "r8"; + case CV_AMD64_R9: return "r9"; + case CV_AMD64_R10: return "r10"; + case CV_AMD64_R11: return "r11"; + case CV_AMD64_R12: return "r12"; + case CV_AMD64_R13: return "r13"; + case CV_AMD64_R14: return "r14"; + case CV_AMD64_R15: return "r15"; + case CV_AMD64_RIP: return "rip"; + + case CV_AMD64_XMM0 + 0: return "xmm0"; + case CV_AMD64_XMM0 + 1: return "xmm1"; + case CV_AMD64_XMM0 + 2: return "xmm2"; + case CV_AMD64_XMM0 + 3: return "xmm3"; + case CV_AMD64_XMM0 + 4: return "xmm4"; + case CV_AMD64_XMM0 + 5: return "xmm5"; + case CV_AMD64_XMM0 + 6: return "xmm6"; + case CV_AMD64_XMM0 + 7: return "xmm7"; + case CV_AMD64_XMM8 + 0: return "xmm8"; + case CV_AMD64_XMM8 + 1: return "xmm9"; + case CV_AMD64_XMM8 + 2: return "xmm10"; + case CV_AMD64_XMM8 + 3: return "xmm11"; + case CV_AMD64_XMM8 + 4: return "xmm12"; + case CV_AMD64_XMM8 + 5: return "xmm13"; + case CV_AMD64_XMM8 + 6: return "xmm14"; + case CV_AMD64_XMM8 + 7: return "xmm15"; + + case CV_AMD64_ST0 + 0: return "st0"; + case CV_AMD64_ST0 + 1: return "st1"; + case CV_AMD64_ST0 + 2: return "st2"; + case CV_AMD64_ST0 + 3: return "st3"; + case CV_AMD64_ST0 + 4: return "st4"; + case CV_AMD64_ST0 + 5: return "st5"; + case CV_AMD64_ST0 + 6: return "st6"; + case CV_AMD64_ST0 + 7: return "st7"; + + case CV_AMD64_EFLAGS: return "eflags"; + case CV_AMD64_ES: return "es"; + case CV_AMD64_CS: return "cs"; + case CV_AMD64_SS: return "ss"; + case CV_AMD64_DS: return "ds"; + case CV_AMD64_FS: return "fs"; + case CV_AMD64_GS: return "gs"; + } + FIXME("Unknown register %x\n", regno); + return NULL; +} struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, @@ -641,4 +763,6 @@ struct cpu cpu_x86_64 = { x86_64_stack_walk, x86_64_find_runtime_function, x86_64_map_dwarf_register, + x86_64_fetch_context_reg, + x86_64_fetch_regname, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9f47b32..728e464 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -481,6 +481,10 @@ struct cpu /* dwarf dedicated information */ unsigned (*map_dwarf_register)(unsigned regno); + + /* context related maniputation */ + void* (*fetch_context_reg)(CONTEXT* context, unsigned regno, unsigned* size); + const char* (*fetch_regname)(unsigned regno); }; extern struct cpu* dbghelp_current_cpu;

1 0

Eric Pouech : dbghelp: Added CFA information to dbghelp's dwarf.h.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0eef5d6809a4551e2395b53c4038e8bc5226bcd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eef5d6809a4551e2395b53c4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:06 2010 +0100 dbghelp: Added CFA information to dbghelp's dwarf.h. --- dlls/dbghelp/dwarf.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index a590df2..2a01c1b 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -418,3 +418,50 @@ enum dwarf_calling_convention #define DW_LNE_end_sequence 0x01 #define DW_LNE_set_address 0x02 #define DW_LNE_define_file 0x03 + +#define DW_CIE_ID ~(0x0) + +enum dwarf_call_frame_info +{ + DW_CFA_advance_loc = 0x40, + DW_CFA_offset = 0x80, + DW_CFA_restore = 0xc0, + DW_CFA_nop = 0x00, + DW_CFA_set_loc = 0x01, + DW_CFA_advance_loc1 = 0x02, + DW_CFA_advance_loc2 = 0x03, + DW_CFA_advance_loc4 = 0x04, + DW_CFA_offset_extended = 0x05, + DW_CFA_restore_extended = 0x06, + DW_CFA_undefined = 0x07, + DW_CFA_same_value = 0x08, + DW_CFA_register = 0x09, + DW_CFA_remember_state = 0x0a, + DW_CFA_restore_state = 0x0b, + DW_CFA_def_cfa = 0x0c, + DW_CFA_def_cfa_register = 0x0d, + DW_CFA_def_cfa_offset = 0x0e, + DW_CFA_def_cfa_expression = 0x0f, + DW_CFA_expression = 0x10, + DW_CFA_offset_extended_sf = 0x11, + DW_CFA_def_cfa_sf = 0x12, + DW_CFA_def_cfa_offset_sf = 0x13, + DW_CFA_val_offset = 0x14, + DW_CFA_val_offset_sf = 0x15, + DW_CFA_val_expression = 0x16, +}; + +#define DW_EH_PE_native 0x00 +#define DW_EH_PE_leb128 0x01 +#define DW_EH_PE_data2 0x02 +#define DW_EH_PE_data4 0x03 +#define DW_EH_PE_data8 0x04 +#define DW_EH_PE_signed 0x08 +#define DW_EH_PE_abs 0x00 +#define DW_EH_PE_pcrel 0x10 +#define DW_EH_PE_textrel 0x20 +#define DW_EH_PE_datarel 0x30 +#define DW_EH_PE_funcrel 0x40 +#define DW_EH_PE_aligned 0x50 +#define DW_EH_PE_indirect 0x80 +#define DW_EH_PE_omit 0xff

1 0

Eric Pouech : dbghelp: Added preliminary CFA management.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 036392c5d131d73e84ad0ed52a796b2cb9c1139d URL: http://source.winehq.org/git/wine.git/?a=commit;h=036392c5d131d73e84ad0ed52… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:11 2010 +0100 dbghelp: Added preliminary CFA management. --- dlls/dbghelp/cpu_x86_64.c | 19 +- dlls/dbghelp/dbghelp_private.h | 3 + dlls/dbghelp/dwarf.c | 697 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 716 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=036392c5d131d73e84ad0…

1 0

Eric Pouech : winedbg: Store for context variables only the offsets of each register ( instead of the address of the register in dbg_context).
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: ea21a32707340cb4f5781691b9ebaab96a9ccab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea21a32707340cb4f5781691b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:20 2010 +0100 winedbg: Store for context variables only the offsets of each register (instead of the address of the register in dbg_context). --- programs/winedbg/be_alpha.c | 8 +------- programs/winedbg/be_cpu.h | 8 +++----- programs/winedbg/be_i386.c | 11 +---------- programs/winedbg/be_ppc.c | 8 +------- programs/winedbg/be_x86_64.c | 11 +---------- programs/winedbg/debugger.h | 1 - programs/winedbg/memory.c | 4 ++-- programs/winedbg/winedbg.c | 15 ++++++++++----- 8 files changed, 19 insertions(+), 47 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 57bdfd1..3c470e7 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -54,12 +54,6 @@ static struct dbg_internal_var be_alpha_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_alpha_init_registers(CONTEXT* ctx) -{ - dbg_printf("not done\n"); - return be_alpha_ctx; -} - static unsigned be_alpha_is_step_over_insn(const void* insn) { dbg_printf("not done\n"); @@ -159,7 +153,7 @@ struct backend_cpu be_alpha = be_alpha_single_step, be_alpha_print_context, be_alpha_print_segment_info, - be_alpha_init_registers, + be_alpha_ctx, be_alpha_is_step_over_insn, be_alpha_is_function_return, be_alpha_is_break_insn, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 6679977..a08f8f0 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -59,11 +59,9 @@ struct backend_cpu * function empty */ void (*print_segment_info)(HANDLE hThread, const CONTEXT* ctx); - /* Do the initialization so that the debugger has internal variables linked - * to the context's registers - */ - const struct dbg_internal_var* - (*init_registers)(CONTEXT* ctx); + /* all the CONTEXT's relative variables, bound to this CPU */ + const struct dbg_internal_var* context_vars; + /* ------------------------------------------------------------------------------- * code inspection * -------------------------------------------------------------------------------*/ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 6ab5970..74676dd 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -290,15 +290,6 @@ static struct dbg_internal_var be_i386_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_i386_init_registers(CONTEXT* ctx) -{ - struct dbg_internal_var* div; - - for (div = be_i386_ctx; div->name; div++) - div->pval = (DWORD_PTR*)((char*)ctx + (DWORD)div->pval); - return be_i386_ctx; -} - static unsigned be_i386_is_step_over_insn(const void* insn) { BYTE ch; @@ -754,7 +745,7 @@ struct backend_cpu be_i386 = be_i386_single_step, be_i386_print_context, be_i386_print_segment_info, - be_i386_init_registers, + be_i386_ctx, be_i386_is_step_over_insn, be_i386_is_function_return, be_i386_is_break_insn, diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 9ba9994..22becf2 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -67,12 +67,6 @@ static struct dbg_internal_var be_ppc_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_ppc_init_registers(CONTEXT* ctx) -{ - dbg_printf("not done\n"); - return be_ppc_ctx; -} - static unsigned be_ppc_is_step_over_insn(const void* insn) { dbg_printf("not done\n"); @@ -183,7 +177,7 @@ struct backend_cpu be_ppc = be_ppc_single_step, be_ppc_print_context, be_ppc_print_segment_info, - be_ppc_init_registers, + be_ppc_ctx, be_ppc_is_step_over_insn, be_ppc_is_function_return, be_ppc_is_break_insn, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 682bd05..ac7f1fc 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -153,15 +153,6 @@ static struct dbg_internal_var be_x86_64_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx) -{ - struct dbg_internal_var* div; - - for (div = be_x86_64_ctx; div->name; div++) - div->pval = (DWORD_PTR*)((char*)ctx + (DWORD_PTR)div->pval); - return be_x86_64_ctx; -} - #define f_mod(b) ((b)>>6) #define f_reg(b) (((b)>>3)&0x7) #define f_rm(b) ((b)&0x7) @@ -561,7 +552,7 @@ struct backend_cpu be_x86_64 = be_x86_64_single_step, be_x86_64_print_context, be_x86_64_print_segment_info, - be_x86_64_init_registers, + be_x86_64_ctx, be_x86_64_is_step_over_insn, be_x86_64_is_function_return, be_x86_64_is_break_insn, diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 300f48a..373600a 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -488,7 +488,6 @@ static inline void* dbg_heap_realloc(void* buffer, size_t size) } extern struct dbg_internal_var dbg_internal_vars[]; -extern const struct dbg_internal_var* dbg_context_vars; #define DBG_IVARNAME(_var) dbg_internal_var_##_var #define DBG_IVARSTRUCT(_var) dbg_internal_vars[DBG_IVARNAME(_var)] diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 9554ea4..2b17dab 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -690,7 +690,7 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) return FALSE; } - for (div = dbg_context_vars; div->name; div++) + for (div = be_cpu->context_vars; div->name; div++) { if (div->val == regno) { @@ -703,7 +703,7 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) } } else - *value = div->pval; + *value = (DWORD_PTR*)((char*)&dbg_context + (DWORD_PTR)div->pval); if (buffer) lstrcpynA(buffer, div->name, len); return TRUE; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 78bf722..889bb3a 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -96,7 +96,6 @@ BOOL dbg_interactiveP = FALSE; static struct dbg_process* dbg_process_list = NULL; struct dbg_internal_var dbg_internal_vars[DBG_IV_LAST]; -const struct dbg_internal_var* dbg_context_vars; static HANDLE dbg_houtput; static void dbg_outputA(const char* buffer, int len) @@ -208,8 +207,7 @@ static unsigned dbg_load_internal_vars(void) } } RegCloseKey(hkey); - /* set up the debug variables for the CPU context */ - dbg_context_vars = be_cpu->init_registers(&dbg_context); + return TRUE; } @@ -245,9 +243,16 @@ const struct dbg_internal_var* dbg_get_internal_var(const char* name) { if (!strcmp(div->name, name)) return div; } - for (div = dbg_context_vars; div->name; div++) + for (div = be_cpu->context_vars; div->name; div++) { - if (!strcasecmp(div->name, name)) return div; + if (!strcasecmp(div->name, name)) + { + struct dbg_internal_var* ret = (void*)lexeme_alloc_size(sizeof(*ret)); + /* relocate register's field against current context */ + *ret = *div; + ret->pval = (DWORD_PTR*)((char*)&dbg_context + (DWORD_PTR)div->pval); + return ret; + } } return NULL;

1 0

Eric Pouech : dbghelp: In dwarf attribute parsing, ensure that we do have a block when parsing a block.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6a6edcd1ca8820145e36916b0dfdca48c38fb763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6edcd1ca8820145e36916b0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:44 2010 +0100 dbghelp: In dwarf attribute parsing, ensure that we do have a block when parsing a block. --- dlls/dbghelp/dwarf.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 94563af..1652f46 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -878,6 +878,13 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, loc->reg = Wine_DW_no_register; loc->offset = xloc.u.uvalue; return TRUE; + case DW_FORM_block: + case DW_FORM_block1: + case DW_FORM_block2: + case DW_FORM_block4: + break; + default: FIXME("Unsupported yet form %lx\n", xloc.form); + return FALSE; } /* assume we have a block form */

1 0