wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Eric Pouech : dbghelp: Implemented SymFunctionTableAccess.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: bf97b03db5daea7d0d622fa21d2a40875fe259f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf97b03db5daea7d0d622fa21… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:47:24 2010 +0100 dbghelp: Implemented SymFunctionTableAccess. --- dlls/dbghelp/cpu_i386.c | 1 + dlls/dbghelp/cpu_ppc.c | 1 + dlls/dbghelp/cpu_x86_64.c | 30 ++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/module.c | 23 +++++++++++++++++++++++ dlls/dbghelp/symbol.c | 18 ------------------ 6 files changed, 58 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index f3de652..47610e6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -409,4 +409,5 @@ struct cpu cpu_i386 = { 4, i386_get_addr, i386_stack_walk, + NULL, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index fca5ec7..6efa3f8 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -59,4 +59,5 @@ struct cpu cpu_ppc = { 4, ppc_get_addr, ppc_stack_walk, + NULL, }; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index cd0e32c..a56a800 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -124,9 +124,39 @@ done_err: return FALSE; } +static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr) +{ +#ifdef __x86_64__ + RUNTIME_FUNCTION* rtf; + ULONG size; + int min, max; + + rtf = (RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size); + if (rtf) for (min = 0, max = size / sizeof(*rtf); min <= max; ) + { + int pos = (min + max) / 2; + if (addr < module->module.BaseOfImage + rtf[pos].BeginAddress) max = pos - 1; + else if (addr >= module->module.BaseOfImage + rtf[pos].EndAddress) min = pos + 1; + else + { + rtf += pos; + while (rtf->UnwindData & 1) /* follow chained entry */ + { + FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); + /* we need to read into the other process */ + /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ + } + return rtf; + } + } +#endif + return NULL; +} + struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, 8, x86_64_get_addr, x86_64_stack_walk, + x86_64_find_runtime_function, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 42234ee..54b7272 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -475,6 +475,9 @@ struct cpu /* stack manipulation */ BOOL (*stack_walk)(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame); + + /* module manipulation */ + void* (*find_runtime_function)(struct module*, DWORD64 addr); }; extern struct cpu* dbghelp_current_cpu; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 250c5a5..eadc67a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1087,3 +1087,26 @@ BOOL WINAPI SymRefreshModuleList(HANDLE hProcess) return refresh_module_list(pcs); } + +/*********************************************************************** + * SymFunctionTableAccess (DBGHELP.@) + */ +PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) +{ + return SymFunctionTableAccess64(hProcess, AddrBase); +} + +/*********************************************************************** + * SymFunctionTableAccess64 (DBGHELP.@) + */ +PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) +{ + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + + if (!pcs || !dbghelp_current_cpu->find_runtime_function) return NULL; + module = module_find_by_addr(pcs, AddrBase, DMT_UNKNOWN); + if (!module) return NULL; + + return dbghelp_current_cpu->find_runtime_function(module, AddrBase); +} diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 650f6a2..fa9459e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1794,24 +1794,6 @@ BOOL WINAPI SymGetLineNext(HANDLE hProcess, PIMAGEHLP_LINE Line) } /*********************************************************************** - * SymFunctionTableAccess (DBGHELP.@) - */ -PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) -{ - WARN("(%p, 0x%08x): stub\n", hProcess, AddrBase); - return NULL; -} - -/*********************************************************************** - * SymFunctionTableAccess64 (DBGHELP.@) - */ -PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) -{ - WARN("(%p, %s): stub\n", hProcess, wine_dbgstr_longlong(AddrBase)); - return NULL; -} - -/*********************************************************************** * SymUnDName (DBGHELP.@) */ BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL sym, PSTR UnDecName, DWORD UnDecNameLength)

1 0

Eric Pouech : dbghelp: Added helper to image_file_map to map also directory out of PE executables .
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 2ed8b9f6b6aac5580d2ce5dd064e8bf26272bb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed8b9f6b6aac5580d2ce5dd0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:47:18 2010 +0100 dbghelp: Added helper to image_file_map to map also directory out of PE executables. --- dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/pe_module.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5ea2e82..42234ee 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -570,6 +570,9 @@ extern struct module* DWORD64 base, DWORD64 size); extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module); +extern const char* pe_map_directory(struct module* module, int dirno, DWORD* size); +extern void pe_unmap_directoy(struct module* module, int dirno); + /* source.c */ extern unsigned source_new(struct module* module, const char* basedir, const char* source); extern const char* source_get(const struct module* module, unsigned idx); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 63a2b9a..61b8c5e 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -257,6 +257,35 @@ static void pe_unmap_file(struct image_file_map* fmap) } } +/****************************************************************** + * pe_map_directory + * + * Maps a directory content out of a PE file + */ +const char* pe_map_directory(struct module* module, int dirno, DWORD* size) +{ + IMAGE_NT_HEADERS* nth; + void* mapping; + + if (module->type != DMT_PE || !module->format_info[DFI_PE]) return NULL; + if (dirno >= IMAGE_NUMBEROF_DIRECTORY_ENTRIES || + !(mapping = pe_map_full(&module->format_info[DFI_PE]->u.pe_info->fmap, &nth))) + return NULL; + if (size) *size = nth->OptionalHeader.DataDirectory[dirno].Size; + return RtlImageRvaToVa(nth, mapping, + nth->OptionalHeader.DataDirectory[dirno].VirtualAddress, NULL); +} + +/****************************************************************** + * pe_unmap_directory + * + * Unmaps a directory content + */ +void pe_unmap_directory(struct image_file_map* fmap, int dirno) +{ + pe_unmap_full(fmap); +} + static void pe_module_remove(struct process* pcs, struct module_format* modfmt) { pe_unmap_file(&modfmt->u.pe_info->fmap);

1 0

Francois Gouget : Assorted spelling and case fixes.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 3428b94a8d8db96ff157c3c9144679ef9946898a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3428b94a8d8db96ff157c3c91… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:24:53 2010 +0100 Assorted spelling and case fixes. --- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/inetcomm/tests/mimeintl.c | 2 +- dlls/kernel32/tests/path.c | 2 +- dlls/mmdevapi/tests/propstore.c | 2 +- dlls/mmdevapi/tests/render.c | 4 ++-- dlls/msdaps/row_server.c | 8 ++++---- dlls/mshtml/view.c | 2 +- dlls/msvfw32/mciwnd.c | 2 +- dlls/oleaut32/tests/dispatch.c | 2 +- dlls/oleaut32/tests/olefont.c | 5 +++-- dlls/qedit/samplegrabber.c | 2 +- dlls/quartz/tests/dsoundrender.c | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 4 ++-- dlls/shlwapi/url.c | 2 +- dlls/urlmon/urlmon_urlmon.idl | 2 +- dlls/urlmon/usrmarshal.c | 2 +- dlls/user32/tests/combo.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- dlls/winmm/winmm.c | 2 +- include/amaudio.h | 2 +- include/devpkey.h | 2 +- include/devpropdef.h | 2 +- include/propkey.h | 2 +- 24 files changed, 31 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3428b94a8d8db96ff157c…

1 0

Francois Gouget : shell32/tests: Remove spaces before '\n'.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 1cc79eaef74a6073b936cdb65fe7e06ff8384f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc79eaef74a6073b936cdb65… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:23:44 2010 +0100 shell32/tests: Remove spaces before '\n'. --- dlls/shell32/tests/shlexec.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ffdf393..ef69e19 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -878,7 +878,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -888,7 +888,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -897,7 +897,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s \n", + "expected failure (2), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -907,7 +907,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc>32 || broken(rc == 2) /* Win9x/2000 */, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -917,7 +917,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -927,7 +927,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s \n", + "expected failure (2), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -938,7 +938,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s \n", + "expected failure (2), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -948,7 +948,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, shorttmpdir); rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -957,7 +957,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, shorttmpdir); rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); }

