claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More warnings fixed (in cpu/ and mem.c)

Browse Source 
More vidapi cleanups, synced with UNIX version now.
More fine-tuning of UI code here and there.
This commit is contained in:
waltje
2018-05-10 03:58:47 -04:00
parent 4d076d37e0
commit bf676a9213
32 changed files with 408 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/win/mingw/Makefile.MinGW
View File

@@ -8,7 +8,7 @@
#
# Makefile for Windows systems using the MinGW32 environment.
#
# Version: @(#)Makefile.mingw 1.0.41 2018/05/07
# Version: @(#)Makefile.mingw 1.0.42 2018/05/09
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -475,6 +475,7 @@ endif
# Final versions of the toolchain flags.
# FIXME: add the -Wsign-compare option soon!
CFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
$(AFLAGS) -fomit-frame-pointer -mstackrealign \
-Wall -Wundef #-Wshadow #-Wunused-parameter -Wmissing-declarations
@@ -489,12 +490,12 @@ CXXFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
#########################################################################
# Create the (final) list of objects to build. #
#########################################################################
MAINOBJ := pc.o config.o \
MAINOBJ := pc.o config.o misc.o \
random.o timer.o io.o dma.o nmi.o pic.o pit.o ppi.o \
pci.o mca.o mcr.o mem.o memregs.o rom.o rom_load.o \
device.o nvr.o nvr_at.o nvr_ps2.o $(VNCOBJ) $(RDPOBJ)
UIOBJ += ui_main.o ui_new_floppy.o ui_stbar.o
UIOBJ += ui_main.o ui_new_floppy.o ui_stbar.o ui_vidapi.o
INTELOBJ := intel.o \
intel_flash.o \
@@ -570,9 +571,10 @@ SCSIOBJ := scsi.o \
NETOBJ := network.o \
net_pcap.o \
net_slirp.o \
bootp.o ip_icmp.o misc.o socket.o tcp_timer.o cksum.o \
ip_input.o queue.o tcp_input.o debug.o ip_output.o \
sbuf.o tcp_output.o udp.o if.o mbuf.o slirp.o tcp_subr.o \
bootp.o ip_icmp.o slirp_misc.o socket.o tcp_timer.o \
cksum.o ip_input.o queue.o tcp_input.o debug.o \
ip_output.o sbuf.o tcp_output.o udp.o if.o mbuf.o \
slirp.o tcp_subr.o \
net_ne2000.o
SNDOBJ := sound.o \
@@ -662,6 +664,10 @@ else
@echo $<
@$(CPP) $(CXXFLAGS) -c $<
%.int: %.c
@echo $<
@$(PREPROC) $(OPTS) $< >$@
%.d: %.c $(wildcard $*.d)
@echo $<
@$(CC) $(CFLAGS) $(DEPS) -E $< >NUL

15
src/win/msvc/Makefile.VC
View File

@@ -8,7 +8,7 @@
#
# Makefile for Windows using Visual Studio 2015.
#
# Version: @(#)Makefile.VC 1.0.28 2018/05/09
# Version: @(#)Makefile.VC 1.0.29 2018/05/09
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -453,7 +453,7 @@ CXXFLAGS := $(WX_FLAGS) $(OPTS) $(CXXOPTS) $(COPTS) $(DOPTS) $(AOPTIM) $(AFLAGS)
#########################################################################
# Create the (final) list of objects to build. #
#########################################################################
MAINOBJ := pc.obj config.obj \
MAINOBJ := pc.obj config.obj misc.obj \
random.obj timer.obj io.obj dma.obj nmi.obj pic.obj \
pit.obj ppi.obj pci.obj mca.obj mcr.obj mem.obj \
memregs.obj rom.obj rom_load.obj device.obj nvr.obj \
@@ -535,9 +535,11 @@ SCSIOBJ := scsi.obj \
NETOBJ := network.obj \
net_pcap.obj \
net_slirp.obj \
bootp.obj ip_icmp.obj misc.obj socket.obj tcp_timer.obj cksum.obj \
ip_input.obj queue.obj tcp_input.obj debug.obj ip_output.obj \
sbuf.obj tcp_output.obj udp.obj if.obj mbuf.obj slirp.obj tcp_subr.obj \
bootp.obj ip_icmp.obj slirp_misc.obj socket.obj \
tcp_timer.obj cksum.obj ip_input.obj queue.obj \
tcp_input.obj debug.obj ip_output.obj sbuf.obj \
tcp_output.obj udp.obj if.obj mbuf.obj slirp.obj \
tcp_subr.obj \
net_ne2000.obj
SNDOBJ := sound.obj \
@@ -625,6 +627,9 @@ else
%.obj: %.cpp
@$(CPP) $(CXXFLAGS) -Fo$@ -c $<
%.int: %.c
@$(PREPROC) $(OPTS) -Fo$@ $<
%.d: %.c $(wildcard $*.d)
$(MCPP) $(OPTS) $(DEPS) $< >NUL

113
src/win/win.c
View File

