[PATCH 0/2] MR6826: net: Correct error code for stopping non existing service

[Fabian Maurer (＠DarkShadow44)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55859

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

[PATCH 1/2] net/tests: Add test for stopping non existing service

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

---
 programs/net/tests/Makefile.in |  4 ++
 programs/net/tests/net.c       | 79 ++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 programs/net/tests/Makefile.in
 create mode 100644 programs/net/tests/net.c

diff --git a/programs/net/tests/Makefile.in b/programs/net/tests/Makefile.in
new file mode 100644
index 00000000000..e0c79d11c1c
--- /dev/null
+++ b/programs/net/tests/Makefile.in
@@ -0,0 +1,4 @@
+TESTDLL   = net.exe
+
+SOURCES = \
+	net.c
diff --git a/programs/net/tests/net.c b/programs/net/tests/net.c
new file mode 100644
index 00000000000..3609486a7cc
--- /dev/null
+++ b/programs/net/tests/net.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2024 Fabian Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windows.h>
+#include <stdio.h>
+#include "wine/test.h"
+
+static HANDLE nul_file;
+
+#define check_exit_code(x) ok(r == (x), "got exit code %ld, expected %d\n", r, (x))
+
+/* Copied and modified from the reg.exe tests */
+#define run_net_exe(c,r) run_net_exe_(__FILE__,__LINE__,c,r)
+static BOOL run_net_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc)
+{
+    STARTUPINFOA si = {sizeof(STARTUPINFOA)};
+    PROCESS_INFORMATION pi;
+    BOOL bret;
+    DWORD ret;
+    char cmdline[256];
+
+    si.dwFlags = STARTF_USESTDHANDLES;
+    si.hStdInput  = nul_file;
+    si.hStdOutput = nul_file;
+    si.hStdError  = nul_file;
+
+    strcpy(cmdline, cmd);
+    if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+        return FALSE;
+
+    ret = WaitForSingleObject(pi.hProcess, 10000);
+    if (ret == WAIT_TIMEOUT)
+        TerminateProcess(pi.hProcess, 1);
+
+    bret = GetExitCodeProcess(pi.hProcess, rc);
+    ok_(__FILE__, line)(bret, "GetExitCodeProcess failed: %ld\n", GetLastError());
+
+    CloseHandle(pi.hThread);
+    CloseHandle(pi.hProcess);
+    return bret;
+}
+
+static void test_stop(void)
+{
+    DWORD r;
+
+    /* Stop non existing service */
+
+    run_net_exe("net stop non-existing-service", &r);
+    todo_wine
+    check_exit_code(2);
+}
+
+START_TEST(net)
+{
+    SECURITY_ATTRIBUTES secattr = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
+
+    nul_file = CreateFileA("NUL", GENERIC_READ | GENERIC_WRITE, 0, &secattr, OPEN_EXISTING,
+                           FILE_ATTRIBUTE_NORMAL, NULL);
+
+    test_stop();
+
+    CloseHandle(nul_file);
+}
-- 
GitLab


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

[PATCH 2/2] net: Correct error code for stopping non existing service

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55859
---
 programs/net/net.c       | 2 +-
 programs/net/tests/net.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/programs/net/net.c b/programs/net/net.c
index db0933ae78f..60a91cc3ed2 100644
--- a/programs/net/net.c
+++ b/programs/net/net.c
@@ -365,7 +365,7 @@ int __cdecl wmain(int argc, const WCHAR* argv[])
         if(arg_is(argv[2], L"/help"))
             output_string(STRING_STOP_USAGE);
         else if(!net_service(NET_STOP, argv[2]))
-            return 1;
+            return 2;
     }
     else if(arg_is(argv[1], L"use"))
     {
diff --git a/programs/net/tests/net.c b/programs/net/tests/net.c
index 3609486a7cc..623a4e2794a 100644
--- a/programs/net/tests/net.c
+++ b/programs/net/tests/net.c
@@ -62,7 +62,6 @@ static void test_stop(void)
     /* Stop non existing service */
 
     run_net_exe("net stop non-existing-service", &r);
-    todo_wine
     check_exit_code(2);
 }
 
-- 
GitLab

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

[PATCH 2/2] net: Correct error code for stopping non existing service

[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=149709

Your paranoid android.


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

user32:
win.c:4073: Test succeeded inside todo block: Expected active window 00000000039F018E, got 00000000039F018E.
win.c:4074: Test succeeded inside todo block: Expected focus window 00000000039F018E, got 00000000039F018E.