[WBEMPROX] Sync with Wine Staging 1.9.4. CORE-10912

[reactos.git] / reactos / dll / win32 / wbemprox / wql.y

diff --git a/reactos/dll/win32/wbemprox/wql.y b/reactos/dll/win32/wbemprox/wql.y
index 58663d0..98b0378 100644 (file)
--- a/reactos/dll/win32/wbemprox/wql.y
+++ b/reactos/dll/win32/wbemprox/wql.y
@@ -318,6 +318,12 @@ expr:
             if (!$$)
                 YYABORT;
         }
+  | TK_NOT expr
+        {
+            $$ = expr_unary( ctx, $2, OP_NOT );
+            if (!$$)
+                YYABORT;
+        }
   | prop_val TK_EQ const_val
         {
             $$ = expr_complex( ctx, $1, OP_EQ, $3 );
@@ -577,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;
@@ -640,15 +647,13 @@ static int get_token( const WCHAR *s, int *token )
         return 1;
     case '\"':
     case '\'':
+        for (i = 1; s[i]; i++)
         {
-            for (i = 1; s[i]; i++)
-            {
-                if (s[i] == s[0]) break;
-            }
-            if (s[i]) i++;
-            *token = TK_STRING;
-            return i;
+            if (s[i] == s[0]) break;
         }
+        if (s[i]) i++;
+        *token = TK_STRING;
+        return i;
     case '.':
         if (!isdigitW( s[1] ))
         {