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

Alexander Dorofeyev : ddraw: Return DDERR_NOCOLORKEY when there is no colorkey.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: d6ecf5d14d50cde431e16afaf5d0e66baeb1da90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ecf5d14d50cde431e16afaf… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue May 6 00:49:32 2008 +0300 ddraw: Return DDERR_NOCOLORKEY when there is no colorkey. --- dlls/ddraw/surface.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3467a64..5f31c0a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1490,9 +1490,6 @@ IDirectDrawSurfaceImpl_GetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey) { - /* There is a DDERR_NOCOLORKEY error, but how do we know if a color key - * isn't there? That's like saying that an int isn't there. (Which MS - * has done in other docs.) */ ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); TRACE("(%p)->(%08x,%p)\n", This, Flags, CKey); @@ -1500,21 +1497,42 @@ IDirectDrawSurfaceImpl_GetColorKey(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); + switch (Flags) { case DDCKEY_DESTBLT: + if (!(This->surface_desc.dwFlags & DDSD_CKDESTBLT)) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_NOCOLORKEY; + } *CKey = This->surface_desc.ddckCKDestBlt; break; case DDCKEY_DESTOVERLAY: + if (!(This->surface_desc.dwFlags & DDSD_CKDESTOVERLAY)) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_NOCOLORKEY; + } *CKey = This->surface_desc.u3.ddckCKDestOverlay; break; case DDCKEY_SRCBLT: + if (!(This->surface_desc.dwFlags & DDSD_CKSRCBLT)) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_NOCOLORKEY; + } *CKey = This->surface_desc.ddckCKSrcBlt; break; case DDCKEY_SRCOVERLAY: + if (!(This->surface_desc.dwFlags & DDSD_CKSRCOVERLAY)) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_NOCOLORKEY; + } *CKey = This->surface_desc.ddckCKSrcOverlay; break;

1 0

Alexander Dorofeyev : ddraw/tests: Add tests for IDirect3DDevice7_Load.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: c4d75213abe21dcd7697d2f9151a186ebb3f8c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d75213abe21dcd7697d2f91… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue May 6 00:49:34 2008 +0300 ddraw/tests: Add tests for IDirect3DDevice7_Load. --- dlls/ddraw/tests/d3d.c | 1092 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 1092 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4d75213abe21dcd7697d…

1 0

Maarten Lankhorst : winmm: Make mixer test less strict so it passes with SoundMAX drivers on XP.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: fc777c0ed3adc1f3a81a45fca083595439b2ad75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc777c0ed3adc1f3a81a45fca… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 5 20:10:30 2008 -0700 winmm: Make mixer test less strict so it passes with SoundMAX drivers on XP. --- dlls/winmm/tests/mixer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 89ac7c9..ed68f89 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -549,8 +549,8 @@ static void mixer_test_deviceA(int device) } } rc=mixerClose(mix); - ok(rc==MMSYSERR_NOERROR, - "mixerClose: MMSYSERR_BADDEVICEID expected, got %s\n", + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALHANDLE, + "mixerClose: MMSYSERR_NOERROR or MMSYSERR_INVALHANDLE expected, got %s\n", mmsys_error(rc)); } } @@ -954,8 +954,8 @@ static void mixer_test_deviceW(int device) } } rc=mixerClose(mix); - ok(rc==MMSYSERR_NOERROR, - "mixerClose: MMSYSERR_BADDEVICEID expected, got %s\n", + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALHANDLE, + "mixerClose: MMSYSERR_NOERROR or MMSYSERR_INVALHANDLE expected, got %s\n", mmsys_error(rc)); } }

1 0

Maarten Lankhorst : netapi32: Fix test crash occuring when NetWkstaUserGetInfo fails.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: a61ef431b8fe9593970aff497a6756a231df8657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61ef431b8fe9593970aff497… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 5 23:05:08 2008 -0700 netapi32: Fix test crash occuring when NetWkstaUserGetInfo fails. --- dlls/netapi32/tests/wksta.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 5eefba4..01d0d6f 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -80,7 +80,17 @@ static void run_wkstausergetinfo_tests(void) /* Level 0 */ ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, - "NetWkstaUserGetInfo is successful\n"); + "NetWkstaUserGetInfo is unsuccessful\n"); + + ok(ui0 != NULL, "ui0 is NULL\n"); + /* This failure occured when I ran sshd as service and didn't authenticate + * Since the test dereferences ui0, the rest of this test is worthless + */ + if (!ui0) + { + return; + } + ok(!lstrcmpW(user_name, ui0->wkui0_username), "This is really user name\n"); pNetApiBufferSize(ui0, &dwSize); ok(dwSize >= (sizeof(WKSTA_USER_INFO_0) +

1 0

Maarten Lankhorst : winetest: Fix CreateProcess so that debugger tests run without timing out.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 3c79c2e88ce436a909caea3ad2bd3066d31415e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c79c2e88ce436a909caea3ad… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 5 21:54:41 2008 -0700 winetest: Fix CreateProcess so that debugger tests run without timing out. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 72b7442..c862427 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -325,7 +325,7 @@ run_ex (char *cmd, const char *out, const char *tempdir, DWORD ms) close (fd); } - if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, 0, + if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_PROCESS_GROUP, NULL, tempdir, &si, &pi)) { status = -2; } else {

1 0

Paul Vriens : services.exe: Move a trace to a more appropriate place.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: b0f34a600f6b108767d3aa1ba7b8b28f645608ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f34a600f6b108767d3aa1ba… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue May 6 08:54:21 2008 +0200 services.exe: Move a trace to a more appropriate place. --- programs/services/services.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index c61b8dd..0a23fc8 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -714,8 +714,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * err = ERROR_SERVICE_REQUEST_TIMEOUT; } - WINE_TRACE("returning %d\n", err); - if (err == ERROR_SUCCESS) err = service_wait_for_startup(service, process_handle); @@ -725,6 +723,8 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * ReleaseMutex(service->control_mutex); scmdatabase_unlock_startup(service->db); + WINE_TRACE("returning %d\n", err); + return err; }

