Merge remote-tracking branch 'github/inbox' into HEAD

microsoft · Feb 12, 2020 · 6bacd00 · 6bacd00
2 parents deef9f3 + bb4cd64
commit 6bacd00
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/interactivity/onecore/BgfxEngine.cpp b/src/interactivity/onecore/BgfxEngine.cpp
@@ -138,7 +138,7 @@ BgfxEngine::BgfxEngine(PVOID SharedViewBase, LONG DisplayHeight, LONG DisplayWid
         for (SHORT j = 0; j < _displayWidth; j++)
         {
             NewRun[j].Character = L' ';
-            NewRun[j].Atribute = 0;
+            NewRun[j].Attribute = 0;
         }
     }
 
@@ -157,7 +157,7 @@ BgfxEngine::BgfxEngine(PVOID SharedViewBase, LONG DisplayHeight, LONG DisplayWid
         for (size_t i = 0; i < clusters.size() && i < (size_t)_displayWidth; i++)
         {
             NewRun[coord.X + i].Character = clusters.at(i).GetTextAsSingle();
-            NewRun[coord.X + i].Atribute = _currentLegacyColorAttribute;
+            NewRun[coord.X + i].Attribute = _currentLegacyColorAttribute;
         }
 
         return S_OK;

diff --git a/src/renderer/wddmcon/WddmConRenderer.cpp b/src/renderer/wddmcon/WddmConRenderer.cpp
@@ -248,10 +248,10 @@ bool WddmConEngine::IsInitialized()
             NewChar = &_displayState[rowIndex]->New[colIndex];
 
             OldChar->Character = NewChar->Character;
-            OldChar->Atribute = NewChar->Atribute;
+            OldChar->Attribute = NewChar->Attribute;
 
             NewChar->Character = L' ';
-            NewChar->Atribute = 0x0;
+            NewChar->Attribute = 0x0;
         }
     }
 
@@ -275,10 +275,10 @@ bool WddmConEngine::IsInitialized()
             NewChar = &_displayState[coord.Y]->New[coord.X + i];
 
             OldChar->Character = NewChar->Character;
-            OldChar->Atribute = NewChar->Atribute;
+            OldChar->Attribute = NewChar->Attribute;
 
             NewChar->Character = clusters.at(i).GetTextAsSingle();
-            NewChar->Atribute = _currentLegacyColorAttribute;
+            NewChar->Attribute = _currentLegacyColorAttribute;
         }
 
         return WDDMConUpdateDisplay(_hWddmConCtx, _displayState[coord.Y], FALSE);

diff --git a/src/renderer/wddmcon/main.cxx b/src/renderer/wddmcon/main.cxx
@@ -617,7 +617,7 @@ WDDMConUpdateDisplay(
 
                 pCtx->pwszGlyphRunAccel[ColumnIndex] = pRowInformation->New[ColumnIndex].Character;
                 if (ColumnIndexReadAhead != pCtx->DisplaySize.Width) {
-                    while (pRowInformation->New[ColumnIndex].Atribute == pRowInformation->New[ColumnIndexReadAhead].Atribute) {
+                    while (pRowInformation->New[ColumnIndex].Attribute == pRowInformation->New[ColumnIndexReadAhead].Attribute) {
                         if (memcmp(&pRowInformation->New[ColumnIndexReadAhead],
                                    &pRowInformation->Old[ColumnIndexReadAhead],
                                    sizeof(CD_IO_CHARACTER)) == 0) {
@@ -667,11 +667,11 @@ WDDMConUpdateDisplay(
                     }
 
                     pCtx->pD2DColorBrush->SetColor(
-                        ConsoleColors[(pCharacter->Atribute >> 4) & 0xF]);
+                        ConsoleColors[(pCharacter->Attribute >> 4) & 0xF]);
                     pCtx->pD2DSwapChainRT->FillRectangle(&GlyphRectangle,
                                                           pCtx->pD2DColorBrush);
 
-                    pCtx->pD2DColorBrush->SetColor(ConsoleColors[pCharacter->Atribute & 0xF]);
+                    pCtx->pD2DColorBrush->SetColor(ConsoleColors[pCharacter->Attribute & 0xF]);
                     pCtx->pD2DSwapChainRT->DrawTextLayout(Origin,
                                                           pTextLayout,
                                                           pCtx->pD2DColorBrush,