October 2011 - Wine-commits

Marcus Meissner : dsound: Remove dead code from mixer (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 587cd82013c6a2dd80da5ba90efde0eb442bc3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587cd82013c6a2dd80da5ba90… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 19:16:41 2011 +0200 dsound: Remove dead code from mixer (Coverity). --- dlls/dsound/mixer.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 8adbdff..b1925d5 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -934,11 +934,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) size2 = 0; FillMemory(device->mix_buffer + mixplaypos, mixplaypos2 - mixplaypos, 0); FillMemory(buf1, size1, nfiller); - if (buf2 && size2) - { - FIXME("%d: There should be no additional buffer here!!\n", __LINE__); - FillMemory(buf2, size2, nfiller); - } } device->playpos = playpos;

1 0

Dan Kegel : comdlg32/tests: Initialize find & replace strings before testing FindTextA, etc.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 4a38b10a56209758287b61553a2e389fdc09756f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a38b10a56209758287b61553… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Oct 16 10:47:59 2011 -0700 comdlg32/tests: Initialize find & replace strings before testing FindTextA, etc. --- dlls/comdlg32/tests/finddlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/finddlg.c b/dlls/comdlg32/tests/finddlg.c index 4a10909..82a7a46 100644 --- a/dlls/comdlg32/tests/finddlg.c +++ b/dlls/comdlg32/tests/finddlg.c @@ -103,11 +103,13 @@ static void test_param_check(void) /* invalid lpstrFindWhat (NULL) */ CHECK_FINDREPLACE_FAIL(FRERR_BUFFERLENGTHZERO); fr.lpstrFindWhat = findbuffer; + strcpy(findbuffer, "abc"); /* invalid lpstrReplaceWith (NULL) for ReplaceText */ CHECK_FIND_SUCCEED(); CHECK_REPLACE_FAIL(FRERR_BUFFERLENGTHZERO); fr.lpstrReplaceWith = replacebuffer; + strcpy(replacebuffer, "def"); /* wReplaceWithLen may be 0, even for ReplaceText */ CHECK_FIND_SUCCEED();

1 0

Alexandre Julliard : gdi32: Implement a BlendImage entry point in the DIB driver.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a3a574fae03a069f0837cbfc1e5f6d38965ee00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a574fae03a069f0837cbfc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 12:30:28 2011 +0200 gdi32: Implement a BlendImage entry point in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 72 ++++++++++++ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 4 + dlls/gdi32/dibdrv/primitives.c | 238 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 315 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3a574fae03a069f0837c…

1 0

Alexandre Julliard : gdi32/tests: Add test cases for DIB blending.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 78d50cafb28ac4345daaf33e08b7252a8428e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d50cafb28ac4345daaf33e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 14:02:43 2011 +0200 gdi32/tests: Add test cases for DIB blending. --- dlls/gdi32/tests/dib.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78d50cafb28ac4345daaf…

1 0

Vitaliy Margolen : dinput: Fix buffer size in test.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: e93998002728b58cbf1097c515fd09cc1d22cd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93998002728b58cbf1097c51… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:43 2011 -0600 dinput: Fix buffer size in test. --- dlls/dinput/tests/device.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 2e4e4f8..7171bb8 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -127,7 +127,7 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK && cnt == 5, "GetDeviceData() failed: %08x cnt: %d\n", hr, cnt); dp.dwData = 20; @@ -135,15 +135,17 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); /* Cannot change mode while acquired */ hr = IDirectInputDevice_Acquire(device); ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %08x\n", hr); hr = IDirectInputDevice_Unacquire(device);

1 0

Vitaliy Margolen : dinput: Add buffer overflow check.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: db6780806e939f3b31504243aedc4392fb5dad41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6780806e939f3b31504243a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:46 2011 -0600 dinput: Add buffer overflow check. --- dlls/dinput/tests/mouse.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index db96a15..0d6b88a 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -75,6 +75,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; + int i; if (! SetForegroundWindow(hwnd)) { @@ -90,7 +91,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == S_OK, "SetCooperativeLevel: %08x\n", hr); memset(&di_op, 0, sizeof(di_op)); - di_op.dwData = 20; + di_op.dwData = 5; di_op.diph.dwHow = DIPH_DEVICE; di_op.diph.dwSize = sizeof(DIPROPDWORD); di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); @@ -143,6 +144,17 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + /* Check for buffer owerflow */ + for (i = 0; i < 6; i++) + mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); + + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

Vitaliy Margolen : dinput: Don't mask buffer overflow error.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: d7db5d539998e3528f6435d76874a77336058075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7db5d539998e3528f6435d76… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:48 2011 -0600 dinput: Don't mask buffer overflow error. --- dlls/dinput/device.c | 2 +- dlls/dinput/mouse.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a9c7b87..75b3cb5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1307,7 +1307,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W ifac } *entries = len; - if (This->overflow) + if (This->overflow && This->dinput->dwVersion == 0x0800) ret = DI_BUFFEROVERFLOW; if (!(flags & DIGDD_PEEK)) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 011deb0..4b65e89 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -419,7 +419,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM return ret; } -static HRESULT warp_check( SysMouseImpl* This, BOOL force ) +static void warp_check( SysMouseImpl* This, BOOL force ) { DWORD now = GetCurrentTime(); const DWORD interval = This->clipped ? 500 : 10; @@ -430,7 +430,7 @@ static HRESULT warp_check( SysMouseImpl* This, BOOL force ) This->last_warped = now; This->need_warp = FALSE; - if (!GetWindowRect(This->base.win, &rect)) return DIERR_GENERIC; + if (!GetWindowRect(This->base.win, &rect)) return; This->mapped_center.x = (rect.left + rect.right) / 2; This->mapped_center.y = (rect.top + rect.bottom) / 2; if (!This->clipped) @@ -447,7 +447,6 @@ static HRESULT warp_check( SysMouseImpl* This, BOOL force ) This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); } } - return DI_OK; } @@ -569,7 +568,8 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, } LeaveCriticalSection(&This->base.crit); - return warp_check( This, FALSE ); + warp_check( This, FALSE ); + return DI_OK; } static HRESULT WINAPI SysMouseAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) @@ -588,7 +588,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, HRESULT res; res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); - if (SUCCEEDED(res)) res = warp_check( This, FALSE ); + if (SUCCEEDED(res)) warp_check( This, FALSE ); return res; }

