From d507246033898ddd5f9c09dba22579caf2fb6347 Mon Sep 17 00:00:00 2001 From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:33:55 -0800 Subject: [PATCH] c# side for previous commit --- src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs | 4 ++-- .../Arcades/MAME/MAME.IVideoProvider.cs | 4 ++-- src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs | 7 +------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs index 9569b5ebb8..51e4e8bbd5 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs @@ -100,7 +100,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME // get double [BizImport(cc)] - public abstract void mame_lua_get_double(string code, out double ret); + public abstract double mame_lua_get_double(string code); // get string [BizImport(cc)] @@ -108,6 +108,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME // free string [BizImport(cc)] - public abstract bool mame_lua_free_string(IntPtr pointer); + public abstract void mame_lua_free_string(IntPtr pointer); } } diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IVideoProvider.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IVideoProvider.cs index bf3f4546d9..b918039771 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IVideoProvider.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IVideoProvider.cs @@ -34,8 +34,8 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME private void UpdateAspect() { - _core.mame_lua_get_double(MAMELuaCommand.GetBoundX, out var x); - _core.mame_lua_get_double(MAMELuaCommand.GetBoundY, out var y); + var x = _core.mame_lua_get_double(MAMELuaCommand.GetBoundX); + var y = _core.mame_lua_get_double(MAMELuaCommand.GetBoundY); VirtualHeight = BufferWidth > BufferHeight * x / y ? (int)Math.Round(BufferWidth * y / x) : BufferHeight; diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs index 3e672edeb1..9d5c2b9bd7 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs @@ -188,12 +188,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME } var ret = Marshal.PtrToStringAnsi(ptr, lengthInBytes); - - if (!_core.mame_lua_free_string(ptr)) - { - Console.WriteLine("LibMAME ERROR: string buffer wasn't freed"); - } - + _core.mame_lua_free_string(ptr); return ret; }