wine-devel October 2019

wine-devel@winehq.org

80 participants
669 discussions

[PATCH] t2embed: Use a wchar string literal instead of a temp variable
by Michael Stefaniuc 29 Oct '19

29 Oct '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/t2embed/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e47884611c..1200564028 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -107,8 +107,6 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) { - static const WCHAR exclusionlistW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'S','h','a','r','e','d',' ','T','o','o','l','s','\\','t','2','e','m','b','e','d',0}; DWORD index; HKEY hkey; LONG ret; @@ -122,7 +120,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) return E_PBENABLEDINVALID; *enabled = TRUE; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Shared Tools\\t2embed", 0, GENERIC_READ, &hkey)) goto out; *enabled = TRUE; -- 2.20.1

1 0

[PATCH] mfreadwrite: Use wchar string literals instead of temp variables
by Michael Stefaniuc 29 Oct '19

29 Oct '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfreadwrite/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 6859af8d53..3467746bb8 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -1123,8 +1123,6 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) static const UINT8 asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; static const UINT8 wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; static const UINT8 wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; - static const WCHAR asfW[] = {'.','a','s','f',0}; - static const WCHAR wavW[] = {'.','w','a','v',0}; static const struct stream_content_url_hint { const UINT8 *magic; @@ -1134,8 +1132,8 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) } url_hints[] = { - { asfmagic, sizeof(asfmagic), asfW }, - { wavmagic, sizeof(wavmagic), wavW, wavmask }, + { asfmagic, sizeof(asfmagic), L".asf" }, + { wavmagic, sizeof(wavmagic), L".wav", wavmask }, }; UINT8 buffer[4 * sizeof(unsigned int)]; IMFAttributes *attributes; -- 2.20.1

1 0

[PATCH] dmsynth: Use a wchar string literal instead of a temp variable
by Michael Stefaniuc 29 Oct '19

29 Oct '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index ebc92afdf0..6d2c778a74 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -574,8 +574,6 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) { - static const WCHAR descrW[] = {'M','i','c','r','o','s','o','f','t',' ', - 'S','y','n','t','h','e','s','i','z','e','r',0}; IDirectMusicSynth8Impl *obj; HRESULT hr; @@ -600,7 +598,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->pCaps.dwMaxVoices = 1000; obj->pCaps.dwMaxAudioChannels = 2; obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - lstrcpyW(obj->pCaps.wszDescription, descrW); + lstrcpyW(obj->pCaps.wszDescription, L"Microsoft Synthesizer"); DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); -- 2.20.1

1 0

[PATCH v2] atl: Fix a MSVC-x64 warning about wci.
by Serge Gautherie 29 Oct '19

29 Oct '19

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\atl30.c(316): warning C4477: 'sprintf' : format string '%08lx' requires an argument of type 'unsigned long', but variadic argument 1 has type 'UINT_PTR'" --- dlls/atl/atl30.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index c2db138..d30a4cd 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -313,7 +313,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { - sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); + sprintf(wci->m_szAutoName, "ATL%08lx", PtrToUlong(wci)); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -373,7 +373,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - swprintf(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci); + swprintf(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, PtrToUlong(wci)); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } -- 2.10.0.windows.1

1 0

[PATCH 3/3] msi/tests: Remove workarounds for Windows 2000.
by Hans Leidekker 29 Oct '19

