diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-10 07:27:06 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-10 07:27:06 +0000 |
| commit | 18d68b10f6cace492c15af575620e15ca2ca482f (patch) | |
| tree | e608a5eade6e015fdfd8286e11fe2f9c50181443 /win32 | |
| parent | 78470f808411136437789aee0d33fbe0c892daea (diff) | |
| download | pcsxr-18d68b10f6cace492c15af575620e15ca2ca482f.tar.gz | |
windows fix
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47755 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/gui/WndMain.c | 14 | ||||
| -rw-r--r-- | win32/gui/plugin.c | 6 |
2 files changed, 9 insertions, 11 deletions
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c index 0823a47b..7a1397e4 100644 --- a/win32/gui/WndMain.c +++ b/win32/gui/WndMain.c @@ -414,7 +414,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { return TRUE;
case ID_FILE_RUN_CD:
- cdrfilename[0] = '\0';
+ SetIsoFile(NULL);
SetMenu(hWnd, NULL);
LoadPlugins();
if (OpenPlugins(hWnd) == -1) {
@@ -445,7 +445,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { SysMessage(_("Running BIOS is not supported with Internal HLE Bios."));
return TRUE;
}
- cdrfilename[0] = '\0';
+ SetIsoFile(NULL);
SetMenu(hWnd, NULL);
LoadPlugins();
if (OpenPlugins(hWnd) == -1) {
@@ -463,7 +463,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case ID_FILE_RUN_ISO:
if (!Open_Iso_Proc(File)) return TRUE;
- strcpy(cdrfilename, File);
+ SetIsoFile(File);
SetMenu(hWnd, NULL);
LoadPlugins();
if (OpenPlugins(hWnd) == -1) {
@@ -491,7 +491,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case ID_FILE_RUN_EXE:
if (!Open_File_Proc(File)) return TRUE;
- cdrfilename[0] = '\0';
+ SetIsoFile(NULL);
SetMenu(hWnd, NULL);
LoadPlugins();
if (OpenPlugins(hWnd) == -1) {
@@ -542,7 +542,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case ID_EMULATOR_SWITCH_ISO:
if (!Open_Iso_Proc(File)) return TRUE;
- strcpy(cdrfilename, File);
+ SetIsoFile(File);
SetMenu(hWnd, NULL);
if (OpenPlugins(hWnd) == -1) {
ClosePlugins();
@@ -551,7 +551,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { }
ShowCursor(FALSE);
Running = 1;
- cdOpenCase = time(NULL) + 2;
+ SetCdOpenCaseTime(time(NULL) + 2);
CheatSearchBackupMemory();
psxCpu->Execute();
return TRUE;
@@ -1584,7 +1584,7 @@ void CreateMainMenu() { EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_SOUND, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_GRAPHICS, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(gApp.hMenu, ID_CONFIGURATION, MF_BYCOMMAND | MF_GRAYED);
- if (cdrfilename[0] == '\0') {
+ if (UsingIso()) {
EnableMenuItem(gApp.hMenu, ID_EMULATOR_SWITCH_ISO, MF_BYCOMMAND | MF_GRAYED);
}
} else {
diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c index 93942ca4..4f83b9ef 100644 --- a/win32/gui/plugin.c +++ b/win32/gui/plugin.c @@ -143,12 +143,12 @@ void PADhandleKey(int key) { case VK_F9:
GPU_displayText(_("*PCSX*: CdRom Case Opened"));
- cdOpenCase = -1;
+ SetCdOpenCaseTime(-1);
break;
case VK_F10:
GPU_displayText(_("*PCSX*: CdRom Case Closed"));
- cdOpenCase = 0;
+ SetCdOpenCaseTime(0);
break;
case VK_F12:
@@ -198,8 +198,6 @@ BOOL CALLBACK ConnectDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) { return FALSE;
}
-int NetOpened = 0;
-
#define PARSEPATH(dst, src) \
ptr = src + strlen(src); \
while (*ptr != '\\' && ptr != src) ptr--; \
|