February 2017 - Wine-commits

Alex Henrie : user32: Tell MENU_SuspendPopup which message to remove.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 24a1fd1ab4da3a9a6921d2d132c1b9aead950b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a1fd1ab4da3a9a6921d2d13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 21:28:50 2016 -0700 user32: Tell MENU_SuspendPopup which message to remove. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68ca28a8bc3197a09cd3b82d90969f44f844dc2e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/menu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bb737ac..77294b4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2809,7 +2809,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk, UINT wFlags ) * The idea is not to show the popup if the next input message is * going to hide it anyway. */ -static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg ) +static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT uMsg ) { MSG msg; @@ -2881,7 +2881,7 @@ static BOOL MENU_KeyEscape(MTRACKER* pmt, UINT wFlags) * * Handle a VK_LEFT key event in a menu. */ -static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) +static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags, UINT msg ) { POPUPMENU *menu; HMENU hmenutmp, hmenuprev; @@ -2921,7 +2921,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) /* A sublevel menu was displayed - display the next one * unless there is another displacement coming up */ - if( !MENU_SuspendPopup( pmt, WM_KEYDOWN ) ) + if( !MENU_SuspendPopup( pmt, msg ) ) pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, pmt->hTopMenu, TRUE, wFlags); } @@ -2934,7 +2934,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) * * Handle a VK_RIGHT key event in a menu. */ -static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags ) +static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags, UINT msg ) { HMENU hmenutmp; POPUPMENU *menu = MENU_GetMenu( pmt->hTopMenu ); @@ -2978,7 +2978,7 @@ static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags ) MENU_MoveSelection( pmt->hOwnerWnd, pmt->hTopMenu, ITEM_NEXT ); if( hmenutmp || pmt->trackFlags & TF_SUSPENDPOPUP ) - if( !MENU_SuspendPopup(pmt, WM_KEYDOWN) ) + if( !MENU_SuspendPopup( pmt, msg ) ) pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, pmt->hTopMenu, TRUE, wFlags); } @@ -3178,11 +3178,11 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, break; case VK_LEFT: - MENU_KeyLeft( &mt, wFlags ); + MENU_KeyLeft( &mt, wFlags, msg.message ); break; case VK_RIGHT: - MENU_KeyRight( &mt, wFlags ); + MENU_KeyRight( &mt, wFlags, msg.message ); break; case VK_ESCAPE:

1 0

