December 2009 - Wine-commits

Paul Vriens : comctl32/tests: Fix some test failures on older comctl32.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: fb1fada93a47cea9b52cac968ff87d3365539c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1fada93a47cea9b52cac968… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 15 08:59:30 2009 +0100 comctl32/tests: Fix some test failures on older comctl32. --- dlls/comctl32/tests/treeview.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index f99da88..e763feb 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -999,7 +999,10 @@ static void test_get_linecolor(void) /* newly created control has default color */ clr = (COLORREF)SendMessage(hTree, TVM_GETLINECOLOR, 0, 0); - expect(CLR_DEFAULT, clr); + if (clr == 0) + win_skip("TVM_GETLINECOLOR is not supported on comctl32 < 5.80\n"); + else + expect(CLR_DEFAULT, clr); DestroyWindow(hTree); } @@ -1013,7 +1016,10 @@ static void test_get_insertmarkcolor(void) /* newly created control has default color */ clr = (COLORREF)SendMessage(hTree, TVM_GETINSERTMARKCOLOR, 0, 0); - expect(CLR_DEFAULT, clr); + if (clr == 0) + win_skip("TVM_GETINSERTMARKCOLOR is not supported on comctl32 < 5.80\n"); + else + expect(CLR_DEFAULT, clr); DestroyWindow(hTree); }

1 0

Paul Vriens : kernel32: Add a define for UNICODE_STRING_MAX_CHARS.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 4d6b74758f9ce967e87a9a1d0b67079898e8a5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6b74758f9ce967e87a9a1d0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 14 13:58:24 2009 +0100 kernel32: Add a define for UNICODE_STRING_MAX_CHARS. --- dlls/kernel32/environ.c | 4 ++-- include/winnt.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index aaa9d6e..b11f7bf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -364,8 +364,8 @@ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len ) RtlInitUnicodeString(&us_src, src); /* make sure we don't overflow the maximum UNICODE_STRING size */ - if (len > 0x7fff) - len = 0x7fff; + if (len > UNICODE_STRING_MAX_CHARS) + len = UNICODE_STRING_MAX_CHARS; us_dst.Length = 0; us_dst.MaximumLength = len * sizeof(WCHAR); diff --git a/include/winnt.h b/include/winnt.h index e2d1d1a..28409af 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -617,6 +617,8 @@ typedef struct _MEMORY_BASIC_INFORMATION #define MAXWORD 0xffff #define MAXDWORD 0xffffffff +#define UNICODE_STRING_MAX_CHARS 32767 + #define FIELD_OFFSET(type, field) \ ((LONG)(INT_PTR)&(((type *)0)->field))

1 0

Alexandre Julliard : gdiplus/tests: Fix parentheses in the expect() macro.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 8d8544fa157ae92a61d7bf298a92551fe16f9227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8544fa157ae92a61d7bf298… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 14:55:05 2009 +0100 gdiplus/tests: Fix parentheses in the expect() macro. --- dlls/gdiplus/tests/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 66c6410..2b08ef8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -27,7 +27,7 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(((UINT)got) == ((UINT)expected), "Expected %.8x, got %.8x\n", (UINT)expected, (UINT)got) +#define expect(expected, got) ok((UINT)(got) == (UINT)(expected), "Expected %.8x, got %.8x\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo)

1 0

Alexandre Julliard : winex11: Make GetKeyboardLayoutName() use the same default layout as GetKeyboardLayout().
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: d18ad16331d1c68ab72a39f7bba77ca1b9a17cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18ad16331d1c68ab72a39f7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 15:10:24 2009 +0100 winex11: Make GetKeyboardLayoutName() use the same default layout as GetKeyboardLayout(). --- dlls/winex11.drv/keyboard.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7cf0fdc..4d486b0 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1635,16 +1635,11 @@ static HKL get_locale_kbd_layout(void) */ BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) { - static const WCHAR formatW[] = {'%','0','8','l','x',0}; + static const WCHAR formatW[] = {'%','0','8','x',0}; DWORD layout; - LANGID langid; - - layout = main_key_tab[kbd_layout].lcid; - /* see comment for get_locale_kbd_layout */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* FIXME */ + layout = HandleToUlong( get_locale_kbd_layout() ); + if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); sprintfW(name, formatW, layout); TRACE("returning %s\n", debugstr_w(name)); return TRUE;

1 0

