Wine-devel
Threads by month
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2003 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2002 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2001 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
December 2017
- 60 participants
- 368 discussions
28 Dec '17
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
---
This should fix the failures on Korean Windows.
dlls/user32/tests/Makefile.in | 2 +-
dlls/user32/tests/input.c | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in
index 7149dc824e..c71cbe2547 100644
--- a/dlls/user32/tests/Makefile.in
+++ b/dlls/user32/tests/Makefile.in
@@ -1,5 +1,5 @@
TESTDLL = user32.dll
-IMPORTS = user32 gdi32 advapi32
+IMPORTS = user32 gdi32 advapi32 imm32
C_SRCS = \
broadcast.c \
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 793590ef71..a15a64420d 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -54,6 +54,7 @@
#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
+#include "imm.h"
#include "wine/test.h"
@@ -2515,6 +2516,7 @@ static void test_OemKeyScan(void)
DWORD ret, expect, vkey, scan;
WCHAR oem, wchr;
char oem_char;
+ BOOL ime = ImmIsIME(GetKeyboardLayout(0));
for (oem = 0; oem < 0x200; oem++)
{
@@ -2527,7 +2529,10 @@ static void test_OemKeyScan(void)
{
vkey = VkKeyScanW( wchr );
scan = MapVirtualKeyW( LOBYTE( vkey ), MAPVK_VK_TO_VSC );
- if (!scan)
+ /* OemKeyScan returns -1 for any character that has to go through
+ * the IME, whereas VkKeyScan returns the virtual key code for the
+ * question mark key */
+ if (!scan || (ime && wchr != '?' && vkey == VkKeyScanW( '?' )))
expect = -1;
else
{
--
2.15.1
1
0
Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
---
dlls/quartz/waveparser.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c
index f6bea2c704..f8afc527b1 100644
--- a/dlls/quartz/waveparser.c
+++ b/dlls/quartz/waveparser.c
@@ -431,10 +431,17 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv)
/* Note: This memory is managed by the transform filter once created */
This = CoTaskMemAlloc(sizeof(WAVEParserImpl));
+ if (!This)
+ return E_OUTOFMEMORY;
+
+ ZeroMemory(This, sizeof(WAVEParserImpl));
hr = Parser_Create(&(This->Parser), &WAVEParser_Vtbl, &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL);
if (FAILED(hr))
+ {
+ CoTaskMemFree(This);
return hr;
+ }
*ppv = &This->Parser.filter.IBaseFilter_iface;
--
2.13.6
1
0
[PATCH] user32/tests: Add some tests for A/W auto conversion in case of mismatching window vs dialog procedure types
by Nikolay Sivov 28 Dec '17
by Nikolay Sivov 28 Dec '17
28 Dec '17
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/user32/tests/dialog.c | 198 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 196 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index 8bf76f112c..511f0c5723 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -1236,8 +1236,195 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg,
return FALSE;
}
-static void test_DialogBoxParamA(void)
+static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0};
+static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
+ if (msg == WM_SETTEXT)
+ {
+ if (IsWindowUnicode(hdlg))
+ {
+ WCHAR *text = (WCHAR *)lparam;
+ todo_wine
+ ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text));
+ }
+ else
+ {
+ char *textA = (char *)lparam;
+ todo_wine
+ ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA);
+ }
+ }
+
+ return DefWindowProcW(hdlg, msg, wparam, lparam);
+}
+
+static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+ if (msg == WM_SETTEXT)
+ {
+ if (IsWindowUnicode(hdlg))
+ {
+ WCHAR *text = (WCHAR *)lparam;
+ ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text));
+ }
+ else
+ {
+ char *textA = (char *)lparam;
+ ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA);
+ }
+ }
+
+ return DefWindowProcA(hdlg, msg, wparam, lparam);
+}
+
+static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+ ULONG_PTR dlgproc, originalproc;
+ WCHAR buffW[64];
+ char buff[64];
+ BOOL ret;
+ INT len;
+
+ switch (msg)
+ {
+ case WM_INITDIALOG:
+ ok(IsWindowUnicode(hdlg), "Expected unicode window.\n");
+
+ originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC);
+ ok(originalproc == (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", originalproc);
+
+ dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC);
+ ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ dlgproc = SetWindowLongPtrA(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA);
+ ok(IsWindowUnicode(hdlg), "Expected unicode window.\n");
+
+ dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC);
+ ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC);
+ ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ ret = SetWindowTextW(hdlg, testtextW);
+ todo_wine
+ ok(ret, "Failed to set window text.\n");
+
+ memset(buff, 'A', sizeof(buff));
+ len = GetWindowTextA(hdlg, buff, sizeof(buff));
+ todo_wine
+ ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %hhx, %hhx, len %d\n",
+ buff[0], buff[1], len);
+
+ memset(buffW, 0xff, sizeof(buffW));
+ len = GetWindowTextW(hdlg, buffW, 64);
+ todo_wine
+ ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len);
+
+ dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW);
+ ok(IsWindowUnicode(hdlg), "Expected unicode window.\n");
+
+ dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC);
+ ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC);
+ ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ ret = SetWindowTextA(hdlg, "WndText");
+ todo_wine
+ ok(ret, "Failed to set window text.\n");
+
+ memset(buff, 'A', sizeof(buff));
+ len = GetWindowTextA(hdlg, buff, sizeof(buff));
+ ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %hhx, %hhx, len %d\n",
+ buff[0], buff[1], len);
+
+ memset(buffW, 0xff, sizeof(buffW));
+ len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0]));
+ ok(buffW[0] == 'W' && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n",
+ buffW[0], buffW[1], len);
+
+ SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc);
+ EndDialog(hdlg, -123);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+ ULONG_PTR dlgproc, originalproc;
+ WCHAR buffW[64];
+ char buff[64];
+ BOOL ret;
+ INT len;
+
+ switch (msg)
+ {
+ case WM_INITDIALOG:
+ ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n");
+
+ originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC);
+ ok(originalproc != (ULONG_PTR)test_aw_conversion_dlgproc2, "Unexpected dlg proc %#lx.\n", originalproc);
+
+ dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC);
+ ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgproc2, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ dlgproc = SetWindowLongPtrA(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW);
+ ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n");
+
+ dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC);
+ ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC);
+ ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ ret = SetWindowTextA(hdlg, "WndText");
+ todo_wine
+ ok(ret, "Failed to set window text.\n");
+
+ memset(buff, 'A', sizeof(buff));
+ len = GetWindowTextA(hdlg, buff, sizeof(buff));
+ ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len);
+
+ memset(buffW, 0xff, sizeof(buffW));
+ len = GetWindowTextW(hdlg, buffW, 64);
+ ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %s, len %d\n",
+ wine_dbgstr_w(buffW), len);
+
+ dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA);
+ ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n");
+
+ dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC);
+ ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC);
+ ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc);
+
+ ret = SetWindowTextW(hdlg, testtextW);
+ todo_wine
+ ok(ret, "Failed to set window text.\n");
+
+ memset(buff, 'A', sizeof(buff));
+ len = GetWindowTextA(hdlg, buff, sizeof(buff));
+ todo_wine
+ ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len);
+
+ memset(buffW, 0xff, sizeof(buffW));
+ len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0]));
+ todo_wine
+ ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n",
+ buffW[0], buffW[1], len);
+
+ SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc);
+ EndDialog(hdlg, -123);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void test_DialogBoxParam(void)
+{
+ static const WCHAR nameW[] = {'T','E','S','T','_','E','M','P','T','Y','_','D','I','A','L','O','G',0};
INT_PTR ret;
HWND hwnd_invalid = (HWND)0x4444;
@@ -1290,6 +1477,13 @@ static void test_DialogBoxParamA(void)
ok(ret == IDOK, "Expected IDOK\n");
DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0);
+
+ /* WM_SETTEXT handling in case of A/W dialog procedures vs A/W dialog window. */
+ ret = DialogBoxParamW(GetModuleHandleA(NULL), nameW, 0, test_aw_conversion_dlgproc, 0);
+ ok(ret == -123, "Unexpected ret value %ld.\n", ret);
+
+ ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, test_aw_conversion_dlgproc2, 0);
+ ok(ret == -123, "Unexpected ret value %ld.\n", ret);
}
static void test_DisabledDialogTest(void)
@@ -1580,7 +1774,7 @@ START_TEST(dialog)
test_focus();
test_GetDlgItem();
test_GetDlgItemText();
- test_DialogBoxParamA();
+ test_DialogBoxParam();
test_DisabledDialogTest();
test_MessageBoxFontTest();
test_SaveRestoreFocus();
--
2.15.1
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/comctl32/tests/imagelist.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index e0251a9601..d72e22a6b3 100644
--- a/dlls/comctl32/tests/imagelist.c
+++ b/dlls/comctl32/tests/imagelist.c
@@ -836,8 +836,11 @@ static const IStreamVtbl Test_Stream_Vtbl =
static void init_memstream(struct memstream *stream)
{
+ HRESULT hr;
+
stream->IStream_iface.lpVtbl = &Test_Stream_Vtbl;
- CreateStreamOnHGlobal(NULL, TRUE, &stream->stream);
+ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream->stream);
+ ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr);
}
static void cleanup_memstream(struct memstream *stream)
@@ -995,7 +998,8 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN
hr = GetHGlobalFromStream(stream.stream, &hglobal);
ok(hr == S_OK, "%s: Failed to get hglobal, %#x\n", comment, hr);
- IStream_Stat(stream.stream, &stat, STATFLAG_NONAME);
+ hr = IStream_Stat(stream.stream, &stat, STATFLAG_NONAME);
+ ok(hr == S_OK, "Stat() failed, hr %#x.\n", hr);
data = GlobalLock(hglobal);
--
2.15.1
1
0
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/data.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
1
0
27 Dec '17
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/shell32/tests/shellpath.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 387eecb..f667431 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -1898,7 +1898,7 @@ static const struct knownFolderDef known_folders[] = {
{ 0 }
};
#undef KNOWN_FOLDER
-BOOL known_folder_found[sizeof(known_folders)/sizeof(known_folders[0])-1];
+BOOL known_folder_found[ARRAY_SIZE(known_folders)-1];
static BOOL is_in_strarray(const WCHAR *needle, const char *hay)
{
@@ -1914,7 +1914,7 @@ static BOOL is_in_strarray(const WCHAR *needle, const char *hay)
if(strcmp(hay, "(null)") == 0 && !needle)
return TRUE;
- ret = MultiByteToWideChar(CP_ACP, 0, hay, -1, wstr, sizeof(wstr)/sizeof(wstr[0]));
+ ret = MultiByteToWideChar(CP_ACP, 0, hay, -1, wstr, ARRAY_SIZE(wstr));
if(ret == 0)
{
ok(0, "Failed to convert string\n");
@@ -1967,7 +1967,7 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId
ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot get known folder definition for %s\n", known_folder->sFolderId);
if(SUCCEEDED(hr))
{
- ret = MultiByteToWideChar(CP_ACP, 0, known_folder->sName, -1, sName, sizeof(sName)/sizeof(sName[0]));
+ ret = MultiByteToWideChar(CP_ACP, 0, known_folder->sName, -1, sName, ARRAY_SIZE(sName));
ok_(__FILE__, known_folder->line)(ret != 0, "cannot convert known folder name \"%s\" to wide characters\n", known_folder->sName);
ok_(__FILE__, known_folder->line)(lstrcmpW(kfd.pszName, sName)==0, "invalid known folder name returned for %s: %s expected, but %s retrieved\n", known_folder->sFolderId, wine_dbgstr_w(sName), wine_dbgstr_w(kfd.pszName));
@@ -2063,10 +2063,10 @@ static void test_knownFolders(void)
GetWindowsDirectoryW( sWinDir, MAX_PATH );
- GetTempPathW(sizeof(sExamplePath)/sizeof(sExamplePath[0]), sExamplePath);
+ GetTempPathW(ARRAY_SIZE(sExamplePath), sExamplePath);
lstrcatW(sExamplePath, sExample);
- GetTempPathW(sizeof(sExample2Path)/sizeof(sExample2Path[0]), sExample2Path);
+ GetTempPathW(ARRAY_SIZE(sExample2Path), sExample2Path);
lstrcatW(sExample2Path, sExample2);
lstrcpyW(sSubFolderPath, sExamplePath);
@@ -2172,7 +2172,7 @@ static void test_knownFolders(void)
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr);
ok(folder == NULL, "got %p\n", folder);
- for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i)
+ for(i=0; i < ARRAY_SIZE(known_folder_found); ++i)
known_folder_found[i] = FALSE;
hr = IKnownFolderManager_GetFolderIds(mgr, &folders, &nCount);
@@ -2180,7 +2180,7 @@ static void test_knownFolders(void)
for(i=0;i<nCount;++i)
check_known_folder(mgr, &folders[i]);
- for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i)
+ for(i=0; i < ARRAY_SIZE(known_folder_found); ++i)
if(!known_folder_found[i])
trace("Known folder %s not found on current platform\n", known_folders[i].sFolderId);
@@ -2554,7 +2554,7 @@ static void test_DoEnvironmentSubst(void)
memset(bufferA, '#', MAX_PATH - 1);
bufferA[MAX_PATH - 1] = 0;
lstrcpyA(bufferA, names[i]);
- MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW));
res2 = ExpandEnvironmentStringsA(names[i], expectedA, MAX_PATH);
res = DoEnvironmentSubstA(bufferA, MAX_PATH);
@@ -2585,7 +2585,7 @@ static void test_DoEnvironmentSubst(void)
memset(bufferA, '#', MAX_PATH - 1);
bufferA[len + 2] = 0;
lstrcpyA(bufferA, names[i]);
- MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW));
res2 = ExpandEnvironmentStringsA(bufferA, expectedA, MAX_PATH);
res = DoEnvironmentSubstA(bufferA, len + 1);
@@ -2606,7 +2606,7 @@ static void test_DoEnvironmentSubst(void)
memset(bufferA, '#', MAX_PATH - 1);
bufferA[len + 2] = 0;
lstrcpyA(bufferA, names[i]);
- MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW));
/* ANSI version failed without an extra byte, as documented on msdn */
res = DoEnvironmentSubstA(bufferA, len);
@@ -2629,7 +2629,7 @@ static void test_DoEnvironmentSubst(void)
memset(bufferA, '#', MAX_PATH - 1);
bufferA[len + 2] = 0;
lstrcpyA(bufferA, names[i]);
- MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW));
res = DoEnvironmentSubstA(bufferA, len - 1);
ok(!HIWORD(res) && (LOWORD(res) == (len - 1)),
@@ -2650,7 +2650,7 @@ static void test_DoEnvironmentSubst(void)
memset(bufferA, '#', MAX_PATH - 1);
bufferA[MAX_PATH - 1] = 0;
lstrcpyA(bufferA, does_not_existA);
- MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW));
res2 = lstrlenA(does_not_existA) + 1;
res = DoEnvironmentSubstA(bufferA, MAX_PATH);
@@ -2701,7 +2701,7 @@ if (0)
ok(!ret, "got %d\n", ret);
}
- GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW);
+ GetTempPathW(ARRAY_SIZE(pathW), pathW);
/* Using short name only first */
nameW[0] = 0;
--
2.9.5
1
0
[PATCH 3/3] ddraw/tests: Recognise E_NOTIMPL returned from UpdateOverlay() on VMware as broken.
by Henri Verbeet 27 Dec '17
by Henri Verbeet 27 Dec '17
27 Dec '17
From: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/ddraw/tests/ddraw1.c | 12 +++++++++++-
dlls/ddraw/tests/ddraw2.c | 12 +++++++++++-
dlls/ddraw/tests/ddraw4.c | 12 +++++++++++-
dlls/ddraw/tests/ddraw7.c | 12 +++++++++++-
4 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index db54abd4165..2c4410af783 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -123,6 +123,15 @@ static BOOL ddraw_is_intel(IDirectDraw *ddraw)
&& identifier.dwVendorId == 0x8086;
}
+static BOOL ddraw_is_vmware(IDirectDraw *ddraw)
+{
+ DDDEVICEIDENTIFIER identifier;
+
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x15ad;
+}
+
static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw,
unsigned int width, unsigned int height, DWORD format)
{
@@ -8666,7 +8675,8 @@ static void test_offscreen_overlay(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL);
- ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()),
+ ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled())
+ || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)),
"Failed to update overlay, hr %#x.\n", hr);
/* Try to overlay the primary with a non-overlay surface. */
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index d2382d153be..89d0d7e4be3 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -125,6 +125,15 @@ static BOOL ddraw_is_intel(IDirectDraw2 *ddraw)
&& identifier.dwVendorId == 0x8086;
}
+static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw)
+{
+ DDDEVICEIDENTIFIER identifier;
+
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x15ad;
+}
+
static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw,
unsigned int width, unsigned int height, DWORD format)
{
@@ -9800,7 +9809,8 @@ static void test_offscreen_overlay(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL);
- ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()),
+ ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled())
+ || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)),
"Failed to update overlay, hr %#x.\n", hr);
/* Try to overlay the primary with a non-overlay surface. */
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index caa3ced1728..fa1178d0361 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -131,6 +131,15 @@ static BOOL ddraw_is_intel(IDirectDraw4 *ddraw)
&& identifier.dwVendorId == 0x8086;
}
+static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw)
+{
+ DDDEVICEIDENTIFIER identifier;
+
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x15ad;
+}
+
static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw,
unsigned int width, unsigned int height, DWORD format)
{
@@ -11262,7 +11271,8 @@ static void test_offscreen_overlay(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL);
- ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()),
+ ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled())
+ || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)),
"Failed to update overlay, hr %#x.\n", hr);
/* Try to overlay the primary with a non-overlay surface. */
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index f1568bb9d07..fdfac696cfc 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -145,6 +145,15 @@ static BOOL ddraw_is_intel(IDirectDraw7 *ddraw)
&& identifier.dwVendorId == 0x8086;
}
+static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw)
+{
+ DDDEVICEIDENTIFIER2 identifier;
+
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x15ad;
+}
+
static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw,
unsigned int width, unsigned int height, DWORD format)
{
@@ -11220,7 +11229,8 @@ static void test_offscreen_overlay(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL);
- ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()),
+ ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled())
+ || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)),
"Failed to update overlay, hr %#x.\n", hr);
/* Try to overlay the primary with a non-overlay surface. */
--
2.11.0
1
0
[PATCH 2/3] ddraw/tests: Print driver and device information before running the tests.
by Henri Verbeet 27 Dec '17
by Henri Verbeet 27 Dec '17
27 Dec '17
Analogous to the d3d8 and d3d9 tests.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/ddraw/tests/ddraw1.c | 59 ++++++++++++++++++++++-------------------------
dlls/ddraw/tests/ddraw2.c | 59 ++++++++++++++++++++++-------------------------
dlls/ddraw/tests/ddraw4.c | 51 ++++++++++++++++++++++------------------
dlls/ddraw/tests/ddraw7.c | 55 +++++++++++++++++++++++--------------------
4 files changed, 114 insertions(+), 110 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 109910b8205..db54abd4165 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -82,58 +82,45 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa
&& compare_float(vec->w, w, ulps);
}
-static BOOL ddraw_is_warp(IDirectDraw *ddraw)
+static BOOL ddraw_get_identifier(IDirectDraw *ddraw, DDDEVICEIDENTIFIER *identifier)
{
IDirectDraw4 *ddraw4;
- DDDEVICEIDENTIFIER identifier;
HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4);
ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr);
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0);
+ hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, identifier, 0);
ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
IDirectDraw4_Release(ddraw4);
- return !!strstr(identifier.szDriver, "warp");
+ return SUCCEEDED(hr);
}
-static BOOL ddraw_is_nvidia(IDirectDraw *ddraw)
+static BOOL ddraw_is_warp(IDirectDraw *ddraw)
{
- IDirectDraw4 *ddraw4;
DDDEVICEIDENTIFIER identifier;
- HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && strstr(identifier.szDriver, "warp");
+}
- hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4);
- ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr);
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- IDirectDraw4_Release(ddraw4);
+static BOOL ddraw_is_nvidia(IDirectDraw *ddraw)
+{
+ DDDEVICEIDENTIFIER identifier;
- return identifier.dwVendorId == 0x10de;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x10de;
}
static BOOL ddraw_is_intel(IDirectDraw *ddraw)
{
- IDirectDraw4 *ddraw4;
DDDEVICEIDENTIFIER identifier;
- HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
- hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4);
- ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr);
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- IDirectDraw4_Release(ddraw4);
-
- return identifier.dwVendorId == 0x8086;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x8086;
}
static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw,
@@ -10784,8 +10771,9 @@ done:
START_TEST(ddraw1)
{
- IDirectDraw *ddraw;
+ DDDEVICEIDENTIFIER identifier;
DEVMODEW current_mode;
+ IDirectDraw *ddraw;
HMODULE dwmapi;
if (!(ddraw = create_ddraw()))
@@ -10793,6 +10781,15 @@ START_TEST(ddraw1)
skip("Failed to create a ddraw object, skipping tests.\n");
return;
}
+
+ if (ddraw_get_identifier(ddraw, &identifier))
+ {
+ trace("Driver string: \"%s\"\n", identifier.szDriver);
+ trace("Description string: \"%s\"\n", identifier.szDescription);
+ trace("Driver version %d.%d.%d.%d\n",
+ HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart),
+ HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart));
+ }
IDirectDraw_Release(ddraw);
memset(¤t_mode, 0, sizeof(current_mode));
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 1db7ad9329f..d2382d153be 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -84,58 +84,45 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa
&& compare_float(vec->w, w, ulps);
}
-static BOOL ddraw_is_warp(IDirectDraw2 *ddraw)
+static BOOL ddraw_get_identifier(IDirectDraw2 *ddraw, DDDEVICEIDENTIFIER *identifier)
{
IDirectDraw4 *ddraw4;
- DDDEVICEIDENTIFIER identifier;
HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4);
ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr);
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0);
+ hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, identifier, 0);
ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
IDirectDraw4_Release(ddraw4);
- return !!strstr(identifier.szDriver, "warp");
+ return SUCCEEDED(hr);
}
-static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw)
+static BOOL ddraw_is_warp(IDirectDraw2 *ddraw)
{
- IDirectDraw4 *ddraw4;
DDDEVICEIDENTIFIER identifier;
- HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && strstr(identifier.szDriver, "warp");
+}
- hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4);
- ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr);
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- IDirectDraw4_Release(ddraw4);
+static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw)
+{
+ DDDEVICEIDENTIFIER identifier;
- return identifier.dwVendorId == 0x10de;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x10de;
}
static BOOL ddraw_is_intel(IDirectDraw2 *ddraw)
{
- IDirectDraw4 *ddraw4;
DDDEVICEIDENTIFIER identifier;
- HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
- hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4);
- ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr);
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- IDirectDraw4_Release(ddraw4);
-
- return identifier.dwVendorId == 0x8086;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x8086;
}
static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw,
@@ -12160,8 +12147,9 @@ done:
START_TEST(ddraw2)
{
- IDirectDraw2 *ddraw;
+ DDDEVICEIDENTIFIER identifier;
DEVMODEW current_mode;
+ IDirectDraw2 *ddraw;
HMODULE dwmapi;
if (!(ddraw = create_ddraw()))
@@ -12169,6 +12157,15 @@ START_TEST(ddraw2)
skip("Failed to create a ddraw object, skipping tests.\n");
return;
}
+
+ if (ddraw_get_identifier(ddraw, &identifier))
+ {
+ trace("Driver string: \"%s\"\n", identifier.szDriver);
+ trace("Description string: \"%s\"\n", identifier.szDescription);
+ trace("Driver version %d.%d.%d.%d\n",
+ HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart),
+ HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart));
+ }
IDirectDraw2_Release(ddraw);
memset(¤t_mode, 0, sizeof(current_mode));
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 98c86d0bf01..caa3ced1728 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -94,46 +94,41 @@ static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff)
return TRUE;
}
-static BOOL ddraw_is_warp(IDirectDraw4 *ddraw)
+static BOOL ddraw_get_identifier(IDirectDraw4 *ddraw, DDDEVICEIDENTIFIER *identifier)
{
- DDDEVICEIDENTIFIER identifier;
HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0);
+ hr = IDirectDraw4_GetDeviceIdentifier(ddraw, identifier, 0);
ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- return !!strstr(identifier.szDriver, "warp");
+ return SUCCEEDED(hr);
}
-static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw)
+static BOOL ddraw_is_warp(IDirectDraw4 *ddraw)
{
DDDEVICEIDENTIFIER identifier;
- HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && strstr(identifier.szDriver, "warp");
+}
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
+static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw)
+{
+ DDDEVICEIDENTIFIER identifier;
- return identifier.dwVendorId == 0x10de;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x10de;
}
static BOOL ddraw_is_intel(IDirectDraw4 *ddraw)
{
DDDEVICEIDENTIFIER identifier;
- HRESULT hr;
-
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
- hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- return identifier.dwVendorId == 0x8086;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x8086;
}
static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw,
@@ -14008,8 +14003,9 @@ static void test_compute_sphere_visibility(void)
START_TEST(ddraw4)
{
- IDirectDraw4 *ddraw;
+ DDDEVICEIDENTIFIER identifier;
DEVMODEW current_mode;
+ IDirectDraw4 *ddraw;
HMODULE dwmapi;
if (!(ddraw = create_ddraw()))
@@ -14017,6 +14013,15 @@ START_TEST(ddraw4)
skip("Failed to create a ddraw object, skipping tests.\n");
return;
}
+
+ if (ddraw_get_identifier(ddraw, &identifier))
+ {
+ trace("Driver string: \"%s\"\n", identifier.szDriver);
+ trace("Description string: \"%s\"\n", identifier.szDescription);
+ trace("Driver version %d.%d.%d.%d\n",
+ HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart),
+ HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart));
+ }
IDirectDraw4_Release(ddraw);
memset(¤t_mode, 0, sizeof(current_mode));
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 7c6264bd557..f1568bb9d07 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -108,46 +108,41 @@ static ULONG get_refcount(IUnknown *iface)
return IUnknown_Release(iface);
}
-static BOOL ddraw_is_warp(IDirectDraw7 *ddraw)
+static BOOL ddraw_get_identifier(IDirectDraw7 *ddraw, DDDEVICEIDENTIFIER2 *identifier)
{
- DDDEVICEIDENTIFIER2 identifier;
HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
- hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0);
+ hr = IDirectDraw7_GetDeviceIdentifier(ddraw, identifier, 0);
ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- return !!strstr(identifier.szDriver, "warp");
+ return SUCCEEDED(hr);
}
-static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw)
+static BOOL ddraw_is_warp(IDirectDraw7 *ddraw)
{
DDDEVICEIDENTIFIER2 identifier;
- HRESULT hr;
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && strstr(identifier.szDriver, "warp");
+}
- hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
+static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw)
+{
+ DDDEVICEIDENTIFIER2 identifier;
- return identifier.dwVendorId == 0x10de;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x10de;
}
static BOOL ddraw_is_intel(IDirectDraw7 *ddraw)
{
DDDEVICEIDENTIFIER2 identifier;
- HRESULT hr;
-
- if (!strcmp(winetest_platform, "wine"))
- return FALSE;
-
- hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0);
- ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr);
- return identifier.dwVendorId == 0x8086;
+ return strcmp(winetest_platform, "wine")
+ && ddraw_get_identifier(ddraw, &identifier)
+ && identifier.dwVendorId == 0x8086;
}
static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw,
@@ -13384,11 +13379,12 @@ static void test_clip_planes_limits(void)
START_TEST(ddraw7)
{
- HMODULE module = GetModuleHandleA("ddraw.dll");
- HMODULE dwmapi;
- IDirectDraw7 *ddraw;
+ DDDEVICEIDENTIFIER2 identifier;
+ HMODULE module, dwmapi;
DEVMODEW current_mode;
+ IDirectDraw7 *ddraw;
+ module = GetModuleHandleA("ddraw.dll");
if (!(pDirectDrawCreateEx = (void *)GetProcAddress(module, "DirectDrawCreateEx")))
{
win_skip("DirectDrawCreateEx not available, skipping tests.\n");
@@ -13400,6 +13396,15 @@ START_TEST(ddraw7)
skip("Failed to create a ddraw object, skipping tests.\n");
return;
}
+
+ if (ddraw_get_identifier(ddraw, &identifier))
+ {
+ trace("Driver string: \"%s\"\n", identifier.szDriver);
+ trace("Description string: \"%s\"\n", identifier.szDescription);
+ trace("Driver version %d.%d.%d.%d\n",
+ HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart),
+ HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart));
+ }
IDirectDraw7_Release(ddraw);
memset(¤t_mode, 0, sizeof(current_mode));
--
2.11.0
1
0
[PATCH 1/3] ddraw/tests: Introduce an ARRAY_SIZE macro to ddraw7 as well.
by Henri Verbeet 27 Dec '17
by Henri Verbeet 27 Dec '17
27 Dec '17
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/ddraw/tests/ddraw7.c | 167 +++++++++++++++++++++++-----------------------
1 file changed, 82 insertions(+), 85 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 91822281d06..7c6264bd557 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -32,6 +32,10 @@ static DEVMODEW registry_mode;
static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
+#endif
+
struct vec2
{
float x, y;
@@ -1519,7 +1523,7 @@ static void test_ck_rgba(void)
hr = IDirect3DDevice7_GetRenderTarget(device, &rt);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_COLORKEYENABLE, tests[i].color_key);
ok(SUCCEEDED(hr), "Failed to enable color keying, hr %#x.\n", hr);
@@ -1998,7 +2002,7 @@ static void test_surface_qi(void)
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
- test_qi("surface_qi", (IUnknown *)surface, &IID_IDirectDrawSurface7, tests, sizeof(tests) / sizeof(*tests));
+ test_qi("surface_qi", (IUnknown *)surface, &IID_IDirectDrawSurface7, tests, ARRAY_SIZE(tests));
IDirectDrawSurface7_Release(surface);
IDirectDraw7_Release(ddraw);
@@ -2064,7 +2068,7 @@ static void test_device_qi(void)
return;
}
- test_qi("device_qi", (IUnknown *)device, &IID_IDirect3DDevice7, tests, sizeof(tests) / sizeof(*tests));
+ test_qi("device_qi", (IUnknown *)device, &IID_IDirect3DDevice7, tests, ARRAY_SIZE(tests));
IDirect3DDevice7_Release(device);
DestroyWindow(window);
@@ -3732,7 +3736,7 @@ static void test_lighting(void)
hr = IDirect3DDevice7_LightEnable(device, 0, TRUE);
ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, tests[i].world_matrix);
ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
@@ -3944,22 +3948,14 @@ static void test_specular_lighting(void)
}
tests[] =
{
- {&directional, FALSE, 30.0f, expected_directional,
- sizeof(expected_directional) / sizeof(expected_directional[0])},
- {&directional, TRUE, 30.0f, expected_directional_local,
- sizeof(expected_directional_local) / sizeof(expected_directional_local[0])},
- {&point, FALSE, 30.0f, expected_point,
- sizeof(expected_point) / sizeof(expected_point[0])},
- {&point, TRUE, 30.0f, expected_point_local,
- sizeof(expected_point_local) / sizeof(expected_point_local[0])},
- {&spot, FALSE, 30.0f, expected_spot,
- sizeof(expected_spot) / sizeof(expected_spot[0])},
- {&spot, TRUE, 30.0f, expected_spot_local,
- sizeof(expected_spot_local) / sizeof(expected_spot_local[0])},
- {&point_range, FALSE, 30.0f, expected_point_range,
- sizeof(expected_point_range) / sizeof(expected_point_range[0])},
- {&point_side, TRUE, 0.0f, expected_point_side,
- sizeof(expected_point_side) / sizeof(expected_point_side[0])},
+ {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)},
+ {&directional, TRUE, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)},
+ {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)},
+ {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)},
+ {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)},
+ {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)},
+ {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)},
+ {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)},
};
IDirect3DDevice7 *device;
IDirectDrawSurface7 *rt;
@@ -4032,7 +4028,7 @@ static void test_specular_lighting(void)
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SPECULARENABLE, TRUE);
ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IDirect3DDevice7_SetLight(device, 0, tests[i].light);
ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr);
@@ -4320,7 +4316,7 @@ static void test_fog_special(void)
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGEND, conv.d);
ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 1.0f, 0);
ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr);
@@ -4512,7 +4508,7 @@ static void test_lighting_interface_versions(void)
ok(SUCCEEDED(hr), "Failed to get specularenable render state, hr %#x.\n", hr);
ok(rs == FALSE, "Initial D3DRENDERSTATE_SPECULARENABLE is %#x, expected FALSE.\n", rs);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff202020, 0.0f, 0);
ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);
@@ -4748,7 +4744,7 @@ static void test_texturemanage(void)
return;
}
- for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
@@ -4954,7 +4950,7 @@ static void test_block_formats_creation(void)
ok(SUCCEEDED(hr), "Failed to get fourcc codes %#x.\n", hr);
for (i = 0; i < num_fourcc_codes; i++)
{
- for (j = 0; j < sizeof(formats) / sizeof(*formats); j++)
+ for (j = 0; j < ARRAY_SIZE(formats); ++j)
{
if (fourcc_codes[i] == formats[j].fourcc)
supported_overlay_fmts |= formats[j].support_flag;
@@ -4969,9 +4965,9 @@ static void test_block_formats_creation(void)
mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 2 * 2 * 16 + 1);
- for (i = 0; i < sizeof(formats) / sizeof(*formats); i++)
+ for (i = 0; i < ARRAY_SIZE(formats); ++i)
{
- for (j = 0; j < sizeof(types) / sizeof(*types); j++)
+ for (j = 0; j < ARRAY_SIZE(types); ++j)
{
BOOL support;
@@ -5035,7 +5031,7 @@ static void test_block_formats_creation(void)
if (formats[i].overlay)
continue;
- for (j = 0; j < sizeof(user_mem_tests) / sizeof(*user_mem_tests); ++j)
+ for (j = 0; j < ARRAY_SIZE(user_mem_tests); ++j)
{
memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
@@ -5164,13 +5160,13 @@ static void test_unsupported_formats(void)
ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr);
IDirect3D7_Release(d3d);
- for (i = 0; i < sizeof(formats) / sizeof(*formats); i++)
+ for (i = 0; i < ARRAY_SIZE(formats); ++i)
{
struct format_support_check check = {&formats[i].fmt, FALSE};
hr = IDirect3DDevice7_EnumTextureFormats(device, test_unsupported_formats_cb, &check);
ok(SUCCEEDED(hr), "Failed to enumerate texture formats %#x.\n", hr);
- for (j = 0; j < sizeof(caps) / sizeof(*caps); j++)
+ for (j = 0; j < ARRAY_SIZE(caps); ++j)
{
memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
@@ -5441,7 +5437,7 @@ static void test_rt_caps(void)
hr = IDirectDraw7_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, palette_entries, &palette, NULL);
ok(SUCCEEDED(hr), "Failed to create palette, hr %#x.\n", hr);
- for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
IDirectDrawSurface7 *surface, *rt, *expected_rt, *tmp;
DDSURFACEDESC2 surface_desc;
@@ -5663,7 +5659,7 @@ static void test_primary_caps(void)
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
- for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, test_data[i].coop_level);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
@@ -5860,7 +5856,7 @@ static void test_surface_lock(void)
IDirectDrawSurface7_Release(surface);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
if (!cubemap_supported && tests[i].caps2 & DDSCAPS2_CUBEMAP)
continue;
@@ -5962,7 +5958,7 @@ static void test_surface_discard(void)
hr = IDirect3DDevice7_GetRenderTarget(device, &target);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
BOOL discarded;
@@ -6076,7 +6072,7 @@ static void test_flip(void)
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
- for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
/* Creating a flippable texture induces a BSoD on some versions of the
* Intel graphics driver. At least Intel GMA 950 with driver version
@@ -6580,8 +6576,9 @@ static void test_set_surface_desc(void)
/* SetSurfaceDesc needs systemmemory surfaces.
*
- * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing DDSD_LINEARSIZE is moot. */
- for (i = 0; i < sizeof(invalid_caps_tests) / sizeof(*invalid_caps_tests); i++)
+ * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing
+ * DDSD_LINEARSIZE is moot. */
+ for (i = 0; i < ARRAY_SIZE(invalid_caps_tests); ++i)
{
reset_ddsd(&ddsd);
ddsd.dwFlags = DDSD_CAPS;
@@ -7612,7 +7609,7 @@ static void test_create_surface_pitch(void)
mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63);
- for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -7725,7 +7722,7 @@ static void test_mipmap(void)
return;
}
- for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -8004,7 +8001,7 @@ static void test_p8_blit(void)
if (SUCCEEDED(hr))
{
- for (x = 0; x < sizeof(expected) / sizeof(*expected); x++)
+ for (x = 0; x < ARRAY_SIZE(expected); ++x)
{
color = get_surface_color(dst, x, 0);
todo_wine ok(compare_color(color, expected[x], 0),
@@ -8174,16 +8171,16 @@ static void test_palette_gdi(void)
"Got unexpected palette %p, expected %p.\n",
ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE));
- i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad);
- ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i);
- for (i = 0; i < sizeof(expected1) / sizeof(*expected1); i++)
+ i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad);
+ ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i);
+ for (i = 0; i < ARRAY_SIZE(expected1); ++i)
{
ok(!memcmp(&rgbquad[i], &expected1[i], sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n",
i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue,
expected1[i].rgbRed, expected1[i].rgbGreen, expected1[i].rgbBlue);
}
- for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++)
+ for (; i < ARRAY_SIZE(rgbquad); ++i)
{
ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n",
@@ -8223,16 +8220,16 @@ static void test_palette_gdi(void)
/* Refresh the DC. This updates the palette. */
hr = IDirectDrawSurface7_GetDC(surface, &dc);
ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr);
- i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad);
- ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i);
- for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++)
+ i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad);
+ ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i);
+ for (i = 0; i < ARRAY_SIZE(expected2); ++i)
{
ok(!memcmp(&rgbquad[i], &expected2[i], sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n",
i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue,
expected2[i].rgbRed, expected2[i].rgbGreen, expected2[i].rgbBlue);
}
- for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++)
+ for (; i < ARRAY_SIZE(rgbquad); ++i)
{
ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n",
@@ -8296,16 +8293,16 @@ static void test_palette_gdi(void)
* the system palette are not included pending an application that depends on this.
* The relation between those causes problems on Windows Vista and newer for games
* like Age of Empires or StarcCaft. Don't emulate it without a real need. */
- i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad);
- ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i);
- for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++)
+ i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad);
+ ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i);
+ for (i = 0; i < ARRAY_SIZE(expected2); ++i)
{
ok(!memcmp(&rgbquad[i], &expected2[i], sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n",
i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue,
expected2[i].rgbRed, expected2[i].rgbGreen, expected2[i].rgbBlue);
}
- for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++)
+ for (; i < ARRAY_SIZE(rgbquad); ++i)
{
ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n",
@@ -8327,16 +8324,16 @@ static void test_palette_gdi(void)
* but in all likelihood it is actually the system palette. */
hr = IDirectDrawSurface7_GetDC(surface, &dc);
ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr);
- i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad);
- ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i);
- for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++)
+ i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad);
+ ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i);
+ for (i = 0; i < ARRAY_SIZE(expected2); ++i)
{
ok(!memcmp(&rgbquad[i], &expected2[i], sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n",
i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue,
expected2[i].rgbRed, expected2[i].rgbGreen, expected2[i].rgbBlue);
}
- for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++)
+ for (; i < ARRAY_SIZE(rgbquad); ++i)
{
ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n",
@@ -8367,16 +8364,16 @@ static void test_palette_gdi(void)
* palette. */
hr = IDirectDrawSurface7_GetDC(surface, &dc);
ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr);
- i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad);
- ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i);
- for (i = 0; i < sizeof(expected3) / sizeof(*expected3); i++)
+ i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad);
+ ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i);
+ for (i = 0; i < ARRAY_SIZE(expected3); ++i)
{
ok(!memcmp(&rgbquad[i], &expected3[i], sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n",
i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue,
expected3[i].rgbRed, expected3[i].rgbGreen, expected3[i].rgbBlue);
}
- for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++)
+ for (; i < ARRAY_SIZE(rgbquad); ++i)
{
ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])),
"Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n",
@@ -8483,7 +8480,7 @@ static void test_palette_alpha(void)
ok(palette_entries[3].peFlags == 0x00, "Got unexpected peFlags 0x%02x, expected 0x00.\n",
palette_entries[3].peFlags);
- for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -8587,7 +8584,7 @@ static void test_vb_writeonly(void)
desc.dwSize = sizeof(desc);
desc.dwCaps = D3DVBCAPS_WRITEONLY;
desc.dwFVF = D3DFVF_XYZRHW;
- desc.dwNumVertices = sizeof(quad) / sizeof(*quad);
+ desc.dwNumVertices = ARRAY_SIZE(quad);
hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &buffer, 0);
ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);
@@ -8856,7 +8853,7 @@ static void test_resource_priority(void)
goto done;
}
- for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -9089,9 +9086,9 @@ static void test_fog_interpolation(void)
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_TEXTUREFACTOR, 0x000000ff);
ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
- if(!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog)
+ if (!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog)
continue;
hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00808080, 0.0f, 0);
@@ -9238,7 +9235,7 @@ static void test_negative_fixedfunction_fog(void)
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE);
ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
if (!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog)
continue;
@@ -9356,7 +9353,7 @@ static void test_table_fog_zw(void)
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_LINEAR);
ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr);
- for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0);
ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
@@ -9519,7 +9516,7 @@ static void test_signed_formats(void)
hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLORARG2, D3DTA_TFACTOR);
ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr);
- for (i = 0; i < sizeof(formats) / sizeof(*formats); i++)
+ for (i = 0; i < ARRAY_SIZE(formats); ++i)
{
for (width = 1; width < 5; width += 3)
{
@@ -9822,7 +9819,7 @@ static void test_color_fill(void)
if (!(supported_fmts & (SUPPORT_YUY2 | SUPPORT_UYVY)) || !(hal_caps.dwCaps & DDCAPS_OVERLAY))
skip("Overlays or some YUV formats not supported, skipping YUV colorfill tests.\n");
- for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
DWORD expected_broken = tests[i].result;
@@ -10049,7 +10046,7 @@ static void test_color_fill(void)
hr = IDirectDrawSurface7_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_ROP | DDBLT_WAIT, &fx);
ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr);
- for (i = 0; i < sizeof(rops) / sizeof(*rops); i++)
+ for (i = 0; i < ARRAY_SIZE(rops); ++i)
{
fx.dwROP = rops[i].rop;
hr = IDirectDrawSurface7_Blt(surface, NULL, surface2, NULL, DDBLT_ROP | DDBLT_WAIT, &fx);
@@ -10450,7 +10447,7 @@ static void test_colorkey_precision(void)
memset(&lock_desc, 0, sizeof(lock_desc));
lock_desc.dwSize = sizeof(lock_desc);
- for (t = 0; t < sizeof(tests) / sizeof(*tests); ++t)
+ for (t = 0; t < ARRAY_SIZE(tests); ++t)
{
if (is_nvidia && tests[t].skip_nv)
{
@@ -10824,7 +10821,7 @@ static void test_shademode(void)
desc.dwSize = sizeof(desc);
desc.dwCaps = D3DVBCAPS_WRITEONLY;
desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE;
- desc.dwNumVertices = sizeof(quad_strip) / sizeof(*quad_strip);
+ desc.dwNumVertices = ARRAY_SIZE(quad_strip);
hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_strip, 0);
ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(vb_strip, 0, &data, NULL);
@@ -10833,7 +10830,7 @@ static void test_shademode(void)
hr = IDirect3DVertexBuffer7_Unlock(vb_strip);
ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr);
- desc.dwNumVertices = sizeof(quad_list) / sizeof(*quad_list);
+ desc.dwNumVertices = ARRAY_SIZE(quad_list);
hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_list, 0);
ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr);
hr = IDirect3DVertexBuffer7_Lock(vb_list, 0, &data, NULL);
@@ -10845,7 +10842,7 @@ static void test_shademode(void)
/* Try it first with a TRIANGLESTRIP. Do it with different geometry because
* the color fixups we have to do for FLAT shading will be dependent on that. */
- for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
@@ -10949,7 +10946,7 @@ static void test_lockrect_invalid(void)
goto done;
}
- for (r = 0; r < sizeof(resources) / sizeof(*resources); ++r)
+ for (r = 0; r < ARRAY_SIZE(resources); ++r)
{
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -10980,7 +10977,7 @@ static void test_lockrect_invalid(void)
ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name);
*/
- for (i = 0; i < sizeof(valid) / sizeof(*valid); ++i)
+ for (i = 0; i < ARRAY_SIZE(valid); ++i)
{
RECT *rect = &valid[i];
@@ -10995,7 +10992,7 @@ static void test_lockrect_invalid(void)
ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name);
}
- for (i = 0; i < sizeof(invalid) / sizeof(*invalid); ++i)
+ for (i = 0; i < ARRAY_SIZE(invalid); ++i)
{
RECT *rect = &invalid[i];
@@ -11408,7 +11405,7 @@ static void test_blt(void)
hr = IDirectDrawSurface7_Blt(surface, NULL, rt, NULL, 0, NULL);
ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr);
- for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
hr = IDirectDrawSurface7_Blt(surface, &test_data[i].dst_rect,
surface, &test_data[i].src_rect, DDBLT_WAIT, NULL);
@@ -11509,7 +11506,7 @@ static void test_blt_z_alpha(void)
fx.dwAlphaSrcConstBitDepth = 8;
U4(fx).dwAlphaSrcConst = 0x22;
- for (i = 0; i < sizeof(blt_flags) / sizeof(*blt_flags); ++i)
+ for (i = 0; i < ARRAY_SIZE(blt_flags); ++i)
{
fx.dwFillColor = 0x3300ff00;
hr = IDirectDrawSurface7_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx);
@@ -11692,7 +11689,7 @@ static void test_getdc(void)
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
- for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i)
+ for (i = 0; i < ARRAY_SIZE(test_data); ++i)
{
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -12411,7 +12408,7 @@ static void test_surface_desc_size(void)
hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
- for (i = 0; i < sizeof(surface_caps) / sizeof(*surface_caps); ++i)
+ for (i = 0; i < ARRAY_SIZE(surface_caps); ++i)
{
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -12430,7 +12427,7 @@ static void test_surface_desc_size(void)
ok(hr == DD_OK, "Failed to query IDirectDrawSurface3, hr %#x, type %s.\n", hr, surface_caps[i].name);
/* GetSurfaceDesc() */
- for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j)
+ for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j)
{
memset(&desc, 0, sizeof(desc));
desc.dwSize = desc_sizes[j];
@@ -12455,7 +12452,7 @@ static void test_surface_desc_size(void)
}
/* Lock() */
- for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j)
+ for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j)
{
const BOOL ignore_size = surface_caps[i].caps & DDSCAPS_TEXTURE
&& !(surface_caps[i].caps & DDSCAPS_VIDEOMEMORY);
@@ -12547,7 +12544,7 @@ static void test_surface_desc_size(void)
}
/* GetDisplayMode() */
- for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j)
+ for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j)
{
memset(&desc, 0xcc, sizeof(desc));
desc.dwSize = desc_sizes[j];
@@ -13292,7 +13289,7 @@ static void test_compute_sphere_visibility(void)
IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &identity);
- for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, tests[i].view);
IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, tests[i].proj);
--
2.11.0
1
0
Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com>
---
This is merely a port of the existing test back to ddraw. The next patch
will address the WARP test failure.
---
dlls/ddraw/tests/ddraw1.c | 187 +++++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw2.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw4.c | 176 +++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw7.c | 134 +++++++++++++++++++++++++++++++
dlls/ddraw/tests/visual.c | 47 -----------
5 files changed, 694 insertions(+), 47 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 109910b820..671beeaa8e 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -10782,6 +10782,192 @@ done:
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ IDirectDraw *ddraw;
+ IDirect3DDevice *device;
+ IDirectDrawSurface *rt;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+ D3DRECT rect[2];
+ D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}};
+ D3DCOLOR color;
+ IDirect3DViewport *viewport, *viewport2, *viewport3;
+ IDirect3DMaterial *white, *red, *green, *blue;
+
+ window = create_window();
+ ddraw = create_ddraw();
+ ok(!!ddraw, "Failed to create a ddraw object.\n");
+ if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create a 3D device, skipping test.\n");
+ IDirectDraw_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
+ hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ viewport = create_viewport(device, 0, 0, 640, 480);
+
+ white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f);
+ red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f);
+ green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f);
+ blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f);
+
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative
+ * rectangles, but it will not clear them either. */
+ viewport_set_background(device, viewport, red);
+ hr = IDirect3DViewport_Clear(viewport, 2, rect, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here.*/
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ viewport_set_background(device, viewport, green);
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color);
+
+ /* Test how the viewport affects clears */
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ viewport2 = create_viewport(device, 160, 120, 160, 120);
+ viewport_set_background(device, viewport2, blue);
+ hr = IDirect3DViewport_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ viewport3 = create_viewport(device, 320, 240, 320, 240);
+ viewport_set_background(device, viewport3, green);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color);
+
+ /* The clear rectangle is rendertarget absolute, not relative to the viewport. */
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+ U1(rect[0]).x1 = 330;
+ U2(rect[0]).y1 = 250;
+ U3(rect[0]).x2 = 340;
+ U4(rect[0]).y2 = 260;
+ hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 328, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color);
+ color = get_surface_color(rt, 328, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color);
+
+ color = get_surface_color(rt, 338, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color);
+ color = get_surface_color(rt, 338, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color);
+
+ color = get_surface_color(rt, 328, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color);
+ color = get_surface_color(rt, 332, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color);
+ color = get_surface_color(rt, 328, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color);
+
+ color = get_surface_color(rt, 338, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color);
+ color = get_surface_color(rt, 342, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color);
+ color = get_surface_color(rt, 338, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d1. */
+
+ IDirect3DViewport_Release(viewport3);
+ IDirect3DViewport_Release(viewport2);
+ IDirect3DViewport_Release(viewport);
+ IDirect3DMaterial_Release(white);
+ IDirect3DMaterial_Release(red);
+ IDirect3DMaterial_Release(green);
+ IDirect3DMaterial_Release(blue);
+ IDirectDrawSurface_Release(rt);
+ refcount = IDirect3DDevice_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ refcount = IDirectDraw_Release(ddraw);
+ ok(!refcount, "Ddraw object has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -10870,4 +11056,5 @@ START_TEST(ddraw1)
test_surface_desc_size();
test_texture_load();
test_ck_operation();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 1db7ad9329..6a13764859 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12158,6 +12158,202 @@ done:
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ IDirectDraw2 *ddraw;
+ IDirect3DDevice2 *device;
+ IDirectDrawSurface *rt;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+ D3DRECT rect[2];
+ D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}};
+ D3DCOLOR color;
+ IDirect3DViewport2 *viewport, *viewport2, *viewport3;
+ IDirect3DMaterial2 *white, *red, *green, *blue;
+
+ window = create_window();
+ ddraw = create_ddraw();
+ ok(!!ddraw, "Failed to create a ddraw object.\n");
+ if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create a 3D device, skipping test.\n");
+ IDirectDraw2_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
+ hr = IDirect3DDevice2_GetRenderTarget(device, &rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ viewport = create_viewport(device, 0, 0, 640, 480);
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f);
+ red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f);
+ green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f);
+ blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f);
+
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative
+ * rectangles, but it will not clear them either. */
+ viewport_set_background(device, viewport, red);
+ hr = IDirect3DViewport2_Clear(viewport, 2, rect, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here.*/
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ viewport_set_background(device, viewport, green);
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color);
+
+ /* Test how the viewport affects clears */
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ viewport2 = create_viewport(device, 160, 120, 160, 120);
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ viewport_set_background(device, viewport2, blue);
+ hr = IDirect3DViewport2_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ viewport3 = create_viewport(device, 320, 240, 320, 240);
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport3);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ viewport_set_background(device, viewport3, green);
+ hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color);
+
+ /* The clear rectangle is rendertarget absolute, not relative to the viewport. */
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+ U1(rect[0]).x1 = 330;
+ U2(rect[0]).y1 = 250;
+ U3(rect[0]).x2 = 340;
+ U4(rect[0]).y2 = 260;
+ hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 328, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color);
+ color = get_surface_color(rt, 328, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color);
+
+ color = get_surface_color(rt, 338, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color);
+ color = get_surface_color(rt, 338, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color);
+
+ color = get_surface_color(rt, 328, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color);
+ color = get_surface_color(rt, 332, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color);
+ color = get_surface_color(rt, 328, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color);
+
+ color = get_surface_color(rt, 338, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color);
+ color = get_surface_color(rt, 342, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color);
+ color = get_surface_color(rt, 338, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d2. */
+
+ IDirect3DViewport2_Release(viewport3);
+ IDirect3DViewport2_Release(viewport2);
+ IDirect3DViewport2_Release(viewport);
+ IDirect3DMaterial2_Release(white);
+ IDirect3DMaterial2_Release(red);
+ IDirect3DMaterial2_Release(green);
+ IDirect3DMaterial2_Release(blue);
+ IDirectDrawSurface_Release(rt);
+ refcount = IDirect3DDevice2_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ refcount = IDirectDraw2_Release(ddraw);
+ ok(!refcount, "Ddraw object has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -12254,4 +12450,5 @@ START_TEST(ddraw2)
test_display_mode_surface_pixel_format();
test_surface_desc_size();
test_ck_operation();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 98c86d0bf0..b79e6c67a2 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -14006,6 +14006,181 @@ static void test_compute_sphere_visibility(void)
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ IDirect3DDevice3 *device;
+ IDirectDrawSurface4 *rt;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+ D3DRECT rect[2];
+ D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}};
+ D3DCOLOR color;
+ IDirect3DViewport3 *viewport, *viewport2, *viewport3;
+
+ window = create_window();
+ if (!(device = create_device(window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create 3D device.\n");
+ DestroyWindow(window);
+ return;
+ }
+
+ hr = IDirect3DDevice3_GetRenderTarget(device, &rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ viewport = create_viewport(device, 0, 0, 640, 480);
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative
+ * rectangles, but it will not clear them either. */
+ hr = IDirect3DViewport3_Clear2(viewport, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here.*/
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color);
+
+ /* Test how the viewport affects clears */
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ viewport2 = create_viewport(device, 160, 120, 160, 120);
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport2);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ hr = IDirect3DViewport3_Clear2(viewport2, 1, &rect_full, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ viewport3 = create_viewport(device, 320, 240, 320, 240);
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color);
+
+ /* The clear rectangle is rendertarget absolute, not relative to the viewport. */
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+ U1(rect[0]).x1 = 330;
+ U2(rect[0]).y1 = 250;
+ U3(rect[0]).x2 = 340;
+ U4(rect[0]).y2 = 260;
+ hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 328, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color);
+ color = get_surface_color(rt, 328, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color);
+
+ color = get_surface_color(rt, 338, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color);
+ color = get_surface_color(rt, 338, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color);
+
+ color = get_surface_color(rt, 328, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color);
+ color = get_surface_color(rt, 332, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color);
+ color = get_surface_color(rt, 328, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color);
+ color = get_surface_color(rt, 332, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color);
+
+ color = get_surface_color(rt, 338, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color);
+ color = get_surface_color(rt, 342, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color);
+ color = get_surface_color(rt, 338, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color);
+ color = get_surface_color(rt, 342, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d3. */
+
+ IDirect3DViewport3_Release(viewport3);
+ IDirect3DViewport3_Release(viewport2);
+ IDirect3DViewport3_Release(viewport);
+ IDirectDrawSurface4_Release(rt);
+ refcount = IDirect3DDevice3_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -14114,4 +14289,5 @@ START_TEST(ddraw4)
test_ck_operation();
test_vb_refcount();
test_compute_sphere_visibility();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 91822281d0..ebcb972034 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -13385,6 +13385,139 @@ static void test_clip_planes_limits(void)
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ IDirect3DDevice7 *device;
+ IDirectDrawSurface7 *rt;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+ D3DRECT rect[2];
+ D3DRECT rect_negneg;
+ D3DCOLOR color;
+ D3DVIEWPORT7 vp, old_vp;
+
+ window = create_window();
+ if (!(device = create_device(window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create 3D device.\n");
+ DestroyWindow(window);
+ return;
+ }
+
+ hr = IDirect3DDevice7_GetRenderTarget(device, &rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative
+ * rectangles, but it will not clear them either. */
+ hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here.*/
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color);
+
+ /* Test how the viewport affects clears */
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+ hr = IDirect3DDevice7_GetViewport(device, &old_vp);
+ ok(hr == D3D_OK, "Failed to get viewport, hr %#x.\n", hr);
+
+ vp.dwX = 160;
+ vp.dwY = 120;
+ vp.dwWidth = 160;
+ vp.dwHeight = 120;
+ vp.dvMinZ = 0.0;
+ vp.dvMaxZ = 1.0;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr);
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ vp.dwX = 320;
+ vp.dwY = 240;
+ vp.dwWidth = 320;
+ vp.dwHeight = 240;
+ vp.dvMinZ = 0.0;
+ vp.dvMaxZ = 1.0;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ hr = IDirect3DDevice7_Clear(device, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);
+ ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice7_SetViewport(device, &old_vp);
+ ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d7. */
+
+ IDirectDrawSurface7_Release(rt);
+ refcount = IDirect3DDevice7_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -13503,4 +13636,5 @@ START_TEST(ddraw7)
test_vb_refcount();
test_compute_sphere_visibility();
test_clip_planes_limits();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c
index 4f6213354d..2cb1c89231 100644
--- a/dlls/ddraw/tests/visual.c
+++ b/dlls/ddraw/tests/visual.c
@@ -267,52 +267,6 @@ static void set_viewport_size(IDirect3DDevice7 *device)
return;
}
-static void clear_test(IDirect3DDevice7 *device)
-{
- /* Tests the correctness of clearing parameters */
- HRESULT hr;
- D3DRECT rect[2];
- D3DRECT rect_negneg;
- DWORD color;
-
- hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
- ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr);
-
- /* Positive x, negative y */
- U1(rect[0]).x1 = 0;
- U2(rect[0]).y1 = 480;
- U3(rect[0]).x2 = 320;
- U4(rect[0]).y2 = 240;
-
- /* Positive x, positive y */
- U1(rect[1]).x1 = 0;
- U2(rect[1]).y1 = 0;
- U3(rect[1]).x2 = 320;
- U4(rect[1]).y2 = 240;
- /* Clear 2 rectangles with one call. Shows that a positive value is returned, but the negative rectangle
- * is ignored, the positive is still cleared afterwards
- */
- hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0);
- ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr);
-
- /* negative x, negative y */
- U1(rect_negneg).x1 = 640;
- U2(rect_negneg).y1 = 240;
- U3(rect_negneg).x2 = 320;
- U4(rect_negneg).y2 = 0;
- hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);
- ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr);
-
- color = getPixelColor(device, 160, 360); /* lower left quad */
- ok(color == 0x00ffffff, "Clear rectangle 3(pos, neg) has color %08x\n", color);
- color = getPixelColor(device, 160, 120); /* upper left quad */
- ok(color == 0x00ff0000, "Clear rectangle 1(pos, pos) has color %08x\n", color);
- color = getPixelColor(device, 480, 360); /* lower right quad */
- ok(color == 0x00ffffff, "Clear rectangle 4(NULL) has color %08x\n", color);
- color = getPixelColor(device, 480, 120); /* upper right quad */
- ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color);
-}
-
static void fog_test(IDirect3DDevice7 *device)
{
HRESULT hr;
@@ -1681,7 +1635,6 @@ START_TEST(visual)
/* Now run the tests */
depth_clamp_test(Direct3DDevice);
- clear_test(Direct3DDevice);
fog_test(Direct3DDevice);
offscreen_test(Direct3DDevice);
test_blend(Direct3DDevice);
--
2.13.6
3
3