February 2016 - Wine-commits

Alexandre Julliard : libwine: Move the wine_fold_string implementation to libwine_port.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: fa84ea255501390b0967d430de6b371149a6ff28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa84ea255501390b0967d430d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 14:10:26 2016 +0900 libwine: Move the wine_fold_string implementation to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/{wine => port}/fold.c | 0 libs/wine/Makefile.in | 1 - libs/wine/port.c | 7 +++++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 23000c9..7301555 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -3,6 +3,7 @@ STATICLIB = libwine_port.a C_SRCS = \ digitmap.c \ ffs.c \ + fold.c \ fstatvfs.c \ getopt.c \ getopt1.c \ diff --git a/libs/wine/fold.c b/libs/port/fold.c similarity index 100% rename from libs/wine/fold.c rename to libs/port/fold.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 1b7fea8..08156da 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -81,7 +81,6 @@ C_SRCS = \ config.c \ cptable.c \ debug.c \ - fold.c \ ldt.c \ loader.c \ mbtowc.c \ diff --git a/libs/wine/port.c b/libs/wine/port.c index a532b2d..7e38de7 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -25,8 +25,15 @@ #include <string.h> #include <sys/types.h> +#include "wine/unicode.h" #include "wine/library.h" +/* functions from libwine_port that are also exported from libwine for backwards compatibility */ +const void *libwine_port_functions[] = +{ + wine_fold_string +}; + /* no longer used, for backwards compatibility only */ struct wine_pthread_functions; static void *pthread_functions[8];

1 0

Alexandre Julliard : libwine: Move the codepage tables to libwine_port.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 2087f38e8478ff8596a5a2038f8607aecfe2faa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2087f38e8478ff8596a5a2038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 14:33:10 2016 +0900 libwine: Move the codepage tables to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 73 +++++++++++++++++++++++++++++++++++++++++++ libs/{wine => port}/c_037.c | 0 libs/{wine => port}/c_10000.c | 0 libs/{wine => port}/c_10001.c | 0 libs/{wine => port}/c_10002.c | 0 libs/{wine => port}/c_10003.c | 0 libs/{wine => port}/c_10004.c | 0 libs/{wine => port}/c_10005.c | 0 libs/{wine => port}/c_10006.c | 0 libs/{wine => port}/c_10007.c | 0 libs/{wine => port}/c_10008.c | 0 libs/{wine => port}/c_10010.c | 0 libs/{wine => port}/c_10017.c | 0 libs/{wine => port}/c_10021.c | 0 libs/{wine => port}/c_10029.c | 0 libs/{wine => port}/c_1006.c | 0 libs/{wine => port}/c_10079.c | 0 libs/{wine => port}/c_10081.c | 0 libs/{wine => port}/c_10082.c | 0 libs/{wine => port}/c_1026.c | 0 libs/{wine => port}/c_1250.c | 0 libs/{wine => port}/c_1251.c | 0 libs/{wine => port}/c_1252.c | 0 libs/{wine => port}/c_1253.c | 0 libs/{wine => port}/c_1254.c | 0 libs/{wine => port}/c_1255.c | 0 libs/{wine => port}/c_1256.c | 0 libs/{wine => port}/c_1257.c | 0 libs/{wine => port}/c_1258.c | 0 libs/{wine => port}/c_1361.c | 0 libs/{wine => port}/c_20127.c | 0 libs/{wine => port}/c_20866.c | 0 libs/{wine => port}/c_20932.c | 0 libs/{wine => port}/c_21866.c | 0 libs/{wine => port}/c_28591.c | 0 libs/{wine => port}/c_28592.c | 0 libs/{wine => port}/c_28593.c | 0 libs/{wine => port}/c_28594.c | 0 libs/{wine => port}/c_28595.c | 0 libs/{wine => port}/c_28596.c | 0 libs/{wine => port}/c_28597.c | 0 libs/{wine => port}/c_28598.c | 0 libs/{wine => port}/c_28599.c | 0 libs/{wine => port}/c_28600.c | 0 libs/{wine => port}/c_28603.c | 0 libs/{wine => port}/c_28604.c | 0 libs/{wine => port}/c_28605.c | 0 libs/{wine => port}/c_28606.c | 0 libs/{wine => port}/c_424.c | 0 libs/{wine => port}/c_437.c | 0 libs/{wine => port}/c_500.c | 0 libs/{wine => port}/c_737.c | 0 libs/{wine => port}/c_775.c | 0 libs/{wine => port}/c_850.c | 0 libs/{wine => port}/c_852.c | 0 libs/{wine => port}/c_855.c | 0 libs/{wine => port}/c_856.c | 0 libs/{wine => port}/c_857.c | 0 libs/{wine => port}/c_860.c | 0 libs/{wine => port}/c_861.c | 0 libs/{wine => port}/c_862.c | 0 libs/{wine => port}/c_863.c | 0 libs/{wine => port}/c_864.c | 0 libs/{wine => port}/c_865.c | 0 libs/{wine => port}/c_866.c | 0 libs/{wine => port}/c_869.c | 0 libs/{wine => port}/c_874.c | 0 libs/{wine => port}/c_875.c | 0 libs/{wine => port}/c_878.c | 0 libs/{wine => port}/c_932.c | 0 libs/{wine => port}/c_936.c | 0 libs/{wine => port}/c_949.c | 0 libs/{wine => port}/c_950.c | 0 libs/{wine => port}/cptable.c | 4 +-- libs/wine/Makefile.in | 73 ------------------------------------------- libs/wine/port.c | 2 ++ tools/make_unicode | 4 +-- 77 files changed, 79 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2087f38e8478ff8596a5a…

