November 2018 - Wine-Commits

Józef Kucia : wined3d: Use wined3d_cs_finish() in swapchain_cleanup().
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: f44e09b1826ecac2426666388514e453100714b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f44e09b1826ecac242666638… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 14:43:08 2018 +0100 wined3d: Use wined3d_cs_finish() in swapchain_cleanup(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6ed4f89..344a186 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -66,7 +66,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) } wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); - swapchain->device->cs->ops->finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating

1 0

Fabian Maurer : user32: LoadImage should not only search in the working directory.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 400dd1596ab7946e68278b3f8dc7c87b898c7e9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=400dd1596ab7946e68278b3f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Nov 28 22:39:49 2018 +0100 user32: LoadImage should not only search in the working directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46186 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 8 +++- dlls/user32/tests/cursoricon.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f11f5e4..539fc7c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3039,11 +3039,17 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { int depth; + WCHAR path[MAX_PATH]; TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); - if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; + if (loadflags & LR_LOADFROMFILE) + { + loadflags &= ~LR_SHARED; + /* relative paths are not only relative to the current working directory */ + if (SearchPathW(NULL, name, NULL, ARRAY_SIZE(path), path, NULL)) name = path; + } switch (type) { case IMAGE_BITMAP: return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8404ee7..405856c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,6 +1203,92 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } +void test_LoadImage_working_directory_run(char *path) +{ + DWORD bytes_written; + HANDLE handle; + BOOL ret; + char path_icon[MAX_PATH]; + char path_image[MAX_PATH]; + static const test_icon_entries_t icon_desc = {32, 32}; + + sprintf(path_icon, "%s\\icon.ico", path); + sprintf(path_image, "%s\\test.bmp", path); + + /* Create Files */ + create_ico_file(path_icon, &icon_desc, 1); + + handle = CreateFileA(path_image, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "run %s: CreateFileA failed. %u\n", path, GetLastError()); + ret = WriteFile(handle, bmpimage, sizeof(bmpimage), &bytes_written, NULL); + ok(ret && bytes_written == sizeof(bmpimage), "run %s: Test file created improperly.\n", path); + CloseHandle(handle); + + /* Test cursor */ + handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImage() failed.\n", path); + + ret = DestroyIcon(handle); + ok(ret, "run %s: DestroyIcon failed: %d\n", path, GetLastError()); + + /* Test image */ + handle = LoadImageA(NULL, "test.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImageA failed.\n", path); + + ret = DeleteObject(handle); + ok(ret, "run %s: DeleteObject failed: %d\n", path, GetLastError()); + + /* Cleanup */ + ret = DeleteFileA(path_image); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); + ret = DeleteFileA(path_icon); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); +} + +static void test_LoadImage_working_directory(void) +{ + char old_working_dir[MAX_PATH]; + char temp_dir_current[MAX_PATH]; + char temp_dir_PATH[MAX_PATH]; + char executable_path[MAX_PATH]; + int pos_slash; + char old_PATH[10000]; + char new_PATH[10000]; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(old_working_dir), old_working_dir); + + GetTempPathA(ARRAY_SIZE(temp_dir_current), temp_dir_current); + strcat(temp_dir_current, "wine-test-dir-current\\"); + GetTempPathA(ARRAY_SIZE(temp_dir_PATH), temp_dir_PATH); + strcat(temp_dir_PATH, "wine-test-dir-path\\"); + + GetModuleFileNameA(NULL, executable_path, ARRAY_SIZE(executable_path)); + pos_slash = strrchr(executable_path, '\\') - executable_path; + executable_path[pos_slash + 1] = 0; + + CreateDirectoryA(temp_dir_current, NULL); + CreateDirectoryA(temp_dir_PATH, NULL); + + SetCurrentDirectoryA(temp_dir_current); + + GetEnvironmentVariableA("PATH", old_PATH, ARRAY_SIZE(old_PATH)); + sprintf(new_PATH, "%s;%s", old_PATH, temp_dir_PATH); + SetEnvironmentVariableA("PATH", new_PATH); + + test_LoadImage_working_directory_run(temp_dir_current); + test_LoadImage_working_directory_run(executable_path); + test_LoadImage_working_directory_run(temp_dir_PATH); + + SetCurrentDirectoryA(old_working_dir); + SetEnvironmentVariableA("PATH", old_PATH); + + ret = RemoveDirectoryA(temp_dir_current); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); + ret = RemoveDirectoryA(temp_dir_PATH); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_LoadImage(void) { HANDLE handle; @@ -1326,6 +1412,9 @@ static void test_LoadImage(void) bitmap_header->biSize = sizeof(BITMAPINFOHEADER); test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); + + /* Test in which paths images with a relative path can be found */ + test_LoadImage_working_directory(); } static void test_CreateIconFromResource(void)

1 0

Józef Kucia : d3d9: Remove dead code from indexbuffer_init() (Coverity).
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 92c5d32ef4a2dad74a162232f6e53f9735a8e1b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92c5d32ef4a2dad74a162232… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 11:31:32 2018 +0100 d3d9: Remove dead code from indexbuffer_init() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 219ee43..02b3570 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -597,8 +597,6 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;

1 0

Alex Henrie : mscoree: Make several string constants static.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: e078e1654cb952d2fa0245b5b33384ac42cc32e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e078e1654cb952d2fa0245b5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:10 2018 -0700 mscoree: Make several string constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 4 ++-- dlls/mscoree/mscoree_main.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 0f88b0f..422ca31 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -446,8 +446,8 @@ static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface, static BOOL get_install_root(LPWSTR install_dir) { - const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; - const WCHAR install_root[] = {'I','n','s','t','a','l','l','R','o','o','t',0}; + static const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; + static const WCHAR install_root[] = {'I','n','s','t','a','l','l','R','o','o','t',0}; DWORD len; HKEY key; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 5612ff6..234afe4 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -72,8 +72,8 @@ char *WtoA(LPCWSTR wstr) static BOOL get_install_root(LPWSTR install_dir) { - const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; - const WCHAR install_root[] = {'I','n','s','t','a','l','l','R','o','o','t',0}; + static const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; + static const WCHAR install_root[] = {'I','n','s','t','a','l','l','R','o','o','t',0}; DWORD len; HKEY key; @@ -564,7 +564,7 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv) { - const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; + static const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; HRESULT hr = E_FAIL; ICLRRuntimeInfo *runtimeinfo;

1 0

Alex Henrie : mshtml: Turn several constants and variables into static constants.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 31deafe153143745ca23d7556e94340b73413b31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31deafe153143745ca23d755… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:11 2018 -0700 mshtml: Turn several constants and variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/script.c | 6 +++--- dlls/mshtml/txtrange.c | 2 +- dlls/mshtml/view.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 7699516..4b8a07a 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -350,7 +350,7 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ - const WCHAR format[] = {'%','u',0}; + static const WCHAR format[] = {'%','u',0}; DWORD len, port_len; WCHAR portW[6]; WCHAR *buf; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 20930aa..7b82349 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1160,8 +1160,8 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value) { + static const WCHAR szFormat[] = {'%','.','0','f','p','x',0}; WCHAR szValue[25]; - WCHAR szFormat[] = {'%','.','0','f','p','x',0}; value = floor(value); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f331cfd..286c4e2 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2067,7 +2067,7 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) nsresult nsres; HRESULT hres; - const WCHAR selector_formatW[] = {'a','[','i','d','=','"','%','s','"',']',0}; + static const WCHAR selector_formatW[] = {'a','[','i','d','=','"','%','s','"',']',0}; set_current_uri(window, uri); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index d7b4e92..de2bb7f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1171,11 +1171,11 @@ static GUID get_default_script_guid(HTMLInnerWindow *window) static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { - const WCHAR text_javascriptW[] = + static const WCHAR text_javascriptW[] = {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; - const WCHAR text_jscriptW[] = + static const WCHAR text_jscriptW[] = {'t','e','x','t','/','j','s','c','r','i','p','t',0}; - const WCHAR text_vbscriptW[] = + static const WCHAR text_vbscriptW[] = {'t','e','x','t','/','v','b','s','c','r','i','p','t',0}; /* FIXME: Handle more types */ diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 8b12c01..bfabbf4 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -938,7 +938,7 @@ static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) } if(!*p) { - const WCHAR emptyW[] = {0}; + static const WCHAR emptyW[] = {0}; *p = SysAllocString(emptyW); } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 442b07d..9d4f404 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -100,8 +100,8 @@ void update_title(HTMLDocumentObj *This) hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd); if(SUCCEEDED(hres)) { + static const WCHAR empty[] = {0}; VARIANT title; - WCHAR empty[] = {0}; V_VT(&title) = VT_BSTR; V_BSTR(&title) = SysAllocString(empty);

1 0

Józef Kucia : dxgi: Return S_OK from dxgi_output_SetGammaControl() stub.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 369ef0f56ddd1fd85b434d3b704c8914e82049c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=369ef0f56ddd1fd85b434d3b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 14:43:04 2018 +0100 dxgi: Return S_OK from dxgi_output_SetGammaControl() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43584 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4a508b3..bf0a415 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -320,10 +320,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); - return E_NOTIMPL; + return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, DXGI_GAMMA_CONTROL *gamma_control) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, + DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control);

