From 29c75480c5478b6dcd27a2ec5f8c9e20aacd2cf5 Mon Sep 17 00:00:00 2001
From: Rafal Harabien <rafalh@reactos.org>
Date: Sun, 18 Mar 2012 14:02:07 +0000
Subject: [PATCH] [VBE_NEW][REGEDIT] - Fix two bugs mentioned by Victor on
 mailing list. Other bugs was already fixed.

svn path=/trunk/; revision=56180
---
 reactos/base/applications/regedit/regproc.c  |  2 +-
 reactos/drivers/video/miniport/vga_new/vbe.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/reactos/base/applications/regedit/regproc.c b/reactos/base/applications/regedit/regproc.c
index facf2df5df6..8b4964822f8 100644
--- a/reactos/base/applications/regedit/regproc.c
+++ b/reactos/base/applications/regedit/regproc.c
@@ -290,7 +290,7 @@ static void REGPROC_unescape_string(WCHAR* str)
                 str[val_idx] = str[str_idx];
                 break;
             default:
-                fprintf(stderr,"Warning! Unrecognized escape sequence: \\%c'\n",
+                fprintf(stderr,"Warning! Unrecognized escape sequence: \\%C'\n",
                 str[str_idx]);
                 str[val_idx] = str[str_idx];
                 break;
diff --git a/reactos/drivers/video/miniport/vga_new/vbe.c b/reactos/drivers/video/miniport/vga_new/vbe.c
index f6adf7ef684..161748ff40f 100644
--- a/reactos/drivers/video/miniport/vga_new/vbe.c
+++ b/reactos/drivers/video/miniport/vga_new/vbe.c
@@ -12,10 +12,10 @@
 
 /* GLOBALS ********************************************************************/
 
-static const PCHAR Nv11Board = "NV11 (GeForce2) Board";
-static const PCHAR Nv11Chip = "Chip Rev B2";
-static const PCHAR Nv11Vendor = "NVidia Corporation";
-static const PCHAR IntelBrookdale = "Brookdale-G Graphics Controller";
+static const CHAR Nv11Board[] = "NV11 (GeForce2) Board";
+static const CHAR Nv11Chip[] = "Chip Rev B2";
+static const CHAR Nv11Vendor[] = "NVidia Corporation";
+static const CHAR IntelBrookdale[] = "Brookdale-G Graphics Controller";
 static const PCHAR BrokenVesaBiosList[] =
 {
     "SiS 5597",
@@ -51,12 +51,12 @@ IsVesaBiosOk(IN PVIDEO_PORT_INT10_INTERFACE Interface,
     }
 
     /* For Brookdale-G (Intel), special hack used */
-    g_bIntelBrookdaleBIOS = !strncmp(Product, IntelBrookdale, sizeof(IntelBrookdale));
+    g_bIntelBrookdaleBIOS = !strncmp(Product, IntelBrookdale, sizeof(IntelBrookdale) - 1);
 
     /* For NVIDIA make sure */
-    if (!(strncmp(Vendor, Nv11Vendor, sizeof(Nv11Vendor))) &&
-        !(strncmp(Product, Nv11Board, sizeof(Nv11Board))) &&
-        !(strncmp(Revision, Nv11Chip, sizeof(Nv11Chip))) &&
+    if (!(strncmp(Vendor, Nv11Vendor, sizeof(Nv11Vendor) - 1)) &&
+        !(strncmp(Product, Nv11Board, sizeof(Nv11Board) - 1)) &&
+        !(strncmp(Revision, Nv11Chip, sizeof(Nv11Chip) - 1)) &&
         (OemRevision == 0x311))
     {
         /* Read version */