January 2009 - Wine-commits

Andrey Turkin : shell32: Add explorer toolbar bitmaps.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 59520240ccc47ce1e92fbe2931aff9404824fe24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59520240ccc47ce1e92fbe293… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jan 3 18:36:00 2009 +0300 shell32: Add explorer toolbar bitmaps. --- dlls/shell32/idb_tb_large.bmp | Bin 0 -> 108342 bytes dlls/shell32/idb_tb_small.bmp | Bin 0 -> 48182 bytes dlls/shell32/shres.rc | 12 ++++++++++++ dlls/shell32/shresdef.h | 9 +++++++++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/idb_tb_large.bmp b/dlls/shell32/idb_tb_large.bmp new file mode 100644 index 0000000..f741242 Binary files /dev/null and b/dlls/shell32/idb_tb_large.bmp differ diff --git a/dlls/shell32/idb_tb_small.bmp b/dlls/shell32/idb_tb_small.bmp new file mode 100644 index 0000000..c44a2de Binary files /dev/null and b/dlls/shell32/idb_tb_small.bmp differ diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 8222f95..03349cc 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -99,6 +99,18 @@ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico /* @makedep: mydocs.ico */ IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico +/* @makedep: idb_tb_large.bmp */ +IDB_TB_LG_LIGHT BITMAP idb_tb_large.bmp + +/* @makedep: idb_tb_large.bmp */ +IDB_TB_LG_DARK BITMAP idb_tb_large.bmp + +/* @makedep: idb_tb_small.bmp */ +IDB_TB_SM_LIGHT BITMAP idb_tb_small.bmp + +/* @makedep: idb_tb_small.bmp */ +IDB_TB_SM_DARK BITMAP idb_tb_small.bmp + /* @makedep: searching.avi */ IDR_AVI_SEARCHING AVI searching.avi diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index c6df462..6353623 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -193,4 +193,13 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi #define IDC_RUNDLG_EDITPATH 12298 #define IDC_RUNDLG_LABEL 12305 +/* bitmaps */ +/* explorer toolbar icons + * FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now + */ +#define IDB_TB_LARGE_LIGHT 214 +#define IDB_TB_LARGE_DARK 215 +#define IDB_TB_SMALL_LIGHT 216 +#define IDB_TB_SMALL_DARK 217 + #endif

1 0

Andrey Turkin : ntdll: Always set output values in RtlGetDaclSecurityDescriptor.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 79dd662d2d953458acbdf965999f62d731209b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dd662d2d953458acbdf9659… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jan 3 18:35:00 2009 +0300 ntdll: Always set output values in RtlGetDaclSecurityDescriptor. --- dlls/ntdll/sec.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index a3a7148..a764e21 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -618,7 +618,12 @@ NTSTATUS WINAPI RtlGetDaclSecurityDescriptor( *pDacl = lpsd->Dacl; *lpbDaclDefaulted = (( SE_DACL_DEFAULTED & lpsd->Control ) ? 1 : 0); - } + } + else + { + *pDacl = NULL; + *lpbDaclDefaulted = 0; + } return STATUS_SUCCESS; }

1 0