1 0

Vitaliy Margolen : dinput: Put some checks back into GetDeviceData for DirectInput 8.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: aba1ed78daaaa3de17761dc94471760048ce24c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba1ed78daaaa3de17761dc94… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:50 2011 -0600 dinput: Put some checks back into GetDeviceData for DirectInput 8. --- dlls/dinput/device.c | 6 ++++++ dlls/dinput8/tests/device.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 75b3cb5..b088eff 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1283,6 +1283,12 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W ifac TRACE("(%p) %p -> %p(%d) x%d, 0x%08x\n", This, dod, entries, entries ? *entries : 0, dodsize, flags); + if (This->dinput->dwVersion == 0x0800) + { + if (!This->acquired) return DIERR_NOTACQUIRED; + if (!This->queue_len) return DIERR_NOTBUFFERED; + } + if (!This->queue_len) return DI_OK; if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 30c702f..ab44cf3 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -69,12 +69,13 @@ static void test_device_input( HRESULT hr; DIDEVICEOBJECTDATA obj_data; DWORD data_size = 1; + int i; hr = IDirectInputDevice8_Acquire(lpdid); ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event( event, 0, 0, 0); + keybd_event( event, DIK_SPACE, 0, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -89,6 +90,28 @@ static void test_device_input( } ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); + + /* Check for buffer owerflow */ + for (i = 0; i < 17; i++) + if (event_type == INPUT_KEYBOARD) + { + keybd_event( VK_SPACE, DIK_SPACE, 0, 0); + keybd_event( VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); + } + else if (event_type == INPUT_MOUSE) + { + mouse_event(MOUSEEVENTF_LEFTDOWN, 1, 1, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 1, 1, 0, 0); + } + + IDirectInputDevice8_Poll(lpdid); + + data_size = 1; + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + ok(hr == DI_BUFFEROVERFLOW, "GetDeviceData() failed: %08x\n", hr); + data_size = 1; + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); } static void test_build_action_map( @@ -134,6 +157,9 @@ static BOOL CALLBACK enumeration_callback( DIPROPDWORD dp; DIPROPRANGE dpr; struct enum_data *data = pvRef; + DWORD cnt; + DIDEVICEOBJECTDATA buffer[5]; + if (!data) return DIENUM_CONTINUE; data->ndevices++; @@ -180,6 +206,10 @@ static BOOL CALLBACK enumeration_callback( ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); ok (dp.dwData == data->lpdiaf->dwBufferSize, "SetActionMap must set the buffer, buffersize=%d\n", dp.dwData); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(lpdid, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DIERR_NOTACQUIRED, "GetDeviceData() failed hr=%08x\n", hr); + /* Test axis range */ memset(&dpr, 0, sizeof(dpr)); dpr.diph.dwSize = sizeof(dpr); @@ -198,6 +228,10 @@ static BOOL CALLBACK enumeration_callback( hr = IDirectInputDevice8_Acquire(lpdid); ok (SUCCEEDED(hr), "Acquire failed hr=%08x\n", hr); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(lpdid, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed hr=%08x\n", hr); + /* SetActionMap should not work on an acquired device */ hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); ok (hr == DIERR_ACQUIRED, "SetActionMap succeeded with an acquired device hr=%08x\n", hr);

1 0

Henri Verbeet : wined3d: Don't bother updating the context' s window in context_destroy_gl_resources().
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: dfea2ab6f49bf986482c9784c4788b86323132f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfea2ab6f49bf986482c9784c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:29 2011 +0200 wined3d: Don't bother updating the context's window in context_destroy_gl_resources(). context_update_window() accesses the swapchain, which may not exist if this is a destroyed context, and we don't do anything that needs displaying here anyway. --- dlls/wined3d/context.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9d15176..3353434 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -869,7 +869,6 @@ static void context_destroy_gl_resources(struct wined3d_context *context) restore_ctx = pwglGetCurrentContext(); restore_dc = pwglGetCurrentDC(); - context_update_window(context); if (context->valid && restore_ctx != context->glCtx) context_set_gl_context(context); else restore_ctx = NULL;

1 0

Henri Verbeet : wined3d: Don' t try to access the swapchain of a destroyed context in context_set_gl_context ().
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: cdc9aadf5c9144920caefcfe7a0e12915ee0ce38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9aadf5c9144920caefcfe7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:30 2011 +0200 wined3d: Don't try to access the swapchain of a destroyed context in context_set_gl_context(). --- dlls/wined3d/context.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3353434..ef8b94e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -768,6 +768,17 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) ctx->valid = 0; WARN("Trying fallback to the backup window.\n"); + /* FIXME: If the context is destroyed it's no longer associated with + * a swapchain, so we can't use the swapchain to get a backup dc. To + * make this work windowless contexts would need to be handled by the + * device. */ + if (ctx->destroyed) + { + FIXME("Unable to get backup dc for destroyed context %p.\n", ctx); + context_set_current(NULL); + return FALSE; + } + if (!(dc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL);

1 0