wined3d: Check volume texture creation errors.

Volumetexture::Release checks for NULL pointers, so releasing a partially created texture works.

wined3d: Check volume texture creation errors.
40111053 · Stefan Dösinger · Alexandre Julliard · 3f5458dc · 40111053
Commit 40111053 authored Feb 19, 2007 by Stefan Dösinger Committed by Alexandre Julliard Feb 20, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

device.c dlls/wined3d/device.c +10 -2

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -939,9 +939,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa

    for (i = 0; i < object->baseTexture.levels; i++)
    {
+        HRESULT hr;
        /* Create the volume */
-        D3DCB_CreateVolume(This->parent, parent, Width, Height, Depth, Format, Pool, Usage,
-                           (IWineD3DVolume **)&object->volumes[i], pSharedHandle);
+        hr = D3DCB_CreateVolume(This->parent, parent, Width, Height, Depth, Format, Pool, Usage,
+                                (IWineD3DVolume **)&object->volumes[i], pSharedHandle);
+
+        if(FAILED(hr)) {
+            ERR("Creating a volume for the volume texture failed(%08x)\n", hr);
+            IWineD3DVolumeTexture_Release((IWineD3DVolumeTexture *) object);
+            *ppVolumeTexture = NULL;
+            return hr;
+        }

        /* Set its container to this object */
        IWineD3DVolume_SetContainer(object->volumes[i], (IWineD3DBase *)object);