1 0

Alexandre Julliard : libwine: Move the CP_SYMBOL conversion functions to libwine_port.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 18699623b3ad43c2baa37ebd0ea211adda867479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18699623b3ad43c2baa37ebd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 18:49:28 2016 +0900 libwine: Move the CP_SYMBOL conversion functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/cpsymbol.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/mbtowc.c | 19 ----------------- libs/wine/port.c | 2 ++ libs/wine/wctomb.c | 21 ------------------- 5 files changed, 61 insertions(+), 40 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index ede38c5..67fb999 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -73,6 +73,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + cpsymbol.c \ cptable.c \ digitmap.c \ ffs.c \ diff --git a/libs/port/cpsymbol.c b/libs/port/cpsymbol.c new file mode 100644 index 0000000..e35a359 --- /dev/null +++ b/libs/port/cpsymbol.c @@ -0,0 +1,58 @@ +/* + * CP_SYMBOL support + * + * Copyright 2000 Alexandre Julliard + * Copyright 2004 Rein Klazes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/unicode.h" + +/* return -1 on dst buffer overflow */ +int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen) +{ + int len, i; + + if (dstlen == 0) return srclen; + len = dstlen > srclen ? srclen : dstlen; + for (i = 0; i < len; i++) + { + unsigned char c = src[i]; + dst[i] = (c < 0x20) ? c : c + 0xf000; + } + if (srclen > len) return -1; + return len; +} + +/* return -1 on dst buffer overflow, -2 on invalid character */ +int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen) +{ + int len, i; + + if (dstlen == 0) return srclen; + len = dstlen > srclen ? srclen : dstlen; + for (i = 0; i < len; i++) + { + if (src[i] < 0x20) + dst[i] = src[i]; + else if (src[i] >= 0xf020 && src[i] < 0xf100) + dst[i] = src[i] - 0xf000; + else + return -2; + } + if (srclen > len) return -1; + return len; +} diff --git a/libs/wine/mbtowc.c b/libs/wine/mbtowc.c index 6fc38ca..9267d9d 100644 --- a/libs/wine/mbtowc.c +++ b/libs/wine/mbtowc.c @@ -291,22 +291,3 @@ int wine_cp_mbstowcs( const union cptable *table, int flags, return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); } } - -/* CP_SYMBOL implementation */ -/* return -1 on dst buffer overflow */ -int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen) -{ - int len, i; - if( dstlen == 0) return srclen; - len = dstlen > srclen ? srclen : dstlen; - for( i = 0; i < len; i++) - { - unsigned char c = src [ i ]; - if( c < 0x20 ) - dst[i] = c; - else - dst[i] = c + 0xf000; - } - if( srclen > len) return -1; - return len; -} diff --git a/libs/wine/port.c b/libs/wine/port.c index dc08b71..070dfd9 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -33,6 +33,8 @@ const void *libwine_port_functions[] = { wine_cp_enum_table, wine_cp_get_table, + wine_cpsymbol_mbstowcs, + wine_cpsymbol_wcstombs, wine_fold_string }; diff --git a/libs/wine/wctomb.c b/libs/wine/wctomb.c index 29a3d92..62c0fc2 100644 --- a/libs/wine/wctomb.c +++ b/libs/wine/wctomb.c @@ -470,24 +470,3 @@ int wine_cp_wcstombs( const union cptable *table, int flags, return wcstombs_dbcs( &table->dbcs, src, srclen, dst, dstlen ); } } - -/* CP_SYMBOL implementation */ -/* return -1 on dst buffer overflow, -2 on invalid character */ -int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen) -{ - int len, i; - if( dstlen == 0) return srclen; - len = dstlen > srclen ? srclen : dstlen; - for( i = 0; i < len; i++) - { - WCHAR w = src [ i ]; - if( w < 0x20 ) - dst[i] = w; - else if( w >= 0xf020 && w < 0xf100) - dst[i] = w - 0xf000; - else - return -2; - } - if( srclen > len) return -1; - return len; -}

