February 2019 - Wine-Devel - list.winehq.org

po: Update Lithuanian translation
by Aurimas Fišeras Feb. 14, 2019

Feb. 14, 2019

1 0

[PATCH] user32/tests: Execute test_shell_window() last.
by Zebediah Figura Feb. 13, 2019

Feb. 13, 2019

Cf. also d83fc43e5. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 83f5f63663..461b696f9b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11631,7 +11631,6 @@ START_TEST(win) test_layered_window(); test_SetForegroundWindow(hwndMain); - test_shell_window(); test_handles( hwndMain ); test_winregion(); test_map_points(); @@ -11663,4 +11662,8 @@ START_TEST(win) * state of hwndMain and hwndMain2 windows. */ test_topmost(); + + /* Execute the SetShellWindow() test last, since it kills explorer and that + * breaks a lot of things. */ + test_shell_window(); } -- 2.20.1

1 0

[PATCH] oleaut32: Support VT_DECIMAL in VarRound
by Alistair Leslie-Hughes Feb. 13, 2019

Feb. 13, 2019

Based of a patch by Carlos Chiriboga Calderon Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26653 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 62b4852..0b1ac0f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3630,7 +3630,8 @@ static const struct decimal_round_t decimal_round_data[] = { {{ 2, 0, 0, 0, 199 }, { 2, 0, 0, 0, 199 }, 2}, {{ 2, DECIMAL_NEG, 0, 0, 199 }, { 2, DECIMAL_NEG, 0, 0, 199 }, 2}, {{ 2, DECIMAL_NEG, 0, 0, 55 }, { 2, DECIMAL_NEG, 0, 0, 6 }, 1}, - {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1} + {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1}, + {{ 2, 0, 0, 0, 1999 }, { 1, 0, 0, 0, 200 }, 1}, }; static void test_VarRound(void) @@ -3733,7 +3734,6 @@ static void test_VarRound(void) S1(U1(*pdec)).Lo32 = ptr->source.Lo32; VariantInit(&vDst); hres = pVarRound(&v, ptr->dec, &vDst); - todo_wine ok(hres == S_OK, "%d: got 0x%08x\n", i, hres); if (hres == S_OK) { diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8781f3e..fcbef53 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5134,7 +5134,21 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) } V_VT(pVarOut) = V_VT(pVarIn); break; + case VT_DECIMAL: + { + double dbl; + VarR8FromDec(&V_DECIMAL(pVarIn), &dbl); + + if (dbl>0.0f) + dbl = floor(dbl*pow(10,deci)+0.5); + else + dbl = ceil(dbl*pow(10,deci)-0.5); + + V_VT(pVarOut)=VT_DECIMAL; + VarDecFromR8(dbl, &V_DECIMAL(pVarOut)); + break; + } /* cases we don't know yet */ default: FIXME("unimplemented part, V_VT(pVarIn) == 0x%X, deci == %d\n", -- 1.9.1

1 0

[PATCH v3 1/4] kernel32/tests: Add tests for SpecialCasing.
by Daniel Lehman Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: - call LCMapString - rearrange and squash commits v3: - add static const to all test cases --- dlls/kernel32/tests/locale.c | 186 +++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 126b08cc57..2627fc5de8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5784,6 +5784,191 @@ todo_wine_if(ptest->todo[i]) } } +static void test_SpecialCasing(void) +{ + int ret, i; + WCHAR exp, buffer[8]; + static const WCHAR azCyrlazW[] = {'a','z','-','C','y','r','l','-','a','z',0}; + static const WCHAR azLatnazW[] = {'a','z','-','L','a','t','n','-','a','z',0}; + static const WCHAR deDEW[] = {'d','e','-','D','E',0}; + static const WCHAR elGRW[] = {'e','l','-','G','R',0}; + static const WCHAR enUSW[] = {'e','n','-','U','S',0}; + static const WCHAR hyAMW[] = {'h','y','-','A','M',0}; + static const WCHAR ltLTW[] = {'l','t','-','L','T',0}; + static const WCHAR trTRW[] = {'t','r','-','T','R',0}; + static const WCHAR TRTRW[] = {'T','R','-','T','R',0}; + static const struct test { + const WCHAR *lang; + DWORD flags; + WCHAR ch; + WCHAR exp; /* 0 if self */ + WCHAR exp_ling; /* 0 if exp */ + BOOL todo; + BOOL todo_ling; + } tests[] = { + {deDEW, LCMAP_UPPERCASE, 0x00DF}, /* LATIN SMALL LETTER SHARP S */ + + {enUSW, LCMAP_UPPERCASE, 0xFB00}, /* LATIN SMALL LIGATURE FF */ + {enUSW, LCMAP_UPPERCASE, 0xFB01}, /* LATIN SMALL LIGATURE FI */ + {enUSW, LCMAP_UPPERCASE, 0xFB02}, /* LATIN SMALL LIGATURE FL */ + {enUSW, LCMAP_UPPERCASE, 0xFB03}, /* LATIN SMALL LIGATURE FFI */ + {enUSW, LCMAP_UPPERCASE, 0xFB04}, /* LATIN SMALL LIGATURE FFL */ + {enUSW, LCMAP_UPPERCASE, 0xFB05}, /* LATIN SMALL LIGATURE LONG S T */ + {enUSW, LCMAP_UPPERCASE, 0xFB06}, /* LATIN SMALL LIGATURE ST */ + + {hyAMW, LCMAP_UPPERCASE, 0x0587}, /* ARMENIAN SMALL LIGATURE ECH YIWN */ + {hyAMW, LCMAP_UPPERCASE, 0xFB13}, /* ARMENIAN SMALL LIGATURE MEN NOW */ + {hyAMW, LCMAP_UPPERCASE, 0xFB14}, /* ARMENIAN SMALL LIGATURE MEN ECH */ + {hyAMW, LCMAP_UPPERCASE, 0xFB15}, /* ARMENIAN SMALL LIGATURE MEN INI */ + {hyAMW, LCMAP_UPPERCASE, 0xFB16}, /* ARMENIAN SMALL LIGATURE VEW NOW */ + {hyAMW, LCMAP_UPPERCASE, 0xFB17}, /* ARMENIAN SMALL LIGATURE MEN XEH */ + + {enUSW, LCMAP_UPPERCASE, 0x0149}, /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */ + {elGRW, LCMAP_UPPERCASE, 0x0390}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */ + {elGRW, LCMAP_UPPERCASE, 0x03B0}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */ + {enUSW, LCMAP_UPPERCASE, 0x01F0}, /* LATIN SMALL LETTER J WITH CARON */ + {enUSW, LCMAP_UPPERCASE, 0x1E96}, /* LATIN SMALL LETTER H WITH LINE BELOW */ + {enUSW, LCMAP_UPPERCASE, 0x1E97}, /* LATIN SMALL LETTER T WITH DIAERESIS */ + {enUSW, LCMAP_UPPERCASE, 0x1E98}, /* LATIN SMALL LETTER W WITH RING ABOVE */ + {enUSW, LCMAP_UPPERCASE, 0x1E99}, /* LATIN SMALL LETTER Y WITH RING ABOVE */ + {enUSW, LCMAP_UPPERCASE, 0x1E9A}, /* LATIN SMALL LETTER A WITH RIGHT HALF RING */ + {elGRW, LCMAP_UPPERCASE, 0x1F50}, /* GREEK SMALL LETTER UPSILON WITH PSILI */ + {elGRW, LCMAP_UPPERCASE, 0x1F52}, /* GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA */ + {elGRW, LCMAP_UPPERCASE, 0x1F54}, /* GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA */ + {elGRW, LCMAP_UPPERCASE, 0x1F56}, /* GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FB6}, /* GREEK SMALL LETTER ALPHA WITH PERISPOMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FC6}, /* GREEK SMALL LETTER ETA WITH PERISPOMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FD2}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA */ + {elGRW, LCMAP_UPPERCASE, 0x1FD3}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA */ + {elGRW, LCMAP_UPPERCASE, 0x1FD6}, /* GREEK SMALL LETTER IOTA WITH PERISPOMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FD7}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FE2}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA */ + {elGRW, LCMAP_UPPERCASE, 0x1FE3}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA */ + {elGRW, LCMAP_UPPERCASE, 0x1FE4}, /* GREEK SMALL LETTER RHO WITH PSILI */ + {elGRW, LCMAP_UPPERCASE, 0x1FE6}, /* GREEK SMALL LETTER UPSILON WITH PERISPOMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FE7}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FF6}, /* GREEK SMALL LETTER OMEGA WITH PERISPOMENI */ + + {elGRW, LCMAP_UPPERCASE, 0x1F80,0x1F88}, /* GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F81,0x1F89}, /* GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F82,0x1F8A}, /* GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F83,0x1F8B}, /* GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F84,0x1F8C}, /* GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F85,0x1F8D}, /* GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F86,0x1F8E}, /* GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F87,0x1F8F}, /* GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */ + + {elGRW, LCMAP_LOWERCASE, 0x1F88,0x1F80}, /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1F89,0x1F81}, /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1F8A,0x1F82}, /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1F8B,0x1F83}, /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1F8C,0x1F84}, /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1F8D,0x1F85}, /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1F8E,0x1F86}, /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1F8F,0x1F87}, /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */ + + {elGRW, LCMAP_UPPERCASE, 0x1F90,0x1F98}, /* GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F91,0x1F99}, /* GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F92,0x1F9A}, /* GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F93,0x1F9B}, /* GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F94,0x1F9C}, /* GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F95,0x1F9D}, /* GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F96,0x1F9E}, /* GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1F97,0x1F9F}, /* GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */ + + {elGRW, LCMAP_LOWERCASE, 0x1FA8,0x1FA0}, /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FA9,0x1FA1}, /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FAA,0x1FA2}, /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FAB,0x1FA3}, /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FAC,0x1FA4}, /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FAD,0x1FA5}, /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FAE,0x1FA6}, /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FAF,0x1FA7}, /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */ + + {elGRW, LCMAP_UPPERCASE, 0x1FB3,0x1FBC}, /* GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FBC,0x1FB3}, /* GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FC3,0x1FCC}, /* GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FCC,0x1FC3}, /* GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FF3,0x1FFC}, /* GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI */ + {elGRW, LCMAP_LOWERCASE, 0x1FFC,0x1FF3}, /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */ + + {elGRW, LCMAP_UPPERCASE, 0x1FB2}, /* GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FB4}, /* GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FC2}, /* GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FC4}, /* GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FF2}, /* GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FF4}, /* GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI */ + + {elGRW, LCMAP_UPPERCASE, 0x1FB7}, /* GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FC7}, /* GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI */ + {elGRW, LCMAP_UPPERCASE, 0x1FF7}, /* GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI */ + + {elGRW, LCMAP_LOWERCASE, 0x03A3,0x03C3}, /* GREEK CAPITAL LETTER SIGMA */ + + {ltLTW, LCMAP_LOWERCASE, 'J','j'}, /* LATIN CAPITAL LETTER J */ + {ltLTW, LCMAP_LOWERCASE, 0x012E,0x012F}, /* LATIN CAPITAL LETTER I WITH OGONEK */ + {ltLTW, LCMAP_LOWERCASE, 0x00CC,0x00EC}, /* LATIN CAPITAL LETTER I WITH GRAVE */ + {ltLTW, LCMAP_LOWERCASE, 0x00CD,0x00ED}, /* LATIN CAPITAL LETTER I WITH ACUTE */ + {ltLTW, LCMAP_LOWERCASE, 0x0128,0x0129}, /* LATIN CAPITAL LETTER I WITH TILDE */ + + {enUSW, LCMAP_UPPERCASE, 'i', 'I'}, /* LATIN SMALL LETTER I */ + {ltLTW, LCMAP_UPPERCASE, 'i', 'I'}, /* LATIN SMALL LETTER I */ + {trTRW, LCMAP_UPPERCASE, 'i', 'I', 0x0130, FALSE, TRUE}, /* LATIN SMALL LETTER I */ + {TRTRW, LCMAP_UPPERCASE, 'i', 'I', 0x0130, FALSE, TRUE}, /* LATIN SMALL LETTER I */ + {azCyrlazW, LCMAP_UPPERCASE, 'i', 'I', 0x0130, FALSE, TRUE}, /* LATIN SMALL LETTER I */ + {azLatnazW, LCMAP_UPPERCASE, 'i', 'I', 0x0130, FALSE, TRUE}, /* LATIN SMALL LETTER I */ + + {enUSW, LCMAP_LOWERCASE, 'I', 'i'}, /* LATIN CAPITAL LETTER I */ + {ltLTW, LCMAP_LOWERCASE, 'I', 'i'}, /* LATIN CAPITAL LETTER I */ + {trTRW, LCMAP_LOWERCASE, 'I', 'i', 0x0131, FALSE, TRUE}, /* LATIN CAPITAL LETTER I */ + {TRTRW, LCMAP_LOWERCASE, 'I', 'i', 0x0131, FALSE, TRUE}, /* LATIN CAPITAL LETTER I */ + {azCyrlazW, LCMAP_LOWERCASE, 'I', 'i', 0x0131, FALSE, TRUE}, /* LATIN CAPITAL LETTER I */ + {azLatnazW, LCMAP_LOWERCASE, 'I', 'i', 0x0131, FALSE, TRUE}, /* LATIN CAPITAL LETTER I */ + + {enUSW, LCMAP_LOWERCASE, 0x0130,0,'i', TRUE}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + {trTRW, LCMAP_LOWERCASE, 0x0130,0,'i', TRUE}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + {TRTRW, LCMAP_LOWERCASE, 0x0130,0,'i', TRUE}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + {azCyrlazW, LCMAP_LOWERCASE, 0x0130,0,'i', TRUE}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + {azLatnazW, LCMAP_LOWERCASE, 0x0130,0,'i', TRUE}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + + {enUSW, LCMAP_UPPERCASE, 0x0131,0,'I', TRUE}, /* LATIN SMALL LETTER DOTLESS I */ + {trTRW, LCMAP_UPPERCASE, 0x0131,0,'I', TRUE}, /* LATIN SMALL LETTER DOTLESS I */ + {TRTRW, LCMAP_UPPERCASE, 0x0131,0,'I', TRUE}, /* LATIN SMALL LETTER DOTLESS I */ + {azCyrlazW, LCMAP_UPPERCASE, 0x0131,0,'I', TRUE}, /* LATIN SMALL LETTER DOTLESS I */ + {azLatnazW, LCMAP_UPPERCASE, 0x0131,0,'I', TRUE}, /* LATIN SMALL LETTER DOTLESS I */ + }; + + if (!pLCMapStringEx) + { + win_skip("LCMapStringEx not available\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); i++) { + memset(buffer, 0, sizeof(buffer)); + ret = pLCMapStringEx(tests[i].lang, tests[i].flags, + &tests[i].ch, 1, buffer, ARRAY_SIZE(buffer), NULL, NULL, 0); + ok(ret == 1, "expected 1, got %d for %04x for %s\n", ret, tests[i].ch, + wine_dbgstr_w(tests[i].lang)); + exp = tests[i].exp ? tests[i].exp : tests[i].ch; + todo_wine_if(tests[i].todo) + ok(buffer[0] == exp || broken(buffer[0] != exp), + "expected %04x, got %04x for %04x for %s\n", + exp, buffer[0], tests[i].ch, wine_dbgstr_w(tests[i].lang)); + + memset(buffer, 0, sizeof(buffer)); + ret = pLCMapStringEx(tests[i].lang, tests[i].flags|LCMAP_LINGUISTIC_CASING, + &tests[i].ch, 1, buffer, ARRAY_SIZE(buffer), NULL, NULL, 0); + ok(ret == 1, "expected 1, got %d for %04x for %s\n", ret, tests[i].ch, + wine_dbgstr_w(tests[i].lang)); + exp = tests[i].exp_ling ? tests[i].exp_ling : exp; + todo_wine_if(tests[i].todo_ling) + ok(buffer[0] == exp || broken(buffer[0] != exp), + "expected %04x, got %04x for %04x for %s\n", + exp, buffer[0], tests[i].ch, wine_dbgstr_w(tests[i].lang)); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -5834,6 +6019,7 @@ START_TEST(locale) test_FindStringOrdinal(); test_SetThreadUILanguage(); test_NormalizeString(); + test_SpecialCasing(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } -- 2.17.1

2 4

[PATCH v2] dsound: IDirectSoundNotify is only available when DSBCAPS_CTRLPOSITIONNOTIFY is specified.
by Alistair Leslie-Hughes Feb. 13, 2019

Feb. 13, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45473 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 9 +++++++-- dlls/dsound/tests/dsound.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5262628528..2a328ed32a 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -923,11 +923,16 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8 return S_OK; } - if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { + if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { + if(This->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY) { IDirectSoundNotify_AddRef(&This->IDirectSoundNotify_iface); *ppobj = &This->IDirectSoundNotify_iface; return S_OK; - } + } + + TRACE( "App requested IDirectSoundNotify without DSBCAPS_CTRLPOSITIONNOTIFY flag.\n"); + return E_NOINTERFACE; + } if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { if(This->dsbd.dwFlags & DSBCAPS_CTRL3D){ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 89f0aa03ff..41818deb17 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1561,6 +1561,19 @@ static void test_notifications(LPGUID lpGuid) wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; wfx.cbSize = 0; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2; + bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ + bufdesc.lpwfxFormat = &wfx; + rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); + ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " + "to create a buffer %08x\n", rc); + + rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); + ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + IDirectSoundBuffer_Release(buf); + ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY; -- 2.20.1

2 1

[PATCH 1/4] d3dx9/tests: Clear vertex shader constants in test_effect_states().
by Paul Gofman Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/tests/effect.c | 83 +++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 2217a42ebb..0620910117 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3001,40 +3001,55 @@ static const DWORD test_effect_states_effect_blob[] = }; #define TEST_EFFECT_STATES_VSHADER_POS 271 +static const D3DXVECTOR4 fvect_filler = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; + +static void test_effect_clear_vconsts(IDirect3DDevice9 *device) +{ + unsigned int i; + HRESULT hr; + + for (i = 0; i < 256; ++i) + { + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, i, &fvect_filler.x, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + } +} + static void test_effect_states(IDirect3DDevice9 *device) { - D3DMATRIX test_mat = + static const D3DMATRIX test_mat = {{{ -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }}}; - D3DMATRIX test_mat_camera = + static const D3DMATRIX test_mat_camera = {{{ 4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 6.0f }}}; - D3DMATRIX test_mat_world1 = + static const D3DMATRIX test_mat_world1 = {{{ 2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 4.0f }}}; - D3DMATRIX mat; - HRESULT hr; + + IDirect3DVertexShader9 *vshader; + float float_data[4]; ID3DXEffect *effect; + UINT byte_code_size; + void *byte_code; + D3DLIGHT9 light; + D3DMATRIX mat; UINT npasses; DWORD value; - IDirect3DVertexShader9 *vshader; - void *byte_code; - UINT byte_code_size; + HRESULT hr; BOOL bval; - D3DLIGHT9 light; - float float_data[4]; hr = D3DXCreateEffect(device, test_effect_states_effect_blob, sizeof(test_effect_states_effect_blob), NULL, NULL, 0, NULL, &effect, NULL); @@ -3086,6 +3101,8 @@ static void test_effect_states(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix does not match.\n"); + test_effect_clear_vconsts(device); + hr = effect->lpVtbl->BeginPass(effect, 0); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); @@ -4367,20 +4384,6 @@ static void test_effect_preshader_op_results_(unsigned int line, IDirect3DDevice } } -static const D3DXVECTOR4 fvect_filler = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; - -static void test_effect_preshader_clear_vconsts(IDirect3DDevice9 *device) -{ - unsigned int i; - HRESULT hr; - - for (i = 0; i < 256; ++i) - { - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, i, &fvect_filler.x, 1); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - } -} - static const D3DXVECTOR4 test_effect_preshader_fvect_v[] = { {0.0f, 0.0f, 0.0f, 0.0f}, @@ -4588,7 +4591,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); for (i = 0; i < 224; ++i) { @@ -5443,7 +5446,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) for (i = 0; i < ARRAY_SIZE(check_vconsts_parameters); ++i) { - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, check_vconsts_parameters[i].param_name); ok(!!param, "GetParameterByName failed.\n"); hr = effect->lpVtbl->GetValue(effect, param, buffer, sizeof(buffer)); @@ -5473,7 +5476,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) check_bconsts_parameters[i].param_name); } - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Selector"); ok(!!param, "GetParameterByName failed.\n"); fvect.x = fvect.y = fvect.z = fvect.w = 0.0f; @@ -5484,7 +5487,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[0].const_updated_mask, check_vconsts_parameters[0].param_name); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "arr2"); ok(!!param, "GetParameterByName failed.\n"); param = effect->lpVtbl->GetParameterElement(effect, param, 0); @@ -5496,7 +5499,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, const_no_update_mask, check_vconsts_parameters[10].param_name); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "arr2"); ok(!!param, "GetParameterByName failed.\n"); param = effect->lpVtbl->GetParameterElement(effect, param, 1); @@ -5509,7 +5512,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[10].const_updated_mask, check_vconsts_parameters[10].param_name); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "arr2"); ok(!!param, "GetParameterByName failed.\n"); fvect.x = 92.0f; @@ -5520,7 +5523,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[10].const_updated_mask, check_vconsts_parameters[10].param_name); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "arr2"); ok(!!param, "GetParameterByName failed.\n"); param = effect->lpVtbl->GetParameterElement(effect, param, 1); @@ -5532,7 +5535,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, const_no_update_mask, check_vconsts_parameters[10].param_name); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Pos1"); ok(!!param, "GetParameterByName failed.\n"); fvect.x = fvect.y = fvect.z = fvect.w = 0.0f; @@ -5543,7 +5546,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[1].const_updated_mask, check_vconsts_parameters[1].param_name); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "ts1"); ok(!!param, "GetParameterByName failed.\n"); param = effect->lpVtbl->GetParameterElement(effect, param, 0); @@ -5567,7 +5570,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, value); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "ts2"); ok(!!param, "GetParameterByName failed.\n"); param = effect->lpVtbl->GetParameterElement(effect, param, 0); @@ -5604,7 +5607,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, value); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "ts3"); ok(!!param, "GetParameterByName failed.\n"); param = effect->lpVtbl->GetParameterByName(effect, param, "ts"); @@ -5666,7 +5669,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -6723,7 +6726,7 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); } - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); fvect.x = fvect.y = fvect.z = fvect.w = 28.0f; hr = effect2->lpVtbl->SetVector(effect2, "g_Pos1", &fvect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -6822,7 +6825,7 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) hr = effect1->lpVtbl->SetFloatArray(effect1, "arr2", fval, 2); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); hr = effect1->lpVtbl->CommitChanges(effect1); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -6832,7 +6835,7 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) fvect.x = -1.0f; test_effect_shared_parameters_compare_vconst(device, 30, &fvect, FALSE); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); hr = effect1->lpVtbl->CommitChanges(effect1); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7131,7 +7134,7 @@ static void test_effect_skip_constants(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetFloat(effect, "v5", 32.0f); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_clear_vconsts(device); + test_effect_clear_vconsts(device); hr = effect->lpVtbl->Begin(effect, &passes_count, 0); ok(hr == D3D_OK, "Got result %#x.\n", hr); -- 2.20.1

2 5

[PATCH] wined3d: Mark dcl_input_ps_{siv, sgv} shader instructions as implemented.
by Józef Kucia Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c83d5f697f1e..9f9d54c99c20 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11415,8 +11415,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PS */ shader_glsl_nop, - /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, - /* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL, + /* WINED3DSIH_DCL_INPUT_PS_SGV */ shader_glsl_nop, + /* WINED3DSIH_DCL_INPUT_PS_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_SGV */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INTERFACE */ NULL, -- 2.19.2

2 1

[PATCH] wined3d: Correct indices for contained states in wined3d_stateblock_apply().
by Zebediah Figura Feb. 13, 2019

Feb. 13, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46602 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 49 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 65f953f5a6..cd57e6cc9a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1040,21 +1040,24 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) { - state->vs_consts_f[i] = stateblock->stateblock_state.vs_consts_f[i]; - wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], - 1, &stateblock->stateblock_state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); + unsigned int idx = stateblock->contained_vs_consts_f[i]; + + state->vs_consts_f[idx] = stateblock->stateblock_state.vs_consts_f[idx]; + wined3d_device_set_vs_consts_f(device, idx, 1, &stateblock->stateblock_state.vs_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { - state->vs_consts_i[i] = stateblock->stateblock_state.vs_consts_i[i]; - wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - 1, &stateblock->stateblock_state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); + unsigned int idx = stateblock->contained_vs_consts_i[i]; + + state->vs_consts_i[idx] = stateblock->stateblock_state.vs_consts_i[idx]; + wined3d_device_set_vs_consts_i(device, idx, 1, &stateblock->stateblock_state.vs_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { - state->vs_consts_b[i] = stateblock->stateblock_state.vs_consts_b[i]; - wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], - 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); + unsigned int idx = stateblock->contained_vs_consts_b[i]; + + state->vs_consts_b[idx] = stateblock->stateblock_state.vs_consts_b[idx]; + wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); } for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state.light_map); ++i) @@ -1087,29 +1090,33 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Pixel Shader Constants. */ for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) { - state->ps_consts_f[i] = stateblock->stateblock_state.ps_consts_f[i]; - wined3d_device_set_ps_consts_f(device, stateblock->contained_ps_consts_f[i], - 1, &stateblock->stateblock_state.ps_consts_f[stateblock->contained_ps_consts_f[i]]); + unsigned int idx = stateblock->contained_ps_consts_f[i]; + + state->ps_consts_f[idx] = stateblock->stateblock_state.ps_consts_f[idx]; + wined3d_device_set_ps_consts_f(device, idx, 1, &stateblock->stateblock_state.ps_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { - state->ps_consts_i[i] = stateblock->stateblock_state.ps_consts_i[i]; - wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - 1, &stateblock->stateblock_state.ps_consts_i[stateblock->contained_ps_consts_i[i]]); + unsigned int idx = stateblock->contained_ps_consts_i[i]; + + state->ps_consts_i[idx] = stateblock->stateblock_state.ps_consts_i[idx]; + wined3d_device_set_ps_consts_i(device, idx, 1, &stateblock->stateblock_state.ps_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { - state->ps_consts_b[i] = stateblock->stateblock_state.ps_consts_b[i]; - wined3d_device_set_ps_consts_b(device, stateblock->contained_ps_consts_b[i], - 1, &stateblock->stateblock_state.ps_consts_b[stateblock->contained_ps_consts_b[i]]); + unsigned int idx = stateblock->contained_ps_consts_b[i]; + + state->ps_consts_b[idx] = stateblock->stateblock_state.ps_consts_b[idx]; + wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); } /* Render states. */ for (i = 0; i < stateblock->num_contained_render_states; ++i) { - state->rs[i] = stateblock->stateblock_state.rs[i]; - wined3d_device_set_render_state(device, stateblock->contained_render_states[i], - stateblock->stateblock_state.rs[stateblock->contained_render_states[i]]); + enum wined3d_render_state rs = stateblock->contained_render_states[i]; + + state->rs[rs] = stateblock->stateblock_state.rs[rs]; + wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } /* Texture states. */ -- 2.20.1

3 2

[PATCH] d3d11/tests: Remove useless casts to self
by Michael Stefaniuc Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3c870c27e7..90e213801d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2198,7 +2198,7 @@ static void test_create_texture1d(void) desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, (ID3D11Texture1D **)&texture); + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D11Texture1D_Release(texture); @@ -2572,7 +2572,7 @@ static void test_create_texture2d(void) desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; desc.MiscFlags = tests[i].misc_flags; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); todo_wine_if(todo) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x (format %#x).\n", @@ -2845,7 +2845,7 @@ static void test_create_texture3d(void) { desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; - hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, (ID3D11Texture3D **)&texture); + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -8536,8 +8536,8 @@ static void test_cube_maps(void) { for (j = 0; j < ARRAY_SIZE(data); ++j) data[j] = sub_resource_idx; - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, sub_resource_idx, NULL, - data, texture_desc.Width * sizeof(*data), 0); + ID3D11DeviceContext_UpdateSubresource(context, texture, sub_resource_idx, NULL, data, + texture_desc.Width * sizeof(*data), 0); } expected_result.y = expected_result.z = 0.0f; @@ -21352,7 +21352,7 @@ static void test_sampleinfo_instruction(void) continue; } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); @@ -21388,7 +21388,7 @@ static void test_sampleinfo_instruction(void) continue; } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); -- 2.20.1

3 2

[PATCH] d3d10/tests: Remove useless casts to self
by Michael Stefaniuc Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/tests/effect.c | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 0ca7a48c3f..e2b27cf0c8 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -1449,7 +1449,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1481,7 +1481,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(constantbuffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -1513,7 +1513,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 4, "BufferOffset is %u, expected 4\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(constantbuffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -1545,7 +1545,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 16, "BufferOffset is %u, expected 16\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(constantbuffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -1577,7 +1577,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 64, "BufferOffset is %u, expected 64\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(constantbuffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -1609,7 +1609,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1641,7 +1641,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1673,7 +1673,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1705,7 +1705,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1737,7 +1737,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1769,7 +1769,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1801,7 +1801,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1833,7 +1833,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1865,7 +1865,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1897,7 +1897,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1929,7 +1929,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1961,7 +1961,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -1993,7 +1993,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -2025,7 +2025,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -2057,7 +2057,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -2089,7 +2089,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); @@ -2121,7 +2121,7 @@ static void test_effect_variable_type_class(void) ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); - check_as((ID3D10EffectVariable *)variable); + check_as(variable); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); -- 2.20.1

2 1