wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

André Hentschel : gdi32/tests: Consistently print out all infos about non-equal rects.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 8134b93516912e080e8057d13e2e98b7f7e7fe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8134b93516912e080e8057d13… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 9 19:17:12 2011 +0200 gdi32/tests: Consistently print out all infos about non-equal rects. --- dlls/gdi32/tests/dc.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5017583..c173cef 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -107,7 +107,10 @@ todo_wine ret = GetClipBox(hdc, &rc_clip); ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); SetRect(&rc, 0, 0, 50, 50); - ok(EqualRect(&rc, &rc_clip), "rects are not equal\n"); + ok(EqualRect(&rc, &rc_clip), + "rects are not equal: (%d,%d-%d,%d) - (%d,%d-%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); ret = RestoreDC(hdc, 1); ok(ret, "ret = %d\n", ret); @@ -115,7 +118,10 @@ todo_wine ret = GetClipBox(hdc, &rc_clip); ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); SetRect(&rc, 0, 0, 100, 100); - ok(EqualRect(&rc, &rc_clip), "rects are not equal\n"); + ok(EqualRect(&rc, &rc_clip), + "rects are not equal: (%d,%d-%d,%d) - (%d,%d-%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); DeleteObject(hrgn); ReleaseDC(hwnd, hdc);

1 0

André Hentschel : winex11: Fix function header for building without xrender headers.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 0dba66c05b8d1686924f00bb8fb7b902069fa88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dba66c05b8d1686924f00bb8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 9 19:16:58 2011 +0200 winex11: Fix function header for building without xrender headers. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ad8e08b..a8d6329 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2440,8 +2440,8 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) return; } -BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc, - struct bitblt_coords *dst, struct bitblt_coords *src, BLENDFUNCTION blendfn ) +BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, struct bitblt_coords *dst, + X11DRV_PDEVICE *devSrc, struct bitblt_coords *src, BLENDFUNCTION blendfn ) { FIXME("not supported - XRENDER headers were missing at compile time\n"); return FALSE;

1 0

Jörg Höhle : kernel32/tests: WaitForMultipleObjects returns lowest signaled handle first.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a52e160c68bf170074e6f7810646d3ad0b962ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52e160c68bf170074e6f7810… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jul 23 22:02:19 2011 +0200 kernel32/tests: WaitForMultipleObjects returns lowest signaled handle first. --- dlls/kernel32/tests/sync.c | 48 ++++++++++++++++++++++++++++------------- dlls/kernel32/tests/thread.c | 3 +- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 94b2963..72f33ae 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -41,8 +41,7 @@ static void test_signalandwait(void) DWORD (WINAPI *pSignalObjectAndWait)(HANDLE, HANDLE, DWORD, BOOL); HMODULE kernel32; DWORD r; - int i; - HANDLE event[2], maxevents[MAXIMUM_WAIT_OBJECTS], semaphore[2], file; + HANDLE event[2], semaphore[2], file; kernel32 = GetModuleHandle("kernel32"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); @@ -94,19 +93,6 @@ static void test_signalandwait(void) CloseHandle(event[0]); CloseHandle(event[1]); - /* create the maximum number of events and make sure - * we can wait on that many */ - for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) - { - maxevents[i] = CreateEvent(NULL, 1, 1, NULL); - ok( maxevents[i] != 0, "should create enough events\n"); - } - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); - ok( r != WAIT_FAILED && r != WAIT_TIMEOUT, "should succeed\n"); - - for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) - if (maxevents[i]) CloseHandle(maxevents[i]); - /* semaphores */ semaphore[0] = CreateSemaphore( NULL, 0, 1, NULL ); semaphore[1] = CreateSemaphore( NULL, 1, 1, NULL ); @@ -1027,6 +1013,37 @@ static void test_WaitForSingleObject(void) CloseHandle(nonsignaled); } +static void test_WaitForMultipleObjects(void) +{ + DWORD r; + int i; + HANDLE maxevents[MAXIMUM_WAIT_OBJECTS]; + + /* create the maximum number of events and make sure + * we can wait on that many */ + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + { + maxevents[i] = CreateEvent(NULL, i==0, TRUE, NULL); + ok( maxevents[i] != 0, "should create enough events\n"); + } + + /* a manual-reset event remains signaled, an auto-reset event is cleared */ + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r == WAIT_OBJECT_0, "should signal lowest handle first, got %d\n", r); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r == WAIT_OBJECT_0, "should signal handle #0 first, got %d\n", r); + ok(ResetEvent(maxevents[0]), "ResetEvent\n"); + for (i=1; i<MAXIMUM_WAIT_OBJECTS; i++) + { + /* the lowest index is checked first and remaining events are untouched */ + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r == WAIT_OBJECT_0+i, "should signal handle #%d first, got %d\n", i, r); + } + + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + if (maxevents[i]) CloseHandle(maxevents[i]); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -1047,4 +1064,5 @@ START_TEST(sync) test_iocp_callback(); test_timer_queue(); test_WaitForSingleObject(); + test_WaitForMultipleObjects(); } diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 03983f5..19726af 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -288,6 +288,7 @@ static VOID test_CreateRemoteThread(void) skip("child process wasn't mapped at same address, so can't do CreateRemoteThread tests.\n"); return; } + ok(ret == WAIT_OBJECT_0 || broken(ret == WAIT_OBJECT_0+1 /* nt4,w2k */), "WaitForAllObjects 2 events %d\n", ret); hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); ok(hEvent != NULL, "Can't create event, err=%u\n", GetLastError()); @@ -1248,7 +1249,7 @@ static void test_TLS(void) } ret = WaitForMultipleObjects(2, threads, TRUE, 60000); - ok(ret == WAIT_OBJECT_0 || ret == WAIT_OBJECT_0+1 /* nt4 */, "WaitForMultipleObjects failed %u\n",ret); + ok(ret == WAIT_OBJECT_0 || broken(ret == WAIT_OBJECT_0+1 /* nt4,w2k */), "WaitForAllObjects 2 threads %d\n",ret); for (i = 0; i < 2; ++i) CloseHandle(threads[i]);

