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

gsdumpgui: Use PS2EGetLibName instead of PSEGetLibName export.

This commit is contained in:
lightningterror 2020-03-05 07:12:52 +01:00
parent 280553b41f
commit 6f8dbe589c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/GSDumpGUI/Forms/Helper/GsdxDllFinder.cs
View File

@ -50,10 +50,10 @@ namespace GSDumpGUI.Forms.Helper
dll = new GsFile dll = new GsFile
{ {
DisplayText = availableDll.Name + " | " + wrap.PSEGetLibName(), DisplayText = availableDll.Name + " | " + wrap.PS2EGetLibName(),
File = availableDll File = availableDll
}; };
_logger.Information($"'{availableDll}' correctly identified as '{wrap.PSEGetLibName()}'"); _logger.Information($"'{availableDll}' correctly identified as '{wrap.PS2EGetLibName()}'");
wrap.Unload(); wrap.Unload();
} }

10
tools/GSDumpGUI/Library/GSDXWrapper.cs
View File

@ -45,7 +45,7 @@ namespace GSDumpGUI
public delegate void GSshutdown(); public delegate void GSshutdown();
public delegate void GSConfigure(); public delegate void GSConfigure();
public delegate void GSsetBaseMem(IntPtr data); public delegate void GSsetBaseMem(IntPtr data);
public delegate IntPtr PSEgetLibName(); public delegate IntPtr PS2EgetLibName();
public delegate void GSinit(); public delegate void GSinit();
public delegate UInt32 GSmakeSnapshot(string path); public delegate UInt32 GSmakeSnapshot(string path);
@ -59,7 +59,7 @@ namespace GSDumpGUI
static public bool DumpTooOld = false; static public bool DumpTooOld = false;
private GSConfigure gsConfigure; private GSConfigure gsConfigure;
private PSEgetLibName PsegetLibName; private PS2EgetLibName Ps2egetLibName;
private GSgifTransfer GSgifTransfer; private GSgifTransfer GSgifTransfer;
private GSgifTransfer1 GSgifTransfer1; private GSgifTransfer1 GSgifTransfer1;
private GSgifTransfer2 GSgifTransfer2; private GSgifTransfer2 GSgifTransfer2;
@ -133,7 +133,7 @@ namespace GSDumpGUI
throw new InvalidGSPlugin(""); throw new InvalidGSPlugin("");
gsConfigure = (GSConfigure) Marshal.GetDelegateForFunctionPointer(funcaddrConfig, typeof(GSConfigure)); gsConfigure = (GSConfigure) Marshal.GetDelegateForFunctionPointer(funcaddrConfig, typeof(GSConfigure));
PsegetLibName = (PSEgetLibName) Marshal.GetDelegateForFunctionPointer(funcaddrLibName, typeof(PSEgetLibName)); Ps2egetLibName = (PS2EgetLibName) Marshal.GetDelegateForFunctionPointer(funcaddrLibName, typeof(PS2EgetLibName));
this.GSgifTransfer = (GSgifTransfer) Marshal.GetDelegateForFunctionPointer(funcaddrGIF, typeof(GSgifTransfer)); this.GSgifTransfer = (GSgifTransfer) Marshal.GetDelegateForFunctionPointer(funcaddrGIF, typeof(GSgifTransfer));
this.GSgifTransfer1 = (GSgifTransfer1) Marshal.GetDelegateForFunctionPointer(funcaddrGIF1, typeof(GSgifTransfer1)); this.GSgifTransfer1 = (GSgifTransfer1) Marshal.GetDelegateForFunctionPointer(funcaddrGIF1, typeof(GSgifTransfer1));
@ -184,11 +184,11 @@ namespace GSDumpGUI
gsConfigure.Invoke(); gsConfigure.Invoke();
} }
public String PSEGetLibName() public String PS2EGetLibName()
{ {
if (!Loaded) if (!Loaded)
throw new Exception("GSdx is not loaded"); throw new Exception("GSdx is not loaded");
return Marshal.PtrToStringAnsi(PsegetLibName.Invoke()); return Marshal.PtrToStringAnsi(Ps2egetLibName.Invoke());
} }
public unsafe void Run(GSDump dump, int rendererOverride) public unsafe void Run(GSDump dump, int rendererOverride)