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

Nikolay Sivov : shlwapi: Fix some memory, handle and reference count leaks in RegisterDefaultAcceptHeaders.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 076676d448fe973b0b3da31af61b1ce0cd4fda3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=076676d448fe973b0b3da31af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 02:53:02 2010 +0300 shlwapi: Fix some memory, handle and reference count leaks in RegisterDefaultAcceptHeaders. --- dlls/shlwapi/ordinal.c | 63 +++++++++++++++++++++++++++-------------------- 1 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 6c3c1d0..7c2d87c 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -309,24 +309,22 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) BSTR property; IEnumFORMATETC* pIEnumFormatEtc = NULL; VARIANTARG var; - HRESULT hRet; - IWebBrowserApp* pBrowser = NULL; + HRESULT hr; + IWebBrowserApp* pBrowser; TRACE("(%p, %p)\n", lpBC, lpUnknown); - /* Get An IWebBrowserApp interface from lpUnknown */ - hRet = IUnknown_QueryService(lpUnknown, &IID_IWebBrowserApp, &IID_IWebBrowserApp, (PVOID)&pBrowser); - if (FAILED(hRet) || !pBrowser) - return E_NOINTERFACE; + hr = IUnknown_QueryService(lpUnknown, &IID_IWebBrowserApp, &IID_IWebBrowserApp, (void**)&pBrowser); + if (FAILED(hr)) + return hr; V_VT(&var) = VT_EMPTY; /* The property we get is the browsers clipboard enumerator */ property = SysAllocString(szProperty); - hRet = IWebBrowserApp_GetProperty(pBrowser, property, &var); + hr = IWebBrowserApp_GetProperty(pBrowser, property, &var); SysFreeString(property); - if (FAILED(hRet)) - return hRet; + if (FAILED(hr)) goto exit; if (V_VT(&var) == VT_EMPTY) { @@ -340,7 +338,10 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) if (!RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\Current" "Version\\Internet Settings\\Accepted Documents", &hDocs)) - return E_FAIL; + { + hr = E_FAIL; + goto exit; + } /* Get count of values in key */ while (!dwRet) @@ -355,7 +356,11 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) /* Note: dwCount = number of items + 1; The extra item is the end node */ format = formatList = HeapAlloc(GetProcessHeap(), 0, dwCount * sizeof(FORMATETC)); if (!formatList) - return E_OUTOFMEMORY; + { + RegCloseKey(hDocs); + hr = E_OUTOFMEMORY; + goto exit; + } if (dwNumValues > 1) { @@ -372,7 +377,12 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) dwRet = RegEnumValueA(hDocs, dwCount, szKeyBuff, &dwKeySize, 0, &dwType, (PBYTE)szValueBuff, &dwValueSize); if (!dwRet) - return E_FAIL; + { + HeapFree(GetProcessHeap(), 0, formatList); + RegCloseKey(hDocs); + hr = E_FAIL; + goto exit; + } format->cfFormat = RegisterClipboardFormatA(szValueBuff); format->ptd = NULL; @@ -385,6 +395,8 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) } } + RegCloseKey(hDocs); + /* Terminate the (maybe empty) list, last entry has a cfFormat of 0 */ format->cfFormat = 0; format->ptd = NULL; @@ -393,22 +405,21 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) format->tymed = -1; /* Create a clipboard enumerator */ - hRet = CreateFormatEnumerator(dwNumValues, formatList, &pIEnumFormatEtc); - - if (FAILED(hRet) || !pIEnumFormatEtc) - return hRet; + hr = CreateFormatEnumerator(dwNumValues, formatList, &pIEnumFormatEtc); + HeapFree(GetProcessHeap(), 0, formatList); + if (FAILED(hr)) goto exit; /* Set our enumerator as the browsers property */ V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)pIEnumFormatEtc; property = SysAllocString(szProperty); - hRet = IWebBrowserApp_PutProperty(pBrowser, property, var); + hr = IWebBrowserApp_PutProperty(pBrowser, property, var); SysFreeString(property); - if (FAILED(hRet)) + if (FAILED(hr)) { IEnumFORMATETC_Release(pIEnumFormatEtc); - goto RegisterDefaultAcceptHeaders_Exit; + goto exit; } } @@ -422,28 +433,26 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) /* Get an IEnumFormatEtc interface from the variants value */ pIEnumFormatEtc = NULL; - hRet = IUnknown_QueryInterface(pIUnknown, &IID_IEnumFORMATETC, - (PVOID)&pIEnumFormatEtc); - if (hRet == S_OK && pIEnumFormatEtc) + hr = IUnknown_QueryInterface(pIUnknown, &IID_IEnumFORMATETC, (void**)&pIEnumFormatEtc); + if (hr == S_OK && pIEnumFormatEtc) { /* Clone and register the enumerator */ - hRet = IEnumFORMATETC_Clone(pIEnumFormatEtc, &pClone); - if (hRet == S_OK && pClone) + hr = IEnumFORMATETC_Clone(pIEnumFormatEtc, &pClone); + if (hr == S_OK && pClone) { RegisterFormatEnumerator(lpBC, pClone, 0); IEnumFORMATETC_Release(pClone); } - /* Release the IEnumFormatEtc interface */ IEnumFORMATETC_Release(pIUnknown); } IUnknown_Release(V_UNKNOWN(&var)); } -RegisterDefaultAcceptHeaders_Exit: +exit: IWebBrowserApp_Release(pBrowser); - return hRet; + return hr; } /*************************************************************************

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 5ca6d9b5be30b359a401c74dd2bce368f2f82a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca6d9b5be30b359a401c74dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:55:34 2010 +0100 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8a8766a..a5d8e4a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1099,7 +1099,7 @@ static void test_CreateTypeLib(void) { funcdesc.invkind = INVOKE_PROPERTYGET; funcdesc.callconv = CC_STDCALL; funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; - funcdesc.elemdescFunc.idldesc.wIDLFlags = IDLFLAG_NONE; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); @@ -1122,8 +1122,8 @@ static void test_CreateTypeLib(void) { ok(hres == TYPE_E_INCONSISTENTPROPFUNCS, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_BSTR; - elemdesc[0].idldesc.dwReserved = 0; - elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; funcdesc.lprgelemdescParam = elemdesc; funcdesc.invkind = INVOKE_PROPERTYPUT; @@ -1158,40 +1158,40 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_PTR; - elemdesc[0].tdesc.lptdesc = &typedesc1; + U(elemdesc[0].tdesc).lptdesc = &typedesc1; typedesc1.vt = VT_BSTR; funcdesc.cParams = 1; funcdesc.lprgelemdescParam = elemdesc; hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].tdesc.lptdesc = &typedesc2; + U(elemdesc[0].tdesc).lptdesc = &typedesc2; typedesc2.vt = VT_PTR; - typedesc2.lptdesc = &typedesc1; + U(typedesc2).lptdesc = &typedesc1; hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_INT; - elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[0].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; V_VT(&paramdescex.varDefaultValue) = VT_INT; V_INT(&paramdescex.varDefaultValue) = 0x123; hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].idldesc.dwReserved = 0; - elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; elemdesc[1].tdesc.vt = VT_UI2; - elemdesc[1].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[1].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[1]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[1]).paramdesc.pparamdescex = &paramdescex; V_VT(&paramdescex.varDefaultValue) = VT_UI2; V_UI2(&paramdescex.varDefaultValue) = 0xffff; funcdesc.cParams = 2; hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[0].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; elemdesc[1].tdesc.vt = VT_INT; V_VT(&paramdescex.varDefaultValue) = VT_INT; V_INT(&paramdescex.varDefaultValue) = 0xffffffff;

