- Wine-Devel - list.winehq.org

[PATCH v3 4/8] dllhost: Implement IClassFactory::CreateInstance().
by Dmitry Timoshkov March 8, 2022

March 8, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 691f233906a..681a20a6bb5 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -98,8 +98,14 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *punkouter, REFIID iid, void **ppv) { - FIXME("(%p,%p,%s,%p): stub\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); - return E_NOTIMPL; + struct factory *factory = impl_from_IClassFactory(iface); + + TRACE("(%p,%p,%s,%p)\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); + + if (punkouter) + return CLASS_E_NOAGGREGATION; + + return CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, ppv); } static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) -- 2.35.1

2 4

[PATCH 08/11] win32u: Move GWLP_HWNDPARENT implementation from user32.
by Jacek Caban March 8, 2022

March 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 14 -------------- dlls/win32u/window.c | 6 ++++-- 2 files changed, 4 insertions(+), 16 deletions(-)

2 1

[PATCH 05/11] win32u: Move GetWindow implementation from user32.
by Jacek Caban March 8, 2022

March 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 51 +-------------------------------------- dlls/win32u/window.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 59 insertions(+), 50 deletions(-)

2 1

[PATCH] makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs.
by Brendan Shanks March 8, 2022

March 8, 2022

Fixes launching 32-bit EXEs from a WOW64 build dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52618 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 2 +- tools/winegcc/winegcc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ab3490b21cd..d408b1f344b 100644 --- a/configure.ac +++ b/configure.ac @@ -773,7 +773,7 @@ case $host_os in LIBS="$ac_save_LIBS" fi - UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)" + UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"]) AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist") diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bcec3916843..ab26adb07e8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -416,7 +416,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n if (opts->unix_lib) { strarray_add( &flags, "-install_name" ); - strarray_add( &flags, strmake( "@loader_path/%s.so", output_name ) ); + strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) ); + strarray_add( &flags, "-Wl,-rpath,@loader_path/" ); } strarray_addall( &link_args, flags ); return link_args; -- 2.32.0 (Apple Git-132)

2 1

[PATCH 04/11] win32u: Move GetWindowLong implementation from user32.
by Jacek Caban March 8, 2022

March 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 166 +++--------------------- dlls/user32/win.h | 10 -- dlls/win32u/class.c | 2 +- dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/window.c | 237 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 + 6 files changed, 274 insertions(+), 157 deletions(-)

2 1

[PATCH] wined3d: Allow changing settings using a new WINE_D3D_CONFIG environment variable.
by Zebediah Figura March 8, 2022

March 8, 2022

This can be significantly more convenient than modifying the registry. config_list_get_value() is based on vkd3d_debug_list_has_member() by Józef Kucia. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 108 +++++++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 248c886542f..a4eb23eac05 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -152,17 +152,67 @@ struct wined3d * CDECL wined3d_create(DWORD flags) return object; } -static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size) +static bool is_option_separator(char c) { + return c == ',' || c == ';' || c == '\0'; +} + +static const char *config_list_get_value(const char *string, const char *key, size_t *len) +{ + const char *p, *end; + char prev_char; + + p = string; + while (p) + { + if ((p = strstr(p, key))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(key); + + if (is_option_separator(prev_char) && *p == '=') + { + if ((end = strpbrk(p + 1, ",;"))) + *len = end - p + 1; + else + *len = strlen(p + 1); + return p + 1; + } + } + } + + return NULL; +} + +static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *env, const char *name, char *buffer, DWORD size) +{ + const char *env_value; + size_t env_len; + + if ((env_value = config_list_get_value(env, name, &env_len)) && env_len < size) + { + memcpy(buffer, env_value, env_len); + buffer[env_len] = 0; + return 0; + } if (appkey && !RegQueryValueExA(appkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; if (defkey && !RegQueryValueExA(defkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, DWORD *value) { DWORD type, data, size; + const char *env_value; + size_t env_len; + char *end; + if ((env_value = config_list_get_value(env, name, &env_len))) + { + *value = strtoul(env_value, &end, 0); + if (end != env_value) + return 0; + } size = sizeof(data); if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; size = sizeof(data); @@ -214,6 +264,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) char app_name[MAX_PATH], buffer[MAX_PATH + 10]; DWORD wined3d_context_tls_idx; DWORD size = sizeof(buffer); + const char *env; HKEY hkey = 0; HKEY appkey = 0; DWORD tmpvalue; @@ -271,17 +322,24 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } } - if (hkey || appkey) + /* Allow modifying settings using the WINE_D3D_CONFIG environment variable, + * which takes precedence over registry keys. An example is as follows: + * + * WINE_D3D_CONFIG=csmt=0x1,shader_backend=glsl + */ + env = getenv("WINE_D3D_CONFIG"); + + if (hkey || appkey || env) { - if (!get_config_key_dword(hkey, appkey, "csmt", &wined3d_settings.cs_multithreaded)) + if (!get_config_key_dword(hkey, appkey, env, "csmt", &wined3d_settings.cs_multithreaded)) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); - if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "MaxVersionGL", &tmpvalue)) { ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) + if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { if (!_strnicmp(buffer, "glsl", -1)) { @@ -305,10 +363,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled.\n"); } - if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) + if (!get_config_key(hkey, appkey, env, "OffscreenRenderingMode", buffer, size) && !strcmp(buffer,"backbuffer")) wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciDeviceID", &tmpvalue)) { int pci_device_id = tmpvalue; @@ -323,7 +381,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_device_id = pci_device_id; } } - if ( !get_config_key_dword( hkey, appkey, "VideoPciVendorID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciVendorID", &tmpvalue)) { int pci_vendor_id = tmpvalue; @@ -338,7 +396,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_vendor_id = pci_vendor_id; } } - if ( !get_config_key( hkey, appkey, "VideoMemorySize", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "VideoMemorySize", buffer, size)) { int TmpVideoMemorySize = atoi(buffer); if(TmpVideoMemorySize > 0) @@ -351,7 +409,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); } - if ( !get_config_key( hkey, appkey, "WineLogo", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "WineLogo", buffer, size)) { size_t len = strlen(buffer) + 1; @@ -360,38 +418,38 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else memcpy(wined3d_settings.logo, buffer, len); } - if (!get_config_key_dword(hkey, appkey, "MultisampleTextures", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "MultisampleTextures", &tmpvalue)) { wined3d_settings.multisample_textures = !!tmpvalue; ERR_(winediag)("Setting multisample textures to %#x.\n", wined3d_settings.multisample_textures); } - if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) + if (!get_config_key_dword(hkey, appkey, env, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); - if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + if (!get_config_key(hkey, appkey, env, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = 1; } - if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "strict_shader_math", &tmpvalue)) { wined3d_settings.strict_shader_math = !!tmpvalue; ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); } - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) TRACE("Limiting HS shader model to %u.\n", wined3d_settings.max_sm_hs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) TRACE("Limiting DS shader model to %u.\n", wined3d_settings.max_sm_ds); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) TRACE("Limiting GS shader model to %u.\n", wined3d_settings.max_sm_gs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "renderer", buffer, size)) + if (!get_config_key(hkey, appkey, env, "renderer", buffer, size)) { if (!strcmp(buffer, "vulkan")) { @@ -409,18 +467,18 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } - if (!get_config_key_dword(hkey, appkey, "cb_access_map_w", &tmpvalue) && tmpvalue) + if (!get_config_key_dword(hkey, appkey, env, "cb_access_map_w", &tmpvalue) && tmpvalue) { TRACE("Forcing all constant buffers to be write-mappable.\n"); wined3d_settings.cb_access_map_w = 1; } - if (!get_config_key_dword(hkey, appkey, "lenient_nooverwrite", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "lenient_nooverwrite", &tmpvalue)) wined3d_settings.lenient_nooverwrite = tmpvalue; else wined3d_settings.lenient_nooverwrite = quirk_match_lenient_nooverwrite(app_name); if (wined3d_settings.lenient_nooverwrite) TRACE("Allowing DISCARD and NOOVERWRITE maps on non-dynamic resources.\n"); - if (!get_config_key_dword(hkey, appkey, "fake_screen_bit_depth", &wined3d_settings.fake_screen_bit_depth)) + if (!get_config_key_dword(hkey, appkey, env, "fake_screen_bit_depth", &wined3d_settings.fake_screen_bit_depth)) TRACE("Overriding screen bit depth with %u.\n", wined3d_settings.fake_screen_bit_depth); } -- 2.35.1