Bruno Jesus : iphlpapi: Ensure GetIpAddrTable returns loopback addresses in the end.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: a96b43f3850a1eeaa04c9912309994b70366036d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96b43f3850a1eeaa04c99123… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 1 10:23:36 2016 -0200 iphlpapi: Ensure GetIpAddrTable returns loopback addresses in the end. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 95298b4442504d9e977fbdb72ce1417273340265) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 27 +++++++++++++++++++++------ dlls/iphlpapi/tests/iphlpapi.c | 3 +++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 90dcda3..54f7a37 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -134,17 +134,27 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, } -static int IpAddrTableSorter(const void *a, const void *b) +static int IpAddrTableNumericSorter(const void *a, const void *b) { - int ret; + int ret = 0; if (a && b) ret = ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; - else - ret = 0; return ret; } +static int IpAddrTableLoopbackSorter(const void *a, const void *b) +{ + const MIB_IPADDRROW *left = a, *right = b; + int ret = 0; + + if (isIfIndexLoopback(left->dwIndex)) + ret = 1; + else if (isIfIndexLoopback(right->dwIndex)) + ret = -1; + + return ret; +} /****************************************************************** * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) @@ -173,7 +183,7 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, ret = getIPAddrTable(ppIpAddrTable, heap, flags); if (!ret && bOrder) qsort((*ppIpAddrTable)->table, (*ppIpAddrTable)->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableSorter); + sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); TRACE("returning %d\n", ret); return ret; } @@ -1988,9 +1998,14 @@ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL else { *pdwSize = size; memcpy(pIpAddrTable, table, size); + /* sort by numeric IP value */ if (bOrder) qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableSorter); + sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); + /* sort ensuring loopback interfaces are in the end */ + else + qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, + sizeof(MIB_IPADDRROW), IpAddrTableLoopbackSorter); ret = NO_ERROR; } HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 92653ed5..2022b70 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -261,6 +261,9 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); + /* loopback must never be the first when more than one interface is found */ + if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) + ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Nikolay Sivov : shell32: Move retrieving folder path logic to SHGetKnownFolderPath().
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: e5a36c4a3d48c941ff38421cc667a1e96e0c408f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a36c4a3d48c941ff38421cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 23:33:08 2016 +0300 shell32: Move retrieving folder path logic to SHGetKnownFolderPath(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0c259cf562b32268df86053a5e0785b1ad78cc1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shellpath.c | 137 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 113 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index cb79d6f..1c3ab59 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4704,45 +4704,134 @@ static int csidl_from_id( const KNOWNFOLDERID *id ) /************************************************************************* * SHGetKnownFolderPath [SHELL32.@] */ -HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PWSTR *path) +HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, WCHAR **ret_path) { - HRESULT hr; - WCHAR folder[MAX_PATH]; - int index = csidl_from_id( rfid ); + WCHAR pathW[MAX_PATH], tempW[MAX_PATH]; + HRESULT hr; + CSIDL_Type type; + int ret; + int folder = csidl_from_id(rfid), shgfp_flags; - TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, path); + TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, ret_path); - *path = NULL; + *ret_path = NULL; - if (index < 0) + if (folder < 0) return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); - if (flags & KF_FLAG_CREATE) - index |= CSIDL_FLAG_CREATE; + if (flags & ~(KF_FLAG_CREATE|KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS| + KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) + { + FIXME("flags 0x%08x not supported\n", flags); + return E_INVALIDARG; + } + + shgfp_flags = flags & KF_FLAG_DEFAULT_PATH ? SHGFP_TYPE_DEFAULT : SHGFP_TYPE_CURRENT; + + type = CSIDL_Data[folder].type; + switch (type) + { + case CSIDL_Type_Disallowed: + hr = E_INVALIDARG; + break; + case CSIDL_Type_NonExistent: + hr = S_FALSE; + break; + case CSIDL_Type_WindowsPath: + GetWindowsDirectoryW(tempW, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(tempW); + strcatW(tempW, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; + case CSIDL_Type_SystemPath: + GetSystemDirectoryW(tempW, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(tempW); + strcatW(tempW, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; + case CSIDL_Type_SystemX86Path: + if (!GetSystemWow64DirectoryW(tempW, MAX_PATH)) GetSystemDirectoryW(tempW, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(tempW); + strcatW(tempW, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; + case CSIDL_Type_CurrVer: + hr = _SHGetCurrentVersionPath(shgfp_flags, folder, tempW); + break; + case CSIDL_Type_User: + hr = _SHGetUserProfilePath(token, shgfp_flags, folder, tempW); + break; + case CSIDL_Type_AllUsers: + hr = _SHGetAllUsersProfilePath(shgfp_flags, folder, tempW); + break; + default: + FIXME("bogus type %d, please fix\n", type); + hr = E_INVALIDARG; + break; + } + + /* Expand environment strings if necessary */ + if (*tempW == '%') + hr = _SHExpandEnvironmentStrings(tempW, pathW); + else + strcpyW(pathW, tempW); - if (flags & KF_FLAG_DONT_VERIFY) - index |= CSIDL_FLAG_DONT_VERIFY; + if (FAILED(hr)) + goto failed; - if (flags & KF_FLAG_NO_ALIAS) - index |= CSIDL_FLAG_NO_ALIAS; + /* if we don't care about existing directories we are ready */ + if (flags & KF_FLAG_DONT_VERIFY) goto done; - if (flags & KF_FLAG_INIT) - index |= CSIDL_FLAG_PER_USER_INIT; + if (PathFileExistsW(pathW)) goto done; - if (flags & ~(KF_FLAG_CREATE|KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT)) + /* Does not exist but we are not allowed to create it. The return value + * is verified against shell32 version 6.0. + */ + if (!(flags & KF_FLAG_CREATE)) { - FIXME("flags 0x%08x not supported\n", flags); - return E_INVALIDARG; + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + goto done; } - hr = SHGetFolderPathW( NULL, index, token, 0, folder ); - if (SUCCEEDED(hr)) + /* create directory/directories */ + ret = SHCreateDirectoryExW(NULL, pathW, NULL); + if (ret && ret != ERROR_ALREADY_EXISTS) { - *path = CoTaskMemAlloc( (strlenW( folder ) + 1) * sizeof(WCHAR) ); - if (!*path) - return E_OUTOFMEMORY; - strcpyW( *path, folder ); + ERR("Failed to create directory %s.\n", debugstr_w(pathW)); + hr = E_FAIL; + goto failed; } + + TRACE("Created missing system directory %s\n", debugstr_w(pathW)); + +done: + TRACE("Final path is %s, %#x\n", debugstr_w(pathW), hr); + + *ret_path = CoTaskMemAlloc((strlenW(pathW) + 1) * sizeof(WCHAR)); + if (!*ret_path) + return E_OUTOFMEMORY; + strcpyW(*ret_path, pathW); + + return hr; + +failed: + TRACE("Failed to get folder path, %#x.\n", hr); + return hr; }

1 0

VRan Liu : shell32/tests: Simple test for KF_FLAG_DEFAULT_PATH.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 5ef771160e4da018d518cc807b3dd9575c119a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef771160e4da018d518cc807… Author: VRan Liu <gliuwr(a)gmail.com> Date: Sun Dec 4 23:33:09 2016 +0300 shell32/tests: Simple test for KF_FLAG_DEFAULT_PATH. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c64cdc1fe608faf01ca21708787839df849c0a55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 6b5ed76..8c61cf7 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -860,6 +860,12 @@ if (0) { /* crashes */ ok(path == NULL, "got %p\n", path); path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, KF_FLAG_DEFAULT_PATH, NULL, &path); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "expected path != NULL\n"); + CoTaskMemFree(path); + + path = NULL; hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); ok(path != NULL, "expected path != NULL\n");

1 0

Lauri Kenttä : user32: Fix caret disappearing after scrolling.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 8948f223b3902ba983c2a316419016daa6f1f52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8948f223b3902ba983c2a3164… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Nov 26 18:03:43 2016 +0200 user32: Fix caret disappearing after scrolling. The caret needs to be moved along with scrolling even if it's outside the visible area. Otherwise, when the caret is scrolled out from the view, the position won't get updated anymore and the caret will never scroll back again. The idea is based on the patch by André Hentschel. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1d3b9448f6dccf642b015359af53e03f295a76cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/painting.c | 76 ++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1c4ca7c..14dfc58 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -839,65 +839,41 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, { GUITHREADINFO info; RECT rect, mapped_rcCaret; - BOOL hide_caret = FALSE; info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; + mapped_rcCaret = info.rcCaret; if (info.hwndCaret == hWnd) { - /* Move the caret if it's (partially) in the source rectangle */ - if (IntersectRect(&rect, scroll_rect, &info.rcCaret)) - { - *move_caret = TRUE; - hide_caret = TRUE; - new_caret_pos->x = info.rcCaret.left + dx; - new_caret_pos->y = info.rcCaret.top + dy; - } - else - { - *move_caret = FALSE; - - /* Hide the caret if it's in the destination rectangle */ - rect = *scroll_rect; - OffsetRect(&rect, dx, dy); - hide_caret = IntersectRect(&rect, &rect, &info.rcCaret); - } + /* The caret needs to be moved along with scrolling even if it's + * outside the visible area. Otherwise, when the caret is scrolled + * out from the view, the position won't get updated anymore and + * the caret will never scroll back again. */ + *move_caret = TRUE; + new_caret_pos->x = info.rcCaret.left + dx; + new_caret_pos->y = info.rcCaret.top + dy; } else { - if ((flags & SW_SCROLLCHILDREN) && IsChild(hWnd, info.hwndCaret)) - { - *move_caret = FALSE; - - /* Hide the caret if it's in the source or in the destination - rectangle */ - mapped_rcCaret = info.rcCaret; - MapWindowPoints(info.hwndCaret, hWnd, (LPPOINT)&mapped_rcCaret, 2); - - if (IntersectRect(&rect, scroll_rect, &mapped_rcCaret)) - { - hide_caret = TRUE; - } - else - { - rect = *scroll_rect; - OffsetRect(&rect, dx, dy); - hide_caret = IntersectRect(&rect, &rect, &mapped_rcCaret); - } - } - else + *move_caret = FALSE; + if (!(flags & SW_SCROLLCHILDREN) || !IsChild(hWnd, info.hwndCaret)) return 0; + MapWindowPoints(info.hwndCaret, hWnd, (LPPOINT)&mapped_rcCaret, 2); } - if (hide_caret) - { - HideCaret(info.hwndCaret); - return info.hwndCaret; + /* If the caret is not in the src/dest rects, all is fine done. */ + if (!IntersectRect(&rect, scroll_rect, &mapped_rcCaret)) + { + rect = *scroll_rect; + OffsetRect(&rect, dx, dy); + if (!IntersectRect(&rect, &rect, &mapped_rcCaret)) + return 0; } - else - return 0; + + /* Indicate that the caret needs to be updated during the scrolling. */ + return info.hwndCaret; } @@ -1458,6 +1434,8 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); hwndCaret = fix_caret(hwnd, &rc, dx, dy, flags, &moveCaret, &newCaretPos); + if (hwndCaret) + HideCaret(hwndCaret); if (is_ex) dcxflags |= DCX_CACHE; if( style & WS_CLIPSIBLINGS) dcxflags |= DCX_CLIPSIBLINGS; @@ -1550,10 +1528,10 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC DeleteObject( hrgnWinupd); } - if( hwndCaret ) { - if ( moveCaret ) SetCaretPos( newCaretPos.x, newCaretPos.y ); - ShowCaret(hwndCaret); - } + if( moveCaret ) + SetCaretPos( newCaretPos.x, newCaretPos.y ); + if( hwndCaret ) + ShowCaret( hwndCaret ); if( bOwnRgn && hrgnUpdate ) DeleteObject( hrgnUpdate );

1 0

Brock York : msctf: Remove incorrect dereference of double pointer.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: aac46fef39680fa15df81795ebf8e31f2d612fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac46fef39680fa15df81795e… Author: Brock York <twunknown(a)gmail.com> Date: Sat Dec 10 01:05:48 2016 +1100 msctf: Remove incorrect dereference of double pointer. Signed-off-by: Brock York <twunknown(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d7662881a52305045aa01e6dff8275331a67f70e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/threadmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 3f0e7f6..bce1d27 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1257,7 +1257,7 @@ static HRESULT WINAPI UIElementMgr_QueryInterface(ITfUIElementMgr *iface, REFIID { ThreadMgr *This = impl_from_ITfUIElementMgr(iface); - return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, *ppvOut); + return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut); } static ULONG WINAPI UIElementMgr_AddRef(ITfUIElementMgr *iface)

1 0

Henri Verbeet : d3drm: Introduce d3drm_set_color().
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 2156bc739bc29191cf3388183cb1483a6edb57a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2156bc739bc29191cf3388183… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 10 16:17:37 2016 +0100 d3drm: Introduce d3drm_set_color(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 060ea15ae2c1604d51d3df1460e99c7d6e6211cf) Conflicts: dlls/d3drm/frame.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 16 ++++++++++++++++ dlls/d3drm/frame.c | 5 ++--- dlls/d3drm/light.c | 2 +- dlls/d3drm/math.c | 29 +++++++++-------------------- dlls/d3drm/meshbuilder.c | 7 +++---- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 5df83a7..e0a48b5 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -21,6 +21,7 @@ #ifndef __D3DRM_PRIVATE_INCLUDED__ #define __D3DRM_PRIVATE_INCLUDED__ +#include <math.h> #include "d3drm.h" #include "dxfile.h" @@ -61,4 +62,19 @@ struct d3drm_file_header extern char templates[] DECLSPEC_HIDDEN; +static inline BYTE d3drm_color_component(float c) +{ + if (c <= 0.0f) + return 0u; + if (c >= 1.0f) + return 0xffu; + return floor(c * 255.0f); +} + +static inline void d3drm_set_color(D3DCOLOR *color, float r, float g, float b, float a) +{ + *color = RGBA_MAKE(d3drm_color_component(r), d3drm_color_component(g), + d3drm_color_component(b), d3drm_color_component(a)); +} + #endif /* __D3DRM_PRIVATE_INCLUDED__ */ diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index f20040b..3acb3e9 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1860,8 +1860,7 @@ static HRESULT WINAPI d3drm_frame3_SetSceneBackgroundRGB(IDirect3DRMFrame3 *ifac TRACE("iface %p, red %.8e, green %.8e, blue %.8e stub!\n", iface, red, green, blue); - frame->scenebackground = RGBA_MAKE((BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&frame->scenebackground, red, green, blue, 1.0f); return D3DRM_OK; } @@ -2283,7 +2282,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) object->IDirect3DRMFrame2_iface.lpVtbl = &d3drm_frame2_vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &d3drm_frame3_vtbl; object->ref = 1; - object->scenebackground = RGBA_MAKE(0, 0, 0, 0xff); + d3drm_set_color(&object->scenebackground, 0.0f, 0.0f, 0.0f, 1.0f); memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 53accbf..7a7ccd4 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -183,7 +183,7 @@ static HRESULT WINAPI d3drm_light_SetColorRGB(IDirect3DRMLight *iface, TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); - light->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&light->color, red, green, blue, 1.0f); return D3DRM_OK; } diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index a1ad727..4ccde60 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -19,12 +19,10 @@ #define NONAMELESSUNION -#include <math.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "d3drmdef.h" +#include "config.h" +#include "wine/port.h" + +#include "d3drm_private.h" /* Create a RGB color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) @@ -34,20 +32,11 @@ D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) /* Create a RGBA color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE red, D3DVALUE green, D3DVALUE blue, D3DVALUE alpha) { - int Red, Green, Blue, Alpha; - Red=floor(red*255); - Green=floor(green*255); - Blue=floor(blue*255); - Alpha=floor(alpha*255); - if (red < 0) Red=0; - if (red > 1) Red=255; - if (green < 0) Green=0; - if (green > 1) Green=255; - if (blue < 0) Blue=0; - if (blue > 1) Blue=255; - if (alpha < 0) Alpha=0; - if (alpha > 1) Alpha=255; - return (RGBA_MAKE(Red, Green, Blue, Alpha)); + D3DCOLOR color; + + d3drm_set_color(&color, red, green, blue, alpha); + + return color; } /* Determine the alpha part of a color */ diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 8bd5131..447f5ea 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1234,8 +1234,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, values = (float*)ptr; - This->materials[i].color = RGBA_MAKE((BYTE)(values[0] * 255.0f), (BYTE)(values[1] * 255.0f), - (BYTE)(values[2] * 255.0f), (BYTE)(values[3] * 255.0f)); + d3drm_set_color(&This->materials[i].color, values[0], values[1], values[2], values[3]); IDirect3DRMMaterial2_SetAmbient(This->materials[i].material, values[0], values [1], values[2]); /* Alpha ignored */ IDirect3DRMMaterial2_SetPower(This->materials[i].material, values[4]); @@ -1694,7 +1693,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetColorRGB(IDirect3DRMMeshBuilder3 *i TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); - mesh_builder->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&mesh_builder->color, red, green, blue, 1.0f); return D3DRM_OK; } @@ -2595,7 +2594,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface, if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; - mesh->groups[id].color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&mesh->groups[id].color, red, green, blue, 1.0f); return D3DRM_OK; }

1 0

Lauri Kenttä : cmd: Fix copying when the dest is one of the sources.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: a9ab13e0504b6ca28c3fd45f462a5c98cf66ee70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ab13e0504b6ca28c3fd45f4… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 5 18:53:23 2016 +0200 cmd: Fix copying when the dest is one of the sources. "COPY a+b a" appends b to a. "COPY a+b b" skips b from the sources. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 064508c0dd7bb331d581de77bebec62db2025e57) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 44 ++++++++++++++++++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 16 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cfa1642..dce5a78 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -460,6 +460,36 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) } /**************************************************************************** + * WCMD_IsSameFile + * + * Checks if the two paths reference to the same file + */ +static BOOL WCMD_IsSameFile(const WCHAR *name1, const WCHAR *name2) +{ + BOOL ret = FALSE; + HANDLE file1 = INVALID_HANDLE_VALUE, file2 = INVALID_HANDLE_VALUE; + BY_HANDLE_FILE_INFORMATION info1, info2; + + file1 = CreateFileW(name1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0); + if (file1 == INVALID_HANDLE_VALUE || !GetFileInformationByHandle(file1, &info1)) + goto end; + + file2 = CreateFileW(name2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0); + if (file2 == INVALID_HANDLE_VALUE || !GetFileInformationByHandle(file2, &info2)) + goto end; + + ret = info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber + && info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow; +end: + if (file1 != INVALID_HANDLE_VALUE) + CloseHandle(file1); + if (file2 != INVALID_HANDLE_VALUE) + CloseHandle(file2); + return ret; +} + +/**************************************************************************** * WCMD_ManualCopy * * Copies from a file @@ -922,6 +952,7 @@ void WCMD_copy(WCHAR * args) { do { WCHAR outname[MAX_PATH]; BOOL overwrite; + BOOL appendtofirstfile = FALSE; /* Skip . and .., and directories */ if (!srcisdevice && fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -946,8 +977,14 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Flags: srcbinary(%d), dstbinary(%d), over(%d), prompt(%d)\n", thiscopy->binarycopy, destination->binarycopy, overwrite, prompt); + if (!writtenoneconcat) { + appendtofirstfile = anyconcats && WCMD_IsSameFile(srcpath, outname); + } + /* Prompt before overwriting */ - if (!overwrite) { + if (appendtofirstfile) { + overwrite = TRUE; + } else if (!overwrite) { DWORD attributes = GetFileAttributesW(outname); if (attributes != INVALID_FILE_ATTRIBUTES) { WCHAR* question; @@ -969,7 +1006,10 @@ void WCMD_copy(WCHAR * args) { /* Do the copy as appropriate */ if (overwrite) { - if (anyconcats && writtenoneconcat) { + if (anyconcats && WCMD_IsSameFile(srcpath, outname)) { + /* Silently skip if the destination file is also a source file */ + status = TRUE; + } else if (anyconcats && writtenoneconcat) { if (thiscopy->binarycopy) { status = WCMD_ManualCopy(srcpath, outname, FALSE, TRUE); } else { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 975a84b..e199c0b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2391,6 +2391,22 @@ rem Concat 2 files, default mode - (one EOF on the end 5+8+1) copy ..\file1+..\file2 file12_eof2 >nul 2>&1 call :CheckFileSize file12_eof2 14 +rem Test copying when destination is one of the sources. +rem Concat file1+file2+file3 into file1, should produce file1+file2+file3 = 24 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file1 >nul 2>&1 +call :CheckFileSize file1 24 + +rem Concat file1+file2+file3 into file2, should produce file1+file3 = 16 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file2 >nul 2>&1 +call :CheckFileSize file2 16 + +rem Concat file1+file2+file3 into file3, should produce file1+file2 = 13 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file3 >nul 2>&1 +call :CheckFileSize file3 13 + rem -------------------------------------------------------------- rem Show ascii source copy stops at first EOF, binary does the lot rem -------------------------------------------------------------- diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d70aad3..17dbd19 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1262,6 +1262,9 @@ Passed: file size check on file3_plus_eof [12]@or_broken(a)Skipping file size chec Passed: file size check on file12_plus_eof [14]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file12_no_eof [13]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file12_eof2 [14]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file1 [24]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file2 [16]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file3 [13]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_binary_srccopy [6]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_ascii_srccopy [5]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file123_default_copy [25]@or_broken(a)Skipping file size check on NT4

1 0

Matteo Bruni : wined3d: Also check BLENDWEIGHT for immediate mode fallback.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 0a2226f1992a63f74e1d44f844435b8038ac4caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2226f1992a63f74e1d44f84… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 29 21:01:49 2016 +0200 wined3d: Also check BLENDWEIGHT for immediate mode fallback. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 75c8eba5250a96eb585a852c5381e5289a782290) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a15aad2..f6b16a5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2984,7 +2984,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] - & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR)); + & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if (((stream_info->position_transformed && !d3d_info->xyzrhw) || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo)

1 0

Matteo Bruni : d3d9/tests: Add a vertex blending test with D3DCOLOR weights.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 25263909aed0dd43a67a67687d18bfef2ddee942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25263909aed0dd43a67a67687… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 29 21:01:53 2016 +0200 d3d9/tests: Add a vertex blending test with D3DCOLOR weights. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e592b541a1bfd4edf109e32918f4a5fabb3ade67) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 108 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 81 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c91d02c..bb56bd6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19408,6 +19408,7 @@ static void test_texcoordindex(void) static void test_vertex_blending(void) { + IDirect3DVertexDeclaration9 *vertex_declaration; IDirect3DDevice9 *device; IDirect3D9 *d3d; D3DCAPS9 caps; @@ -19488,12 +19489,23 @@ static void test_vertex_blending(void) static const struct { + DWORD fvf; + D3DVERTEXELEMENT9 decl_elements[3]; struct { - struct vec3 position; - struct vec3 blendweights; - } - vertex_data[4]; + struct + { + struct vec3 position; + struct vec3 blendweights; + } + vertex_data_float[4]; + struct + { + struct vec3 position; + D3DCOLOR blendweights; + } + vertex_data_d3dcolor[4]; + } s; const POINT *quad_points; const POINT *empty_points; } @@ -19501,36 +19513,59 @@ static void test_vertex_blending(void) { /* upper right */ { - {{{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, - {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}}, quad_upper_right_points, quad_upper_right_empty_points }, /* center */ { - {{{-1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, - {{-1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{-1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}}}, quad_center_points, quad_center_empty_points }, - /* upper center */ + /* upper center */ { - {{{-1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, - {{-1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}}}, quad_upper_center_points, quad_upper_center_empty_points }, - /* full screen */ + /* full screen */ { - {{{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.0f}}, - {{-1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.0f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 1.0f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}}, quad_fullscreen_points, quad_fullscreen_empty_points - } + }, + /* D3DCOLOR, full screen */ + { + 0, + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, + D3DDECL_END() + }, + {{{{0}}}, + {{{-1.0f, -1.0f, 0.0f}, 0x0000ff00}, + {{-1.0f, 1.0f, 0.0f}, 0x00ff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0x000000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0x00000000}}}, + quad_fullscreen_points, quad_fullscreen_empty_points + }, }; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -19574,16 +19609,32 @@ static void test_vertex_blending(void) { const POINT *point; + if (tests[i].fvf) + { + hr = IDirect3DDevice9_SetFVF(device, tests[i].fvf); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + vertex_declaration = NULL; + } + else + { + hr = IDirect3DDevice9_CreateVertexDeclaration(device, tests[i].decl_elements, &vertex_declaration); + ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZB3); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tests[i].vertex_data, 6 * sizeof(float)); + if (tests[i].fvf) + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, + tests[i].s.vertex_data_float, sizeof(*tests[i].s.vertex_data_float)); + else + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, + tests[i].s.vertex_data_d3dcolor, sizeof(*tests[i].s.vertex_data_d3dcolor)); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -19607,6 +19658,9 @@ static void test_vertex_blending(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + if (vertex_declaration) + IDirect3DVertexDeclaration9_Release(vertex_declaration); } refcount = IDirect3DDevice9_Release(device);

1 0