From 6f8dbe589c40138f23a977c327676cf744399f19 Mon Sep 17 00:00:00 2001 From: lightningterror Date: Thu, 5 Mar 2020 07:12:52 +0100 Subject: [PATCH] gsdumpgui: Use PS2EGetLibName instead of PSEGetLibName export. --- tools/GSDumpGUI/Forms/Helper/GsdxDllFinder.cs | 4 ++-- tools/GSDumpGUI/Library/GSDXWrapper.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/GSDumpGUI/Forms/Helper/GsdxDllFinder.cs b/tools/GSDumpGUI/Forms/Helper/GsdxDllFinder.cs index 5fbe159071..f47b103df6 100644 --- a/tools/GSDumpGUI/Forms/Helper/GsdxDllFinder.cs +++ b/tools/GSDumpGUI/Forms/Helper/GsdxDllFinder.cs @@ -50,10 +50,10 @@ namespace GSDumpGUI.Forms.Helper dll = new GsFile { - DisplayText = availableDll.Name + " | " + wrap.PSEGetLibName(), + DisplayText = availableDll.Name + " | " + wrap.PS2EGetLibName(), File = availableDll }; - _logger.Information($"'{availableDll}' correctly identified as '{wrap.PSEGetLibName()}'"); + _logger.Information($"'{availableDll}' correctly identified as '{wrap.PS2EGetLibName()}'"); wrap.Unload(); } diff --git a/tools/GSDumpGUI/Library/GSDXWrapper.cs b/tools/GSDumpGUI/Library/GSDXWrapper.cs index 5c8e9c6824..b837c38d84 100644 --- a/tools/GSDumpGUI/Library/GSDXWrapper.cs +++ b/tools/GSDumpGUI/Library/GSDXWrapper.cs @@ -45,7 +45,7 @@ namespace GSDumpGUI public delegate void GSshutdown(); public delegate void GSConfigure(); public delegate void GSsetBaseMem(IntPtr data); - public delegate IntPtr PSEgetLibName(); + public delegate IntPtr PS2EgetLibName(); public delegate void GSinit(); public delegate UInt32 GSmakeSnapshot(string path); @@ -59,7 +59,7 @@ namespace GSDumpGUI static public bool DumpTooOld = false; private GSConfigure gsConfigure; - private PSEgetLibName PsegetLibName; + private PS2EgetLibName Ps2egetLibName; private GSgifTransfer GSgifTransfer; private GSgifTransfer1 GSgifTransfer1; private GSgifTransfer2 GSgifTransfer2; @@ -133,7 +133,7 @@ namespace GSDumpGUI throw new InvalidGSPlugin(""); 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.GSgifTransfer1 = (GSgifTransfer1) Marshal.GetDelegateForFunctionPointer(funcaddrGIF1, typeof(GSgifTransfer1)); @@ -184,11 +184,11 @@ namespace GSDumpGUI gsConfigure.Invoke(); } - public String PSEGetLibName() + public String PS2EGetLibName() { if (!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)