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

Andrew Talbot : ws2_32: Remove unused function.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 0c1407008dabb8f82e27aa136f0070ca440bd00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1407008dabb8f82e27aa136… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed May 21 21:50:27 2008 +0100 ws2_32: Remove unused function. --- dlls/ws2_32/socket.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c24a049..d0d2a13 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -579,17 +579,6 @@ static int convert_sockopt(INT *level, INT *optname) return 0; } -static inline BOOL is_timeout_option( int optname ) -{ -#ifdef SO_RCVTIMEO - if (optname == SO_RCVTIMEO) return TRUE; -#endif -#ifdef SO_SNDTIMEO - if (optname == SO_SNDTIMEO) return TRUE; -#endif - return FALSE; -} - /* ----------------------------------- Per-thread info (or per-process?) */ static char *strdup_lower(const char *str)

1 0

Alexandre Julliard : kernel32: File mapping names are case sensitive.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 9f76085c0606ddf3a9c8e43c4c02d0c27ca32fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f76085c0606ddf3a9c8e43c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 20:45:11 2008 +0200 kernel32: File mapping names are case sensitive. --- dlls/kernel32/tests/virtual.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/virtual.c | 5 ++--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index dad82f6..fc70a76 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -622,6 +622,45 @@ static void test_NtMapViewOfSection(void) CloseHandle(hProcess); } +static void test_CreateFileMapping(void) +{ + HANDLE handle, handle2; + + /* test case sensitivity */ + + SetLastError(0xdeadbeef); + handle = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, SEC_COMMIT | PAGE_READWRITE, 0, 0x1000, + __FILE__ ": Test Mapping"); + ok( handle != NULL, "CreateFileMapping failed with error %u\n", GetLastError()); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle2 = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, SEC_COMMIT | PAGE_READWRITE, 0, 0x1000, + __FILE__ ": Test Mapping"); + ok( handle2 != NULL, "CreateFileMapping failed with error %d\n", GetLastError()); + ok( GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, SEC_COMMIT | PAGE_READWRITE, 0, 0x1000, + __FILE__ ": TEST MAPPING"); + ok( handle2 != NULL, "CreateFileMapping failed with error %d\n", GetLastError()); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenFileMappingA( FILE_MAP_ALL_ACCESS, FALSE, __FILE__ ": Test Mapping"); + ok( handle2 != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenFileMappingA( FILE_MAP_ALL_ACCESS, FALSE, __FILE__ ": TEST MAPPING"); + ok( !handle2, "OpenFileMapping succeeded\n"); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + CloseHandle( handle ); +} + static void test_BadPtr(void) { void *ptr = (void*)1; @@ -667,5 +706,6 @@ START_TEST(virtual) test_VirtualAlloc(); test_MapViewOfFile(); test_NtMapViewOfSection(); + test_CreateFileMapping(); test_BadPtr(); } diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 9bb13f1..a338a9d 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -347,8 +347,7 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | - ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; @@ -451,7 +450,7 @@ HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name) attr.Length = sizeof(attr); attr.RootDirectory = get_BaseNamedObjects_handle(); attr.ObjectName = &nameW; - attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); + attr.Attributes = inherit ? OBJ_INHERIT : 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, name );

1 0

