March 2015 - Wine-Commits - list.winehq.org

Andrew Eikum : oleaut32: Allow typelib filenames longer than MAX_PATH.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 4a7b5856daa5ce09bb52c2baa3d524a5ea1cae1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7b5856daa5ce09bb52c2baa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 23 09:56:58 2015 -0500 oleaut32: Allow typelib filenames longer than MAX_PATH. --- dlls/oleaut32/typelib.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 54dbc05..b8325c0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3353,18 +3353,27 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(h != INVALID_HANDLE_VALUE){ - FILE_NAME_INFORMATION *info; - char data[MAX_PATH * sizeof(WCHAR) + sizeof(info->FileNameLength)]; + FILE_NAME_INFORMATION size_info; BOOL br; - info = (FILE_NAME_INFORMATION*)data; /* GetFileInformationByHandleEx returns the path of the file without * WOW64 redirection */ - br = GetFileInformationByHandleEx(h, FileNameInfo, data, sizeof(data)); - if(br){ - info->FileName[info->FileNameLength / sizeof(WCHAR)] = 0; - lstrcpynW(pszPath + 2, info->FileName, cchPath - 2); + br = GetFileInformationByHandleEx(h, FileNameInfo, &size_info, sizeof(size_info)); + if(br || GetLastError() == ERROR_MORE_DATA){ + FILE_NAME_INFORMATION *info; + DWORD size = sizeof(*info) + size_info.FileNameLength + sizeof(WCHAR); + + info = HeapAlloc(GetProcessHeap(), 0, size); + + br = GetFileInformationByHandleEx(h, FileNameInfo, info, size); + if(br){ + info->FileName[info->FileNameLength / sizeof(WCHAR)] = 0; + lstrcpynW(pszPath + 2, info->FileName, cchPath - 2); + } + + HeapFree(GetProcessHeap(), 0, info); } + CloseHandle(h); }

1 0

Sebastian Lackner : user32: Use C_ASSERT to ensure user_thread_info fits into TEB->Win32ClientInfo.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 5e5adcffb5e665d3d1562fd8598c5e1ae016054f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5adcffb5e665d3d1562fd85… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 23 14:12:38 2015 +0100 user32: Use C_ASSERT to ensure user_thread_info fits into TEB->Win32ClientInfo. --- dlls/user32/user_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index adf3f7d..919540d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -189,10 +189,10 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; - - ULONG pad[6]; /* Available for more data */ }; +C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); + struct hook_extra_info { HHOOK handle;

1 0

Nikolay Sivov : user32/static: Allow setting NULL text.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: c5dda71cd472c3438e54d82ffe835876c160c8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5dda71cd472c3438e54d82ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 08:12:29 2015 +0300 user32/static: Allow setting NULL text. --- dlls/user32/static.c | 15 ++++++--------- dlls/user32/tests/static.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index ff5c77c..60fcb79 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -464,15 +464,12 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WM_SETTEXT: if (hasTextStyle( full_style )) { - if (HIWORD(lParam)) - { - if(unicode) - lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); - else - lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); - STATIC_TryPaintFcn( hwnd, full_style ); - } - } + if (unicode) + lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); + else + lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); + STATIC_TryPaintFcn( hwnd, full_style ); + } break; case WM_SETFONT: diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index d4aa9b1..841889d 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -117,6 +117,21 @@ static void test_updates(int style, int flags) DestroyWindow(hStatic); } +static void test_set_text(void) +{ + HWND hStatic = build_static(SS_SIMPLE); + char buffA[10]; + + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(!strcmp(buffA, "Test"), "got wrong text %s\n", buffA); + + SetWindowTextA(hStatic, NULL); + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(buffA[0] == 0, "got wrong text %s\n", buffA); + + DestroyWindow(hStatic); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -148,6 +163,7 @@ START_TEST(static) test_updates(SS_WHITERECT, TODO_COUNT); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_set_text(); DestroyWindow(hMainWnd); }

1 0

