d3d10: Use CRT allocation functions.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>

d3d10: Use CRT allocation functions.
b9a61cde · Nikolay Sivov · Alexandre Julliard · 24c900b9 · b9a61cde · b9a61cde
Commit b9a61cde authored Jul 12, 2022 by Nikolay Sivov Committed by Alexandre Julliard Jul 12, 2022
Expand all Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

d3d10_private.h dlls/d3d10/d3d10_private.h +0 -1

effect.c dlls/d3d10/effect.c +0 -0

stateblock.c dlls/d3d10/stateblock.c +2 -2

No files found.
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -24,7 +24,6 @@

 #include "wine/debug.h"
 #include "wine/rbtree.h"
-#include "wine/heap.h"

 #define COBJMACROS
 #include "winbase.h"

--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
--- a/dlls/d3d10/stateblock.c
+++ b/dlls/d3d10/stateblock.c
@@ -310,7 +310,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface)
    {
        stateblock_cleanup(stateblock);
        ID3D10Device_Release(stateblock->device);
-        heap_free(stateblock);
+        free(stateblock);
    }

    return refcount;
@@ -557,7 +557,7 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device,

    TRACE("device %p, mask %p, stateblock %p.\n", device, mask, stateblock);

-    if (!(object = heap_alloc_zero(sizeof(*object))))
+    if (!(object = calloc(1, sizeof(*object))))
    {
        ERR("Failed to allocate D3D10 stateblock object memory.\n");
        return E_OUTOFMEMORY;