Added patch to handle '\r' as whitespace in wbemprox queries.

README.md

@@ -39,6 +39,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
+**Bug fixes and features included in the next upcoming release [1]:**
+
+* Also handle '\r' as whitespace in wbemprox queries
+
+
 **Bug fixes and features in Wine Staging 1.7.43 [235]:**
 
 *Note: The following list only contains features and bug fixes which are not

debian/changelog

@@ -1,4 +1,5 @@
 wine-staging (1.7.44) UNRELEASED; urgency=low
+  * Added patch to handle '\r' as whitespace in wbemprox queries.
   * Removed patch to reset device state in SysKeyboard*Impl_Acquire (accepted
     upstream).
   * Removed patch to avoid creating thread queues for foreign threads in

patches/patchinstall.sh

@@ -236,6 +236,7 @@ patch_enable_all ()
 	enable_vcomp_Stub_Functions="$1"
 	enable_version_VerQueryValue="$1"
 	enable_version_VersionInfoEx="$1"
+	enable_wbemprox_Whitespace="$1"
 	enable_wiaservc_IEnumWIA_DEV_INFO="$1"
 	enable_windowscodecs_GIF_Decoder="$1"
 	enable_windowscodecs_TIFF_Decoder="$1"
@@ -766,6 +767,9 @@ patch_enable ()
 		version-VersionInfoEx)
 			enable_version_VersionInfoEx="$2"
 			;;
+		wbemprox-Whitespace)
+			enable_wbemprox_Whitespace="$2"
+			;;
 		wiaservc-IEnumWIA_DEV_INFO)
 			enable_wiaservc_IEnumWIA_DEV_INFO="$2"
 			;;
@@ -5149,6 +5153,18 @@ if test "$enable_version_VersionInfoEx" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wbemprox-Whitespace
+# |
+# | Modified files:
+# |   *	dlls/wbemprox/tests/query.c, dlls/wbemprox/wql.y
+# |
+if test "$enable_wbemprox_Whitespace" -eq 1; then
+	patch_apply wbemprox-Whitespace/0001-wbemprox-Treat-r-as-whitespace.patch
+	(
+		echo '+    { "Michael Müller", "wbemprox: Treat \\\\r as whitespace.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wiaservc-IEnumWIA_DEV_INFO
 # |
 # | This patchset fixes the following Wine bugs:

patches/wbemprox-Whitespace/0001-wbemprox-Treat-r-as-whitespace.patch

@@ -0,0 +1,40 @@
+From a70798633f4404744722bc43cde7f2c9e2bcdb26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 24 May 2015 03:53:13 +0200
+Subject: wbemprox: Treat \r as whitespace.
+
+---
+ dlls/wbemprox/tests/query.c | 4 +++-
+ dlls/wbemprox/wql.y         | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
+index a7bf201..b46ff52 100644
+--- a/dlls/wbemprox/tests/query.c
++++ b/dlls/wbemprox/tests/query.c
+@@ -96,7 +96,9 @@ static void test_select( IWbemServices *services )
+         {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_',
+          'D','i','s','k','D','r','i','v','e',' ','W','H','E','R','E',' ','D','e','v','i','c','e','I','D','=',
+          '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0};
+-    static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8 };
++    static const WCHAR query9[] =
++        {'S','E','L','E','C','T','\n','a','\r','F','R','O','M','\t','b',0};
++    static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9 };
+     HRESULT hr;
+     IEnumWbemClassObject *result;
+     BSTR wql = SysAllocString( wqlW );
+diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y
+index 6eabe19..734c4da 100644
+--- a/dlls/wbemprox/wql.y
++++ b/dlls/wbemprox/wql.y
+@@ -583,6 +583,7 @@ static int get_token( const WCHAR *s, int *token )
+     {
+     case ' ':
+     case '\t':
++    case '\r':
+     case '\n':
+         for (i = 1; isspaceW( s[i] ); i++) {}
+         *token = TK_SPACE;
+-- 
+2.4.0
+

patches/wbemprox-Whitespace/definition

@@ -0,0 +1 @@
+Fixes: Also handle '\r' as whitespace in wbemprox queries