- Wine-Commits - list.winehq.org

Joel Holdsworth : ntdll/tests: Fix FILE_RENAME_INFORMATION_EX test failures on Windows 10 1607 & 1709.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 72ebbca61b81e5aa4c9b200b3522832a8a07bd92 URL: https://gitlab.winehq.org/wine/wine/-/commit/72ebbca61b81e5aa4c9b200b352283… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Fri Oct 6 10:41:37 2023 +0100 ntdll/tests: Fix FILE_RENAME_INFORMATION_EX test failures on Windows 10 1607 & 1709. These versions of Windows are not included in the TestBot base VM set hence why the failures were not caught when the tests were submitted in the original commit: 07e40a6f9f70338d9810d50b606696b7be984d98 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55733 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4e1750a4751..da3611f74f2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2259,12 +2259,18 @@ static void test_file_rename_information_ex(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx ); - ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); - fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - ok( fileDeleted, "file should not exist\n" ); - fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - ok( !fileDeleted, "file should exist\n" ); + ok( io.Status == STATUS_SUCCESS || io.Status == 0xdeadbeef, + "io.Status expected STATUS_SUCCESS or 0xdeadbeef, got %lx\n", io.Status ); + ok( res == STATUS_SUCCESS || res == STATUS_NOT_SUPPORTED, + "res expected STATUS_SUCCESS or STATUS_NOT_SUPPORTED, got %lx\n", res ); + + if (res == STATUS_SUCCESS) + { + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "file should not exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + } CloseHandle( handle ); HeapFree( GetProcessHeap(), 0, fri );

1 0

Jactry Zeng : user32: Add more builtin string resources.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: bcc8c31e0df136f4cebef96222b2c69977c41ec2 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcc8c31e0df136f4cebef96222b2c6… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Oct 5 06:52:54 2023 -0500 user32: Add more builtin string resources. --- dlls/user32/resources.h | 11 +++++ dlls/user32/tests/resource.c | 47 +++++++++++++++++++- dlls/user32/user32.rc | 11 +++++ po/ar.po | 98 +++++++++++++++++++++-------------------- po/ast.po | 98 +++++++++++++++++++++-------------------- po/bg.po | 98 +++++++++++++++++++++-------------------- po/ca.po | 98 +++++++++++++++++++++-------------------- po/cs.po | 98 +++++++++++++++++++++-------------------- po/da.po | 98 +++++++++++++++++++++-------------------- po/de.po | 98 +++++++++++++++++++++-------------------- po/el.po | 98 +++++++++++++++++++++-------------------- po/en.po | 98 +++++++++++++++++++++-------------------- po/en_US.po | 98 +++++++++++++++++++++-------------------- po/eo.po | 98 +++++++++++++++++++++-------------------- po/es.po | 98 +++++++++++++++++++++-------------------- po/fa.po | 98 +++++++++++++++++++++-------------------- po/fi.po | 101 ++++++++++++++++++++++--------------------- po/fr.po | 98 +++++++++++++++++++++-------------------- po/he.po | 98 +++++++++++++++++++++-------------------- po/hi.po | 98 +++++++++++++++++++++-------------------- po/hr.po | 98 +++++++++++++++++++++-------------------- po/hu.po | 98 +++++++++++++++++++++-------------------- po/it.po | 98 +++++++++++++++++++++-------------------- po/ja.po | 98 +++++++++++++++++++++-------------------- po/ka.po | 98 +++++++++++++++++++++-------------------- po/ko.po | 98 +++++++++++++++++++++-------------------- po/lt.po | 98 +++++++++++++++++++++-------------------- po/ml.po | 98 +++++++++++++++++++++-------------------- po/nb_NO.po | 98 +++++++++++++++++++++-------------------- po/nl.po | 98 +++++++++++++++++++++-------------------- po/or.po | 98 +++++++++++++++++++++-------------------- po/pa.po | 98 +++++++++++++++++++++-------------------- po/pl.po | 98 +++++++++++++++++++++-------------------- po/pt_BR.po | 98 +++++++++++++++++++++-------------------- po/pt_PT.po | 98 +++++++++++++++++++++-------------------- po/rm.po | 98 +++++++++++++++++++++-------------------- po/ro.po | 98 +++++++++++++++++++++-------------------- po/ru.po | 98 +++++++++++++++++++++-------------------- po/si.po | 98 +++++++++++++++++++++-------------------- po/sk.po | 98 +++++++++++++++++++++-------------------- po/sl.po | 98 +++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 98 +++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 98 +++++++++++++++++++++-------------------- po/sv.po | 98 +++++++++++++++++++++-------------------- po/ta.po | 98 +++++++++++++++++++++-------------------- po/te.po | 98 +++++++++++++++++++++-------------------- po/th.po | 98 +++++++++++++++++++++-------------------- po/tr.po | 98 +++++++++++++++++++++-------------------- po/uk.po | 98 +++++++++++++++++++++-------------------- po/wa.po | 98 +++++++++++++++++++++-------------------- po/wine.pot | 98 +++++++++++++++++++++-------------------- po/zh_CN.po | 98 +++++++++++++++++++++-------------------- po/zh_TW.po | 98 +++++++++++++++++++++-------------------- 53 files changed, 2569 insertions(+), 2403 deletions(-)

