[ros-diffs] [dgorbachev] 43216: Do not copy those structures twice.

[dgorbachev at svn.reactos.org]

Author: dgorbachev
Date: Mon Sep 28 22:46:19 2009
New Revision: 43216

URL: http://svn.reactos.org/svn/reactos?rev=43216&view=rev
Log:
Do not copy those structures twice.

Modified:
    trunk/reactos/drivers/video/displays/framebuf/screen.c

Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/framebuf/screen.c?rev=43216&r1=43215&r2=43216&view=diff
==============================================================================
--- trunk/reactos/drivers/video/displays/framebuf/screen.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/displays/framebuf/screen.c [iso-8859-1] Mon Sep 28 22:46:19 2009
@@ -19,6 +19,10 @@
  */
 
 #include "framebuf.h"
+
+static LOGFONTW SystemFont = { 16, 7, 0, 0, 700, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"System" };
+static LOGFONTW AnsiVariableFont = { 12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"MS Sans Serif" };
+static LOGFONTW AnsiFixedFont = { 12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, FIXED_PITCH | FF_DONTCARE, L"Courier" };
 
 /*
  * GetAvailableModes
@@ -118,9 +122,6 @@
    ULONG ModeInfoSize;
    PVIDEO_MODE_INFORMATION ModeInfo, ModeInfoPtr, SelectedMode = NULL;
    VIDEO_COLOR_CAPABILITIES ColorCapabilities;
-   LOGFONTW SystemFont = {16, 7, 0, 0, 700, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"System"};
-   LOGFONTW AnsiVariableFont = {12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"MS Sans Serif"};
-   LOGFONTW AnsiFixedFont = {12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, FIXED_PITCH | FF_DONTCARE, L"Courier"};
    ULONG Temp;
 
    /*
@@ -159,7 +160,7 @@
       while (ModeCount-- > 0)
       {
          if (ModeInfoPtr->Length > 0 &&
-	     pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth &&
+             pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth &&
              pDevMode->dmPelsHeight == ModeInfoPtr->VisScreenHeight &&
              pDevMode->dmBitsPerPel == (ModeInfoPtr->BitsPerPlane *
                                         ModeInfoPtr->NumberOfPlanes) &&