Tried to fix up the CDVDiso plugin so that it doesn't ask for ISOfile when resuming execution of a game, but for some reason the plugin isn't recognized by Pcsx2. Too tired to figure out what I did wrong. :/

Also, fixed a typo in PS2Edefs.h - had _cplusplus instead of __cplusplus.

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@491 a6443dda-0b58-4228-96e9-037be469359c

pcsx2/PS2Edefs.h

@@ -199,7 +199,7 @@ typedef struct _winInfo { // unsupported values must be set to zero
 } winInfo;
 #endif
 
-#ifdef _cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -878,7 +878,7 @@ extern _FWtest            FWtest;
 extern _FWabout           FWabout;
 #endif
 
-#ifdef _cplusplus
+#ifdef __cplusplus
 }	// End extern "C"
 #endif
 

pcsx2/Plugins.c

@@ -223,7 +223,7 @@ USBhandler usbHandler;
 #define MapSymbolVarType(var,type,name) var = (type)SysLoadSym(drv,Strfy(name))
 #define MapSymbolVar(var,name) MapSymbolVarType(var,_##name,name)
 #define MapSymbolVar_Fallback(var,name,fallback) if((MapSymbolVar(var,name))==NULL) var = fallback
-#define MapSymbolVar_Error(var,name) if((MapSymbolVar(var,name))==NULL) { const char* errString = SysLibError(); SysMessage (_("%s: Error loading %s: %s"), filename, __FUNCTION__, errString); return -1; } 
+#define MapSymbolVar_Error(var,name) if((MapSymbolVar(var,name))==NULL) { const char* errString = SysLibError(); SysMessage (_("%s: Error loading %s: %s"), filename, #name, errString); return -1; } 
 
 #define MapSymbol(name) MapSymbolVar(name,name)
 #define MapSymbol_Fallback(name,fallback) MapSymbolVar_Fallback(name,name,fallback)
@@ -705,14 +705,17 @@ int OpenPlugins(const char* pTitleFilename) {
     }
 #endif
 
-	//first we need the data
+	if( !OpenStatus.CDVD )
-	if (CDVDnewDiskCB) CDVDnewDiskCB(cdvdNewDiskCB);
+	{
+		//first we need the data
+		if (CDVDnewDiskCB) CDVDnewDiskCB(cdvdNewDiskCB);
 
-    ret = CDVDopen(pTitleFilename);
+		ret = CDVDopen(pTitleFilename);
 
-	if (ret != 0) { SysMessage (_("Error Opening CDVD Plugin")); goto OpenError; }
+		if (ret != 0) { SysMessage (_("Error Opening CDVD Plugin")); goto OpenError; }
-	OpenStatus.CDVD = 1;
+		OpenStatus.CDVD = true;
-	cdvdNewDiskCB();
+		cdvdNewDiskCB();
+	}
 
 	//video
 	// Only bind the gsIrq if we're not running the MTGS.