Dmitry Timoshkov : shell32: Update version information to match XP values.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 6e638d824b80e8a02cb830cd6bc25a7ef8507849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e638d824b80e8a02cb830cd6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 10:20:59 2015 +0800 shell32: Update version information to match XP values. --- dlls/shell32/shell32.rc | 7 ++++++- dlls/shell32/version.h | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 37acbe7..847d2ce 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -457,9 +457,14 @@ IDR_AVI_FILEDELETE AVI searching.avi /* @makedep: AUTHORS */ AUTHORS RCDATA AUTHORS -#include "version.h" +/* please keep in sync with version.h values */ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILENAME_STR "shell32.dll" +#define WINE_FILEVERSION 6,0,2900,6242 +#define WINE_FILEVERSION_STR "6.0.2900.6242" +#define WINE_PRODUCTVERSION 6,0,2900,6242 +#define WINE_PRODUCTVERSION_STR "6.0.2900.6242" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" diff --git a/dlls/shell32/version.h b/dlls/shell32/version.h index aedf231..06f4871 100644 --- a/dlls/shell32/version.h +++ b/dlls/shell32/version.h @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_FILEVERSION_MAJOR 5 +/* please keep in sync with shell32.rc values */ +#define WINE_FILEVERSION_MAJOR 6 #define WINE_FILEVERSION_MINOR 0 -#define WINE_FILEVERSION_BUILD 3900 -#define WINE_FILEVERSION_PLATFORMID 6975 +#define WINE_FILEVERSION_BUILD 2900 +#define WINE_FILEVERSION_PLATFORMID 6242

1 0

Nikolay Sivov : comctl32/listview: Update view on style change only if LVS_TYPEMASK styles have changed.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: b6dc726bbd4b9c9b64569744b9df01f503c20e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6dc726bbd4b9c9b64569744b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 01:19:41 2015 +0300 comctl32/listview: Update view on style change only if LVS_TYPEMASK styles have changed. --- dlls/comctl32/listview.c | 6 ++++-- dlls/comctl32/tests/listview.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 57f19e4..2653155 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11067,7 +11067,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (wStyleType != GWL_STYLE) return 0; infoPtr->dwStyle = lpss->styleNew; - map_style_view(infoPtr); if (((lpss->styleOld & WS_HSCROLL) != 0)&& ((lpss->styleNew & WS_HSCROLL) == 0)) @@ -11080,7 +11079,10 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (uNewView != uOldView) { HIMAGELIST himl; - + + /* LVM_SETVIEW doesn't change window style bits within LVS_TYPEMASK, + changing style updates current view only when view bits change. */ + map_style_view(infoPtr); SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0); ShowWindow(infoPtr->hwndHeader, SW_HIDE); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0e3a5c9..3d439df 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4554,6 +4554,12 @@ static void test_get_set_view(void) style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_LIST, "Expected style to be preserved\n"); + /* now change window style to see if view is remapped */ + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SHOWSELALWAYS); + ret = SendMessageA(hwnd, LVM_GETVIEW, 0, 0); + expect(LV_VIEW_SMALLICON, ret); + DestroyWindow(hwnd); }

1 0

Piotr Caban : oleacc: Added client IEnumVARIANT::{Reset, Skip, Next} implementation.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 8c4a3f9fac5559e1ecd509c700cfd34bc79bacf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4a3f9fac5559e1ecd509c70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 13:19:59 2015 +0100 oleacc: Added client IEnumVARIANT::{Reset,Skip,Next} implementation. --- dlls/oleacc/client.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 9409990..ddaa89d 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -33,6 +33,7 @@ typedef struct { LONG ref; HWND hwnd; + HWND enum_pos; } Client; static inline Client* impl_from_Client(IAccessible *iface) @@ -526,22 +527,82 @@ static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); - return E_NOTIMPL; + HWND cur = This->enum_pos, next; + ULONG fetched = 0; + HRESULT hr; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if(!celt) { + if(pCeltFetched) + *pCeltFetched = 0; + return S_OK; + } + + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + + while(next) { + cur = next; + + V_VT(rgVar+fetched) = VT_DISPATCH; + hr = AccessibleObjectFromWindow(cur, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(rgVar+fetched)); + if(FAILED(hr)) { + V_VT(rgVar+fetched) = VT_EMPTY; + while(fetched > 0) { + VariantClear(rgVar+fetched-1); + fetched--; + } + if(pCeltFetched) + *pCeltFetched = 0; + return hr; + } + fetched++; + if(fetched == celt) + break; + + next = GetWindow(cur, GW_HWNDNEXT); + } + + This->enum_pos = cur; + if(pCeltFetched) + *pCeltFetched = fetched; + return celt == fetched ? S_OK : S_FALSE; } static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)->(%u)\n", This, celt); - return E_NOTIMPL; + HWND next; + + TRACE("(%p)->(%u)\n", This, celt); + + while(celt) { + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + if(!next) + return S_FALSE; + + This->enum_pos = next; + celt--; + } + + return S_OK; } static HRESULT WINAPI Client_EnumVARIANT_Reset(IEnumVARIANT *iface) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->enum_pos = 0; + return S_OK; } static HRESULT WINAPI Client_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) @@ -578,6 +639,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; client->ref = 1; client->hwnd = hwnd; + client->enum_pos = 0; hres = IAccessible_QueryInterface(&client->IAccessible_iface, iid, obj); IAccessible_Release(&client->IAccessible_iface);