1 0

Zebediah Figura : wined3d: Rename WINED3D_MAX_TEXTURES to WINED3D_MAX_FFP_TEXTURES.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: fbee3cf2e062973b37bb14f36c8764d1729bbf18 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbee3cf2e062973b37bb14f36c8764… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 19:18:29 2023 -0600 wined3d: Rename WINED3D_MAX_TEXTURES to WINED3D_MAX_FFP_TEXTURES. --- dlls/wined3d/adapter_gl.c | 14 +++---- dlls/wined3d/arb_program_shader.c | 42 ++++++++++--------- dlls/wined3d/ati_fragment_shader.c | 18 ++++----- dlls/wined3d/context_gl.c | 14 +++---- dlls/wined3d/glsl_shader.c | 78 ++++++++++++++++++------------------ dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 6 +-- dlls/wined3d/state.c | 8 ++-- dlls/wined3d/stateblock.c | 20 ++++----- dlls/wined3d/utils.c | 23 +++++------ dlls/wined3d/wined3d_private.h | 26 ++++++------ include/wine/wined3d.h | 4 +- 12 files changed, 129 insertions(+), 126 deletions(-)

1 0

Gabriel Ivăncescu : ieframe: Use the original URL for error pages' address bar.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 76b198000f3df8e32c63174dc728d88f625e85f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/76b198000f3df8e32c63174dc728d8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Use the original URL for error pages' address bar. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/iexplore.c | 4 ++++ dlls/ieframe/shellbrowser.c | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index b03fe6e8e83..602bb1c5d36 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -281,6 +281,7 @@ HRESULT get_window(DocHost*,IHTMLWindow2**); HRESULT get_location_url(DocHost*,BSTR*); HRESULT set_dochost_url(DocHost*,const WCHAR*); void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*); +const WCHAR *error_url_frag(const WCHAR*); HRESULT dochost_object_available(DocHost*,IUnknown*); void set_doc_state(DocHost*,READYSTATE); void activate_document(DocHost*); diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index acf7a18e3f3..43ecf5ee3f1 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -783,6 +783,10 @@ static void DocHostContainer_on_command_state_change(DocHost *iface, LONG comman static void DocHostContainer_set_url(DocHost* iface, const WCHAR *url) { InternetExplorer *This = impl_from_DocHost(iface); + const WCHAR *orig_url = error_url_frag(url); + + if(orig_url) + url = orig_url; This->nohome = FALSE; SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index a5666fd761b..d3f8c6f8ddb 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -29,6 +29,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +const WCHAR *error_url_frag(const WCHAR *url) +{ + if(!wcsncmp(url, L"res://", ARRAY_SIZE(L"res://")-1)) { + WCHAR buf[MAX_PATH]; + UINT len = GetSystemDirectoryW(buf, ARRAY_SIZE(buf)); + + if(len && !wcsncmp(url + ARRAY_SIZE(L"res://")-1, buf, len)) { + len += ARRAY_SIZE(L"res://")-1; + if(!wcsncmp(url + len, L"\\shdoclc.dll/ERROR.HTM", ARRAY_SIZE(L"\\shdoclc.dll/ERROR.HTM")-1)) { + len += ARRAY_SIZE(L"\\shdoclc.dll/ERROR.HTM")-1; + url = wcschr(url + len, '#'); + return url ? url + 1 : NULL; + } + } + } + return NULL; +} + static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) { return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface);

1 0

Gabriel Ivăncescu : ieframe: Implement DocObjectService_IsErrorUrl.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: c737b283d0c9716f5ea7e93afac93b8c34e8fc16 URL: https://gitlab.winehq.org/wine/wine/-/commit/c737b283d0c9716f5ea7e93afac93b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Implement DocObjectService_IsErrorUrl. Needed to prevent an infinite loop when the error page itself fails to load (mshtml bails out early). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/shellbrowser.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index ca229c0ac8b..e2c4c451741 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -930,9 +930,10 @@ static HRESULT WINAPI DocObjectService_IsErrorUrl( BOOL *pfIsError) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %s %p\n", This, debugstr_w(lpszUrl), pfIsError); - *pfIsError = FALSE; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(lpszUrl), pfIsError); + + *pfIsError = !!error_url_frag(lpszUrl); return S_OK; }

1 0

Gabriel Ivăncescu : ieframe: Send the original URL for error pages in FireNavigationComplete2 notification.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 82c03141d871d8bf651132817bfa6bc117ed0d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/82c03141d871d8bf651132817bfa6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Send the original URL for error pages in FireNavigationComplete2 notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/shellbrowser.c | 8 ++++++++ dlls/ieframe/tests/ie.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index d3f8c6f8ddb..58ff851fb0b 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -758,6 +758,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( ShellBrowser *This = impl_from_IDocObjectService(iface); DocHost *doc_host = This->doc_host; IHTMLPrivateWindow *priv_window; + const WCHAR *orig_url; VARIANTARG params[2]; DISPPARAMS dp = {params, NULL, 2, 0}; VARIANT url_var; @@ -786,6 +787,13 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( TRACE("got URL %s\n", debugstr_w(url)); set_dochost_url(This->doc_host, url); + orig_url = error_url_frag(url); + if(orig_url) { + BSTR tmp = SysAllocString(orig_url); + SysFreeString(url); + url = tmp; + } + V_VT(params) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params) = &url_var; diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 5e52baedb68..8a91efb3af5 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -186,7 +186,6 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF arg = pDispParams->rgvarg; ok(V_VT(arg) == (VT_BYREF | VT_VARIANT), "VT = %d\n", V_VT(arg)); ok(V_VT(V_VARIANTREF(arg)) == VT_BSTR, "VT = %d\n", V_VT(V_VARIANTREF(arg))); - todo_wine_if(called_Invoke_NAVIGATEERROR) ok(!wcscmp(V_BSTR(V_VARIANTREF(arg)), navigate_url), "url = %s\n", wine_dbgstr_w(V_BSTR(V_VARIANTREF(arg)))); arg = pDispParams->rgvarg + 1;

1 0

Gabriel Ivăncescu : ieframe: Send the original URL for error pages in FireDocumentComplete notification.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 5d17e7e4a877d75c024e016b1cc888b31f3fad10 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d17e7e4a877d75c024e016b1cc888… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Send the original URL for error pages in FireDocumentComplete notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/shellbrowser.c | 8 ++++++++ dlls/ieframe/tests/ie.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 58ff851fb0b..ca229c0ac8b 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -839,6 +839,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( { ShellBrowser *This = impl_from_IDocObjectService(iface); IHTMLPrivateWindow *priv_window; + const WCHAR *orig_url; VARIANTARG params[2]; DISPPARAMS dp = {params, NULL, 2, 0}; VARIANT url_var; @@ -858,6 +859,13 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( TRACE("got URL %s\n", debugstr_w(url)); + orig_url = error_url_frag(url); + if(orig_url) { + BSTR tmp = SysAllocString(orig_url); + SysFreeString(url); + url = tmp; + } + V_VT(params) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params) = &url_var; diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 8a91efb3af5..d6e1f643952 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -215,7 +215,6 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF arg = pDispParams->rgvarg; ok(V_VT(arg) == (VT_BYREF | VT_VARIANT), "VT = %d\n", V_VT(arg)); ok(V_VT(V_VARIANTREF(arg)) == VT_BSTR, "VT = %d\n", V_VT(V_VARIANTREF(arg))); - todo_wine_if(called_Invoke_NAVIGATEERROR) ok(!wcscmp(V_BSTR(V_VARIANTREF(arg)), navigate_url), "url = %s\n", wine_dbgstr_w(V_BSTR(V_VARIANTREF(arg)))); arg = pDispParams->rgvarg + 1;

1 0

Gabriel Ivăncescu : mshtml: Implement SuperNavigate undocumented flag 2.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

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

Helix Graziani : nsiproxy.sys: Implement ipv6_forward_enumerate_all.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

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

Zebediah Figura : objsel: Do not create an object from IClassFactory::QueryInterface().
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

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