wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Vijay Kiran Kamuju : taskschd: Implement ITaskService_get_ConnectedUser.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 6ec977aa004409e17e1df5a2fdee850044ddf1ca URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec977aa004409e17e1df5a2fdee85… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Feb 25 22:25:00 2024 +0100 taskschd: Implement ITaskService_get_ConnectedUser. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48110 --- dlls/taskschd/task.c | 22 ++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d9ddf9d12b8..26cfeb950b0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3687,6 +3687,7 @@ typedef struct BOOL connected; DWORD version; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR user_name[256]; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -3858,6 +3859,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V static WCHAR ncalrpc[] = L"ncalrpc"; TaskService *task_svc = impl_from_ITaskService(iface); WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR user_name[256]; DWORD len; HRESULT hr; RPC_WSTR binding_str; @@ -3873,6 +3875,10 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V if (!GetComputerNameW(comp_name, &len)) return HRESULT_FROM_WIN32(GetLastError()); + len = ARRAY_SIZE(user_name); + if (!GetUserNameW(user_name, &len)) + return HRESULT_FROM_WIN32(GetLastError()); + if (!is_variant_null(&server)) { const WCHAR *server_name; @@ -3911,6 +3917,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V TRACE("server version %#lx\n", task_svc->version); lstrcpyW(task_svc->comp_name, comp_name); + lstrcpyW(task_svc->user_name, user_name); task_svc->connected = TRUE; return S_OK; @@ -3948,8 +3955,19 @@ static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *se static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *user) { - FIXME("%p,%p: stub\n", iface, user); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, user); + + if (!user) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *user = SysAllocString(task_svc->user_name); + if (!*user) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskService_get_ConnectedDomain(ITaskService *iface, BSTR *domain) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index bf6e13be98b..2829ba98ff2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -64,6 +64,7 @@ static BOOL check_win_version(int min_major, int min_minor) static void test_Connect(void) { WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR user_name[256]; DWORD len; HRESULT hr; BSTR bstr; @@ -93,6 +94,12 @@ static void test_Connect(void) hr = ITaskService_get_TargetServer(service, &bstr); ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + hr = ITaskService_get_ConnectedUser(service, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#lx\n", hr); + + hr = ITaskService_get_ConnectedUser(service, &bstr); + ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + /* Win7 doesn't support UNC \\ prefix, but according to a user * comment on MSDN Win8 supports both ways. */ @@ -144,6 +151,14 @@ static void test_Connect(void) ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); SysFreeString(bstr); + len = ARRAY_SIZE(user_name); + GetUserNameW(user_name, &len); + + hr = ITaskService_get_ConnectedUser(service, &bstr); + ok(hr == S_OK, "get_ConnectedUser error %#lx\n", hr); + ok(!lstrcmpW(user_name, bstr), "username %s != user name %s\n", wine_dbgstr_w(user_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskService_Release(service); }

1 0

Paul Gofman : mmdevapi: Force debug info in critical sections.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: b9a2ff25587bb7a7c9db9467a96dc2a18feab4ab URL: https://gitlab.winehq.org/wine/wine/-/commit/b9a2ff25587bb7a7c9db9467a96dc2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:29:48 2024 -0600 mmdevapi: Force debug info in critical sections. --- dlls/mmdevapi/devenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 246625286b8..3c2085339ed 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -344,7 +344,7 @@ static MMDevice *MMDevice_Create(const WCHAR *name, GUID *id, EDataFlow flow, DW cur->IMMDevice_iface.lpVtbl = &MMDeviceVtbl; cur->IMMEndpoint_iface.lpVtbl = &MMEndpointVtbl; - InitializeCriticalSection(&cur->crst); + InitializeCriticalSectionEx(&cur->crst, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cur->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MMDevice.crst"); list_add_tail(&device_list, &cur->entry);

1 0

Paul Gofman : itss: Force debug info in critical sections.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 131918e4c29237f8750168432a6653d272179f1f URL: https://gitlab.winehq.org/wine/wine/-/commit/131918e4c29237f8750168432a6653… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:27:28 2024 -0600 itss: Force debug info in critical sections. --- dlls/itss/chm_lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index f2665cae529..894bfc07a49 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -686,11 +686,11 @@ struct chmFile *chm_openW(const WCHAR *filename) } /* initialize mutexes, if needed */ - InitializeCriticalSection(&newHandle->mutex); + InitializeCriticalSectionEx(&newHandle->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex"); - InitializeCriticalSection(&newHandle->lzx_mutex); + InitializeCriticalSectionEx(&newHandle->lzx_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex"); - InitializeCriticalSection(&newHandle->cache_mutex); + InitializeCriticalSectionEx(&newHandle->cache_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex"); /* read and verify header */ @@ -817,11 +817,11 @@ struct chmFile *chm_dup(struct chmFile *oldHandle) newHandle->cache_num_blocks = 0; /* initialize mutexes, if needed */ - InitializeCriticalSection(&newHandle->mutex); + InitializeCriticalSectionEx(&newHandle->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex"); - InitializeCriticalSection(&newHandle->lzx_mutex); + InitializeCriticalSectionEx(&newHandle->lzx_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex"); - InitializeCriticalSection(&newHandle->cache_mutex); + InitializeCriticalSectionEx(&newHandle->cache_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex"); /* initialize cache */

1 0

Paul Gofman : browseui: Force debug info in critical sections.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: f4a3f573c279213b710f9eef6bd391a5cb193568 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4a3f573c279213b710f9eef6bd391… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:26:15 2024 -0600 browseui: Force debug info in critical sections. --- dlls/browseui/compcatcachedaemon.c | 2 +- dlls/browseui/progressdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index f7a5e4b449f..6ea983626a4 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -149,7 +149,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; This->refCount = 1; - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs"); TRACE("returning %p\n", This); diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 9834a4089f2..da73dbb4740 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -626,7 +626,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; This->IOleWindow_iface.lpVtbl = &OleWindowVtbl; This->refCount = 1; - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); TRACE("returning %p\n", This);

1 0

Paul Gofman : wmwcore: Force debug info in critical sections.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 03e3bd947fef8f0eed7eb8c674b3d2ae917db8ea URL: https://gitlab.winehq.org/wine/wine/-/commit/03e3bd947fef8f0eed7eb8c674b3d2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:24:33 2024 -0600 wmwcore: Force debug info in critical sections. --- dlls/wmvcore/async_reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index 3a8556a5f0a..ef657d561ba 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -1924,9 +1924,9 @@ static HRESULT WINAPI async_reader_create(IWMReader **reader) goto failed; IWMReader_Release(&object->IWMReader_iface); - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.cs"); - InitializeCriticalSection(&object->callback_cs); + InitializeCriticalSectionEx(&object->callback_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->callback_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.callback_cs"); QueryPerformanceFrequency(&object->clock_frequency);

1 0

Paul Gofman : wbemprox: Force debug info in critical sections.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 0d51cce2fb6b5828b663805d72ed35d201c328e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d51cce2fb6b5828b663805d72ed35… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:22:43 2024 -0600 wbemprox: Force debug info in critical sections. --- dlls/wbemprox/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 53b731d8b10..3b55a534de9 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -992,7 +992,7 @@ HRESULT WbemServices_create( const WCHAR *namespace, IWbemContext *context, LPVO ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; ws->ns = ns; - InitializeCriticalSection( &ws->cs ); + InitializeCriticalSectionEx( &ws->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ws->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wbemprox_services.cs"); if (context) IWbemContext_Clone( context, &ws->context );

1 0

Hans Leidekker : wbemprox: Handle implicit property in object path.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 4cc9ee7e6747a4df3c7b93c95eed4f8fcadbf8ec URL: https://gitlab.winehq.org/wine/wine/-/commit/4cc9ee7e6747a4df3c7b93c95eed4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 23 13:37:46 2024 +0100 wbemprox: Handle implicit property in object path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55619 --- dlls/wbemprox/services.c | 54 ++++++++++++++++++++++++++++++++-------- dlls/wbemprox/table.c | 21 ++++++++++++++++ dlls/wbemprox/tests/query.c | 14 +++++++++-- dlls/wbemprox/wbemprox_private.h | 5 ++-- 4 files changed, 79 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 436097c1e8d..53b731d8b10 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -336,6 +336,14 @@ static HRESULT WINAPI wbem_services_QueryObjectSink( return WBEM_E_FAILED; } +void free_path( struct path *path ) +{ + if (!path) return; + free( path->class ); + free( path->filter ); + free( path ); +} + HRESULT parse_path( const WCHAR *str, struct path **ret ) { struct path *path; @@ -391,7 +399,7 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) } q = p; - while (*p && *p != '.') p++; + while (*p && *p != '.' && *p != '=') p++; len = p - q; if (!(path->class = malloc( (len + 1) * sizeof(WCHAR) ))) @@ -411,26 +419,50 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) len = q - p; if (!(path->filter = malloc( (len + 1) * sizeof(WCHAR) ))) { - free( path->class ); - free( path ); + free_path( path ); return E_OUTOFMEMORY; } memcpy( path->filter, p, len * sizeof(WCHAR) ); path->filter[len] = 0; path->filter_len = len; } + else if (p[0] == '=' && p[1]) + { + WCHAR *key; + UINT len_key; + + while (*q) q++; + len = q - p; + + if (!(key = get_first_key_property( WBEMPROX_NAMESPACE_CIMV2, path->class ))) + { + free_path( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } + len_key = wcslen( key ); + + if (!(path->filter = malloc( (len + len_key + 1) * sizeof(WCHAR) ))) + { + free( key ); + free_path( path ); + return E_OUTOFMEMORY; + } + wcscpy( path->filter, key ); + memcpy( path->filter + len_key, p, len * sizeof(WCHAR) ); + path->filter_len = len + len_key; + path->filter[path->filter_len] = 0; + free( key ); + } + else if (p[0]) + { + free_path( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } + *ret = path; return S_OK; } -void free_path( struct path *path ) -{ - if (!path) return; - free( path->class ); - free( path->filter ); - free( path ); -} - WCHAR *query_from_path( const struct path *path ) { static const WCHAR selectW[] = L"SELECT * FROM %s WHERE %s"; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 67f57878ea5..573cf035245 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -449,3 +449,24 @@ BSTR get_method_name( enum wbm_namespace ns, const WCHAR *class, UINT index ) release_table( table ); return NULL; } + +WCHAR *get_first_key_property( enum wbm_namespace ns, const WCHAR *class ) +{ + struct table *table; + WCHAR *ret = NULL; + UINT i; + + if (!(table = find_table( ns, class ))) return NULL; + + for (i = 0; i < table->num_cols; i++) + { + if (table->columns[i].type & COL_FLAG_KEY) + { + ret = wcsdup( table->columns[i].name ); + break; + } + } + + release_table( table ); + return ret; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f5a3c2a14cd..f06e0a431ea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2286,8 +2286,7 @@ static void test_SystemRestore( IWbemServices *services ) static void test_Win32_LogicalDisk( IWbemServices *services ) { - BSTR wql = SysAllocString( L"wql" ); - BSTR query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -2329,6 +2328,17 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); + + query = SysAllocString( L"Win32_LogicalDisk = \"C:\"" ); + hr = IWbemServices_GetObject( services, query, 0, NULL, &obj, NULL ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr ); + SysFreeString( query ); + + query = SysAllocString( L"Win32_LogicalDisk=\"C:\"" ); + hr = IWbemServices_GetObject( services, query, 0, NULL, &obj, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + IWbemClassObject_Release( obj ); + SysFreeString( query ); SysFreeString( wql ); } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 8e065bee0b9..655e3db27c2 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -241,8 +241,9 @@ VARTYPE to_vartype( CIMTYPE ); void destroy_array( struct array *, CIMTYPE ); BOOL is_result_prop( const struct view *, const WCHAR * ); HRESULT get_properties( const struct view *, UINT, LONG, SAFEARRAY ** ); -HRESULT get_object( enum wbm_namespace ns, const WCHAR *, IWbemClassObject ** ); -BSTR get_method_name( enum wbm_namespace ns, const WCHAR *, UINT ); +HRESULT get_object( enum wbm_namespace, const WCHAR *, IWbemClassObject ** ); +BSTR get_method_name( enum wbm_namespace, const WCHAR *, UINT ); +WCHAR *get_first_key_property( enum wbm_namespace, const WCHAR * ); void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ); HRESULT create_signature( enum wbm_namespace ns, const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** );

1 0

Hans Leidekker : netprofm: Set return pointer to NULL in networks_enum_Next().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: d2df3c2c21f02a23a5c852c83f26e2bd7483d80f URL: https://gitlab.winehq.org/wine/wine/-/commit/d2df3c2c21f02a23a5c852c83f26e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 26 15:23:51 2024 +0100 netprofm: Set return pointer to NULL in networks_enum_Next(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56271 --- dlls/netprofm/list.c | 2 ++ dlls/netprofm/tests/list.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d6eb1265ac5..31534c7f4b9 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -812,6 +812,8 @@ static HRESULT WINAPI networks_enum_Next( TRACE( "%p, %lu %p %p\n", iter, count, ret, fetched ); + if (!ret) return E_POINTER; + *ret = NULL; if (fetched) *fetched = 0; if (!count) return S_OK; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 05b6851a2d8..bb3d0f59be8 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -381,14 +381,21 @@ static void test_INetworkListManager( void ) hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_ALL, &network_iter ); ok( hr == S_OK, "got %08lx\n", hr ); ok(network_iter != NULL, "network_iter not set\n"); + hr = IEnumNetworks_Next( network_iter, 0, NULL, NULL ); + ok( hr == E_POINTER, "got %08lx\n", hr ); + network = (INetwork *)0xdeadbeef; while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) { + ok( network != (INetwork *)0xdeadbeef, "network not set\n" ); connected = 1; hr = INetwork_get_IsConnected( network, &connected ); ok( hr == S_OK, "got %08lx\n", hr ); ok( connected == -1 || connected == 0, "got %d\n", connected ); INetwork_Release( network ); + network = (INetwork *)0xdeadbeef; } + ok( hr == S_FALSE, "got %08lx\n", hr ); + ok( network == NULL, "network not set\n" ); IEnumNetworks_Release( network_iter ); hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_CONNECTED, &network_iter );

1 0

Hans Leidekker : netprofm: Support NLM_ENUM_NETWORK flags.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 635e0566a331e0ccb0b9445e0252fed0c5840eaf URL: https://gitlab.winehq.org/wine/wine/-/commit/635e0566a331e0ccb0b9445e0252fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 26 13:07:34 2024 +0100 netprofm: Support NLM_ENUM_NETWORK flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56271 --- dlls/netprofm/list.c | 37 ++++++++++++++++++++++++++++--------- dlls/netprofm/tests/list.c | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 16 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index cb65484485b..d6eb1265ac5 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -684,6 +684,7 @@ struct networks_enum LONG refs; struct list_manager *mgr; struct list *cursor; + NLM_ENUM_NETWORK flags; }; static inline struct networks_enum *impl_from_IEnumNetworks( @@ -792,6 +793,17 @@ static HRESULT WINAPI networks_enum_get__NewEnum( return E_NOTIMPL; } +static BOOL match_enum_network_flags( NLM_ENUM_NETWORK flags, struct network *network ) +{ + if (flags == NLM_ENUM_NETWORK_ALL) return TRUE; + if (network->connected) + { + if (flags & NLM_ENUM_NETWORK_CONNECTED) return TRUE; + } + else if (flags & NLM_ENUM_NETWORK_DISCONNECTED) return TRUE; + return FALSE; +} + static HRESULT WINAPI networks_enum_Next( IEnumNetworks *iface, ULONG count, INetwork **ret, ULONG *fetched ) { @@ -806,10 +818,13 @@ static HRESULT WINAPI networks_enum_Next( while (iter->cursor && i < count) { struct network *network = LIST_ENTRY( iter->cursor, struct network, entry ); - ret[i] = &network->INetwork_iface; - INetwork_AddRef( ret[i] ); + if (match_enum_network_flags( iter->flags, network )) + { + ret[i] = &network->INetwork_iface; + INetwork_AddRef( ret[i] ); + i++; + } iter->cursor = list_next( &iter->mgr->networks, iter->cursor ); - i++; } if (fetched) *fetched = i; @@ -826,10 +841,14 @@ static HRESULT WINAPI networks_enum_Skip( if (!count) return S_OK; if (!iter->cursor) return S_FALSE; - while (count--) + for (;;) { + struct network *network; iter->cursor = list_next( &iter->mgr->networks, iter->cursor ); if (!iter->cursor) break; + network = LIST_ENTRY( iter->cursor, struct network, entry ); + if (match_enum_network_flags( iter->flags, network )) count--; + if (!count) break; } return count ? S_FALSE : S_OK; @@ -847,7 +866,7 @@ static HRESULT WINAPI networks_enum_Reset( } static HRESULT create_networks_enum( - struct list_manager *, IEnumNetworks** ); + struct list_manager *, NLM_ENUM_NETWORK, IEnumNetworks ** ); static HRESULT WINAPI networks_enum_Clone( IEnumNetworks *iface, IEnumNetworks **ret ) @@ -855,7 +874,7 @@ static HRESULT WINAPI networks_enum_Clone( struct networks_enum *iter = impl_from_IEnumNetworks( iface ); TRACE( "%p, %p\n", iter, ret ); - return create_networks_enum( iter->mgr, ret ); + return create_networks_enum( iter->mgr, iter->flags, ret ); } static const IEnumNetworksVtbl networks_enum_vtbl = @@ -875,7 +894,7 @@ static const IEnumNetworksVtbl networks_enum_vtbl = }; static HRESULT create_networks_enum( - struct list_manager *mgr, IEnumNetworks **ret ) + struct list_manager *mgr, NLM_ENUM_NETWORK flags, IEnumNetworks **ret ) { struct networks_enum *iter; @@ -886,6 +905,7 @@ static HRESULT create_networks_enum( iter->cursor = list_head( &mgr->networks ); iter->mgr = mgr; INetworkListManager_AddRef( &mgr->INetworkListManager_iface ); + iter->flags = flags; iter->refs = 1; *ret = &iter->IEnumNetworks_iface; @@ -1227,9 +1247,8 @@ static HRESULT WINAPI list_manager_GetNetworks( struct list_manager *mgr = impl_from_INetworkListManager( iface ); TRACE( "%p, %x, %p\n", iface, Flags, ppEnumNetwork ); - if (Flags) FIXME( "flags %08x not supported\n", Flags ); - return create_networks_enum( mgr, ppEnumNetwork ); + return create_networks_enum( mgr, Flags, ppEnumNetwork ); } static HRESULT WINAPI list_manager_GetNetwork( diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index b58aef9bdec..05b6851a2d8 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -380,15 +380,40 @@ static void test_INetworkListManager( void ) network_iter = NULL; hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_ALL, &network_iter ); ok( hr == S_OK, "got %08lx\n", hr ); - if (network_iter) + ok(network_iter != NULL, "network_iter not set\n"); + while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) { - while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) - { - test_INetwork( network, NULL ); - INetwork_Release( network ); - } - IEnumNetworks_Release( network_iter ); + connected = 1; + hr = INetwork_get_IsConnected( network, &connected ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( connected == -1 || connected == 0, "got %d\n", connected ); + INetwork_Release( network ); + } + IEnumNetworks_Release( network_iter ); + + hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_CONNECTED, &network_iter ); + ok( hr == S_OK, "got %08lx\n", hr ); + while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) + { + connected = 0; + hr = INetwork_get_IsConnected( network, &connected ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( connected == -1, "got %d\n", connected ); + INetwork_Release( network ); + } + IEnumNetworks_Release( network_iter ); + + hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_DISCONNECTED, &network_iter ); + ok( hr == S_OK, "got %08lx\n", hr ); + while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) + { + connected = -1; + hr = INetwork_get_IsConnected( network, &connected ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( connected == 0, "got %d\n", connected ); + INetwork_Release( network ); } + IEnumNetworks_Release( network_iter ); conn_iter = NULL; hr = INetworkListManager_GetNetworkConnections( mgr, &conn_iter );

1 0

Paul Gofman : iphlpapi: Partially fill Ipv4 / Ipv6 metric in GetAdaptersAddresses().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: fbd6b2583dc979f47438af5c8dfb502d67f5d612 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbd6b2583dc979f47438af5c8dfb50… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 23 17:49:43 2024 -0600 iphlpapi: Partially fill Ipv4 / Ipv6 metric in GetAdaptersAddresses(). --- dlls/iphlpapi/iphlpapi_main.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 343cc2345d2..85048f7a026 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -993,6 +993,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG { struct nsi_ipv4_forward_key *key4; struct nsi_ipv6_forward_key *key6; + struct nsi_ip_forward_rw *rw; IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; IP_ADAPTER_PREFIX *prefix, **prefix_next; DWORD err, count, i, prefix_len, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); @@ -1002,11 +1003,14 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG void *key; err = NsiAllocateAndGetTable( 1, ip_module_id( family ), NSI_IP_FORWARD_TABLE, &key, key_size, - NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + (void **)&rw, sizeof(*rw), NULL, 0, NULL, 0, &count, 0 ); if (err) return err; while (aa) { + if (family == AF_INET) aa->Ipv4Metric = ~0u; + else aa->Ipv6Metric = ~0u; + for (gw_next = &aa->FirstGatewayAddress; *gw_next; gw_next = &(*gw_next)->Next) ; for (prefix_next = &aa->FirstPrefix; *prefix_next; prefix_next = &(*prefix_next)->Next) @@ -1019,6 +1023,12 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG luid = (family == AF_INET) ? &key4->luid : &key6->luid; if (luid->Value != aa->Luid.Value) continue; + if (rw[i].metric) + { + if (family == AF_INET) aa->Ipv4Metric = min( aa->Ipv4Metric, rw[i].metric ); + else aa->Ipv6Metric = min( aa->Ipv6Metric, rw[i].metric ); + } + if (flags & GAA_FLAG_INCLUDE_GATEWAYS) { memset( &sockaddr, 0, sizeof(sockaddr) ); @@ -1103,7 +1113,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG } err: - NsiFreeTable( key, NULL, NULL, NULL ); + NsiFreeTable( key, rw, NULL, NULL ); return err; } @@ -1269,11 +1279,8 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if (err) goto err; } - if (flags & (GAA_FLAG_INCLUDE_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX)) - { - err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags ); - if (err) goto err; - } + err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags ); + if (err) goto err; err = dns_info_alloc( aa, family, flags ); if (err) goto err;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024