[ros-diffs] [rharabien] 56180: [VBE_NEW][REGEDIT] - Fix two bugs mentioned by Victor on mailing list. Other bugs was already fixed.

Author: rharabien
Date: Sun Mar 18 14:02:07 2012
New Revision: 56180

URL: http://svn.reactos.org/svn/reactos?rev=56180&view=rev
Log:
[VBE_NEW][REGEDIT]
- Fix two bugs mentioned by Victor on mailing list. Other bugs was already fixed.

Modified:
    trunk/reactos/base/applications/regedit/regproc.c
    trunk/reactos/drivers/video/miniport/vga_new/vbe.c

Modified: trunk/reactos/base/applications/regedit/regproc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Sun Mar 18 14:02:07
2012
@@ -290,7 +290,7 @@
                 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;

Modified: trunk/reactos/drivers/video/miniport/vga_new/vbe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga…
==============================================================================
--- trunk/reactos/drivers/video/miniport/vga_new/vbe.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vga_new/vbe.c [iso-8859-1] Sun Mar 18 14:02:07
2012
@@ -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 @@
     }
 
     /* 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 */