February 2007 - Wine-commits

Felix Nawothnig : gdi32: Fix offset calculation in PATH_ExtTextOut for > 1 chars.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 7777a8eaf781b3a2b688db2542f43107af96004c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7777a8eaf781b3a2b688db254… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sat Feb 3 22:04:38 2007 +0100 gdi32: Fix offset calculation in PATH_ExtTextOut for >1 chars. --- dlls/gdi32/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 306ed37..edce62c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1350,6 +1350,7 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT LOGFONTW lf; POINT org; HDC hdc = dc->hSelf; + INT offset = 0, xoff = 0, yoff = 0; TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, wine_dbgstr_rect(lprc), debugstr_wn(str, count), count, dx); @@ -1372,7 +1373,6 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT for (idx = 0; idx < count; idx++) { - INT offset = 0, xoff = 0, yoff = 0; GLYPHMETRICS gm; DWORD dwSize; void *outline;

1 0

Mikołaj Zalewski : shlwapi: Test string functions when buffer is too small.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 2270cc2994ff742c937a61e2c53c06a997c1b965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2270cc2994ff742c937a61e2c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 4 23:55:35 2007 +0100 shlwapi: Test string functions when buffer is too small. --- dlls/shlwapi/tests/string.c | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 6369a87..6f7b511 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -30,6 +30,11 @@ #include "shlwapi.h" #include "shtypes.h" +#define expect_eq(expr, val, type, fmt) do { \ + type ret = expr; \ + ok(ret == val, "Unexpected value of '" #expr "': " #fmt " instead of " #val "\n", ret); \ +} while (0); + static HMODULE hShlwapi; static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int); static LPWSTR (WINAPI *pStrCpyNXW)(LPWSTR,LPCWSTR,int); @@ -755,6 +760,65 @@ static void test_SHUnicodeToUnicode(void dwRet, dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } +static void test_StrXXX_overflows() +{ + CHAR str1[2*MAX_PATH+1], buf[2*MAX_PATH]; + WCHAR wstr1[2*MAX_PATH+1], wbuf[2*MAX_PATH]; + const WCHAR fmt[] = {'%','s',0}; + STRRET strret; + int ret; + int i; + + for (i=0; i<2*MAX_PATH; i++) + { + str1[i] = '0'+(i%10); + wstr1[i] = '0'+(i%10); + } + str1[2*MAX_PATH] = 0; + wstr1[2*MAX_PATH] = 0; + + memset(buf, 0xbf, sizeof(buf)); + expect_eq(StrCpyNA(buf, str1, 10), buf, PCHAR, "%p"); + expect_eq(buf[9], 0, CHAR, "%x"); + expect_eq(buf[10], '\xbf', CHAR, "%x"); + expect_eq(StrCatBuffA(buf, str1, 100), buf, PCHAR, "%p"); + expect_eq(buf[99], 0, CHAR, "%x"); + expect_eq(buf[100], '\xbf', CHAR, "%x"); + + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, wstr1, 10), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[9], 0, WCHAR, "%x"); + expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); + expect_eq(StrCatBuffW(wbuf, wstr1, 100), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[99], 0, WCHAR, "%x"); + expect_eq(wbuf[100], (WCHAR)0xbfbf, WCHAR, "%x"); + + memset(wbuf, 0xbf, sizeof(wbuf)); + strret.uType = STRRET_WSTR; + U(strret).pOleStr = StrDupW(wstr1); + expect_eq(StrRetToBufW(&strret, NULL, wbuf, 10), S_OK, HRESULT, "%x"); + expect_eq(wbuf[9], 0, WCHAR, "%x"); + expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); + + memset(buf, 0xbf, sizeof(buf)); + strret.uType = STRRET_CSTR; + StrCpyN(U(strret).cStr, str1, MAX_PATH); + expect_eq(StrRetToBufA(&strret, NULL, buf, 10), S_OK, HRESULT, "%x"); + expect_eq(buf[9], 0, CHAR, "%x"); + expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); + + memset(buf, 0xbf, sizeof(buf)); + ret = wnsprintfA(buf, 10, "%s", str1); + todo_wine ok(ret == 9, "Unexpected wsnprintfA return %d, expected 9\n", ret); + expect_eq(buf[9], 0, CHAR, "%x"); + expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); + memset(wbuf, 0xbf, sizeof(wbuf)); + ret = wnsprintfW(wbuf, 10, fmt, wstr1); + todo_wine ok(ret == 9, "Unexpected wsnprintfW return %d, expected 9\n", ret); + expect_eq(wbuf[9], 0, WCHAR, "%x"); + expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); +} + START_TEST(string) { TCHAR thousandDelim[8]; @@ -802,4 +866,5 @@ START_TEST(string) test_StrRStrI(); test_SHAnsiToAnsi(); test_SHUnicodeToUnicode(); + test_StrXXX_overflows(); }

1 0

Anatoly Lyutin : comdlg32: Update Russian translation.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: b18cc0596503decfccf10481af79293433a9c831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18cc0596503decfccf10481a… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Fri Feb 2 16:48:44 2007 +0300 comdlg32: Update Russian translation. --- dlls/comdlg32/cdlg_Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc index 8514e62..7afe4e3 100644 --- a/dlls/comdlg32/cdlg_Ru.rc +++ b/dlls/comdlg32/cdlg_Ru.rc @@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "��",grp2,98,72,120,36,WS_GROUP CTEXT "��AaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "��&�� :",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP }

1 0

Dmitry Timoshkov : gdi32: Make sure that we don't read/ write beyond the provided buffer in GetOutlineTextMetricsA, add a test case .
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: e915a3cfb102870ed71843844b62c337af758ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e915a3cfb102870ed71843844… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 2 18:18:15 2007 +0800 gdi32: Make sure that we don't read/write beyond the provided buffer in GetOutlineTextMetricsA, add a test case. --- dlls/gdi32/font.c | 32 +++++++++++++---- dlls/gdi32/tests/font.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 527a0d9..ee57ba8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1484,17 +1484,33 @@ UINT WINAPI GetOutlineTextMetricsA( /* check if the string offsets really fit into the provided size */ /* FIXME: should we check string length as well? */ - if ((UINT_PTR)lpOTM->otmpFamilyName >= lpOTM->otmSize) - lpOTM->otmpFamilyName = 0; /* doesn't fit */ + /* make sure that we don't read/write beyond the provided buffer */ + if (lpOTM->otmSize >= FIELD_OFFSET(OUTLINETEXTMETRICA, otmpFamilyName) + sizeof(LPSTR)) + { + if ((UINT_PTR)lpOTM->otmpFamilyName >= lpOTM->otmSize) + lpOTM->otmpFamilyName = 0; /* doesn't fit */ + } - if ((UINT_PTR)lpOTM->otmpFaceName >= lpOTM->otmSize) - lpOTM->otmpFaceName = 0; /* doesn't fit */ + /* make sure that we don't read/write beyond the provided buffer */ + if (lpOTM->otmSize >= FIELD_OFFSET(OUTLINETEXTMETRICA, otmpFaceName) + sizeof(LPSTR)) + { + if ((UINT_PTR)lpOTM->otmpFaceName >= lpOTM->otmSize) + lpOTM->otmpFaceName = 0; /* doesn't fit */ + } - if ((UINT_PTR)lpOTM->otmpStyleName >= lpOTM->otmSize) - lpOTM->otmpStyleName = 0; /* doesn't fit */ + /* make sure that we don't read/write beyond the provided buffer */ + if (lpOTM->otmSize >= FIELD_OFFSET(OUTLINETEXTMETRICA, otmpStyleName) + sizeof(LPSTR)) + { + if ((UINT_PTR)lpOTM->otmpStyleName >= lpOTM->otmSize) + lpOTM->otmpStyleName = 0; /* doesn't fit */ + } - if ((UINT_PTR)lpOTM->otmpFullName >= lpOTM->otmSize) - lpOTM->otmpFullName = 0; /* doesn't fit */ + /* make sure that we don't read/write beyond the provided buffer */ + if (lpOTM->otmSize >= FIELD_OFFSET(OUTLINETEXTMETRICA, otmpFullName) + sizeof(LPSTR)) + { + if ((UINT_PTR)lpOTM->otmpFullName >= lpOTM->otmSize) + lpOTM->otmpFullName = 0; /* doesn't fit */ + } } end: diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e18bffe..670ec36 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -732,6 +732,91 @@ todo_wine { ReleaseDC(0, hdc); } +static void test_GetOutlineTextMetrics(void) +{ + OUTLINETEXTMETRIC *otm; + LOGFONT lf; + HFONT hfont, hfont_old; + HDC hdc; + DWORD ret, otm_size; + + hdc = GetDC(0); + + if (!is_font_installed("Arial")) + { + skip("Arial is not installed\n"); + return; + } + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = -13; + lf.lfWeight = FW_NORMAL; + lf.lfPitchAndFamily = DEFAULT_PITCH; + lf.lfQuality = PROOF_QUALITY; + hfont = CreateFontIndirect(&lf); + assert(hfont != 0); + + hfont_old = SelectObject(hdc, hfont); + otm_size = GetOutlineTextMetrics(hdc, 0, NULL); + trace("otm buffer size %u (0x%x)\n", otm_size, otm_size); + + otm = HeapAlloc(GetProcessHeap(), 0, otm_size); + + memset(otm, 0xAA, otm_size); + SetLastError(0xdeadbeef); + otm->otmSize = sizeof(*otm); /* just in case for Win9x compatibility */ + ret = GetOutlineTextMetrics(hdc, otm->otmSize, otm); + ok(ret == 1 /* Win9x */ || + ret == otm->otmSize /* XP*/, + "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + if (ret != 1) /* Win9x doesn't care about pointing beyond of the buffer */ + { + ok(otm->otmpFamilyName == NULL, "expected NULL got %p\n", otm->otmpFamilyName); + ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName); + ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); + ok(otm->otmpFullName == NULL, "expected NULL got %p\n", otm->otmpFullName); + } + + memset(otm, 0xAA, otm_size); + SetLastError(0xdeadbeef); + otm->otmSize = otm_size; /* just in case for Win9x compatibility */ + ret = GetOutlineTextMetrics(hdc, otm->otmSize, otm); + ok(ret == 1 /* Win9x */ || + ret == otm->otmSize /* XP*/, + "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + if (ret != 1) /* Win9x doesn't care about pointing beyond of the buffer */ + { + ok(otm->otmpFamilyName != NULL, "expected not NULL got %p\n", otm->otmpFamilyName); + ok(otm->otmpFaceName != NULL, "expected not NULL got %p\n", otm->otmpFaceName); + ok(otm->otmpStyleName != NULL, "expected not NULL got %p\n", otm->otmpStyleName); + ok(otm->otmpFullName != NULL, "expected not NULL got %p\n", otm->otmpFullName); + } + + /* ask about truncated data */ + memset(otm, 0xAA, otm_size); + SetLastError(0xdeadbeef); + otm->otmSize = sizeof(*otm) - sizeof(LPSTR); /* just in case for Win9x compatibility */ + ret = GetOutlineTextMetrics(hdc, otm->otmSize, otm); + ok(ret == 1 /* Win9x */ || + ret == otm->otmSize /* XP*/, + "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + if (ret != 1) /* Win9x doesn't care about pointing beyond of the buffer */ + { + ok(otm->otmpFamilyName == NULL, "expected NULL got %p\n", otm->otmpFamilyName); + ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName); + ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); + } + ok(otm->otmpFullName == (LPSTR)0xAAAAAAAA, "expected 0xAAAAAAAA got %p\n", otm->otmpFullName); + + HeapFree(GetProcessHeap(), 0, otm); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + + ReleaseDC(0, hdc); +} + START_TEST(font) { test_logfont(); @@ -742,4 +827,5 @@ START_TEST(font) test_text_extents(); test_GetGlyphIndices(); test_GetKerningPairs(); + test_GetOutlineTextMetrics(); }

1 0

Vitaliy Margolen : dinput: Initialize user limits with the default 0.. 65535 range. Add tests.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: b8b03b54b79fcc45fb0662aea30033cfb4d04cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b03b54b79fcc45fb0662aea… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 2 00:47:19 2007 -0700 dinput: Initialize user limits with the default 0..65535 range. Add tests. --- dlls/dinput/joystick_linuxinput.c | 6 ++++-- dlls/dinput/tests/joystick.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 0011398..12fcf6d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -387,8 +387,10 @@ static JoystickImpl *alloc_device(REFGUI memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i], df->dwObjSize); newDevice->axes[i] = idx; - newDevice->props[idx].wantmin = newDevice->props[idx].havemin = newDevice->joydev->axes[i][AXIS_ABSMIN]; - newDevice->props[idx].wantmax = newDevice->props[idx].havemax = newDevice->joydev->axes[i][AXIS_ABSMAX]; + newDevice->props[idx].havemin = newDevice->joydev->axes[i][AXIS_ABSMIN]; + newDevice->props[idx].havemax = newDevice->joydev->axes[i][AXIS_ABSMAX]; + newDevice->props[idx].wantmin = 0; + newDevice->props[idx].wantmax = 0xffff; newDevice->props[idx].deadzone = 0; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS; } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index df12529..05be5d6 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -81,6 +81,7 @@ typedef struct tagJoystickInfo DWORD axis; DWORD pov; DWORD button; + LONG lMin, lMax; } JoystickInfo; static BOOL CALLBACK EnumAxes( @@ -102,8 +103,14 @@ static BOOL CALLBACK EnumAxes( diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER); diprg.diph.dwHow = DIPH_BYID; diprg.diph.dwObj = pdidoi->dwType; - diprg.lMin = -1000; - diprg.lMax = +1000; + + hr = IDirectInputDevice_GetProperty(info->pJoystick, DIPROP_RANGE, &diprg.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %s\n", DXGetErrorString8(hr)); + ok(info->lMin == diprg.lMin && info->lMax == diprg.lMax, "Min/Max range invalid: " + "expected %d..%d got %d..%d\n", info->lMin, info->lMax, diprg.lMin, diprg.lMax); + + diprg.lMin = -2000; + diprg.lMax = +2000; hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_RANGE, NULL); ok(hr==E_INVALIDARG,"IDirectInputDevice_SetProperty() should have returned " @@ -239,6 +246,9 @@ static BOOL CALLBACK EnumJoysticks( ZeroMemory(&info, sizeof(info)); info.pJoystick = pJoystick; + /* default min/max limits */ + info.lMin = 0; + info.lMax = 0xffff; /* enumerate objects */ hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL); ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %s\n",

1 0

Vitaliy Margolen : dinput: Don' t reset user specified range in SetDataFormat. With tests.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 45b8d865b46d1083dc65731c9e33623559e5fa06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b8d865b46d1083dc65731c9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 2 00:49:55 2007 -0700 dinput: Don't reset user specified range in SetDataFormat. With tests. --- dlls/dinput/joystick_linux.c | 2 -- dlls/dinput/tests/joystick.c | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ba63d9c..4c542ad 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -664,8 +664,6 @@ static HRESULT WINAPI JoystickAImpl_SetD for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { - This->props[i].lMin = 0; - This->props[i].lMax = 0xffff; This->props[i].lDeadZone = 1000; This->props[i].lSaturation = 0; } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 05be5d6..7ca690a 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -258,6 +258,14 @@ static BOOL CALLBACK EnumJoysticks( ok(caps.dwButtons == info.button, "Number of enumerated buttons doesn't match capabilities\n"); ok(caps.dwPOVs == info.pov, "Number of enumerated POVs doesn't match capabilities\n"); + /* Set format and check limits again */ + hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + info.lMin = -2000; + info.lMax = +2000; + hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL); + ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceInfo(pJoystick, 0); ok(hr==E_POINTER, "IDirectInputDevice_GetDeviceInfo() " "should have returned E_POINTER, returned: %s\n",

1 0

Marcus Meissner : kernel32: Initialize owner_exists (Coverity).
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 67b6044de79a91971eeab1f68ccc29b4cec271a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b6044de79a91971eeab1f68… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Feb 1 17:02:38 2007 +0100 kernel32: Initialize owner_exists (Coverity). --- dlls/kernel32/ne_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 80b8295..25b0dcf 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -1050,7 +1050,7 @@ static HINSTANCE16 MODULE_LoadModule16( const char *file_name = NULL; char dllname[20], owner[20], *p; const char *basename; - int owner_exists; + int owner_exists = FALSE; /* strip path information */

1 0

Vitaliy Margolen : dinput: Don't close fd before we done with it.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 15e0ccab9bc549841c6440b8ebf130f5324758ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=15e0ccab9bc549841c6440b8e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 2 00:46:17 2007 -0700 dinput: Don't close fd before we done with it. --- dlls/dinput/joystick_linuxinput.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3815c22..9c05500 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -242,16 +242,14 @@ static void find_joydevs(void) ); #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION - if (!no_ff_check) { - if ((!test_bit(joydev.evbits,EV_FF)) - || (-1==ioctl(fd,EVIOCGBIT(EV_FF,sizeof(joydev.ffbits)),joydev.ffbits)) - || (-1==ioctl(fd,EVIOCGEFFECTS,&joydev.num_effects)) - || (joydev.num_effects <= 0)) { - close(fd); - } else { + if (!no_ff_check && + test_bit(joydev.evbits, EV_FF) && + ioctl(fd, EVIOCGBIT(EV_FF, sizeof(joydev.ffbits)), joydev.ffbits) != -1 && + ioctl(fd, EVIOCGEFFECTS, &joydev.num_effects) != -1 && + joydev.num_effects > 0) + { TRACE(" ... with force feedback\n"); joydev.has_ff = 1; - } } #endif

1 0

Vitaliy Margolen : dinput: Return user set limits not the device limits.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 575ede974dcf159ca77cf354730b35ff3d0fd8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575ede974dcf159ca77cf3547… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 2 00:47:01 2007 -0700 dinput: Return user set limits not the device limits. --- dlls/dinput/joystick_linuxinput.c | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 9c05500..0011398 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -901,35 +901,32 @@ static HRESULT WINAPI JoystickAImpl_GetP REFGUID rguid, LPDIPROPHEADER pdiph) { - JoystickImpl *This = (JoystickImpl *)iface; - - TRACE("(this=%p,%s,%p)\n", - iface, debugstr_guid(rguid), pdiph); + JoystickImpl *This = (JoystickImpl *)iface; - if (TRACE_ON(dinput)) + TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (!HIWORD(rguid)) { + if (HIWORD(rguid)) return DI_OK; + switch (LOWORD(rguid)) { - case (DWORD) DIPROP_RANGE: { - LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; - int obj = find_property(&This->base.data_format, pdiph); + case (DWORD) DIPROP_RANGE: + { + LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; + int obj = find_property(&This->base.data_format, pdiph); + + if (obj < 0) return DIERR_OBJECTNOTFOUND; - if (obj >= 0) { - pr->lMin = This->props[obj].havemin; - pr->lMax = This->props[obj].havemax; + pr->lMin = This->props[obj].wantmin; + pr->lMax = This->props[obj].wantmax; TRACE("range(%d, %d) obj=%d\n", pr->lMin, pr->lMax, obj); - } - break; + break; } default: return IDirectInputDevice2AImpl_GetProperty(iface, rguid, pdiph); } - } - - return DI_OK; + return DI_OK; } /******************************************************************************

1 0

Maarten Lankhorst : wined3d: Report D3D caps properly for ATI cards.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 89840c0517f669c8178261e48030d9af14fa96f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89840c0517f669c8178261e48… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jan 27 12:12:44 2007 +0100 wined3d: Report D3D caps properly for ATI cards. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0e6f4bc..7bd04bb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2136,7 +2136,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDe D3DTEXOPCAPS_LERP | D3DTEXOPCAPS_SUBTRACT; } - if (GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { + if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3) || + GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { *pCaps->TextureOpCaps |= D3DTEXOPCAPS_ADDSMOOTH | D3DTEXOPCAPS_MULTIPLYADD | D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR |

1 0