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

[PATCH v2 1/4] winex11.drv: Call XFlush() right after XUngrabServer().
by Zhiyi Zhang 25 Oct '19

25 Oct '19

XGrabServer() stops the processing of other display connections until a XUngrabServer() call is actually processed by the X server. Now consider the following scenario: Thread 1: XGrabServer -> ... -> XUngrabServer -> Grab mutex A Thread 2: Grab mutex A -> Do something with another display connection Before the XUngrabServer() request is actually processed by the X server, go on grabbing mutex A could trigger a lock because processing another display connection in thread 2 is blocked by thread 1 calling XGrabServer and thread 1 is blocked by thread 2 grabbing the same mutex. With thread 1 freezed, the XUngrabServer may never reach the X server, thus a deadlock. By adding a XFlush() call right after XUngrabServer(), we avoid such a race condition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix a possible deadlock as described above. Supersede 171243~171245 dlls/winex11.drv/palette.c | 1 + dlls/winex11.drv/xrandr.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index bba2253264..073761a5ee 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -480,6 +480,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template palette_size = c_min + NB_RESERVED_COLORS; XUngrabServer(gdi_display); + XFlush(gdi_display); TRACE("adjusted size %i colorcells\n", palette_size); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6bb2b18ce7..85da5efea3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -419,6 +419,7 @@ static LONG xrandr12_set_current_mode( int mode ) if (status != RRSetConfigSuccess) { XUngrabServer( gdi_display ); + XFlush( gdi_display ); ERR("Failed to disable CRTC.\n"); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); @@ -440,6 +441,7 @@ static LONG xrandr12_set_current_mode( int mode ) crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); XUngrabServer( gdi_display ); + XFlush( gdi_display ); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); -- 2.23.0

1 0

[PATCH] winex11.drv: Wait for process_attach to complete before enabling xrandr.
by Rémi Bernon 25 Oct '19

25 Oct '19

X11DRV_XRandR_Init is called in process_attach and calling thread_init_display there would make thread data to be initialized before its completion. It breaks some assumtions that could be made in x11drv_init_thread_data, for example that DesktopWindow has already been created. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xrandr.c | 38 ++++++++++++++++++++++++---------- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 135faa8989b..fdd2fbb5057 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -668,6 +668,7 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +void X11DRV_XRandR_Enable(void) DECLSPEC_HIDDEN; /* X11 display device handler. Used to initialize display device registry data */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 21807af3f18..109d37ce4c3 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -680,6 +680,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) TlsSetValue( thread_data_tls_index, data ); if (use_xim) X11DRV_SetupXIM(); + X11DRV_XRandR_Enable(); return data; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6bb2b18ce7f..ecbb3ec85a3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1069,30 +1069,33 @@ static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) #endif +static int xrandr_load_version = 0; +static int xrandr_minor = 0; +static int xrandr_major = 0; + void X11DRV_XRandR_Init(void) { struct x11drv_display_device_handler handler; - int event_base, error_base, minor, ret; - static int major; + int event_base, error_base; Bool ok; - if (major) return; /* already initialized? */ + if (xrandr_major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ if (root_window != DefaultRootWindow( gdi_display )) return; - if (!(ret = load_xrandr())) return; /* can't load the Xrandr library */ + if (!(xrandr_load_version = load_xrandr())) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ if (!pXRRQueryExtension( gdi_display, &event_base, &error_base )) return; X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); - ok = pXRRQueryVersion( gdi_display, &major, &minor ); + ok = pXRRQueryVersion( gdi_display, &xrandr_major, &xrandr_minor ); if (X11DRV_check_error() || !ok) return; - TRACE("Found XRandR %d.%d.\n", major, minor); + TRACE("Found XRandR %d.%d.\n", xrandr_major, xrandr_minor); #ifdef HAVE_XRRGETSCREENRESOURCES - if (ret >= 2 && (major > 1 || (major == 1 && minor >= 2))) + if (xrandr_load_version >= 2 && (xrandr_major > 1 || (xrandr_major == 1 && xrandr_minor >= 2))) { - if (major > 1 || (major == 1 && minor >= 3)) + if (xrandr_major > 1 || (xrandr_major == 1 && xrandr_minor >= 3)) pXRRGetScreenResourcesCurrent = wine_dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent", NULL, 0 ); if (!pXRRGetScreenResourcesCurrent) pXRRGetScreenResourcesCurrent = pXRRGetScreenResources; @@ -1103,7 +1106,7 @@ void X11DRV_XRandR_Init(void) xrandr10_init_modes(); #ifdef HAVE_XRRGETPROVIDERRESOURCES - if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) + if (xrandr_load_version >= 4 && (xrandr_major > 1 || (xrandr_major == 1 && xrandr_minor >= 4))) { handler.name = "XRandR 1.4"; handler.priority = 200; @@ -1115,8 +1118,6 @@ void X11DRV_XRandR_Init(void) handler.pFreeMonitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); - pXRRSelectInput( thread_init_display(), root_window, - RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, "XRandR CrtcChange" ); X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, @@ -1127,6 +1128,17 @@ void X11DRV_XRandR_Init(void) #endif } +void X11DRV_XRandR_Enable(void) +{ +#ifdef HAVE_XRRGETPROVIDERRESOURCES + struct x11drv_thread_data *data = x11drv_thread_data(); + + if (xrandr_load_version >= 4 && (xrandr_major > 1 || (xrandr_major == 1 && xrandr_minor >= 4))) + pXRRSelectInput( data->display, root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); +#endif +} + #else /* SONAME_LIBXRANDR */ void X11DRV_XRandR_Init(void) @@ -1134,4 +1146,8 @@ void X11DRV_XRandR_Init(void) TRACE("XRandR support not compiled in.\n"); } +void X11DRV_XRandR_Enable(void) +{ +} + #endif /* SONAME_LIBXRANDR */ -- 2.24.0.rc0

