Various unicode/ANSI related bugfixes as pointed out by GvG

svn path=/trunk/; revision=5244

reactos/include/structs.h

@@ -2877,9 +2877,9 @@ typedef struct tagNEWTEXTMETRICW {
 } NEWTEXTMETRICW;
 
 #ifdef UNICODE
-typedef NEWTEXTMETRICA NEWTEXTMETRIC;
-#else
 typedef NEWTEXTMETRICW NEWTEXTMETRIC;
+#else
+typedef NEWTEXTMETRICA NEWTEXTMETRIC;
 #endif
 
 typedef struct tagNEWTEXTMETRICEXA {
@@ -2893,9 +2893,9 @@ typedef struct tagNEWTEXTMETRICEXW {
 } NEWTEXTMETRICEXW;
 
 #ifdef UNICODE
-typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX;
-#else
 typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX;
+#else
+typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX;
 #endif
 
 typedef struct tagNM_LISTVIEW {
@@ -3145,9 +3145,9 @@ typedef struct _OSVERSIONINFOEXW
 } OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
 
 #ifdef UNICODE
-typedef OSVERSIONINFOEXA OSVERSIONINFOEX;
-#else
 typedef OSVERSIONINFOEXW OSVERSIONINFOEX;
+#else
+typedef OSVERSIONINFOEXA OSVERSIONINFOEX;
 #endif
 
 typedef struct tagTEXTMETRICA {
@@ -3197,10 +3197,10 @@ typedef struct tagTEXTMETRICW {
 } TEXTMETRICW, *LPTEXTMETRICW;
 
 #ifdef UNICODE
-typedef TEXTMETRICA TEXTMETRIC;
-typedef LPTEXTMETRICA LPTEXTMETRIC;
-#else
 typedef TEXTMETRICW TEXTMETRIC;
+typedef LPTEXTMETRICW LPTEXTMETRIC;
+#else
+typedef TEXTMETRICA TEXTMETRIC;
 typedef LPTEXTMETRICA LPTEXTMETRIC;
 #endif
 
@@ -3275,10 +3275,10 @@ typedef struct _OUTLINETEXTMETRICW {
 } OUTLINETEXTMETRICW, *LPOUTLINETEXTMETRICW;
 
 #ifdef UNICODE
-typedef OUTLINETEXTMETRICA OUTLINETEXTMETRIC;
-typedef LPOUTLINETEXTMETRICA LPOUTLINETEXTMETRIC;
-#else
 typedef OUTLINETEXTMETRICW OUTLINETEXTMETRIC;
+typedef LPOUTLINETEXTMETRICW LPOUTLINETEXTMETRIC;
+#else
+typedef OUTLINETEXTMETRICA OUTLINETEXTMETRIC;
 typedef LPOUTLINETEXTMETRICA LPOUTLINETEXTMETRIC;
 #endif