1 0

Francois Gouget : qedit: Don't cast NULL.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: e18e1c19fd9b3e1c90f409e596a4e069acd46212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18e1c19fd9b3e1c90f409e59… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:24:01 2010 +0100 qedit: Don't cast NULL. --- dlls/qedit/samplegrabber.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 1875c51..73b952f 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1264,7 +1264,7 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; - *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : (const AM_MEDIA_TYPE *)NULL); + *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL); return *mtypes ? S_OK : E_OUTOFMEMORY; }

1 0

Francois Gouget : appwiz.cpl: Use SUBLANG_NEUTRAL for Spanish.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 24517db1fb6e44bed16f801025622164b8ab004a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24517db1fb6e44bed16f80102… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:23:57 2010 +0100 appwiz.cpl: Use SUBLANG_NEUTRAL for Spanish. --- dlls/appwiz.cpl/Es.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/Es.rc b/dlls/appwiz.cpl/Es.rc index 7826e06..cb2688c 100644 --- a/dlls/appwiz.cpl/Es.rc +++ b/dlls/appwiz.cpl/Es.rc @@ -23,7 +23,7 @@ #pragma code_page(65001) -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE {

1 0

Francois Gouget : hlink/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: da00e1558e8c52e69fb5ed3e6588dcdd2f9fc7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da00e1558e8c52e69fb5ed3e6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:25:14 2010 +0100 hlink/tests: Add a trailing '\n' to an ok() call. --- dlls/hlink/tests/browse_ctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 30cd559..e25333d 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -123,7 +123,7 @@ static void test_BrowseWindowInfo(void) hres = IHlinkBrowseContext_GetBrowseWindowInfo(bc, &bwinfo_get); ok(hres == S_OK, "GetBrowseWindowInfo failed: 0x%08x\n", hres); - ok(!memcmp(&bwinfo_set, &bwinfo_get, sizeof(HLBWINFO)), "Set and Get differ"); + ok(!memcmp(&bwinfo_set, &bwinfo_get, sizeof(HLBWINFO)), "Set and Get differ\n"); } START_TEST(browse_ctx)