1 0

Dmitry Timoshkov : kernel32: Print in the trace pid and tid of the created process.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: fab78cdc8d978b296430d5ce98c3ef7010caacd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab78cdc8d978b296430d5ce9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 6 17:25:32 2008 +0900 kernel32: Print in the trace pid and tid of the created process. --- dlls/kernel32/process.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 59fd1f5..aeec13d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1785,6 +1785,8 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline ); if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); HeapFree( GetProcessHeap(), 0, unixdir ); + if (retv) + TRACE( "started process pid %04x tid %04x\n", info->dwProcessId, info->dwThreadId ); return retv; }

1 0

Michael Stefaniuc : ws2_32: Fix test output string to match the test.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: af1986d6ccaeb6b170e7ff994f88be4b65c2b06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1986d6ccaeb6b170e7ff994… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 5 22:45:05 2008 +0200 ws2_32: Fix test output string to match the test. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f511dd2..ce75811 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1664,7 +1664,7 @@ static void test_extendedSocketOptions(void) ok(ret == 0, "getsockopt failed to query SO_MAX_MSG_SIZE, return value is 0x%08x\n", ret); ok((optval == 65507) || (optval == 65527), - "SO_MAX_MSG_SIZE reported %d, expected 65507 or 65507\n", optval); + "SO_MAX_MSG_SIZE reported %d, expected 65507 or 65527\n", optval); optlen = sizeof(LINGER); ret = getsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger_val, &optlen);

1 0

Vitaliy Margolen : comctl32: tab: Fix drawing of the icons.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 5c9fbb828d979ce18b218ee37f4f6473027c0a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9fbb828d979ce18b218ee37… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue May 6 00:14:37 2008 -0600 comctl32: tab: Fix drawing of the icons. This patch partially reverts aa57ad37. It's not correct. The top/left is added later on. --- dlls/comctl32/tab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 4b1673a..62047e5 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1715,12 +1715,12 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect if(lStyle & TCS_VERTICAL) { center_offset_h = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = (drawRect->left + (drawRect->right - drawRect->left) - cx) / 2; + center_offset_v = ((drawRect->right - drawRect->left) - cx) / 2; } else { center_offset_h = ((drawRect->right - drawRect->left) - (cx + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = (drawRect->top + (drawRect->bottom - drawRect->top) - cy) / 2; + center_offset_v = ((drawRect->bottom - drawRect->top) - cy) / 2; } /* if an item is selected, the icon is shifted up instead of down */

1 0

Maarten Lankhorst : gdi32: Make mapping test slightly less strict so it passes on windows XP.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: f74075b776e4118a8522a2ba6e11623cba9ca7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74075b776e4118a8522a2ba6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 5 20:08:39 2008 -0700 gdi32: Make mapping test slightly less strict so it passes on windows XP. --- dlls/gdi32/tests/mapping.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 695b7d7..91e487a 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -53,6 +53,8 @@ static void test_modify_world_transform(void) ReleaseDC(0, hdc); } +#define rough_match(got, expected) ((got >= expected - 2) && (got <= expected + 2)) + static void test_SetWindowExt(HDC hdc, LONG cx, LONG cy, LONG expected_vp_cx, LONG expected_vp_cy) { SIZE windowExt, viewportExt; @@ -68,7 +70,7 @@ static void test_SetWindowExt(HDC hdc, LONG cx, LONG cy, LONG expected_vp_cx, LO cx, cy, windowExt.cx, windowExt.cy); GetViewportExtEx(hdc, &viewportExt); - ok(viewportExt.cx == expected_vp_cx && viewportExt.cy == expected_vp_cy, + ok(rough_match(viewportExt.cx, expected_vp_cx) && rough_match(viewportExt.cy, expected_vp_cy), "Viewport extents have not been properly adjusted: Expected %dx%d, got %dx%d\n", expected_vp_cx, expected_vp_cy, viewportExt.cx, viewportExt.cy); @@ -94,7 +96,7 @@ static void test_SetViewportExt(HDC hdc, LONG cx, LONG cy, LONG expected_vp_cx, SetViewportExtEx(hdc, cx, cy, NULL); GetViewportExtEx(hdc, &viewportExt); - ok(viewportExt.cx == expected_vp_cx && viewportExt.cy == expected_vp_cy, + ok(rough_match(viewportExt.cx, expected_vp_cx) && rough_match(viewportExt.cy, expected_vp_cy), "Viewport extents have not been properly adjusted: Expected %dx%d, got %dx%d\n", expected_vp_cx, expected_vp_cy, viewportExt.cx, viewportExt.cy);

1 0