February 2017 - Wine-Commits

Hugh McMaster : appwiz.cpl: Remove list entries left over from an earlier uninstall.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 64d37d9482c259a9b0e8bb062aec741e8914b014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d37d9482c259a9b0e8bb062… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 16 12:20:40 2016 +0000 appwiz.cpl: Remove list entries left over from an earlier uninstall. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 537768b67520408d97ab032cd4bcc6c6d39105b1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 9d53e79..dd84827 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -298,7 +298,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } /* registry key */ - info->regroot = root; + RegOpenKeyExW(root, NULL, 0, KEY_READ, &info->regroot); lstrcpyW(info->regkey, subKeyName); info->path = command; @@ -497,7 +497,6 @@ static void UninstallProgram(int id, DWORD button) PROCESS_INFORMATION info; WCHAR errormsg[MAX_STRING_LEN]; WCHAR sUninstallFailed[MAX_STRING_LEN]; - HKEY hkey; BOOL res; LoadStringW(hInst, IDS_UNINSTALL_FAILED, sUninstallFailed, @@ -533,9 +532,8 @@ static void UninstallProgram(int id, DWORD button) MB_ICONQUESTION) == IDYES) { /* delete the application's uninstall entry */ - RegOpenKeyExW(iter->regroot, PathUninstallW, 0, KEY_READ, &hkey); - RegDeleteKeyW(hkey, iter->regkey); - RegCloseKey(hkey); + RegDeleteKeyW(iter->regroot, iter->regkey); + RegCloseKey(iter->regroot); } }

1 0

Hugh McMaster : kernel32: Use Emacs keymap mode immediately after wineconsole configuration change.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 577b41b1560ff0f3696e27ea78dfca83fc36ec6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=577b41b1560ff0f3696e27ea7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 11:09:23 2016 +0000 kernel32: Use Emacs keymap mode immediately after wineconsole configuration change. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a3ffc4f3fa4c3b11658dce4a941e9ffcbf34317) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/editline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 6d2ad17..9eda65f 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -984,6 +984,8 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } } + CONSOLE_GetEditionMode(hConsoleIn, &use_emacs); + GetConsoleMode(hConsoleIn, &mode); if (input_mode != mode) {

1 0

Nikolay Sivov : shell32: Don't access uninitialized buffer (Coverity).
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: fc49f58d0809bf89436f652a96787daf700c5ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc49f58d0809bf89436f652a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 22:16:11 2016 +0300 shell32: Don't access uninitialized buffer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c6cbc2f910ae1ee905e385ea06bb537cc3d901d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shellpath.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 1c3ab59..d06ba2f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4735,6 +4735,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t hr = E_INVALIDARG; break; case CSIDL_Type_NonExistent: + *tempW = 0; hr = S_FALSE; break; case CSIDL_Type_WindowsPath: @@ -4785,15 +4786,19 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t break; } + if (FAILED(hr)) + goto failed; + /* Expand environment strings if necessary */ if (*tempW == '%') + { hr = _SHExpandEnvironmentStrings(tempW, pathW); + if (FAILED(hr)) + goto failed; + } else strcpyW(pathW, tempW); - if (FAILED(hr)) - goto failed; - /* if we don't care about existing directories we are ready */ if (flags & KF_FLAG_DONT_VERIFY) goto done;

1 0

Nikolay Sivov : comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: fa792eb157262dea71e8bc674f12946b701fedba URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa792eb157262dea71e8bc674… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 15:31:42 2017 +0300 comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 26067cc0b9e39ac80bd13f8c90d9c9948eb60fbb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 11 ++++++++++- dlls/comctl32/toolbar.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index bab746b..43cdcc9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1713,12 +1713,13 @@ static void test_recalc(void) static void test_getbuttoninfo(void) { HWND hToolbar = NULL; + TBBUTTONINFOW tbiW; + TBBUTTONINFOA tbi; int i; rebuild_toolbar_with_buttons(&hToolbar); for (i = 0; i < 128; i++) { - TBBUTTONINFOA tbi; int ret; tbi.cbSize = i; @@ -1730,6 +1731,14 @@ static void test_getbuttoninfo(void) compare(ret, -1, "%d"); } } + + /* TBIF_TEXT with NULL pszText */ + memset(&tbiW, 0, sizeof(tbiW)); + tbiW.cbSize = sizeof(tbiW); + tbiW.dwMask = TBIF_BYINDEX | TBIF_STYLE | TBIF_COMMAND | TBIF_TEXT; + i = SendMessageA(hToolbar, TB_GETBUTTONINFOW, 1, (LPARAM)&tbiW); + ok(i == 1, "Got index %d\n", i); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ae6f21e..4e4c940 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3400,7 +3400,7 @@ TOOLBAR_GetButtonInfoT(const TOOLBAR_INFO *infoPtr, INT Id, LPTBBUTTONINFOW lpTb Str_GetPtrW(lpText, lpTbInfo->pszText, lpTbInfo->cchText); else Str_GetPtrWtoA(lpText, (LPSTR)lpTbInfo->pszText, lpTbInfo->cchText); - } else + } else if (!bUnicode || lpTbInfo->pszText) lpTbInfo->pszText[0] = '\0'; } return nIndex;

