ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed color definition (bg and fg were swapped). 

Fixed some initialisation issues.
Fixed exit condition when nothing was allocated.
This commit is contained in:
Eric Pouech 2002-01-02 21:45:47 +00:00 committed by Alexandre Julliard
parent fbdfef73f6
commit a90875686f
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/wineconsole/dialog.c
View File

@ -521,8 +521,8 @@ static BOOL WINAPI WCUSER_FontDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
di->hDlg = hDlg; di->hDlg = hDlg;
SetWindowLong(hDlg, DWL_USER, (DWORD)di); SetWindowLong(hDlg, DWL_USER, (DWORD)di);
fill_list_font(di); fill_list_font(di);
SetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0, di->config->def_attr & 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 >> 4) & 0x0F); SetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_FG), 0, di->config->def_attr & 0x0F);
break; break;
case WM_COMMAND: case WM_COMMAND:
di = (struct dialog_info*)GetWindowLong(hDlg, DWL_USER); 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); if (val < di->nFont) (di->apply)(di, hDlg, WCUSER_ApplyToFont, val);
(di->apply)(di, hDlg, WCUSER_ApplyToAttribute, (di->apply)(di, hDlg, WCUSER_ApplyToAttribute,
GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0) | (GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0) << 4) |
(GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_FG), 0) << 4)); GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_FG), 0));
SetWindowLong(hDlg, DWL_MSGRESULT, PSNRET_NOERROR); SetWindowLong(hDlg, DWL_MSGRESULT, PSNRET_NOERROR);
return TRUE; return TRUE;

6
programs/wineconsole/registry.c
View File

@ -72,18 +72,18 @@ BOOL WINECON_RegLoad(struct config_data* cfg)
count = sizeof(val); count = sizeof(val);
if (!hConKey || RegQueryValueEx(hConKey, wszScreenBufferSize, 0, &type, (char*)&val, &count)) if (!hConKey || RegQueryValueEx(hConKey, wszScreenBufferSize, 0, &type, (char*)&val, &count))
val = 0x000C0008; val = 0x00190050;
cfg->sb_height = HIWORD(val); cfg->sb_height = HIWORD(val);
cfg->sb_width = LOWORD(val); cfg->sb_width = LOWORD(val);
count = sizeof(val); count = sizeof(val);
if (!hConKey || RegQueryValueEx(hConKey, wszScreenColors, 0, &type, (char*)&val, &count)) if (!hConKey || RegQueryValueEx(hConKey, wszScreenColors, 0, &type, (char*)&val, &count))
val = 0x0007; val = 0x000F;
cfg->def_attr = val; cfg->def_attr = val;
count = sizeof(val); count = sizeof(val);
if (!hConKey || RegQueryValueEx(hConKey, wszWindowSize, 0, &type, (char*)&val, &count)) if (!hConKey || RegQueryValueEx(hConKey, wszWindowSize, 0, &type, (char*)&val, &count))
val = 0x000C0008; val = 0x00190050;
cfg->win_height = HIWORD(val); cfg->win_height = HIWORD(val);
cfg->win_width = LOWORD(val); cfg->win_width = LOWORD(val);

2
programs/wineconsole/user.c
View File

@ -1030,7 +1030,7 @@ BOOL WCUSER_InitBackend(struct inner_data* data)
WNDCLASS wndclass; 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; if (!data->private) return FALSE;
data->fnMainLoop = WCUSER_MainLoop; data->fnMainLoop = WCUSER_MainLoop;

2
programs/wineconsole/wineconsole.c
View File

@ -307,7 +307,7 @@ static void WINECON_Delete(struct inner_data* data)
if (data->hConOut) CloseHandle(data->hConOut); if (data->hConOut) CloseHandle(data->hConOut);
if (data->hSynchro) CloseHandle(data->hSynchro); if (data->hSynchro) CloseHandle(data->hSynchro);
if (data->cells) HeapFree(GetProcessHeap(), 0, data->cells); if (data->cells) HeapFree(GetProcessHeap(), 0, data->cells);
data->fnDeleteBackend(data); if (data->fnDeleteBackend) data->fnDeleteBackend(data);
HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, data);
} }

4
server/console.c
View File

@ -116,7 +116,7 @@ static const struct object_ops screen_buffer_ops =
static struct screen_buffer *screen_buffer_list; 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 */ /* dumps the renderer events of a console */
static void console_input_events_dump( struct object *obj, int verbose ) 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->max_height = 25;
screen_buffer->cursor_x = 0; screen_buffer->cursor_x = 0;
screen_buffer->cursor_y = 0; screen_buffer->cursor_y = 0;
screen_buffer->attr = 0xF0; screen_buffer->attr = 0x0F;
screen_buffer->win.left = 0; screen_buffer->win.left = 0;
screen_buffer->win.right = screen_buffer->max_width - 1; screen_buffer->win.right = screen_buffer->max_width - 1;
screen_buffer->win.top = 0; screen_buffer->win.top = 0;