1 0

Józef Kucia : dxgi/tests: Add basic test for gamma control.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 4eb4a7bc31b07a1255c595f093129eb2098481f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb4a7bc31b07a1255c595f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 14:43:05 2018 +0100 dxgi/tests: Add basic test for gamma control. Based on a patch by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1aaed46..02cf744 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4835,6 +4835,118 @@ static void test_swapchain_window_styles(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_gamma_control(void) +{ + DXGI_GAMMA_CONTROL_CAPABILITIES caps; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + DXGI_GAMMA_CONTROL gamma; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + IDXGIOutput *output; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter doesn't have any outputs.\n"); + IDXGIAdapter_Release(adapter); + IDXGIDevice_Release(device); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_Release(output); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to enter fullscreen, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + goto done; + } + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&caps, 0, sizeof(caps)); + hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(caps.MaxConvertedValue > caps.MinConvertedValue + || broken(caps.MaxConvertedValue == 0.0f && caps.MinConvertedValue == 1.0f) /* WARP */, + "Expected max gamma value (%.8e) to be bigger than min value (%.8e).\n", + caps.MaxConvertedValue, caps.MinConvertedValue); + + for (i = 1; i < caps.NumGammaControlPoints; ++i) + { + ok(caps.ControlPointPositions[i] > caps.ControlPointPositions[i - 1], + "Expected control point positions to be strictly monotonically increasing (%.8e > %.8e).\n", + caps.ControlPointPositions[i], caps.ControlPointPositions[i - 1]); + } + + memset(&gamma, 0, sizeof(gamma)); + hr = IDXGIOutput_GetGammaControl(output, &gamma); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_SetGammaControl(output, &gamma); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + IDXGIOutput_Release(output); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + +done: + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -4929,6 +5041,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_resize_target(); test_inexact_modes(); + test_gamma_control(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles();

1 0

Józef Kucia : wined3d: Introduce wined3d_cs_submit() helper.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 4eed2416d61950dbb8569852a0a05116d99e935b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eed2416d61950dbb8569852… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 14:43:06 2018 +0100 wined3d: Introduce wined3d_cs_submit() helper. Mainly for consistency. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 105 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4eed2416d61950dbb856…

1 0

Michael Müller : dxgi: Implement dxgi_output_GetGammaControlCapabilities().
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: ad76b1fb36c73133586368a38f280e0de0744c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad76b1fb36c73133586368a3… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Nov 30 14:43:03 2018 +0100 dxgi: Implement dxgi_output_GetGammaControlCapabilities(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43584 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 868a368..4a508b3 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -297,9 +297,22 @@ static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps) { - FIXME("iface %p, gamma_caps %p stub!\n", iface, gamma_caps); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, gamma_caps %p.\n", iface, gamma_caps); + + if (!gamma_caps) + return E_INVALIDARG; + + gamma_caps->ScaleAndOffsetSupported = FALSE; + gamma_caps->MaxConvertedValue = 1.0f; + gamma_caps->MinConvertedValue = 0.0f; + gamma_caps->NumGammaControlPoints = 256; + + for (i = 0; i < gamma_caps->NumGammaControlPoints; ++i) + gamma_caps->ControlPointPositions[i] = i / 255.0f; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_cs_require_space() helper.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 1f08817355a323f180acc86bfa6d0e06816f1ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f08817355a323f180acc86b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 14:43:07 2018 +0100 wined3d: Introduce wined3d_cs_require_space() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 106 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f08817355a323f180ac…

1 0