June 2019 - Wine-commits - list.winehq.org

Józef Kucia : d3d12/tests: Add test for creating swapchain on desktop window.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 29bc8075ccd81358492c402d36d62a6b1c8044ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=29bc8075ccd81358492c402d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 24 11:26:30 2019 +0200 d3d12/tests: Add test for creating swapchain on desktop window. 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/d3d12/tests/d3d12.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index ae750af..d23aba9 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -308,6 +308,7 @@ static ID3D12CommandQueue *create_command_queue_(unsigned int line, struct test_context_desc { + BOOL no_render_target; BOOL no_pipeline; const D3D12_SHADER_BYTECODE *ps; }; @@ -436,6 +437,9 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr); } + if (desc && desc->no_render_target) + return TRUE; + rtv_heap_desc.NumDescriptors = MAX_FRAME_COUNT; rtv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; rtv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; @@ -1011,6 +1015,7 @@ static void test_swapchain_draw(void) {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1088,6 +1093,7 @@ static void test_swapchain_refcount(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1165,6 +1171,7 @@ static void test_swapchain_size_mismatch(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1287,6 +1294,7 @@ static void test_swapchain_backbuffer_index(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1357,6 +1365,56 @@ static void test_swapchain_backbuffer_index(void) destroy_test_context(&context); } +static void test_desktop_window(void) +{ + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + struct test_context_desc desc; + struct test_context context; + IDXGISwapChain1 *swapchain; + IDXGIFactory4 *factory; + IUnknown *queue; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = TRUE; + if (!init_test_context(&context, NULL)) + return; + queue = (IUnknown *)context.queue; + + window = GetDesktopWindow(); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + + swapchain_desc.Width = 640; + swapchain_desc.Height = 480; + swapchain_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 2; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + swapchain_desc.Flags = 0; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + swapchain_desc.Width = rect.right; + swapchain_desc.Height = rect.bottom; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + IDXGIFactory4_Release(factory); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -1391,4 +1449,5 @@ START_TEST(d3d12) test_swapchain_refcount(); test_swapchain_size_mismatch(); test_swapchain_backbuffer_index(); + test_desktop_window(); }

1 0

Alexandre Julliard : uianimation: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 761a693bd94cd1cf1106cfee51bc3aeec781ca67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=761a693bd94cd1cf1106cfee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:13:31 2019 +0200 uianimation: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/Makefile.in | 2 ++ dlls/uianimation/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index b504181..85bf167 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,4 +1,6 @@ MODULE = uianimation.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 92d594f..ea35a30 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : uianimationcore: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 71dfe2dd1065f3701ccbcf43e80176c070f0eb28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71dfe2dd1065f3701ccbcf43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:13:36 2019 +0200 uianimationcore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 5221450..b6edec5 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,7 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ uia_main.c

1 0

Alexandre Julliard : uiribbon: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 59c2df1552bce81c41a147fb68e716e64074dfce URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c2df1552bce81c41a147fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:13:48 2019 +0200 uiribbon: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiribbon/Makefile.in | 2 ++ dlls/uiribbon/uiribbon.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index 0b9724d..f41b4d4 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -1,6 +1,8 @@ MODULE = uiribbon.dll IMPORTS = uuid ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ uiribbon.c diff --git a/dlls/uiribbon/uiribbon.c b/dlls/uiribbon/uiribbon.c index 58ac51a..18cb487 100644 --- a/dlls/uiribbon/uiribbon.c +++ b/dlls/uiribbon/uiribbon.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "wine/debug.h" #define COBJMACROS

1 0

Alexandre Julliard : updspapi: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: ec4035e58a98839b86b8e1bad2907a10ba824a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4035e58a98839b86b8e1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:14:01 2019 +0200 updspapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/updspapi/Makefile.in | 2 ++ dlls/updspapi/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/updspapi/Makefile.in b/dlls/updspapi/Makefile.in index 3cf1922..e83354c 100644 --- a/dlls/updspapi/Makefile.in +++ b/dlls/updspapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = updspapi.dll IMPORTS = setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/updspapi/main.c b/dlls/updspapi/main.c index 73af32f..61c8ea5 100644 --- a/dlls/updspapi/main.c +++ b/dlls/updspapi/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : url: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: dac2ea3e700f6b49c4a6c5ee82995a6bfd8d85ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac2ea3e700f6b49c4a6c5ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:14:20 2019 +0200 url: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/url/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 1b8a69d..8f5c8da 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -2,4 +2,6 @@ MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = url_main.c

1 0

Alexandre Julliard : urlmon: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 42d2477edf29afada764e2eecc3666d6ccff7795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d2477edf29afada764e2ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:15:45 2019 +0200 urlmon: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/Makefile.in | 2 ++ dlls/urlmon/axinstall.c | 34 +++++++++--------- dlls/urlmon/binding.c | 4 +-- dlls/urlmon/file.c | 4 +-- dlls/urlmon/http.c | 8 ++--- dlls/urlmon/internet.c | 4 +-- dlls/urlmon/mimefilter.c | 16 ++++----- dlls/urlmon/mk.c | 4 +-- dlls/urlmon/protocol.c | 2 +- dlls/urlmon/sec_mgr.c | 42 ++++++++++------------ dlls/urlmon/session.c | 12 +++---- dlls/urlmon/umon.c | 4 +-- dlls/urlmon/uri.c | 90 ++++++++++++++++++++++------------------------- dlls/urlmon/urlmon_main.c | 6 ++-- dlls/urlmon/urlmon_main.h | 3 +- 15 files changed, 113 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42d2477edf29afada764…

1 0

Fabian Maurer : kernel32/tests: Add sxs tests.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: aa97c30b01458a311609e9fbedc874254f9de23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa97c30b01458a311609e9fb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jun 20 17:50:30 2019 +0200 kernel32/tests: Add sxs tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 385 +++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/dummy.c | 21 ++- dlls/kernel32/tests/dummy.spec | 2 +- 3 files changed, 406 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa97c30b01458a311609…

1 0

Alexandre Julliard : ntdll: Try to use the name of the PE file also when loading .so builtin.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 91bbc46c99dd850fad8c07e42c88ba36cc1df9ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=91bbc46c99dd850fad8c07e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:30:51 2019 +0200 ntdll: Try to use the name of the PE file also when loading .so builtin. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/loader.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b7242af..9f2a401 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3481,7 +3481,6 @@ static void test_builtin_sxs(void) GetModuleFileNameA(module_msvcp, path_msvcp, sizeof(path_msvcp)); GetModuleFileNameA(module_msvcr, path_msvcr, sizeof(path_msvcr)); ok(strnicmp(expected_path, path_msvcp, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcp); - todo_wine ok(strnicmp(expected_path, path_msvcr, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcr); DeactivateActCtx(0, cookie); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 43ca7c5..8b42721 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2427,7 +2427,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, } info.load_path = load_path; - info.filename = so_name ? NULL : nt_name; + info.filename = nt_name; info.status = STATUS_SUCCESS; info.wm = NULL; @@ -2528,7 +2528,9 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na return load_native_dll( load_path, nt_name, module_ptr, &image_info, flags, pwm, &st ); } - return load_so_dll( load_path, nt_name, so_name, pwm ); + status = load_so_dll( load_path, nt_name, so_name, pwm ); + RtlFreeHeap( GetProcessHeap(), 0, so_name ); + return status; }

1 0

Fabian Maurer : ntdll: Check the activation context before looking for the module basename.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 6525a1667311988258c9cb47b695930eef811c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6525a1667311988258c9cb47… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jun 20 17:50:32 2019 +0200 ntdll: Check the activation context before looking for the module basename. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 5 ----- dlls/ntdll/loader.c | 14 ++++++++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9f2a401..4dede37 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3300,12 +3300,10 @@ static void test_two_dlls_at_same_time(void) if (!fill_sxs_info(&dll_2, "2", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) goto cleanup; - todo_wine ok(dll_1.module != dll_2.module, "Libraries are the same\n"); dll_1.get_path(path1, sizeof(path1)); ok(strcmp(path1, dll_1.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll_1.path_dll); dll_2.get_path(path2, sizeof(path2)); - todo_wine ok(strcmp(path2, dll_2.path_dll) == 0, "Got '%s', expected '%s'\n", path2, dll_2.path_dll); cleanup: @@ -3338,10 +3336,8 @@ static void test_one_sxs_and_one_local_1(void) if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) goto cleanup; - todo_wine ok(dll.module != module, "Libraries are the same\n"); dll.get_path(path1, sizeof(path1)); - todo_wine ok(strcmp(path1, dll.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll.path_dll); get_path(path2, sizeof(path2)); ok(strcmp(path2, path_dll_local) == 0, "Got '%s', expected '%s'\n", path2, path_dll_local); @@ -3417,7 +3413,6 @@ static void test_one_with_sxs_and_GetModuleHandleA(void) ok(success, "ActivateActCtx failed: %d\n", GetLastError()); module_temp = GetModuleHandleA("sxs_dll.dll"); - todo_wine ok (module_temp == 0, "Expected 0, got %p\n", module_temp); DeactivateActCtx(0, dll.cookie); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8b42721..67efcaf 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2693,7 +2693,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, void **module, pe_image_info_t *image_info, struct stat *st ) { WCHAR *ext, *dllname; - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status; /* first append .dll if needed */ @@ -2716,8 +2716,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, { WCHAR *fullname = NULL; - if ((*pwm = find_basename_module( libname )) != NULL) goto done; - status = find_actctx_dll( libname, &fullname ); if (status == STATUS_SUCCESS) { @@ -2725,7 +2723,15 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, RtlFreeHeap( GetProcessHeap(), 0, dllname ); libname = dllname = fullname; } - else if (status != STATUS_SXS_KEY_NOT_FOUND) goto done; + else + { + if (status != STATUS_SXS_KEY_NOT_FOUND) goto done; + if ((*pwm = find_basename_module( libname )) != NULL) + { + status = STATUS_SUCCESS; + goto done; + } + } } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH)

1 0