2 2

[PATCH] ntoskrnl: Implement IoCreateUnprotectedSymbolicLink
by Alex Henrie 25 Oct '19

25 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47986 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This is just a copy-paste of IoCreateSymbolicLink. --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 009b0dda81..9fe9c995a3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1581,6 +1581,27 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ } +/*********************************************************************** + * IoCreateUnprotectedSymbolicLink (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateUnprotectedSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *target ) +{ + HANDLE handle; + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = name; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); + /* FIXME: store handle somewhere */ + return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); +} + + /*********************************************************************** * IoDeleteSymbolicLink (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d47a706054..297487fa25 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -361,7 +361,7 @@ @ stub IoCreateStreamFileObjectLite @ stdcall IoCreateSymbolicLink(ptr ptr) @ stdcall IoCreateSynchronizationEvent(ptr ptr) -@ stub IoCreateUnprotectedSymbolicLink +@ stdcall IoCreateUnprotectedSymbolicLink(ptr ptr) @ stdcall IoCsqInitialize(ptr ptr ptr ptr ptr ptr ptr) @ stub IoCsqInsertIrp @ stub IoCsqRemoveIrp -- 2.23.0

1 0

Re: [PATCH v2 1/3] D3D10: Add d3dcompiler_43 PARENTSRC to d3d10
by Connor McAdams 25 Oct '19

25 Oct '19

Ah, okay, didn't know about that. I'll change it and send a new patch. On Thu, Oct 24, 2019 at 6:09 PM Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > > I get that, why do you need both? Wouldn't they compile to the same file utils.o? > > makedep is smart enough to use the correct file PARENTSRC\utils.c vs local utils.c. > The basic logic is, the local file used first if exists, else use the one in the PARENTSRC directory. > > ________________________________ > From: Connor McAdams <conmanx360(a)gmail.com> > Sent: Friday, 25 October 2019 8:54 AM > To: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Subject: Re: [PATCH v2 1/3] D3D10: Add d3dcompiler_43 PARENTSRC to d3d10 > > There's a utils.c within the dlls/d3d10/ directory. So, there's a > utils.c file inside of both d3dcompiler_43 and d3d10. > > On Thu, Oct 24, 2019 at 5:50 PM Alistair Leslie-Hughes > <leslie_alistair(a)hotmail.com> wrote: > > > > Hi Connor, > > > > > C_SRCS = \ > > >+ asmparser.c \ > > >+ blob.c \ > > >+ bytecodewriter.c \ > > >+ compiler.c \ > > >+ preproc.c \ > > >+ reflection.c \ > > >+ ../d3dcompiler_43/utils.c \ > > Since you have PARENTSRC set, have the path doesn't make sense. > > > > > d3d10_main.c \ > > > effect.c \ > > > shader.c \ > > > stateblock.c \ > > > utils.c > > ^^^^^^^^^^^^^^ > > Is there a reason you are including two utils.c files? Wouldn't they compile to the same place? > > > > Regards > > Alistair.

2 2

[PATCH] mscoree: Call mono_thread_manage in GC Unsafe mode.
by Vincent Povirk 24 Oct '19

24 Oct '19

The mono_thread_manage API expects to be called in GC Unsafe mode. This has been the case for a while, but for some reason it only caused problems in the Mono merge I'm working on now. We don't need a matching exit call because we're shutting down the runtime anyway, and we can't change GC modes after the runtime shuts down. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 2 ++ dlls/mscoree/metahost.c | 2 ++ dlls/mscoree/mscoree_private.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index e932a7f58be..b72af709c03 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1544,6 +1544,8 @@ __int32 WINAPI _CorExeMain(void) if (domain) { + int dummy; + mono_threads_enter_gc_unsafe_region(&dummy); mono_thread_manage(); mono_runtime_quit(); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 18232a45686..575d6ce1d39 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -124,6 +124,7 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); +void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -224,6 +225,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); + LOAD_MONO_FUNCTION(mono_threads_enter_gc_unsafe_region); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 2b9c1dd35e5..250bd24ad10 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -177,6 +177,7 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; +extern void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; -- 2.17.1

2 1

[PATCH v2] ntdll: Enable WoW64 filesystem redirection when loading libraries.
by Brendan Shanks 24 Oct '19

24 Oct '19

This matches the behavior seen on Windows 7/2008R2 and newer. Fixes Rockstar Games Launcher installer crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Move enabling below the STATUS_NO_MEMORY early return dlls/kernel32/tests/loader.c | 2 +- dlls/ntdll/loader.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e5b8c3b28e..912e8600dd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -3822,7 +3822,7 @@ static void test_wow64_redirection_for_dll(const char *libname) if (!GetModuleHandleA(libname)) { lib = LoadLibraryExA(libname, NULL, 0); - todo_wine ok (broken(lib == NULL) /* Vista/2008 */ || + ok (broken(lib == NULL) /* Vista/2008 */ || lib != NULL, "Loading %s should succeed with WOW64 redirection disabled\n", libname); if (lib) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2bae3c7bd5..fa1eab4b8b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2881,6 +2881,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, { WCHAR *ext, *dllname; NTSTATUS status; + ULONG wow64_old_value = 0; /* first append .dll if needed */ @@ -2897,6 +2898,12 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, libname = dllname; } + /* Win 7/2008R2 and up seem to re-enable WoW64 FS redirection when loading libraries. + * Enable redirection here, and if it was disabled, disable it before returning. + */ + if (is_wow64) + RtlWow64EnableFsRedirectionEx(0, &wow64_old_value); + nt_name->Buffer = NULL; if (!contains_path( libname )) @@ -2930,6 +2937,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); + if (is_wow64 && wow64_old_value == 1) + RtlWow64EnableFsRedirectionEx(1, &wow64_old_value); return status; } -- 2.17.1