2 1

[PATCH 1/7] ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_LOOP with zero optlen.
by Paul Gofman March 8, 2022

March 8, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index dacb41a0403..816ca828b90 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2981,6 +2981,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_IF, optval, optlen ); case IP_MULTICAST_LOOP: + if (!optlen) + { + SetLastError( WSAEFAULT ); + return -1; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP, optval, optlen ); case IP_MULTICAST_TTL: -- 2.35.1

3 17

[PATCH 1/3] server: fix some error detection
by Eric Pouech March 8, 2022

March 8, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- server/mapping.c | 4 ++-- server/request.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 8d4332d240f..6b0785c1c0c 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -691,13 +691,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!file_size) return STATUS_INVALID_FILE_FOR_SECTION; size = pread( unix_fd, &mz, sizeof(mz), 0 ); - if (size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; + if (size < 0 || size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; if (mz.dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_NOT_MZ; mz_size = size; pos = mz.dos.e_lfanew; size = pread( unix_fd, &nt, sizeof(nt), pos ); - if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; + if (size < 0 || size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ opt_size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof( IMAGE_OPTIONAL_HEADER32, CheckSum )); size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + opt_size ); diff --git a/server/request.c b/server/request.c index 7021741c765..1bc92d479ae 100644 --- a/server/request.c +++ b/server/request.c @@ -265,7 +265,8 @@ static void send_reply( union generic_reply *reply ) vec[1].iov_base = current->reply_data; vec[1].iov_len = current->reply_size; - if ((ret = writev( get_unix_fd( current->reply_fd ), vec, 2 )) < sizeof(*reply)) goto error; + ret = writev( get_unix_fd( current->reply_fd ), vec, 2 ); + if (ret < 0 || ret < sizeof(*reply)) goto error; if ((current->reply_towrite = current->reply_size - (ret - sizeof(*reply)))) {

2 1

[PATCH 3/3] include: fix prototype of NtQueryInformationFile
by Eric Pouech March 8, 2022

March 8, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/unix/file.c | 2 +- include/winternl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..cc8bf0c6e82 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4021,7 +4021,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC * NtQueryInformationFile (NTDLL.@) */ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, - void *ptr, LONG len, FILE_INFORMATION_CLASS class ) + void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { static const size_t info_sizes[] = { diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..4c49f5eae47 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4048,7 +4048,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOL NTSYSAPI NTSTATUS WINAPI NtQueryEvent(HANDLE,EVENT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); NTSYSAPI NTSTATUS WINAPI NtQueryInformationAtom(RTL_ATOM,ATOM_INFORMATION_CLASS,PVOID,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtQueryInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationPort(HANDLE,PORT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG);

1 0

[PATCH] maintainers: Add dllhost.
by Huw Davies March 8, 2022

March 8, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a90c91b60b7..9ceae9e80bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -233,6 +233,7 @@ F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c +F: programs/dllhost/ OLE Storage M: Esme Povirk <esme(a)codeweavers.com> -- 2.23.0

1 0