August 2012 - Wine-commits - list.winehq.org

Lucas Zawacki : dinput/tests: Test for keyboard GetCapabilities.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 5b3ccdf04ab7283f03455bbc921f9066abb11db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3ccdf04ab7283f03455bbc9… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 20 03:52:16 2012 -0300 dinput/tests: Test for keyboard GetCapabilities. --- dlls/dinput/tests/keyboard.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 4b46a61..6aab8a7 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -170,6 +170,29 @@ static void test_get_prop(LPDIRECTINPUT pDI, HWND hwnd) if (pKeyboard) IUnknown_Release(pKeyboard); } +static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard = NULL; + DIDEVCAPS caps; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + caps.dwSize = sizeof(caps); + hr = IDirectInputDevice_GetCapabilities(pKeyboard, &caps); + + ok (SUCCEEDED(hr), "GetCapabilites failed: 0x%08x\n", hr); + ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilites dwFlags: 0x%08x\n", caps.dwFlags); + ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, + "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); + todo_wine ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); + + if (pKeyboard) IUnknown_Release(pKeyboard); +} + static void keyboard_tests(DWORD version) { HRESULT hr; @@ -196,6 +219,7 @@ static void keyboard_tests(DWORD version) acquire_tests(pDI, hwnd); test_set_coop(pDI, hwnd); test_get_prop(pDI, hwnd); + test_capabilities(pDI, hwnd); } DestroyWindow(hwnd);

1 0

Lucas Zawacki : dinput: Return a valid keyboard type in keyboard GetCapabilities.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: ac9a10f81563419836a9c734c3027d976067d9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9a10f81563419836a9c734c… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 20 03:52:17 2012 -0300 dinput: Return a valid keyboard type in keyboard GetCapabilities. --- dlls/dinput/keyboard.c | 4 ++-- dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3ca7d97..8e1d1a4 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -375,9 +375,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) - devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_PCENH << 8); else - devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_PCENH << 8); devcaps.dwAxes = 0; devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 6aab8a7..5d32abe 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -187,7 +187,7 @@ static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd) ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilites dwFlags: 0x%08x\n", caps.dwFlags); ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); - todo_wine ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, + ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); if (pKeyboard) IUnknown_Release(pKeyboard);

1 0