@@ -72,30 +72,16 @@
#include "win.h"
typedef struct {
WCHAR str[512];
} rc_str_t;
/* Platform Public data, specific. */
HINSTANCE hInstance; /* application instance */
LCID lang_id; /* current language ID used */
DWORD dwSubLangID;
const string_t *plat_strings;
/* Local data. */
static HANDLE hBlitMutex, /* video mutex */
thMain; /* main thread */
static rc_str_t *lpRCstr2048,
*lpRCstr4096,
*lpRCstr4352,
*lpRCstr4608,
*lpRCstr5120,
*lpRCstr5376,
*lpRCstr5632,
*lpRCstr5888,
*lpRCstr6144,
*lpRCstr7168;
/* The list with supported VidAPI modules. */
@@ -125,48 +111,45 @@ const vidapi_t *plat_vidapis[] = {
static void
LoadCommonStrings(void)
{
int i;
wchar_t temp[512], *str;
string_t *array, *tbl;
int c = 0, i;
lpRCstr2048 = (rc_str_t *)malloc(STR_NUM_2048*sizeof(rc_str_t));
lpRCstr4096 = (rc_str_t *)malloc(STR_NUM_4096*sizeof(rc_str_t));
lpRCstr4352 = (rc_str_t *)malloc(STR_NUM_4352*sizeof(rc_str_t));
lpRCstr4608 = (rc_str_t *)malloc(STR_NUM_4608*sizeof(rc_str_t));
lpRCstr5120 = (rc_str_t *)malloc(STR_NUM_5120*sizeof(rc_str_t));
lpRCstr5376 = (rc_str_t *)malloc(STR_NUM_5376*sizeof(rc_str_t));
lpRCstr5632 = (rc_str_t *)malloc(STR_NUM_5632*sizeof(rc_str_t));
lpRCstr5888 = (rc_str_t *)malloc(STR_NUM_5888*sizeof(rc_str_t));
lpRCstr6144 = (rc_str_t *)malloc(STR_NUM_6144*sizeof(rc_str_t));
lpRCstr7168 = (rc_str_t *)malloc(STR_NUM_7168*sizeof(rc_str_t));
/*
* First, we need to know how many strings are in the table.
* Sadly, there is no other way to determine this but to try
* to load all possible ID's...
*/
for (i = IDS_BEGIN; i < IDS_END; i++)
if (LoadString(hInstance, i, temp, sizeof_w(temp)) > 0) c++;
for (i=0; i<STR_NUM_2048; i++)
LoadString(hInstance, 2048+i, lpRCstr2048[i].str, 512);
/*
* Now that we know how many strings exist, we can allocate
* our string_table array.
*/
i = (c + 1) * sizeof(string_t);
array = (string_t *)malloc(i);
memset(array, 0x00, i);
for (i=0; i<STR_NUM_4096; i++)
LoadString(hInstance, 4096+i, lpRCstr4096[i].str, 512);
/* Now load the actual strings into our string table. */
tbl = array;
for (i = IDS_BEGIN; i < IDS_END; i++) {
c = LoadString(hInstance, i, temp, sizeof_w(temp));
if (c == 0) continue;
for (i=0; i<STR_NUM_4352; i++)
LoadString(hInstance, 4352+i, lpRCstr4352[i].str, 512);
tbl->id = i;
str = (wchar_t *)malloc((c + 1) * sizeof(wchar_t));
wcscpy(str, temp);
tbl->str = str;
for (i=0; i<STR_NUM_4608; i++)
LoadString(hInstance, 4608+i, lpRCstr4608[i].str, 512);
tbl++;
}
for (i=0; i<STR_NUM_5120; i++)
LoadString(hInstance, 5120+i, lpRCstr5120[i].str, 512);
/* Terminate the table. */
tbl->str = NULL;
for (i=0; i<STR_NUM_5376; i++)
LoadString(hInstance, 5376+i, lpRCstr5376[i].str, 512);
for (i=0; i<STR_NUM_5632; i++)
LoadString(hInstance, 5632+i, lpRCstr5632[i].str, 512);
for (i=0; i<STR_NUM_5888; i++)
LoadString(hInstance, 5888+i, lpRCstr5888[i].str, 512);
for (i=0; i<STR_NUM_6144; i++)
LoadString(hInstance, 6144+i, lpRCstr6144[i].str, 512);
for (i=0; i<STR_NUM_7168; i++)
LoadString(hInstance, 7168+i, lpRCstr7168[i].str, 512);
/* Consider this table const. */
plat_strings = array;
}
@@ -440,36 +423,6 @@ plat_fdd_icon(int type)
}
wchar_t *
plat_get_string(int i)
{
LPTSTR str;
if ((i >= 2048) && (i <= 3071))
str = lpRCstr2048[i-2048].str;
else if ((i >= 4096) && (i <= 4351))
str = lpRCstr4096[i-4096].str;
else if ((i >= 4352) && (i <= 4607))
str = lpRCstr4352[i-4352].str;
else if ((i >= 4608) && (i <= 5119))
str = lpRCstr4608[i-4608].str;
else if ((i >= 5120) && (i <= 5375))
str = lpRCstr5120[i-5120].str;
else if ((i >= 5376) && (i <= 5631))
str = lpRCstr5376[i-5376].str;
else if ((i >= 5632) && (i <= 5887))
str = lpRCstr5632[i-5632].str;
else if ((i >= 5888) && (i <= 6143))
str = lpRCstr5888[i-5888].str;
else if ((i >= 6144) && (i <= 7167))
str = lpRCstr6144[i-6144].str;
else
str = lpRCstr7168[i-7168].str;
return((wchar_t *)str);
}
void
plat_get_exe_name(wchar_t *bufp, int size)
{

1
src/win/win.h
View File

@@ -76,7 +76,6 @@ extern HWND hwndMain,
extern LCID lang_id;
extern DWORD filterindex;
extern int status_is_open;
extern const vidapi_t *vid_apis[];
/* VidApi initializers. */
extern const vidapi_t ddraw_vidapi;

16
src/win/win_ddraw.cpp
View File

@@ -8,7 +8,7 @@
*
* Rendering module for Microsoft DirectDraw 9.
*
* Version: @(#)win_ddraw.cpp 1.0.8 2018/05/07
* Version: @(#)win_ddraw.cpp 1.0.9 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -228,7 +228,7 @@ SavePNG(const wchar_t *fn, HBITMAP hBitmap)
fp = plat_fopen(fn, L"wb");
if (fp == NULL) {
pclog("[SavePNG] File %ls could not be opened for writing!\n", fn);
_swprintf(temp, plat_get_string(IDS_2088), fn);
_swprintf(temp, get_string(IDS_2088), fn);
ui_msgbox(MBX_ERROR, temp);
return;
}
@@ -238,7 +238,7 @@ SavePNG(const wchar_t *fn, HBITMAP hBitmap)
if (png_ptr == NULL) {
(void)fclose(fp);
pclog("[SavePNG] png_create_write_struct failed!\n");
_swprintf(temp, plat_get_string(IDS_2088), fn);
_swprintf(temp, get_string(IDS_2088), fn);
ui_msgbox(MBX_ERROR, temp);
return;
}
@@ -247,7 +247,7 @@ SavePNG(const wchar_t *fn, HBITMAP hBitmap)
if (png_info_ptr == NULL) {
(void)fclose(fp);
pclog("[SavePNG] png_create_info_struct failed!\n");
_swprintf(temp, plat_get_string(IDS_2088), fn);
_swprintf(temp, get_string(IDS_2088), fn);
ui_msgbox(MBX_ERROR, temp);
return;
}
@@ -267,7 +267,7 @@ SavePNG(const wchar_t *fn, HBITMAP hBitmap)
if ((pBuf = malloc(bmpInfo.bmiHeader.biSizeImage)) == NULL) {
(void)fclose(fp);
pclog("[SavePNG] Unable to allocate bitmap memory!\n");
_swprintf(temp, plat_get_string(IDS_2088), fn);
_swprintf(temp, get_string(IDS_2088), fn);
ui_msgbox(MBX_ERROR, temp);
return;
}
@@ -279,7 +279,7 @@ SavePNG(const wchar_t *fn, HBITMAP hBitmap)
(void)fclose(fp);
free(pBuf);
pclog("[SavePNG] Unable to allocate secondary bitmap memory!\n");
_swprintf(temp, plat_get_string(IDS_2088), fn);
_swprintf(temp, get_string(IDS_2088), fn);
ui_msgbox(MBX_ERROR, temp);
return;
}
@@ -308,7 +308,7 @@ SavePNG(const wchar_t *fn, HBITMAP hBitmap)
free(pBuf);
free(pBuf2);
pclog("[SavePNG] Unable to allocate RGB bitmap memory!\n");
_swprintf(temp, plat_get_string(IDS_2088), fn);
_swprintf(temp, get_string(IDS_2088), fn);
ui_msgbox(MBX_ERROR, temp);
return;
}
@@ -381,7 +381,7 @@ SaveBMP(const wchar_t *fn, HBITMAP hBitmap)
GetDIBits(hdc, hBitmap, 0, bmpInfo.bmiHeader.biHeight, pBuf, &bmpInfo, DIB_RGB_COLORS);
if ((fp = _wfopen(fn, L"wb")) == NULL) {
_swprintf(temp, plat_get_string(IDS_2088), fn);
_swprintf(temp, get_string(IDS_2088), fn);
ui_msgbox(MBX_ERROR, temp);
break;
}

16
src/win/win_dialog.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of server several dialogs.
*
* Version: @(#)win_dialog.c 1.0.8 2018/04/29
* Version: @(#)win_dialog.c 1.0.9 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -89,8 +89,8 @@ ui_msgbox(int flags, void *arg)
{
WCHAR temp[512];
DWORD fl = 0;
WCHAR *str = NULL;
WCHAR *cap = NULL;
const WCHAR *str = NULL;
const WCHAR *cap = NULL;
switch(flags & 0x1f) {
case MBX_INFO: /* just an informational message */
@@ -100,16 +100,16 @@ ui_msgbox(int flags, void *arg)
case MBX_WARNING: /* warning message */
fl = (MB_YESNO | MB_ICONWARNING);
cap = plat_get_string(IDS_2051); /* "Warning" */
cap = get_string(IDS_2051); /* "Warning" */
break;
case MBX_ERROR: /* error message */
if (flags & MBX_FATAL) {
fl = (MB_OK | MB_ICONERROR);
cap = plat_get_string(IDS_2049); /* "Fatal Error"*/
cap = get_string(IDS_2049); /* "Fatal Error"*/
} else {
fl = (MB_OK | MB_ICONWARNING);
cap = plat_get_string(IDS_2048); /* "Error" */
cap = get_string(IDS_2048); /* "Error" */
}
break;
@@ -120,7 +120,7 @@ ui_msgbox(int flags, void *arg)
case MBX_CONFIG: /* configuration */
fl = (MB_YESNO | MB_ICONERROR);
cap = plat_get_string(IDS_2050); /* "Configuration Error" */
cap = get_string(IDS_2050); /* "Configuration Error" */
break;
}
@@ -145,7 +145,7 @@ ui_msgbox(int flags, void *arg)
* that if the value of 'arg' is low, its an ID..
*/
if (((uintptr_t)arg) < ((uintptr_t)65636))
str = plat_get_string((intptr_t)arg);
str = get_string((intptr_t)arg);
}
/* At any rate, we do have a valid (wide) string now. */

10
src/win/win_new_floppy.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the New Floppy Image dialog.
*
* Version: @(#)win_new_floppy.c 1.0.13 2018/05/06
* Version: @(#)win_new_floppy.c 1.0.14 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -85,18 +85,18 @@ dlg_init(HWND hdlg)
zip_types = zip_drives[fdd_id].is_250 ? 2 : 1;
for (i = 0; i < zip_types; i++)
SendMessage(h, CB_ADDSTRING, 0,
(LPARAM)plat_get_string(IDS_5900 + i));
(LPARAM)get_string(IDS_5900 + i));
} else {
for (i = 0; i < 12; i++)
SendMessage(h, CB_ADDSTRING, 0,
(LPARAM)plat_get_string(IDS_5888 + i));
(LPARAM)get_string(IDS_5888 + i));
}
SendMessage(h, CB_SETCURSEL, 0, 0);
EnableWindow(h, FALSE);
h = GetDlgItem(hdlg, IDC_COMBO_RPM_MODE);
for (i = 0; i < 4; i++)
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_6144 + i));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_6144 + i));
SendMessage(h, CB_SETCURSEL, 0, 0);
EnableWindow(h, FALSE);
ShowWindow(h, SW_HIDE);
@@ -181,7 +181,7 @@ dlg_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
return TRUE;
case IDC_CFILE:
if (! dlg_file_ex(hdlg, plat_get_string(is_zip ? IDS_2176 : IDS_2174), NULL, temp_path, 1)) {
if (! dlg_file_ex(hdlg, get_string(is_zip ? IDS_2176 : IDS_2174), NULL, temp_path, 1)) {
if (! wcschr(temp_path, L'.')) {
if (wcslen(temp_path) && (wcslen(temp_path) <= 256)) {
twcs = &temp_path[wcslen(temp_path)];

4
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings.c 1.0.28 2018/05/06
* Version: @(#)win_settings.c 1.0.29 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -552,7 +552,7 @@ insert_categories(HWND hwndList)
lvI.stateMask = lvI.iSubItem = lvI.state = 0;
for (i=0; i<10; i++) {
lvI.pszText = plat_get_string(IDS_2065+i);
lvI.pszText = (LPTSTR)get_string(IDS_2065+i);
lvI.iItem = i;
lvI.iImage = i;

66
src/win/win_settings_disk.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_disk.h 1.0.7 2018/05/02
* Version: @(#)win_settings_disk.h 1.0.8 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -165,29 +165,29 @@ disk_add_locations(HWND hdlg)
h = GetDlgItem(hdlg, IDC_COMBO_HD_BUS);
for (i = 0; i < 6; i++)
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_4352 + i));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_4352 + i));
h = GetDlgItem(hdlg, IDC_COMBO_HD_CHANNEL);
for (i = 0; i < 8; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4097), i >> 1, i & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4097), i >> 1, i & 1);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
h = GetDlgItem(hdlg, IDC_COMBO_HD_ID);
for (i = 0; i < 16; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), i);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), i);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
h = GetDlgItem(hdlg, IDC_COMBO_HD_LUN);
for (i = 0; i < 8; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), i);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), i);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
h = GetDlgItem(hdlg, IDC_COMBO_HD_CHANNEL_IDE);
for (i = 0; i < 8; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4097), i >> 1, i & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4097), i >> 1, i & 1);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
}
@@ -464,27 +464,27 @@ disk_update_item(HWND hwndList, int i, int column)
if (column == 0) {
switch(temp_hdd[i].bus) {
case HDD_BUS_ST506:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4608), temp_hdd[i].id.st506_channel >> 1, temp_hdd[i].id.st506_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4608), temp_hdd[i].id.st506_channel >> 1, temp_hdd[i].id.st506_channel & 1);
break;
case HDD_BUS_ESDI:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4609), temp_hdd[i].id.esdi_channel >> 1, temp_hdd[i].id.esdi_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4609), temp_hdd[i].id.esdi_channel >> 1, temp_hdd[i].id.esdi_channel & 1);
break;
case HDD_BUS_IDE_PIO_ONLY:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4610), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4610), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
break;
case HDD_BUS_IDE_PIO_AND_DMA:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4611), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4611), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
break;
case HDD_BUS_SCSI:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4612), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
swprintf(temp, sizeof_w(temp), get_string(IDS_4612), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
break;
case HDD_BUS_SCSI_REMOVABLE:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4613), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
swprintf(temp, sizeof_w(temp), get_string(IDS_4613), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
break;
}
@@ -494,19 +494,19 @@ disk_update_item(HWND hwndList, int i, int column)
lvI.pszText = temp_hdd[i].fn;
lvI.iImage = 0;
} else if (column == 2) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), temp_hdd[i].tracks);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), temp_hdd[i].tracks);
lvI.pszText = temp;
lvI.iImage = 0;
} else if (column == 3) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), temp_hdd[i].hpc);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), temp_hdd[i].hpc);
lvI.pszText = temp;
lvI.iImage = 0;
} else if (column == 4) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), temp_hdd[i].spt);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), temp_hdd[i].spt);
lvI.pszText = temp;
lvI.iImage = 0;
} else if (column == 5) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11);
lvI.pszText = temp;
lvI.iImage = 0;
}
@@ -547,27 +547,27 @@ disk_recalc_list(HWND hwndList)
switch(temp_hdd[i].bus) {
case HDD_BUS_ST506:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4608), temp_hdd[i].id.st506_channel >> 1, temp_hdd[i].id.st506_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4608), temp_hdd[i].id.st506_channel >> 1, temp_hdd[i].id.st506_channel & 1);
break;
case HDD_BUS_ESDI:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4609), temp_hdd[i].id.esdi_channel >> 1, temp_hdd[i].id.esdi_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4609), temp_hdd[i].id.esdi_channel >> 1, temp_hdd[i].id.esdi_channel & 1);
break;
case HDD_BUS_IDE_PIO_ONLY:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4610), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4610), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
break;
case HDD_BUS_IDE_PIO_AND_DMA:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4611), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4611), temp_hdd[i].id.ide_channel >> 1, temp_hdd[i].id.ide_channel & 1);
break;
case HDD_BUS_SCSI:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4612), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
swprintf(temp, sizeof_w(temp), get_string(IDS_4612), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
break;
case HDD_BUS_SCSI_REMOVABLE:
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4613), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
swprintf(temp, sizeof_w(temp), get_string(IDS_4613), temp_hdd[i].id.scsi.id, temp_hdd[i].id.scsi.lun);
break;
}
@@ -583,28 +583,28 @@ disk_recalc_list(HWND hwndList)
if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE;
lvI.iSubItem = 2;
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), temp_hdd[i].tracks);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), temp_hdd[i].tracks);
lvI.pszText = temp;
lvI.iItem = j;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE;
lvI.iSubItem = 3;
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), temp_hdd[i].hpc);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), temp_hdd[i].hpc);
lvI.pszText = temp;
lvI.iItem = j;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE;
lvI.iSubItem = 4;
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), temp_hdd[i].spt);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), temp_hdd[i].spt);
lvI.pszText = temp;
lvI.iItem = j;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE;
lvI.iSubItem = 5;
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11);
lvI.pszText = temp;
lvI.iItem = j;
lvI.iImage = 0;
@@ -631,7 +631,7 @@ disk_init_columns(HWND hwndList)
lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
lvc.iSubItem = iCol;
lvc.pszText = plat_get_string(2082 + iCol);
lvc.pszText = (LPTSTR)get_string(2082 + iCol);
switch(iCol) {
case 0: /* Bus */
@@ -699,7 +699,7 @@ set_edit_box_contents(HWND hdlg, int id, uint64_t val)
HWND h;
h = GetDlgItem(hdlg, id);
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2156), val);
swprintf(temp, sizeof_w(temp), get_string(IDS_2156), val);
SendMessage(h, WM_SETTEXT, (WPARAM)wcslen(temp), (LPARAM)temp);
}
@@ -720,7 +720,7 @@ disk_initialize_hdt(HWND hdlg)
temp_size = hdd_table[i].cyls * hdd_table[i].head * hdd_table[i].sect;
size_mb = temp_size >> 11;
swprintf(temp, sizeof_w(temp),
plat_get_string(IDS_2157),
get_string(IDS_2157),
size_mb, hdd_table[i].cyls,
hdd_table[i].head, hdd_table[i].sect);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
@@ -728,8 +728,8 @@ disk_initialize_hdt(HWND hdlg)
selection = i;
}
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_4100));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_4101));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_4100));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_4101));
SendMessage(h, CB_SETCURSEL, selection & 0xffff, 0);
return selection;
@@ -791,7 +791,7 @@ disk_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
hdd_ptr = &(temp_hdd[next_free_id]);
}
SetWindowText(hdlg, plat_get_string((existing & 1) ? IDS_4103 : IDS_4102));
SetWindowText(hdlg, get_string((existing & 1) ? IDS_4103 : IDS_4102));
no_update = 1;
spt = (existing & 1) ? 0 : 17;
@@ -1065,7 +1065,7 @@ hd_add_ok_common:
return TRUE;
case IDC_CFILE:
if (! dlg_file_ex(hdlg, plat_get_string(IDS_4106), NULL, temp_path, !(existing & 1))) {
if (! dlg_file_ex(hdlg, get_string(IDS_4106), NULL, temp_path, !(existing & 1))) {
if (! wcschr(temp_path, L'.')) {
if (wcslen(temp_path) && (wcslen(temp_path) <= 256)) {
twcs = &temp_path[wcslen(temp_path)];

22
src/win/win_settings_floppy.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_floppy.h 1.0.4 2018/05/03
* Version: @(#)win_settings_floppy.h 1.0.5 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -85,7 +85,7 @@ floppy_recalc_list(HWND hwndList)
mbstowcs(temp, tempA, sizeof_w(temp));
lvI.pszText = temp;
} else {
lvI.pszText = plat_get_string(IDS_5376);
lvI.pszText = (LPTSTR)get_string(IDS_5376);
}
lvI.iItem = i;
lvI.iImage = temp_fdd_types[i];
@@ -93,14 +93,14 @@ floppy_recalc_list(HWND hwndList)
return FALSE;
lvI.iSubItem = 1;
lvI.pszText = plat_get_string(temp_fdd_turbo[i] ? IDS_2060 : IDS_2061);
lvI.pszText = (LPTSTR)get_string(temp_fdd_turbo[i] ? IDS_2060 : IDS_2061);
lvI.iItem = i;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1)
return FALSE;
lvI.iSubItem = 2;
lvI.pszText = plat_get_string(temp_fdd_check_bpb[i] ? IDS_2060 : IDS_2061);
lvI.pszText = (LPTSTR)get_string(temp_fdd_check_bpb[i] ? IDS_2060 : IDS_2061);
lvI.iItem = i;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1)
@@ -119,21 +119,21 @@ floppy_init_columns(HWND hwndList)
lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
lvc.iSubItem = 0;
lvc.pszText = plat_get_string(IDS_2143);
lvc.pszText = (LPTSTR)get_string(IDS_2143);
lvc.cx = 292;
lvc.fmt = LVCFMT_LEFT;
if (ListView_InsertColumn(hwndList, 0, &lvc) == -1)
return FALSE;
lvc.iSubItem = 1;
lvc.pszText = plat_get_string(IDS_2059);
lvc.pszText = (LPTSTR)get_string(IDS_2059);
lvc.cx = 50;
lvc.fmt = LVCFMT_LEFT;
if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
return FALSE;
lvc.iSubItem = 2;
lvc.pszText = plat_get_string(IDS_2170);
lvc.pszText = (LPTSTR)get_string(IDS_2170);
lvc.cx = 75;
lvc.fmt = LVCFMT_LEFT;
if (ListView_InsertColumn(hwndList, 2, &lvc) == -1)
@@ -179,21 +179,21 @@ floppy_update_item(HWND hwndList, int i)
mbstowcs(temp, tempA, sizeof_w(temp));
lvI.pszText = temp;
} else {
lvI.pszText = plat_get_string(IDS_5376);
lvI.pszText = (LPTSTR)get_string(IDS_5376);
}
lvI.iImage = temp_fdd_types[i];
if (ListView_SetItem(hwndList, &lvI) == -1)
return;
lvI.iSubItem = 1;
lvI.pszText = plat_get_string(temp_fdd_turbo[i] ? IDS_2060 : IDS_2061);
lvI.pszText = (LPTSTR)get_string(temp_fdd_turbo[i] ? IDS_2060 : IDS_2061);
lvI.iItem = i;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1)
return;
lvI.iSubItem = 2;
lvI.pszText = plat_get_string(temp_fdd_check_bpb[i] ? IDS_2060 : IDS_2061);
lvI.pszText = (LPTSTR)get_string(temp_fdd_check_bpb[i] ? IDS_2060 : IDS_2061);
lvI.iItem = i;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1)
@@ -226,7 +226,7 @@ floppy_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
h = GetDlgItem(hdlg, IDC_COMBO_FD_TYPE);
for (i = 0; i < 14; i++) {
if (i == 0) {
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_5376));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_5376));
} else {
mbstowcs(temp, fdd_getname(i), sizeof_w(temp));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);