Alexandre Julliard : libwine: Fix vsnprintfW string formatting to handle alignment and padding.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 9428dfe71a83c175108b8a936db5768f5d6558c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9428dfe71a83c175108b8a936… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:13:33 2009 +0100 libwine: Fix vsnprintfW string formatting to handle alignment and padding. Also fix handling of pointer format for 64-bit. --- libs/wine/string.c | 84 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 70 insertions(+), 14 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 195af6c..b45de92 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <limits.h> #include <stdio.h> @@ -298,6 +299,51 @@ noconv: } +/* format a WCHAR string according to a printf format; helper for vsnprintfW */ +static int format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str ) +{ + size_t count = 0; + int i, left_align = 0, width = 0, max = 0; + + assert( *format == '%' ); + format++; /* skip '%' */ + + while (*format == '0' || *format == '+' || *format == '-' || *format == ' ' || *format == '#') + { + if (*format == '-') left_align = 1; + format++; + } + + while (isdigit(*format)) width = width * 10 + *format++ - '0'; + + if (*format == '.') + { + format++; + while (isdigit(*format)) max = max * 10 + *format++ - '0'; + for (i = 0; i < max; i++) if (!str[i]) max = i; + } + else max = strlenW(str); + + assert( *format == 's' ); + + if (!left_align && width > max) + { + if ((count += width - max) >= len) return -1; + for (i = 0; i < width - max; i++) *buffer++ = ' '; + } + + if ((count += max) >= len) return -1; + memcpy( buffer, str, max * sizeof(WCHAR) ); + buffer += max; + + if (left_align && width > max) + { + if ((count += width - max) >= len) return -1; + for (i = 0; i < width - max; i++) *buffer++ = ' '; + } + return count; +} + int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { unsigned int written = 0; @@ -372,23 +418,34 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { static const WCHAR none[] = { '(','n','u','l','l',')',0 }; const WCHAR *wstr = va_arg(valist, const WCHAR *); - const WCHAR *striter = wstr ? wstr : none; - while (*striter) - { - if (written++ >= len) - return -1; - *str++ = *striter++; - } + int count; + + *fmta++ = 's'; + *fmta = 0; + count = format_string( str, len - written, fmtbufa, wstr ? wstr : none ); + if (count == -1) return -1; + str += count; + written += count; iter++; break; } case 'c': - if (written++ >= len) - return -1; - *str++ = (WCHAR)va_arg(valist, int); + { + WCHAR wstr[2]; + int count; + + wstr[0] = va_arg(valist, int); + wstr[1] = 0; + *fmta++ = 's'; + *fmta = 0; + count = format_string( str, len - written, fmtbufa, wstr ); + if (count == -1) return -1; + str += count; + written += count; iter++; break; + } default: { @@ -396,7 +453,8 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) /* FIXME: for unrecognised types, should ignore % when printing */ char *bufaiter = bufa; if (*iter == 'p') - sprintf(bufaiter, "%08lX", va_arg(valist, long)); + sprintf(bufaiter, "%0*lX", 2 * (int)sizeof(void*), + (unsigned long)va_arg(valist, void *)); else { *fmta++ = *iter; @@ -408,9 +466,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else { - /* FIXME: On 32 bit systems this doesn't handle int 64's. - * on 64 bit systems this doesn't work for 32 bit types - */ + /* FIXME: On 32 bit systems this doesn't handle int 64's. */ sprintf(bufaiter, fmtbufa, va_arg(valist, void *)); } }

1 0

