windows fix

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47755 e17a0e51-4ae3-4d35-97c3-1a29b211df97

5 files changed, 15 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 37a0b1a7..1d62c5af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,12 +5,16 @@ May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
  * gui/Plugin.c: Likewise.
  * gui/LnxMain.c: Likewise.
  * gui/Gtk2Gui.c: Likewise.
+ * win32/gui/plugin.c: Likewise.
+ * win32/gui/WndMain.c: Likewise.
  * libpcsxcore/cdriso.c: Likewise.
  * libpcsxcore/psxcommon.c: Likewise.
  * libpcsxcore/plugins.h: Likewise.
  * libpcsxcore/psxcommon.h: Likewise.
  * libpcsxcore/sio.c: Likewise.
  * libpcsxcore/psxhw.c: Likewise.
+ * libpcsxcore/psxbios.c: Moved declaration of netError() into ...
+ * libpcsxcore/sio.h: Here.
 
 May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index f281878a..2f49fdf6 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -2235,8 +2235,6 @@ __inline void LoadRegs() {
 	} \
 }
 
-void netError();
-
 void biosInterrupt() {
 	int i, bufcount;
 
diff --git a/libpcsxcore/sio.h b/libpcsxcore/sio.h
index 20c75d1b..8e4476c0 100644
--- a/libpcsxcore/sio.h
+++ b/libpcsxcore/sio.h
@@ -47,6 +47,8 @@ unsigned short sioReadMode16();
 unsigned short sioReadCtrl16();
 unsigned short sioReadBaud16();
 
+void netError();
+
 void sioInterrupt();
 int sioFreeze(gzFile f, int Mode);
 
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--; \