November 2008 - Wine-Commits

Hans Leidekker : user32: Add a stub implementation of ChangeWindowMessageFilter.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 066a8f442dd40545403228907cbb427fde94cf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=066a8f442dd40545403228907… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 11 10:18:11 2008 +0100 user32: Add a stub implementation of ChangeWindowMessageFilter. --- dlls/user32/message.c | 9 +++++++++ dlls/user32/user32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index aeda7b3..e049d57 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3701,3 +3701,12 @@ BOOL WINAPI IsHungAppWindow( HWND hWnd ) SERVER_END_REQ; return ret; } + +/****************************************************************** + * ChangeWindowMessageFilter (USER32.@) + */ +BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) +{ + FIXME( "%x %08x\n", message, flag ); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f19178d..8d55717 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -37,6 +37,7 @@ @ stdcall ChangeDisplaySettingsW(ptr long) @ stdcall ChangeMenuA(long long ptr long long) @ stdcall ChangeMenuW(long long ptr long long) +@ stdcall ChangeWindowMessageFilter(long long) @ stdcall CharLowerA(str) @ stdcall CharLowerBuffA(str long) @ stdcall CharLowerBuffW(wstr long)

1 0

Paul Vriens : urlmon/tests: Skip some tests on Win9x and WinMe.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 7a723944b88be1de9c42d4e017ab3ec7547fdcaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a723944b88be1de9c42d4e01… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 11 10:09:39 2008 +0100 urlmon/tests: Skip some tests on Win9x and WinMe. --- dlls/urlmon/tests/protocol.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 6c933af..bdd5a85 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1423,8 +1423,14 @@ static void test_file_protocol(void) { trace("Testing file protocol...\n"); tested_protocol = FILE_TEST; + SetLastError(0xdeadbeef); file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(!file && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Detected Win9x or WinMe\n"); + return; + } ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) return;

1 0

Paul Vriens : advapi32/tests: Fix valgrind warning.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: bf8ca52abfc902878389f0daaab09c0a6cc2492e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8ca52abfc902878389f0daa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 11 08:14:15 2008 +0100 advapi32/tests: Fix valgrind warning. --- dlls/advapi32/tests/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index f961a8b..d6d321c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -882,7 +882,7 @@ static void test_query_svc(void) /* Only info level is correct. It looks like the buffer/size is checked second */ SetLastError(0xdeadbeef); ret = pQueryServiceStatusEx(NULL, 0, NULL, 0, &needed); - /* NT4 checks the handle first */ + /* NT4 and Wine check the handle first */ if (GetLastError() != ERROR_INVALID_HANDLE) { ok(!ret, "Expected failure\n"); @@ -893,7 +893,7 @@ static void test_query_svc(void) } /* Pass a correct buffer and buffersize but a NULL handle */ - statusproc = HeapAlloc(GetProcessHeap(), 0, needed); + statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); bufsize = needed; SetLastError(0xdeadbeef); ret = pQueryServiceStatusEx(NULL, 0, (BYTE*)statusproc, bufsize, &needed);

1 0

Paul Vriens : ole32/tests: Don't crash on NT4.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: a9c3d6f20729c3ea6067431150387f01da2a6e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c3d6f20729c3ea606743115… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 11 07:48:04 2008 +0100 ole32/tests: Don't crash on NT4. --- dlls/ole32/tests/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 60e85cf..087d5cb 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -158,9 +158,9 @@ static void test_marshal_HGLOBAL(void) static HENHMETAFILE create_emf(void) { - RECT rect = {0, 0, 100, 100}; + const RECT rect = {0, 0, 100, 100}; HDC hdc = CreateEnhMetaFile(NULL, NULL, &rect, "HENHMETAFILE Marshaling Test\0Test\0\0"); - ExtTextOut(hdc, 0, 0, ETO_OPAQUE, NULL, "Test String", strlen("Test String"), NULL); + ExtTextOut(hdc, 0, 0, ETO_OPAQUE, &rect, "Test String", strlen("Test String"), NULL); return CloseEnhMetaFile(hdc); }

1 0

Dmitry Timoshkov : widl: Make the generated string pointers const as well.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: d560b7bbb07980cec575a890f328f3baff8650d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d560b7bbb07980cec575a890f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Nov 11 13:06:43 2008 +0800 widl: Make the generated string pointers const as well. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5a6e592..775bef6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3348,7 +3348,7 @@ void write_endpoints( FILE *f, const char *prefix, const str_list_t *list ) const char *p; /* this should be an array of RPC_PROTSEQ_ENDPOINT but we want const strings */ - print_file( f, 0, "static const unsigned char * %s__RpcProtseqEndpoint[][2] =\n{\n", prefix ); + print_file( f, 0, "static const unsigned char * const %s__RpcProtseqEndpoint[][2] =\n{\n", prefix ); LIST_FOR_EACH_ENTRY( endpoint, list, const struct str_list_entry_t, entry ) { print_file( f, 1, "{ (const unsigned char *)\"" );

1 0

Andrew Talbot : setupapi: Sign-compare warnings fix.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 1c64c934db07bf9e6431ee43c6e9a53e58c78120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c64c934db07bf9e6431ee43c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 10 19:37:42 2008 +0000 setupapi: Sign-compare warnings fix. --- dlls/setupapi/devinst.c | 5 +++-- dlls/setupapi/parser.c | 2 +- dlls/setupapi/query.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index af4f4d3..f134da1 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1349,7 +1349,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoA( static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) { LPCWSTR ptr; - DWORD devNameLen = lstrlenW(devName), devInst = 0; + int devNameLen = lstrlenW(devName); + DWORD devInst = 0; BOOL valid = TRUE; TRACE("%s\n", debugstr_w(devName)); @@ -1704,7 +1705,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW( return FALSE; } TRACE("instance ID: %s\n", debugstr_w(devInfo->instanceId)); - if (DeviceInstanceIdSize < lstrlenW(devInfo->instanceId) + 1) + if (DeviceInstanceIdSize < strlenW(devInfo->instanceId) + 1) { SetLastError(ERROR_INSUFFICIENT_BUFFER); if (RequiredSize) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 8c8a518..c2bd84c 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -199,7 +199,7 @@ static struct line *find_line( struct inf_file *file, int section_index, const W { struct section *section; struct line *line; - int i; + unsigned int i; if (section_index < 0 || section_index >= file->nb_sections) return NULL; section = file->sections[section_index]; diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index c5dce78..f44826d 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -580,7 +580,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, INFCONTEXT ctx; WCHAR *dir; - INT size; + unsigned int size; TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer, buffer_size, required_size); @@ -591,7 +591,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, if (!(dir = PARSER_get_dest_dir( context ? context : &ctx ))) return FALSE; - size = lstrlenW( dir ) + 1; + size = strlenW( dir ) + 1; if (required_size) *required_size = size; if (buffer)

1 0

Eric Pouech : winedbg: Added scoped symbol picker, and options to handle it .
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 583e051044a97bd247cfb04b47be674059b48c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583e051044a97bd247cfb04b4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 10 15:03:10 2008 +0100 winedbg: Added scoped symbol picker, and options to handle it. --- programs/winedbg/debugger.h | 2 ++ programs/winedbg/symbol.c | 32 ++++++++++++++++++++++++++++++++ programs/winedbg/winedbg.c | 15 +++++++++++++++ 3 files changed, 49 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 12ab719..319f0dc 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -401,6 +401,8 @@ typedef enum sym_get_lval (*symbol_picker_t)(const char* name, const struct sgv_ extern symbol_picker_t symbol_current_picker; extern enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_data* sgv, struct dbg_lvalue* rtn); +extern enum sym_get_lval symbol_picker_scoped(const char* name, const struct sgv_data* sgv, + struct dbg_lvalue* rtn); /* tgt_active.c */ extern void dbg_run_debuggee(const char* args); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 56f814b..90c5510 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -251,6 +251,38 @@ enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_d return sglv_found; } +enum sym_get_lval symbol_picker_scoped(const char* name, const struct sgv_data* sgv, + struct dbg_lvalue* rtn) +{ + unsigned i; + int local = -1; + + for (i = 0; i < sgv->num; i++) + { + if (sgv->num - sgv->num_thunks > 1 && (sgv->syms[i].flags & SYMFLAG_THUNK) && !DBG_IVAR(AlwaysShowThunks)) + continue; + if (sgv->syms[i].flags & SYMFLAG_LOCAL) + { + if (local == -1) + local = i; + else + { + /* FIXME: several locals with same name... which one to pick ?? */ + dbg_printf("Several local variables/parameters for %s, aborting\n", name); + return sglv_aborted; + } + } + } + if (local != -1) + { + *rtn = sgv->syms[local].lvalue; + return sglv_found; + } + /* no locals found, multiple globals... abort for now */ + dbg_printf("Several global variables for %s, aborting\n", name); + return sglv_aborted; +} + symbol_picker_t symbol_current_picker = symbol_picker_interactive; /*********************************************************************** diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 3fefd4c..d1df695 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -517,6 +517,21 @@ void dbg_set_option(const char* option, const char* val) } SymSetOptions(opt); } + else if (!strcasecmp(option, "symbol_picker")) + { + if (!val) + dbg_printf("Option: symbol_picker %s\n", + symbol_current_picker == symbol_picker_interactive ? "interactive" : "scoped"); + else if (!strcasecmp(val, "interactive")) + symbol_current_picker = symbol_picker_interactive; + else if (!strcasecmp(val, "scoped")) + symbol_current_picker = symbol_picker_scoped; + else + { + dbg_printf("Syntax: symbol_picker [interactive|scoped]\n"); + return; + } + } else dbg_printf("Unknown option '%s'\n", option); }

1 0

Eric Pouech : winedbg: Slightly change the option setting syntax ( allows also to get the current state back).
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 508414313e2736b991c8a0bde4476cb11d3975e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508414313e2736b991c8a0bde… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 10 15:03:02 2008 +0100 winedbg: Slightly change the option setting syntax (allows also to get the current state back). --- programs/winedbg/dbg.y | 4 ++-- programs/winedbg/debugger.h | 2 +- programs/winedbg/winedbg.c | 15 +++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index c88d3e8..33ca896 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -210,8 +210,8 @@ set_command: | tSET '-' tIDENTIFIER { info_wine_dbg_channel(FALSE, NULL, $3); } | tSET tIDENTIFIER '+' tIDENTIFIER { info_wine_dbg_channel(TRUE, $2, $4); } | tSET tIDENTIFIER '-' tIDENTIFIER { info_wine_dbg_channel(FALSE, $2, $4); } - | tSET '!' tIDENTIFIER '+' { dbg_set_option($3, TRUE); } - | tSET '!' tIDENTIFIER '-' { dbg_set_option($3, FALSE); } + | tSET '!' tIDENTIFIER tIDENTIFIER { dbg_set_option($3, $4); } + | tSET '!' tIDENTIFIER { dbg_set_option($3, NULL); } ; x_command: diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 6c7cde3..12ab719 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -456,7 +456,7 @@ extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD base, DWORD size); extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod); -extern void dbg_set_option(const char*, BOOL); +extern void dbg_set_option(const char*, const char*); /* gdbproxy.c */ extern int gdb_main(int argc, char* argv[]); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index ab66148..3fefd4c 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -501,13 +501,20 @@ void dbg_del_thread(struct dbg_thread* t) HeapFree(GetProcessHeap(), 0, t); } -void dbg_set_option(const char* option, BOOL enable) +void dbg_set_option(const char* option, const char* val) { - if (!strcmp(option, "module")) + if (!strcasecmp(option, "module_load_mismatched")) { DWORD opt = SymGetOptions(); - if (enable) opt |= SYMOPT_LOAD_ANYTHING; - else opt &= ~SYMOPT_LOAD_ANYTHING; + if (!val) + dbg_printf("Option: module_load_mismatched %s\n", opt & SYMOPT_LOAD_ANYTHING ? "true" : "false"); + else if (!strcasecmp(val, "true")) opt |= SYMOPT_LOAD_ANYTHING; + else if (!strcasecmp(val, "false")) opt &= ~SYMOPT_LOAD_ANYTHING; + else + { + dbg_printf("Syntax: module_load_mismatched [true|false]\n"); + return; + } SymSetOptions(opt); } else dbg_printf("Unknown option '%s'\n", option);

1 0

Lei Zhang : comctl32: Check for NULL input in TAB_AdjustRect.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 87ca1b94165275e045de109fc33fcf15bab84b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ca1b94165275e045de109fc… Author: Lei Zhang <thestig(a)google.com> Date: Mon Nov 10 20:39:29 2008 -0800 comctl32: Check for NULL input in TAB_AdjustRect. --- dlls/comctl32/tab.c | 2 ++ dlls/comctl32/tests/tab.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0afcc77..6a9b8e8 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -863,6 +863,8 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr TRACE ("hwnd=%p fLarger=%ld (%s)\n", infoPtr->hwnd, fLarger, wine_dbgstr_rect(prc)); + if (!prc) return -1; + if(lStyle & TCS_VERTICAL) { iRightBottom = &(prc->right); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index bd4919d..9d98e11 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -856,6 +856,22 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } +static void test_adjustrect(HWND parent_wnd) +{ + HWND hTab; + INT r; + + ok(parent_wnd != NULL, "no parent window!\n"); + + hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, 0, 0); + ok(hTab != NULL, "Failed to create tab control\n"); + + r = SendMessage(hTab, TCM_ADJUSTRECT, FALSE, 0); + expect(-1, r); + + r = SendMessage(hTab, TCM_ADJUSTRECT, TRUE, 0); + expect(-1, r); +} static void test_insert_focus(HWND parent_wnd) { HWND hTab; @@ -1001,6 +1017,8 @@ START_TEST(tab) /* Testing getters and setters with 5 tabs */ test_getters_setters(parent_wnd, 5); + test_adjustrect(parent_wnd); + test_insert_focus(parent_wnd); test_delete_focus(parent_wnd);

1 0

Eric Pouech : winedbg: Rewrote the symbol picking mechanism so that it can handle several algorithms .
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 4c00325c3ba057e7c7296cce4daa6378e8f4ad88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c00325c3ba057e7c7296cce4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 10 15:02:49 2008 +0100 winedbg: Rewrote the symbol picking mechanism so that it can handle several algorithms. --- programs/winedbg/debugger.h | 6 ++ programs/winedbg/symbol.c | 127 ++++++++++++++++++++++++------------------- 2 files changed, 76 insertions(+), 57 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d7ea3c9..6c7cde3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -395,6 +395,12 @@ extern void symbol_info(const char* str); extern void symbol_print_local(const SYMBOL_INFO* sym, ULONG base, BOOL detailed); extern int symbol_info_locals(void); extern BOOL symbol_is_local(const char* name); +struct sgv_data; +typedef enum sym_get_lval (*symbol_picker_t)(const char* name, const struct sgv_data* sgv, + struct dbg_lvalue* rtn); +extern symbol_picker_t symbol_current_picker; +extern enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_data* sgv, + struct dbg_lvalue* rtn); /* tgt_active.c */ extern void dbg_run_debuggee(const char* args); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index b4b04e6..56f814b 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -192,6 +192,67 @@ static BOOL CALLBACK sgv_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) return TRUE; } +enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_data* sgv, + struct dbg_lvalue* rtn) +{ + char buffer[512]; + unsigned i; + + if (!dbg_interactiveP) + { + dbg_printf("More than one symbol named %s, picking the first one\n", name); + *rtn = sgv->syms[0].lvalue; + return sglv_found; + } + + dbg_printf("Many symbols with name '%s', " + "choose the one you want (<cr> to abort):\n", name); + for (i = 0; i < sgv->num; i++) + { + if (sgv->num - sgv->num_thunks > 1 && (sgv->syms[i].flags & SYMFLAG_THUNK) && !DBG_IVAR(AlwaysShowThunks)) + continue; + dbg_printf("[%d]: ", i + 1); + if (sgv->syms[i].flags & SYMFLAG_LOCAL) + { + dbg_printf("%s %sof %s\n", + sgv->syms[i].flags & SYMFLAG_PARAMETER ? "Parameter" : "Local variable", + sgv->syms[i].flags & (SYMFLAG_REGISTER|SYMFLAG_REGREL) ? "(in a register) " : "", + name); + } + else if (sgv->syms[i].flags & SYMFLAG_THUNK) + { + print_address(&sgv->syms[i].lvalue.addr, TRUE); + /* FIXME: should display where the thunks points to */ + dbg_printf(" thunk %s\n", name); + } + else + { + print_address(&sgv->syms[i].lvalue.addr, TRUE); + dbg_printf("\n"); + } + } + do + { + i = 0; + if (input_read_line("=> ", buffer, sizeof(buffer))) + { + if (buffer[0] == '\0') return sglv_aborted; + i = atoi(buffer); + if (i < 1 || i > sgv->num) + dbg_printf("Invalid choice %d\n", i); + } + else return sglv_aborted; + } while (i < 1 || i > sgv->num); + + /* The array is 0-based, but the choices are 1..n, + * so we have to subtract one before returning. + */ + *rtn = sgv->syms[i - 1].lvalue; + return sglv_found; +} + +symbol_picker_t symbol_current_picker = symbol_picker_interactive; + /*********************************************************************** * symbol_get_lvalue * @@ -317,65 +378,17 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, } } - i = 0; - if (dbg_interactiveP) - { - if (sgv.num - sgv.num_thunks > 1 || /* many symbols non thunks (and showing only non thunks) */ - (sgv.num > 1 && DBG_IVAR(AlwaysShowThunks)) || /* many symbols (showing symbols & thunks) */ - (sgv.num == sgv.num_thunks && sgv.num_thunks > 1)) - { - dbg_printf("Many symbols with name '%s', " - "choose the one you want (<cr> to abort):\n", name); - for (i = 0; i < sgv.num; i++) - { - if (sgv.num - sgv.num_thunks > 1 && (sgv.syms[i].flags & SYMFLAG_THUNK) && !DBG_IVAR(AlwaysShowThunks)) - continue; - dbg_printf("[%d]: ", i + 1); - if (sgv.syms[i].flags & SYMFLAG_LOCAL) - { - dbg_printf("%s %sof %s\n", - sgv.syms[i].flags & SYMFLAG_PARAMETER ? "Parameter" : "Local variable", - sgv.syms[i].flags & (SYMFLAG_REGISTER|SYMFLAG_REGREL) ? "(in a register) " : "", - name); - } - else if (sgv.syms[i].flags & SYMFLAG_THUNK) - { - print_address(&sgv.syms[i].lvalue.addr, TRUE); - /* FIXME: should display where the thunks points to */ - dbg_printf(" thunk %s\n", name); - } - else - { - print_address(&sgv.syms[i].lvalue.addr, TRUE); - dbg_printf("\n"); - } - } - do - { - i = 0; - if (input_read_line("=> ", buffer, sizeof(buffer))) - { - if (buffer[0] == '\0') return sglv_aborted; - i = atoi(buffer); - if (i < 1 || i > sgv.num) - dbg_printf("Invalid choice %d\n", i); - } - else return sglv_aborted; - } while (i < 1 || i > sgv.num); - - /* The array is 0-based, but the choices are 1..n, - * so we have to subtract one before returning. - */ - i--; - } - } - else + if (sgv.num - sgv.num_thunks > 1 || /* many symbols non thunks (and showing only non thunks) */ + (sgv.num > 1 && DBG_IVAR(AlwaysShowThunks)) || /* many symbols (showing symbols & thunks) */ + (sgv.num == sgv.num_thunks && sgv.num_thunks > 1)) { - /* FIXME: could display the list of non-picked up symbols */ - if (sgv.num > 1) - dbg_printf("More than one symbol named %s, picking the first one\n", name); + return symbol_current_picker(name, &sgv, rtn); } - *rtn = sgv.syms[i].lvalue; + /* first symbol is the one we want: + * - only one symbol found, + * - or many symbols but only one non thunk when AlwaysShowThunks is FALSE + */ + *rtn = sgv.syms[0].lvalue; return sglv_found; }

1 0