October 2023 - Wine-commits

Alexandre Julliard : server: Remove some leftover code from a failed rebase.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 93a5dce013a0b992e18ff6b923dcbb6535577ab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/93a5dce013a0b992e18ff6b923dcbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 6 11:23:46 2023 +0200 server: Remove some leftover code from a failed rebase. --- server/mapping.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index c570bcf8f94..a795dc4b38b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -833,11 +833,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)); if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; - else if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && - nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && - nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && - !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)) - mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; else if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && (has_relocs || mapping->image.contains_code) && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated;

1 0

Alexandre Julliard : ntdll: Only create the main module on the 32-bit side for wow64.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: de81e2ea41b27a14f88177639c5b5d35a210b5bd URL: https://gitlab.winehq.org/wine/wine/-/commit/de81e2ea41b27a14f88177639c5b5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 6 15:08:02 2023 +0200 ntdll: Only create the main module on the 32-bit side for wow64. --- dlls/ntdll/loader.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cfb1e833cc6..2bf1437623f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4219,16 +4219,13 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR init_user_process_params(); load_global_options(); version_init(); + build_ntdll_module( meminfo.AllocationBase ); - get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path ); + if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); wm = build_main_module(); wm->ldr.LoadCount = -1; - build_ntdll_module( meminfo.AllocationBase ); - - if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); - if ((status = load_dll( NULL, L"kernel32.dll", 0, &kernel32, FALSE )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %lx\n", status ); @@ -4245,6 +4242,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR actctx_init(); locale_init(); + get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path ); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry ); else

1 0

Alex Henrie : riched20: Use CRT allocation functions.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 42579f1dcd2f14e765e2f53ceb5b46fff5623f10 URL: https://gitlab.winehq.org/wine/wine/-/commit/42579f1dcd2f14e765e2f53ceb5b46… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 11:36:20 2023 -0600 riched20: Use CRT allocation functions. --- dlls/riched20/caret.c | 2 +- dlls/riched20/clipboard.c | 8 +++--- dlls/riched20/editor.c | 36 ++++++++++++------------ dlls/riched20/editstr.h | 1 - dlls/riched20/list.c | 8 +++--- dlls/riched20/reader.c | 72 +++++++++++++++++------------------------------ dlls/riched20/richole.c | 22 +++++++-------- dlls/riched20/string.c | 24 ++++++++-------- dlls/riched20/style.c | 4 +-- dlls/riched20/table.c | 2 +- dlls/riched20/txthost.c | 12 ++++---- dlls/riched20/txtsrv.c | 4 +-- dlls/riched20/undo.c | 8 +++--- dlls/riched20/wrap.c | 18 ++++++------ dlls/riched20/writer.c | 12 ++++---- 15 files changed, 106 insertions(+), 127 deletions(-)

1 0

Zebediah Figura : objsel: Remove unnecessary includes.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 528fdc783bf8fe84cf232b90b5d19acc258c0a32 URL: https://gitlab.winehq.org/wine/wine/-/commit/528fdc783bf8fe84cf232b90b5d19a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 13:01:43 2023 -0500 objsel: Remove unnecessary includes. --- dlls/objsel/objsel.c | 1 - dlls/objsel/objsel_private.h | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index e42ac5ab898..90873191691 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -19,7 +19,6 @@ */ #include "objsel_private.h" -#include "rpcproxy.h" #include "wine/debug.h" diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index 9289c00d8c9..b0a2e956733 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -18,24 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" - #define COBJMACROS -#include "ole2.h" -#include "strmif.h" -#include "olectl.h" -#include "unknwn.h" +#include "objidl.h" #include "objsel.h" -#include "uuids.h" /********************************************************************** * Dll lifetime tracking declaration for objsel.dll

1 0

