mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some msdev warnings

Browse Source
This commit is contained in:
Stanislav Shwartsman 2013-11-10 17:36:13 +00:00
parent 2756931a40
commit f66a49a570
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/gui/siminterface.h
View File

@ -445,7 +445,7 @@ typedef struct {
// a type and a spot for a return code (only used for synchronous events).
typedef struct {
BxEventType type; // what kind is this?
Bit32s retcode; // sucess or failure. only used for synchronous events.
Bit32s retcode; // success or failure. only used for synchronous events.
union {
BxKeyEvent key;
BxMouseEvent mouse;

10
bochs/gui/win32dialog.cc
View File

@ -725,25 +725,25 @@ static BOOL CALLBACK MainMenuDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
void LogAskDialog(BxEvent *event)
{
event->retcode = DialogBoxParam(NULL, MAKEINTRESOURCE(ASK_DLG), GetBochsWindow(),
event->retcode = (Bit32s) DialogBoxParam(NULL, MAKEINTRESOURCE(ASK_DLG), GetBochsWindow(),
(DLGPROC)LogAskProc, (LPARAM)event);
}
int AskString(bx_param_string_c *param)
{
return DialogBoxParam(NULL, MAKEINTRESOURCE(STRING_DLG), GetBochsWindow(),
return (int) DialogBoxParam(NULL, MAKEINTRESOURCE(STRING_DLG), GetBochsWindow(),
(DLGPROC)StringParamProc, (LPARAM)param);
}
int FloppyDialog(bx_param_filename_c *param)
{
return DialogBoxParam(NULL, MAKEINTRESOURCE(FLOPPY_DLG), GetBochsWindow(),
return (int) DialogBoxParam(NULL, MAKEINTRESOURCE(FLOPPY_DLG), GetBochsWindow(),
(DLGPROC)FloppyDlgProc, (LPARAM)param);
}
int MainMenuDialog(HWND hwnd, bx_bool runtime)
{
return DialogBoxParam(NULL, MAKEINTRESOURCE(MAINMENU_DLG), hwnd,
return (int) DialogBoxParam(NULL, MAKEINTRESOURCE(MAINMENU_DLG), hwnd,
(DLGPROC)MainMenuDlgProc, (LPARAM)runtime);
}
@ -780,7 +780,7 @@ BxEvent* win32_notify_callback(void *unused, BxEvent *event)
}
} else if (param->get_type() == BXT_LIST) {
SIM->get_first_cdrom()->get_param_path(pname, BX_PATHNAME_LEN);
event->retcode = win32ParamDialog(GetBochsWindow(), pname);
event->retcode = (Bit32s) win32ParamDialog(GetBochsWindow(), pname);
return event;
} else if (param->get_type() == BXT_PARAM_BOOL) {
UINT flag = MB_YESNO | MB_SETFOREGROUND;

6
bochs/gui/win32paramdlg.cc
View File

@ -1049,13 +1049,11 @@ static INT_PTR CALLBACK ParamDlgProc(HWND Window, UINT AMessage, WPARAM wParam,
return 0;
}
int win32ParamDialog(HWND parent, const char *menu)
INT_PTR win32ParamDialog(HWND parent, const char *menu)
{
INT_PTR ret;
InitDlgFont();
RegisterScrollWindow(NULL);
ret = DialogBoxParam(NULL, MAKEINTRESOURCE(PARAM_DLG), parent, (DLGPROC)ParamDlgProc, (LPARAM)menu);
INT_PTR ret = DialogBoxParam(NULL, MAKEINTRESOURCE(PARAM_DLG), parent, (DLGPROC)ParamDlgProc, (LPARAM)menu);
DeleteObject(DlgFont);
return ret;
}

2
bochs/gui/win32paramdlg.h
View File

@ -26,7 +26,7 @@
#if BX_USE_TEXTCONFIG && defined(WIN32)
int AskFilename(HWND hwnd, bx_param_filename_c *param, char *buffer);
int win32ParamDialog(HWND parent, const char *menu);
INT_PTR win32ParamDialog(HWND parent, const char *menu);
#endif