November 2005 - Wine-Commits

wine/dlls/kernel/tests locale.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21330 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:15:59 Modified files: dlls/kernel/tests: locale.c Log message: Added a few more Unicode digits from Unicode version 4.1. Patch: http://cvs.winehq.org/patch.py?id=21330 Old revision New revision Changes Path 1.40 1.41 +2 -1 wine/dlls/kernel/tests/locale.c Index: wine/dlls/kernel/tests/locale.c diff -u -p wine/dlls/kernel/tests/locale.c:1.40 wine/dlls/kernel/tests/locale.c:1.41 --- wine/dlls/kernel/tests/locale.c:1.40 18 Nov 2005 12:15:59 -0000 +++ wine/dlls/kernel/tests/locale.c 18 Nov 2005 12:15:59 -0000 @@ -1793,7 +1793,8 @@ static void test_FoldStringW(void) ok(dst[0] == ch || strchrW(outOfSequenceDigits, ch) || /* Wine (correctly) maps all Unicode 4.0+ digits */ - isdigitW(ch) || (ch >= 0x24F5 && ch <= 0x24FD) || ch == 0x24FF, + isdigitW(ch) || (ch >= 0x24F5 && ch <= 0x24FD) || ch == 0x24FF || + (ch >= 0x1369 && ch <= 0x1371), "MAP_FOLDDIGITS: ch %d 0x%04x Expected unchanged got %d\n", ch, ch, dst[0]); }

1 0

wine/libs/unicode wctype.c casemap.c c_950.c c ...
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21329 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:15:06 Modified files: libs/unicode : wctype.c casemap.c c_950.c c_949.c c_936.c c_932.c c_878.c c_875.c c_874.c c_869.c c_866.c c_865.c c_864.c c_863.c c_862.c c_861.c c_860.c c_857.c c_856.c c_855.c c_852.c c_850.c c_775.c c_737.c c_500.c c_437.c c_424.c c_28606.c c_28605.c c_28604.c c_28603.c c_28600.c c_28599.c c_28598.c c_28597.c c_28596.c c_28595.c c_28594.c c_28593.c c_28592.c c_28591.c c_21866.c c_20932.c c_20866.c c_1258.c c_1257.c c_1256.c c_1255.c c_1254.c c_1253.c c_1252.c c_1251.c c_1250.c c_1026.c c_10081.c c_10079.c c_1006.c c_10029.c c_10007.c c_10006.c c_10000.c c_037.c Log message: Updated codepage tables to Unicode version 4.1. Patch: http://cvs.winehq.org/patch.py?id=21329 Old revision New revision Changes Path 1.4 1.5 +350 -126 wine/libs/unicode/wctype.c 1.4 1.5 +194 -77 wine/libs/unicode/casemap.c 1.3 1.4 +19 -19 wine/libs/unicode/c_950.c 1.3 1.4 +19 -19 wine/libs/unicode/c_949.c 1.3 1.4 +20 -20 wine/libs/unicode/c_936.c 1.3 1.4 +19 -19 wine/libs/unicode/c_932.c 1.3 1.4 +6 -6 wine/libs/unicode/c_878.c 1.2 1.3 +6 -6 wine/libs/unicode/c_875.c 1.3 1.4 +5 -5 wine/libs/unicode/c_874.c 1.2 1.3 +6 -6 wine/libs/unicode/c_869.c 1.3 1.4 +6 -6 wine/libs/unicode/c_866.c 1.3 1.4 +6 -6 wine/libs/unicode/c_865.c 1.2 1.3 +5 -5 wine/libs/unicode/c_864.c 1.2 1.3 +6 -6 wine/libs/unicode/c_863.c 1.3 1.4 +6 -6 wine/libs/unicode/c_862.c 1.3 1.4 +6 -6 wine/libs/unicode/c_861.c 1.3 1.4 +6 -6 wine/libs/unicode/c_860.c 1.2 1.3 +5 -5 wine/libs/unicode/c_857.c 1.2 1.3 +5 -5 wine/libs/unicode/c_856.c 1.3 1.4 +6 -6 wine/libs/unicode/c_855.c 1.3 1.4 +5 -5 wine/libs/unicode/c_852.c 1.2 1.3 +5 -5 wine/libs/unicode/c_850.c 1.2 1.3 +5 -5 wine/libs/unicode/c_775.c 1.3 1.4 +6 -6 wine/libs/unicode/c_737.c 1.2 1.3 +5 -5 wine/libs/unicode/c_500.c 1.3 1.4 +6 -6 wine/libs/unicode/c_437.c 1.2 1.3 +5 -5 wine/libs/unicode/c_424.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28606.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28605.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28604.c 1.2 1.3 +5 -5 wine/libs/unicode/c_28603.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28600.c 1.2 1.3 +5 -5 wine/libs/unicode/c_28599.c 1.2 1.3 +5 -5 wine/libs/unicode/c_28598.c 1.2 1.3 +11 -11 wine/libs/unicode/c_28597.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28596.c 1.3 1.4 +6 -6 wine/libs/unicode/c_28595.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28594.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28593.c 1.3 1.4 +5 -5 wine/libs/unicode/c_28592.c 1.2 1.3 +5 -5 wine/libs/unicode/c_28591.c 1.1 1.2 +6 -6 wine/libs/unicode/c_21866.c 1.3 1.4 +19 -19 wine/libs/unicode/c_20932.c 1.3 1.4 +6 -6 wine/libs/unicode/c_20866.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1258.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1257.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1256.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1255.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1254.c 1.2 1.3 +6 -6 wine/libs/unicode/c_1253.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1252.c 1.2 1.3 +6 -6 wine/libs/unicode/c_1251.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1250.c 1.2 1.3 +5 -5 wine/libs/unicode/c_1026.c 1.3 1.4 +6 -6 wine/libs/unicode/c_10081.c 1.3 1.4 +6 -6 wine/libs/unicode/c_10079.c 1.3 1.4 +5 -5 wine/libs/unicode/c_1006.c 1.3 1.4 +5 -5 wine/libs/unicode/c_10029.c 1.3 1.4 +6 -6 wine/libs/unicode/c_10007.c 1.2 1.3 +6 -6 wine/libs/unicode/c_10006.c 1.3 1.4 +6 -6 wine/libs/unicode/c_10000.c 1.2 1.3 +5 -5 wine/libs/unicode/c_037.c

1 0

wine/ programs/cmdlgtst/cmdlgr.rc dlls/wineps/ ...
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21328 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:07:42 Modified files: programs/cmdlgtst: cmdlgr.rc dlls/wineps : wps_Ko.rc dlls/shdocvw : Ko.rc dlls/serialui : Ko.rc dlls/comctl32 : comctl_Ko.rc Added files: programs/cmdlgtst: Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Update Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21328 Old revision New revision Changes Path 1.17 1.18 +1 -0 wine/programs/cmdlgtst/cmdlgr.rc Added 1.1 +0 -0 wine/programs/cmdlgtst/Ko.rc 1.3 1.4 +6 -5 wine/dlls/wineps/wps_Ko.rc 1.1 1.2 +3 -3 wine/dlls/shdocvw/Ko.rc 1.1 1.2 +6 -6 wine/dlls/serialui/Ko.rc 1.6 1.7 +14 -13 wine/dlls/comctl32/comctl_Ko.rc

1 0

wine/dlls/user/tests win.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21327 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:07:19 Modified files: dlls/user/tests: win.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add another test for Z order of child windows. Patch: http://cvs.winehq.org/patch.py?id=21327 Old revision New revision Changes Path 1.72 1.73 +23 -4 wine/dlls/user/tests/win.c Index: wine/dlls/user/tests/win.c diff -u -p wine/dlls/user/tests/win.c:1.72 wine/dlls/user/tests/win.c:1.73 --- wine/dlls/user/tests/win.c:1.72 18 Nov 2005 12: 7:19 -0000 +++ wine/dlls/user/tests/win.c 18 Nov 2005 12: 7:19 -0000 @@ -1860,8 +1860,18 @@ static void test_window_tree(HWND parent for (i = 0; i < total; i++) { - child[i] = CreateWindowExA(0, "static", "", style[i], 0,0,10,10, - parent, 0, 0, NULL); + if (style[i] & DS_CONTROL) + { + child[i] = CreateWindowExA(0, MAKEINTATOMA(32770), "", style[i] & ~WS_VISIBLE, + 0,0,0,0, parent, (HMENU)i, 0, NULL); + if (style[i] & WS_VISIBLE) + ShowWindow(child[i], SW_SHOW); + + SetWindowPos(child[i], HWND_BOTTOM, 0,0,10,10, SWP_NOACTIVATE); + } + else + child[i] = CreateWindowExA(0, "static", "", style[i], 0,0,10,10, + parent, (HMENU)i, 0, NULL); trace("child[%d] = %p\n", i, child[i]); ok(child[i] != 0, "CreateWindowEx failed to create child window\n"); } @@ -1897,6 +1907,10 @@ static void test_children_zorder(HWND pa const int complex_order_3[3] = { 1, 0, 2 }; const int complex_order_4[4] = { 1, 0, 2, 3 }; const int complex_order_5[5] = { 4, 1, 0, 2, 3 }; + const DWORD complex_style_6[3] = { WS_CHILD | WS_VISIBLE, + WS_CHILD | WS_CLIPSIBLINGS | DS_CONTROL | WS_VISIBLE, + WS_CHILD | WS_VISIBLE }; + const int complex_order_6[3] = { 0, 1, 2 }; /* simple WS_CHILD */ test_window_tree(parent, simple_style, simple_order, 5); @@ -1907,6 +1921,9 @@ static void test_children_zorder(HWND pa test_window_tree(parent, complex_style, complex_order_3, 3); test_window_tree(parent, complex_style, complex_order_4, 4); test_window_tree(parent, complex_style, complex_order_5, 5); + + /* another set of complex children styles */ + test_window_tree(parent, complex_style_6, complex_order_6, 3); } static void test_vis_rgn( HWND hwnd ) @@ -3457,6 +3474,7 @@ START_TEST(win) assert( hwndMain ); assert( hwndMain2 ); + /* Add the tests below this line */ test_params(); test_capture_1(); @@ -3484,10 +3502,11 @@ START_TEST(win) test_IsWindowUnicode(); test_vis_rgn(hwndMain); - UnhookWindowsHookEx(hhook); - test_AdjustWindowRect(); test_window_styles(); test_redrawnow(); test_csparentdc(); + + /* add the tests above this line */ + UnhookWindowsHookEx(hhook); }

1 0

wine/dlls/kernel vxd.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21326 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:06:57 Modified files: dlls/kernel : vxd.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Use case insensitive comparison to check file extensions. Patch: http://cvs.winehq.org/patch.py?id=21326 Old revision New revision Changes Path 1.21 1.22 +1 -1 wine/dlls/kernel/vxd.c Index: wine/dlls/kernel/vxd.c diff -u -p wine/dlls/kernel/vxd.c:1.21 wine/dlls/kernel/vxd.c:1.22 --- wine/dlls/kernel/vxd.c:1.21 18 Nov 2005 12: 6:57 -0000 +++ wine/dlls/kernel/vxd.c 18 Nov 2005 12: 6:57 -0000 @@ -201,7 +201,7 @@ HANDLE VXD_Open( LPCWSTR filenameW, DWOR strlwrW( name ); p = strchrW( name, '.' ); if (!p) strcatW( name, dotVxDW ); - else if (strcmpW( p, dotVxDW )) /* existing extension has to be .vxd */ + else if (strcmpiW( p, dotVxDW )) /* existing extension has to be .vxd */ { SetLastError( ERROR_FILE_NOT_FOUND ); return 0;

1 0

wine/dlls/x11drv opengl.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21325 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:06:45 Modified files: dlls/x11drv : opengl.c Log message: Peter Beutner <p.beutner(a)gmx.net> Fix wrong use of the PFD_GENERIC_ACCELERATED flag. It indicates that the selected pixel format lacks full hardware acceleration and only a few parts are accelerated. So don't always set it but only if the X server actually reports that the selected pixel format is not fully accelerated. Patch: http://cvs.winehq.org/patch.py?id=21325 Old revision New revision Changes Path 1.17 1.18 +6 -2 wine/dlls/x11drv/opengl.c Index: wine/dlls/x11drv/opengl.c diff -u -p wine/dlls/x11drv/opengl.c:1.17 wine/dlls/x11drv/opengl.c:1.18 --- wine/dlls/x11drv/opengl.c:1.17 18 Nov 2005 12: 6:45 -0000 +++ wine/dlls/x11drv/opengl.c 18 Nov 2005 12: 6:45 -0000 @@ -358,11 +358,15 @@ int X11DRV_DescribePixelFormat(X11DRV_PD ppfd->nVersion = 1; /* These flags are always the same... */ - ppfd->dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_GENERIC_ACCELERATED; - /* Now the flags extraced from the Visual */ + ppfd->dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + /* Now the flags extracted from the Visual */ wine_tsx11_lock(); + pglXGetFBConfigAttrib(gdi_display, cur, GLX_CONFIG_CAVEAT, &value); + if(value == GLX_SLOW_CONFIG) + ppfd->dwFlags |= PFD_GENERIC_ACCELERATED; + pglXGetFBConfigAttrib(gdi_display, cur, GLX_DOUBLEBUFFER, &value); if (value) ppfd->dwFlags |= PFD_DOUBLEBUFFER; pglXGetFBConfigAttrib(gdi_display, cur, GLX_STEREO, &value); if (value) ppfd->dwFlags |= PFD_STEREO;

1 0

wine/dlls/shdocvw webbrowser.c shdocvw.h events.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21324 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:06:12 Modified files: dlls/shdocvw : webbrowser.c shdocvw.h events.c Log message: Jacek Caban <jacek(a)codeweavers.com> Free ConnectionPoint objects (fix memory leak). Patch: http://cvs.winehq.org/patch.py?id=21324 Old revision New revision Changes Path 1.24 1.25 +1 -0 wine/dlls/shdocvw/webbrowser.c 1.30 1.31 +1 -0 wine/dlls/shdocvw/shdocvw.h 1.17 1.18 +7 -0 wine/dlls/shdocvw/events.c Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.24 wine/dlls/shdocvw/webbrowser.c:1.25 --- wine/dlls/shdocvw/webbrowser.c:1.24 18 Nov 2005 12: 6:12 -0000 +++ wine/dlls/shdocvw/webbrowser.c 18 Nov 2005 12: 6:12 -0000 @@ -125,6 +125,7 @@ static ULONG WINAPI WebBrowser_Release(I IUnknown_Release(This->document); WebBrowser_OleObject_Destroy(This); + WebBrowser_Events_Destroy(This); HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.30 wine/dlls/shdocvw/shdocvw.h:1.31 --- wine/dlls/shdocvw/shdocvw.h:1.30 18 Nov 2005 12: 6:12 -0000 +++ wine/dlls/shdocvw/shdocvw.h 18 Nov 2005 12: 6:12 -0000 @@ -131,6 +131,7 @@ void WebBrowser_ClientSite_Init(WebBrows void WebBrowser_DocHost_Init(WebBrowser*); void WebBrowser_OleObject_Destroy(WebBrowser*); +void WebBrowser_Events_Destroy(WebBrowser*); HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); Index: wine/dlls/shdocvw/events.c diff -u -p wine/dlls/shdocvw/events.c:1.17 wine/dlls/shdocvw/events.c:1.18 --- wine/dlls/shdocvw/events.c:1.17 18 Nov 2005 12: 6:12 -0000 +++ wine/dlls/shdocvw/events.c 18 Nov 2005 12: 6:12 -0000 @@ -233,3 +233,10 @@ void WebBrowser_Events_Init(WebBrowser * ConnectionPoint_Create(This, &DIID_DWebBrowserEvents, &This->cp_wbe); ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cp_pns); } + +void WebBrowser_Events_Destroy(WebBrowser *This) +{ + HeapFree(GetProcessHeap(), 0, This->cp_wbe2); + HeapFree(GetProcessHeap(), 0, This->cp_wbe); + HeapFree(GetProcessHeap(), 0, This->cp_pns); +}

1 0

wine/dlls/msvcrt undname.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21323 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:06:00 Modified files: dlls/msvcrt : undname.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Ensures, when we cannot demangle the string, to return the mangled name instead of a NULL pointer. Patch: http://cvs.winehq.org/patch.py?id=21323 Old revision New revision Changes Path 1.4 1.5 +10 -12 wine/dlls/msvcrt/undname.c Index: wine/dlls/msvcrt/undname.c diff -u -p wine/dlls/msvcrt/undname.c:1.4 wine/dlls/msvcrt/undname.c:1.5 --- wine/dlls/msvcrt/undname.c:1.4 18 Nov 2005 12: 6: 0 -0000 +++ wine/dlls/msvcrt/undname.c 18 Nov 2005 12: 6: 0 -0000 @@ -1152,6 +1152,7 @@ char* __unDNameEx(char* buffer, const ch void* unknown, unsigned short int flags) { struct parsed_symbol sym; + const char* result; TRACE("(%p,%s,%d,%p,%p,%p,%x) stub!\n", buffer, mangled, buflen, memget, memfree, unknown, flags); @@ -1171,20 +1172,17 @@ char* __unDNameEx(char* buffer, const ch sym.mem_free_ptr = memfree; sym.current = mangled; - if (symbol_demangle(&sym)) + result = symbol_demangle(&sym) ? sym.result : mangled; + if (buffer && buflen) { - if (buffer && buflen) - { - memcpy(buffer, sym.result, buflen - 1); - buffer[buflen - 1] = '\0'; - } - else - { - buffer = memget(strlen(sym.result) + 1); - if (buffer) strcpy(buffer, sym.result); - } + memcpy(buffer, result, buflen - 1); + buffer[buflen - 1] = '\0'; + } + else + { + buffer = memget(strlen(result) + 1); + if (buffer) strcpy(buffer, result); } - else buffer = NULL; und_free_all(&sym);

1 0

wine/ programs/winedbg/winedbg.c programs/wine ...
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21322 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:05:44 Modified files: programs/winedbg: winedbg.c symbol.c dlls/dbghelp : symbol.c dbghelp.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Now returning correct symbol flags (as native does) for function pmts & locals in dbghelp. Modified winedbg accordingly. Patch: http://cvs.winehq.org/patch.py?id=21322 Old revision New revision Changes Path 1.40 1.41 +4 -0 wine/programs/winedbg/winedbg.c 1.10 1.11 +24 -28 wine/programs/winedbg/symbol.c 1.19 1.20 +3 -3 wine/dlls/dbghelp/symbol.c 1.13 1.14 +2 -0 wine/dlls/dbghelp/dbghelp.c Index: wine/programs/winedbg/winedbg.c diff -u -p wine/programs/winedbg/winedbg.c:1.40 wine/programs/winedbg/winedbg.c:1.41 --- wine/programs/winedbg/winedbg.c:1.40 18 Nov 2005 12: 5:44 -0000 +++ wine/programs/winedbg/winedbg.c 18 Nov 2005 12: 5:44 -0000 @@ -56,6 +56,10 @@ * + all computations should be made on long long * o expr computations are in int:s * o bitfield size is on a 4-bytes + * + array_index and deref should be the same function (or should share the same + * core) + * + segmented pointers are not correctly handled (and are hacked throughout the + * code by testing against itype_none) * - execution: * + set a better fix for gdb (proxy mode) than the step-mode hack * + implement function call in debuggee Index: wine/programs/winedbg/symbol.c diff -u -p wine/programs/winedbg/symbol.c:1.10 wine/programs/winedbg/symbol.c:1.11 --- wine/programs/winedbg/symbol.c:1.10 18 Nov 2005 12: 5:44 -0000 +++ wine/programs/winedbg/symbol.c 18 Nov 2005 12: 5:44 -0000 @@ -67,7 +67,8 @@ static BOOL symbol_get_debug_start(DWORD struct sgv_data { #define NUMDBGV 100 - struct { + struct + { /* FIXME: NUMDBGV should be made variable */ struct dbg_lvalue lvalue; DWORD flags; @@ -79,7 +80,7 @@ struct sgv_data int lineno; /* in (opt): line number in filename where to look up symbol */ unsigned bp_disp : 1, /* in : whether if we take into account func address or func first displayable insn */ do_thunks : 1; /* in : whether we return thunks tags */ - IMAGEHLP_STACK_FRAME ihsf; /* in : frame for local & parameter variables look up */ + ULONG64 frame_offset; /* in : frame for local & parameter variables look up */ }; static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sym, ULONG size, void* ctx) @@ -109,15 +110,9 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* addr = (ULONG64)(DWORD_PTR)div->pval; cookie = DLV_HOST; } - else if (sym->Flags & SYMFLAG_FRAMEREL) + else if (sym->Flags & SYMFLAG_LOCAL) /* covers both local & parameters */ { - ULONG offset; - struct dbg_type type; - - type.module = sym->ModBase; - type.id = sym->TypeIndex; - types_get_info(&type, TI_GET_OFFSET, &offset); - addr = sgv->ihsf.FrameOffset + offset; + addr = sgv->frame_offset + sym->Address; } else if (sym->Flags & SYMFLAG_THUNK) { @@ -168,13 +163,14 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sgv->name, NUMDBGV); return FALSE; } - WINE_TRACE("==> %s %s%s%s%s%s%s\n", + WINE_TRACE("==> %s %s%s%s%s%s%s%s\n", sym->Name, (sym->Flags & SYMFLAG_FUNCTION) ? "func " : "", (sym->Flags & SYMFLAG_FRAMEREL) ? "framerel " : "", (sym->Flags & SYMFLAG_REGISTER) ? "register " : "", (sym->Flags & SYMFLAG_REGREL) ? "regrel " : "", (sym->Flags & SYMFLAG_PARAMETER) ? "param " : "", + (sym->Flags & SYMFLAG_LOCAL) ? "local " : "", (sym->Flags & SYMFLAG_THUNK) ? "thunk " : ""); /* always keep the thunks at end of the array */ @@ -217,6 +213,7 @@ enum sym_get_lval symbol_get_lvalue(cons SYMBOL_INFO* si = (SYMBOL_INFO*)tmp; char buffer[512]; DWORD opt; + IMAGEHLP_STACK_FRAME ihsf; if (strlen(name) + 4 > sizeof(buffer)) { @@ -280,9 +277,10 @@ enum sym_get_lval symbol_get_lvalue(cons /* now grab local symbols */ si->SizeOfStruct = sizeof(*si); si->MaxNameLen = 256; - if (stack_get_frame(si, &sgv.ihsf) && sgv.num < NUMDBGV) + if (stack_get_frame(si, &ihsf) && sgv.num < NUMDBGV) { - if (SymSetContext(dbg_curr_process->handle, &sgv.ihsf, NULL)) + sgv.frame_offset = ihsf.FrameOffset; + if (SymSetContext(dbg_curr_process->handle, &ihsf, NULL)) SymEnumSymbols(dbg_curr_process->handle, 0, name, sgv_cb, (void*)&sgv); } @@ -307,14 +305,9 @@ enum sym_get_lval symbol_get_lvalue(cons dbg_printf("[%d]: ", i + 1); if (sgv.syms[i].flags & SYMFLAG_LOCAL) { - dbg_printf("local variable %sof %s\n", - sgv.syms[i].flags & SYMFLAG_REGISTER ? "(in a register) " : "", - si->Name); - } - else if (sgv.syms[i].flags & SYMFLAG_PARAMETER) - { - dbg_printf("parameter %sof %s\n", - sgv.syms[i].flags & SYMFLAG_REGISTER ? "(in a register) " : "", + 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) " : "", si->Name); } else if (sgv.syms[i].flags & SYMFLAG_THUNK) @@ -362,6 +355,7 @@ BOOL symbol_is_local(const char* name) struct sgv_data sgv; char tmp[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* si = (SYMBOL_INFO*)tmp; + IMAGEHLP_STACK_FRAME ihsf; sgv.num = 0; sgv.num_thunks = 0; @@ -373,9 +367,12 @@ BOOL symbol_is_local(const char* name) si->SizeOfStruct = sizeof(*si); si->MaxNameLen = 256; - if (stack_get_frame(si, &sgv.ihsf) && - SymSetContext(dbg_curr_process->handle, &sgv.ihsf, NULL)) + if (stack_get_frame(si, &ihsf) && + SymSetContext(dbg_curr_process->handle, &ihsf, NULL)) + { + sgv.frame_offset = ihsf.FrameOffset; SymEnumSymbols(dbg_curr_process->handle, 0, name, sgv_cb, (void*)&sgv); + } return sgv.num > 0; } @@ -565,8 +562,8 @@ static BOOL CALLBACK info_locals_cb(SYMB types_get_info(&type, TI_GET_TYPE, &type.id); types_print_type(&type, FALSE); - if (sym->Flags & SYMFLAG_LOCAL) explain = "local"; - else if (sym->Flags & SYMFLAG_PARAMETER) explain = "parameter"; + if (sym->Flags & SYMFLAG_PARAMETER) explain = "parameter"; + else if (sym->Flags & SYMFLAG_LOCAL) explain = "local"; else if (sym->Flags & SYMFLAG_REGISTER) explain = buf; if (sym->Flags & SYMFLAG_REGISTER) @@ -589,11 +586,10 @@ static BOOL CALLBACK info_locals_cb(SYMB } } } - else if (sym->Flags & SYMFLAG_FRAMEREL) + else if (sym->Flags & SYMFLAG_LOCAL) { type.id = sym->TypeIndex; - types_get_info(&type, TI_GET_OFFSET, &v); - v += ((IMAGEHLP_STACK_FRAME*)ctx)->FrameOffset; + v = ((IMAGEHLP_STACK_FRAME*)ctx)->FrameOffset + sym->Address; if (!dbg_read_memory((void*)v, &val, sizeof(val))) { Index: wine/dlls/dbghelp/symbol.c diff -u -p wine/dlls/dbghelp/symbol.c:1.19 wine/dlls/dbghelp/symbol.c:1.20 --- wine/dlls/dbghelp/symbol.c:1.19 18 Nov 2005 12: 5:45 -0000 +++ wine/dlls/dbghelp/symbol.c 18 Nov 2005 12: 5:45 -0000 @@ -460,7 +460,7 @@ static void symt_fill_sym_info(const str case DataIsParam: if (data->u.s.reg_id) { - sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_REGISTER; + sym_info->Flags |= SYMFLAG_REGISTER; sym_info->Register = data->u.s.reg_id; sym_info->Address = 0; } @@ -469,10 +469,10 @@ static void symt_fill_sym_info(const str if (data->u.s.offset < 0) sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_FRAMEREL; else - sym_info->Flags |= SYMFLAG_PARAMETER | SYMFLAG_FRAMEREL; + sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_PARAMETER | SYMFLAG_FRAMEREL; /* FIXME: needed ? moreover, it's i386 dependent !!! */ sym_info->Register = CV_REG_EBP; - sym_info->Address = data->u.s.offset; + sym_info->Address = data->u.s.offset / 8; } break; case DataIsGlobal: Index: wine/dlls/dbghelp/dbghelp.c diff -u -p wine/dlls/dbghelp/dbghelp.c:1.13 wine/dlls/dbghelp/dbghelp.c:1.14 --- wine/dlls/dbghelp/dbghelp.c:1.13 18 Nov 2005 12: 5:45 -0000 +++ wine/dlls/dbghelp/dbghelp.c 18 Nov 2005 12: 5:45 -0000 @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); * but those values are not directly usable from a debugger (that's why, I * assume, that we have also to define constants for enum values, as * Codeview does BTW. + * + SymEnumTypes should only return *user* defined types (UDT, typedefs...) not + * all the types stored/used in the modules (like char*) * - SymGetLine{Next|Prev} don't work as expected (they don't seem to work across * functions, and even across function blocks...). Basically, for *Next* to work * it requires an address after the prolog of the func (the base address of the

1 0

wine/dlls/twain dsm_ctrl.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21321 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:05:05 Modified files: dlls/twain : dsm_ctrl.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> If SANE returns empty device list treat it as an error. Patch: http://cvs.winehq.org/patch.py?id=21321 Old revision New revision Changes Path 1.9 1.10 +11 -3 wine/dlls/twain/dsm_ctrl.c Index: wine/dlls/twain/dsm_ctrl.c diff -u -p wine/dlls/twain/dsm_ctrl.c:1.9 wine/dlls/twain/dsm_ctrl.c:1.10 --- wine/dlls/twain/dsm_ctrl.c:1.9 18 Nov 2005 12: 5: 5 -0000 +++ wine/dlls/twain/dsm_ctrl.c 18 Nov 2005 12: 5: 5 -0000 @@ -146,16 +146,24 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_ID { if (device_list[0]) { + TRACE("got: %s, %s, %s\n", device_list[0]->name, device_list[0]->vendor, device_list[0]->model); pSourceIdentity->Id = DSM_sourceId ++; strcpy (pSourceIdentity->ProductName, device_list[0]->name); strcpy (pSourceIdentity->Manufacturer, device_list[0]->vendor); strcpy (pSourceIdentity->ProductFamily, device_list[0]->model); pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; + + DSM_currentDevice = 1; + twRC = TWRC_SUCCESS; + DSM_twCC = TWCC_SUCCESS; + } + else + { + TRACE("got empty device list\n"); + twRC = TWRC_FAILURE; + DSM_twCC = TWCC_NODS; } - DSM_currentDevice = 1; - twRC = TWRC_SUCCESS; - DSM_twCC = TWCC_SUCCESS; } else if (status == SANE_STATUS_NO_MEM) {

1 0