[CONSRV]: Support reverse video bit COMMON_LVB_REVERSE_VIDEO

[reactos.git] / win32ss / user / winsrv / consrv / include / settings.h

diff --git a/win32ss/user/winsrv/consrv/include/settings.h b/win32ss/user/winsrv/consrv/include/settings.h
index f538460..fcef0f1 100644 (file)
--- a/win32ss/user/winsrv/consrv/include/settings.h
+++ b/win32ss/user/winsrv/consrv/include/settings.h
@@ -11,6 +11,8 @@
 
 /* STRUCTURES *****************************************************************/
 
+#pragma pack(push, 1)
+
 /*
  * Structure used to hold terminal-specific information
  */
@@ -49,10 +51,14 @@ typedef struct _CONSOLE_INFO
     WCHAR ConsoleTitle[MAX_PATH + 1];
 } CONSOLE_INFO, *PCONSOLE_INFO;
 
+/*
+ * BYTE Foreground = LOBYTE(Attributes) & 0x0F;
+ * BYTE Background = (LOBYTE(Attributes) & 0xF0) >> 4;
+ */
 #define RGBFromAttrib(Console, Attribute)   ((Console)->Colors[(Attribute) & 0xF])
-#define TextAttribFromAttrib(Attribute)     ((Attribute) & 0xF)
-#define BkgdAttribFromAttrib(Attribute)     (((Attribute) >> 4) & 0xF)
-#define MakeAttrib(TextAttrib, BkgdAttrib)  (DWORD)((((BkgdAttrib) & 0xF) << 4) | ((TextAttrib) & 0xF))
+#define TextAttribFromAttrib(Attribute)     ( !((Attribute) & COMMON_LVB_REVERSE_VIDEO) ? (Attribute) & 0xF : ((Attribute) >> 4) & 0xF )
+#define BkgdAttribFromAttrib(Attribute)     ( !((Attribute) & COMMON_LVB_REVERSE_VIDEO) ? ((Attribute) >> 4) & 0xF : (Attribute) & 0xF )
+#define MakeAttrib(TextAttrib, BkgdAttrib)  (USHORT)((((BkgdAttrib) & 0xF) << 4) | ((TextAttrib) & 0xF))
 
 /*
  * Structure used to communicate with console.dll
@@ -69,6 +75,8 @@ typedef struct _CONSOLE_PROPS
     TERMINAL_INFO TerminalInfo; /* Frontend-specific parameters  */
 } CONSOLE_PROPS, *PCONSOLE_PROPS;
 
+#pragma pack(pop)
+
 /* FUNCTIONS ******************************************************************/
 
 #ifndef CONSOLE_H__ // If we aren't included by console.dll