ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mostly port the GSnull plugin to Windows. Currently asserts on startup in Windows about GSirq not being null. (Though it works if you hit ignore.) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1158 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-08 22:40:56 +00:00
parent a80dfabca8
commit 85c8e4c4af
7 changed files with 79 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/GSnull/GS.cpp
View File

@ -72,7 +72,6 @@ EXPORT_C_(void) GSprintf(int timeout, char *fmt, ...)
{
va_list list;
char msg[512];
char cmd[512];
va_start(list, fmt);
vsprintf(msg, fmt, list);

21
plugins/GSnull/GS.h
View File

@ -21,16 +21,6 @@
#include <stdio.h>
#ifdef __cplusplus
extern "C"
{
#endif
#define GSdefs
#include "PS2Edefs.h"
#ifdef __cplusplus
}
#endif
#ifdef _WIN32
#include <windows.h>
@ -44,6 +34,16 @@ extern "C"
#endif
#ifdef __cplusplus
extern "C"
{
#endif
#define GSdefs
#include "PS2Edefs.h"
#ifdef __cplusplus
}
#endif
/*#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
@ -63,6 +63,7 @@ typedef struct
int Log;
} Config;
extern Config conf;
extern FILE *gsLog;

8
plugins/GSnull/Windows/Config.cpp
View File

@ -1,6 +1,6 @@
#include <stdlib.h>
#include "../FW.h"
#include "../GS.h"
extern HINSTANCE hInst;
void SaveConfig()
@ -14,7 +14,7 @@ void SaveConfig()
szTemp = strrchr(szIniFile, '\\');
if(!szTemp) return;
strcpy(szTemp, "\\inis\\fwnull.ini");
strcpy(szTemp, "\\inis\\gsnull.ini");
sprintf(szValue,"%u",Conf1->Log);
WritePrivateProfileString("Interface", "Logging",szValue,szIniFile);
@ -32,8 +32,8 @@ void LoadConfig() {
szTemp = strrchr(szIniFile, '\\');
if(!szTemp) return ;
strcpy(szTemp, "\\inis\\fwnull.ini");
fp=fopen("inis\\fwnull.ini","rt");//check if firewirenull.ini really exists
strcpy(szTemp, "\\inis\\gsnull.ini");
fp=fopen("inis\\gsnull.ini","rt");//check if gsnull.ini really exists
if (!fp)
{
CreateDirectory("inis",NULL);

42
plugins/GSnull/Windows/GS.def
View File

@ -7,13 +7,35 @@ EXPORTS
PS2EgetLibType @2
PS2EgetLibName @3
PS2EgetLibVersion2 @4
FWinit @5
FWshutdown @6
FWopen @7
FWclose @8
FWread32 @11
FWwrite32 @14
FWirqCallback @15
FWconfigure @17
FWtest @18
FWabout @19
GSinit @5
GSopen @6
GSclose @7
GSshutdown @8
GSvsync @9
GSgifTransfer1 @10
GSgifTransfer2 @11
GSgifTransfer3 @12
GSgetLastTag @13
GSgifSoftReset @14
GSreadFIFO @15
GSreadFIFO2 @16
GSkeyEvent @17
GSchangeSaveState @18
GSmakeSnapshot @19
GSmakeSnapshot2 @20
GSirqCallback @21
GSprintf @22
GSsetBaseMem @23
GSsetGameCRC @24
GSsetFrameSkip @25
GSsetupRecording @26
GSreset @27
GSwriteCSR @28
GSgetDriverInfo @29
GSsetWindowInfo @30
GSfreeze @31
GSconfigure @32
GSabout @33
GStest @34

20
plugins/GSnull/Windows/GSnull_vc2008.sln Normal file
View File

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSnull", "GSnull_vc2008.vcproj", "{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Debug|Win32.ActiveCfg = Debug|Win32
{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Debug|Win32.Build.0 = Debug|Win32
{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release|Win32.ActiveCfg = Release|Win32
{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

16
plugins/GSnull/Windows/GSnull_vc2008.vcproj
View File

@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="FWnull"
Name="GSnull"
ProjectGUID="{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}"
RootNamespace="FWnull"
RootNamespace="GSnull"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@ -55,7 +55,7 @@
/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="FireWireNull.def"
ModuleDefinitionFile="GS.def"
RandomizedBaseAddress="1"
TargetMachine="1"
/>
@ -122,7 +122,7 @@
/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="FireWireNull.def"
ModuleDefinitionFile="GS.def"
RandomizedBaseAddress="1"
TargetMachine="1"
/>
@ -161,7 +161,7 @@
>
</File>
<File
RelativePath="..\FW.cpp"
RelativePath="..\GS.cpp"
>
</File>
<File
@ -174,7 +174,7 @@
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
RelativePath="..\FW.h"
RelativePath="..\GS.h"
>
</File>
<File
@ -187,11 +187,11 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
RelativePath=".\FireWireNull.def"
RelativePath=".\GS.def"
>
</File>
<File
RelativePath=".\FireWireNull.rc"
RelativePath=".\GS.rc"
>
</File>
</Filter>

8
plugins/GSnull/Windows/Win32.cpp
View File

@ -4,7 +4,7 @@
#include "resource.h"
#include "../FW.h"
#include "../GS.h"
HINSTANCE hInst;
@ -15,7 +15,7 @@ void SysMessage(char *fmt, ...) {
va_start(list,fmt);
vsprintf(tmp,fmt,list);
va_end(list);
MessageBox(0, tmp, "FW Plugin Msg", 0);
MessageBox(0, tmp, "GS Plugin Msg", 0);
}
BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
@ -58,14 +58,14 @@ BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
return FALSE;
}
void CALLBACK FWconfigure() {
EXPORT_C_(void) GSconfigure() {
DialogBox(hInst,
MAKEINTRESOURCE(IDD_CONFIG),
GetActiveWindow(),
(DLGPROC)ConfigureDlgProc);
}
void CALLBACK FWabout() {
EXPORT_C_(void) GSabout() {
DialogBox(hInst,
MAKEINTRESOURCE(IDD_ABOUT),
GetActiveWindow(),