May 2006 - Wine-Commits - list.winehq.org

Mike McCormack : wininet: Check for null parameters in FtpSetCurrentDirectoryW.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 35f0965c431fe800594384e161ea64e1f354330e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35f0965c431fe800594384e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 12 00:47:52 2006 +0900 wininet: Check for null parameters in FtpSetCurrentDirectoryW. --- dlls/wininet/ftp.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index aa254f6..5fde83d 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -339,10 +339,16 @@ BOOL WINAPI FtpSetCurrentDirectoryA(HINT */ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) { - LPWININETFTPSESSIONW lpwfs; + LPWININETFTPSESSIONW lpwfs = NULL; LPWININETAPPINFOW hIC = NULL; BOOL r = FALSE; + if (!lpszDirectory) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hConnect ); if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) {

1 0

Eric Pouech : ntdll: Fix serial timeout regression.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 0ddd1c9e18331f6745a5ba69a10c7c01814c9199 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ddd1c9e18331f6745a5ba6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri May 12 22:05:48 2006 +0200 ntdll: Fix serial timeout regression. --- dlls/ntdll/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 64e181a..5290b96 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -968,7 +968,7 @@ #endif case IOCTL_SERIAL_GET_TIMEOUTS: if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_TIMEOUTS)) { - if (!(status = get_timeouts(hDevice, (SERIAL_TIMEOUTS*)lpInBuffer))) + if (!(status = get_timeouts(hDevice, (SERIAL_TIMEOUTS*)lpOutBuffer))) sz = sizeof(SERIAL_TIMEOUTS); } else

1 0

lostwages/news 2006051201.xml
by WineHQ May 12, 2006

May 12, 2006

ChangeSet ID: 24772 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/12 13:04:48 Modified files: news : 2006051201.xml Log message: Update news blurb Patch: http://cvs.winehq.org/patch.py?id=24772 Old revision New revision Changes Path 1.1 1.2 +2 -2 lostwages/news/2006051201.xml Index: lostwages/news/2006051201.xml diff -u -p lostwages/news/2006051201.xml:1.1 lostwages/news/2006051201.xml:1.2 --- lostwages/news/2006051201.xml:1.1 12 May 2006 18: 4:48 -0000 +++ lostwages/news/2006051201.xml 12 May 2006 18: 4:48 -0000 @@ -12,9 +12,9 @@ Alexandre released Wine 0.9.13 today. T </ul> Binary packages are in the process of being built, but the source is - <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.12.tar.bz2">available + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.13.tar.bz2">available now</a>. You can find out more about this release in the - <a href="?announce=1.116">announcement</a>. Check out our + <a href="?announce=1.117">announcement</a>. Check out our <a href="/site/download">download page</a> for packages for your favorite distribution. Currently official Fedora packages lag behind, but you can get Wine-0.9.10 by running <tt>yum install wine</tt> from

1 0

lostwages/ include/winehq.conf news/2006051201.xml
by WineHQ May 12, 2006

May 12, 2006

ChangeSet ID: 24771 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/12 13:01:05 Modified files: include : winehq.conf Added files: news : 2006051201.xml Log message: News about Wine 0.9.13 Patch: http://cvs.winehq.org/patch.py?id=24771 Old revision New revision Changes Path 1.36 1.37 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006051201.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.36 lostwages/include/winehq.conf:1.37 --- lostwages/include/winehq.conf:1.36 12 May 2006 18: 1: 5 -0000 +++ lostwages/include/winehq.conf 12 May 2006 18: 1: 5 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.12 +snapshot_date: 0.9.13 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006051201.xml diff -u -p /dev/null lostwages/news/2006051201.xml:1.1 --- /dev/null 12 May 2006 18: 1: 5 -0000 +++ lostwages/news/2006051201.xml 12 May 2006 18: 1: 5 -0000 @@ -0,0 +1,24 @@ +<news> + <date>May 12, 2006</date> + <title>Wine 0.9.13 Released</title> + <body> + +Alexandre released Wine 0.9.13 today. The following changes were noted: +<ul> +<li> GPhoto backend for TWAIN.</li> +<li> drive configuration using HAL.</li> +<li> gazillion Direct3D fixes.</li> +<li> TCP transport for RPC.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.12.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.116">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. Currently official Fedora packages lag behind, but you can get + Wine-0.9.10 by running <tt>yum install wine</tt> from + <a href="http://fedoraproject.org/extras/4/i386/repodata/repoview/W.group.html">Fedora Extras</a>. + + </body> +</news>

1 0

Tag wine-0.9.13 : Alexandre Julliard : Release 0.9.13
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/tags/wine-0.9.13 Tag: 45b500fab28d8328dbc31cacf3ede9a55c3ceeeb URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=45b500fab28d8328dbc31cacf3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 11 18:01:41 2006 +0200 Release 0.9.13

1 0

Alexandre Julliard : Release 0.9.13.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 8af7be69cbbec4bbe6b1513ed4057d0cf4cea657 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8af7be69cbbec4bbe6b1513… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 11 18:01:41 2006 +0200 Release 0.9.13. --- ANNOUNCE | 15 ChangeLog | 2399 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 4 files changed, 2416 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8af7be69cbbec4bbe6b…

1 0

Stefan Leichter : kernel: Fix CreateToolhelp32Snapshot tests on win2k.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 72a6d976794bf4c4f52bdf5ac7e3cc67593b387a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72a6d976794bf4c4f52bdf5… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed May 10 23:05:17 2006 +0200 kernel: Fix CreateToolhelp32Snapshot tests on win2k. --- dlls/kernel/tests/toolhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/toolhelp.c b/dlls/kernel/tests/toolhelp.c index 5b96a99..2b4a150 100644 --- a/dlls/kernel/tests/toolhelp.c +++ b/dlls/kernel/tests/toolhelp.c @@ -244,7 +244,7 @@ static void test_module(DWORD pid, const me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); ok(me.th32ProcessID == pid, "wrong returned process id"); for (i = 0; i < num_expected; i++) - if (!strcmp(expected[i], me.szModule)) found[i]++; + if (!lstrcmpi(expected[i], me.szModule)) found[i]++; num++; } while (pModule32Next( hSnapshot, &me )); } @@ -262,7 +262,7 @@ static void test_module(DWORD pid, const trace("PID=%lx base=%p size=%lx %s %s\n", me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); for (i = 0; i < num_expected; i++) - if (!strcmp(expected[i], me.szModule)) found[i]++; + if (!lstrcmpi(expected[i], me.szModule)) found[i]++; num--; } while (pModule32Next( hSnapshot, &me )); }

