DLGPROC return type is INT_PTR, not BOOL and not LRESULT. These are compatible return types in 32-bit but not 64-bit.
This commit is contained in:
parent
7047a998fa
commit
c33ab17da4
|
@ -198,7 +198,7 @@ INT_PTR CWin32InputBox::InputBoxEx(WIN32INPUTBOX_PARAM *param)
|
||||||
CWin32InputBox inputbox(param);
|
CWin32InputBox inputbox(param);
|
||||||
|
|
||||||
// Resize dialog and SHOW or HIDE multiline
|
// Resize dialog and SHOW or HIDE multiline
|
||||||
INT_PTR r = ::DialogBoxIndirectParam(param->hInstance, dlgTemplate, param->hwndOwner, (DLGPROC)DlgProc, (LPARAM)&inputbox);
|
INT_PTR r = ::DialogBoxIndirectParam(param->hInstance, dlgTemplate, param->hwndOwner, DlgProc, (LPARAM)&inputbox);
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
@ -310,7 +310,7 @@ void CWin32InputBox::InitDialog()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Message handler for about box.
|
// Message handler for about box.
|
||||||
LRESULT CALLBACK CWin32InputBox::DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK CWin32InputBox::DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
CWin32InputBox *_this = (CWin32InputBox *) ::GetWindowLong(hDlg, GWL_USERDATA);
|
CWin32InputBox *_this = (CWin32InputBox *) ::GetWindowLong(hDlg, GWL_USERDATA);
|
||||||
WIN32INPUTBOX_PARAM *param = _this ? _this->GetParam() : 0;
|
WIN32INPUTBOX_PARAM *param = _this ? _this->GetParam() : 0;
|
||||||
|
|
|
@ -73,7 +73,7 @@ class CWin32InputBox
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
WIN32INPUTBOX_PARAM *_param;
|
WIN32INPUTBOX_PARAM *_param;
|
||||||
static LRESULT CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM);
|
static INT_PTR CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM);
|
||||||
HWND _hwndEditCtrl;
|
HWND _hwndEditCtrl;
|
||||||
|
|
||||||
void InitDialog();
|
void InitDialog();
|
||||||
|
|
|
@ -275,7 +275,7 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static BOOL CALLBACK ArchiveFileSelectorCallback(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static INT_PTR CALLBACK ArchiveFileSelectorCallback(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -60,7 +60,7 @@ bool autoloadCDL = true;
|
||||||
bool autoresumeCDLogging = false;
|
bool autoresumeCDLogging = false;
|
||||||
char loadedcdfile[2048] = {0};
|
char loadedcdfile[2048] = {0};
|
||||||
|
|
||||||
BOOL CALLBACK CDLoggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK CDLoggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -267,7 +267,7 @@ static void UpdateDialog(HWND hwndDlg) {
|
||||||
//CheckDlgButton(hwndDlg,IDC_ADDBP_MEM_SPR,BST_UNCHECKED);
|
//CheckDlgButton(hwndDlg,IDC_ADDBP_MEM_SPR,BST_UNCHECKED);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK AddbpCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK AddbpCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
char str[8] = {0};
|
char str[8] = {0};
|
||||||
int tmp;
|
int tmp;
|
||||||
|
@ -1224,7 +1224,7 @@ int AddAsmHistory(HWND hwndDlg, int id, char *str) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK AssemblerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
INT_PTR CALLBACK AssemblerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
||||||
int romaddr,count,i,j;
|
int romaddr,count,i,j;
|
||||||
char str[128],*dasm;
|
char str[128],*dasm;
|
||||||
static int patchlen,applied,saved,lastundo;
|
static int patchlen,applied,saved,lastundo;
|
||||||
|
@ -1358,7 +1358,7 @@ BOOL CALLBACK AssemblerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK PatcherCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
INT_PTR CALLBACK PatcherCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
||||||
char str[64]; //mbg merge 7/18/06 changed from unsigned char
|
char str[64]; //mbg merge 7/18/06 changed from unsigned char
|
||||||
uint8 *c;
|
uint8 *c;
|
||||||
int i;
|
int i;
|
||||||
|
@ -1756,7 +1756,7 @@ BOOL CALLBACK IDC_DEBUGGER_DISASSEMBLY_WndProc(HWND hwndDlg, UINT uMsg, WPARAM w
|
||||||
return CallWindowProc(IDC_DEBUGGER_DISASSEMBLY_oldWndProc, hwndDlg, uMsg, wParam, lParam);
|
return CallWindowProc(IDC_DEBUGGER_DISASSEMBLY_oldWndProc, hwndDlg, uMsg, wParam, lParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
RECT wrect;
|
RECT wrect;
|
||||||
char str[256] = {0};
|
char str[256] = {0};
|
||||||
|
|
|
@ -62,7 +62,7 @@ int debuggerWasActive = 0;
|
||||||
char temp_chr[40] = {0};
|
char temp_chr[40] = {0};
|
||||||
char delimiterChar[2] = "#";
|
char delimiterChar[2] = "#";
|
||||||
|
|
||||||
extern BOOL CALLBACK nameBookmarkCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
extern INT_PTR CALLBACK nameBookmarkCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
extern char bookmarkDescription[];
|
extern char bookmarkDescription[];
|
||||||
|
|
||||||
MemoryMappedRegister RegNames[] = {
|
MemoryMappedRegister RegNames[] = {
|
||||||
|
@ -919,7 +919,7 @@ void GoToDebuggerBookmark(HWND hwnd)
|
||||||
Disassemble(hwnd, IDC_DEBUGGER_DISASSEMBLY, IDC_DEBUGGER_DISASSEMBLY_VSCR, n);
|
Disassemble(hwnd, IDC_DEBUGGER_DISASSEMBLY, IDC_DEBUGGER_DISASSEMBLY_VSCR, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK SymbolicNamingCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK SymbolicNamingCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -842,7 +842,7 @@ static const uint8 *DWBText;
|
||||||
|
|
||||||
static HWND die;
|
static HWND die;
|
||||||
|
|
||||||
static BOOL CALLBACK DWBCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static INT_PTR CALLBACK DWBCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
|
|
||||||
switch(uMsg) {
|
switch(uMsg) {
|
||||||
|
@ -1060,7 +1060,7 @@ static const char *DoTBTitle=0;
|
||||||
static int DoTBMax=0;
|
static int DoTBMax=0;
|
||||||
static int DoTBType=0,DoTBPort=0;
|
static int DoTBType=0,DoTBPort=0;
|
||||||
|
|
||||||
static BOOL CALLBACK DoTBCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static INT_PTR CALLBACK DoTBCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg) {
|
switch(uMsg) {
|
||||||
case WM_INITDIALOG:
|
case WM_INITDIALOG:
|
||||||
|
@ -1208,7 +1208,7 @@ static void UpdateFourscoreState(HWND dlg)
|
||||||
}
|
}
|
||||||
|
|
||||||
//Callback function of the input configuration dialog.
|
//Callback function of the input configuration dialog.
|
||||||
BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -73,7 +73,7 @@ void RedoText(void)
|
||||||
/**
|
/**
|
||||||
* Callback function for the log window.
|
* Callback function for the log window.
|
||||||
**/
|
**/
|
||||||
BOOL CALLBACK LogCon(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK LogCon(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
RECT wrect; //For remembering window position
|
RECT wrect; //For remembering window position
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -142,7 +142,7 @@ int GetHexScreenCoordy(int offset);
|
||||||
int GetAddyFromCoord(int x,int y);
|
int GetAddyFromCoord(int x,int y);
|
||||||
void AutoScrollFromCoord(int x,int y);
|
void AutoScrollFromCoord(int x,int y);
|
||||||
LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
|
LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||||
BOOL CALLBACK MemFindCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK MemFindCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
void FindNext();
|
void FindNext();
|
||||||
void OpenFindDialog();
|
void OpenFindDialog();
|
||||||
static int GetFileData(uint32 offset);
|
static int GetFileData(uint32 offset);
|
||||||
|
@ -2218,7 +2218,7 @@ void DoMemView()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK MemFindCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
INT_PTR CALLBACK MemFindCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
||||||
|
|
||||||
switch(uMsg) {
|
switch(uMsg) {
|
||||||
case WM_INITDIALOG:
|
case WM_INITDIALOG:
|
||||||
|
|
|
@ -57,7 +57,7 @@ char bookmarkDescription[51] = {0};
|
||||||
BOOL CenterWindow(HWND hwndDlg);
|
BOOL CenterWindow(HWND hwndDlg);
|
||||||
|
|
||||||
/// Callback function for the name bookmark dialog
|
/// Callback function for the name bookmark dialog
|
||||||
BOOL CALLBACK nameBookmarkCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK nameBookmarkCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch (uMsg)
|
switch (uMsg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -697,7 +697,7 @@ void ClearAllText()
|
||||||
fileChanged = false;
|
fileChanged = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static INT_PTR CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
const int FMAX = 6;
|
const int FMAX = 6;
|
||||||
string formula[FMAX] = {"> than", "> by 1", "< than", "< by 1", "equal", "!equal"};
|
string formula[FMAX] = {"> than", "> by 1", "< than", "< by 1", "equal", "!equal"};
|
||||||
|
|
|
@ -219,7 +219,7 @@ unsigned int ruleBox_to_ruleInput(unsigned int ruleBox)
|
||||||
return ruleBox - RULE_BOX_1 + RULE_INPUT_1;
|
return ruleBox - RULE_BOX_1 + RULE_INPUT_1;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK MonitorCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK MonitorCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg) {
|
switch(uMsg) {
|
||||||
case WM_MOVE: {
|
case WM_MOVE: {
|
||||||
|
|
|
@ -53,7 +53,7 @@ void CloseMovieOptionsDialog(HWND hwndDlg)
|
||||||
/**
|
/**
|
||||||
* Callback function of the Timing configuration dialog.
|
* Callback function of the Timing configuration dialog.
|
||||||
**/
|
**/
|
||||||
BOOL CALLBACK MovieOptionsCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK MovieOptionsCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -393,7 +393,7 @@ CFGSTRUCT NetplayConfig[]={
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static BOOL CALLBACK NetCon(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static INT_PTR CALLBACK NetCon(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -435,7 +435,7 @@ void KillNTView() {
|
||||||
NTViewSkip=0;
|
NTViewSkip=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK NTViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
INT_PTR CALLBACK NTViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
||||||
RECT wrect;
|
RECT wrect;
|
||||||
char str[50];
|
char str[50];
|
||||||
int TileID, TileX, TileY, NameTable, PPUAddress, AttAddress, Attrib;
|
int TileID, TileX, TileY, NameTable, PPUAddress, AttAddress, Attrib;
|
||||||
|
|
|
@ -68,7 +68,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)
|
||||||
|
|
|
@ -364,7 +364,7 @@ void KillPPUView()
|
||||||
PPUViewSkip=0;
|
PPUViewSkip=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK PPUViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK PPUViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
RECT wrect;
|
RECT wrect;
|
||||||
char str[20];
|
char str[20];
|
||||||
|
|
|
@ -1101,15 +1101,15 @@ void ReopenRamWindows() //Reopen them when a new Rom is loaded
|
||||||
if(!RamSearchHWnd)
|
if(!RamSearchHWnd)
|
||||||
{
|
{
|
||||||
reset_address_info();
|
reset_address_info();
|
||||||
LRESULT CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
RamSearchHWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_RAMSEARCH), hWnd, (DLGPROC) RamSearchProc);
|
RamSearchHWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_RAMSEARCH), hWnd, RamSearchProc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (AutoRWLoad)
|
if (AutoRWLoad)
|
||||||
OpenRWRecentFile(0);
|
OpenRWRecentFile(0);
|
||||||
|
|
||||||
if (!RamWatchHWnd)
|
if (!RamWatchHWnd)
|
||||||
RamWatchHWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_RAMWATCH), hWnd, (DLGPROC) RamWatchProc);
|
RamWatchHWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_RAMWATCH), hWnd, RamWatchProc);
|
||||||
|
|
||||||
if (hwnd == hWnd && hwnd != GetActiveWindow())
|
if (hwnd == hWnd && hwnd != GetActiveWindow())
|
||||||
SetActiveWindow(hWnd); // restore focus to the main window if it had it before
|
SetActiveWindow(hWnd); // restore focus to the main window if it had it before
|
||||||
|
@ -1396,7 +1396,7 @@ static BOOL SelectingByKeyboard()
|
||||||
return (a | b | c | d) & 0x80;
|
return (a | b | c | d) & 0x80;
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
RECT r;
|
RECT r;
|
||||||
RECT r2;
|
RECT r2;
|
||||||
|
|
|
@ -29,7 +29,7 @@ void SetSearchType(int SearchType); //Set the search type
|
||||||
void DoRamSearchOperation(); //Perform a search
|
void DoRamSearchOperation(); //Perform a search
|
||||||
|
|
||||||
extern HWND RamSearchHWnd;
|
extern HWND RamSearchHWnd;
|
||||||
extern LRESULT CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
extern INT_PTR CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
// Too much work to do for resorting the values, and finding the biggest number
|
// Too much work to do for resorting the values, and finding the biggest number
|
||||||
// by sorting in ram list doesn't help too much in usually use, so I gave it up.
|
// by sorting in ram list doesn't help too much in usually use, so I gave it up.
|
||||||
|
|
|
@ -154,7 +154,7 @@ bool InsertWatch(const AddressWatcher& Watch, HWND parent)
|
||||||
|
|
||||||
rswatches[tmpWatchIndex] = Watch;
|
rswatches[tmpWatchIndex] = Watch;
|
||||||
rswatches[tmpWatchIndex].CurValue = GetCurrentValue(rswatches[tmpWatchIndex]);
|
rswatches[tmpWatchIndex].CurValue = GetCurrentValue(rswatches[tmpWatchIndex]);
|
||||||
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), parent, (DLGPROC)EditWatchProc, tmpWatchIndex);
|
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), parent, EditWatchProc, tmpWatchIndex);
|
||||||
rswatches.erase(tmpWatchIndex);
|
rswatches.erase(tmpWatchIndex);
|
||||||
|
|
||||||
return WatchCount > prevWatchCount;
|
return WatchCount > prevWatchCount;
|
||||||
|
@ -170,7 +170,7 @@ bool InsertWatches(const AddressWatcher* watches, HWND parent, const int count)
|
||||||
char comment[256];
|
char comment[256];
|
||||||
rswatches[-1] = watches[0];
|
rswatches[-1] = watches[0];
|
||||||
rswatches[-1].comment = comment;
|
rswatches[-1].comment = comment;
|
||||||
if(DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), parent, (DLGPROC)EditWatchProc, (LPARAM)-1))
|
if(DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), parent, EditWatchProc, (LPARAM)-1))
|
||||||
for (int i = 0; i < count; ++i)
|
for (int i = 0; i < count; ++i)
|
||||||
{
|
{
|
||||||
AddressWatcher watcher = watches[i];
|
AddressWatcher watcher = watches[i];
|
||||||
|
@ -775,7 +775,7 @@ void RefreshWatchListSelectedItemControlStatus(HWND hDlg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) //Gets info for a RAM Watch, and then inserts it into the Watch List
|
INT_PTR CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) //Gets info for a RAM Watch, and then inserts it into the Watch List
|
||||||
{
|
{
|
||||||
|
|
||||||
// since there are 3 windows can pops up the add watch dialog, we should store them separately.
|
// since there are 3 windows can pops up the add watch dialog, we should store them separately.
|
||||||
|
@ -1002,7 +1002,7 @@ void RefreshWatchListSelectedCountControlStatus(HWND hDlg, int newComer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
static int watchIndex = 0; // current watch index
|
static int watchIndex = 0; // current watch index
|
||||||
static bool listFocus;
|
static bool listFocus;
|
||||||
|
@ -1307,7 +1307,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||||
watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
|
watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
|
||||||
if(watchIndex != -1)
|
if(watchIndex != -1)
|
||||||
{
|
{
|
||||||
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC)EditWatchProc, watchIndex);
|
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, EditWatchProc, watchIndex);
|
||||||
SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
|
SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -1318,7 +1318,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||||
target.WrongEndian = 0;
|
target.WrongEndian = 0;
|
||||||
target.Size = 'b';
|
target.Size = 'b';
|
||||||
target.Type = 's';
|
target.Type = 's';
|
||||||
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC)EditWatchProc, WatchCount);
|
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, EditWatchProc, WatchCount);
|
||||||
SetFocus(GetDlgItem(hDlg, IDC_WATCHLIST));
|
SetFocus(GetDlgItem(hDlg, IDC_WATCHLIST));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1332,7 +1332,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||||
AddressWatcher* source = &rswatches[watchIndex];
|
AddressWatcher* source = &rswatches[watchIndex];
|
||||||
memcpy(target, source, sizeof(AddressWatcher));
|
memcpy(target, source, sizeof(AddressWatcher));
|
||||||
target->comment = strcpy(str_tmp, source->comment);
|
target->comment = strcpy(str_tmp, source->comment);
|
||||||
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC)EditWatchProc, WatchCount);
|
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, EditWatchProc, WatchCount);
|
||||||
SetFocus(GetDlgItem(hDlg, IDC_WATCHLIST));
|
SetFocus(GetDlgItem(hDlg, IDC_WATCHLIST));
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -1345,7 +1345,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||||
target->Size = 'S';
|
target->Size = 'S';
|
||||||
target->Type = 'S';
|
target->Type = 'S';
|
||||||
|
|
||||||
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC)EditWatchProc, (LPARAM)WatchCount);
|
DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, EditWatchProc, (LPARAM)WatchCount);
|
||||||
|
|
||||||
// InsertWatch(separator, "----------------------------");
|
// InsertWatch(separator, "----------------------------");
|
||||||
SetFocus(GetDlgItem(hDlg, IDC_WATCHLIST));
|
SetFocus(GetDlgItem(hDlg, IDC_WATCHLIST));
|
||||||
|
|
|
@ -70,8 +70,8 @@ bool Load_Watches(bool clear, const char* filename);
|
||||||
void RWAddRecentFile(const char *filename);
|
void RWAddRecentFile(const char *filename);
|
||||||
void UpdateWatchCheats();
|
void UpdateWatchCheats();
|
||||||
|
|
||||||
LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
extern HWND RamWatchHWnd;
|
extern HWND RamWatchHWnd;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -500,7 +500,7 @@ static void UpdateSD(HWND hwndDlg)
|
||||||
UpdateSoundChannelQualityMode(hwndDlg);
|
UpdateSoundChannelQualityMode(hwndDlg);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK SoundConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK SoundConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
|
|
||||||
switch(uMsg) {
|
switch(uMsg) {
|
||||||
|
|
|
@ -245,7 +245,7 @@ void updateTASEditor()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK newProjectProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK newProjectProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
static struct NewProjectParameters* p = NULL;
|
static struct NewProjectParameters* p = NULL;
|
||||||
switch (message)
|
switch (message)
|
||||||
|
@ -518,7 +518,7 @@ void SaveCompact_GetDialogItems(HWND hwndDlg)
|
||||||
else
|
else
|
||||||
taseditorConfig.saveCompact_GreenzoneSavingMode = GREENZONE_SAVING_MODE_NO;
|
taseditorConfig.saveCompact_GreenzoneSavingMode = GREENZONE_SAVING_MODE_NO;
|
||||||
}
|
}
|
||||||
BOOL CALLBACK SaveCompactProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK SaveCompactProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch (message)
|
switch (message)
|
||||||
{
|
{
|
||||||
|
@ -655,7 +655,7 @@ void importInputData()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK aboutWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK aboutWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch (message)
|
switch (message)
|
||||||
{
|
{
|
||||||
|
@ -678,7 +678,7 @@ BOOL CALLBACK aboutWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK savingOptionsWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK savingOptionsWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch (message)
|
switch (message)
|
||||||
{
|
{
|
||||||
|
@ -768,7 +768,7 @@ BOOL CALLBACK savingOptionsWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LP
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK ExportProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK ExportProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch (message)
|
switch (message)
|
||||||
{
|
{
|
||||||
|
|
|
@ -619,7 +619,7 @@ void MARKERS_MANAGER::updateEditedMarkerNote()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// ------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------
|
||||||
BOOL CALLBACK findNoteWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK findNoteWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
extern MARKERS_MANAGER markersManager;
|
extern MARKERS_MANAGER markersManager;
|
||||||
switch (message)
|
switch (message)
|
||||||
|
|
|
@ -53,12 +53,12 @@ extern bool mustCallManualLuaFunction;
|
||||||
|
|
||||||
extern char* GetKeyComboName(int c);
|
extern char* GetKeyComboName(int c);
|
||||||
|
|
||||||
extern BOOL CALLBACK findNoteWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
extern INT_PTR CALLBACK findNoteWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||||
extern BOOL CALLBACK aboutWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
extern INT_PTR CALLBACK aboutWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||||
extern BOOL CALLBACK savingOptionsWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
extern INT_PTR CALLBACK savingOptionsWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
// main window wndproc
|
// main window wndproc
|
||||||
BOOL CALLBACK TASEditorWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK TASEditorWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
// wndprocs for "Marker X" text fields
|
// wndprocs for "Marker X" text fields
|
||||||
LRESULT APIENTRY IDC_PLAYBACK_MARKER_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
LRESULT APIENTRY IDC_PLAYBACK_MARKER_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||||
LRESULT APIENTRY IDC_SELECTION_MARKER_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
LRESULT APIENTRY IDC_SELECTION_MARKER_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||||
|
@ -780,7 +780,7 @@ void TASEDITOR_WINDOW::recheckPatternsMenu()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ====================================================================================================
|
// ====================================================================================================
|
||||||
BOOL CALLBACK TASEditorWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK TASEditorWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
extern TASEDITOR_WINDOW taseditorWindow;
|
extern TASEDITOR_WINDOW taseditorWindow;
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
|
|
|
@ -777,7 +777,7 @@ int TextHookerSaveTableFile(){
|
||||||
* Looking for comments? Inqure within!
|
* Looking for comments? Inqure within!
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
BOOL CALLBACK TextHookerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
INT_PTR CALLBACK TextHookerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
||||||
RECT wrect;
|
RECT wrect;
|
||||||
char str[2048];
|
char str[2048];
|
||||||
char bufferstr[10240]; //holds the entire buffer, so it needs to be big...
|
char bufferstr[10240]; //holds the entire buffer, so it needs to be big...
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -373,7 +373,7 @@ BOOL CALLBACK TracerResizingEnumWindowsProc(HWND hwnd, LPARAM lParam)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK TracerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK TracerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
switch(uMsg)
|
switch(uMsg)
|
||||||
|
|
|
@ -1148,7 +1148,7 @@ double GetDlgItemDouble(HWND hDlg, int item)
|
||||||
return(ret);
|
return(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK VideoConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK VideoConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
static char *vmstr[11]={
|
static char *vmstr[11]={
|
||||||
"Custom",
|
"Custom",
|
||||||
|
|
|
@ -117,7 +117,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;
|
||||||
|
@ -1870,7 +1870,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);
|
||||||
|
@ -3159,14 +3159,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()
|
||||||
|
|
|
@ -6193,7 +6193,7 @@ int FCEU_LoadLuaCode(const char *filename, const char *arg) {
|
||||||
info_onstart = WinLuaOnStart;
|
info_onstart = WinLuaOnStart;
|
||||||
info_onstop = WinLuaOnStop;
|
info_onstop = WinLuaOnStop;
|
||||||
if(!LuaConsoleHWnd)
|
if(!LuaConsoleHWnd)
|
||||||
LuaConsoleHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_LUA), hAppWnd, (DLGPROC) DlgLuaScriptDialog);
|
LuaConsoleHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_LUA), hAppWnd, DlgLuaScriptDialog);
|
||||||
info_uid = (int)LuaConsoleHWnd;
|
info_uid = (int)LuaConsoleHWnd;
|
||||||
#else
|
#else
|
||||||
info_print = NULL;
|
info_print = NULL;
|
||||||
|
|
Loading…
Reference in New Issue