Zebediah Figura : objsel: Remove DLL refcount tracking.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 39ccd7199160bd0e9ed3ed4a040328f930369706 URL: https://gitlab.winehq.org/wine/wine/-/commit/39ccd7199160bd0e9ed3ed4a040328… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 13:05:14 2023 -0500 objsel: Remove DLL refcount tracking. Recent consensus seems to be that this isn't worth the effort. --- dlls/objsel/factory.c | 20 ++------------------ dlls/objsel/objsel.c | 24 +----------------------- dlls/objsel/objsel_private.h | 6 ------ 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c index cb0fb491cb4..c3e64f0568a 100644 --- a/dlls/objsel/factory.c +++ b/dlls/objsel/factory.c @@ -66,20 +66,12 @@ static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface( static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) { ClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref; TRACE("\n"); if (This == NULL) return E_POINTER; - ref = InterlockedIncrement(&This->ref); - - if (ref == 1) - { - InterlockedIncrement(&dll_refs); - } - - return ref; + return InterlockedIncrement(&This->ref); } @@ -89,20 +81,12 @@ static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface) { ClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref; TRACE("\n"); if (This == NULL) return E_POINTER; - ref = InterlockedDecrement(&This->ref); - - if (ref == 0) - { - InterlockedDecrement(&dll_refs); - } - - return ref; + return InterlockedDecrement(&This->ref); } diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 90873191691..026a6d594af 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -24,8 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(objsel); -LONG dll_refs = 0; - /*********************************************************************** * DllGetClassObject (OBJSEL.@) */ @@ -43,15 +41,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) } -/*********************************************************************** - * DllCanUnloadNow (OBJSEL.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return dll_refs != 0 ? S_FALSE : S_OK; -} - - /********************************************************************** * OBJSEL_IDsObjectPicker_Destroy (also IUnknown) */ @@ -74,20 +63,12 @@ static inline IDsObjectPickerImpl *impl_from_IDsObjectPicker(IDsObjectPicker *if static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) { IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface); - ULONG ref; TRACE("\n"); if (This == NULL) return E_POINTER; - ref = InterlockedIncrement(&This->ref); - - if (ref == 1) - { - InterlockedIncrement(&dll_refs); - } - - return ref; + return InterlockedIncrement(&This->ref); } @@ -106,10 +87,7 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) - { - InterlockedDecrement(&dll_refs); OBJSEL_IDsObjectPicker_Destroy(This); - } return ref; } diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index b0a2e956733..86ea129089b 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -23,12 +23,6 @@ #include "objidl.h" #include "objsel.h" -/********************************************************************** - * Dll lifetime tracking declaration for objsel.dll - */ - -extern LONG dll_refs DECLSPEC_HIDDEN; - /********************************************************************** * ClassFactory declaration for objsel.dll */

1 0

Zebediah Figura : objsel: Merge factory.c into objsel.c.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 026c7fc6b52f26b75de920f57766c807a329610d URL: https://gitlab.winehq.org/wine/wine/-/commit/026c7fc6b52f26b75de920f57766c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 17:41:14 2023 -0500 objsel: Merge factory.c into objsel.c. A separate file for the class factory is not justified. --- dlls/objsel/Makefile.in | 1 - dlls/objsel/factory.c | 152 ------------------------------------------- dlls/objsel/objsel.c | 151 ++++++++++++++++++++++++++++++++++++------ dlls/objsel/objsel_private.h | 43 ------------ 4 files changed, 131 insertions(+), 216 deletions(-)

1 0

Zebediah Figura : objsel: Do not check for a NULL interface in COM methods.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 2ac66e33fd89bbae31367ebda94415424d812a56 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ac66e33fd89bbae31367ebda94415… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 17:45:49 2023 -0500 objsel: Do not check for a NULL interface in COM methods. --- dlls/objsel/objsel.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 0c809673c44..41f548bbc75 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -59,8 +59,6 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) TRACE("\n"); - if (This == NULL) return E_POINTER; - return InterlockedIncrement(&This->ref); } @@ -75,8 +73,6 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) TRACE("\n"); - if (This == NULL) return E_POINTER; - ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -209,9 +205,6 @@ static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) TRACE("\n"); - if (!factory) - return E_POINTER; - return InterlockedIncrement(&factory->ref); } @@ -222,9 +215,6 @@ static ULONG WINAPI class_factory_Release(IClassFactory *iface) TRACE("\n"); - if (!factory) - return E_POINTER; - return InterlockedDecrement(&factory->ref); }

1 0

Zebediah Figura : objsel: Do not create an object from IClassFactory::QueryInterface().
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 512f8b17aee3fe25d1ec062667ef9e1eb24a485a URL: https://gitlab.winehq.org/wine/wine/-/commit/512f8b17aee3fe25d1ec062667ef9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 17:46:54 2023 -0500 objsel: Do not create an object from IClassFactory::QueryInterface(). --- dlls/objsel/objsel.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 41f548bbc75..fce397cf557 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -189,10 +189,6 @@ static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID IClassFactory_AddRef(iface); return S_OK; } - else if (IsEqualGUID(iid, &IID_IDsObjectPicker)) - { - return IClassFactory_CreateInstance(iface, NULL, iid, out); - } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); return E_NOINTERFACE;

1 0