Alexandre Julliard : kernel32: Waitable timer names are case sensitive.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: b62f3dee2d629999f8f4cd2970af3592e091a8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62f3dee2d629999f8f4cd297… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 20:44:36 2008 +0200 kernel32: Waitable timer names are case sensitive. --- dlls/kernel32/sync.c | 5 ++--- dlls/kernel32/tests/sync.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index e317bf7..0032d17 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -913,8 +913,7 @@ HANDLE WINAPI CreateWaitableTimerW( SECURITY_ATTRIBUTES *sa, BOOL manual, LPCWST attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | - ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; if (name) @@ -967,7 +966,7 @@ HANDLE WINAPI OpenWaitableTimerW( DWORD access, BOOL inherit, LPCWSTR name ) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); + attr.Attributes = inherit ? OBJ_INHERIT : 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; if (name) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 6402457..7c9967d 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -372,6 +372,42 @@ static void test_semaphore(void) CloseHandle( handle ); } +static void test_waitable_timer(void) +{ + HANDLE handle, handle2; + + /* test case sensitivity */ + + SetLastError(0xdeadbeef); + handle = CreateWaitableTimerA(NULL, FALSE, __FILE__ ": Test WaitableTimer"); + ok(handle != NULL, "CreateWaitableTimer failed with error %u\n", GetLastError()); + ok(GetLastError() == 0, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle2 = CreateWaitableTimerA(NULL, FALSE, __FILE__ ": Test WaitableTimer"); + ok( handle2 != NULL, "CreateWaitableTimer failed with error %d\n", GetLastError()); + ok( GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = CreateWaitableTimerA(NULL, FALSE, __FILE__ ": TEST WAITABLETIMER"); + ok( handle2 != NULL, "CreateWaitableTimer failed with error %d\n", GetLastError()); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, __FILE__ ": Test WaitableTimer"); + ok( handle2 != NULL, "OpenWaitableTimer failed with error %d\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, __FILE__ ": TEST WAITABLETIMER"); + ok( !handle2, "OpenWaitableTimer succeeded\n"); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + CloseHandle( handle ); +} + static HANDLE sem = 0; static void CALLBACK iocp_callback(DWORD dwErrorCode, DWORD dwNumberOfBytesTransferred, LPOVERLAPPED lpOverlapped) @@ -488,5 +524,6 @@ START_TEST(sync) test_slist(); test_event(); test_semaphore(); + test_waitable_timer(); test_iocp_callback(); }

1 0

Alexandre Julliard : kernel32: Semaphore names are case sensitive.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 116297d0c17694a2a7b7f7060f80e50f51d8ae87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116297d0c17694a2a7b7f7060… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 20:43:43 2008 +0200 kernel32: Semaphore names are case sensitive. --- dlls/kernel32/sync.c | 5 ++--- dlls/kernel32/tests/sync.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index eb2fcc5..e317bf7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -794,8 +794,7 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial, attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | - ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; if (name) @@ -847,7 +846,7 @@ HANDLE WINAPI OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name ) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); + attr.Attributes = inherit ? OBJ_INHERIT : 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; if (name) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index e3de911..6402457 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -336,6 +336,42 @@ static void test_event(void) CloseHandle( handle ); } +static void test_semaphore(void) +{ + HANDLE handle, handle2; + + /* test case sensitivity */ + + SetLastError(0xdeadbeef); + handle = CreateSemaphoreA(NULL, 0, 1, __FILE__ ": Test Semaphore"); + ok(handle != NULL, "CreateSemaphore failed with error %u\n", GetLastError()); + ok(GetLastError() == 0, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle2 = CreateSemaphoreA(NULL, 0, 1, __FILE__ ": Test Semaphore"); + ok( handle2 != NULL, "CreateSemaphore failed with error %d\n", GetLastError()); + ok( GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = CreateSemaphoreA(NULL, 0, 1, __FILE__ ": TEST SEMAPHORE"); + ok( handle2 != NULL, "CreateSemaphore failed with error %d\n", GetLastError()); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenSemaphoreA( SEMAPHORE_ALL_ACCESS, FALSE, __FILE__ ": Test Semaphore"); + ok( handle2 != NULL, "OpenSemaphore failed with error %d\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenSemaphoreA( SEMAPHORE_ALL_ACCESS, FALSE, __FILE__ ": TEST SEMAPHORE"); + ok( !handle2, "OpenSemaphore succeeded\n"); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + CloseHandle( handle ); +} + static HANDLE sem = 0; static void CALLBACK iocp_callback(DWORD dwErrorCode, DWORD dwNumberOfBytesTransferred, LPOVERLAPPED lpOverlapped) @@ -451,5 +487,6 @@ START_TEST(sync) test_mutex(); test_slist(); test_event(); + test_semaphore(); test_iocp_callback(); }

1 0

Alexandre Julliard : kernel32: Mutex names are case sensitive.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: e9793cc1837c226af760d0a51f66baf1b8c266ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9793cc1837c226af760d0a51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 20:41:45 2008 +0200 kernel32: Mutex names are case sensitive. --- dlls/kernel32/sync.c | 5 ++--- dlls/kernel32/tests/sync.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 06efdec..bd2dd06 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -669,8 +669,7 @@ HANDLE WINAPI CreateMutexW( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCWSTR name ) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | - ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; if (name) @@ -722,7 +721,7 @@ HANDLE WINAPI OpenMutexW( DWORD access, BOOL inherit, LPCWSTR name ) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); + attr.Attributes = inherit ? OBJ_INHERIT : 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; if (name) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index b5778fc..d130803 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -148,7 +148,30 @@ static void test_mutex(void) todo_wine ok(!ret && (GetLastError() == ERROR_NOT_OWNER), "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %d\n", GetLastError()); + /* test case sensitivity */ + + SetLastError(0xdeadbeef); + hOpened = OpenMutex(READ_CONTROL, FALSE, "WINETESTMUTEX"); + ok(!hOpened, "OpenMutex succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + hOpened = OpenMutex(READ_CONTROL, FALSE, "winetestmutex"); + ok(!hOpened, "OpenMutex succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + hOpened = CreateMutex(NULL, FALSE, "WineTestMutex"); + ok(hOpened != NULL, "CreateMutex failed with error %d\n", GetLastError()); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); CloseHandle(hOpened); + + SetLastError(0xdeadbeef); + hOpened = CreateMutex(NULL, FALSE, "WINETESTMUTEX"); + ok(hOpened != NULL, "CreateMutex failed with error %d\n", GetLastError()); + ok(GetLastError() == 0, "wrong error %u\n", GetLastError()); + CloseHandle(hOpened); + CloseHandle(hCreated); }

1 0

Alexandre Julliard : kernel32: Event names are case sensitive.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: c96752c044c151497e0de115516cfb809603268e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96752c044c151497e0de1155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 20:42:54 2008 +0200 kernel32: Event names are case sensitive. --- dlls/kernel32/sync.c | 5 ++--- dlls/kernel32/tests/sync.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index bd2dd06..eb2fcc5 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -469,8 +469,7 @@ HANDLE WINAPI CreateEventW( SECURITY_ATTRIBUTES *sa, BOOL manual_reset, attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | - ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; if (name) @@ -531,7 +530,7 @@ HANDLE WINAPI OpenEventW( DWORD access, BOOL inherit, LPCWSTR name ) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); + attr.Attributes = inherit ? OBJ_INHERIT : 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; if (name) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index d130803..e3de911 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -268,9 +268,9 @@ static void test_slist(void) ok(((struct item*)entry->Next)->value == 1, "item 1 not at the back of list\n"); } -static void test_event_security(void) +static void test_event(void) { - HANDLE handle; + HANDLE handle, handle2; SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; ACL acl; @@ -303,6 +303,37 @@ static void test_event_security(void) handle = CreateEventA(&sa, FALSE, FALSE, __FILE__ ": Test Event"); ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError()); CloseHandle(handle); + + /* test case sensitivity */ + + SetLastError(0xdeadbeef); + handle = CreateEventA(NULL, FALSE, FALSE, __FILE__ ": Test Event"); + ok( handle != NULL, "CreateEvent failed with error %u\n", GetLastError()); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle2 = CreateEventA(NULL, FALSE, FALSE, __FILE__ ": Test Event"); + ok( handle2 != NULL, "CreateEvent failed with error %d\n", GetLastError()); + ok( GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = CreateEventA(NULL, FALSE, FALSE, __FILE__ ": TEST EVENT"); + ok( handle2 != NULL, "CreateEvent failed with error %d\n", GetLastError()); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenEventA( EVENT_ALL_ACCESS, FALSE, __FILE__ ": Test Event"); + ok( handle2 != NULL, "OpenEvent failed with error %d\n", GetLastError()); + CloseHandle( handle2 ); + + SetLastError(0xdeadbeef); + handle2 = OpenEventA( EVENT_ALL_ACCESS, FALSE, __FILE__ ": TEST EVENT"); + ok( !handle2, "OpenEvent succeeded\n"); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + CloseHandle( handle ); } static HANDLE sem = 0; @@ -419,6 +450,6 @@ START_TEST(sync) test_signalandwait(); test_mutex(); test_slist(); - test_event_security(); + test_event(); test_iocp_callback(); }

