mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-12 18:27:23 +01:00
Remove old PInvoke libs
This commit is contained in:
parent
90b15d45c6
commit
4e724fbe45
8 changed files with 11 additions and 17 deletions
|
|
@ -13,9 +13,9 @@ using Dalamud.Plugin.Internal;
|
||||||
using Dalamud.Storage;
|
using Dalamud.Storage;
|
||||||
using Dalamud.Utility;
|
using Dalamud.Utility;
|
||||||
using Dalamud.Utility.Timing;
|
using Dalamud.Utility.Timing;
|
||||||
using PInvoke;
|
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Windows.Win32.Foundation;
|
using Windows.Win32.Foundation;
|
||||||
|
using Windows.Win32.Security;
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
[assembly: InternalsVisibleTo("Dalamud.CorePlugin")]
|
[assembly: InternalsVisibleTo("Dalamud.CorePlugin")]
|
||||||
|
|
@ -171,8 +171,9 @@ internal sealed unsafe class Dalamud : IServiceType
|
||||||
if (!reportCrashesSetting && !pmHasDevPlugins)
|
if (!reportCrashesSetting && !pmHasDevPlugins)
|
||||||
{
|
{
|
||||||
// Leaking on purpose for now
|
// Leaking on purpose for now
|
||||||
var attribs = Kernel32.SECURITY_ATTRIBUTES.Create();
|
var attribs = default(SECURITY_ATTRIBUTES);
|
||||||
Kernel32.CreateMutex(attribs, false, "DALAMUD_CRASHES_NO_MORE");
|
attribs.nLength = (uint)Unsafe.SizeOf<SECURITY_ATTRIBUTES>();
|
||||||
|
Windows.Win32.PInvoke.CreateMutex(attribs, false, "DALAMUD_CRASHES_NO_MORE");
|
||||||
}
|
}
|
||||||
|
|
||||||
this.unloadSignal.Set();
|
this.unloadSignal.Set();
|
||||||
|
|
|
||||||
|
|
@ -74,10 +74,6 @@
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="MinSharp" Version="1.0.4" />
|
<PackageReference Include="MinSharp" Version="1.0.4" />
|
||||||
<PackageReference Include="PInvoke.DwmApi" Version="0.7.104" />
|
|
||||||
<PackageReference Include="PInvoke.Kernel32" Version="0.7.104" />
|
|
||||||
<PackageReference Include="PInvoke.User32" Version="0.7.104" />
|
|
||||||
<PackageReference Include="PInvoke.Win32" Version="0.7.104" />
|
|
||||||
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
|
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
|
||||||
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
|
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
|
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
using System.ComponentModel;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
|
@ -16,7 +17,6 @@ using Dalamud.Storage;
|
||||||
using Dalamud.Support;
|
using Dalamud.Support;
|
||||||
using Dalamud.Utility;
|
using Dalamud.Utility;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using PInvoke;
|
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Serilog.Core;
|
using Serilog.Core;
|
||||||
using Serilog.Events;
|
using Serilog.Events;
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,7 @@ using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
using Dalamud.Memory;
|
|
||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
using PInvoke;
|
|
||||||
using Windows.Win32.System.Memory;
|
using Windows.Win32.System.Memory;
|
||||||
|
|
||||||
using Win32Exception = System.ComponentModel.Win32Exception;
|
using Win32Exception = System.ComponentModel.Win32Exception;
|
||||||
|
|
|
||||||
|
|
@ -40,13 +40,12 @@ using Dalamud.Utility;
|
||||||
using FFXIVClientStructs.FFXIV.Client.System.Framework;
|
using FFXIVClientStructs.FFXIV.Client.System.Framework;
|
||||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||||
using PInvoke;
|
|
||||||
using Serilog.Events;
|
using Serilog.Events;
|
||||||
|
|
||||||
namespace Dalamud.Interface.Internal;
|
namespace Dalamud.Interface.Internal;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This plugin implements all of the Dalamud interface separately, to allow for reloading of the interface and rapid prototyping.
|
/// This plugin implements all the Dalamud interface separately, to allow for reloading of the interface and rapid prototyping.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[ServiceManager.EarlyLoadedService]
|
[ServiceManager.EarlyLoadedService]
|
||||||
internal class DalamudInterface : IInternalDisposableService
|
internal class DalamudInterface : IInternalDisposableService
|
||||||
|
|
@ -575,7 +574,7 @@ internal class DalamudInterface : IInternalDisposableService
|
||||||
|
|
||||||
// Release focus of any ImGui window if we click into the game.
|
// Release focus of any ImGui window if we click into the game.
|
||||||
var io = ImGui.GetIO();
|
var io = ImGui.GetIO();
|
||||||
if (!io.WantCaptureMouse && (User32.GetKeyState((int)User32.VirtualKey.VK_LBUTTON) & 0x8000) != 0)
|
if (!io.WantCaptureMouse && (global::Windows.Win32.PInvoke.GetKeyState((int)VirtualKey.LBUTTON) & 0x8000) != 0)
|
||||||
{
|
{
|
||||||
unsafe
|
unsafe
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
using Dalamud.Bindings.ImGui;
|
using Dalamud.Bindings.ImGui;
|
||||||
using Dalamud.Hooking;
|
using Dalamud.Hooking;
|
||||||
using PInvoke;
|
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Windows.Win32.Foundation;
|
using Windows.Win32.Foundation;
|
||||||
using Windows.Win32.UI.WindowsAndMessaging;
|
using Windows.Win32.UI.WindowsAndMessaging;
|
||||||
|
|
@ -81,7 +80,7 @@ internal class HookWidget : IDataWindowWidget
|
||||||
|
|
||||||
var result = this.messageBoxMinHook!.Original(hwnd, "Cause Access Violation?", caption, MESSAGEBOX_STYLE.MB_YESNO);
|
var result = this.messageBoxMinHook!.Original(hwnd, "Cause Access Violation?", caption, MESSAGEBOX_STYLE.MB_YESNO);
|
||||||
|
|
||||||
if (result == (int)User32.MessageBoxResult.IDYES)
|
if (result == (int)MESSAGEBOX_RESULT.IDYES)
|
||||||
{
|
{
|
||||||
Marshal.ReadByte(IntPtr.Zero);
|
Marshal.ReadByte(IntPtr.Zero);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ using Dalamud.Logging.Internal;
|
||||||
using Dalamud.Utility;
|
using Dalamud.Utility;
|
||||||
|
|
||||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||||
using PInvoke;
|
|
||||||
|
|
||||||
namespace Dalamud.Interface.Windowing;
|
namespace Dalamud.Interface.Windowing;
|
||||||
|
|
||||||
|
|
@ -732,7 +731,7 @@ public abstract class Window
|
||||||
hovered = true;
|
hovered = true;
|
||||||
|
|
||||||
// We can't use ImGui native functions here, because they don't work with clickthrough
|
// We can't use ImGui native functions here, because they don't work with clickthrough
|
||||||
if ((User32.GetKeyState((int)VirtualKey.LBUTTON) & 0x8000) != 0)
|
if ((global::Windows.Win32.PInvoke.GetKeyState((int)VirtualKey.LBUTTON) & 0x8000) != 0)
|
||||||
{
|
{
|
||||||
held = true;
|
held = true;
|
||||||
pressed = true;
|
pressed = true;
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,13 @@ SetWindowPos
|
||||||
SetForegroundWindow
|
SetForegroundWindow
|
||||||
SetFocus
|
SetFocus
|
||||||
SetActiveWindow
|
SetActiveWindow
|
||||||
|
GetKeyState
|
||||||
HWND_TOPMOST
|
HWND_TOPMOST
|
||||||
HWND_NOTOPMOST
|
HWND_NOTOPMOST
|
||||||
SET_WINDOW_POS_FLAGS
|
SET_WINDOW_POS_FLAGS
|
||||||
|
|
||||||
SetEvent
|
SetEvent
|
||||||
|
CreateMutex
|
||||||
|
|
||||||
SymInitialize
|
SymInitialize
|
||||||
SymCleanup
|
SymCleanup
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue