November 2005 - Wine-commits

wine/dlls/wldap32 value.c search.c option.c mo ...
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21340 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 10:29:33 Modified files: dlls/wldap32 : value.c search.c option.c modrdn.c modify.c misc.c error.c dn.c delete.c Log message: Hans Leidekker <hans(a)it.vu.nl> Avoid using deprecated openldap functions. Correct some return values. Patch: http://cvs.winehq.org/patch.py?id=21340 Old revision New revision Changes Path 1.1 1.2 +65 -13 wine/dlls/wldap32/value.c 1.5 1.6 +12 -4 wine/dlls/wldap32/search.c 1.2 1.3 +2 -2 wine/dlls/wldap32/option.c 1.1 1.2 +16 -4 wine/dlls/wldap32/modrdn.c 1.1 1.2 +9 -2 wine/dlls/wldap32/modify.c 1.8 1.9 +3 -3 wine/dlls/wldap32/misc.c 1.3 1.4 +9 -2 wine/dlls/wldap32/error.c 1.1 1.2 +1 -1 wine/dlls/wldap32/dn.c 1.1 1.2 +9 -2 wine/dlls/wldap32/delete.c

1 0

wine/programs/winedbg winedbg.c symbol.c stack.c
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21339 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 10:27:55 Modified files: programs/winedbg: winedbg.c symbol.c stack.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Centralized calls for SymSetContext, we only do it when we change the current stack frame, and no longer every time we look up local symbols on current stack Patch: http://cvs.winehq.org/patch.py?id=21339 Old revision New revision Changes Path 1.42 1.43 +0 -1 wine/programs/winedbg/winedbg.c 1.12 1.13 +5 -16 wine/programs/winedbg/symbol.c 1.18 1.19 +9 -7 wine/programs/winedbg/stack.c Index: wine/programs/winedbg/winedbg.c diff -u -p wine/programs/winedbg/winedbg.c:1.42 wine/programs/winedbg/winedbg.c:1.43 --- wine/programs/winedbg/winedbg.c:1.42 18 Nov 2005 16:27:55 -0000 +++ wine/programs/winedbg/winedbg.c 18 Nov 2005 16:27:55 -0000 @@ -606,7 +606,6 @@ static unsigned dbg_exception_prolog(BOO { ADDRESS tmp = addr; /* Show where we crashed */ - stack_set_frame(0); memory_disasm_one_insn(&tmp); } source_list_from_addr(&addr, 0); Index: wine/programs/winedbg/symbol.c diff -u -p wine/programs/winedbg/symbol.c:1.12 wine/programs/winedbg/symbol.c:1.13 --- wine/programs/winedbg/symbol.c:1.12 18 Nov 2005 16:27:55 -0000 +++ wine/programs/winedbg/symbol.c 18 Nov 2005 16:27:55 -0000 @@ -209,8 +209,6 @@ enum sym_get_lval symbol_get_lvalue(cons { struct sgv_data sgv; int i = 0; - char tmp[sizeof(SYMBOL_INFO) + 256]; - SYMBOL_INFO* si = (SYMBOL_INFO*)tmp; char buffer[512]; DWORD opt; IMAGEHLP_STACK_FRAME ihsf; @@ -275,13 +273,10 @@ enum sym_get_lval symbol_get_lvalue(cons SymSetOptions(opt); /* now grab local symbols */ - si->SizeOfStruct = sizeof(*si); - si->MaxNameLen = 256; - if (stack_get_frame(si, &ihsf) && sgv.num < NUMDBGV) + if (stack_get_current_frame(&ihsf) && sgv.num < NUMDBGV) { sgv.frame_offset = ihsf.FrameOffset; - if (SymSetContext(dbg_curr_process->handle, &ihsf, NULL)) - SymEnumSymbols(dbg_curr_process->handle, 0, name, sgv_cb, (void*)&sgv); + SymEnumSymbols(dbg_curr_process->handle, 0, name, sgv_cb, (void*)&sgv); } if (!sgv.num) @@ -308,7 +303,7 @@ enum sym_get_lval symbol_get_lvalue(cons 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); + name); } else if (sgv.syms[i].flags & SYMFLAG_THUNK) { @@ -353,8 +348,6 @@ enum sym_get_lval symbol_get_lvalue(cons 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; @@ -365,10 +358,7 @@ BOOL symbol_is_local(const char* name) sgv.bp_disp = FALSE; sgv.do_thunks = FALSE; - si->SizeOfStruct = sizeof(*si); - si->MaxNameLen = 256; - if (stack_get_frame(si, &ihsf) && - SymSetContext(dbg_curr_process->handle, &ihsf, NULL)) + if (stack_get_current_frame(&ihsf)) { sgv.frame_offset = ihsf.FrameOffset; SymEnumSymbols(dbg_curr_process->handle, 0, name, sgv_cb, (void*)&sgv); @@ -613,8 +603,7 @@ int symbol_info_locals(void) if (stack_get_frame(si, &ihsf)) { dbg_printf("%s:\n", si->Name); - if (SymSetContext(dbg_curr_process->handle, &ihsf, NULL)) - SymEnumSymbols(dbg_curr_process->handle, 0, NULL, info_locals_cb, &ihsf); + SymEnumSymbols(dbg_curr_process->handle, 0, NULL, info_locals_cb, &ihsf); } return TRUE; } Index: wine/programs/winedbg/stack.c diff -u -p wine/programs/winedbg/stack.c:1.18 wine/programs/winedbg/stack.c:1.19 --- wine/programs/winedbg/stack.c:1.18 18 Nov 2005 16:27:55 -0000 +++ wine/programs/winedbg/stack.c 18 Nov 2005 16:27:55 -0000 @@ -141,8 +141,6 @@ unsigned stack_fetch_frames(void) HeapFree(GetProcessHeap(), 0, dbg_curr_thread->frames); dbg_curr_thread->frames = NULL; - dbg_curr_thread->num_frames = 0; - dbg_curr_thread->curr_frame = 0; memset(&sf, 0, sizeof(sf)); memory_get_current_frame(&sf.AddrFrame); @@ -168,7 +166,10 @@ unsigned stack_fetch_frames(void) /* we've probably gotten ourselves into an infinite loop so bail */ if (nf > 200) break; } - return dbg_curr_thread->num_frames = nf; + dbg_curr_thread->curr_frame = -1; + dbg_curr_thread->num_frames = nf; + stack_set_frame_internal(0); + return nf; } struct sym_enum @@ -215,9 +216,6 @@ static void stack_print_addr_and_args(in stack_get_frame_internal(nf, &ihsf); - ihsf.InstructionOffset = (DWORD_PTR)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_pc); - ihsf.FrameOffset = (DWORD_PTR)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_frame); - /* grab module where symbol is. If we don't have a module, we cannot print more */ im.SizeOfStruct = sizeof(im); if (!SymGetModuleInfo(dbg_curr_process->handle, ihsf.InstructionOffset, &im)) @@ -258,7 +256,8 @@ static void stack_print_addr_and_args(in */ static unsigned backtrace(void) { - unsigned nf = 0; + unsigned nf = 0; + IMAGEHLP_STACK_FRAME ihsf; dbg_printf("Backtrace:\n"); for (nf = 0; nf < dbg_curr_thread->num_frames; nf++) @@ -270,6 +269,9 @@ static unsigned backtrace(void) print_bare_address(&dbg_curr_thread->frames[nf].addr_pc); dbg_printf(")\n"); } + /* reset context to current stack frame */ + stack_get_frame_internal(dbg_curr_thread->curr_frame, &ihsf); + SymSetContext(dbg_curr_process->handle, &ihsf, NULL); return nf; }

1 0

lostwages/ include/winehq.conf templates/en/do ...
by Jeremy Newman 18 Nov '05

18 Nov '05

ChangeSet ID: 21338 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/11/18 09:11:59 Modified files: include : winehq.conf templates/en : download-rh.template Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Update RH download page for 0.9.1. Patch: http://cvs.winehq.org/patch.py?id=21338 Old revision New revision Changes Path 1.23 1.24 +1 -1 lostwages/include/winehq.conf 1.5 1.6 +1 -1 lostwages/templates/en/download-rh.template Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.23 lostwages/include/winehq.conf:1.24 --- lostwages/include/winehq.conf:1.23 18 Nov 2005 15:11:59 -0000 +++ lostwages/include/winehq.conf 18 Nov 2005 15:11:59 -0000 @@ -32,4 +32,4 @@ wwn_xml_path: wwn snapshot_date: 0.9.1 # Current RH Packages Snapshot Date -snapshot_date_rh: 0.9 +snapshot_date_rh: 0.9.1 Index: lostwages/templates/en/download-rh.template diff -u -p lostwages/templates/en/download-rh.template:1.5 lostwages/templates/en/download-rh.template:1.6 --- lostwages/templates/en/download-rh.template:1.5 18 Nov 2005 15:11:59 -0000 +++ lostwages/templates/en/download-rh.template 18 Nov 2005 15:11:59 -0000 @@ -220,7 +220,7 @@ CentOS updates. </tr> <tr> - <td align=center colspan=2 bgcolor=black><a name="rh9"></a>Red Hat Linux 9 (NOT AVAILABLE YET!)</td> + <td align=center colspan=2 bgcolor=black><a name="rh9"></a>Red Hat Linux 9</td> </tr> <tr bgcolor="#7f7f7f">

1 0

wine/dlls/kernel/tests thread.c
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21337 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 09:06:38 Modified files: dlls/kernel/tests: thread.c Log message: Avoid setting the context before the thread has started running, it's broken on most Windows versions. Patch: http://cvs.winehq.org/patch.py?id=21337 Old revision New revision Changes Path 1.32 1.33 +8 -1 wine/dlls/kernel/tests/thread.c Index: wine/dlls/kernel/tests/thread.c diff -u -p wine/dlls/kernel/tests/thread.c:1.32 wine/dlls/kernel/tests/thread.c:1.33 --- wine/dlls/kernel/tests/thread.c:1.32 18 Nov 2005 15: 6:38 -0000 +++ wine/dlls/kernel/tests/thread.c 18 Nov 2005 15: 6:38 -0000 @@ -610,6 +610,7 @@ static VOID test_GetThreadExitCode(void) #ifdef __i386__ static int test_value = 0; +static HANDLE event; static void WINAPI set_test_val( int val ) { @@ -618,6 +619,8 @@ static void WINAPI set_test_val( int val static DWORD WINAPI threadFunc6(LPVOID p) { + SetEvent( event ); + Sleep( 1000 ); test_value *= (int)p; return 0; } @@ -631,13 +634,17 @@ static void test_SetThreadContext(void) DWORD prevcount; SetLastError(0xdeadbeef); - thread = CreateThread( NULL, 0, threadFunc6, (void *)2, CREATE_SUSPENDED, &threadid ); + event = CreateEvent( NULL, TRUE, FALSE, NULL ); + thread = CreateThread( NULL, 0, threadFunc6, (void *)2, 0, &threadid ); ok( thread != NULL, "CreateThread failed : (%ld)\n", GetLastError() ); if (!thread) { trace("Thread creation failed, skipping rest of test\n"); return; } + WaitForSingleObject( event, INFINITE ); + SuspendThread( thread ); + CloseHandle( event ); ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef);

1 0

wine/dlls/msxml3 tests/domdoc.c nodemap.c node ...
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21336 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 09:05:26 Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : nodemap.c nodelist.c node.c msxml_private.h domdoc.c Log message: Huw Davies <huw(a)codeweavers.com> Ref count the xmlDocPtr. If two nodes refer to the same xmlNodePtr don't return same object. Patch: http://cvs.winehq.org/patch.py?id=21336 Old revision New revision Changes Path 1.11 1.12 +77 -0 wine/dlls/msxml3/tests/domdoc.c 1.9 1.10 +1 -0 wine/dlls/msxml3/nodemap.c 1.7 1.8 +3 -0 wine/dlls/msxml3/nodelist.c 1.15 1.16 +9 -38 wine/dlls/msxml3/node.c 1.12 1.13 +2 -0 wine/dlls/msxml3/msxml_private.h 1.18 1.19 +20 -0 wine/dlls/msxml3/domdoc.c

1 0

