fix(fg): validate native creation before publishing or logging handles

Author: abc354402600

.github/workflows/just_build_no_signature.yml

@@ -128,7 +128,7 @@ jobs:
         $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
         $vs = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
         $vcvars = Join-Path $vs 'VC\Auxiliary\Build\vcvars64.bat'
-        foreach ($name in @('Aurora_DLSSG_Frame_Guard_Tests','Aurora_Provider_Handle_Tests','Aurora_Input_Lock_Tests','Aurora_Streamline_Binding_Tests')) {
+        foreach ($name in @('Aurora_DLSSG_Frame_Guard_Tests','Aurora_Provider_Handle_Tests','Aurora_Input_Lock_Tests','Aurora_Streamline_Binding_Tests','Aurora_Provider_Create_Tests')) {
             $command = 'call "' + $vcvars + '" && cl /nologo /EHsc /std:c++20 /I OptiScaler tests\' + $name + '.cpp /Fe:x64\' + $name + '.exe && x64\' + $name + '.exe'
             & $env:ComSpec /d /c $command
             if ($LASTEXITCODE) { throw "Compatibility guard test failed: $name" }

OptiScaler/framegen/ProviderHandleCreation.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <utility>
+
+// Keep the caller's output empty until native creation and validation both
+// succeed. Error returns must not publish wrappers around absent native handles.
+template <typename PublicHandle, typename Registry, typename Value, typename Result, typename Create>
+Result CreateProviderHandle(Registry& registry, PublicHandle** output, Value initial, Result success,
+                            Result invalidParameter, Result malformedSuccess, Create&& create)
+{
+    if (!output)
+        return invalidParameter;
+    *output = nullptr;
+    auto pending = registry.Prepare(std::move(initial));
+    const auto result = std::forward<Create>(create)(pending->value);
+    if (result != success)
+        return result;
+    if (!pending->value.nativeHandle)
+        return malformedSuccess;
+    *output = reinterpret_cast<PublicHandle*>(registry.Publish(pending));
+    return result;
+}

OptiScaler/framegen/nvngx/Nvngx_FG.cpp

@@ -2,6 +2,7 @@
 
 #include <NVNGX_Parameter.h>
 #include "Nvngx_FG.h"
+#include <framegen/ProviderHandleCreation.h>
 
 #include "proxies/NVNGX_Proxy.h"
 #include "proxies/Ntdll_Proxy.h"
@@ -267,26 +268,16 @@ NVSDK_NGX_Result Nvngx_FG::D3D12_GetScratchBufferSize(NVSDK_NGX_Feature InFeatur
 NVSDK_NGX_Result Nvngx_FG::D3D12_CreateFeature(ID3D12GraphicsCommandList* InCmdList, NVSDK_NGX_Feature InFeatureID,
                                                NVSDK_NGX_Parameter* InParameters, NVSDK_NGX_Handle** OutHandle)
 {
-    auto* provider = getProvider();
-
-    if (!provider)
-        return NVSDK_NGX_Result_Fail;
-
-    if (!OutHandle)
-        return NVSDK_NGX_Result_FAIL_InvalidParameter;
-
-    auto pending = _handles.Prepare({ lastIdCreated++ + NVNGX_PROVIDER_ID_OFFSET });
-    auto* proxyHandle = &pending->value;
-    *OutHandle = nullptr;
-
-    auto result = provider->D3D12_CreateFeature(InCmdList, InFeatureID, InParameters, &proxyHandle->nativeHandle);
-
-    if (result == NVSDK_NGX_Result_Success)
-        *OutHandle = reinterpret_cast<NVSDK_NGX_Handle*>(_handles.Publish(pending));
-
-    // LOG_TRACE("Handle given to the game: {:X}", (uint64_t) *OutHandle);
-
-    return result;
+    return CreateProviderHandle(_handles, OutHandle, Nvngx_FG_Handle { lastIdCreated++ + NVNGX_PROVIDER_ID_OFFSET },
+                                NVSDK_NGX_Result_Success, NVSDK_NGX_Result_FAIL_InvalidParameter, NVSDK_NGX_Result_Fail,
+                                [&](Nvngx_FG_Handle& handle)
+                                {
+                                    auto* provider = getProvider();
+                                    if (!provider)
+                                        return NVSDK_NGX_Result_Fail;
+                                    return provider->D3D12_CreateFeature(InCmdList, InFeatureID, InParameters,
+                                                                         &handle.nativeHandle);
+                                });
 }
 
 NVSDK_NGX_Result Nvngx_FG::D3D12_ReleaseFeature(NVSDK_NGX_Handle* InHandle)
@@ -476,51 +467,32 @@ NVSDK_NGX_Result Nvngx_FG::VULKAN_GetScratchBufferSize(NVSDK_NGX_Feature InFeatu
 NVSDK_NGX_Result Nvngx_FG::VULKAN_CreateFeature(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Feature InFeatureID,
                                                 NVSDK_NGX_Parameter* InParameters, NVSDK_NGX_Handle** OutHandle)
 {
-    auto* provider = getProvider();
-
-    if (!provider)
-        return NVSDK_NGX_Result_Fail;
-
-    if (!OutHandle)
-        return NVSDK_NGX_Result_FAIL_InvalidParameter;
-
-    auto pending = _handles.Prepare({ lastIdCreated++ + NVNGX_PROVIDER_ID_OFFSET });
-    auto* proxyHandle = &pending->value;
-    *OutHandle = nullptr;
-    auto result = provider->VULKAN_CreateFeature(InCmdBuffer, InFeatureID, InParameters, &proxyHandle->nativeHandle);
-
-    if (result == NVSDK_NGX_Result_Success)
-        *OutHandle = reinterpret_cast<NVSDK_NGX_Handle*>(_handles.Publish(pending));
-
-    // LOG_TRACE("Handle given to the game: {:X}", (uint64_t) *OutHandle);
-
-    return result;
+    return CreateProviderHandle(_handles, OutHandle, Nvngx_FG_Handle { lastIdCreated++ + NVNGX_PROVIDER_ID_OFFSET },
+                                NVSDK_NGX_Result_Success, NVSDK_NGX_Result_FAIL_InvalidParameter, NVSDK_NGX_Result_Fail,
+                                [&](Nvngx_FG_Handle& handle)
+                                {
+                                    auto* provider = getProvider();
+                                    if (!provider)
+                                        return NVSDK_NGX_Result_Fail;
+                                    return provider->VULKAN_CreateFeature(InCmdBuffer, InFeatureID, InParameters,
+                                                                          &handle.nativeHandle);
+                                });
 }
 
 NVSDK_NGX_Result Nvngx_FG::VULKAN_CreateFeature1(VkDevice InDevice, VkCommandBuffer InCmdList,
                                                  NVSDK_NGX_Feature InFeatureID, NVSDK_NGX_Parameter* InParameters,
                                                  NVSDK_NGX_Handle** OutHandle)
 {
-    auto* provider = getProvider();
-
-    if (!provider)
-        return NVSDK_NGX_Result_Fail;
-
-    if (!OutHandle)
-        return NVSDK_NGX_Result_FAIL_InvalidParameter;
-
-    auto pending = _handles.Prepare({ lastIdCreated++ + NVNGX_PROVIDER_ID_OFFSET });
-    auto* proxyHandle = &pending->value;
-    *OutHandle = nullptr;
-    auto result =
-        provider->VULKAN_CreateFeature1(InDevice, InCmdList, InFeatureID, InParameters, &proxyHandle->nativeHandle);
-
-    if (result == NVSDK_NGX_Result_Success)
-        *OutHandle = reinterpret_cast<NVSDK_NGX_Handle*>(_handles.Publish(pending));
-
-    // LOG_TRACE("Handle given to the game: {:X}", (uint64_t) *OutHandle);
-
-    return result;
+    return CreateProviderHandle(_handles, OutHandle, Nvngx_FG_Handle { lastIdCreated++ + NVNGX_PROVIDER_ID_OFFSET },
+                                NVSDK_NGX_Result_Success, NVSDK_NGX_Result_FAIL_InvalidParameter, NVSDK_NGX_Result_Fail,
+                                [&](Nvngx_FG_Handle& handle)
+                                {
+                                    auto* provider = getProvider();
+                                    if (!provider)
+                                        return NVSDK_NGX_Result_Fail;
+                                    return provider->VULKAN_CreateFeature1(InDevice, InCmdList, InFeatureID,
+                                                                           InParameters, &handle.nativeHandle);
+                                });
 }
 
 NVSDK_NGX_Result Nvngx_FG::VULKAN_ReleaseFeature(NVSDK_NGX_Handle* InHandle)

OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp

@@ -743,17 +743,16 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_CreateFeature(ID3D12GraphicsComma
 {
     LOG_FUNC();
 
+    if (!OutHandle)
+        return NVSDK_NGX_Result_FAIL_InvalidParameter;
+    *OutHandle = nullptr;
+
     if (!InCmdList)
     {
         LOG_ERROR("InCmdList is null");
         return NVSDK_NGX_Result_Fail;
     }
 
-    if (!OutHandle)
-    {
-        LOG_ERROR("OutHandle is null");
-        return NVSDK_NGX_Result_Fail;
-    }
 
     const State& state = State::Instance();
     const Config& cfg = *Config::Instance();
@@ -766,7 +765,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_CreateFeature(ID3D12GraphicsComma
 
         NVSDK_NGX_Result res = Nvngx_FG::D3D12_CreateFeature(InCmdList, InFeatureID, InParameters, OutHandle);
 
-        if (*OutHandle)
+        if (res == NVSDK_NGX_Result_Success && *OutHandle)
         {
             LOG_INFO("Created modded DLSSG feature with HandleId: {}", (*OutHandle)->Id);
             HandleToFeature[(*OutHandle)->Id] = InFeatureID;
@@ -785,7 +784,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_CreateFeature(ID3D12GraphicsComma
 
             NVSDK_NGX_Result res = NVNGXProxy::D3D12_CreateFeature()(InCmdList, InFeatureID, InParameters, OutHandle);
 
-            if (*OutHandle)
+            if (res == NVSDK_NGX_Result_Success && *OutHandle)
             {
                 LOG_INFO("Native CreateFeature success, HandleId: {}", (*OutHandle)->Id);
                 HandleToFeature[(*OutHandle)->Id] = InFeatureID;

OptiScaler/inputs/NVNGX_DLSS_Vk.cpp

@@ -818,10 +818,17 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_CreateFeature1(VkDevice InDevice
                                                                NVSDK_NGX_Parameter* InParameters,
                                                                NVSDK_NGX_Handle** OutHandle)
 {
+    if (!OutHandle)
+        return NVSDK_NGX_Result_FAIL_InvalidParameter;
+    *OutHandle = nullptr;
+
     if (Nvngx_FG::isVulkanAvailable() && InFeatureID == NVSDK_NGX_Feature_FrameGeneration)
     {
         auto result = Nvngx_FG::VULKAN_CreateFeature1(InDevice, InCmdList, InFeatureID, InParameters, OutHandle);
-        LOG_INFO("Creating new modded DLSSG feature with HandleId: {0}", (*OutHandle)->Id);
+        if (result == NVSDK_NGX_Result_Success && *OutHandle)
+            LOG_INFO("Creating new modded DLSSG feature with HandleId: {0}", (*OutHandle)->Id);
+        else
+            LOG_ERROR("Modded DLSSG feature creation failed: {0:X}", (UINT) result);
         return result;
     }
     else if (InFeatureID != NVSDK_NGX_Feature_SuperSampling && InFeatureID != NVSDK_NGX_Feature_RayReconstruction)
@@ -911,12 +918,19 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_CreateFeature(VkCommandBuffer In
                                                               NVSDK_NGX_Parameter* InParameters,
                                                               NVSDK_NGX_Handle** OutHandle)
 {
+    if (!OutHandle)
+        return NVSDK_NGX_Result_FAIL_InvalidParameter;
+    *OutHandle = nullptr;
+
     LOG_FUNC();
 
     if (Nvngx_FG::isVulkanAvailable() && InFeatureID == NVSDK_NGX_Feature_FrameGeneration)
     {
         auto result = Nvngx_FG::VULKAN_CreateFeature(InCmdBuffer, InFeatureID, InParameters, OutHandle);
-        LOG_INFO("Creating new modded DLSSG feature with HandleId: {0}", (*OutHandle)->Id);
+        if (result == NVSDK_NGX_Result_Success && *OutHandle)
+            LOG_INFO("Creating new modded DLSSG feature with HandleId: {0}", (*OutHandle)->Id);
+        else
+            LOG_ERROR("Modded DLSSG feature creation failed: {0:X}", (UINT) result);
         return result;
     }
     else if (InFeatureID != NVSDK_NGX_Feature_SuperSampling && InFeatureID != NVSDK_NGX_Feature_RayReconstruction)

docs/CODEX_HANDOFF.md

@@ -13,6 +13,8 @@ The user abandoned the RC3 one-click installer branch and authorized compatibili
 
 ## Continuation rules
 
+Latest user constraints: no ZZZ installation/feedback is available, and Witcher cannot currently be retested. Keep these as pending validation; continue independent code work without repeatedly requesting game tests. New features are deferred. The user's conditional main-branch merge request requires sufficient stability confidence, which has not yet been established.
+
 Official upstream is `https://github.com/optiscaler/OptiScaler.git`; the local remote named `upstream` is instead the grim-susemi fork. Official audit cutoff is now `a4890db5b3c7c6918f4b35d0fd3318b42e2ccc66`. It adds only the Sword and Fairy 7 quirk after `4af2417b`; adopted with provenance. Nine commits before that, after `731f3b79`, were already reviewed. Do not repeat those audits.
 
 Current package workflow builds this branch and runs production-header frame/handle guard tests. Keep the original installer layout inherited from `aurora`; do not restore RC3 tools.
@@ -21,6 +23,8 @@ The 2026-09-16 continuation adds optional input discovery outside the state lock
 
 The next continuation implements active private Streamline binding after device selection, separates runtime initialization from FG readiness (including Witcher's second-device path), and guards failed Reflex frame-token acquisition. See [Streamline binding audit](STREAMLINE_BINDING_20260916.md), including 23 lifecycle checks and the full-build result. This supersedes the earlier deferred-binding item; provider-global concurrency and actual game verification remain outstanding.
 
+The creation-failure follow-up adds 16 CPU checks and repairs null/stale handle access after failed FG creation in D3D12/Vulkan. See [FG creation audit](FG_CREATION_20260916.md), which also explains why provider construction needs an explicit busy/routing design and why device-specific shutdown cannot simply become a global lock/stop.
+
 The user subsequently provided ZZZ 11008 component-error screenshots and reports of disappearing files, and NTE menu stutter with an NPI workaround. GPU is tentatively RTX 40; exact build, missing filenames, protection history, and crash logs remain unknown. See [NTE/ZZZ follow-up](NTE_ZZZ_COMPATIBILITY.md). Do not confuse component errors, GPU exceptions, and absent FG input. No driver/game settings were changed by this work.
 
 Git network requests on this host have worked with per-command `http.proxy=http://127.0.0.1:7897`; do not alter global proxy or disable TLS verification. Push only `origin Compatibility-fixes`.

docs/FG_CREATION_20260916.md

@@ -0,0 +1,21 @@
+# FG creation failure boundary — 2026-09-16
+
+Continuation from `2bf68763` on `Compatibility-fixes`. The user currently cannot test Witcher and does not own ZZZ; actual game verification is pending and must not block independent source-level work. New features are deferred. No main-branch merge is justified by CPU tests alone.
+
+## Confirmed defects repaired
+
+- Both exported Vulkan FG Create routes logged `(*OutHandle)->Id` unconditionally after provider creation. Failure leaves the output null, so the diagnostic path could itself crash. These routes now validate/clear output and only inspect the handle after successful creation with a non-null result.
+- The D3D12 and Vulkan provider adapters previously returned early for an unavailable provider before clearing a caller's old output, and published wrappers when a native provider returned success with a null native handle. A shared production helper now clears output before provider lookup, retains unpublished wrapper ownership during creation, and publishes only a successful, non-null native handle.
+- D3D12 exported creation clears output before command-list validation and only records/logs native or replacement handles on a successful result. This prevents reading stale outputs on error.
+
+Failed native creation remains the provider's responsibility: Aurora does not guess how to release a pointer written alongside a failure result. C++ exceptions leave output empty and the unpublished wrapper destroyed; this helper does not claim to catch structured exceptions or make foreign binaries safe.
+
+## Focused validation
+
+16 Windows C++ checks exercise the production creation helper and registry: null output without native invocation, clearing stale output before callback, failure/unavailable-provider behavior, no publication on failure, successful return with no native handle, failure that writes a pointer, exception cleanup, successful publication/read and release exactly once. These are CPU failure-path checks, not GPU compatibility evidence.
+
+## Global lifecycle audit remains open
+
+`Nvngx_FG::getProvider` still constructs and exposes a shared provider before fallback validation completes. A concurrent call could observe that provider while another call replaces it. A mutex held across constructors is unsafe because Nukems/Enabler constructors load DLLs and can cause callbacks. A nonblocking construction gate also needs outer routing changes: current D3D12 Create treats a temporarily unavailable replacement as permission to try native NGX, which is not equivalent to a retryable initialization state. This boundary should be solved as a distinct publication/routing change, not by quietly returning null from a locked factory.
+
+Shutdown needs separate ordering work too. The FFX provider's shutdown is a no-op, while DLL providers forward native shutdown; device-specific shutdown must not be replaced by a global stop that disables other devices. Handle-level locks and the creation checks in this checkpoint do not serialize native global shutdown against evaluations. No claim of fixing all lifecycle races or the game's reported crash follows from this patch.