29 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/msi.c | 84 +++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 56d2ead365..39a6638118 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1318,8 +1318,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}"); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); /* same length as guid, but random */ SetLastError(0xdeadbeef); @@ -1334,8 +1333,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); @@ -1348,8 +1346,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"); lstrcatA(keypath, prodcode); @@ -1370,8 +1367,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); data = 1; res = RegSetValueExA(localkey, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); @@ -1382,8 +1378,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); RegDeleteValueA(localkey, "WindowsInstaller"); delete_key(localkey, "", access & KEY_WOW64_64KEY); @@ -1409,8 +1404,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1420,8 +1414,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); data = 1; res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); @@ -1445,8 +1438,7 @@ static void test_MsiQueryProductState(void) return; } ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); data = 2; res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); @@ -1457,8 +1449,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); RegDeleteKeyA(userkey, ""); @@ -1467,8 +1458,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); RegDeleteValueA(props, "WindowsInstaller"); delete_key(props, "", access & KEY_WOW64_64KEY); @@ -1689,8 +1679,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}", "feature"); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_ALREADY_EXISTS) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); /* same length as guid, but random */ SetLastError(0xdeadbeef); @@ -1711,16 +1700,14 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, ""); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); /* feature key does not exist yet */ SetLastError(0xdeadbeef); state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); /* MSIINSTALLCONTEXT_USERUNMANAGED */ @@ -1735,8 +1722,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1746,8 +1732,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\"); lstrcatA(keypath, usersid); @@ -1771,8 +1756,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1781,8 +1765,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaa", 21); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1791,8 +1774,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaaa", 22); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1801,8 +1783,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1811,8 +1792,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\"); lstrcatA(keypath, usersid); @@ -1834,8 +1814,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1844,8 +1823,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1854,8 +1832,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1865,8 +1842,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01\\", 4); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1876,8 +1852,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1887,8 +1862,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01a", 4); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1898,8 +1872,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1909,8 +1882,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, - "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); RegDeleteValueA(compkey, prod_squashed); RegDeleteValueA(compkey2, prod_squashed); -- 2.20.1

2 1

[PATCH 2/3] msi/tests: Run the package tests from a temporary directory.
by Hans Leidekker 29 Oct '19