1 0

Louis Lenders : wine.inf: Add Drivers32 registry key.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: f054e5b0615c0af8d4b625c228a3b71669c88c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f054e5b0615c0af8d4b625c22… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Jan 2 00:15:15 2017 +0100 wine.inf: Add Drivers32 registry key. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a5d9d29721c2f1165863e20457c4fa0675338ad8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index dc55f52..0512d7b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -490,6 +490,7 @@ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Console,,16 +HKLM,%CurrentVersionNT%\Drivers32,,16 HKLM,%CurrentVersionNT%\FontDpi,,16 HKLM,%CurrentVersionNT%\FontLink,,16 HKLM,%CurrentVersionNT%\FontMapper,,16

1 0

Alexandre Julliard : Update copyright info for 2017.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: ce6cbd48cc3736358ac8144ae4ecdb7e57e3e95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6cbd48cc3736358ac8144ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 2 16:05:08 2017 +0100 Update copyright info for 2017. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1f8974e6e8720b887d2221bcfbb157d003c0eb02) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index c35515e..1065ca6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 8dbb85b..eb36403 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index fcf1385..76ddabf 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -74,7 +74,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 581a1f03497e30b6f4dccf84e351e4e6c54ec73a URL: http://source.winehq.org/git/wine.git/?a=commit;h=581a1f03497e30b6f4dccf84e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 12 22:03:21 2016 +0300 comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6aabe0159b6c38664380718b57418618e305704) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 1 - dlls/comctl32/trackbar.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index da24595..80d5906 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -992,7 +992,6 @@ static void test_tic_settings(void) SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); - todo_wine ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 880acc7..0e52212 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1433,6 +1433,7 @@ TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) TRACKBAR_InvalidateAll(infoPtr); } + TRACKBAR_UpdateThumb (infoPtr); return 0; }

1 0

Alexandre Julliard : wineconsole: Leave room for wide characters only when using a DBCS codepage.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 071c11783763ef8a145c7dd34f7b5ea71c1f08cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=071c11783763ef8a145c7dd34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 14:23:54 2016 +0100 wineconsole: Leave room for wide characters only when using a DBCS codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 29533e4844761c499c16be73e2db7dc055776fdf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineconsole/user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 40a0757..f119d19 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -458,6 +458,7 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, TEXTMETRICW tm; HDC hDC; HFONT hFont, hOldFont; + CPINFO cpinfo; if (!(hDC = GetDC(hWnd))) return NULL; if (!(hFont = CreateFontIndirectW(lf))) @@ -470,12 +471,16 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, SelectObject(hDC, hOldFont); ReleaseDC(hWnd, hDC); - config->cell_width = tm.tmMaxCharWidth; + config->cell_width = tm.tmAveCharWidth; config->cell_height = tm.tmHeight + tm.tmExternalLeading; config->font_weight = tm.tmWeight; lstrcpyW(config->face_name, lf->lfFaceName); if (el) *el = tm.tmExternalLeading; + /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ + if (GetCPInfo( GetConsoleOutputCP(), &cpinfo ) && cpinfo.MaxCharSize > 1) + config->cell_width = tm.tmMaxCharWidth; + return hFont; }

1 0

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

Feb. 28, 2017

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

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

Feb. 28, 2017

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