wine/dlls/wldap32 compare.c bind.c add.c
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21335 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 09:05:01 Modified files: dlls/wldap32 : compare.c bind.c add.c Log message: Hans Leidekker <hans(a)it.vu.nl> Avoid using deprecated openldap functions. Correct some return values. Patch: http://cvs.winehq.org/patch.py?id=21335 Old revision New revision Changes Path 1.3 1.4 +34 -19 wine/dlls/wldap32/compare.c 1.6 1.7 +36 -6 wine/dlls/wldap32/bind.c 1.2 1.3 +11 -6 wine/dlls/wldap32/add.c

1 0

wine/programs/winedbg stack.c memory.c debugger.h
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21334 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 09:04:45 Modified files: programs/winedbg: stack.c memory.c debugger.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Move print_func_and_args to stack.c, where it belongs. Patch: http://cvs.winehq.org/patch.py?id=21334 Old revision New revision Changes Path 1.17 1.18 +89 -5 wine/programs/winedbg/stack.c 1.24 1.25 +0 -78 wine/programs/winedbg/memory.c 1.33 1.34 +0 -1 wine/programs/winedbg/debugger.h

1 0

wine/dlls/user static.c
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21333 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 09:04:25 Modified files: dlls/user : static.c Log message: Kieran Clancy <n0dalus+wine(a)gmail.com> Fix vertical text alignment in static controls. Patch: http://cvs.winehq.org/patch.py?id=21333 Old revision New revision Changes Path 1.9 1.10 +4 -4 wine/dlls/user/static.c Index: wine/dlls/user/static.c diff -u -p wine/dlls/user/static.c:1.9 wine/dlls/user/static.c:1.10 --- wine/dlls/user/static.c:1.9 18 Nov 2005 15: 4:25 -0000 +++ wine/dlls/user/static.c 18 Nov 2005 15: 4:25 -0000 @@ -500,11 +500,11 @@ static void STATIC_PaintTextfn( HWND hwn break; case SS_SIMPLE: - wFormat = DT_LEFT | DT_SINGLELINE | DT_VCENTER; + wFormat = DT_LEFT | DT_SINGLELINE; break; case SS_LEFTNOWORDWRAP: - wFormat = DT_LEFT | DT_EXPANDTABS | DT_VCENTER; + wFormat = DT_LEFT | DT_EXPANDTABS; break; default: @@ -513,8 +513,8 @@ static void STATIC_PaintTextfn( HWND hwn if (style & SS_NOPREFIX) wFormat |= DT_NOPREFIX; - if (style & SS_CENTERIMAGE) - wFormat |= DT_VCENTER; + if ((style & SS_CENTERIMAGE) && (style & SS_TYPEMASK) != SS_SIMPLE) + wFormat |= DT_SINGLELINE | DT_VCENTER; if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) SelectObject( hdc, hFont );

1 0

wine/dlls/comctl32/tests Makefile.in .cvsignor ...
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21332 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:33:11 Modified files: dlls/comctl32/tests: Makefile.in .cvsignore Added files: dlls/comctl32/tests: header.c Log message: Vijay Kiran Kamuju <infyquest(a)gmail.com> Added header control tests. Patch: http://cvs.winehq.org/patch.py?id=21332 Old revision New revision Changes Path 1.12 1.13 +1 -0 wine/dlls/comctl32/tests/Makefile.in 1.11 1.12 +1 -0 wine/dlls/comctl32/tests/.cvsignore Added 1.1 +0 -0 wine/dlls/comctl32/tests/header.c

1 0

wine/programs/winedbg winedbg.c symbol.c stack ...
by Alexandre Julliard 18 Nov '05

18 Nov '05

ChangeSet ID: 21331 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 06:33:04 Modified files: programs/winedbg: winedbg.c symbol.c stack.c debugger.h dbg.y Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> - now storing frames information in thread structure - frames are cached after each thread stops execution - reimplemented backtrace on top of this Patch: http://cvs.winehq.org/patch.py?id=21331 Old revision New revision Changes Path 1.41 1.42 +7 -4 wine/programs/winedbg/winedbg.c 1.11 1.12 +2 -2 wine/programs/winedbg/symbol.c 1.16 1.17 +76 -42 wine/programs/winedbg/stack.c 1.32 1.33 +11 -3 wine/programs/winedbg/debugger.h 1.30 1.31 +8 -8 wine/programs/winedbg/dbg.y

1 0