Dmitry Timoshkov : gdi32: Make sure that pattern info is initialized before being used.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: c8d61899dbb3e8930881a212943d368e8390b8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d61899dbb3e8930881a2129… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Aug 18 02:09:17 2012 +0900 gdi32: Make sure that pattern info is initialized before being used. --- dlls/gdi32/dibdrv/objects.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 4712dc1..98bbb91 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1897,9 +1897,6 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * dib_info pattern; BOOL dither = (brush->dib.bit_count == 1); - if (pattern.bit_count == 1 && !pattern.color_table) - dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ - if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) { copy_bitmapinfo( info, brush->pattern.info ); @@ -1912,6 +1909,9 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * init_dib_info_from_bitmapinfo( &pattern, brush->pattern.info, brush->pattern.bits.ptr ); } + if (pattern.bit_count == 1 && !pattern.color_table) + dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ + if (pattern.bit_count == 1 && !pattern.color_table && (pdev->dib.bit_count != 1 || pdev->dib.color_table)) {

1 0

Marcus Meissner : winecfg: Fixed use-after-free (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: f1b4c331622d77e5bd33a1bef6d30ed4fe4c1b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b4c331622d77e5bd33a1bef… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 20:53:43 2012 +0200 winecfg: Fixed use-after-free (Coverity). --- programs/winecfg/drivedetect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 34b113e..b0d827d 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -287,7 +287,6 @@ static void ensure_drive_c_is_mapped(void) len = snprintf(NULL, 0, "%s/../drive_c", configdir); drive_c_dir = HeapAlloc(GetProcessHeap(), 0, len); snprintf(drive_c_dir, len, "%s/../drive_c", configdir); - HeapFree(GetProcessHeap(), 0, drive_c_dir); if (stat(drive_c_dir, &buf) == 0) { @@ -300,6 +299,7 @@ static void ensure_drive_c_is_mapped(void) { report_error(NO_DRIVE_C); } + HeapFree(GetProcessHeap(), 0, drive_c_dir); } int autodetect_drives(void)

1 0

Marcus Meissner : user32: Free the correct dce (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 3fb8a4263868d5db0bd2a4d7321b6e1a2af5db23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb8a4263868d5db0bd2a4d73… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 21:23:38 2012 +0200 user32: Free the correct dce (Coverity). --- dlls/user32/painting.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 5a3614c..dcf615d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -314,9 +314,11 @@ static struct dce *get_window_dce( HWND hwnd ) if (dce_to_free) { - SetDCHook( dce->hdc, NULL, 0 ); - DeleteDC( dce->hdc ); - HeapFree( GetProcessHeap(), 0, dce ); + SetDCHook( dce_to_free->hdc, NULL, 0 ); + DeleteDC( dce_to_free->hdc ); + HeapFree( GetProcessHeap(), 0, dce_to_free ); + if (dce_to_free == dce) + dce = NULL; } } return dce;

1 0

Marcus Meissner : user32: Fixed two use-after-free (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 84bb5969120d605ec0f6bbe458851cba4670edaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bb5969120d605ec0f6bbe45… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 21:31:34 2012 +0200 user32: Fixed two use-after-free (Coverity). --- dlls/user32/dde_client.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index ef3ee3f..90fa4db 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1246,14 +1246,18 @@ BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction { if ((pConv = WDML_GetConv(hConv, TRUE)) && pConv->instance == pInstance) { - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { + + pXAct = pConv->transactions; + while (pXAct) { + WDML_XACT *nextXAct = pXAct->next; + if (pXAct->dwTimeout == TIMEOUT_ASYNC && (idTransaction == 0 || pXAct->xActID == idTransaction)) { WDML_UnQueueTransaction(pConv, pXAct); WDML_FreeTransaction(pInstance, pXAct, TRUE); } + pXAct = nextXAct; } } } @@ -1262,13 +1266,16 @@ BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv; pConv = pConv->next) { if (!(pConv->wStatus & ST_CONNECTED)) continue; - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { + pXAct = pConv->transactions; + while (pXAct) { + WDML_XACT *nextXAct = pXAct->next; + if (pXAct->dwTimeout == TIMEOUT_ASYNC) { WDML_UnQueueTransaction(pConv, pXAct); WDML_FreeTransaction(pInstance, pXAct, TRUE); } + pXAct = nextXAct; } } }

1 0

Marcus Meissner : quartz: Avoid linked list walk with free next (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: de7635a2f0a1424b14318788f935ff2a3d531a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7635a2f0a1424b14318788f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 22:36:48 2012 +0200 quartz: Avoid linked list walk with free next (Coverity). --- dlls/quartz/systemclock.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 842541b..043299b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -116,12 +116,15 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { } /** First SingleShots Advice: sorted list */ - for (it = This->pSingleShotAdvise; NULL != it && (it->rtBaseTime + it->rtIntervalTime) <= curTime; it = it->next) { + it = This->pSingleShotAdvise; + while ((NULL != it) && (it->rtBaseTime + it->rtIntervalTime) <= curTime) { + SystemClockAdviseEntry* nextit = it->next; /** send event ... */ SetEvent(it->hEvent); /** ... and Release it */ QUARTZ_RemoveAviseEntryFromQueue(This, it); CoTaskMemFree(it); + it = nextit; } if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000;

1 0

Marcus Meissner : qcap: Fixed a use after free in error path (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 524ff6fe27cfb0a2f2154b1543134d0e93784c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=524ff6fe27cfb0a2f2154b154… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 23:04:31 2012 +0200 qcap: Fixed a use after free in error path (Coverity). --- dlls/qcap/v4l.c | 1 + dlls/qcap/vfwcapture.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 119eb29..1851ba4 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -314,6 +314,7 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) if (!vi) { CoTaskMemFree(mT[0]); + mT[0] = NULL; return E_OUTOFMEMORY; } mT[0]->majortype = MEDIATYPE_Video; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 68341ae..7be59cc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -678,9 +678,10 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI return VFW_S_NO_MORE_ITEMS; hr = qcap_driver_get_format(This->driver_info, &vfw_pmt); - CopyMediaType(pmt, vfw_pmt); - DeleteMediaType(vfw_pmt); - + if (SUCCEEDED(hr)) { + CopyMediaType(pmt, vfw_pmt); + DeleteMediaType(vfw_pmt); + } return hr; }

1 0

Marcus Meissner : qcap: Fixed another use-after free (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 985d2ba18ed736423fb161985faf45adcc505b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985d2ba18ed736423fb161985… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 23:07:11 2012 +0200 qcap: Fixed another use-after free (Coverity). --- dlls/qcap/vfwcapture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7be59cc..227a671 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -793,11 +793,11 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) VfwPinImpl *This = (VfwPinImpl *)iface; hr = qcap_driver_get_format(This->driver_info, &pmt); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); + DeleteMediaType(pmt); + } TRACE("%p -- %x\n", This, hr); - DeleteMediaType(pmt); - return hr; }

1 0

Marcus Meissner : joy.cpl: Avoid uninitialized variable usage (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: f51b6e7847167c984234815842e1e17f72212504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51b6e7847167c98423481584… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:51:24 2012 +0200 joy.cpl: Avoid uninitialized variable usage (Coverity). --- dlls/joy.cpl/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 354dfd7..b84a0aa 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -289,6 +289,7 @@ static DWORD WINAPI input_thread(void *param) r.left = (TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0]); r.top = (TEST_AXIS_Y + axes_pos[i][1]); + r.bottom = r.right = 0; /* unused */ MapDialogRect(data->graphics.hwnd, &r); SetWindowPos(data->graphics.axes[i], 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); @@ -549,6 +550,7 @@ static DWORD WINAPI ff_input_thread(void *param) r.left = FF_AXIS_X + state.lX; r.top = FF_AXIS_Y + state.lY; + r.right = r.bottom = 0; /* unused */ MapDialogRect(data->graphics.hwnd, &r); SetWindowPos(data->graphics.ff_axis, 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);

1 0