1 0

Nikolay Sivov : gdiplus: GdipBitmapLockBits should allow a NULL rect argument.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 36a7f31752bf9ac1eb1a4db649dc375ca8ad88fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a7f31752bf9ac1eb1a4db64… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 21 19:47:50 2008 +0400 gdiplus: GdipBitmapLockBits should allow a NULL rect argument. --- dlls/gdiplus/image.c | 28 +++++++++++++++++++--------- dlls/gdiplus/tests/image.c | 13 ++++++++++++- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 72bf7f5..f6dffcf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -101,15 +101,25 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, BITMAPINFO bmi; BYTE *buff = NULL; UINT abs_height; + GpRect act_rect; /* actual rect to be used */ TRACE("%p %p %d %d %p\n", bitmap, rect, flags, format, lockeddata); - if(!lockeddata || !bitmap || !rect) + if(!lockeddata || !bitmap) return InvalidParameter; - if(rect->X < 0 || rect->Y < 0 || (rect->X + rect->Width > bitmap->width) || - (rect->Y + rect->Height > bitmap->height) || !flags) - return InvalidParameter; + if(rect){ + if(rect->X < 0 || rect->Y < 0 || (rect->X + rect->Width > bitmap->width) || + (rect->Y + rect->Height > bitmap->height) || !flags) + return InvalidParameter; + + act_rect = *rect; + } + else{ + act_rect.X = act_rect.Y = 0; + act_rect.Width = bitmap->width; + act_rect.Height = bitmap->height; + } if(flags & ImageLockModeUserInputBuf) return NotImplemented; @@ -151,19 +161,19 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(!buff) return OutOfMemory; - lockeddata->Width = rect->Width; - lockeddata->Height = rect->Height; + lockeddata->Width = act_rect.Width; + lockeddata->Height = act_rect.Height; lockeddata->PixelFormat = format; lockeddata->Reserved = flags; if(bmi.bmiHeader.biHeight > 0){ lockeddata->Stride = -stride; - lockeddata->Scan0 = buff + (bitspp / 8) * rect->X + - stride * (abs_height - 1 - rect->Y); + lockeddata->Scan0 = buff + (bitspp / 8) * act_rect.X + + stride * (abs_height - 1 - act_rect.Y); } else{ lockeddata->Stride = stride; - lockeddata->Scan0 = buff + (bitspp / 8) * rect->X + stride * rect->Y; + lockeddata->Scan0 = buff + (bitspp / 8) * act_rect.X + stride * act_rect.Y; } bitmap->lockmode = flags; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5142f7c..a3e7676 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -247,7 +247,7 @@ static void test_LockBits(void) GpBitmap *bm; GpRect rect; BitmapData bd; - const REAL WIDTH = 10.0, HEIGHT = 20.0; + const INT WIDTH = 10, HEIGHT = 20; bm = NULL; stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); @@ -267,6 +267,17 @@ static void test_LockBits(void) expect(Ok, stat); } + /* read-only, with NULL rect -> whole bitmap lock */ + stat = GdipBitmapLockBits(bm, NULL, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + expect(bd.Width, WIDTH); + expect(bd.Height, HEIGHT); + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + /* read-only, consecutive */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); expect(Ok, stat);