Rob Shearman : gdi32: Fix memory leaks on EMF_Create_HENHMETAFILE failure.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: eb81fa283b5efbf15dd9360bf1a95ac809374b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb81fa283b5efbf15dd9360bf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:12:58 2009 +0000 gdi32: Fix memory leaks on EMF_Create_HENHMETAFILE failure. --- dlls/gdi32/enhmetafile.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 95e5589..adb19a0 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -466,8 +466,12 @@ UINT WINAPI GetEnhMetaFileDescriptionW( HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf) { ENHMETAHEADER *emh = HeapAlloc( GetProcessHeap(), 0, bufsize ); + HENHMETAFILE hmf; memmove(emh, buf, bufsize); - return EMF_Create_HENHMETAFILE( emh, FALSE ); + hmf = EMF_Create_HENHMETAFILE( emh, FALSE ); + if (!hmf) + HeapFree( GetProcessHeap(), 0, emh ); + return hmf; } /***************************************************************************** @@ -2509,6 +2513,8 @@ HENHMETAFILE WINAPI CopyEnhMetaFileA( emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + if (!hmfDst) + HeapFree( GetProcessHeap(), 0, emrDst ); } else { HANDLE hFile; DWORD w; @@ -2549,6 +2555,8 @@ HENHMETAFILE WINAPI CopyEnhMetaFileW( emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + if (!hmfDst) + HeapFree( GetProcessHeap(), 0, emrDst ); } else { HANDLE hFile; DWORD w;

1 0

Rob Shearman : msvcrt: Free memory allocated in TLS slot on module unload as well as thread exit.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: c20868e0a2f7af909cf8af2877ae8b024fa6d11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20868e0a2f7af909cf8af287… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:13:57 2009 +0000 msvcrt: Free memory allocated in TLS slot on module unload as well as thread exit. --- dlls/msvcrt/main.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index b42b64a..e64f0ba 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -60,13 +60,24 @@ static inline BOOL msvcrt_free_tls(void) return TRUE; } +static inline void msvcrt_free_tls_mem(void) +{ + thread_data_t *tls = TlsGetValue(msvcrt_tls_index); + if (tls) + { + HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); + HeapFree(GetProcessHeap(),0,tls->asctime_buffer); + HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + HeapFree(GetProcessHeap(),0,tls->strerror_buffer); + } + HeapFree(GetProcessHeap(), 0, tls); +} + /********************************************************************* * Init */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - thread_data_t *tls; - TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%u)\n", hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved, GetCurrentProcessId(), GetCurrentThreadId(), @@ -94,21 +105,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_free_console(); msvcrt_free_args(); msvcrt_free_signals(); + msvcrt_free_tls_mem(); if (!msvcrt_free_tls()) return FALSE; TRACE("finished process free\n"); break; case DLL_THREAD_DETACH: - /* Free TLS */ - tls = TlsGetValue(msvcrt_tls_index); - if (tls) - { - HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); - HeapFree(GetProcessHeap(),0,tls->asctime_buffer); - HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); - HeapFree(GetProcessHeap(),0,tls->strerror_buffer); - } - HeapFree(GetProcessHeap(), 0, tls); + msvcrt_free_tls_mem(); TRACE("finished thread free\n"); break; }

1 0