1 0

Stefan Dösinger : ddraw/tests: The testbot applies color keying without a key.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: daf3e8a0dcde52b33af53db7d540af5e4e913306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf3e8a0dcde52b33af53db7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 20 12:47:11 2015 +0100 ddraw/tests: The testbot applies color keying without a key. --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index f59355e..ca61f13 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6211,14 +6211,24 @@ static void test_texturemapblend(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* WARP (Win8 testbot) emulates color keying with the alpha channel like Wine does, + * but even applies it when there's no color key assigned. The surface alpha is zero + * here, so nothing gets drawn. + * + * The ddraw2 version of this test draws these quads with color keying off due to + * different defaults in ddraw1 and ddraw2. */ color = get_surface_color(rt, 5, 5); - ok(compare_color(color, 0x00ff0040, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0040, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 5); - ok(compare_color(color, 0x00ff0080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0080, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 5, 245); - ok(compare_color(color, 0x00800080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00800080, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 245); - ok(compare_color(color, 0x008000ff, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x008000ff, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); IDirect3DTexture_Release(texture); ref = IDirectDrawSurface_Release(surface);

1 0

Nikolay Sivov : scrrun: Support BYREF types for integer keys.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: f70ddf76140fd808996c726d1ce3495081f78467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70ddf76140fd808996c726d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 08:19:12 2015 +0300 scrrun: Support BYREF types for integer keys. --- dlls/scrrun/dictionary.c | 9 ++++++--- dlls/scrrun/tests/dictionary.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 2dc5d2c..cce8a37 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -795,14 +795,17 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_BSTR: V_I4(hash) = get_str_hash(get_key_strptr(key), This->method); break; + case VT_UI1|VT_BYREF: case VT_UI1: - V_I4(hash) = get_num_hash(V_UI1(key)); + V_I4(hash) = get_num_hash(V_VT(key) & VT_BYREF ? *V_UI1REF(key) : V_UI1(key)); break; + case VT_I2|VT_BYREF: case VT_I2: - V_I4(hash) = get_num_hash(V_I2(key)); + V_I4(hash) = get_num_hash(V_VT(key) & VT_BYREF ? *V_I2REF(key) : V_I2(key)); break; + case VT_I4|VT_BYREF: case VT_I4: - V_I4(hash) = get_num_hash(V_I4(key)); + V_I4(hash) = get_num_hash(V_VT(key) & VT_BYREF ? *V_I4REF(key) : V_I4(key)); break; case VT_UNKNOWN|VT_BYREF: case VT_DISPATCH|VT_BYREF: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index f53222f..e1c80f9 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -429,6 +429,10 @@ static void test_hash_value(void) ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); for (i = 0; i < sizeof(int_hash_tests)/sizeof(int_hash_tests[0]); i++) { + SHORT i2; + BYTE ui1; + LONG i4; + expected = get_num_hash(int_hash_tests[i]); V_VT(&key) = VT_I2; @@ -440,6 +444,16 @@ static void test_hash_value(void) ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + i2 = int_hash_tests[i]; + V_VT(&key) = VT_I2|VT_BYREF; + V_I2REF(&key) = &i2; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + V_VT(&key) = VT_I4; V_I4(&key) = int_hash_tests[i]; VariantInit(&hash); @@ -449,6 +463,16 @@ static void test_hash_value(void) ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + i4 = int_hash_tests[i]; + V_VT(&key) = VT_I4|VT_BYREF; + V_I4REF(&key) = &i4; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + expected = get_num_hash((FLOAT)(BYTE)int_hash_tests[i]); V_VT(&key) = VT_UI1; V_UI1(&key) = int_hash_tests[i]; @@ -458,6 +482,16 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + + ui1 = int_hash_tests[i]; + V_VT(&key) = VT_UI1|VT_BYREF; + V_UI1REF(&key) = &ui1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); } /* nan */