@@ -723,53 +726,73 @@ int OpenPlugins(const char* pTitleFilename) {
 	if( !OpenStatus.GS ) {
 		ret = gsOpen();
 		if (ret != 0) { SysMessage (_("Error Opening GS Plugin")); goto OpenError; }
-		OpenStatus.GS = 1;
+		OpenStatus.GS = true;
+
+		//then the user input
+		if (GSgetDriverInfo) {
+			GSgetDriverInfo(&info);
+			if (PAD1gsDriverInfo) PAD1gsDriverInfo(&info);
+			if (PAD2gsDriverInfo) PAD2gsDriverInfo(&info);
+		}
 	}
 
-	//then the user input
+	if( !OpenStatus.PAD1 )
-	if (GSgetDriverInfo) {
+	{
-		GSgetDriverInfo(&info);
+		ret = PAD1open((void *)&pDsp);
-		if (PAD1gsDriverInfo) PAD1gsDriverInfo(&info);
+		if (ret != 0) { SysMessage (_("Error Opening PAD1 Plugin")); goto OpenError; }
-		if (PAD2gsDriverInfo) PAD2gsDriverInfo(&info);
+		OpenStatus.PAD1 = true;
+	}
+
+	if( !OpenStatus.PAD2 )
+	{
+		ret = PAD2open((void *)&pDsp);
+		if (ret != 0) { SysMessage (_("Error Opening PAD2 Plugin")); goto OpenError; }
+		OpenStatus.PAD2 = true;
 	}
-	ret = PAD1open((void *)&pDsp);
-	if (ret != 0) { SysMessage (_("Error Opening PAD1 Plugin")); goto OpenError; }
-	OpenStatus.PAD1 = 1;
-	ret = PAD2open((void *)&pDsp);
-	if (ret != 0) { SysMessage (_("Error Opening PAD2 Plugin")); goto OpenError; }
-	OpenStatus.PAD2 = 1;
 
 	//the sound
 
-	SPU2irqCallback(spu2Irq,spu2DMA4Irq,spu2DMA7Irq);
+	if( !OpenStatus.SPU2 )
-    if( SPU2setDMABaseAddr != NULL )
+	{
-        SPU2setDMABaseAddr((uptr)PSXM(0));
+		SPU2irqCallback(spu2Irq,spu2DMA4Irq,spu2DMA7Irq);
+		if( SPU2setDMABaseAddr != NULL )
+			SPU2setDMABaseAddr((uptr)PSXM(0));
 
-	if(SPU2setClockPtr != NULL)
+		if(SPU2setClockPtr != NULL)
-		SPU2setClockPtr(&psxRegs.cycle);
+			SPU2setClockPtr(&psxRegs.cycle);
 
-	ret = SPU2open((void*)&pDsp);
+		ret = SPU2open((void*)&pDsp);
-	if (ret != 0) { SysMessage (_("Error Opening SPU2 Plugin")); goto OpenError; }
+		if (ret != 0) { SysMessage (_("Error Opening SPU2 Plugin")); goto OpenError; }
-	OpenStatus.SPU2 = 1;
+		OpenStatus.SPU2 = true;
+	}
 
 	//and last the dev9
-	DEV9irqCallback(dev9Irq);
+	if( !OpenStatus.DEV9 )
-	dev9Handler = DEV9irqHandler();
+	{
-	ret = DEV9open(&(psxRegs.pc)); //((void *)&pDsp);
+		DEV9irqCallback(dev9Irq);
-	if (ret != 0) { SysMessage (_("Error Opening DEV9 Plugin")); goto OpenError; }
+		dev9Handler = DEV9irqHandler();
-	OpenStatus.DEV9 = 1;
+		ret = DEV9open(&(psxRegs.pc)); //((void *)&pDsp);
+		if (ret != 0) { SysMessage (_("Error Opening DEV9 Plugin")); goto OpenError; }
+		OpenStatus.DEV9 = true;
+	}
 
-	USBirqCallback(usbIrq);
+	if( !OpenStatus.USB )
-	usbHandler = USBirqHandler();
+	{
-	USBsetRAM(psxM);
+		USBirqCallback(usbIrq);
-	ret = USBopen((void *)&pDsp);
+		usbHandler = USBirqHandler();
-	if (ret != 0) { SysMessage (_("Error Opening USB Plugin")); goto OpenError; }
+		USBsetRAM(psxM);
-	OpenStatus.USB = 1;
+		ret = USBopen((void *)&pDsp);
+		if (ret != 0) { SysMessage (_("Error Opening USB Plugin")); goto OpenError; }
+		OpenStatus.USB = true;
+	}
 
-	FWirqCallback(fwIrq);
+	if( !OpenStatus.FW )
-	ret = FWopen((void *)&pDsp);
+	{
-	if (ret != 0) { SysMessage (_("Error Opening FW Plugin")); goto OpenError; }
+		FWirqCallback(fwIrq);
-	OpenStatus.FW = 1;
+		ret = FWopen((void *)&pDsp);
+		if (ret != 0) { SysMessage (_("Error Opening FW Plugin")); goto OpenError; }
+		OpenStatus.FW = true;
+	}
 
 #ifdef __LINUX__
     chdir(file);

pcsx2/windows/WinMain.c

@@ -792,7 +792,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 void RunGui() {
     MSG msg;
 
-	SetFocus( gApp.hWnd );
     for (;;) {
 		if(PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) {
 			TranslateMessage(&msg);
@@ -806,8 +805,6 @@ void RunGui() {
 void RunGuiAndReturn() {
     MSG msg;
 
-	SetFocus( gApp.hWnd );
-
 	m_ReturnToGame = false;
     while( !m_ReturnToGame ) {
 		if(PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) {
@@ -933,6 +930,7 @@ void CALLBACK KeyEvent(keyEvent* ev)
 				// Let's give the user a RunGui!
 
 				g_GameInProgress = false;
+				CreateMainWindow( SW_SHOWNORMAL );
 				RunGui();	// ah the beauty of perpetual stack recursion! (air)
 			}
 		break;
@@ -1360,7 +1358,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					AccBreak = true;
 					DestroyWindow(gApp.hWnd);
 					ChangeLanguage(langs[LOWORD(wParam) - ID_LANGS].lang);
-					CreateMainWindow(SW_NORMAL);
+					CreateMainWindow(SW_SHOWNORMAL);
 					return TRUE;
 				}
 			}
@@ -1599,7 +1597,7 @@ void CreateMainWindow(int nCmdShow) {
 	h+= rect.bottom - rect.top;
 	GetMenuItemRect(hWnd, gApp.hMenu, 0, &rect);
 	h+= rect.bottom - rect.top;
-	MoveWindow(hWnd, 20, 20, w, h, TRUE);
+	MoveWindow(hWnd, 40, 50, w, h, TRUE);
 
 	DestroyWindow(hStatusWnd);
 	hStatusWnd = CreateStatusWindow(WS_CHILD | WS_VISIBLE, "", hWnd, 100);

plugins/CDVDiso/src/CDVDiso.h

@@ -21,10 +21,42 @@
 #pragma warning(disable:4018)
 #endif
 
-#define CDVDdefs
+//#define CDVDdefs
 #include "PS2Edefs.h"
 #include "libiso.h"
 
+#define EXPORT_C(type) __declspec(dllexport) type __stdcall
+
+EXPORT_C(u32)   PS2EgetLibType();
+EXPORT_C(u32)   PS2EgetLibVersion2(u32 type);
+EXPORT_C(char*) PS2EgetLibName();
+
+
+EXPORT_C(s32)  CDVDinit();
+EXPORT_C(s32)  CDVDopen(const char* pTitleFilename);
+EXPORT_C(void) CDVDclose();
+EXPORT_C(void) CDVDshutdown();
+EXPORT_C(s32)  CDVDreadTrack(u32 lsn, int mode);
+
+// return can be NULL (for async modes)
+EXPORT_C(u8*)  CDVDgetBuffer();
+
+EXPORT_C(s32)  CDVDreadSubQ(u32 lsn, cdvdSubQ* subq);//read subq from disc (only cds have subq data)
+EXPORT_C(s32)  CDVDgetTN(cdvdTN *Buffer);			//disk information
+EXPORT_C(s32)  CDVDgetTD(u8 Track, cdvdTD *Buffer);	//track info: min,sec,frame,type
+EXPORT_C(s32)  CDVDgetTOC(void* toc);				//gets ps2 style toc from disc
+EXPORT_C(s32)  CDVDgetDiskType();					//CDVD_TYPE_xxxx
+EXPORT_C(s32)  CDVDgetTrayStatus();					//CDVD_TRAY_xxxx
+EXPORT_C(s32)  CDVDctrlTrayOpen();					//open disc tray
+EXPORT_C(s32)  CDVDctrlTrayClose();					//close disc tray
+
+// extended funcs
+
+EXPORT_C(void) CDVDconfigure();
+EXPORT_C(void) CDVDabout();
+EXPORT_C(s32)  CDVDtest();
+EXPORT_C(void) CDVDnewDiskCB(void (*callback)());
+
 #define CDVD_LOG __Log
 extern FILE *cdvdLog;
 

plugins/CDVDiso/src/CDVDisop.c

@@ -13,8 +13,13 @@
 #define MAX_PATH 255
 #endif
 
+
 FILE *cdvdLog = NULL;
 
+// This var is used to detect resume-style behavior of the Pcsx2 emulator,
+// and skip prompting the user for a new CD when it's likely they want to run the existing one.
+static char cdvdCurrentIso[MAX_PATH];	
+
 char *methods[] = {
 	".Z  - compress faster",
 	".BZ - compress better",
@@ -22,14 +27,14 @@ char *methods[] = {
 };
 
 #ifdef _DEBUG
-char *LibName = "Linuzappz Iso CDVD (Debug) ";
+char *LibName = "Linuz/PP Iso CDVD (Debug) ";
 #else
-char *LibName = "Linuzappz Iso CDVD ";
+char *LibName = "Linuz/PP Iso CDVD ";
 #endif
 
 const unsigned char version = PS2E_CDVD_VERSION;
 const unsigned char revision = 0;
-const unsigned char build = 7;
+const unsigned char build = 8;
 
 unsigned char cdbuffer[CD_FRAMESIZE_RAW * 10] = {0};
 
@@ -51,15 +56,16 @@ void lba_to_msf(s32 lba, u8* m, u8* s, u8* f) {
 #define btoi(b)		((b)/16*10 + (b)%16)		/* BCD to u_char */
 #define itob(i)		((i)/10*16 + (i)%10)		/* u_char to BCD */
 
-char* CALLBACK PS2EgetLibName() {
+
+EXPORT_C(char*) PS2EgetLibName() {
 	return LibName;
 }
 
-u32 CALLBACK PS2EgetLibType() {
+EXPORT_C(u32) PS2EgetLibType() {
 	return PS2E_LT_CDVD;
 }
 
-u32 CALLBACK PS2EgetLibVersion2(u32 type) {
+EXPORT_C(u32) PS2EgetLibVersion2(u32 type) {
 	return (version << 16) | (revision << 8) | build;
 }
 
@@ -79,7 +85,7 @@ void __Log(char *fmt, ...) {
 #endif
 
 
-s32 CALLBACK CDVDinit() {
+EXPORT_C(s32) CDVDinit() {
 #ifdef _DEBUG
 	cdvdLog = fopen("logs/cdvdLog.txt", "w");
 	if (cdvdLog == NULL) {
@@ -91,22 +97,27 @@ s32 CALLBACK CDVDinit() {
 	setvbuf(cdvdLog, NULL,  _IONBF, 0);
 	CDVD_LOG("CDVDinit\n");
 #endif
+
+	cdvdCurrentIso[0] = 0;
 	memset(cdIso, 0, sizeof(cdIso));
 	return 0;
 }
 
-void CALLBACK CDVDshutdown() {
+EXPORT_C(void) CDVDshutdown() {
+	cdvdCurrentIso[0] = 0;
 #ifdef CDVD_LOG
 	if( cdvdLog != NULL )
         fclose(cdvdLog);
 #endif
 }
 
-s32 CALLBACK CDVDopen(const char* pTitle) {
+EXPORT_C(s32) CDVDopen(const char* pTitle) {
 	LoadConf();
 
     if( pTitle != NULL ) strcpy(IsoFile, pTitle);
 
+	if( *IsoFile == 0 ) strcpy( IsoFile, cdvdCurrentIso );
+
 	if (*IsoFile == 0) {
 		char temp[256];
 
@@ -173,14 +184,17 @@ s32 CALLBACK CDVDopen(const char* pTitle) {
 	return 0;
 }
 
-void CALLBACK CDVDclose() {
+EXPORT_C(void) CDVDclose() {
+
+	strcpy( cdvdCurrentIso, IsoFile );
+
 	isoClose(iso);
 	if (fdump != NULL) {
 		isoClose(fdump);
 	}
 }
 
-s32  CALLBACK CDVDreadSubQ(u32 lsn, cdvdSubQ* subq) {
+EXPORT_C(s32) CDVDreadSubQ(u32 lsn, cdvdSubQ* subq) {
 	// fake it
 	u8 min, sec, frm;
 	subq->ctrl		= 4;
@@ -202,14 +216,14 @@ s32  CALLBACK CDVDreadSubQ(u32 lsn, cdvdSubQ* subq) {
 	return 0;
 }
 
-s32 CALLBACK CDVDgetTN(cdvdTN *Buffer) {
+EXPORT_C(s32) CDVDgetTN(cdvdTN *Buffer) {
 	Buffer->strack = 1;
 	Buffer->etrack = 1;
 
 	return 0;
 }
 
-s32 CALLBACK CDVDgetTD(u8 Track, cdvdTD *Buffer) {
+EXPORT_C(s32) CDVDgetTD(u8 Track, cdvdTD *Buffer) {
 	if (Track == 0) {
 		Buffer->lsn = iso->blocks;
 	} else {
@@ -221,7 +235,7 @@ s32 CALLBACK CDVDgetTD(u8 Track, cdvdTD *Buffer) {
 }
 
 static int layer1start = -1;
-s32  CALLBACK CDVDgetTOC(void* toc) {
+EXPORT_C(s32) CDVDgetTOC(void* toc) {
 	u8 type = CDVDgetDiskType();
 	u8* tocBuff = (u8*)toc;
 	
@@ -359,7 +373,7 @@ s32  CALLBACK CDVDgetTOC(void* toc) {
 	return 0;
 }
 
-s32 CALLBACK CDVDreadTrack(u32 lsn, int mode) {
+EXPORT_C(s32) CDVDreadTrack(u32 lsn, int mode) {
 	int _lsn = lsn;
 
     //__Log("CDVDreadTrack: %x %x\n", lsn, mode);
@@ -385,27 +399,27 @@ s32 CALLBACK CDVDreadTrack(u32 lsn, int mode) {
 	return 0;
 }
 
-u8* CALLBACK CDVDgetBuffer() {
+EXPORT_C(u8*) CDVDgetBuffer() {
 	return pbuffer;
 }
 
-s32  CALLBACK CDVDgetDiskType() {
+EXPORT_C(s32) CDVDgetDiskType() {
 	return cdtype;
 }
 
-s32  CALLBACK CDVDgetTrayStatus() {
+EXPORT_C(s32) CDVDgetTrayStatus() {
 	return CDVD_TRAY_CLOSE;
 }
 
-s32  CALLBACK CDVDctrlTrayOpen() {
+EXPORT_C(s32) CDVDctrlTrayOpen() {
 	return 0;
 }
-s32  CALLBACK CDVDctrlTrayClose() {
+EXPORT_C(s32) CDVDctrlTrayClose() {
 	return 0;
 }
 
 
-s32 CALLBACK CDVDtest() {
+EXPORT_C(s32) CDVDtest() {
 	if (*IsoFile == 0)
 		return 0;
 

plugins/CDVDiso/src/Win32/CDVDiso.def

@@ -1,29 +0,0 @@
-; CDVDiso.def : Declares the module parameters for the DLL.
-
-LIBRARY      "CDVDiso"
-DESCRIPTION  'CDVDiso Driver'
-
-EXPORTS
-    ; Explicit exports can go here
-	PS2EgetLibType		@2
-	PS2EgetLibName		@3
-	PS2EgetLibVersion2	@4
-	CDVDinit			@5
-	CDVDshutdown		@6
-	CDVDopen			@7
-	CDVDclose			@8
-	CDVDreadTrack		@9
-	CDVDgetBuffer		@10
-	CDVDreadSubQ        @11
-	CDVDgetTN			@12
-	CDVDgetTD			@13
-	CDVDgetTOC          @14
-	CDVDgetDiskType     @15
-    CDVDgetTrayStatus   @16
-    CDVDctrlTrayOpen    @17
-    CDVDctrlTrayClose   @18
-
-	CDVDconfigure		@19
-	CDVDtest			@20
-	CDVDabout			@21
-

plugins/CDVDiso/src/Win32/CDVDiso.dsp

@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="CDVDiso" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=CDVDiso - WIN32 RELEASE
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "CDVDiso.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "CDVDiso.mak" CFG="CDVDiso - WIN32 RELEASE"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "CDVDiso - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__MSCW32__" /D "_MBCS" /D "_USRDLL" /D "CDVDiso_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../" /I "./" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__MSCW32__" /D "_MBCS" /D "_USRDLL" /D "CDVDiso_EXPORTS" /D "__WIN32__" /D "_LARGEFILE_SOURCE" /D _FILE_OFFSET_BITS=64 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x408 /d "NDEBUG"
-# ADD RSC /l 0x408 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib libbz2.lib zlib.lib /nologo /dll /machine:I386 /nodefaultlib:"msvcrt.lib"
-# SUBTRACT LINK32 /nodefaultlib
-# Begin Target
-
-# Name "CDVDiso - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\CDVDiso.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDVDiso.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\Config.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libiso.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\Win32.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\CDVDiso.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libiso.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\PS2Edefs.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\CDVDiso.rc
-# End Source File
-# End Group
-# End Target
-# End Project

plugins/CDVDiso/src/Win32/CDVDiso.dsw

@@ -1,30 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "CDVDiso"=".\CDVDiso.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-

plugins/CDVDiso/src/Win32/CDVDiso_2008.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1253"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="CDVDiso"
 	ProjectGUID="{BB27CC2C-28D1-4438-A0DF-3E120D01EDEC}"
 	RootNamespace="CDVDiso"
@@ -23,12 +23,14 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
+			OutputDirectory="$(SolutionDir)\bin\plugins"
-			IntermediateDirectory=".\Release"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
+			EnableManagedIncrementalBuild="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -58,16 +60,22 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..;..\ZLIB;..\bzip2;."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSCW32__;CDVDiso_EXPORTS;_CRT_SECURE_NO_DEPRECATE;__WIN32__;_LARGEFILE_SOURCE;_FILE_OFFSET_BITS=64;ASMV;ASMINF"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSCW32__;_CRT_SECURE_NO_DEPRECATE;__WIN32__;_LARGEFILE_SOURCE;_FILE_OFFSET_BITS=64"
 				StringPooling="true"
 				RuntimeLibrary="0"
+				StructMemberAlignment="5"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/CDVDiso.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -85,13 +93,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib ..\zlib\inffas32.obj ..\zlib\gvmat32.obj"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib"
-				OutputFile=".\Release/CDVDiso.dll"
+				OutputFile="$(OutDir)\CDVDiso.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				IgnoreDefaultLibraryNames="msvcrt.lib"
-				ModuleDefinitionFile=".\CDVDiso.def"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/CDVDiso.pdb"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary=".\Release/CDVDiso.lib"
@@ -122,7 +133,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)\bin\plugins"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
@@ -157,16 +168,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..;..\ZLIB;..\bzip2;."
-				PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,_USRDLL,__MSCW32__,CDVDiso_EXPORTS,_CRT_SECURE_NO_DEPRECATE,__WIN32__,_LARGEFILE_SOURCE,_FILE_OFFSET_BITS=64,ASMV,ASMINF"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;__MSCW32__;CDVDiso_EXPORTS;_CRT_SECURE_NO_DEPRECATE;__WIN32__;_LARGEFILE_SOURCE;_FILE_OFFSET_BITS=64"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				StructMemberAlignment="5"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Debug\CDVDiso.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -185,14 +199,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib ..\zlib\inffas32.obj ..\zlib\gvmat32.obj"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib"
-				OutputFile=".\Debug\CDVDisod.dll"
+				OutputFile="$(OutDir)\CDVDiso-debug.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				IgnoreDefaultLibraryNames="msvcrt.lib"
-				ModuleDefinitionFile=".\CDVDiso.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/CDVDiso.pdb"
+				OptimizeReferences="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary=".\Debug/CDVDisod.lib"
@@ -407,6 +422,14 @@
 			<File
 				RelativePath="..\zlib\gvmat32c.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\zlib\gzio.c"

plugins/CDVDiso/src/Win32/Win32.c

@@ -273,7 +273,7 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	return FALSE;
 }
 
-void CALLBACK CDVDconfigure() {
+EXPORT_C(void) CDVDconfigure() {
     DialogBox(hInst,
               MAKEINTRESOURCE(IDD_CONFIG),
               GetActiveWindow(),  
@@ -295,7 +295,7 @@ BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	return FALSE;
 }
 
-void CALLBACK CDVDabout() {
+EXPORT_C(void) CDVDabout() {
     DialogBox(hInst,
               MAKEINTRESOURCE(IDD_ABOUT),
               GetActiveWindow(),  

plugins/CDVDiso/src/Win32/plugin.def

@@ -1,21 +0,0 @@
-EXPORTS
-    PS2EgetLibType = PS2EgetLibType@0 @2
-    PS2EgetLibName = PS2EgetLibName@0 @3
-    PS2EgetLibVersion2 = PS2EgetLibVersion2@4 @4
-    CDVDinit = CDVDinit@0 @5
-    CDVDshutdown = CDVDshutdown@0 @6
-    CDVDopen = CDVDopen@0 @7
-    CDVDclose = CDVDclose@0 @8
-    CDVDreadTrack = CDVDreadTrack@8 @9
-    CDVDgetBuffer = CDVDgetBuffer@0 @10
-    CDVDreadSubQ = CDVDreadSubQ@8 @11
-    CDVDgetTN = CDVDgetTN@4 @12
-    CDVDgetTD = CDVDgetTD@8 @13
-    CDVDgetTOC = CDVDgetTOC@4 @14
-    CDVDgetDiskType = CDVDgetDiskType@0 @15
-    CDVDgetTrayStatus = CDVDgetTrayStatus@0 @16
-    CDVDctrlTrayOpen = CDVDctrlTrayOpen@0 @17
-    CDVDctrlTrayClose = CDVDctrlTrayClose@0 @18
-    CDVDconfigure = CDVDconfigure@0 @19
-    CDVDtest = CDVDtest@0 @20
-    CDVDabout = CDVDabout@0 @21