10
src/win/win_settings_machine.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_machine.h 1.0.5 2018/05/02
* Version: @(#)win_settings_machine.h 1.0.6 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -178,11 +178,11 @@ machine_recalc_machine(HWND hdlg)
if (!(machines[romstomachine[rs]].flags & MACHINE_AT) || (machines[romstomachine[rs]].ram_granularity >= 128)) {
SendMessage(h, UDM_SETPOS, 0, temp_mem_size);
h = GetDlgItem(hdlg, IDC_TEXT_MB);
SendMessage(h, WM_SETTEXT, 0, (LPARAM)plat_get_string(IDS_2094));
SendMessage(h, WM_SETTEXT, 0, (LPARAM)get_string(IDS_2094));
} else {
SendMessage(h, UDM_SETPOS, 0, temp_mem_size / 1024);
h = GetDlgItem(hdlg, IDC_TEXT_MB);
SendMessage(h, WM_SETTEXT, 0, (LPARAM)plat_get_string(IDS_2087));
SendMessage(h, WM_SETTEXT, 0, (LPARAM)get_string(IDS_2087));
}
}
@@ -223,10 +223,10 @@ machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
SendMessage(h, CB_SETCURSEL, machinetolist[temp_machine], 0);
h = GetDlgItem(hdlg, IDC_COMBO_WS);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2131));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2131));
for (c = 0; c < 8; c++) {
swprintf(temp, sizeof_w(temp), plat_get_string(2132), c);
swprintf(temp, sizeof_w(temp), get_string(2132), c);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}

