ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 06:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix incorrect fixed usage, remove api9 safety code from UiBuilder (#1893)

Browse source 
* fix incorrect fixed usage

* UiBuilder: remove leftover api9 safety code
This commit is contained in:
srkizer 2024-07-04 19:02:37 +09:00 • committed by GitHub
parent 2272848cd3
commit 336d85363e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Interface/Textures/Internal/TextureManager.Wic.cs
View file

@ -247,13 +247,15 @@ internal sealed partial class TextureManager
fixed (Guid* piidWicImagingFactory = &IID.IID_IWICImagingFactory) fixed (Guid* piidWicImagingFactory = &IID.IID_IWICImagingFactory)
fixed (Guid* pclsidWicImagingFactory2 = &CLSID.CLSID_WICImagingFactory2) fixed (Guid* pclsidWicImagingFactory2 = &CLSID.CLSID_WICImagingFactory2)
fixed (Guid* piidWicImagingFactory2 = &IID.IID_IWICImagingFactory2) fixed (Guid* piidWicImagingFactory2 = &IID.IID_IWICImagingFactory2)
fixed (IWICImagingFactory** ppWicFactory = &this.wicFactory.GetPinnableReference())
fixed (IWICImagingFactory2** ppWicFactory2 = &this.wicFactory2.GetPinnableReference())
{ {
if (CoCreateInstance( if (CoCreateInstance(
pclsidWicImagingFactory2, pclsidWicImagingFactory2,
null, null,
(uint)CLSCTX.CLSCTX_INPROC_SERVER, (uint)CLSCTX.CLSCTX_INPROC_SERVER,
piidWicImagingFactory2, piidWicImagingFactory2,
(void**)this.wicFactory2.GetAddressOf()).SUCCEEDED) (void**)ppWicFactory2).SUCCEEDED)
{ {
this.wicFactory2.As(ref this.wicFactory).ThrowOnError(); this.wicFactory2.As(ref this.wicFactory).ThrowOnError();
} }
@ -264,7 +266,7 @@ internal sealed partial class TextureManager
null, null,
(uint)CLSCTX.CLSCTX_INPROC_SERVER, (uint)CLSCTX.CLSCTX_INPROC_SERVER,
piidWicImagingFactory, piidWicImagingFactory,
(void**)this.wicFactory.GetAddressOf()).ThrowOnError(); (void**)ppWicFactory).ThrowOnError();
} }
} }
} }

4
Dalamud/Interface/UiBuilder.cs
View file

@ -694,10 +694,6 @@ public sealed class UiBuilder : IDisposable, IUiBuilder
this.ShowUi?.InvokeSafely(); this.ShowUi?.InvokeSafely();
} }
// just in case, if something goes wrong, prevent drawing; otherwise it probably will crash.
if (!this.FontAtlas.BuildTask.IsCompletedSuccessfully)
return;
ImGui.PushID(this.namespaceName); ImGui.PushID(this.namespaceName);
if (DoStats) if (DoStats)
{ {