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

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

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

2 1

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

Oct. 29, 2019

2 1

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

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

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