29 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/package.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ba1b83a6fb..3c547bf04a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9640,15 +9640,25 @@ static void test_top_level_action(void) START_TEST(package) { + char temp_path[MAX_PATH], prev_path[MAX_PATH]; STATEMGRSTATUS status; BOOL ret = FALSE; + DWORD len; init_functionpointers(); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPathA(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + lstrcpyA(CURR_DIR, temp_path); + len = lstrlenA(CURR_DIR); + + if (len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. @@ -9706,4 +9716,6 @@ START_TEST(package) if (ret) remove_restore_point(status.llSequenceNumber); } + + SetCurrentDirectoryA(prev_path); } -- 2.20.1

2 1

[PATCH 1/3] msi/tests: Fix test failures.
by Hans Leidekker 29 Oct '19

29 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/msi.c | 120 ++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/package.c | 9 +++ dlls/msi/tests/source.c | 21 +++++++ 3 files changed, 149 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 393ad08303..56d2ead365 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1431,6 +1431,19 @@ static void test_MsiQueryProductState(void) SetLastError(0xdeadbeef); state = MsiQueryProductStateA(prodcode); error = GetLastError(); + if (state == INSTALLSTATE_ADVERTISED) + { + win_skip("broken result\n"); + RegDeleteValueA(props, "WindowsInstaller"); + delete_key(props, "", access & KEY_WOW64_64KEY); + RegCloseKey(props); + delete_key(localkey, "", access & KEY_WOW64_64KEY); + RegCloseKey(localkey); + RegDeleteKeyA(userkey, ""); + RegCloseKey(userkey); + LocalFree(usersid); + return; + } ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */, "expected ERROR_SUCCESS, got %u\n", error); @@ -1520,6 +1533,12 @@ static void test_MsiQueryProductState(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); state = MsiQueryProductStateA(prodcode); @@ -2018,6 +2037,12 @@ static void test_MsiQueryFeatureState(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &userkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* feature key exists */ @@ -2972,6 +2997,12 @@ static void test_MsiGetComponentPath(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local classes product key exists */ @@ -3317,6 +3348,12 @@ static void test_MsiGetComponentPathEx(void) lstrcatA( path_key, prod_squashed ); res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_prod, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok( res == ERROR_SUCCESS, "got %d\n", res ); /* local classes product key exists */ @@ -3739,6 +3776,12 @@ static void test_MsiGetProductCode(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local classes product key exists */ @@ -3834,6 +3877,12 @@ static void test_MsiGetProductCode(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local classes product key exists */ @@ -4687,6 +4736,12 @@ static void test_MsiGetProductInfo(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* classes product key exists */ @@ -8015,6 +8070,12 @@ static void test_MsiGetProductInfoEx(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local classes product key exists */ @@ -8894,6 +8955,12 @@ static void test_MsiGetUserInfo(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* product key exists */ @@ -9243,6 +9310,12 @@ static void test_MsiOpenProduct(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* managed product key exists */ @@ -12732,6 +12805,12 @@ static void test_MsiGetPatchInfoEx(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local product key exists */ @@ -13063,6 +13142,12 @@ static void test_MsiEnumProducts(void) HKEY key1, key2, key3; REGSAM access = KEY_ALL_ACCESS; + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + create_test_guid(product1, product_squashed1); create_test_guid(product2, product_squashed2); create_test_guid(product3, product_squashed3); @@ -13089,6 +13174,12 @@ static void test_MsiEnumProducts(void) strcat(keypath1, product_squashed1); r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); strcpy(keypath3, "Software\\Microsoft\\Installer\\Products\\"); @@ -13118,9 +13209,9 @@ static void test_MsiEnumProducts(void) if (!strcmp(product1, guid)) found1 = TRUE; if (!strcmp(product2, guid)) found2 = TRUE; if (!strcmp(product3, guid)) found3 = TRUE; + if (found1 && found2 && found3) break; index++; } - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r); ok(found1, "product1 not found\n"); ok(found2, "product2 not found\n"); ok(found3, "product3 not found\n"); @@ -13188,6 +13279,7 @@ static void test_MsiEnumProductsEx(void) HKEY key1 = NULL, key2 = NULL, key3 = NULL; REGSAM access = KEY_ALL_ACCESS; char *usersid = get_user_sid(); + BOOL found1, found2, found3; if (!pMsiEnumProductsExA) { @@ -13219,6 +13311,11 @@ static void test_MsiEnumProductsEx(void) strcat( keypath1, product_squashed1 ); r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } ok( r == ERROR_SUCCESS, "got %u\n", r ); strcpy( keypath3, usersid ); @@ -13303,6 +13400,7 @@ static void test_MsiEnumProductsEx(void) context = 0xdeadbeef; sid[0] = 0; len = sizeof(sid); + found1 = found2 = found3 = FALSE; while (!pMsiEnumProductsExA( NULL, "S-1-1-0", MSIINSTALLCONTEXT_ALL, index, guid, &context, sid, &len )) { if (!strcmp( product1, guid )) @@ -13310,25 +13408,32 @@ static void test_MsiEnumProductsEx(void) ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context ); ok( !sid[0], "got \"%s\"\n", sid ); ok( !len, "unexpected length %u\n", len ); + found1 = TRUE; } if (!strcmp( product2, guid )) { ok( context == MSIINSTALLCONTEXT_USERMANAGED, "got %u\n", context ); ok( sid[0], "empty sid\n" ); ok( len == strlen(sid), "unexpected length %u\n", len ); + found2 = TRUE; } if (!strcmp( product3, guid )) { ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context ); ok( sid[0], "empty sid\n" ); ok( len == strlen(sid), "unexpected length %u\n", len ); + found3 = TRUE; } + if (found1 && found2 && found3) break; index++; guid[0] = 0; context = 0xdeadbeef; sid[0] = 0; len = sizeof(sid); } + ok(found1, "product1 not found\n"); + ok(found2, "product2 not found\n"); + ok(found3, "product3 not found\n"); done: delete_key( key1, "", access ); @@ -13352,6 +13457,12 @@ static void test_MsiEnumComponents(void) char *usersid = get_user_sid(); HKEY key1 = NULL, key2 = NULL; + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + create_test_guid( comp1, comp_squashed1 ); create_test_guid( comp2, comp_squashed2 ); @@ -13392,6 +13503,7 @@ static void test_MsiEnumComponents(void) if (!strcmp( guid, comp1 )) found1 = TRUE; if (!strcmp( guid, comp2 )) found2 = TRUE; ok( guid[0], "empty guid\n" ); + if (found1 && found2) break; guid[0] = 0; index++; } @@ -13424,6 +13536,12 @@ static void test_MsiEnumComponentsEx(void) win_skip( "MsiEnumComponentsExA not implemented\n" ); return; } + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + create_test_guid( comp1, comp_squashed1 ); create_test_guid( comp2, comp_squashed2 ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 0604098ea1..ba1b83a6fb 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4055,6 +4055,15 @@ static void test_appsearch(void) r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, NULL, &hkey, NULL); ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + if (r == ERROR_ACCESS_DENIED) + { + skip("insufficient rights\n"); + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); + MsiCloseHandle(hdb); + DeleteFileA(msifile); + return; + } + r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", sizeof("c:\\windows\\system32\\notepad.exe")); ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 3d4a955005..32b5621e3b 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -31,6 +31,7 @@ #include <objbase.h> #include "wine/test.h" +#include "utils.h" static BOOL is_wow64; @@ -686,6 +687,11 @@ static void test_MsiSourceListAddSourceEx(void) win_skip("Skipping MsiSourceListAddSourceExA tests\n"); return; } + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } create_test_guid(prodcode, prod_squashed); if (!(usersid = get_user_sid())) @@ -1695,6 +1701,11 @@ static void test_MsiSourceListSetInfo(void) win_skip("MsiSourceListSetInfoA is not available\n"); return; } + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } create_test_guid(prodcode, prod_squashed); if (!(usersid = get_user_sid())) @@ -2126,6 +2137,11 @@ static void test_MsiSourceListAddMediaDisk(void) win_skip("MsiSourceListAddMediaDiskA is not available\n"); return; } + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } create_test_guid(prodcode, prod_squashed); if (!(usersid = get_user_sid())) @@ -3277,6 +3293,11 @@ static void test_MsiSourceListAddSource(void) win_skip("Skipping MsiSourceListAddSourceA tests\n"); return; } + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } create_test_guid(prodcode, prod_squashed); if (!(usersid = get_user_sid())) -- 2.20.1

