[PATCH 1/2] include: add missing includes, functions to qos2.h

[Vijay Kiran Kamuju]

Fix the definition of QOS_FLOWID

Signed-off-by: Vijay Kiran Kamuju 
---
 include/qos2.h | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/include/qos2.h b/include/qos2.h
index ac486f71fd..0d0bc597c9 100644
--- a/include/qos2.h
+++ b/include/qos2.h
@@ -19,11 +19,14 @@
 #ifndef __WINE_QOS2_H__
 #define __WINE_QOS2_H__

+#include <ws2tcpip.h>
+#include <mstcpip.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-typedef UINT32 QOS_FLOWID;
+typedef ULONG QOS_FLOWID, *PQOS_FLOWID;

typedef enum _QOS_SHAPING {
     QOSShapeOnly,
@@ -93,6 +96,27 @@ typedef struct _QOS_VERSION {
     USHORT MinorVersion;
 } QOS_VERSION, *PQOS_VERSION;

+#define QOS_OUTGOING_DEFAULT_MINIMUM_BANDWIDTH  0xFFFFFFFF
+
+#define QOS_QUERYFLOW_FRESH     0x00000001
+#define QOS_NON_ADAPTIVE_FLOW   0x00000002
+
+BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle);
+BOOL WINAPI QOSCloseHandle(HANDLE handle);
+BOOL WINAPI QOSStartTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags);
+BOOL WINAPI QOSStopTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags);
+BOOL WINAPI QOSEnumerateFlows(HANDLE handle, PULONG size, PVOID buffer);
+BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr,
+                               QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid);
+BOOL WINAPI QOSRemoveSocketFromFlow(HANDLE handle, SOCKET socket, QOS_FLOWID flowid, DWORD flags);
+BOOL WINAPI QOSSetFlow(HANDLE handle, QOS_FLOWID flowid, QOS_SET_FLOW op, ULONG size,
+                       PVOID buffer, DWORD flags, LPOVERLAPPED overlap);
+BOOL WINAPI QOSQueryFlow(HANDLE handle, QOS_FLOWID flowid, QOS_QUERY_FLOW op, PULONG size,
+                         PVOID buffer, DWORD flags, LPOVERLAPPED overlap);
+BOOL WINAPI QOSNotifyFlow(HANDLE handle, QOS_FLOWID flowid, QOS_NOTIFY_FLOW op, PULONG size,
+                          PVOID buffer, DWORD flags, LPOVERLAPPED overlap);
+BOOL WINAPI QOSCancel(HANDLE handle, LPOVERLAPPED overlap);
+
 #ifdef __cplusplus
 }
 #endif

[PATCH 2/2] qwave: Add stub for QOSCreateHandle and tests

[Vijay Kiran Kamuju]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46174
From: Vijay Kiran Kamuju 
Signed-off-by: Vijay Kiran Kamuju 
---
 configure                    |  1 +
 configure.ac                 |  1 +
 dlls/qwave/Makefile.in       |  1 +
 dlls/qwave/main.c            | 12 ++++++++
 dlls/qwave/qwave.spec        |  2 +-
 dlls/qwave/tests/Makefile.in |  5 ++++
 dlls/qwave/tests/qos.c       | 58 ++++++++++++++++++++++++++++++++++++
 7 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 dlls/qwave/tests/Makefile.in
 create mode 100644 dlls/qwave/tests/qos.c

diff --git a/configure b/configure
index 5733ea7350..fc148ed5d0 100755
--- a/configure
+++ b/configure
@@ -20447,6 +20447,7 @@ wine_fn_config_makefile dlls/quartz enable_quartz
 wine_fn_config_makefile dlls/quartz/tests enable_tests
 wine_fn_config_makefile dlls/query enable_query
 wine_fn_config_makefile dlls/qwave enable_qwave
+wine_fn_config_makefile dlls/qwave/tests enable_tests
 wine_fn_config_makefile dlls/rasapi16.dll16 enable_win16
 wine_fn_config_makefile dlls/rasapi32 enable_rasapi32
 wine_fn_config_makefile dlls/rasapi32/tests enable_tests
diff --git a/configure.ac b/configure.ac
index 4dbb7f4f22..45929bf106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3607,6 +3607,7 @@ WINE_CONFIG_MAKEFILE(dlls/quartz)
 WINE_CONFIG_MAKEFILE(dlls/quartz/tests)
 WINE_CONFIG_MAKEFILE(dlls/query)
 WINE_CONFIG_MAKEFILE(dlls/qwave)
+WINE_CONFIG_MAKEFILE(dlls/qwave/tests)
 WINE_CONFIG_MAKEFILE(dlls/rasapi16.dll16,enable_win16)
 WINE_CONFIG_MAKEFILE(dlls/rasapi32)
 WINE_CONFIG_MAKEFILE(dlls/rasapi32/tests)
diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in
index 9de8224697..5b4015cb2b 100644
--- a/dlls/qwave/Makefile.in
+++ b/dlls/qwave/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = qwave.dll
+IMPORTLIB = qwave

C_SRCS = \
    main.c
diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c
index ce1cfbd670..94392cbcca 100644
--- a/dlls/qwave/main.c
+++ b/dlls/qwave/main.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 Louis Lenders
+ * Copyright 2019 Vijay Kiran Kamuju
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,6 +22,7 @@

#include "windef.h"
 #include "winbase.h"
+#include "qos2.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(qwave);
@@ -39,3 +41,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
     }
     return TRUE;
 }
+
+BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle)
+{
+    FIXME("%p %p stub!\n", version, handle);
+    if (!version || ((version->MajorVersion != 1) && (version->MinorVersion != 0)) || !handle)
+        SetLastError(ERROR_INVALID_PARAMETER);
+    else
+        SetLastError(ERROR_SERVICE_ALREADY_RUNNING);
+    return FALSE;
+}
diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec
index 27b07f55d6..94b62eb1d8 100644
--- a/dlls/qwave/qwave.spec
+++ b/dlls/qwave/qwave.spec
@@ -3,7 +3,7 @@
 @ stub QOSAddSocketToFlow
 @ stub QOSCancel
 @ stub QOSCloseHandle
-@ stub QOSCreateHandle
+@ stdcall QOSCreateHandle(ptr ptr)
 @ stub QOSEnumerateFlows
 @ stub QOSNotifyFlow
 @ stub QOSQueryFlow
diff --git a/dlls/qwave/tests/Makefile.in b/dlls/qwave/tests/Makefile.in
new file mode 100644
index 0000000000..713909ba19
--- /dev/null
+++ b/dlls/qwave/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL   = qwave.dll
+IMPORTS   = qwave
+
+C_SRCS = \
+	qos.c
diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c
new file mode 100644
index 0000000000..3beec01366
--- /dev/null
+++ b/dlls/qwave/tests/qos.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2019 Vijay Kiran Kamuju
+ *
+ * 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 "qos2.h"
+
+#include "wine/test.h"
+
+static void test_QOSCreateHandle(void)
+{
+    QOS_VERSION ver;
+    HANDLE h;
+    BOOL ret;
+
+    SetLastError(0xdeadbeef);
+    ret = QOSCreateHandle(NULL, NULL);
+    ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = QOSCreateHandle(&ver, NULL);
+    ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ver.MajorVersion = 0;
+    ver.MinorVersion = 0;
+    ret = QOSCreateHandle(&ver, &h);
+    ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ver.MajorVersion = 1;
+    ver.MinorVersion = 0;
+    ret = QOSCreateHandle(&ver, &h);
+    ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
+    ok(GetLastError() == ERROR_SERVICE_ALREADY_RUNNING, "Expected ERROR_SERVICE_ALREADY_RUNNING, got %d\n", GetLastError());
+}
+
+START_TEST(qos)
+{
+    test_QOSCreateHandle();
+}

[PATCH 2/2] qwave: Add stub for QOSCreateHandle and tests

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=50904

Your paranoid android.

=== wvistau64 (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== wvistau64_zh_CN (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== wvistau64_fr (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== wvistau64_he (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w7u (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w7pro64 (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w8 (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w8adm (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w864 (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w1064 (32 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== wvistau64 (64 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w7pro64 (64 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w864 (64 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== w1064 (64 bit report) ===

qwave:
qos.c:51: Test failed: Expected FALSE, got 1
qos.c:52: Test failed: Expected ERROR_SERVICE_ALREADY_RUNNING, got 0

=== debian9 (32 bit report) ===

qwave:
qos.c:45: Test failed: Expected ERROR_INVALID_PARAMETER, got 1056

=== debian9 (32 bit French report) ===

qwave:
qos.c:45: Test failed: Expected ERROR_INVALID_PARAMETER, got 1056

=== debian9 (32 bit Japanese:Japan report) ===

qwave:
qos.c:45: Test failed: Expected ERROR_INVALID_PARAMETER, got 1056

=== debian9 (32 bit Chinese:China report) ===

qwave:
qos.c:45: Test failed: Expected ERROR_INVALID_PARAMETER, got 1056

=== debian9 (32 bit WoW report) ===

qwave:
qos.c:45: Test failed: Expected ERROR_INVALID_PARAMETER, got 1056

=== debian9 (64 bit WoW report) ===

qwave:
qos.c:45: Test failed: Expected ERROR_INVALID_PARAMETER, got 1056