Rob Shearman : cabinet: Fix memory leaks on failure in FDICopy.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: eae5b071c23cf5a7c6285201f245faa14b73ef37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae5b071c23cf5a7c6285201f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:13:20 2009 +0000 cabinet: Fix memory leaks on failure in FDICopy. --- dlls/cabinet/fdi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 61dafdb..de64f02 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2519,6 +2519,7 @@ BOOL __cdecl FDICopy( /* slight overestimation here to save CPU cycles in the developer's brain */ if ((pathlen + filenamelen + 3) > MAX_PATH) { ERR("MAX_PATH exceeded.\n"); + PFDI_FREE(hfdi, decomp_state); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; PFDI_INT(hfdi)->perf->erfType = ERROR_FILE_NOT_FOUND; PFDI_INT(hfdi)->perf->fError = TRUE; @@ -2540,6 +2541,7 @@ BOOL __cdecl FDICopy( /* get a handle to the cabfile */ cabhf = PFDI_OPEN(hfdi, fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { + PFDI_FREE(hfdi, decomp_state); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; PFDI_INT(hfdi)->perf->fError = TRUE; SetLastError(ERROR_FILE_NOT_FOUND); @@ -2548,6 +2550,7 @@ BOOL __cdecl FDICopy( if (cabhf == 0) { ERR("PFDI_OPEN returned zero for %s.\n", fullpath); + PFDI_FREE(hfdi, decomp_state); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; PFDI_INT(hfdi)->perf->erfType = ERROR_FILE_NOT_FOUND; PFDI_INT(hfdi)->perf->fError = TRUE; @@ -2558,6 +2561,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(hfdi, cabhf, &fdici, &(CAB(mii)))) { ERR("FDIIsCabinet failed.\n"); + PFDI_FREE(hfdi, decomp_state); PFDI_CLOSE(hfdi, cabhf); return FALSE; }

1 0

Rob Shearman : ntdll: Ignore the hole in the FILE_PIPE_WAIT_FOR_BUFFER structure passed into NtFsControlFile before writing the structure to the server .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 052873350df26c5add3a36a010b5910131bd0917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052873350df26c5add3a36a01… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:32:50 2009 +0000 ntdll: Ignore the hole in the FILE_PIPE_WAIT_FOR_BUFFER structure passed into NtFsControlFile before writing the structure to the server. --- dlls/ntdll/file.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 00c54c2..b81d38c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -69,6 +69,9 @@ #ifdef HAVE_SYS_STATFS_H # include <sys/statfs.h> #endif +#ifdef HAVE_VALGRIND_MEMCHECK_H +# include <valgrind/memcheck.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -1257,6 +1260,30 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, return status; } +/* Tell Valgrind to ignore any holes in structs we will be passing to the + * server */ +static void ignore_server_ioctl_struct_holes (ULONG code, const void *in_buffer, + ULONG in_size) +{ +#ifdef VALGRIND_MAKE_MEM_DEFINED +# define IGNORE_STRUCT_HOLE(buf, size, t, f1, f2) \ + do { \ + if ((size) >= FIELD_OFFSET(t, f2) && \ + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \ + VALGRIND_MAKE_MEM_DEFINED( \ + (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \ + FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \ + } while (0) + + switch (code) + { + case FSCTL_PIPE_WAIT: + IGNORE_STRUCT_HOLE(in_buffer, in_size, FILE_PIPE_WAIT_FOR_BUFFER, TimeoutSpecified, Name); + break; + } +#endif +} + /************************************************************************** * NtDeviceIoControlFile [NTDLL.@] @@ -1356,6 +1383,8 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!io) return STATUS_INVALID_PARAMETER; + ignore_server_ioctl_struct_holes( code, in_buffer, in_size ); + switch(code) { case FSCTL_DISMOUNT_VOLUME:

1 0

Eric Pouech : winedbg: For the x86_64 backend, fetch all the integral types .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 91c7ff299469a07c37fc10ea681f90d2ddfaaccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c7ff299469a07c37fc10ea6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:19:38 2009 +0100 winedbg: For the x86_64 backend, fetch all the integral types. --- programs/winedbg/be_x86_64.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index dc1f227..ed5cdf2 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -226,10 +226,24 @@ static int be_x86_64_adjust_pc_for_break(CONTEXT* ctx, BOOL way) } static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) + unsigned ext_sign, LONGLONG* ret) { - dbg_printf("not done fetch_integer\n"); - return FALSE; + if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) + return FALSE; + + memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ + /* FIXME: this assumes that debuggee and debugger use the same + * integral representation + */ + if (!memory_read_value(lvalue, size, ret)) return FALSE; + + /* propagate sign information */ + if (ext_sign && size < 16 && (*ret >> (size * 8 - 1)) != 0) + { + ULONGLONG neg = -1; + *ret |= neg << (size * 8); + } + return TRUE; } static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size,

1 0

Eric Pouech : winedbg: Force 64bit line number information throughout the code to ease 64bit portability .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 12c3a012cbe1ecaa7cd7369ef09b48b241b01b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c3a012cbe1ecaa7cd7369ef… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:19:44 2009 +0100 winedbg: Force 64bit line number information throughout the code to ease 64bit portability. --- programs/winedbg/break.c | 4 ++-- programs/winedbg/dbg.y | 4 ++-- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/memory.c | 4 ++-- programs/winedbg/source.c | 10 +++++----- programs/winedbg/stack.c | 6 +++--- programs/winedbg/symbol.c | 21 +++++++++++---------- programs/winedbg/tgt_active.c | 4 ++-- 8 files changed, 29 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12c3a012cbe1ecaa7cd73…

1 0