1 0

Francois Gouget : gdiplus/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 5aca2dd9642eb698bce560978223af4b5457f29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aca2dd9642eb698bce560978… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:54:22 2010 +0100 gdiplus/tests: Fix compilation on systems that don't support nameless unions. --- dlls/gdiplus/tests/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f0dc681..262f9a2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -913,7 +913,7 @@ static void test_loadwmf(void) expect(0, header.Y); todo_wine expect(320, header.Width); todo_wine expect(320, header.Height); - todo_wine expect(1, header.WmfHeader.mtType); + todo_wine expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY); @@ -971,7 +971,7 @@ static void test_createfromwmf(void) expect(0, header.Y); todo_wine expect(320, header.Width); todo_wine expect(320, header.Height); - todo_wine expect(1, header.WmfHeader.mtType); + todo_wine expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY);

1 0

Vincent Povirk : mscoree: Stub ClrCreateManagedInstance.
by Alexandre Julliard March 29, 2010

March 29, 2010

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 : winedbg: Store for context variables only the offsets of each register ( instead of the address of the register in dbg_context).
by Alexandre Julliard March 29, 2010

March 29, 2010

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: Keep the . debug_frame section mapped when parsing dwarf debug_info ( needed for CFA management).
by Alexandre Julliard March 29, 2010

