From b3b2f0921c8c7fef4aa280f79eec7441eefb99ee Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Wed, 14 Jul 2021 17:24:41 +0200
Subject: [PATCH] [d3d9] Never init pSharedHandle.

This parameter has three different meanings if it's non NULL:
- if Pool is D3DPOOL_SYSTEMMEM it's a host pointer for inital data
- if it points to a nullptr it's a output handle
- if it's a pointer to non NULL pointer it's an import handle
---
 src/d3d9/d3d9_device.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
index deee4f2a1..641df2302 100644
--- a/src/d3d9/d3d9_device.cpp
+++ b/src/d3d9/d3d9_device.cpp
@@ -406,8 +406,6 @@ namespace dxvk {
 
       if (Pool == D3DPOOL_SYSTEMMEM && Levels == 1 && pSharedHandle != nullptr)
         initialData = *(reinterpret_cast<void**>(pSharedHandle));
-      else // This must be a shared resource.
-        InitReturnPtr(pSharedHandle);
 
       m_initializer->InitTexture(texture->GetCommonTexture(), initialData);
       *ppTexture = texture.ref();
@@ -432,7 +430,6 @@ namespace dxvk {
           IDirect3DVolumeTexture9** ppVolumeTexture,
           HANDLE*                   pSharedHandle) {
     InitReturnPtr(ppVolumeTexture);
-    InitReturnPtr(pSharedHandle);
 
     if (unlikely(ppVolumeTexture == nullptr))
       return D3DERR_INVALIDCALL;
@@ -478,7 +475,6 @@ namespace dxvk {
           IDirect3DCubeTexture9** ppCubeTexture,
           HANDLE*                 pSharedHandle) {
     InitReturnPtr(ppCubeTexture);
-    InitReturnPtr(pSharedHandle);
 
     if (unlikely(ppCubeTexture == nullptr))
       return D3DERR_INVALIDCALL;
@@ -3395,7 +3391,6 @@ namespace dxvk {
           HANDLE*             pSharedHandle,
           DWORD               Usage) {
     InitReturnPtr(ppSurface);
-    InitReturnPtr(pSharedHandle);
 
     if (unlikely(ppSurface == nullptr))
       return D3DERR_INVALIDCALL;
@@ -3440,7 +3435,6 @@ namespace dxvk {
           HANDLE*             pSharedHandle,
           DWORD               Usage) {
     InitReturnPtr(ppSurface);
-    InitReturnPtr(pSharedHandle);
 
     if (unlikely(ppSurface == nullptr))
       return D3DERR_INVALIDCALL;
@@ -3487,7 +3481,6 @@ namespace dxvk {
           HANDLE*             pSharedHandle,
           DWORD               Usage) {
     InitReturnPtr(ppSurface);
-    InitReturnPtr(pSharedHandle);
 
     if (unlikely(ppSurface == nullptr))
       return D3DERR_INVALIDCALL;