2 1

[PATCH] ntdll: Enable WoW64 filesystem redirection when loading libraries.
by Brendan Shanks 24 Oct '19

24 Oct '19

This matches the behavior seen on Windows 7/2008R2 and newer. Fixes Rockstar Games Launcher installer crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/loader.c | 2 +- dlls/ntdll/loader.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e5b8c3b28e..912e8600dd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -3822,7 +3822,7 @@ static void test_wow64_redirection_for_dll(const char *libname) if (!GetModuleHandleA(libname)) { lib = LoadLibraryExA(libname, NULL, 0); - todo_wine ok (broken(lib == NULL) /* Vista/2008 */ || + ok (broken(lib == NULL) /* Vista/2008 */ || lib != NULL, "Loading %s should succeed with WOW64 redirection disabled\n", libname); if (lib) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2bae3c7bd5..93e1440293 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2881,6 +2881,13 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, { WCHAR *ext, *dllname; NTSTATUS status; + ULONG wow64_old_value = 0; + + /* Win 7/2008R2 and up seem to re-enable WoW64 FS redirection when loading libraries. + * Enable redirection here, and if it was disabled, disable it before returning. + */ + if (is_wow64) + RtlWow64EnableFsRedirectionEx(0, &wow64_old_value); /* first append .dll if needed */ @@ -2930,6 +2937,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); + if (is_wow64 && wow64_old_value == 1) + RtlWow64EnableFsRedirectionEx(1, &wow64_old_value); return status; } -- 2.17.1

3 2

[PATCH] vkd3d: Bump RootSignature version to 1.1.
by Hans-Kristian Arntzen 24 Oct '19

24 Oct '19

There appears to be a complete implementation of RS 1.1 already, so enable this feature. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 691a23a..d248726 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2720,8 +2720,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - FIXME("Root signature version 1_1 not supported yet.\n"); - data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; -- 2.23.0

3 3

[PATCH] Revert "ntdll: Skip dlls of the wrong machine type when searching through the load path."
by Brendan Shanks 24 Oct '19

24 Oct '19

This reverts commit 9839bb7691a1b1c57a4ca501d03825420c1609d7. Windows 7/2008R2 and up are able to load system DLLs with WoW64 redirection disabled, and badly-written installers crash without this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/loader.c | 4 ++-- dlls/ntdll/loader.c | 31 +++++++++++-------------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e5b8c3b28e..f165b3ee05 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -688,7 +688,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); } - else + else todo_wine_if( !expect_status ) { ok( ldr_status == expect_status || broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT), @@ -3822,7 +3822,7 @@ static void test_wow64_redirection_for_dll(const char *libname) if (!GetModuleHandleA(libname)) { lib = LoadLibraryExA(libname, NULL, 0); - todo_wine ok (broken(lib == NULL) /* Vista/2008 */ || + ok (broken(lib == NULL) /* Vista/2008 */ || lib != NULL, "Loading %s should succeed with WOW64 redirection disabled\n", libname); if (lib) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2bae3c7bd5..9e7aa7778d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2326,13 +2326,6 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } - if (!status && !is_valid_binary( *module, image_info )) - { - TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->machine ); - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - *module = NULL; - status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - } return status; } @@ -2351,6 +2344,12 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam TRACE("Trying %s dll %s\n", dll_type, debugstr_us(nt_name) ); + if (!is_valid_binary( *module, image_info )) + { + NtUnmapViewOfSection( NtCurrentProcess(), module ); + return STATUS_INVALID_IMAGE_FORMAT; + } + /* perform base relocation, if necessary */ if ((status = perform_relocations( *module, nt, image_info->map_size ))) return status; @@ -2824,7 +2823,6 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * struct stat *st ) { WCHAR *name; - BOOL found_image = FALSE; NTSTATUS status = STATUS_DLL_NOT_FOUND; ULONG len = strlenW( paths ); @@ -2849,20 +2847,15 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * if ((status = RtlDosPathNameToNtPathName_U_WithStatus( name, nt_name, NULL, NULL ))) goto done; status = open_dll_file( nt_name, pwm, module, image_info, st ); - if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; - else if (status != STATUS_DLL_NOT_FOUND) goto done; + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( nt_name ); paths = ptr; } - if (!found_image) - { - /* not found, return file in the system dir to be loaded as builtin */ - strcpyW( name, system_dir ); - strcatW( name, search ); - if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; - } - else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + /* not found, return file in the system dir to be loaded as builtin */ + strcpyW( name, system_dir ); + strcatW( name, search ); + if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; done: RtlFreeHeap( GetProcessHeap(), 0, name ); @@ -2926,8 +2919,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, else if (!(status = RtlDosPathNameToNtPathName_U_WithStatus( libname, nt_name, NULL, NULL ))) status = open_dll_file( nt_name, pwm, module, image_info, st ); - if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT; - done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); return status; -- 2.17.1

3 3

[PATCH 0/3] d3d10 + d3dcompiler: unify reflection interface.
by Connor McAdams 24 Oct '19

24 Oct '19

This series of patches moves the reflection interface for d3d10 into the already existing d3d11 reflection interface within d3dcompiler_43. This is done using ifdef's. If this is not preferable, please let me know, and I'll change it to whatever considered the best option. Connor McAdams (3): D3D10: Add d3dcompiler_43 PARENTSRC to d3d10 d3dcompiler: unify d3d11 + d3d10 reflection ifaces d3d10+d3dcompiler: Move d3d10 reflection into d3dcompiler dlls/d3d10/Makefile.in | 19 +++++ dlls/d3d10/d3d10_main.c | 19 ++--- dlls/d3d10/d3d10_private.h | 10 +-- dlls/d3d10/effect.c | 12 ++-- dlls/d3d10/shader.c | 112 ------------------------------ dlls/d3d10/utils.c | 4 +- dlls/d3dcompiler_43/reflection.c | 115 +++++++++++++++++++++++-------- include/d3dcompiler.h | 4 ++ 8 files changed, 123 insertions(+), 172 deletions(-) -- 2.20.1

1 3