Merge commit '668183aab' into VCC-1.200b

Author: BGPierce

.gitignore

@@ -1,7 +1,13 @@
+#OS files
+[Tt]humbs.db
+*.DS_Store
+
 *.o
 *.a
 *.stackdump
 
+
+# Visual Studio
 *.obj
 *.dll
 *.exe
@@ -14,8 +20,11 @@
 *.pch
 *.pch.*
 *.gch
+*.aps
 
 Debug
 Release
 All
 
+vcc/coco3.rom
+vcc/disk11.rom

Cassette.cpp

@@ -271,7 +271,7 @@ unsigned int LoadTape(void)
 	DialogOpen=1;
 	memset(&ofn,0,sizeof(ofn));
 	ofn.lStructSize       = sizeof (OPENFILENAME);
-	ofn.hwndOwner         = NULL;
+	ofn.hwndOwner         = GetTopWindow(NULL);
 	ofn.Flags             = OFN_HIDEREADONLY ;
 	ofn.hInstance         = GetModuleHandle(0);
 	ofn.lpstrDefExt			="";

Cassette.h

@@ -1,3 +1,5 @@
+#ifndef __CASSETTE_H__
+#define __CASSETTE_H__
 /*
 Copyright 2015 by Joseph Forgione
 This file is part of VCC (Virtual Color Computer).
@@ -33,3 +35,4 @@ void LoadCassetteBuffer(unsigned char *);
 void FlushCassetteBuffer(unsigned char *,unsigned int);
 void GetTapeName(char *);
 
+#endif

CopyFiles.bat

@@ -1,7 +1,7 @@
-copy .\release\vcc.exe .\vcc
-copy .\becker\release\*.dll .\vcc
-copy .\fd502\release\*.dll .\vcc
-copy .\harddisk\release\*.dll .\vcc
-copy .\mpi\release\*.dll .\vcc
-copy .\orch90\release\*.dll .\vcc
-copy .\superide\release\*.dll .\vcc
+copy .\__obj\Win32\Release\vcc\out\vcc.exe .\vcc
+copy .\__obj\Win32\Release\becker\out\*.dll .\vcc
+copy .\__obj\Win32\Release\fd502\out\*.dll .\vcc
+copy .\__obj\Win32\Release\harddisk\out\*.dll .\vcc
+copy .\__obj\Win32\Release\mpi\out\*.dll .\vcc
+copy .\__obj\Win32\Release\orch90\out\*.dll .\vcc
+copy .\__obj\Win32\Release\superide\out\*.dll .\vcc

DirectDrawInterface.h

@@ -1,3 +1,5 @@
+#ifndef __DIRECTDRAWINTERFACE_H__
+#define __DIRECTDRAWINTERFACE_H__
 /*
 Copyright 2015 by Joseph Forgione
 This file is part of VCC (Virtual Color Computer).
@@ -31,4 +33,6 @@ float Static(SystemState *);
 
 
 
-#define MAX_LOADSTRING 100
+#define MAX_LOADSTRING 100
+
+#endif

FD502/defines.h

@@ -1,3 +1,5 @@
+#ifndef __DEFINES_H__
+#define __DEFINES_H__
 /*
 Copyright 2015 by Joseph Forgione
 This file is part of VCC (Virtual Color Computer).
@@ -40,4 +42,5 @@ This file is part of VCC (Virtual Color Computer).
 #define FIRQ	2
 #define NMI		3
 
+#endif
 

FD502/distortc.h

@@ -1,3 +1,5 @@
+#ifndef __DISTORTC_H__
+#define __DISTORTC_H__
 /*
 Copyright 2015 by Joseph Forgione
 This file is part of VCC (Virtual Color Computer).
@@ -16,4 +18,6 @@ This file is part of VCC (Virtual Color Computer).
     along with VCC (Virtual Color Computer).  If not, see <http://www.gnu.org/licenses/>.
 */
 unsigned char read_time(unsigned short);
-void write_time(unsigned char,unsigned char);
+void write_time(unsigned char,unsigned char);
+
+#endif

FD502/fd502.aps

@@ -338,8 +338,8 @@ LRESULT CALLBACK Config(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 				case IDC_BROWSE:
 					memset(&ofn,0,sizeof(ofn));
 					ofn.lStructSize       = sizeof (OPENFILENAME) ;
-					ofn.hwndOwner         = NULL;
-					ofn.lpstrFilter       =	"Disk Rom Images\0*.rom\0\0";	// filter ROM images
+					ofn.hwndOwner         = GetTopWindow(NULL);
+					ofn.lpstrFilter		  = "Disk Rom Images\0*.rom;*.bin\0\0";	// filter ROM images
 					ofn.nFilterIndex      = 1 ;								// current filter index
 					ofn.lpstrFile         = TempRomFileName ;						// contains full path and filename on return
 					ofn.nMaxFile          = MAX_PATH;						// sizeof lpstrFile
@@ -381,11 +381,11 @@ void Load_Disk(unsigned char disk)
 		CreateFlag=1; 
 		memset(&ofn,0,sizeof(ofn));
 		ofn.lStructSize       = sizeof (OPENFILENAME) ;
-		ofn.hwndOwner         = NULL;
+		ofn.hwndOwner         = GetTopWindow(NULL);
 		ofn.Flags             = OFN_HIDEREADONLY;
 		ofn.hInstance         = GetModuleHandle(0);
-		ofn. lpstrDefExt      ="dsk";
-		ofn.lpstrFilter       =	"Disk Images\0*.DSK;*.OS9\0\0";	// filter string "Disks\0*.DSK\0\0";
+		ofn.lpstrDefExt       = "dsk";
+		ofn.lpstrFilter       =	"Disk Images\0*.dsk;*.os9\0\0";	// filter string "Disks\0*.DSK\0\0";
 		ofn.nFilterIndex      = 0 ;								// current filter index
 		ofn.lpstrFile         = TempFileName	 ;				// contains full path and filename on return
 		ofn.nMaxFile          = MAX_PATH;						// sizeof lpstrFile