2 1

[PATCH v3 2/2] dxgi: Implement dxgi_output_TakeOwnership.
by Zhiyi Zhang 29 Oct '19

29 Oct '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/output.c | 18 ++++++++++++++++-- dlls/dxgi/tests/dxgi.c | 20 ++++++++++++-------- dlls/wined3d/directx.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 5 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 9d50f193e0..9aae518541 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -364,9 +364,23 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) { - FIXME("iface %p, device %p, exclusive %d stub!\n", iface, device, exclusive); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct wined3d_output *wined3d_output; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); + + if (!device) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + if (SUCCEEDED(hr = wined3d_get_adapter_output(output->adapter->factory->wined3d, + output->adapter->ordinal, &wined3d_output))) + { + hr = wined3d_output_take_ownership(wined3d_output, exclusive); + } + wined3d_mutex_unlock(); + return hr; } static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index cbb5806e2d..b05e7f8bf9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5611,10 +5611,14 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); else wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); @@ -5624,16 +5628,16 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) goto done; hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ @@ -5646,11 +5650,11 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6c1393b17b..5999a88137 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -889,6 +889,37 @@ void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) D3DKMTSetVidPnSourceOwner(&set_owner_desc); } +HRESULT CDECL wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + NTSTATUS status; + + TRACE("output %p, exclusive %d.\n", output, exclusive); + + owner_type = exclusive ? D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE : D3DKMT_VIDPNSOURCEOWNER_SHARED; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &output->vidpn_source_id; + set_owner_desc.VidPnSourceCount = 1; + set_owner_desc.hDevice = output->kmt_device; + status = D3DKMTSetVidPnSourceOwner(&set_owner_desc); + + switch (status) + { + case STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + case STATUS_INVALID_PARAMETER: + return E_INVALIDARG; + case STATUS_PROCEDURE_NOT_FOUND: + return E_NOINTERFACE; + case STATUS_SUCCESS: + return S_OK; + default: + FIXME("Unhandled error %#x.\n", status); + return E_FAIL; + } +} + /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 66c36dc745..0909bffd78 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -21,6 +21,7 @@ @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_output_release_ownership(ptr) +@ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 650dffd9f3..2fc7f818cd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2211,6 +2211,7 @@ HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, HRESULT __cdecl wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output **output); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); +HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, -- 2.23.0

2 1

[PATCH 7/7] ddraw/tests: Port TnLHal device test to ddraw7.c
by David Adam 29 Oct '19

29 Oct '19

2 1

[PATCH 6/7 v2] ddraw/tests: Port the test that RGB device is enumerated
by David Adam 29 Oct '19

29 Oct '19

2 1

[PATCH 3/4] vbscript: Add support for interpreting statements.
by Jacek Caban 29 Oct '19

29 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 41 +++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 20 +++++++++++++++++ dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript.rc | 1 + dlls/vbscript/vbscript_defs.h | 1 + 5 files changed, 64 insertions(+)