1 0

Francois Gouget : msxml3: Add a trailing '\n' to a TRACE().
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 3127501f86962d5466c0848af1373e327f9354bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3127501f86962d5466c0848af… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:24:04 2010 +0100 msxml3: Add a trailing '\n' to a TRACE(). --- dlls/msxml3/element.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index b6caf73..617c008 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -594,7 +594,7 @@ static HRESULT WINAPI domelem_removeAttribute( IXMLDOMNamedNodeMap *attr; HRESULT hr; - TRACE("(%p)->(%s)", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); hr = IXMLDOMElement_get_attributes(iface, &attr); if (hr != S_OK) return hr;

1 0

Francois Gouget : comctl32/tests: fix an ok() call's trailing '\n'.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 2659ac14f89f77c02d8b531f9b28e585f4a3260e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2659ac14f89f77c02d8b531f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:25:31 2010 +0100 comctl32/tests: fix an ok() call's trailing '\n'. --- dlls/comctl32/tests/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 06e7b87..839b138 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -541,7 +541,7 @@ static void test_notify(void) wclass.lpszClassName = "TestNotifyParentClass"; wclass.lpfnWndProc = test_notify_parent_proc; atom = RegisterClassA(&wclass); - ok(atom, "RegisterClass failed!n"); + ok(atom, "RegisterClass failed\n"); /* create parent */ hwndParent = CreateWindow(wclass.lpszClassName, "parent", WS_OVERLAPPEDWINDOW,

1 0

Francois Gouget : dxdiagn/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: f096b023c41a51c3cf32da0a9f20c73483362b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f096b023c41a51c3cf32da0a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:25:20 2010 +0100 dxdiagn/tests: Add a trailing '\n' to an ok() call. --- dlls/dxdiagn/tests/container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index e525709..6557e37 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -279,7 +279,7 @@ static void test_GetChildContainer(void) ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); if (SUCCEEDED(hr)) - todo_wine ok(ptr != child, "Expected the two pointers (%p vs. %p) to be unequal", child, ptr); + todo_wine ok(ptr != child, "Expected the two pointers (%p vs. %p) to be unequal\n", child, ptr); IDxDiagContainer_Release(ptr); IDxDiagContainer_Release(child);

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010