1 0

Bruno Jesus : winmm/tests: Add a basic joystick interactive test.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 47ab17595b3b3fc2058ec1c033ccde9b765a2780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ab17595b3b3fc2058ec1c03… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 22 11:51:12 2015 -0300 winmm/tests: Add a basic joystick interactive test. --- dlls/winmm/tests/joystick.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 21e90e3..2f235fa 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -195,6 +195,35 @@ static void test_api(void) ret = joyGetPosEx(joyid, &infoex.ex); ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); } + + /* the interactive tests spans for 15 seconds, a 500ms polling is used to get + * changes in the joystick. */ + if (winetest_interactive) + { +#define MAX_TIME 15000 + DWORD tick = GetTickCount(), spent; + infoex.ex.dwSize = sizeof(infoex.ex); + infoex.ex.dwFlags = JOY_RETURNALL; + do + { + spent = GetTickCount() - tick; + ret = joyGetPosEx(joyid, &infoex.ex); + if (ret == JOYERR_NOERROR) + { + trace("X: %5d, Y: %5d, Z: %5d, POV: %5d\n", + infoex.ex.dwXpos, infoex.ex.dwYpos, infoex.ex.dwZpos, infoex.ex.dwPOV); + trace("R: %5d, U: %5d, V: %5d\n", + infoex.ex.dwRpos, infoex.ex.dwUpos, infoex.ex.dwVpos); + trace("BUTTONS: 0x%04X, BUTTON_COUNT: %2d, REMAINING: %d ms\n\n", + infoex.ex.dwButtons, infoex.ex.dwButtonNumber, MAX_TIME - spent); + } + Sleep(500); + } + while (spent < MAX_TIME); +#undef MAX_TIME + } + else + skip("Skipping interactive tests for the joystick\n"); } START_TEST(joystick)

1 0

Matteo Bruni : wined3d: Introduce a get_projection_matrix() function.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 2d270f31c67f1e7f93917bde3ba18936d384195a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d270f31c67f1e7f93917bde3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 20 13:50:53 2015 +0100 wined3d: Introduce a get_projection_matrix() function. Notice that I'm using floats instead of doubles in the new function, mostly to be able to use struct wined3d_matrix and multiply_matrix(). At a rough estimate the precision should still be good enough. --- dlls/wined3d/state.c | 68 +++--------------------------------------- dlls/wined3d/utils.c | 64 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 70 insertions(+), 64 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 774e6dd..9a40876 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4052,74 +4052,14 @@ static void transform_view(struct wined3d_context *context, const struct wined3d void transform_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_matrix projection; gl_info->gl_ops.gl.p_glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); - /* There are a couple of additional things we have to take into account - * here besides the projection transformation itself: - * - We need to flip along the y-axis in case of offscreen rendering. - * - OpenGL Z range is {-Wc,...,Wc} while D3D Z range is {0,...,Wc}. - * - D3D coordinates refer to pixel centers while GL coordinates refer - * to pixel corners. - * - D3D has a top-left filling convention. We need to maintain this - * even after the y-flip mentioned above. - * In order to handle the last two points, we translate by - * (63.0 / 128.0) / VPw and (63.0 / 128.0) / VPh. This is equivalent to - * translating slightly less than half a pixel. We want the difference to - * be large enough that it doesn't get lost due to rounding inside the - * driver, but small enough to prevent it from interfering with any - * anti-aliasing. */ - - if (context->last_was_rhw) - { - /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ - double x = state->viewport.x; - double y = state->viewport.y; - double w = state->viewport.width; - double h = state->viewport.height; - double x_scale = 2.0 / w; - double x_offset = ((63.0 / 64.0) - (2.0 * x) - w) / w; - double y_scale = context->render_offscreen ? 2.0 / h : 2.0 / -h; - double y_offset = context->render_offscreen - ? ((63.0 / 64.0) - (2.0 * y) - h) / h - : ((63.0 / 64.0) - (2.0 * y) - h) / -h; - enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? - state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; - double z_scale = zenable ? 2.0f : 0.0f; - double z_offset = zenable ? -1.0f : 0.0f; - const GLdouble projection[] = - { - x_scale, 0.0, 0.0, 0.0, - 0.0, y_scale, 0.0, 0.0, - 0.0, 0.0, z_scale, 0.0, - x_offset, y_offset, z_offset, 1.0, - }; - - gl_info->gl_ops.gl.p_glLoadMatrixd(projection); - checkGLcall("glLoadMatrixd"); - } - else - { - double y_scale = context->render_offscreen ? -1.0 : 1.0; - double x_offset = (63.0 / 64.0) / state->viewport.width; - double y_offset = context->render_offscreen - ? (63.0 / 64.0) / state->viewport.height - : -(63.0 / 64.0) / state->viewport.height; - const GLdouble projection[] = - { - 1.0, 0.0, 0.0, 0.0, - 0.0, y_scale, 0.0, 0.0, - 0.0, 0.0, 2.0, 0.0, - x_offset, y_offset, -1.0, 1.0, - }; - - gl_info->gl_ops.gl.p_glLoadMatrixd(projection); - checkGLcall("glLoadMatrixd"); - - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_PROJECTION]._11); - checkGLcall("glLoadMatrixf"); - } + get_projection_matrix(context, state, &projection); + gl_info->gl_ops.gl.p_glLoadMatrixf(&projection._11); + checkGLcall("glLoadMatrixf"); } /* This should match any arrays loaded in load_vertex_data. diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a43029c..4452f7c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3138,6 +3138,70 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi multiply_matrix(mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(0)]); } +void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, + struct wined3d_matrix *mat) +{ + /* There are a couple of additional things we have to take into account + * here besides the projection transformation itself: + * - We need to flip along the y-axis in case of offscreen rendering. + * - OpenGL Z range is {-Wc,...,Wc} while D3D Z range is {0,...,Wc}. + * - D3D coordinates refer to pixel centers while GL coordinates refer + * to pixel corners. + * - D3D has a top-left filling convention. We need to maintain this + * even after the y-flip mentioned above. + * In order to handle the last two points, we translate by + * (63.0 / 128.0) / VPw and (63.0 / 128.0) / VPh. This is equivalent to + * translating slightly less than half a pixel. We want the difference to + * be large enough that it doesn't get lost due to rounding inside the + * driver, but small enough to prevent it from interfering with any + * anti-aliasing. */ + + if (context->last_was_rhw) + { + /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ + float x = state->viewport.x; + float y = state->viewport.y; + float w = state->viewport.width; + float h = state->viewport.height; + float x_scale = 2.0f / w; + float x_offset = (float)((63.0 / 64.0 - (2.0 * x) - w) / w); + float y_scale = context->render_offscreen ? 2.0f / h : 2.0f / -h; + float y_offset = (float)(context->render_offscreen + ? (63.0 / 64.0 - (2.0 * y) - h) / h + : (63.0 / 64.0 - (2.0 * y) - h) / -h); + enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? + state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; + float z_scale = zenable ? 2.0f : 0.0f; + float z_offset = zenable ? -1.0f : 0.0f; + const struct wined3d_matrix projection = + { + x_scale, 0.0f, 0.0f, 0.0f, + 0.0f, y_scale, 0.0f, 0.0f, + 0.0f, 0.0f, z_scale, 0.0f, + x_offset, y_offset, z_offset, 1.0f, + }; + + *mat = projection; + } + else + { + float y_scale = context->render_offscreen ? -1.0f : 1.0f; + float x_offset = 63.0f / 64.0f * (1.0f / state->viewport.width); + float y_offset = context->render_offscreen + ? 63.0f / 64.0f * (1.0f / state->viewport.height) + : -63.0f / 64.0f * (1.0f / state->viewport.height); + const struct wined3d_matrix projection = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, y_scale, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + x_offset, y_offset, -1.0f, 1.0f, + }; + + multiply_matrix(mat, &projection, &state->transforms[WINED3D_TS_PROJECTION]); + } +} + /* Setup this textures matrix according to the texture flags. */ /* Context activation is done by the caller (state handler). */ void set_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, DWORD flags, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 98df60c..bd4f2e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3037,6 +3037,8 @@ static inline BOOL shader_constant_is_local(const struct wined3d_shader *shader, void get_identity_matrix(struct wined3d_matrix *mat) DECLSPEC_HIDDEN; void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; +void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, + struct wined3d_matrix *mat) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0