From d373c19f7568312b8180987785c590a544116b2b Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 23 Nov 2018 11:55:33 +1100 Subject: [PATCH] Added qwave-QOSCreateHandle patchset --- patches/patchinstall.sh | 19 +++++++ ...001-qwave-Added-QOSCreateHandle-stub.patch | 50 +++++++++++++++++++ patches/qwave-QOSCreateHandle/definition | 1 + 3 files changed, 70 insertions(+) create mode 100644 patches/qwave-QOSCreateHandle/0001-qwave-Added-QOSCreateHandle-stub.patch create mode 100644 patches/qwave-QOSCreateHandle/definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d216657b..893d690d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -260,6 +260,7 @@ patch_enable_all () enable_packager_DllMain="$1" enable_quartz_MediaSeeking_Positions="$1" enable_quartz_Silence_FIXMEs="$1" + enable_qwave_QOSCreateHandle="$1" enable_riched20_Class_Tests="$1" enable_riched20_IText_Interface="$1" enable_server_ClipCursor="$1" @@ -943,6 +944,9 @@ patch_enable () quartz-Silence_FIXMEs) enable_quartz_Silence_FIXMEs="$2" ;; + qwave-QOSCreateHandle) + enable_qwave_QOSCreateHandle="$2" + ;; riched20-Class_Tests) enable_riched20_Class_Tests="$2" ;; @@ -5574,6 +5578,21 @@ if test "$enable_quartz_Silence_FIXMEs" -eq 1; then ) >> "$patchlist" fi +# Patchset qwave-QOSCreateHandle +# | +# | This patchset fixes the following Wine bugs: +# | * [#46174] qwave: Added QOSCreateHandle stub +# | +# | Modified files: +# | * dlls/qwave/main.c, include/qos2.h +# | +if test "$enable_qwave_QOSCreateHandle" -eq 1; then + patch_apply qwave-QOSCreateHandle/0001-qwave-Added-QOSCreateHandle-stub.patch + ( + printf '%s\n' '+ { "Gijs Vermeulen", "qwave: Added QOSCreateHandle stub.", 1 },'; + ) >> "$patchlist" +fi + # Patchset riched20-Class_Tests # | # | Modified files: diff --git a/patches/qwave-QOSCreateHandle/0001-qwave-Added-QOSCreateHandle-stub.patch b/patches/qwave-QOSCreateHandle/0001-qwave-Added-QOSCreateHandle-stub.patch new file mode 100644 index 00000000..2507810f --- /dev/null +++ b/patches/qwave-QOSCreateHandle/0001-qwave-Added-QOSCreateHandle-stub.patch @@ -0,0 +1,50 @@ +From ff5865722fe9a3b20a1a64e64af55b166b2bfc32 Mon Sep 17 00:00:00 2001 +From: Gijs Vermeulen +Date: Thu, 22 Nov 2018 10:28:22 +1100 +Subject: [PATCH] qwave: Added QOSCreateHandle stub + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46174 +--- + dlls/qwave/main.c | 8 ++++++++ + include/qos2.h | 2 ++ + 2 files changed, 10 insertions(+) + +diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c +index ce1cfbd..4366c32 100644 +--- a/dlls/qwave/main.c ++++ b/dlls/qwave/main.c +@@ -21,6 +21,7 @@ + + #include "windef.h" + #include "winbase.h" ++#include "qos2.h" + #include "wine/debug.h" + + WINE_DEFAULT_DEBUG_CHANNEL(qwave); +@@ -39,3 +40,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) + } + return TRUE; + } ++ ++BOOL WINAPI QOSCreateHandle(QOS_VERSION *version, HANDLE *handle) ++{ ++ FIXME("%p %p stub!\n", version, handle); ++ SetLastError(ERROR_SERVICE_DEPENDENCY_FAIL); ++ return FALSE; ++} +diff --git a/include/qos2.h b/include/qos2.h +index ac486f7..f2e68f5 100644 +--- a/include/qos2.h ++++ b/include/qos2.h +@@ -93,6 +93,8 @@ typedef struct _QOS_VERSION { + USHORT MinorVersion; + } QOS_VERSION, *PQOS_VERSION; + ++BOOL WINAPI QOSCreateHandle(QOS_VERSION *version, HANDLE *handle); ++ + #ifdef __cplusplus + } + #endif +-- +1.9.1 + diff --git a/patches/qwave-QOSCreateHandle/definition b/patches/qwave-QOSCreateHandle/definition new file mode 100644 index 00000000..49f6a64a --- /dev/null +++ b/patches/qwave-QOSCreateHandle/definition @@ -0,0 +1 @@ +Fixes: [46174] qwave: Added QOSCreateHandle stub