From bd0287d16fd8c0b6477a039a9a2825298c3b1d8f Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 6 Feb 2022 00:32:23 +0100 Subject: [PATCH 1/6] Fixed DRAM row boundaries on Intel 430LX and 430NX. --- src/chipset/intel_4x0.c | 32 ++++++++++++++++++------- src/include/86box/spd.h | 1 + src/mem/spd.c | 52 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 9 deletions(-) diff --git a/src/chipset/intel_4x0.c b/src/chipset/intel_4x0.c index b4cdc3aef..1f7a29ede 100644 --- a/src/chipset/intel_4x0.c +++ b/src/chipset/intel_4x0.c @@ -60,6 +60,7 @@ typedef struct int type; smram_t *smram_low, *smram_high; void *agpgart; + void (*write_drbs)(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit); } i4x0_t; @@ -652,7 +653,7 @@ i4x0_write(int func, int addr, uint8_t val, void *priv) break; case 0x60: case 0x61: case 0x62: case 0x63: case 0x64: if ((addr & 0x7) <= dev->max_drb) { - spd_write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); + dev->write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); break; } switch (dev->type) { @@ -676,7 +677,7 @@ i4x0_write(int func, int addr, uint8_t val, void *priv) break; case 0x65: if ((addr & 0x7) <= dev->max_drb) { - spd_write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); + dev->write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); break; } switch (dev->type) { @@ -699,7 +700,7 @@ i4x0_write(int func, int addr, uint8_t val, void *priv) break; case 0x66: if ((addr & 0x7) <= dev->max_drb) { - spd_write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); + dev->write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); break; } switch (dev->type) { @@ -713,7 +714,7 @@ i4x0_write(int func, int addr, uint8_t val, void *priv) break; case 0x67: if ((addr & 0x7) <= dev->max_drb) { - spd_write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); + dev->write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); break; } switch (dev->type) { @@ -733,8 +734,12 @@ i4x0_write(int func, int addr, uint8_t val, void *priv) } break; case 0x68: + if (dev->type == INTEL_430NX) { + dev->write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); + break; + } switch (dev->type) { - case INTEL_430NX: case INTEL_430HX: + case INTEL_430HX: case INTEL_430VX: case INTEL_430TX: regs[0x68] = val; break; @@ -755,8 +760,11 @@ i4x0_write(int func, int addr, uint8_t val, void *priv) } break; case 0x69: + if (dev->type == INTEL_430NX) { + dev->write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); + break; + } switch (dev->type) { - case INTEL_430NX: case INTEL_440BX: case INTEL_440GX: regs[0x69] = val; break; @@ -769,8 +777,11 @@ i4x0_write(int func, int addr, uint8_t val, void *priv) } break; case 0x6a: case 0x6b: + if (dev->type == INTEL_430NX) { + dev->write_drbs(regs, 0x60, 0x60 + dev->max_drb, dev->drb_unit); + break; + } switch (dev->type) { - case INTEL_430NX: case INTEL_440BX: case INTEL_440GX: regs[addr] = val; break; @@ -1309,6 +1320,8 @@ static void regs[0x00] = 0x86; regs[0x01] = 0x80; /*Intel*/ + dev->write_drbs = spd_write_drbs; + switch (dev->type) { case INTEL_420TX: case INTEL_420ZX: @@ -1360,7 +1373,7 @@ static void regs[0x59] = 0x0f; regs[0x60] = regs[0x61] = regs[0x62] = regs[0x63] = 0x02; dev->max_drb = 5; - dev->drb_unit = 4; + dev->drb_unit = 1; dev->drb_default = 0x02; break; case INTEL_430NX: @@ -1381,8 +1394,9 @@ static void regs[0x59] = 0x0f; regs[0x60] = regs[0x61] = regs[0x62] = regs[0x63] = regs[0x64] = regs[0x65] = regs[0x66] = regs[0x67] = 0x02; dev->max_drb = 7; - dev->drb_unit = 4; + dev->drb_unit = 1; dev->drb_default = 0x02; + dev->write_drbs = spd_write_drbs_with_ext; break; case INTEL_430FX: regs[0x02] = 0x2d; regs[0x03] = 0x12; /* SB82437FX-66 */ diff --git a/src/include/86box/spd.h b/src/include/86box/spd.h index 81216a6f6..0e17d0da3 100644 --- a/src/include/86box/spd.h +++ b/src/include/86box/spd.h @@ -106,6 +106,7 @@ typedef struct { extern void spd_register(uint8_t ram_type, uint8_t slot_mask, uint16_t max_module_size); extern void spd_write_drbs(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit); +extern void spd_write_drbs_with_ext(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit); extern void spd_write_drbs_interleaved(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit); extern void spd_write_drbs_ali1621(uint8_t *regs, uint8_t reg_min, uint8_t reg_max); diff --git a/src/mem/spd.c b/src/mem/spd.c index 2ce97153b..db8f1a806 100644 --- a/src/mem/spd.c +++ b/src/mem/spd.c @@ -400,6 +400,58 @@ spd_write_drbs(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit } +/* Needed for 430LX. */ +void +spd_write_drbs_with_ext(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit) +{ + uint8_t row, dimm, drb; + uint16_t row_val = size, rows[SPD_MAX_SLOTS]; + int shift; + + /* No SPD: split SIMMs into pairs as if they were "DIMM"s. */ + if (!spd_present) { + dimm = ((reg_max - reg_min) + 1) >> 1; /* amount of "DIMM"s, also used to determine the maximum "DIMM" size */ + spd_populate(rows, dimm, mem_size >> 10, drb_unit, 1 << (log2i((machines[machine].max_ram >> 10) / dimm)), 0); + } + + /* Write DRBs for each row. */ + spd_log("SPD: Writing DRBs... regs=[%02X:%02X] unit=%d\n", reg_min, reg_max, drb_unit); + for (row = 0; row <= (reg_max - reg_min); row++) { + dimm = (row >> 1); + size = 0; + + if (spd_present) { + /* SPD enabled: use SPD info for this slot, if present. */ + if (spd_modules[dimm]) { + if (spd_modules[dimm]->row1 < drb_unit) /* hack within a hack: turn a double-sided DIMM that is too small into a single-sided one */ + size = (row & 1) ? 0 : drb_unit; + else + size = (row & 1) ? spd_modules[dimm]->row2 : spd_modules[dimm]->row1; + } + } else { + /* No SPD: use the values calculated above. */ + size = (rows[dimm] >> 1); + } + + /* Determine the DRB register to write. */ + drb = reg_min + row; + if (apollo && ((drb & 0xf) < 0xa)) + drb = apollo + (drb & 0xf); + + /* Write DRB register, adding the previous DRB's value. */ + if (row == 0) + row_val = 0; + if (size) + row_val += size / drb_unit; /* this will intentionally overflow on 440GX with 2 GB */ + regs[drb] = row_val & 0xff; + drb = reg_min + 8 + (row >> 1); + shift = (row & 0x01) << 3; + regs[drb] = (((row_val & 0xfff) >> 8) << shift); + spd_log("SPD: DRB[%d] = %d MB (%02Xh raw)\n", row, size, regs[drb]); + } +} + + /* Used by ALi M1531 and M1541/2. */ void spd_write_drbs_interleaved(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit) From bb3422764af1822ca8276de3bd670b037203fdd4 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 6 Feb 2022 00:44:25 +0100 Subject: [PATCH 2/6] Fixed compile-breaking mistakes in mem/spd.c. --- src/mem/spd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mem/spd.c b/src/mem/spd.c index db8f1a806..b8fa23dcf 100644 --- a/src/mem/spd.c +++ b/src/mem/spd.c @@ -405,7 +405,7 @@ void spd_write_drbs_with_ext(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit) { uint8_t row, dimm, drb; - uint16_t row_val = size, rows[SPD_MAX_SLOTS]; + uint16_t size, row_val = rows[SPD_MAX_SLOTS]; int shift; /* No SPD: split SIMMs into pairs as if they were "DIMM"s. */ @@ -435,8 +435,6 @@ spd_write_drbs_with_ext(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t /* Determine the DRB register to write. */ drb = reg_min + row; - if (apollo && ((drb & 0xf) < 0xa)) - drb = apollo + (drb & 0xf); /* Write DRB register, adding the previous DRB's value. */ if (row == 0) From 6c34c331c08c1b6c44aa7842e5cd29a0596c7bb5 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 6 Feb 2022 01:16:08 +0100 Subject: [PATCH 3/6] And another fix. --- src/mem/spd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mem/spd.c b/src/mem/spd.c index b8fa23dcf..7c033fe8c 100644 --- a/src/mem/spd.c +++ b/src/mem/spd.c @@ -405,7 +405,7 @@ void spd_write_drbs_with_ext(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit) { uint8_t row, dimm, drb; - uint16_t size, row_val = rows[SPD_MAX_SLOTS]; + uint16_t size, row_val, rows[SPD_MAX_SLOTS]; int shift; /* No SPD: split SIMMs into pairs as if they were "DIMM"s. */ From 6b5459c560e9d0cde19169f79f0b6593f91aeeed Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 5 Feb 2022 19:53:48 -0500 Subject: [PATCH 4/6] More UI Layout Improvements --- src/win/languages/dialogs.rc | 420 ++++++++++++++++++----------------- src/win/win_settings.c | 16 +- 2 files changed, 229 insertions(+), 207 deletions(-) diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 42b63b6c7..1f871ffdb 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -1,18 +1,23 @@ -#define CFG_BTN_WIDTH 46 -#define CFG_BTN_HEIGHT 12 -#define CFG_COMBO_NOBTN_WIDTH 289 -#define CFG_COMBO_BOX_LEFT 105 -#define CFG_COMBO_BTN_WIDTH 235 -#define CFG_COMBO_BTN_LEFT 349 -#define CFG_COMBO_HEIGHT 120 -#define CFG_PANE_TOP 0 -#define CFG_PANE_LEFT 140 -#define CFG_PANE_WIDTH 395 -#define CFG_PANE_HEIGHT 211 -#define CFG_PANE_LTEXT_PRI_WIDTH 95 -#define CFG_PANE_LTEXT_HEIGHT 10 -#define CFG_LMARGIN 7 -#define CFG_TMARGIN 9 +#define CFG_CHECKBOX_PRI_WIDTH 94 +#define CFG_CHECKBOX_HEIGHT 10 +#define CFG_BTN_WIDTH 46 +#define CFG_BTN_HEIGHT 14 +#define CFG_PANE_LTEXT_PRI_WIDTH 85 +#define CFG_PANE_LTEXT_HEIGHT 10 +#define CFG_COMBO_BTN_WIDTH 212 +#define CFG_COMBO_NOBTN_WIDTH CFG_COMBO_BTN_WIDTH + CFG_BTN_WIDTH + 8 +#define CFG_COMBO_BOX_LEFT CFG_PANE_LTEXT_PRI_WIDTH + 10 +#define CFG_COMBO_BTN_LEFT CFG_COMBO_BOX_LEFT + CFG_COMBO_BTN_WIDTH + 8 +#define CFG_COMBO_HEIGHT 120 +#define CFG_LIST_WIDTH 123 +#define CFG_LIST_HEIGHT 212 +#define CFG_PANE_TOP 0 +#define CFG_PANE_LEFT CFG_LIST_WIDTH + 8 +#define CFG_PANE_WIDTH CFG_COMBO_BOX_LEFT + CFG_COMBO_NOBTN_WIDTH +#define CFG_PANE_HEIGHT 221 +#define CFG_HMARGIN 7 +#define CFG_VMARGIN 9 +#define CFG_SYSLISTVIEW32_WIDTH CFG_PANE_WIDTH - 7 DLG_PREFERENCES DIALOG DISCARDABLE 0, 0, 240, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -20,10 +25,10 @@ CAPTION STR_PREFERENCES FONT FONT_SIZE, FONT_NAME BEGIN DEFPUSHBUTTON STR_OK, IDOK, - 123, 97, 50, 14 + 123, 97, 50, CFG_BTN_HEIGHT PUSHBUTTON STR_CANCEL, IDCANCEL, - 179, 97, 50, 14 + 179, 97, 50, CFG_BTN_HEIGHT LTEXT STR_LANGUAGE, 2000, 13, 8, 100, 8 @@ -31,7 +36,7 @@ BEGIN 13, 18, 213, 22, CBS_DROPDOWNLIST | CBS_HASSTRINGS PUSHBUTTON STR_DEFAULT, IDC_BUTTON_DEFAULT, - 162, 32, 60, 14 + 162, 32, 60, CFG_BTN_HEIGHT LTEXT STR_ICONSET, 2001, 13, 40, 100, 8 @@ -39,7 +44,7 @@ BEGIN 13, 50, 213, 22, CBS_DROPDOWNLIST | CBS_HASSTRINGS PUSHBUTTON STR_DEFAULT, IDC_BUTTON_DEFICON, - 162, 64, 60, 14 + 162, 64, 60, CFG_BTN_HEIGHT AUTOCHECKBOX STR_GLOBAL, IDC_CHECKBOX_GLOBAL, 13, 82, 217, 8, @@ -52,10 +57,10 @@ CAPTION STR_SND_GAIN FONT FONT_SIZE, FONT_NAME BEGIN DEFPUSHBUTTON STR_OK, IDOK, - 57,7,50,14 + 57, 7, 50, CFG_BTN_HEIGHT PUSHBUTTON STR_CANCEL, IDCANCEL, - 57,24,50,14 + 57, 24, 50, CFG_BTN_HEIGHT CONTROL STR_GAIN, IDC_SLIDER_GAIN, "msctls_trackbar32", @@ -72,10 +77,10 @@ CAPTION STR_NEW_FLOPPY FONT FONT_SIZE, FONT_NAME BEGIN DEFPUSHBUTTON STR_OK, IDOK, - 104, 65, 50, 14 + 104, 65, 50, CFG_BTN_HEIGHT PUSHBUTTON STR_CANCEL, IDCANCEL, - 162, 65, 50, 14 + 162, 65, 50, CFG_BTN_HEIGHT LTEXT STR_FILE_NAME, IDT_FLP_FILE_NAME, 7, 6, 44, 12, @@ -91,7 +96,7 @@ BEGIN 53, 25, 166, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...", IDC_CFILE, - 206, 5, 13, 14 + 206, 5, 13, CFG_BTN_HEIGHT LTEXT STR_RPM_MODE, IDT_FLP_RPM_MODE, 7, 45, 44, 12, @@ -136,81 +141,81 @@ BEGIN CONTROL STR_LOCK_TO_SIZE,IDC_CHECK_LOCK_SIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 7, 26, 94, 10 + 7, 26, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT DEFPUSHBUTTON STR_OK,IDOK, - 30, 45, 50, 14 + 30, 45, 50, CFG_BTN_HEIGHT PUSHBUTTON STR_CANCEL, IDCANCEL, - 99, 45, 50, 14 + 99, 45, 50, CFG_BTN_HEIGHT END -DLG_CONFIG DIALOG DISCARDABLE 0, 0, CFG_PANE_WIDTH + 150, 256 +DLG_CONFIG DIALOG DISCARDABLE 0, 0, CFG_LIST_WIDTH + CFG_PANE_WIDTH + 18, 256 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_CONFIG FONT FONT_SIZE, FONT_NAME BEGIN DEFPUSHBUTTON STR_OK, IDOK, - 427, 235, 50, 14 + CFG_LIST_WIDTH + CFG_PANE_WIDTH - 108, 235, 50, CFG_BTN_HEIGHT PUSHBUTTON STR_CANCEL, IDCANCEL, - 487, 235, 50, 14 + CFG_LIST_WIDTH + CFG_PANE_WIDTH - 48 , 235, 50, CFG_BTN_HEIGHT CONTROL "List2", IDC_SETTINGSCATLIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, - CFG_LMARGIN, CFG_TMARGIN, 132, 212 + CFG_HMARGIN, CFG_VMARGIN, CFG_LIST_WIDTH, CFG_LIST_HEIGHT CONTROL "",-1, "Static", SS_BLACKFRAME | SS_SUNKEN, - 1, 226, CFG_PANE_WIDTH + 150, 1 + 1, 226, CFG_LIST_WIDTH + CFG_PANE_WIDTH + 16, 1 END -DLG_CFG_MACHINE DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 200 +DLG_CFG_MACHINE DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN + LTEXT STR_MACHINE_TYPE,IDT_MACHINE_TYPE, + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MACHINE_TYPE, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MACHINE_TYPE,IDT_MACHINE_TYPE, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + LTEXT STR_MACHINE, IDT_MACHINE, + CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MACHINE, CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MACHINE, IDT_MACHINE, - CFG_LMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_MACHINE, CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT + LTEXT STR_CPU_TYPE, IDT_CPU_TYPE, + CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_CPU_TYPE, CFG_COMBO_BOX_LEFT, 45, 115, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CPU_TYPE, IDT_CPU_TYPE, - CFG_LMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT - COMBOBOX IDC_COMBO_CPU_SPEED, - 255, 45, 30, 120, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CPU_SPEED, IDT_CPU_SPEED, - 229, 47, 24, 10 + 225, 47, 24, CFG_PANE_LTEXT_HEIGHT + COMBOBOX IDC_COMBO_CPU_SPEED, + 255, 45, 106, CFG_COMBO_HEIGHT, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT STR_FPU,IDT_FPU, + CFG_HMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_FPU, CFG_COMBO_BOX_LEFT, 64, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_FPU,IDT_FPU, - CFG_LMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + LTEXT STR_WAIT_STATES, IDT_WAIT_STATES, + CFG_HMARGIN, 85, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_WS, CFG_COMBO_BOX_LEFT, 83, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_WAIT_STATES, IDT_WAIT_STATES, - CFG_LMARGIN, 85, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT LTEXT STR_MEMORY, IDT_MEMORY, - CFG_LMARGIN, 104, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 104, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT EDITTEXT IDC_MEMTEXT, CFG_COMBO_BOX_LEFT, 102, 45, 12, ES_AUTOHSCROLL | ES_NUMBER @@ -219,36 +224,36 @@ BEGIN UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS, 138, 101, 12, 12 LTEXT STR_MB, IDT_MB, - 158, 104, 12, 10 + 148, 104, 12, CFG_PANE_LTEXT_HEIGHT #ifdef USE_DYNAREC CONTROL STR_DYNAREC, IDC_CHECK_DYNAREC, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 120, 120, 10 + CFG_HMARGIN, 120, 120, CFG_CHECKBOX_HEIGHT #endif GROUPBOX STR_TIME_SYNC, IDC_TIME_SYNC, - CFG_LMARGIN, 135, 110, 56 + CFG_HMARGIN, 135, 110, 56 CONTROL STR_DISABLED, IDC_RADIO_TS_DISABLED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, - 14, 147, 94, 10 + 14, 147, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_ENABLED_LOCAL, IDC_RADIO_TS_LOCAL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, - 14, 161, 94, 10 + 14, 161, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_ENABLED_UTC, IDC_RADIO_TS_UTC, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, - 14, 175, 94, 10 + 14, 175, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT END -DLG_CFG_VIDEO DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 45 +DLG_CFG_VIDEO DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_VIDEO, IDT_VIDEO, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_VIDEO, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -257,17 +262,17 @@ BEGIN CONTROL STR_VOODOO, IDC_CHECK_VOODOO, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 7, 27, 199, 10 + 7, 27, 199, CFG_CHECKBOX_HEIGHT PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_VOODOO, CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT END -DLG_CFG_INPUT DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 65 +DLG_CFG_INPUT DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_MOUSE, IDT_MOUSE, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MOUSE, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -275,30 +280,30 @@ BEGIN CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT LTEXT STR_JOYSTICK, IDT_JOYSTICK, - CFG_LMARGIN, 27, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 27, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_JOYSTICK, CFG_COMBO_BOX_LEFT, 25, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_JOY1, IDC_JOY1, - CFG_LMARGIN, 44, 80, 14 + CFG_HMARGIN, 44, 80, CFG_BTN_HEIGHT PUSHBUTTON STR_JOY2, IDC_JOY2, - 111, 44, 80, 14 + 99, 44, 80, CFG_BTN_HEIGHT PUSHBUTTON STR_JOY3, IDC_JOY3, - 213, 44, 80, 14 + 195, 44, 80, CFG_BTN_HEIGHT PUSHBUTTON STR_JOY4, IDC_JOY4, - 315, 44, 80, 14 + 290, 44, 80, CFG_BTN_HEIGHT END -DLG_CFG_SOUND DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 201 +DLG_CFG_SOUND DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_SOUND, IDT_SOUND, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_SOUND, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -306,7 +311,7 @@ BEGIN CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT LTEXT STR_MIDI_OUT, IDT_MIDI_OUT, - CFG_LMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MIDI_OUT, CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -315,7 +320,7 @@ BEGIN CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT LTEXT STR_MIDI_IN, IDT_MIDI_IN, - CFG_LMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MIDI_IN, CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -324,51 +329,51 @@ BEGIN CONTROL STR_MPU401,IDC_CHECK_MPU401, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 66, 199, 10 + CFG_HMARGIN, 66, 199, CFG_CHECKBOX_HEIGHT PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_MPU401, CFG_COMBO_BTN_LEFT, 64, CFG_BTN_WIDTH, CFG_BTN_HEIGHT CONTROL STR_SSI,IDC_CHECK_SSI, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 84, 95, 10 + CFG_HMARGIN, 84, 95, CFG_CHECKBOX_HEIGHT PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_SSI, CFG_COMBO_BTN_LEFT, 82, CFG_BTN_WIDTH, CFG_BTN_HEIGHT CONTROL STR_CMS,IDC_CHECK_CMS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 102, 95, 10 + CFG_HMARGIN, 102, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_CMS, CFG_COMBO_BTN_LEFT, 100, CFG_BTN_WIDTH, CFG_BTN_HEIGHT CONTROL STR_GUS,IDC_CHECK_GUS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 120, 94, 10 + CFG_HMARGIN, 120, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_GUS, CFG_COMBO_BTN_LEFT, 118, CFG_BTN_WIDTH, CFG_BTN_HEIGHT CONTROL STR_FLOAT, IDC_CHECK_FLOAT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 138, 104, 10 + CFG_HMARGIN, 138, 104, CFG_CHECKBOX_HEIGHT END -DLG_CFG_NETWORK DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 65 +DLG_CFG_NETWORK DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_NET_TYPE, IDT_NET_TYPE, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_NET_TYPE, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_PCAP, IDT_PCAP, - CFG_LMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_PCAP, CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_NET, IDT_NET, - CFG_LMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_NET, CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -376,99 +381,99 @@ BEGIN CFG_COMBO_BTN_LEFT, 44, CFG_BTN_WIDTH, CFG_BTN_HEIGHT END -DLG_CFG_PORTS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 155 +DLG_CFG_PORTS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN /* LTEXT STR_COM1, IDT_COM1, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_COM1, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_COM2, IDT_COM2, - CFG_LMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_COM2, CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_COM3, IDT_COM3, - CFG_LMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_COM3, CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_COM4, IDT_COM4, - CFG_LMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_COM4, CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP */ LTEXT STR_LPT1, IDT_LPT1, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_LPT1, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_LPT2, IDT_LPT2, - CFG_LMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_LPT2, CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_LPT3, IDT_LPT3, - CFG_LMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_LPT3, CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_LPT4, IDT_LPT4, - CFG_LMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_LPT4, CFG_COMBO_BOX_LEFT, 64, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL STR_SERIAL1, IDC_CHECK_SERIAL1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 83, 94, 10 + CFG_HMARGIN, 83, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_SERIAL2, IDC_CHECK_SERIAL2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 102, 94, 10 + CFG_HMARGIN, 102, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_SERIAL3, IDC_CHECK_SERIAL3, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 121, 94, 10 + CFG_HMARGIN, 121, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_SERIAL4, IDC_CHECK_SERIAL4, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 140, 94, 10 + CFG_HMARGIN, 140, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_PARALLEL1, IDC_CHECK_PARALLEL1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 147, 83, 94, 10 + 147, 83, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_PARALLEL2, IDC_CHECK_PARALLEL2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 147, 102, 94, 10 + 147, 102, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_PARALLEL3, IDC_CHECK_PARALLEL3, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 147, 121, 94, 10 + 147, 121, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_PARALLEL4, IDC_CHECK_PARALLEL4, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 147, 140, 94, 10 + 147, 140, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT END -DLG_CFG_STORAGE DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 203 +DLG_CFG_STORAGE DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_HDC, IDT_HDC, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_HDC, CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -476,7 +481,7 @@ BEGIN CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT LTEXT STR_FDC, IDT_FDC, - CFG_LMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_FDC, CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -485,18 +490,18 @@ BEGIN CONTROL STR_IDE_TER,IDC_CHECK_IDE_TER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 47, 239, 10 + CFG_HMARGIN, 47, 239, 10 PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_IDE_TER, CFG_COMBO_BTN_LEFT, 45, CFG_BTN_WIDTH, CFG_BTN_HEIGHT CONTROL STR_IDE_QUA, IDC_CHECK_IDE_QUA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 66, 239, 10 + CFG_HMARGIN, 66, 239, 10 PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_IDE_QUA, CFG_COMBO_BTN_LEFT, 64, CFG_BTN_WIDTH, CFG_BTN_HEIGHT GROUPBOX STR_SCSI, IDC_GROUP_SCSI, - CFG_LMARGIN, 85, 388, 93 + CFG_HMARGIN, 85, CFG_SYSLISTVIEW32_WIDTH, 93 LTEXT STR_SCSI_1, IDT_SCSI_1, 16, 102, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT @@ -532,36 +537,36 @@ BEGIN CONTROL STR_CASSETTE,IDC_CHECK_CASSETTE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN,185,94,10 + CFG_HMARGIN, 185, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT END -DLG_CFG_HARD_DISKS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 154 +DLG_CFG_HARD_DISKS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_HDD, IDT_HDD, - CFG_LMARGIN, CFG_TMARGIN, 258, 8 + CFG_HMARGIN, CFG_VMARGIN, 258, CFG_PANE_LTEXT_HEIGHT CONTROL "List1", IDC_LIST_HARD_DISKS, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, - CFG_LMARGIN, 18, 388, 92 + CFG_HMARGIN, 18, CFG_SYSLISTVIEW32_WIDTH, 182 PUSHBUTTON STR_NEW, IDC_BUTTON_HDD_ADD_NEW, - 60, 137, 62, 10 + 80, 206, 62, CFG_BTN_HEIGHT PUSHBUTTON STR_EXISTING, IDC_BUTTON_HDD_ADD, - 129, 137, 62, 10 + 153, 206, 62, CFG_BTN_HEIGHT PUSHBUTTON STR_REMOVE, IDC_BUTTON_HDD_REMOVE, - 198, 137, 62, 10 + 222, 206, 62, CFG_BTN_HEIGHT LTEXT STR_BUS,IDT_BUS, - CFG_LMARGIN, 119, 24, 8 + CFG_HMARGIN, 119, 24, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_HD_BUS, 33, 117, 90, 12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CHANNEL, IDT_CHANNEL, - 131, 119, 38, 8 + 131, 119, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_HD_CHANNEL, 170, 117, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -570,217 +575,229 @@ BEGIN CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_ID, IDT_ID, - 131, 119, 38, 8 + 131, 119, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_HD_ID, 170, 117, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE 0, 0, 219, 149 +DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE 0, 0, 219, 151 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Add Hard Disk" FONT FONT_SIZE, FONT_NAME BEGIN - DEFPUSHBUTTON STR_OK, IDOK, - 55, 127, 50, 14 - PUSHBUTTON STR_CANCEL, IDCANCEL, - 112, 127, 50, 14 - EDITTEXT IDC_EDIT_HD_FILE_NAME, - 7, 16, 153, 12 - PUSHBUTTON STR_SPECIFY, IDC_CFILE, - 167, 16, 44, 12 - EDITTEXT IDC_EDIT_HD_SPT, - 183, 34, 28, 12 - EDITTEXT IDC_EDIT_HD_HPC, - 112, 34, 28, 12 - EDITTEXT IDC_EDIT_HD_CYL, - 42, 34, 28, 12 - EDITTEXT IDC_EDIT_HD_SIZE, - 42, 52, 28, 12 - COMBOBOX IDC_COMBO_HD_TYPE, - 113, 52, 98, 12, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SECTORS, IDT_SECTORS, - 154, 35, 27, 10 - LTEXT STR_HEADS, IDT_HEADS, - 81, 35, 29, 8 - LTEXT STR_CYLS, IDT_CYLS, - 7, 35, 32, 12 - LTEXT STR_SIZE_MB, IDT_SIZE_MB, - 7, 54, 33, 8 - LTEXT STR_TYPE, IDT_TYPE, - 86, 54, 24, 8 LTEXT STR_FILE_NAME, IDT_FILE_NAME, - 7, 7, 204, 9 - COMBOBOX IDC_COMBO_HD_BUS, - 33, 71, 58, 12, + 7, 7, 204, 12 + EDITTEXT IDC_EDIT_HD_FILE_NAME, + 7, 18, 153, 12 + PUSHBUTTON STR_SPECIFY, IDC_CFILE, + 167, 18, 44, CFG_BTN_HEIGHT + + LTEXT STR_CYLS, IDT_CYLS, + 7, 37, 32, 12 + EDITTEXT IDC_EDIT_HD_CYL, + 42, 36, 28, 12 + + LTEXT STR_HEADS, IDT_HEADS, + 81, 37, 29, 12 + EDITTEXT IDC_EDIT_HD_HPC, + 112, 36, 28, 12 + + LTEXT STR_SECTORS, IDT_SECTORS, + 154, 37, 27, 12 + EDITTEXT IDC_EDIT_HD_SPT, + 183, 36, 28, 12 + + LTEXT STR_SIZE_MB, IDT_SIZE_MB, + 7, 56, 33, 12 + EDITTEXT IDC_EDIT_HD_SIZE, + 42, 54, 28, 12 + + LTEXT STR_TYPE, IDT_TYPE, + 86, 56, 24, 12 + COMBOBOX IDC_COMBO_HD_TYPE, + 113, 54, 98, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT STR_BUS,IDT_BUS, - 7, 73, 24, 8 - COMBOBOX IDC_COMBO_HD_CHANNEL, - 134, 71, 77, 12, + 7, 75, 24, 12 + COMBOBOX IDC_COMBO_HD_BUS, + 33, 73, 58, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT STR_CHANNEL, IDT_CHANNEL, - 99, 73, 34, 8 - COMBOBOX IDC_COMBO_HD_ID, - 134, 71, 77, 12, + 99, 75, 34, 12 + COMBOBOX IDC_COMBO_HD_CHANNEL, + 134, 73, 77, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID, IDT_ID, - 99, 73, 34, 8 COMBOBOX IDC_COMBO_HD_CHANNEL_IDE, - 134, 71, 77, 12, + 134, 73, 77, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + LTEXT STR_ID, IDT_ID, + 99, 75, 34, 12 + COMBOBOX IDC_COMBO_HD_ID, + 134, 73, 77, 12, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT STR_IMG_FORMAT, IDT_IMG_FORMAT, - 7, 92, 50, 12 + 7, 94, 50, 12 COMBOBOX IDC_COMBO_HD_IMG_FORMAT, - 58, 90, 153, 12, + 58, 92, 153, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT STR_BLOCK_SIZE, IDT_BLOCK_SIZE, - 7, 111, 50, 12 + 7, 113, 50, 12 COMBOBOX IDC_COMBO_HD_BLOCK_SIZE, - 58, 109, 153, 12, + 58, 111, 153, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_PROGRESS, IDT_PROGRESS,7,7,204,9 + + LTEXT STR_PROGRESS, IDT_PROGRESS, + 7, 7, 204, 12 CONTROL "IMGCreateProgress", IDC_PBAR_IMG_CREATE, "msctls_progress32", PBS_SMOOTH | WS_BORDER, 7, 16, 204, 12 + + DEFPUSHBUTTON STR_OK, IDOK, + 55, 129, 50, CFG_BTN_HEIGHT + PUSHBUTTON STR_CANCEL, IDCANCEL, + 112, 129, 50, CFG_BTN_HEIGHT END -DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 222 +DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_FLOPPY_DRIVES, IDT_FLOPPY_DRIVES, - CFG_LMARGIN, CFG_TMARGIN, 258, 8 + CFG_HMARGIN, CFG_VMARGIN, 258, CFG_PANE_LTEXT_HEIGHT CONTROL "List1", IDC_LIST_FLOPPY_DRIVES, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, - CFG_LMARGIN, 18, 388, 60 + CFG_HMARGIN, 18, CFG_SYSLISTVIEW32_WIDTH, 60 LTEXT STR_TYPE, IDT_FDD_TYPE, - CFG_LMARGIN, 87, 24, 8 + CFG_HMARGIN, 87, 24, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_FD_TYPE, 33, 85, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL STR_TURBO, IDC_CHECKTURBO, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 131, 86, 64, 10 + 131, 86, 64, CFG_CHECKBOX_HEIGHT CONTROL STR_CHECKBPB, IDC_CHECKBPB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 196, 86, 64, 10 + 196, 86, 64, CFG_CHECKBOX_HEIGHT LTEXT STR_CDROM_DRIVES, IDT_CD_DRIVES, - CFG_LMARGIN, 107, 258, 8 + CFG_HMARGIN, 107, 258, CFG_PANE_LTEXT_HEIGHT CONTROL "List1", IDC_LIST_CDROM_DRIVES, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, - CFG_LMARGIN, 117, 388, 60 + CFG_HMARGIN, 117, CFG_SYSLISTVIEW32_WIDTH, 60 LTEXT STR_BUS, IDT_CD_BUS, - CFG_LMARGIN, 187, 24, 8 + CFG_HMARGIN, 187, 24, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_CD_BUS, 33, 185, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_ID, IDT_CD_ID, - 131, 187, 38, 8 + 131, 187, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_CD_ID, 170, 185, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CHANNEL, IDT_CD_CHANNEL, - 131, 187, 38, 8 + 131, 187, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_CD_CHANNEL_IDE, 170, 185, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CD_SPEED, IDT_CD_SPEED, - CFG_LMARGIN, 207, 24, 8 + CFG_HMARGIN, 207, 24, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_CD_SPEED, 33, 205, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 222 +DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_MO_DRIVES, IDT_MO_DRIVES, - CFG_LMARGIN, CFG_TMARGIN, 258, 8 + CFG_HMARGIN, CFG_VMARGIN, 258, CFG_PANE_LTEXT_HEIGHT CONTROL "List1", IDC_LIST_MO_DRIVES, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, - CFG_LMARGIN, 17, 388, 60 + CFG_HMARGIN, 17, CFG_SYSLISTVIEW32_WIDTH, 60 LTEXT STR_BUS, IDT_MO_BUS, - CFG_LMARGIN, 87, 24, 8 + CFG_HMARGIN, 87, 24, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MO_BUS, - 33, 85, 80, 12, + 33, 85, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_ID, IDT_MO_ID, - 131, 87, 38, 8 + 131, 87, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MO_ID, 170, 85, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CHANNEL, IDT_MO_CHANNEL, - 131, 87, 38, 8 + 131, 87, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MO_CHANNEL_IDE, 170, 85, 90, 12, - CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_TYPE, IDT_MO_TYPE, - CFG_LMARGIN, 107, 24, 8 + CFG_HMARGIN, 107, 24, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_MO_TYPE, 33, 105, 120, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_ZIP_DRIVES, IDT_ZIP_DRIVES, - CFG_LMARGIN, 127, 258, 8 + CFG_HMARGIN, 127, 258, CFG_PANE_LTEXT_HEIGHT CONTROL "List1", IDC_LIST_ZIP_DRIVES, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, - CFG_LMARGIN, 137, 388, 60 + CFG_HMARGIN, 137, CFG_SYSLISTVIEW32_WIDTH, 60 LTEXT STR_BUS, IDT_ZIP_BUS, - CFG_LMARGIN, 207, 24, 8 + CFG_HMARGIN, 207, 24, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_ZIP_BUS, - 33, 205, 80, 12, + 33, 205, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_ZIP_ID, - 120, 207, 28, 8 + LTEXT STR_ID, IDT_ZIP_ID, + 131, 207, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_ZIP_ID, - 149, 205, 61, 12, + 170, 205, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CHANNEL, IDT_ZIP_CHANNEL, - 120, 207, 28 ,8 + 131, 207, 38, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_ZIP_CHANNEL_IDE, - 149, 205, 61, 12, + 170, 205, 90, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL STR_250, IDC_CHECK250, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - 218, 205, 44, 10 + 268, 205, 44, CFG_CHECKBOX_HEIGHT END -DLG_CFG_PERIPHERALS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 190 +DLG_CFG_PERIPHERALS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_ISARTC, IDT_ISARTC, - CFG_LMARGIN, CFG_TMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_ISARTC, CFG_COMBO_BOX_LEFT, 7,CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -788,7 +805,7 @@ BEGIN CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT GROUPBOX STR_ISAMEM, IDC_GROUP_ISAMEM, - CFG_LMARGIN, 28, 388, 93 + CFG_HMARGIN, 28, CFG_SYSLISTVIEW32_WIDTH, 93 LTEXT STR_ISAMEM_1, IDT_ISAMEM_1, 16, 45, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT @@ -824,28 +841,33 @@ BEGIN CONTROL STR_BUGGER, IDC_CHECK_BUGGER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 128, 94, 10 + CFG_HMARGIN, 128, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT CONTROL STR_POSTCARD,IDC_CHECK_POSTCARD, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, - CFG_LMARGIN, 146, 94, 10 + CFG_HMARGIN, 146, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT END +#undef CFG_CHECKBOX_PRI_WIDTH +#undef CFG_CHECKBOX_HEIGHT #undef CFG_BTN_WIDTH #undef CFG_BTN_HEIGHT +#undef CFG_PANE_LTEXT_PRI_WIDTH +#undef CFG_PANE_LTEXT_HEIGHT +#undef CFG_COMBO_BTN_WIDTH #undef CFG_COMBO_NOBTN_WIDTH #undef CFG_COMBO_BOX_LEFT -#undef CFG_COMBO_BTN_WIDTH #undef CFG_COMBO_BTN_LEFT #undef CFG_COMBO_HEIGHT +#undef CFG_LIST_WIDTH +#undef CFG_LIST_HEIGHT #undef CFG_PANE_TOP #undef CFG_PANE_LEFT #undef CFG_PANE_WIDTH #undef CFG_PANE_HEIGHT -#undef CFG_PANE_LTEXT_PRI_WIDTH -#undef CFG_PANE_LTEXT_HEIGHT -#undef CFG_LMARGIN -#undef CFG_TMARGIN +#undef CFG_HMARGIN +#undef CFG_VMARGIN +#undef CFG_SYSLISTVIEW32_WIDTH #undef STR_PREFERENCES diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 86e0500cc..4c044c07c 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -429,7 +429,7 @@ win_settings_init(void) /* ISA memory boards. */ for (i = 0; i < ISAMEM_MAX; i++) - temp_isamem[i] = isamem_type[i]; + temp_isamem[i] = isamem_type[i]; temp_deviceconfig = 0; } @@ -2316,7 +2316,7 @@ static void win_settings_hard_disks_resize_columns(HWND hdlg) { /* Bus, File, Cylinders, Heads, Sectors, Size */ - int iCol, width[C_COLUMNS_HARD_DISKS] = {104, 177, 50, 26, 32, 50}; + int iCol, width[C_COLUMNS_HARD_DISKS] = {104, 354, 50, 26, 32, 50}; int total = 0; HWND hwndList = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS); RECT r; @@ -2351,7 +2351,7 @@ win_settings_hard_disks_init_columns(HWND hdlg) lvc.fmt = LVCFMT_LEFT; break; case 1: /* File */ - lvc.cx = 177; + lvc.cx = 354; lvc.fmt = LVCFMT_LEFT; break; case 2: /* Cylinders */ @@ -2650,13 +2650,13 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM size = (tracks * hpc * spt) << 9; set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20LL)); hdconf_initialize_hdt_combo(hdlg); - + settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4122)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4123)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4124)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4125)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4126)); - settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4127)); + settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4127)); settings_set_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT, 0); settings_add_string(hdlg, IDC_COMBO_HD_BLOCK_SIZE, win_get_string(IDS_4128)); @@ -2674,7 +2674,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_IMG_FORMAT, FALSE); settings_show_window(hdlg, IDT_IMG_FORMAT, FALSE); - + /* adjust window size */ GetWindowRect(hdlg, &rect); OffsetRect(&rect, -rect.left, -rect.top); @@ -2837,7 +2837,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM hard_disk_added = 1; EndDialog(hdlg, 0); return TRUE; - } + } big_buf = (char *) malloc(1048576); memset(big_buf, 0, 1048576); @@ -2942,7 +2942,7 @@ hdd_add_file_open_error: if (vhd == NULL) { settings_msgbox_header(MBX_ERROR, (existing & 1) ? (wchar_t *) IDS_4114 : (wchar_t *) IDS_4115, (existing & 1) ? (wchar_t *) IDS_4107 : (wchar_t *) IDS_4108); return TRUE; - } else if (vhd_error == MVHD_ERR_TIMESTAMP) { + } else if (vhd_error == MVHD_ERR_TIMESTAMP) { if (settings_msgbox_ex(MBX_QUESTION_YN | MBX_WARNING, plat_get_string(IDS_4133), plat_get_string(IDS_4132), NULL, NULL, NULL) != 0) { int ts_res = mvhd_diff_update_par_timestamp(vhd, &vhd_error); if (ts_res != 0) { From 232b75fef871800fbe825877871575ccd2e27b07 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 6 Feb 2022 15:29:28 +0100 Subject: [PATCH 5/6] Correctly implemented some implied ALi M1543(C) behavior. --- src/chipset/ali1543.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/chipset/ali1543.c b/src/chipset/ali1543.c index 7aa7e13bc..223b5875a 100644 --- a/src/chipset/ali1543.c +++ b/src/chipset/ali1543.c @@ -294,7 +294,7 @@ ali1533_write(int func, int addr, uint8_t val, void *priv) dev->ide_slot = 0x0d; /* A24 = slot 13 */ break; } - ali1543_log("IDE slot = %02X (A%0i)\n", dev->ide_slot - 5, dev->ide_slot + 11); + ali1543_log("IDE slot = %02X (A%0i)\n", dev->ide_slot/* - 5*/, dev->ide_slot + 11); ali5229_ide_irq_handler(dev); break; @@ -363,7 +363,7 @@ ali1533_write(int func, int addr, uint8_t val, void *priv) dev->pmu_slot = 0x04; /* A15 = slot 04 */ break; } - ali1543_log("PMU slot = %02X (A%0i)\n", dev->pmu_slot - 5, dev->pmu_slot + 11); + ali1543_log("PMU slot = %02X (A%0i)\n", dev->pmu_slot/* - 5*/, dev->pmu_slot + 11); switch (val & 0x03) { case 0x00: dev->usb_slot = 0x14; /* A31 = slot 20 */ @@ -378,7 +378,7 @@ ali1533_write(int func, int addr, uint8_t val, void *priv) dev->usb_slot = 0x01; /* A12 = slot 01 */ break; } - ali1543_log("USB slot = %02X (A%0i)\n", dev->usb_slot - 5, dev->usb_slot + 11); + ali1543_log("USB slot = %02X (A%0i)\n", dev->usb_slot/* - 5*/, dev->usb_slot + 11); break; case 0x73: /* DDMA Base Address */ @@ -955,11 +955,14 @@ ali7101_write(int func, int addr, uint8_t val, void *priv) case 0x04: /* Enable PMU */ ali1543_log("PMU04: %02X\n", val); dev->pmu_conf[addr] = val & 0x01; - acpi_update_io_mapping(dev->acpi, (dev->pmu_conf[0x11] << 8) | (dev->pmu_conf[0x10] & 0xc0), dev->pmu_conf[0x04] & 1); - if (dev->type == 1) - smbus_ali7101_remap(dev->smbus, (dev->pmu_conf[0x15] << 8) | (dev->pmu_conf[0x14] & 0xc0), (dev->pmu_conf[0xe0] & 1) && (dev->pmu_conf[0x04] & 1)); - else - smbus_ali7101_remap(dev->smbus, (dev->pmu_conf[0x15] << 8) | (dev->pmu_conf[0x14] & 0xe0), (dev->pmu_conf[0xe0] & 1) && (dev->pmu_conf[0x04] & 1)); + if (!(dev->pmu_conf[0x5b] & 0x02)) + acpi_update_io_mapping(dev->acpi, (dev->pmu_conf[0x11] << 8) | (dev->pmu_conf[0x10] & 0xc0), dev->pmu_conf[0x04] & 1); + if (!(dev->pmu_conf[0x5b] & 0x04)) { + if (dev->type == 1) + smbus_ali7101_remap(dev->smbus, (dev->pmu_conf[0x15] << 8) | (dev->pmu_conf[0x14] & 0xc0), (dev->pmu_conf[0xe0] & 1) && (dev->pmu_conf[0x04] & 1)); + else + smbus_ali7101_remap(dev->smbus, (dev->pmu_conf[0x15] << 8) | (dev->pmu_conf[0x14] & 0xe0), (dev->pmu_conf[0xe0] & 1) && (dev->pmu_conf[0x04] & 1)); + } break; /* PMU Base I/O */ From e985f1ce75c46794cb172660eb12931ad14e9c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 6 Feb 2022 20:03:08 +0100 Subject: [PATCH 6/6] Fix CLANG64 job failing Turns out MSYS2 removed the GCC virtual package from that environment --- .github/workflows/cmake.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 40bb44fb4..6ee6d6b43 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -79,8 +79,7 @@ jobs: msystem: ${{ matrix.environment.msystem }} install: >- ${{ matrix.environment.prefix }}-ninja - ${{ matrix.environment.prefix }}-gcc - ${{ matrix.environment.prefix }}-clang + ${{ matrix.environment.prefix }}-cc ${{ matrix.environment.prefix }}-pkg-config ${{ matrix.environment.prefix }}-openal ${{ matrix.environment.prefix }}-freetype