Andrey Turkin : user32: GetUserObjectSecurity should return a valid security descriptor.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 405ced0969ad0d346bf03e510777c4773f1cf89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=405ced0969ad0d346bf03e510… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jan 3 18:35:18 2009 +0300 user32: GetUserObjectSecurity should return a valid security descriptor. --- dlls/user32/winstation.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 9b89376..c6c52b7 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -628,7 +628,14 @@ BOOL WINAPI GetUserObjectSecurity( HANDLE handle, PSECURITY_INFORMATION info, PSECURITY_DESCRIPTOR sid, DWORD len, LPDWORD needed ) { FIXME( "(%p %p %p len=%d %p),stub!\n", handle, info, sid, len, needed ); - return TRUE; + if (needed) + *needed = sizeof(SECURITY_DESCRIPTOR); + if (len < sizeof(SECURITY_DESCRIPTOR)) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + return InitializeSecurityDescriptor(sid, SECURITY_DESCRIPTOR_REVISION); } /***********************************************************************

1 0

Alexandre Julliard : kernel32/tests: Use the actual name of the exe module in toolhelp tests.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: c9b4210b9ca9394d76511af36eb61e89c366e009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b4210b9ca9394d76511af36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:12:14 2009 +0100 kernel32/tests: Use the actual name of the exe module in toolhelp tests. --- dlls/kernel32/tests/toolhelp.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 109df6e..529df88 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -204,14 +204,14 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) static const char* curr_expected_modules[] = { - "kernel32.dll", "kernel32_test.exe" + "kernel32.dll", /* FIXME: could test for ntdll on NT and Wine */ }; static const char* sub_expected_modules[] = { - "kernel32.dll", "kernel32_test.exe", + "kernel32.dll", "shell32.dll" /* FIXME: could test for ntdll on NT and Wine */ }; @@ -283,6 +283,7 @@ START_TEST(toolhelp) { DWORD pid = GetCurrentProcessId(); int r; + char *p, module[MAX_PATH]; char buffer[MAX_PATH]; SECURITY_ATTRIBUTES sa; PROCESS_INFORMATION info; @@ -330,6 +331,12 @@ START_TEST(toolhelp) w = WaitForSingleObject(ev1, WAIT_TIME); ok(w == WAIT_OBJECT_0, "Failed to wait on sub-process startup\n"); + GetModuleFileNameA( 0, module, sizeof(module) ); + if (!(p = strrchr( module, '\\' ))) p = module; + else p++; + curr_expected_modules[0] = p; + sub_expected_modules[0] = p; + test_process(pid, info.dwProcessId); test_thread(pid, info.dwProcessId); test_module(pid, curr_expected_modules, NUM_OF(curr_expected_modules));

1 0

Alexandre Julliard : riched20/tests: Move the itextServicesStdcallVtbl definition to avoid a compiler warning.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 139ba4145899a4c591032134a36afd6fa62f7537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139ba4145899a4c591032134a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:12:50 2009 +0100 riched20/tests: Move the itextServicesStdcallVtbl definition to avoid a compiler warning. --- dlls/riched20/tests/txtsrv.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index a8cb169..3732377 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -39,6 +39,7 @@ static HMODULE hmoduleRichEdit; /* Use a special table for x86 machines to convert the thiscall * calling convention. This isn't needed on other platforms. */ #ifdef __i386__ +static ITextServicesVtbl itextServicesStdcallVtbl; #define TXTSERV_VTABLE(This) (&itextServicesStdcallVtbl) #else /* __i386__ */ #define TXTSERV_VTABLE(This) (This)->lpVtbl @@ -441,8 +442,6 @@ static HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *iface, return E_NOTIMPL; } -static ITextServicesVtbl itextServicesStdcallVtbl; - static ITextHostVtbl itextHostVtbl = { ITextHostImpl_QueryInterface, ITextHostImpl_AddRef,

1 0

Alexandre Julliard : msvcrt/tests: Fix the scanf pointer formatting tests on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 52f87c4a5747c7672ffc82b1ea669972b5607252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f87c4a5747c7672ffc82b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:11:08 2009 +0100 msvcrt/tests: Fix the scanf pointer formatting tests on 64-bit. --- dlls/msvcrt/tests/scanf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index cb005f9..0ec89ff 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -54,7 +54,8 @@ static void test_sscanf( void ) ok( ptr == NULL,"sscanf reads %p instead of %x\n", ptr, 0 ); ok( sscanf("-46F174", "%p", &ptr) == 1, "sscanf failed\n" ); - ok( ptr == (void *)0xFFB90E8C,"sscanf reads %p instead of %x\n", ptr, 0xFFB90E8C ); + ok( ptr == (void *)(ULONG_PTR)-0x46f174,"sscanf reads %p instead of %p\n", + ptr, (void *)(ULONG_PTR)-0x46f174 ); ok( sscanf("+46F175", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F175,"sscanf reads %p instead of %x\n", ptr, 0x46F175 );

1 0

Alexandre Julliard : kernel32/tests: Comment out a couple of heap tests that crash on 64-bit Vista.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 1cdccc7de79bf6e4cdea58f5aa461ae0fa949698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cdccc7de79bf6e4cdea58f5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:11:52 2009 +0100 kernel32/tests: Comment out a couple of heap tests that crash on 64-bit Vista. --- dlls/kernel32/tests/heap.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 4aa6b7e..39efde9 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -190,13 +190,16 @@ START_TEST(heap) ok(mem == NULL, "Expected NULL, got %p\n", mem); /* invalid free */ - SetLastError(MAGIC_DEAD); - mem = GlobalFree(gbl); - ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem); - if (mem == gbl) - ok(GetLastError() == ERROR_INVALID_HANDLE || - GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ + { + SetLastError(MAGIC_DEAD); + mem = GlobalFree(gbl); + ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem); + if (mem == gbl) + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } gbl = GlobalAlloc(GMEM_DDESHARE, 100); @@ -211,12 +214,15 @@ START_TEST(heap) "Expected 1 or 0, got %d\n", res); /* GlobalSize on an invalid handle */ - SetLastError(MAGIC_DEAD); - size = GlobalSize((HGLOBAL)0xc042); - ok(size == 0, "Expected 0, got %ld\n", size); - ok(GetLastError() == ERROR_INVALID_HANDLE || - GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ + { + SetLastError(MAGIC_DEAD); + size = GlobalSize((HGLOBAL)0xc042); + ok(size == 0, "Expected 0, got %ld\n", size); + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } /* ####################################### */ /* Local*() functions */

1 0

Michael Stefaniuc : include: Change RPC_LENGTH to ULONG for Win64 compatibility.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: c0827c7a6770afb1c8d234c9e8507abcb4529615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0827c7a6770afb1c8d234c9e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 11:29:30 2009 +0100 include: Change RPC_LENGTH to ULONG for Win64 compatibility. --- include/rpcndr.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 15f1cb2..6cec8cd 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -144,7 +144,7 @@ struct NDR_ALLOC_ALL_NODES_CONTEXT; struct NDR_POINTER_QUEUE_STATE; typedef unsigned char *RPC_BUFPTR; -typedef unsigned long RPC_LENGTH; +typedef ULONG RPC_LENGTH; typedef void (__RPC_USER *EXPR_EVAL)(struct _MIDL_STUB_MESSAGE *); typedef const unsigned char *PFORMAT_STRING;

1 0

Alexandre Julliard : include: Fix data structures for processor affinity on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 935a406b27a96d1f9e4bd7b07ece035024cb56c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935a406b27a96d1f9e4bd7b07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:10:20 2009 +0100 include: Fix data structures for processor affinity on 64-bit. --- dlls/kernel32/cpu.c | 6 +++--- include/winbase.h | 2 +- include/winnt.h | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 63ca277..bd3d74a 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -681,7 +681,7 @@ VOID WINAPI GetSystemInfo( valSize = sizeof(int); if (sysctlbyname ("hw.activecpu", &value, &valSize, NULL, 0) == 0) - cachedsi.dwActiveProcessorMask = (1 << value) - 1; + cachedsi.dwActiveProcessorMask = ((ULONG_PTR)1 << value) - 1; valSize = sizeof(int); if (sysctlbyname ("hw.cputype", &cputype, &valSize, NULL, 0) == 0) @@ -780,12 +780,12 @@ VOID WINAPI GetSystemInfo( FIXME("not yet supported on this system\n"); #endif if (!cachedsi.dwActiveProcessorMask) - cachedsi.dwActiveProcessorMask = (1 << cachedsi.dwNumberOfProcessors) - 1; + cachedsi.dwActiveProcessorMask = ((ULONG_PTR)1 << cachedsi.dwNumberOfProcessors) - 1; *si = cachedsi; TRACE("<- CPU arch %d, res'd %d, pagesize %d, minappaddr %p, maxappaddr %p," - " act.cpumask %08x, numcpus %d, CPU type %d, allocgran. %d, CPU level %d, CPU rev %d\n", + " act.cpumask %lx, numcpus %d, CPU type %d, allocgran. %d, CPU level %d, CPU rev %d\n", si->u.s.wProcessorArchitecture, si->u.s.wReserved, si->dwPageSize, si->lpMinimumApplicationAddress, si->lpMaximumApplicationAddress, si->dwActiveProcessorMask, si->dwNumberOfProcessors, si->dwProcessorType, diff --git a/include/winbase.h b/include/winbase.h index d3b392c..521bb16 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -776,7 +776,7 @@ typedef struct _SYSTEM_INFO DWORD dwPageSize; LPVOID lpMinimumApplicationAddress; LPVOID lpMaximumApplicationAddress; - DWORD dwActiveProcessorMask; + DWORD_PTR dwActiveProcessorMask; DWORD dwNumberOfProcessors; DWORD dwProcessorType; DWORD dwAllocationGranularity; diff --git a/include/winnt.h b/include/winnt.h index 0c8e0a9..57f4c5c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -540,7 +540,12 @@ typedef DWORD FLONG; #define PROCESSOR_ARM920 2336 /* 0x920 */ #define PROCESSOR_ARM_7TDMI 70001 +#ifdef _WIN64 +#define MAXIMUM_PROCESSORS 64 +#else #define MAXIMUM_PROCESSORS 32 +#endif + typedef struct _MEMORY_BASIC_INFORMATION { LPVOID BaseAddress;

1 0