Helix Graziani : nsiproxy.sys: Implement ipv6_forward_enumerate_all.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 5a7d75cd347369ed14dcccc84e796dda20d77580 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a7d75cd347369ed14dcccc84e796d… Author: Helix Graziani <helix.graziani(a)hotmail.com> Date: Sat Sep 9 17:37:48 2023 -0400 nsiproxy.sys: Implement ipv6_forward_enumerate_all. --- dlls/nsiproxy.sys/ip.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index dbe3a0b46b7..c904f9158fe 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -1482,13 +1482,145 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, UINT key_size, void return status; } +struct ipv6_route_data +{ + NET_LUID luid; + UINT if_index; + struct in6_addr prefix; + UINT prefix_len; + struct in6_addr next_hop; + UINT metric; + UINT protocol; + BYTE loopback; +}; + +static void ipv6_forward_fill_entry( struct ipv6_route_data *entry, struct nsi_ipv6_forward_key *key, + struct nsi_ip_forward_rw *rw, struct nsi_ipv6_forward_dynamic *dyn, + struct nsi_ip_forward_static *stat ) +{ + if (key) + { + key->unk = 0; + memcpy( key->prefix.u.Byte, entry->prefix.s6_addr, sizeof(entry->prefix.s6_addr) ); + key->prefix_len = entry->prefix_len; + memset( key->unk2, 0, sizeof(key->unk2) ); + memset( key->unk3, 0, sizeof(key->unk3) ); + key->luid = entry->luid; + key->luid2 = entry->luid; + memcpy( key->next_hop.u.Byte, entry->next_hop.s6_addr, sizeof(entry->next_hop.s6_addr) ); + key->pad = 0; + } + + if (rw) + { + rw->site_prefix_len = 0; + rw->valid_lifetime = ~0u; + rw->preferred_lifetime = ~0u; + rw->metric = entry->metric; + rw->protocol = entry->protocol; + rw->loopback = entry->loopback; + rw->autoconf = 1; + rw->publish = 0; + rw->immortal = 1; + memset( rw->unk, 0, sizeof(rw->unk) ); + rw->unk2 = 0; + } + + if (dyn) + { + memset( dyn, 0, sizeof(*dyn) ); + } + + if (stat) + { + stat->origin = NlroManual; + stat->if_index = entry->if_index; + } +} + +struct in6_addr str_to_in6_addr(char *nptr, char **endptr) +{ + struct in6_addr ret; + + for (int i = 0; i < sizeof(ret); i++) + { + if (!isxdigit( *nptr ) || !isxdigit( *nptr + 1 )) + { + /* invalid hex string */ + if (endptr) *endptr = nptr; + return ret; + } + + sscanf( nptr, "%2hhx", &ret.s6_addr[i] ); + nptr += 2; + } + + if (endptr) *endptr = nptr; + + return ret; +} + static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void *rw_data, UINT rw_size, void *dynamic_data, UINT dynamic_size, void *static_data, UINT static_size, UINT_PTR *count ) { + UINT num = 0; + NTSTATUS status = STATUS_SUCCESS; + BOOL want_data = key_size || rw_size || dynamic_size || static_size; + struct ipv6_route_data entry; + + TRACE( "%p %d %p %d %p %d %p %d %p" , key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); + +#ifdef __linux__ + { + char buf[512], *ptr; + UINT rtf_flags; + FILE *fp; + + if (!(fp = fopen( "/proc/net/ipv6_route", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + while (!isspace( *ptr )) ptr++; + *ptr++ = '\0'; + + entry.prefix = str_to_in6_addr( ptr, &ptr ); + entry.prefix_len = strtoul( ptr + 1, &ptr, 16 ); + str_to_in6_addr( ptr + 1, &ptr ); /* source network, skip */ + strtoul( ptr + 1, &ptr, 16 ); /* source prefix length, skip */ + entry.next_hop = str_to_in6_addr( ptr + 1, &ptr ); + entry.metric = strtoul( ptr + 1, &ptr, 16 ); + strtoul( ptr + 1, &ptr, 16 ); /* refcount, skip */ + strtoul( ptr + 1, &ptr, 16 ); /* use, skip */ + rtf_flags = strtoul( ptr + 1, &ptr, 16); + entry.protocol = (rtf_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL; + entry.loopback = entry.protocol == MIB_IPPROTO_LOCAL && entry.prefix_len == 32; + + if (!convert_unix_name_to_luid( ptr, &entry.luid )) continue; + if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue; + + if (num < *count) + { + ipv6_forward_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); + key_data = (BYTE *)key_data + key_size; + rw_data = (BYTE *)rw_data + rw_size; + dynamic_data = (BYTE *)dynamic_data + dynamic_size; + static_data = (BYTE *)static_data + static_size; + } + num++; + } + fclose(fp); + } +#else FIXME( "not implemented\n" ); - *count = 0; - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; +#endif + + if (!want_data || num <= *count) *count = num; + else status = STATUS_BUFFER_OVERFLOW; + + return status; } static struct module_table ipv4_tables[] =

1 0

Gabriel Ivăncescu : mshtml: Implement SuperNavigate undocumented flag 2.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: b38fcaf36a3cf7b8eed153a539377d82bb4d6291 URL: https://gitlab.winehq.org/wine/wine/-/commit/b38fcaf36a3cf7b8eed153a539377d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 mshtml: Implement SuperNavigate undocumented flag 2. Seems to be doing a replace and skipping updating travel log/history. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 9 +- dlls/mshtml/tests/htmldoc.c | 206 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 212 insertions(+), 3 deletions(-)

1 0