12
src/win/win_settings_periph.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_periph.h 1.0.7 2018/05/04
* Version: @(#)win_settings_periph.h 1.0.8 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -150,7 +150,7 @@ peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
if (device_is_valid(dev, machines[temp_machine].flags)) {
if (c == 0) {
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2152));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2152));
} else {
mbstowcs(temp, stransi, sizeof_w(temp));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
@@ -180,9 +180,9 @@ peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
recalc_hdc_list(hdlg, temp_machine, 0);
h = GetDlgItem(hdlg, IDC_COMBO_IDE_TER);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_5376));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_5376));
for (c = 0; c < 11; c++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2155), valid_ide_irqs[c]);
swprintf(temp, sizeof_w(temp), get_string(IDS_2155), valid_ide_irqs[c]);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
if (temp_ide_ter)
@@ -191,9 +191,9 @@ peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
SendMessage(h, CB_SETCURSEL, 0, 0);
h = GetDlgItem(hdlg, IDC_COMBO_IDE_QUA);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_5376));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_5376));
for (c = 0; c < 11; c++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2155), valid_ide_irqs[c]);
swprintf(temp, sizeof_w(temp), get_string(IDS_2155), valid_ide_irqs[c]);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
if (temp_ide_qua)

66
src/win/win_settings_remov.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the "Removable Devices" dialog.
*
* Version: @(#)win_settings_remov.h 1.0.5 2018/05/02
* Version: @(#)win_settings_remov.h 1.0.6 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -117,24 +117,24 @@ cdrom_recalc_list(HWND hwndList)
switch (temp_cdrom_drives[i].bus_type) {
case CDROM_BUS_DISABLED:
default:
lvI.pszText = plat_get_string(fsid);
lvI.pszText = (LPTSTR)get_string(fsid);
lvI.iImage = 0;
break;
case CDROM_BUS_ATAPI_PIO_ONLY:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case CDROM_BUS_ATAPI_PIO_AND_DMA:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case CDROM_BUS_SCSI:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_cdrom_drives[i].scsi_device_id, temp_cdrom_drives[i].scsi_device_lun);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_cdrom_drives[i].scsi_device_id, temp_cdrom_drives[i].scsi_device_lun);
lvI.pszText = temp;
lvI.iImage = 1;
break;
@@ -145,7 +145,7 @@ cdrom_recalc_list(HWND hwndList)
lvI.iSubItem = 1;
if (temp_cdrom_drives[i].bus_type == CDROM_BUS_DISABLED) {
lvI.pszText = plat_get_string(IDS_2152);
lvI.pszText = (LPTSTR)get_string(IDS_2152);
} else {
wsprintf(temp, L"%ix",
cdrom_speeds[temp_cdrom_drives[i].speed_idx].speed);
@@ -169,14 +169,14 @@ cdrom_init_columns(HWND hwndList)
lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
lvc.iSubItem = 0;
lvc.pszText = plat_get_string(IDS_2082);
lvc.pszText = (LPTSTR)get_string(IDS_2082);
lvc.cx = 342;
lvc.fmt = LVCFMT_LEFT;
if (ListView_InsertColumn(hwndList, 0, &lvc) == -1)
return FALSE;
lvc.iSubItem = 1;
lvc.pszText = plat_get_string(IDS_2179);
lvc.pszText = (LPTSTR)get_string(IDS_2179);
lvc.cx = 50;
lvc.fmt = LVCFMT_LEFT;
if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
@@ -222,24 +222,24 @@ cdrom_update_item(HWND hwndList, int i)
switch (temp_cdrom_drives[i].bus_type) {
case CDROM_BUS_DISABLED:
default:
lvI.pszText = plat_get_string(fsid);
lvI.pszText = (LPTSTR)get_string(fsid);
lvI.iImage = 0;
break;
case CDROM_BUS_ATAPI_PIO_ONLY:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case CDROM_BUS_ATAPI_PIO_AND_DMA:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case CDROM_BUS_SCSI:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_cdrom_drives[i].scsi_device_id, temp_cdrom_drives[i].scsi_device_lun);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_cdrom_drives[i].scsi_device_id, temp_cdrom_drives[i].scsi_device_lun);
lvI.pszText = temp;
lvI.iImage = 1;
break;
@@ -249,7 +249,7 @@ cdrom_update_item(HWND hwndList, int i)
lvI.iSubItem = 1;
if (temp_cdrom_drives[i].bus_type == CDROM_BUS_DISABLED) {
lvI.pszText = plat_get_string(IDS_2152);
lvI.pszText = (LPTSTR)get_string(IDS_2152);
} else {
wsprintf(temp, L"%ix",
cdrom_speeds[temp_cdrom_drives[i].speed_idx].speed);
@@ -272,7 +272,7 @@ cdrom_add_locations(HWND hdlg)
h = GetDlgItem(hdlg, IDC_COMBO_CD_BUS);
for (i = CDROM_BUS_DISABLED; i <= CDROM_BUS_SCSI; i++) {
if ((i == CDROM_BUS_DISABLED) || (i >= CDROM_BUS_ATAPI_PIO_ONLY)) {
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(combo_to_string(i)));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(combo_to_string(i)));
}
}
@@ -285,19 +285,19 @@ cdrom_add_locations(HWND hdlg)
h = GetDlgItem(hdlg, IDC_COMBO_CD_ID);
for (i = 0; i < 16; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), i);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), i);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
h = GetDlgItem(hdlg, IDC_COMBO_CD_LUN);
for (i = 0; i < 8; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), i);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), i);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
h = GetDlgItem(hdlg, IDC_COMBO_CD_CHANNEL_IDE);
for (i = 0; i < 8; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4097), i >> 1, i & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4097), i >> 1, i & 1);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
}
@@ -464,24 +464,24 @@ zip_recalc_list(HWND hwndList)
switch (temp_zip_drives[i].bus_type) {
case ZIP_BUS_DISABLED:
default:
lvI.pszText = plat_get_string(fsid);
lvI.pszText = (LPTSTR)get_string(fsid);
lvI.iImage = 0;
break;
case ZIP_BUS_ATAPI_PIO_ONLY:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case ZIP_BUS_ATAPI_PIO_AND_DMA:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case ZIP_BUS_SCSI:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_zip_drives[i].scsi_device_id, temp_zip_drives[i].scsi_device_lun);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_zip_drives[i].scsi_device_id, temp_zip_drives[i].scsi_device_lun);
lvI.pszText = temp;
lvI.iImage = 1;
break;
@@ -491,7 +491,7 @@ zip_recalc_list(HWND hwndList)
return FALSE;
lvI.iSubItem = 1;
lvI.pszText = plat_get_string(temp_zip_drives[i].is_250 ? IDS_5901 : IDS_5900);
lvI.pszText = (LPTSTR)get_string(temp_zip_drives[i].is_250 ? IDS_5901 : IDS_5900);
lvI.iItem = i;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1)
@@ -510,14 +510,14 @@ zip_init_columns(HWND hwndList)
lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
lvc.iSubItem = 0;
lvc.pszText = plat_get_string(IDS_2082);
lvc.pszText = (LPTSTR)get_string(IDS_2082);
lvc.cx = 342;
lvc.fmt = LVCFMT_LEFT;
if (ListView_InsertColumn(hwndList, 0, &lvc) == -1)
return FALSE;
lvc.iSubItem = 1;
lvc.pszText = plat_get_string(IDS_2143);
lvc.pszText = (LPTSTR)get_string(IDS_2143);
lvc.cx = 50;
lvc.fmt = LVCFMT_LEFT;
if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
@@ -563,24 +563,24 @@ zip_update_item(HWND hwndList, int i)
switch (temp_zip_drives[i].bus_type) {
case ZIP_BUS_DISABLED:
default:
lvI.pszText = plat_get_string(fsid);
lvI.pszText = (LPTSTR)get_string(fsid);
lvI.iImage = 0;
break;
case ZIP_BUS_ATAPI_PIO_ONLY:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case ZIP_BUS_ATAPI_PIO_AND_DMA:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
lvI.pszText = temp;
lvI.iImage = 1;
break;
case ZIP_BUS_SCSI:
swprintf(temp, sizeof_w(temp), plat_get_string(fsid), temp_zip_drives[i].scsi_device_id, temp_zip_drives[i].scsi_device_lun);
swprintf(temp, sizeof_w(temp), get_string(fsid), temp_zip_drives[i].scsi_device_id, temp_zip_drives[i].scsi_device_lun);
lvI.pszText = temp;
lvI.iImage = 1;
break;
@@ -589,7 +589,7 @@ zip_update_item(HWND hwndList, int i)
return;
lvI.iSubItem = 1;
lvI.pszText = plat_get_string(temp_zip_drives[i].is_250 ? IDS_5901 : IDS_5900);
lvI.pszText = (LPTSTR)get_string(temp_zip_drives[i].is_250 ? IDS_5901 : IDS_5900);
lvI.iItem = i;
lvI.iImage = 0;
if (ListView_SetItem(hwndList, &lvI) == -1)
@@ -607,25 +607,25 @@ zip_add_locations(HWND hdlg)
h = GetDlgItem(hdlg, IDC_COMBO_ZIP_BUS);
for (i = ZIP_BUS_DISABLED; i <= ZIP_BUS_SCSI; i++) {
if ((i == ZIP_BUS_DISABLED) || (i >= ZIP_BUS_ATAPI_PIO_ONLY)) {
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(combo_to_string(i)));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(combo_to_string(i)));
}
}
h = GetDlgItem(hdlg, IDC_COMBO_ZIP_ID);
for (i = 0; i < 16; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), i);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), i);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
h = GetDlgItem(hdlg, IDC_COMBO_ZIP_LUN);
for (i = 0; i < 8; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4098), i);
swprintf(temp, sizeof_w(temp), get_string(IDS_4098), i);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
h = GetDlgItem(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE);
for (i = 0; i < 8; i++) {
swprintf(temp, sizeof_w(temp), plat_get_string(IDS_4097), i >> 1, i & 1);
swprintf(temp, sizeof_w(temp), get_string(IDS_4097), i >> 1, i & 1);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
}

