[PATCH v3 0/1] MR3966: mpr: WNetAddConnection*() and WNetCancelConnection*() always return success

[Alexey Alyaev (＠aalyaev)]

- Changes to allow WNetAddConnection*() and WNetCancelConnection*() to succeed
  regardless of available providers (where none have been implemented yet).
  Allowing for manual configuration outside of wine.

--
  v3: mpr: WNetAddConnection*() and WNetCancelConnection*() always return success
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3966

[PATCH v3 1/1] mpr: WNetAddConnection*() and WNetCancelConnection*() always return success

[Alexey Alyaev]

From: Alexey Alyaev <aalyaev(a)etersoft.ru>

---
 dlls/mpr/wnet.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
index 7c5b576598b..b0fb4607869 100644
--- a/dlls/mpr/wnet.c
+++ b/dlls/mpr/wnet.c
@@ -1986,8 +1986,11 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt )
     WCHAR letter[3] = {'Z', ':', 0};
     NETRESOURCEW netres;
 
-    if (!providerTable || providerTable->numProviders == 0)
-        return WN_NO_NETWORK;
+    if (1)
+    {
+        FIXME("Returning success.\n");
+        return WN_SUCCESS;
+    }
 
     if (!ctxt->resource)
         return ERROR_INVALID_PARAMETER;
@@ -2180,8 +2183,8 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, NETRESOURCEA *resource,
     NETRESOURCEW resourceW;
     DWORD ret;
 
-    TRACE( "(%p, %p, %p, %s, 0x%08lX, %p, %p, %p)\n", hwndOwner, resource, password, debugstr_a(userid), flags,
-        accessname, buffer_size, result );
+    TRACE( "(%p, %p, %p, %s, 0x%08lX, %p, %p, %p)\n", hwndOwner, resource,
+        password, debugstr_a(userid), flags, accessname, buffer_size, result );
 
     netresource_a_to_w(resource, &resourceW);
 
@@ -2246,6 +2249,14 @@ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce
     DWORD ret = WN_NO_NETWORK;
     DWORD index;
 
+    TRACE("(%s, %ld, %u)\n", debugstr_w(lpName), dwFlags, fForce);
+
+    if (1)
+    {
+        FIXME("Returning success.\n");
+        return WN_SUCCESS;
+    }
+
     if (providerTable != NULL)
     {
         for (index = 0; index < providerTable->numProviders; index++)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3966

[PATCH v3 1/1] mpr: WNetAddConnection*() and WNetCancelConnection*() always return success

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=138035

Your paranoid android.


=== debian11 (32 bit report) ===

mpr:
mpr.c:290: Test succeeded inside todo block: Unexpected return: 0
mpr.c:309: Test succeeded inside todo block: Unexpected return: 0

=== debian11b (64 bit WoW report) ===

mpr:
mpr.c:290: Test succeeded inside todo block: Unexpected return: 0
mpr.c:309: Test succeeded inside todo block: Unexpected return: 0