ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

...

This commit is contained in:
owomomo 2019-06-29 10:28:24 +08:00
parent 7dde5467fd
commit 5d443badea
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/win/directories.cpp
View File

@ -89,7 +89,7 @@ void CloseDirectoriesDialog(HWND hwndDlg)
} }
///Callback function for the directories configuration dialog. ///Callback function for the directories configuration dialog.
static BOOL CALLBACK DirConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK DirConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {

2
src/drivers/win/guiconfig.cpp
View File

@ -107,7 +107,7 @@ void CloseGuiDialog(HWND hwndDlg)
/** /**
* Message loop of the GUI configuration dialog. * Message loop of the GUI configuration dialog.
**/ **/
BOOL CALLBACK GUIConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK GUIConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {

4
src/drivers/win/mapinput.cpp
View File

@ -332,7 +332,7 @@ char* GetKeyComboName(int c)
} }
//Callback function for the dialog where the user can change hotkeys. //Callback function for the dialog where the user can change hotkeys.
BOOL CALLBACK ChangeInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK ChangeInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
static HANDLE hThread = NULL; static HANDLE hThread = NULL;
static DWORD dwThreadId = 0; static DWORD dwThreadId = 0;
@ -702,7 +702,7 @@ void ApplyDefaultCommandMapping()
/** /**
* Callback function of the Map Input dialog * Callback function of the Map Input dialog
**/ **/
BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {

2
src/drivers/win/palette.cpp
View File

@ -69,7 +69,7 @@ int LoadPaletteFile()
/** /**
* Callback function for the palette configuration dialog. * Callback function for the palette configuration dialog.
**/ **/
BOOL CALLBACK PaletteConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK PaletteConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
char text[40]; char text[40];
switch(uMsg) switch(uMsg)

6
src/drivers/win/replay.cpp
View File

@ -323,7 +323,7 @@ void AbsoluteToRelative(char *const dst, const char *const dir, const char *cons
} }
BOOL CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
RECT wrect; RECT wrect;
switch(uMsg) switch(uMsg)
@ -502,7 +502,7 @@ void HandleScan(HWND hwndDlg, FCEUFILE* file, int& i)
SendDlgItemMessage(hwndDlg, IDC_COMBO_FILENAME, CB_INSERTSTRING, i++, (LPARAM)relative); SendDlgItemMessage(hwndDlg, IDC_COMBO_FILENAME, CB_INSERTSTRING, i++, (LPARAM)relative);
} }
BOOL CALLBACK ReplayDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK ReplayDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {
@ -841,7 +841,7 @@ static void UpdateRecordDialogPath(HWND hwndDlg, const std::string &fname)
} }
} }
static BOOL CALLBACK RecordDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK RecordDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
static struct CreateMovieParameters* p = NULL; static struct CreateMovieParameters* p = NULL;

2
src/drivers/win/timing.cpp
View File

@ -71,7 +71,7 @@ void CloseTimingDialog(HWND hwndDlg)
/** /**
* Callback function of the Timing configuration dialog. * Callback function of the Timing configuration dialog.
**/ **/
BOOL CALLBACK TimingConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK TimingConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {

12
src/drivers/win/window.cpp
View File

@ -118,7 +118,7 @@ extern bool turbo;
extern bool movie_readonly; extern bool movie_readonly;
extern bool AutoSS; //flag for whether an auto-save has been made extern bool AutoSS; //flag for whether an auto-save has been made
extern int newppu; extern int newppu;
extern BOOL CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); //Metadata dialog extern INT_PTR CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); //Metadata dialog
extern bool CheckFileExists(const char* filename); //Receives a filename (fullpath) and checks to see if that file exists extern bool CheckFileExists(const char* filename); //Receives a filename (fullpath) and checks to see if that file exists
extern bool oldInputDisplay; extern bool oldInputDisplay;
extern int RAMInitOption; extern int RAMInitOption;
@ -1037,7 +1037,7 @@ void HideFWindow(int h)
SetWindowPos(hAppWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOREPOSITION | SWP_NOSIZE); SetWindowPos(hAppWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOREPOSITION | SWP_NOSIZE);
} }
SetWindowLong(hAppWnd, GWL_STYLE, desa | ( GetWindowLong(hAppWnd, GWL_STYLE) & WS_VISIBLE )); SetWindowLongPtr(hAppWnd, GWL_STYLE, desa | ( GetWindowLong(hAppWnd, GWL_STYLE) & WS_VISIBLE ));
SetWindowPos(hAppWnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER); SetWindowPos(hAppWnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER);
} }
@ -1877,7 +1877,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
case ID_FILE_OPENLUAWINDOW: case ID_FILE_OPENLUAWINDOW:
if (!LuaConsoleHWnd) if (!LuaConsoleHWnd)
{ {
LuaConsoleHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_LUA), hWnd, (DLGPROC) DlgLuaScriptDialog); LuaConsoleHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_LUA), hWnd, DlgLuaScriptDialog);
} else } else
{ {
ShowWindow(LuaConsoleHWnd, SW_SHOWNORMAL); ShowWindow(LuaConsoleHWnd, SW_SHOWNORMAL);
@ -3168,14 +3168,14 @@ void OpenRamSearch()
if (GameInfo) if (GameInfo)
{ {
reset_address_info(); reset_address_info();
RamSearchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMSEARCH), MainhWnd, (DLGPROC)RamSearchProc); RamSearchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMSEARCH), MainhWnd, RamSearchProc);
} }
} }
void OpenRamWatch() void OpenRamWatch()
{ {
if (GameInfo) if (GameInfo)
RamWatchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMWATCH), MainhWnd, (DLGPROC) RamWatchProc); RamWatchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMWATCH), MainhWnd, RamWatchProc);
} }
void SaveSnapshotAs() void SaveSnapshotAs()
@ -3265,7 +3265,7 @@ POINT CalcSubWindowPos(HWND hDlg, POINT* conf)
LRESULT APIENTRY FilterEditCtrlProc(HWND hwnd, UINT msg, WPARAM wP, LPARAM lP) LRESULT APIENTRY FilterEditCtrlProc(HWND hwnd, UINT msg, WPARAM wP, LPARAM lP)
{ {
bool through = true; bool through = true;
LRESULT result = 0; INT_PTR result = 0;
switch (msg) switch (msg)
{ {