1 0

[PATCH 2/4] vbscript: Add support for parsing with statement.
by Jacek Caban 29 Oct '19

29 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 11 ++++++++++- dlls/vbscript/parse.h | 8 ++++++++ dlls/vbscript/parser.y | 22 ++++++++++++++++++++-- 3 files changed, 38 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] vbscript: Use wide char literals for lexer keywords.
by Jacek Caban 29 Oct '19

29 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 172 +++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 115 deletions(-)

1 0

[PATCH 1/7] vbscript: Store non-persistent code into the script dispatch object.
by Gabriel Ivăncescu 29 Oct '19

29 Oct '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These patches correct the implementation so that it passes the tests at the end of the series. Some changes are done to simplify the next patch in the series. I haven't sent the linked list->array conversion yet, because that is not a functional change, just an optimization, so it will come after this is corrected first. dlls/vbscript/compile.c | 3 ++- dlls/vbscript/vbdisp.c | 5 +++++ dlls/vbscript/vbscript.c | 12 ++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2023261..fc94998 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1948,7 +1948,6 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli ctx.code = NULL; release_compiler(&ctx); - list_add_tail(&script->code_list, &code->entry); *ret = code; return S_OK; } @@ -1975,6 +1974,8 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d desc->next = script->procs; script->procs = desc; + list_add_tail(&script->script_obj->code_list, &code->entry); + *ret = desc; return S_OK; } diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1dd6d4e..7859abf 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -616,6 +616,10 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) if(!ref) { assert(!This->ctx); + + while (!list_empty(&This->code_list)) + release_vbscode(LIST_ENTRY(list_head(&This->code_list), vbscode_t, entry)); + heap_free(This->ident_map); heap_free(This); } @@ -827,6 +831,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) script_disp->IDispatchEx_iface.lpVtbl = &ScriptDispVtbl; script_disp->ref = 1; script_disp->ctx = ctx; + list_init(&script_disp->code_list); *ret = script_disp; return S_OK; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 56c53b4..ca594f1 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -94,6 +94,10 @@ static void exec_queued_code(script_ctx_t *ctx) if(iter->pending_exec) exec_global_code(ctx, iter, NULL); } + LIST_FOR_EACH_ENTRY(iter, &ctx->script_obj->code_list, vbscode_t, entry) { + if(iter->pending_exec) + exec_global_code(ctx, iter, NULL); + } } IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) @@ -764,6 +768,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, { VBScript *This = impl_from_IActiveScriptParse(iface); IDispatch *context = NULL; + struct list *list; vbscode_t *code; HRESULT hres; @@ -786,6 +791,13 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(FAILED(hres)) return hres; + if(dwFlags & SCRIPTTEXT_ISPERSISTENT) + list = &This->ctx->code_list; + else + list = &This->ctx->script_obj->code_list; + + list_add_tail(list, &code->entry); + if(context) IDispatch_AddRef(code->context = context); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 33eb1e8..cfa7469 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -131,6 +131,7 @@ typedef struct { unsigned ident_map_size; script_ctx_t *ctx; + struct list code_list; } ScriptDisp; typedef struct _builtin_prop_t builtin_prop_t; -- 2.21.0

1 7

[PATCH 5/7 v2] ddraw/tests: Test available devices in Enumdevices
by David Adam 29 Oct '19

29 Oct '19

Enumeration of devices was checked in real boxes and device was enumerated once at least: windows 10, windows 8, windows XP and windows98. The last one is worth of checking I think, since old interfaces were used in this old windows only. And some games work only in this box.

2 1

[PATCH 5/7] ddraw/tests: Test available devices in Enumdevices
by David Adam 29 Oct '19

29 Oct '19

2 5

[PATCH 4/7 v2] ddraw/tests: Port life time tests in Enumdevices to ddraw*.c files
by David Adam 29 Oct '19

29 Oct '19

2 1

[PATCH 3/7 v2] ddraw/tests: Port tests for the cancellation of enumeration in Enumdevices in ddraw* files
by David Adam 29 Oct '19

29 Oct '19

2 1

[PATCH 4/7] ddraw/tests: Port life time tests in Enumdevices to ddraw*.c files
by David Adam 29 Oct '19

29 Oct '19

2 4

[PATCH 3/7] ddraw/tests: Port tests for the cancellation of enumeration in Enumdevices in ddraw* files
by David Adam 29 Oct '19

29 Oct '19

2 3

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_transform().
by Zebediah Figura 29 Oct '19

29 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index fe49fd6754..41c97b5020 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1508,6 +1508,19 @@ void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, stateblock->changed.textures |= 1u << stage; } +void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix) +{ + TRACE("stateblock %p, state %s, matrix %p.\n", stateblock, debug_d3dtstype(d3dts), matrix); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_11, matrix->_12, matrix->_13, matrix->_14); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_21, matrix->_22, matrix->_23, matrix->_24); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_31, matrix->_32, matrix->_33, matrix->_34); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); + + stateblock->stateblock_state.transforms[d3dts] = *matrix; + stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d0ba31bf4e..297d3a0410 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,6 +268,7 @@ @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) @ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) +@ cdecl wined3d_stateblock_set_transform(ptr long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a567cfd2f1..298cb3b270 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2677,6 +2677,8 @@ void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *sta void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value); +void __cdecl wined3d_stateblock_set_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); -- 2.23.0

