Added patch to fix invalid usage of RegOpenKeyExW in msdmo.

debian/changelog

@@ -17,6 +17,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
   * Added patch to expect the correct buffer size for different IOCTL_DVD_READ_STRUCTURE requests.
   * Added patch to use actual program name if available to describe PulseAudio streams.
   * Added patch to try harder to get the host name address in getaddrinfo().
+  * Added patch to fix invalid usage of RegOpenKeyExW in msdmo.
   * Removed patch to implement combase HSTRING objects (accepted upstream).
   * Removed patch to add fake ProductId to registry (accepted upstream).
   * Removed patch to implement stubs for MFStartup and MFShutdown (accepted upstream).

patches/Makefile

@@ -61,6 +61,7 @@ PATCHLIST := \
 	libs-Unicode_Collation.ok \
 	libwine-BSD_mmap_fixed.ok \
 	makedep-PARENTSPEC.ok \
+	msdmo-Fix_Typo.ok \
 	msvcp90-basic_string_wchar_dtor.ok \
 	msvcrt-atof_strtod.ok \
 	ntdll-DOS_Attributes.ok \
@@ -866,6 +867,18 @@ makedep-PARENTSPEC.ok:
 		echo '+    { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },'; \
 	) > makedep-PARENTSPEC.ok
 
+# Patchset msdmo-Fix_Typo
+# |
+# | Modified files:
+# |   *	dlls/msdmo/dmoreg.c
+# |
+.INTERMEDIATE: msdmo-Fix_Typo.ok
+msdmo-Fix_Typo.ok:
+	$(call APPLY_FILE,msdmo-Fix_Typo/0001-msdmo-Fix-invalid-usage-of-RegOpenKeyExW.patch)
+	@( \
+		echo '+    { "Mark Harmstone", "msdmo: Fix invalid usage of RegOpenKeyExW.", 1 },'; \
+	) > msdmo-Fix_Typo.ok
+
 # Patchset mshtml-sessionStorage
 # |
 # | Modified files:

patches/msdmo-Fix_Typo/0001-msdmo-Fix-invalid-usage-of-RegOpenKeyExW.patch

@@ -0,0 +1,35 @@
+From 06c43fd81baf70bed6a3729c0e644769da8b14e1 Mon Sep 17 00:00:00 2001
+From: Mark Harmstone <hellas@burntcomma.com>
+Date: Sun, 14 Dec 2014 23:45:41 +0000
+Subject: msdmo: Fix invalid usage of RegOpenKeyExW.
+
+Patch to fix typo in msdmo. RegOpenKeyExW returns 0 on success, and non-zero on failure.
+---
+ dlls/msdmo/dmoreg.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c
+index e8f67c5..ff0e8f0 100644
+--- a/dlls/msdmo/dmoreg.c
++++ b/dlls/msdmo/dmoreg.c
+@@ -406,7 +406,7 @@ static HRESULT IEnumDMO_Constructor(
+     /* If not filtering by category enum from media objects root */
+     if (IsEqualGUID(guidCategory, &GUID_NULL))
+     {
+-        if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey))
++        if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey))
+             hr = E_FAIL;
+     }
+     else
+@@ -416,7 +416,7 @@ static HRESULT IEnumDMO_Constructor(
+ 
+         wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories,
+             GUIDToString(szguid, guidCategory));
+-        if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))
++        if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))
+             hr = E_FAIL;
+     }
+ 
+-- 
+2.2.1
+