March 29, 2010

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 March 29, 2010

March 29, 2010

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: Rewrite SymGetModuleBase so that it relies on 64 bit version.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 0c2401369c20ebe7e69cc3c9f1ff419ee249a3e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2401369c20ebe7e69cc3c9f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:09:02 2010 +0100 dbghelp: Rewrite SymGetModuleBase so that it relies on 64 bit version. --- dlls/dbghelp/module.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index eadc67a..8f12fef 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1034,13 +1034,10 @@ BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, */ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) { - struct process* pcs = process_find_by_handle(hProcess); - struct module* module; + DWORD64 ret; - if (!pcs) return 0; - module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); - if (!module) return 0; - return module->module.BaseOfImage; + ret = SymGetModuleBase64(hProcess, dwAddr); + return validate_addr64(ret) ? ret : 0; } /*********************************************************************** @@ -1048,8 +1045,13 @@ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) */ DWORD64 WINAPI SymGetModuleBase64(HANDLE hProcess, DWORD64 dwAddr) { - if (!validate_addr64(dwAddr)) return 0; - return SymGetModuleBase(hProcess, (DWORD)dwAddr); + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + + if (!pcs) return 0; + module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); + if (!module) return 0; + return module->module.BaseOfImage; } /******************************************************************

1 0

Eric Pouech : dbghelp: When unwinding the stack, stop if the current address isn't in a known module.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 060ccb123a04f9ce34e8ec6235c46e1720fa7392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060ccb123a04f9ce34e8ec623… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:09:08 2010 +0100 dbghelp: When unwinding the stack, stop if the current address isn't in a known module. --- dlls/dbghelp/cpu_x86_64.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c664fd9..f07d8e4 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -516,10 +516,8 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, deltapc = 1; } - if (frame->AddrPC.Offset && (base = sw_module_base(csw, frame->AddrPC.Offset))) - frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); - else - frame->FuncTableEntry = NULL; + if (!frame->AddrPC.Offset || !(base = sw_module_base(csw, frame->AddrPC.Offset))) goto done_err; + frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; if (frame->FuncTableEntry) {

1 0

Eric Pouech : dbghelp: In dwarf parsing, correctly handle the DW_OP_regx option.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: a5293895a34c0cbf4f6db0585a1c48a025ddaee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5293895a34c0cbf4f6db0585… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:55 2010 +0100 dbghelp: In dwarf parsing, correctly handle the DW_OP_regx option. --- dlls/dbghelp/dwarf.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1652f46..78860d7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -690,7 +690,6 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, } stack[++stk] = dwarf2_leb128_as_signed(ctx); loc->kind = loc_regrel; - break; } else switch (op) { @@ -736,18 +735,22 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, case DW_OP_skip: tmp = dwarf2_parse_u2(ctx); ctx->data += tmp; break; case DW_OP_bra: tmp = dwarf2_parse_u2(ctx); if (!stack[stk--]) ctx->data += tmp; break; case DW_OP_regx: - if (loc->reg != Wine_DW_no_register) - FIXME("Only supporting one regx\n"); - loc->reg = dwarf2_map_register(dwarf2_leb128_as_unsigned(ctx)); + tmp = dwarf2_leb128_as_unsigned(ctx); + if (!piece_found) + { + if (loc->reg != Wine_DW_no_register) + FIXME("Only supporting one reg\n"); + loc->reg = dwarf2_map_register(tmp); + } loc->kind = loc_register; break; case DW_OP_bregx: tmp = dwarf2_leb128_as_unsigned(ctx); - ctx->data++; if (loc->reg != Wine_DW_no_register) FIXME("Only supporting one regx\n"); - loc->reg = dwarf2_map_register(tmp) + dwarf2_leb128_as_signed(ctx); - loc->kind = loc_register; + loc->reg = dwarf2_map_register(tmp); + stack[++stk] = dwarf2_leb128_as_signed(ctx); + loc->kind = loc_regrel; break; case DW_OP_fbreg: if (loc->reg != Wine_DW_no_register)

1 0