3 9

[PATCH] d3d8: Fix stream data skip count in convert_to_wined3d_declaration().
by Paul Gofman 29 Oct '19

29 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40364 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d8/tests/visual.c | 17 ++++++++++++----- dlls/d3d8/vertexdeclaration.c | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fc7c3cc293..310ffc59e4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7813,13 +7813,19 @@ static void test_vshader_input(void) {{ 0.0f, 0.0f, 0.1f}, 0x00ff8040}, {{ 1.0f, -1.0f, 0.1f}, 0x00ff8040}, {{ 1.0f, 0.0f, 0.1f}, 0x00ff8040}, - }, + }; + static const struct + { + struct vec3 position; + struct vec3 dummy; /* testing D3DVSD_SKIP */ + DWORD diffuse; + } quad3_color[] = { - {{-1.0f, 0.0f, 0.1f}, 0x00ff8040}, - {{-1.0f, 1.0f, 0.1f}, 0x00ff8040}, - {{ 0.0f, 0.0f, 0.1f}, 0x00ff8040}, - {{ 0.0f, 1.0f, 0.1f}, 0x00ff8040}, + {{-1.0f, 0.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{-1.0f, 1.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{ 0.0f, 0.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{ 0.0f, 1.0f, 0.1f}, {0.0f}, 0x00ff8040}, }; static const float quad4_color[] = { @@ -7870,6 +7876,7 @@ static void test_vshader_input(void) { D3DVSD_STREAM(0), D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position */ + D3DVSD_SKIP(3), /* not used */ D3DVSD_REG(5, D3DVSDT_D3DCOLOR), /* diffuse */ D3DVSD_END() }; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index a43fb26f95..525666d680 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -291,8 +291,8 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 offset += wined3d_type_sizes[type]; } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (*token & D3DVSD_DATALOADTYPEMASK)) { - TRACE(" 0x%08x SKIP(%u)\n", token_type, ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); - offset += sizeof(DWORD) * ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); + TRACE(" 0x%08x SKIP(%u)\n", *token, (*token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); + offset += sizeof(DWORD) * ((*token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); } if (element_count >= 127) { -- 2.21.0

2 1

[PATCH 2/7 v2] ddraw/tests: Test the name of devices in Enumdevices
by David Adam 29 Oct '19

29 Oct '19

2 1

vkd3d: RegisterSpace != 0 is not handled.
by Hans-Kristian Arntzen 29 Oct '19

29 Oct '19

Hi. I was trying to get Control to run in DX12 mode, and the game tries to create a PSO where a descriptor table has RegisterSpace != 0. vk_binding_from_d3d12_descriptor_range() complains about this and CreateRootSignature fails as a result. Is this a simple TODO which just hasn't been needed up until now, or will this be very difficult to support? Cheers, Hans-Kristian

2 2

[PATCH v3 1/2] dxgi: Implement dxgi_output_ReleaseOwnership.
by Zhiyi Zhang 29 Oct '19

29 Oct '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Make wined3d_adapter owns wined3d_output. Supersede 171976~171977 dlls/dxgi/output.c | 13 ++++++- dlls/wined3d/directx.c | 67 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_private.h | 12 ++++++ include/wine/wined3d.h | 4 ++ 5 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index a66628cc60..9d50f193e0 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -371,7 +371,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) { - FIXME("iface %p stub!\n", iface); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct wined3d_output *wined3d_output; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + if (SUCCEEDED(wined3d_get_adapter_output(output->adapter->factory->wined3d, + output->adapter->ordinal, &wined3d_output))) + { + wined3d_output_release_ownership(wined3d_output); + } + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 726b1e3775..6c1393b17b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -74,6 +74,7 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { + wined3d_output_destroy(&adapter->output); heap_free(adapter->formats); } @@ -827,6 +828,67 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } +HRESULT wined3d_output_create(const WCHAR *adapter_name, struct wined3d_output *output) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; + D3DKMT_CREATEDEVICE create_device_desc = {0}; + D3DKMT_CLOSEADAPTER close_adapter_desc; + + TRACE("adapter_name %s, output %p.\n", wine_dbgstr_w(adapter_name), output); + + lstrcpyW(open_adapter_desc.DeviceName, adapter_name); + if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc)) + return E_INVALIDARG; + + create_device_desc.u.hAdapter = open_adapter_desc.hAdapter; + if (D3DKMTCreateDevice(&create_device_desc)) + { + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + D3DKMTCloseAdapter(&close_adapter_desc); + return E_FAIL; + } + + output->kmt_adapter = open_adapter_desc.hAdapter; + output->kmt_device = create_device_desc.hDevice; + output->vidpn_source_id = open_adapter_desc.VidPnSourceId; + return WINED3D_OK; +} + +void wined3d_output_destroy(const struct wined3d_output *output) +{ + D3DKMT_DESTROYDEVICE destroy_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + + TRACE("output %p.\n", output); + + destroy_device_desc.hDevice = output->kmt_device; + D3DKMTDestroyDevice(&destroy_device_desc); + close_adapter_desc.hAdapter = output->kmt_adapter; + D3DKMTCloseAdapter(&close_adapter_desc); +} + +HRESULT CDECL wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx, + struct wined3d_output **output) +{ + TRACE("wined3d %p, adapter_idx %u, output %p.\n", wined3d, adapter_idx, output); + + if (adapter_idx >= wined3d->adapter_count) + return WINED3DERR_INVALIDCALL; + + *output = &wined3d->adapters[adapter_idx]->output; + return WINED3D_OK; +} + +void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + + TRACE("output %p.\n", output); + + set_owner_desc.hDevice = output->kmt_device; + D3DKMTSetVidPnSourceOwner(&set_owner_desc); +} + /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ @@ -2722,6 +2784,11 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->device_name, display_device.DeviceName); + if (FAILED(wined3d_output_create(adapter->device_name, &adapter->output))) + { + ERR("Failed to create output.\n"); + return FALSE; + } if (!AllocateLocallyUniqueId(&adapter->luid)) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d0ba31bf4e..66c36dc745 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -15,10 +15,12 @@ @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_adapter_mode_count(ptr long long long) +@ cdecl wined3d_get_adapter_output(ptr long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) +@ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eaa6493ac4..85e2cc2e27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2860,6 +2860,17 @@ struct wined3d_adapter_ops struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; +HRESULT wined3d_output_create(const WCHAR *adapter_name, struct wined3d_output *output) DECLSPEC_HIDDEN; +void wined3d_output_destroy(const struct wined3d_output *output) DECLSPEC_HIDDEN; + +/* The output structure */ +struct wined3d_output +{ + D3DKMT_HANDLE kmt_adapter; + D3DKMT_HANDLE kmt_device; + D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; +}; + /* The adapter structure */ struct wined3d_adapter { @@ -2870,6 +2881,7 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; + struct wined3d_output output; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a567cfd2f1..650dffd9f3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2120,6 +2120,7 @@ struct wined3d_device; struct wined3d_palette; struct wined3d_query; struct wined3d_blend_state; +struct wined3d_output; struct wined3d_rasterizer_state; struct wined3d_rendertarget_view; struct wined3d_resource; @@ -2207,6 +2208,9 @@ UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); +HRESULT __cdecl wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx, + struct wined3d_output **output); +void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, -- 2.23.0

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2019