From a90875686f72cdab543aa52f973bde8b19e9f87f Mon Sep 17 00:00:00 2001
From: Eric Pouech <eric.pouech@wanadoo.fr>
Date: Wed, 2 Jan 2002 21:45:47 +0000
Subject: [PATCH] Fixed color definition (bg and fg were swapped). Fixed some
 initialisation issues. Fixed exit condition when nothing was allocated.

---
 programs/wineconsole/dialog.c      | 8 ++++----
 programs/wineconsole/registry.c    | 6 +++---
 programs/wineconsole/user.c        | 2 +-
 programs/wineconsole/wineconsole.c | 2 +-
 server/console.c                   | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c
index a930d343707..a52918c904d 100644
--- a/programs/wineconsole/dialog.c
+++ b/programs/wineconsole/dialog.c
@@ -521,8 +521,8 @@ static BOOL WINAPI WCUSER_FontDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 	di->hDlg = hDlg;
 	SetWindowLong(hDlg, DWL_USER, (DWORD)di);
 	fill_list_font(di);
-        SetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0, di->config->def_attr & 0x0F);
-        SetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_FG), 0, (di->config->def_attr >> 4) & 0x0F);
+        SetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0, (di->config->def_attr >> 4) & 0x0F);
+        SetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_FG), 0, di->config->def_attr & 0x0F);
 	break;
     case WM_COMMAND:
 	di = (struct dialog_info*)GetWindowLong(hDlg, DWL_USER);
@@ -559,8 +559,8 @@ static BOOL WINAPI WCUSER_FontDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 	    if (val < di->nFont) (di->apply)(di, hDlg, WCUSER_ApplyToFont, val);
 
             (di->apply)(di, hDlg, WCUSER_ApplyToAttribute, 
-                        GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0) | 
-                        (GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_FG), 0) << 4));
+                        (GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0) << 4) |
+                        GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_FG), 0));
 
             SetWindowLong(hDlg, DWL_MSGRESULT, PSNRET_NOERROR);
 	    return TRUE;
diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c
index 3dc733390d7..c81b632b410 100644
--- a/programs/wineconsole/registry.c
+++ b/programs/wineconsole/registry.c
@@ -72,18 +72,18 @@ BOOL WINECON_RegLoad(struct config_data* cfg)
 
     count = sizeof(val);
     if (!hConKey || RegQueryValueEx(hConKey, wszScreenBufferSize, 0, &type, (char*)&val, &count)) 
-        val = 0x000C0008;
+        val = 0x00190050;
     cfg->sb_height = HIWORD(val);
     cfg->sb_width  = LOWORD(val);
 
     count = sizeof(val);
     if (!hConKey || RegQueryValueEx(hConKey, wszScreenColors, 0, &type, (char*)&val, &count)) 
-        val = 0x0007;
+        val = 0x000F;
     cfg->def_attr = val;
 
     count = sizeof(val);
     if (!hConKey || RegQueryValueEx(hConKey, wszWindowSize, 0, &type, (char*)&val, &count)) 
-        val = 0x000C0008;
+        val = 0x00190050;
     cfg->win_height = HIWORD(val);
     cfg->win_width  = LOWORD(val);
 
diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c
index 0b0e2d76349..fc1d453266f 100644
--- a/programs/wineconsole/user.c
+++ b/programs/wineconsole/user.c
@@ -1030,7 +1030,7 @@ BOOL WCUSER_InitBackend(struct inner_data* data)
 
     WNDCLASS		wndclass;
 
-    data->private = HeapAlloc(GetProcessHeap(), 0, sizeof(struct inner_data_user));
+    data->private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct inner_data_user));
     if (!data->private) return FALSE;
 
     data->fnMainLoop = WCUSER_MainLoop;
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index e7b2dcbd3d7..e4e5551c3dc 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -307,7 +307,7 @@ static void WINECON_Delete(struct inner_data* data)
     if (data->hConOut)		CloseHandle(data->hConOut);
     if (data->hSynchro)		CloseHandle(data->hSynchro);
     if (data->cells)		HeapFree(GetProcessHeap(), 0, data->cells);
-    data->fnDeleteBackend(data);
+    if (data->fnDeleteBackend)  data->fnDeleteBackend(data);
     HeapFree(GetProcessHeap(), 0, data);
 }
 
diff --git a/server/console.c b/server/console.c
index a48e11bec67..72717e76553 100644
--- a/server/console.c
+++ b/server/console.c
@@ -116,7 +116,7 @@ static const struct object_ops screen_buffer_ops =
 
 static struct screen_buffer *screen_buffer_list;
 
-static const char_info_t empty_char_info = { ' ', 0x00f0 };  /* white on black space */
+static const char_info_t empty_char_info = { ' ', 0x000f };  /* white on black space */
 
 /* dumps the renderer events of a console */
 static void console_input_events_dump( struct object *obj, int verbose )
@@ -227,7 +227,7 @@ static struct screen_buffer *create_console_output( struct console_input *consol
     screen_buffer->max_height     = 25;
     screen_buffer->cursor_x       = 0;
     screen_buffer->cursor_y       = 0;
-    screen_buffer->attr           = 0xF0;
+    screen_buffer->attr           = 0x0F;
     screen_buffer->win.left       = 0;
     screen_buffer->win.right      = screen_buffer->max_width - 1;
     screen_buffer->win.top        = 0;