1 0

Eric Pouech : dbghelp: SymFindFileInPath and PDB
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: a5b1581e4862216a9b62c731b1532c2859460951 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5b1581e4862216a9b62c73… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:51 2006 +0200 dbghelp: SymFindFileInPath and PDB - implemented correct lookup when SymFindFileInPath is called to find a PDB file - added pdb_fetch_file_info to gather relevant information - when looking for a PDB file (from a .EXE or a .DLL), now using SymFindFileInPath to locate the PDB file with the correct information --- dlls/dbghelp/dbghelp_private.h | 24 ++++ dlls/dbghelp/msc.c | 238 +++++++++++++++++++++++----------------- dlls/dbghelp/mscvpdb.h | 8 + dlls/dbghelp/path.c | 46 +++++++- 4 files changed, 206 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a5b1581e4862216a9b6…

1 0

Eric Pouech : dbghelp: Removed call to registered callback when unloading a module.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 2a1d8efde440f7c791bf9f3c675a278203c81ea6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a1d8efde440f7c791bf9f3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:47 2006 +0200 dbghelp: Removed call to registered callback when unloading a module. First, native dbghelp doesn't do it, and it crashed windbg, likely because we got the undocumented arguments wrong. --- dlls/dbghelp/module.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 26b847a..9b138e3 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -520,9 +520,9 @@ BOOL module_remove(struct process* pcs, HeapFree(GetProcessHeap(), 0, (char*)module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); pool_destroy(&module->pool); - if (module->module.SymType != SymNone) - pcs_callback(pcs, CBA_SYMBOLS_UNLOADED, NULL); - + /* native dbghelp doesn't invoke registered callback(,CBA_SYMBOLS_UNLOADED,) here + * so do we + */ for (p = &pcs->lmodules; *p; p = &(*p)->next) { if (*p == module)

1 0

Eric Pouech : dbghelp: Implemented SymSearchW.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: c25d3ac7d5e7222ca3be1b6a338030d273c0876c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c25d3ac7d5e7222ca3be1b6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:44 2006 +0200 dbghelp: Implemented SymSearchW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 35 +++++++++++++++++++++++++++++++++++ include/dbghelp.h | 1 + 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index a59ca40..b15aae7 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -134,7 +134,7 @@ @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymSearch(long double long long str double ptr ptr long) -@ stub SymSearchW +@ stdcall SymSearchW(long double long long wstr double ptr ptr long) @ stdcall SymSetContext(long ptr ptr) @ stub SymSetHomeDirectory @ stub SymSetHomeDirectoryW diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index add5be6..a218188 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1538,3 +1538,38 @@ BOOL WINAPI SymSearch(HANDLE hProcess, U return sym_enum(hProcess, BaseOfDll, Mask, &se); } + +/****************************************************************** + * SymSearchW (DBGHELP.@) + */ +BOOL WINAPI SymSearchW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index, + DWORD SymTag, PCWSTR Mask, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + PVOID UserContext, DWORD Options) +{ + struct sym_enumW sew; + BOOL ret = FALSE; + char* maskA = NULL; + + TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, debugstr_w(Mask), + wine_dbgstr_longlong(Address), EnumSymbolsCallback, + UserContext, Options); + + sew.ctx = UserContext; + sew.cb = EnumSymbolsCallback; + sew.sym_info = (PSYMBOL_INFOW)sew.buffer; + + if (Mask) + { + unsigned len = WideCharToMultiByte(CP_ACP, 0, Mask, -1, NULL, 0, NULL, NULL); + maskA = HeapAlloc(GetProcessHeap(), 0, len); + if (!maskA) return FALSE; + WideCharToMultiByte(CP_ACP, 0, Mask, -1, maskA, len, NULL, NULL); + } + ret = SymSearch(hProcess, BaseOfDll, Index, SymTag, maskA, Address, + sym_enumW, &sew, Options); + HeapFree(GetProcessHeap(), 0, maskA); + + return ret; +} diff --git a/include/dbghelp.h b/include/dbghelp.h index b8a5c38..27eb7d9 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -942,6 +942,7 @@ DWORD WINAPI UnDecorateSymbolName(LPCSTR BOOL WINAPI SymMatchString(PCSTR, PCSTR, BOOL); BOOL WINAPI SymMatchStringW(PCWSTR, PCWSTR, BOOL); BOOL WINAPI SymSearch(HANDLE, ULONG64, DWORD, DWORD, PCSTR, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID, DWORD); +BOOL WINAPI SymSearchW(HANDLE, ULONG64, DWORD, DWORD, PCWSTR, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID, DWORD); DWORD WINAPI UnDecorateSymbolName(PCSTR, PSTR, DWORD, DWORD); BOOL WINAPI SymGetScope(HANDLE, ULONG64, DWORD, PSYMBOL_INFO); BOOL WINAPI SymFromIndex(HANDLE, ULONG64, DWORD, PSYMBOL_INFO);

1 0