1 0

Nikolay Sivov : user32: Correct termination of returning string in Text_Ellipsify.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 87bb1cbcdcf9ad0b5850d511ee7ac5b9b6d33219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bb1cbcdcf9ad0b5850d511e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 21 20:49:07 2008 +0400 user32: Correct termination of returning string in Text_Ellipsify. --- dlls/user32/text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index c85bd48..da3444d 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -179,7 +179,7 @@ static void TEXT_Ellipsify (HDC hdc, WCHAR *str, unsigned int max_len, if (modstr) { memcpy (modstr, str, *len_str * sizeof(WCHAR)); - *(str+*len_str) = '\0'; + modstr[*len_str] = '\0'; } }

1 0

Jeremy White : ntdll/tests: Only test the readcount for a read below 0x10000 if the return code indicates a partial copy result .
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 6868691af98a458abab6d9171b0aac9604f565e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6868691af98a458abab6d9171… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed May 21 10:32:27 2008 -0500 ntdll/tests: Only test the readcount for a read below 0x10000 if the return code indicates a partial copy result. --- dlls/ntdll/tests/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 9fab806..140be05 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -819,7 +819,8 @@ static void test_readvirtualmemory(void) todo_wine{ status = pNtReadVirtualMemory(process, (void *) 0x1234, buffer, 12, &readcount); ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08x\n", status); - ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + if (status == STATUS_PARTIAL_COPY) + ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); } /* 0 handle */

1 0

Jeremy White : winebrowser: Route default url handlers to /usr/bin/ open on Mac OS X.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: d392e0e097794d94f683d1f3b6e1d60eb22bca3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d392e0e097794d94f683d1f3b… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed May 21 10:32:07 2008 -0500 winebrowser: Route default url handlers to /usr/bin/open on Mac OS X. --- programs/winebrowser/main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 0164a0b..20d6b72 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -100,11 +100,16 @@ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) static int open_http_url( const WCHAR *url ) { +#ifdef __APPLE__ + static const WCHAR defaultbrowsers[] = + { '/', 'u', 's', 'r', '/', 'b', 'i', 'n', '/', 'o', 'p', 'e', 'n', 0 }; +#else static const WCHAR defaultbrowsers[] = {'x','d','g','-','o','p','e','n',',','f','i','r','e','f','o','x',',', 'k','o','n','q','u','e','r','o','r',',','m','o','z','i','l','l','a',',', 'n','e','t','s','c','a','p','e',',','g','a','l','e','o','n',',', 'o','p','e','r','a',',','d','i','l','l','o',0}; +#endif static const WCHAR browsersW[] = {'B','r','o','w','s','e','r','s',0}; @@ -128,11 +133,16 @@ static int open_http_url( const WCHAR *url ) static int open_mailto_url( const WCHAR *url ) { +#ifdef __APPLE__ + static const WCHAR defaultmailers[] = + { '/', 'u', 's', 'r', '/', 'b', 'i', 'n', '/', 'o', 'p', 'e', 'n', 0 }; +#else static const WCHAR defaultmailers[] = {'x','d','g','-','e','m','a','i','l',',', 'm','o','z','i','l','l','a','-','t','h','u','n','d','e','r','b','i','r','d',',', 't','h','u','n','d','e','r','b','i','r','d',',', 'e','v','o','l','u','t','i','o','n',0}; +#endif static const WCHAR mailersW[] = {'M','a','i','l','e','r','s',0};

1 0