16
src/win/win_settings_video.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_video.h 1.0.4 2018/05/02
* Version: @(#)win_settings_video.h 1.0.5 2018/05/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -109,13 +109,13 @@ video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
recalc_vid_list(hdlg);
h = GetDlgItem(hdlg, IDC_COMBO_VIDEO_SPEED);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2131));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2133));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2134));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2135));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2136));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2137));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2138));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2131));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2133));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2134));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2135));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2136));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2137));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)get_string(IDS_2138));
SendMessage(h, CB_SETCURSEL, temp_video_speed+1, 0);
h = GetDlgItem(hdlg, IDC_CHECK_VOODOO);

11
src/win/win_ui.c
View File

@@ -662,8 +662,7 @@ again:
* Inform the user, and ask if they want to reset
* to the system default one instead.
*/
_swprintf(title, plat_get_string(IDS_2095),
vidapi_internal_name(vid_api));
_swprintf(title, get_string(IDS_2095), vidapi_internal_name(vid_api));
if (ui_msgbox(MBX_CONFIG, title) != 0) {
/* Nope, they don't, so just exit. */
return(5);
@@ -797,7 +796,7 @@ ui_menu_update(void)
/* Update the application's title bar. */
wchar_t *
ui_window_title(wchar_t *s)
ui_window_title(const wchar_t *s)
{
if (! vid_fullscreen) {
if (s != NULL)
@@ -811,7 +810,7 @@ ui_window_title(wchar_t *s)
s = wTitle;
}
return(s);
return((wchar_t *)s);
}
@@ -868,7 +867,7 @@ plat_setfullscreen(int on)
plat_startblit();
video_wait_for_blit();
// win_mouse_close();
win_mouse_close();
/* Close the current mode, and open the new one. */
plat_vidapis[vid_api]->close();
@@ -879,7 +878,7 @@ plat_setfullscreen(int on)
wx_set_fullscreen(on);
#endif
// win_mouse_init();
win_mouse_init();
/* Release video and make it redraw the screen. */
plat_endblit();