1 0

Bruno Jesus : ws2_32/tests: Add MSG_PEEK tests on recv().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a1d177c6b61fe7fc846ad890b83cec5fad7b7142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d177c6b61fe7fc846ad890b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 7 21:33:09 2011 -0300 ws2_32/tests: Add MSG_PEEK tests on recv(). --- dlls/ws2_32/tests/sock.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 24799cf..a171c85 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2324,6 +2324,7 @@ static void test_select(void) fd_set readfds, writefds, exceptfds; unsigned int maxfd; int ret; + char buffer; struct timeval select_timeout; select_thread_params thread_params; HANDLE thread_handle; @@ -2379,6 +2380,8 @@ static void test_select(void) ok ( (thread_params.ReadKilled) || broken(thread_params.ReadKilled == 0), /*Win98*/ "closesocket did not wakeup select\n"); + ret = recv(fdRead, &buffer, 1, MSG_PEEK); + ok( (ret == -1), "peek at closed socket expected -1 got %d\n", ret); /* Test selecting invalid handles */ FD_ZERO(&readfds); @@ -3627,6 +3630,10 @@ static void test_events(int useMessages) ok(ret == 100, "Failed to send buffer %d err %d\n", ret, GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); + ret = recv(src, buffer, 1, MSG_PEEK); + ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError()); + ok_event_seq(src, hEvent, read_seq, NULL, 0); + ret = recv(src, buffer, 50, 0); ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0);

1 0