1 0

Hugh McMaster : reg: Fail if /s is used without an accompanying argument.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 46bdc153f129a32bd88eefc484d27db3e89ac881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bdc153f129a32bd88eefc48… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:05 2016 +1100 reg: Fail if /s is used without an accompanying argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ef25fe5..bcd812a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -576,7 +576,16 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashTW)) type = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashSW)) - separator = argvW[++i][0]; + { + WCHAR *ptr = argvW[++i]; + + if (!ptr) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = ptr[0]; + } else if (!lstrcmpiW(argvW[i], slashDW)) { if (!(data = argvW[++i]))

1 0

Hugh McMaster : reg/tests: Add a test for /s with no separator character.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 5a2ddc8d25c5560f7bfc7fd0575a74033de784bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2ddc8d25c5560f7bfc7fd05… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:06 2016 +1100 reg/tests: Add a test for /s with no separator character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1958be0..a813de1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -355,6 +355,9 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi13 /t REG_MULTI_SZ /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg: Fail if the separator for REG_MULTI_SZ is not one character in length.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 8a902f37618e42ff6e1e6ec82173b10fd3fcfac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a902f37618e42ff6e1e6ec82… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:07 2016 +1100 reg: Fail if the separator for REG_MULTI_SZ is not one character in length. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bcd812a..7dc624a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -579,7 +579,7 @@ int wmain(int argc, WCHAR *argvW[]) { WCHAR *ptr = argvW[++i]; - if (!ptr) + if (!ptr || strlenW(ptr) != 1) { output_message(STRING_INVALID_CMDLINE); return 1;

1 0

Frédéric Delanoy : ddraw/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 3e5321409258d0043b897e7552eb4cd3e96d44f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5321409258d0043b897e755… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 15:34:31 2016 +0100 ddraw/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 10 +--------- dlls/ddraw/tests/ddraw1.c | 10 ++-------- dlls/ddraw/tests/ddraw2.c | 10 ++-------- dlls/ddraw/tests/ddraw4.c | 16 +++------------- dlls/ddraw/tests/ddraw7.c | 26 +++++--------------------- 5 files changed, 13 insertions(+), 59 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec4197a..06f16f3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3312,17 +3312,9 @@ static void FindDevice(void) hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - if (deviceGUIDs[i].todo) - { - todo_wine - ok(hr == D3D_OK, - "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); - } - else - { + todo_wine_if (deviceGUIDs[i].todo) ok(hr == D3D_OK, "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); - } } /* Curiously the color model criteria seem to be ignored. */ diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4090b26..1e1a2ff 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7240,18 +7240,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5c0bb52..75bdc84 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8394,18 +8394,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 950d458..a092787 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5201,11 +5201,7 @@ static void test_block_formats_creation(void) expect_hr = D3D_OK; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); - if (todo) - todo_wine ok(hr == expect_hr, - "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", - hr, formats[i].name, types[j].name, w, h, expect_hr); - else + todo_wine_if (todo) ok(hr == expect_hr, "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", hr, formats[i].name, types[j].name, w, h, expect_hr); @@ -9348,18 +9344,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface4_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface4_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 216ce38..d7589a8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4996,11 +4996,7 @@ static void test_block_formats_creation(void) expect_hr = D3D_OK; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); - if (todo) - todo_wine ok(hr == expect_hr, - "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", - hr, formats[i].name, types[j].name, w, h, expect_hr); - else + todo_wine_if (todo) ok(hr == expect_hr, "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", hr, formats[i].name, types[j].name, w, h, expect_hr); @@ -8862,10 +8858,7 @@ static void test_fog_interpolation(void) color = get_surface_color(rt, 0, 240); ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = get_surface_color(rt, 320, 240); - if (tests[i].todo) - todo_wine ok(compare_color(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(compare_color(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = get_surface_color(rt, 639, 240); @@ -9618,18 +9611,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface7_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); @@ -10737,10 +10724,7 @@ static void test_lockrect_invalid(void) locked_desc.dwSize = sizeof(locked_desc); hr = IDirectDrawSurface7_Lock(surface, rect, &locked_desc, DDLOCK_WAIT, NULL); - if (SUCCEEDED(resources[r].hr)) - todo_wine ok(hr == resources[r].hr, "Lock returned %#x for rect [%d, %d]->[%d, %d], type %s.\n", - hr, rect->left, rect->top, rect->right, rect->bottom, resources[r].name); - else + todo_wine_if (SUCCEEDED(resources[r].hr)) ok(hr == resources[r].hr, "Lock returned %#x for rect [%d, %d]->[%d, %d], type %s.\n", hr, rect->left, rect->top, rect->right, rect->bottom, resources[r].name); if (SUCCEEDED(hr))

1 0

Frédéric Delanoy : d3d9/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 77c05ebc4efd2d44082d40cc8bc5d196edd4cd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c05ebc4efd2d44082d40cc8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 23:16:01 2016 +0100 d3d9/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 10 ++-------- dlls/d3d9/tests/device.c | 24 +++++------------------- dlls/d3d9/tests/visual.c | 22 ++++------------------ 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 99ba823..b74ae47 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2869,12 +2869,9 @@ static void test_window_style(void) ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); style = GetWindowLongA(device_window, GWL_STYLE); - if (tests[i].style_flags & WS_VISIBLE) + todo_wine_if (!(tests[i].style_flags & WS_VISIBLE)) ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); - else - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", - device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); @@ -2890,12 +2887,9 @@ static void test_window_style(void) ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); style = GetWindowLongA(device_window, GWL_STYLE); - if (device_style & WS_VISIBLE) + todo_wine_if (!(device_style & WS_VISIBLE)) ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); - else - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", - device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5bf7121..f31a7cd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -668,11 +668,7 @@ static void test_fvf_decl_conversion(void) hr = IDirect3DDevice9_GetFVF(device, &fvf); ok(SUCCEEDED(hr), "Test %u: Failed to get FVF, hr %#x.\n", i, hr); - if (decl_to_fvf_tests[i].todo) - todo_wine ok(fvf == decl_to_fvf_tests[i].fvf, - "Test %u: Got unexpected FVF %#x, expected %#x.\n", - i, fvf, decl_to_fvf_tests[i].fvf); - else + todo_wine_if (decl_to_fvf_tests[i].todo) ok(fvf == decl_to_fvf_tests[i].fvf, "Test %u: Got unexpected FVF %#x, expected %#x.\n", i, fvf, decl_to_fvf_tests[i].fvf); @@ -3681,10 +3677,8 @@ static void test_wndproc(void) * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ hr = IDirect3DDevice9_TestCooperativeLevel(device); - if (hr == D3DERR_DEVICENOTRESET) + todo_wine_if (hr != D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); - else - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); expect_messages = tests[i].focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or @@ -4483,18 +4477,12 @@ static void test_window_style(void) style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].style; - if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) - todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", - expected_style, style, i); - else + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); expected_style = device_exstyle | tests[i].exstyle; - if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) - todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", - expected_style, style, i); - else + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); @@ -8873,9 +8861,7 @@ static void test_update_volumetexture(void) ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); - if (FAILED(hr)) - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); - else + todo_wine_if (FAILED(hr)) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8b56dbe..274777b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1450,15 +1450,11 @@ static void color_fill_test(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, NULL, 0xdeadbeef); - if (formats[i].flags & TODO_FILL_RETURN) - todo_wine ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); - else + todo_wine_if (formats[i].flags & TODO_FILL_RETURN) ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, &rect, 0xdeadbeef); - if (formats[i].flags & TODO_FILL_RETURN) - todo_wine ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); - else + todo_wine_if (formats[i].flags & TODO_FILL_RETURN) ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); if (SUCCEEDED(hr)) @@ -8472,14 +8468,7 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - if (tests[i].todo) - { - todo_wine ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", - i, color0, tests[i].color0); - todo_wine ok(color_match(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", - i, color1, tests[i].color1); - } - else + todo_wine_if (tests[i].todo) { ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); @@ -18123,10 +18112,7 @@ static void test_fog_interpolation(void) color = getPixelColor(device, 0, 240); ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 320, 240); - if (tests[i].todo) - todo_wine ok(color_match(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(color_match(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 639, 240);

1 0

Frédéric Delanoy : d3d8/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: cdf961a0f1b164bb5a1605dc3e3c6b6870d9fe24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf961a0f1b164bb5a1605dc3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 23:16:02 2016 +0100 d3d8/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 ++++------------ dlls/d3d8/tests/visual.c | 5 +---- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5dba46c..32e2f09 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2712,10 +2712,8 @@ static void test_wndproc(void) * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ hr = IDirect3DDevice8_TestCooperativeLevel(device); - if (hr == D3DERR_DEVICENOTRESET) + todo_wine_if (hr != D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); - else - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); expect_messages = focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or @@ -2736,9 +2734,7 @@ static void test_wndproc(void) ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device); /* Focus-follows-mouse WMs prematurely reactivate our window. */ - if (hr == D3DERR_DEVICENOTRESET) - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); - else + todo_wine_if (hr == D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); @@ -6313,9 +6309,7 @@ static void test_update_volumetexture(void) ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); - if (FAILED(hr)) - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); - else + todo_wine_if (FAILED(hr)) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture8_Release(src); @@ -7837,9 +7831,7 @@ static void test_swapchain_parameters(void) for (j = 0; j < bb_count; ++j) { hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - if (j) - todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); - else + todo_wine_if (j) ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); if (SUCCEEDED(hr)) IDirect3DSurface8_Release(backbuffer); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index db2e0db..856df5d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5829,10 +5829,7 @@ static void test_fog_interpolation(void) color = getPixelColor(device, 0, 240); ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 320, 240); - if (tests[i].todo) - todo_wine ok(color_match(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(color_match(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 639, 240);

1 0

Matteo Bruni : d3d10core/tests: Test relative addressing in constant buffers.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 5571158ed5e57a58b8e15df51e82f0d5f590b94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5571158ed5e57a58b8e15df51… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 16 20:48:04 2016 +0100 d3d10core/tests: Test relative addressing in constant buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f1c2b8c..e2c1683 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5224,6 +5224,239 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_cb_relative_addressing(void) +{ + ID3D10Buffer *vb, *colors_cb, *index_cb; + ID3D10RenderTargetView *backbuffer_rtv; + D3D10_SUBRESOURCE_DATA resource_data; + ID3D10InputLayout *input_layout; + unsigned int i, index[4] = {0}; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *backbuffer; + unsigned int stride, offset; + IDXGISwapChain *swapchain; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + D3D10_VIEWPORT vp; + ULONG refcount; + DWORD color; + HWND window; + HRESULT hr; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 +int color_index; + +cbuffer colors +{ + float4 colors[8]; +}; + +struct vs_in +{ + float4 position : POSITION; +}; + +struct vs_out +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +vs_out main(const vs_in v) +{ + vs_out o; + + o.position = v.position; + o.color = colors[color_index]; + + return o; +} +#endif + 0x43425844, 0xcecf6d7c, 0xe418097c, 0x47902dd0, 0x9500abc2, 0x00000001, 0x00000160, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x000000a4, 0x00010040, + 0x00000029, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000859, 0x00208e46, 0x00000001, + 0x00000008, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, + 0x00101e46, 0x00000000, 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x07000036, 0x001020f2, 0x00000001, 0x04208e46, 0x00000001, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 +struct ps_in +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(const ps_in v) : SV_TARGET +{ + return v.color; +} +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const struct + { + float color[4]; + } + colors[10] = + { + {{0.0f, 0.0f, 0.0f, 1.0f}}, + {{0.0f, 0.0f, 1.0f, 0.0f}}, + {{0.0f, 0.0f, 1.0f, 1.0f}}, + {{0.0f, 1.0f, 0.0f, 0.0f}}, + {{0.0f, 1.0f, 0.0f, 1.0f}}, + {{0.0f, 1.0f, 1.0f, 0.0f}}, + {{0.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 0.0f, 0.0f, 1.0f}}, + {{1.0f, 0.0f, 1.0f, 0.0f}}, + }; + static const struct + { + int index; + DWORD expected; + } + test_data[] = + { + { 0, 0xff000000}, + { 1, 0x00ff0000}, + { 2, 0xffff0000}, + { 3, 0x0000ff00}, + { 4, 0xff00ff00}, + { 5, 0x00ffff00}, + { 6, 0xffffff00}, + { 7, 0x000000ff}, + + { 8, 0xff0000ff}, + { 9, 0x00ff00ff}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(colors); + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + resource_data.pSysMem = &colors; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &colors_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(index); + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &index_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &backbuffer_rtv, NULL); + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_VSSetConstantBuffers(device, 0, 1, &index_cb); + ID3D10Device_VSSetConstantBuffers(device, 1, 1, &colors_cb); + ID3D10Device_PSSetShader(device, ps); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = 640.0f; + vp.Height = 480.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + { + ID3D10Device_ClearRenderTargetView(device, backbuffer_rtv, white); + + index[0] = test_data[i].index; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)index_cb, 0, NULL, index, 0, 0); + + ID3D10Device_Draw(device, 4, 0); + + color = get_texture_color(backbuffer, 319, 239); + ok(compare_color(color, test_data[i].expected, 1), + "Got unexpected color 0x%08x for index %d.\n", color, test_data[i].index); + } + + ID3D10Buffer_Release(index_cb); + ID3D10Buffer_Release(colors_cb); + + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10Buffer_Release(vb); + ID3D10InputLayout_Release(input_layout); + ID3D10RenderTargetView_Release(backbuffer_rtv); + ID3D10Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(device) { test_feature_level(); @@ -5254,4 +5487,5 @@ START_TEST(device) test_copy_subresource_region(); test_multisample_init(); test_check_multisample_quality_levels(); + test_cb_relative_addressing(); }

1 0