Andrew Talbot : shell32: Remove redundant function declaration.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 8032d3ea214157f76d7483abcb9043a8c80b43a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8032d3ea214157f76d7483abc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Aug 7 21:11:35 2011 +0100 shell32: Remove redundant function declaration. --- dlls/shell32/shfldr.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 7d33d27..052b040 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -75,9 +75,5 @@ static inline int SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str) void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags) DECLSPEC_HIDDEN; BOOL SHELL_FS_HideExtension(LPCWSTR pwszPath) DECLSPEC_HIDDEN; -HRESULT SHELL_CreateContextMenu(HWND hwnd, IContextMenu* system_menu, - IShellFolder *folder, LPCITEMIDLIST folder_pidl, - LPCITEMIDLIST *apidl, UINT cidl, const HKEY *aKeys, - UINT cKeys,REFIID riid, void** ppv) DECLSPEC_HIDDEN; DEFINE_GUID( CLSID_UnixFolder, 0xcc702eb2, 0x7dc5, 0x11d9, 0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd ); DEFINE_GUID( CLSID_UnixDosFolder, 0x9d20aae8, 0x0625, 0x44b0, 0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9 );

1 0

Andrew Talbot : comctl32: Remove redundant function declaration.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 072ca07de9b4039931104a179d8ec7fe80860427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072ca07de9b4039931104a179… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Aug 7 21:11:32 2011 +0100 comctl32: Remove redundant function declaration. --- dlls/comctl32/datetime.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index abfef58..785769a 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -135,7 +135,6 @@ extern int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace); static BOOL DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code); static BOOL DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr); -extern void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to); static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y', 'X', 0}; static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1};

1 0

André Hentschel : ntdll: Accept double-digit CPU families.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: abcdcd9eeaaf60e084819b98eb79dcf0d455b019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abcdcd9eeaaf60e084819b98e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 7 13:45:48 2011 +0200 ntdll: Accept double-digit CPU families. --- dlls/ntdll/nt.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f9302c1..bc7ef86 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -995,7 +995,6 @@ void fill_cpu_info(void) { if (isdigit(value[0])) { - value[1] = '\0'; /* Make sure we only get one character */ cached_sci.Level = atoi(value); } continue;

1 0

Andrew Talbot : openal32: void functions should not return a value.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e3ff452f394e22c24e29c98f0f476c90d669a2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ff452f394e22c24e29c98f0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:19 2011 +0100 openal32: void functions should not return a value. --- dlls/openal32/openal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 15206f3..9e0a8f2 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -269,7 +269,7 @@ const ALCchar* CDECL wine_alcGetString(ALCdevice *device, ALCenum param) ALvoid CDECL wine_alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *dest) { - return alcGetIntegerv(device, param, size, dest); + alcGetIntegerv(device, param, size, dest); }

1 0

Andrew Talbot : ole2.dll16: void functions should not return a value.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 3fe447f58ec9e0545e2b72196168ad40fe57507c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe447f58ec9e0545e2b72196… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:17 2011 +0100 ole2.dll16: void functions should not return a value. --- dlls/ole2.dll16/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 275e9ff..25fb141 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -81,7 +81,7 @@ HRESULT WINAPI OleInitialize16(LPVOID reserved) */ void WINAPI OleUninitialize16(void) { - return OleUninitialize(); + OleUninitialize(); } /***********************************************************************

1 0

Andrew Talbot : msvcrt: void functions should not return a value.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: fb3b28f0131690bd0a6f73a42a955c56ae9543f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3b28f0131690bd0a6f73a42… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:16 2011 +0100 msvcrt: void functions should not return a value. --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/time.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 6c6b55f..19b9fb4 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -139,7 +139,7 @@ static void DoMessageBox(const char *lead, const char *message) MSVCRT_mbstowcs(leadW, lead, 1024); MSVCRT_mbstowcs(messageW, message, 1024); - return DoMessageBoxW(leadW, messageW); + DoMessageBoxW(leadW, messageW); } /********************************************************************* diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 5ff1467..bf87711 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -655,12 +655,12 @@ int CDECL MSVCRT__ftime32_s(struct MSVCRT___timeb32 *buf) #ifdef _WIN64 void CDECL MSVCRT__ftime(struct MSVCRT___timeb64 *buf) { - return MSVCRT__ftime64( buf ); + MSVCRT__ftime64( buf ); } #else void CDECL MSVCRT__ftime(struct MSVCRT___timeb32 *buf) { - return MSVCRT__ftime32( buf ); + MSVCRT__ftime32( buf ); } #endif

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011