[PATCH v4 3/9] ddraw: Store matrix handle in the global table.

[Paul Gofman]

From: Paul Gofman

---
 dlls/ddraw/device.c        | 19 ++++---------------
 dlls/ddraw/executebuffer.c |  8 ++++----
 dlls/ddraw/main.c          |  4 ++++
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 9677c352258..f903455a177 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -303,14 +303,6 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
                 case DDRAW_HANDLE_FREE:
                     break;

-                case DDRAW_HANDLE_MATRIX:
-                {
-                    /* No FIXME here because this might happen because of sloppy applications. */
-                    WARN("Leftover matrix handle %#lx (%p), deleting.\n", i + 1, entry->object);
-                    IDirect3DDevice_DeleteMatrix(&This->IDirect3DDevice_iface, i + 1);
-                    break;
-                }
-
                 case DDRAW_HANDLE_STATEBLOCK:
                 {
                     /* No FIXME here because this might happen because of sloppy applications. */
@@ -1304,7 +1296,6 @@ static HRESULT WINAPI d3d_device1_EnumTextureFormats(IDirect3DDevice *iface,
  *****************************************************************************/
 static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DMatHandle)
 {
-    struct d3d_device *device = impl_from_IDirect3DDevice(iface);
     D3DMATRIX *matrix;
     DWORD h;

@@ -1321,7 +1312,7 @@ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIX

wined3d_mutex_lock();

-    h = ddraw_allocate_handle(&device->handle_table, matrix, DDRAW_HANDLE_MATRIX);
+    h = ddraw_allocate_handle(NULL, matrix, DDRAW_HANDLE_MATRIX);
     if (h == DDRAW_INVALID_HANDLE)
     {
         ERR("Failed to allocate a matrix handle.\n");
@@ -1370,7 +1361,7 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface,

wined3d_mutex_lock();

-    m = ddraw_get_object(&device->handle_table, matrix_handle - 1, DDRAW_HANDLE_MATRIX);
+    m = ddraw_get_object(NULL, matrix_handle - 1, DDRAW_HANDLE_MATRIX);
     if (!m)
     {
         WARN("Invalid matrix handle.\n");
@@ -1419,7 +1410,6 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface,
 static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface,
         D3DMATRIXHANDLE D3DMatHandle, D3DMATRIX *D3DMatrix)
 {
-    struct d3d_device *device = impl_from_IDirect3DDevice(iface);
     D3DMATRIX *m;

TRACE("iface %p, matrix_handle %#lx, matrix %p.\n", iface, D3DMatHandle, D3DMatrix);
@@ -1428,7 +1418,7 @@ static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface,

wined3d_mutex_lock();

-    m = ddraw_get_object(&device->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
+    m = ddraw_get_object(NULL, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
     if (!m)
     {
         WARN("Invalid matrix handle.\n");
@@ -1460,14 +1450,13 @@ static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface,
  *****************************************************************************/
 static HRESULT WINAPI d3d_device1_DeleteMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE D3DMatHandle)
 {
-    struct d3d_device *device = impl_from_IDirect3DDevice(iface);
     D3DMATRIX *m;

TRACE("iface %p, matrix_handle %#lx.\n", iface, D3DMatHandle);

wined3d_mutex_lock();

-    m = ddraw_free_handle(&device->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
+    m = ddraw_free_handle(NULL, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
     if (!m)
     {
         WARN("Invalid matrix handle.\n");
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index c6988a3347b..0cf0bf121f3 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -209,9 +209,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
                     D3DMATRIXMULTIPLY *ci = (D3DMATRIXMULTIPLY *)instr;
                     struct wined3d_matrix *a, *b, *c;

-                    a = ddraw_get_object(&device->handle_table, ci->hDestMatrix - 1, DDRAW_HANDLE_MATRIX);
-                    b = ddraw_get_object(&device->handle_table, ci->hSrcMatrix1 - 1, DDRAW_HANDLE_MATRIX);
-                    c = ddraw_get_object(&device->handle_table, ci->hSrcMatrix2 - 1, DDRAW_HANDLE_MATRIX);
+                    a = ddraw_get_object(NULL, ci->hDestMatrix - 1, DDRAW_HANDLE_MATRIX);
+                    b = ddraw_get_object(NULL, ci->hSrcMatrix1 - 1, DDRAW_HANDLE_MATRIX);
+                    c = ddraw_get_object(NULL, ci->hSrcMatrix2 - 1, DDRAW_HANDLE_MATRIX);

if (!a || !b || !c)
                     {
@@ -235,7 +235,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
                     D3DSTATE *ci = (D3DSTATE *)instr;
                     D3DMATRIX *m;

-                    m = ddraw_get_object(&device->handle_table, ci->dwArg[0] - 1, DDRAW_HANDLE_MATRIX);
+                    m = ddraw_get_object(NULL, ci->dwArg[0] - 1, DDRAW_HANDLE_MATRIX);
                     if (!m)
                     {
                         ERR("Invalid matrix handle %#lx.\n", ci->dwArg[0]);
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 7c5628fd47a..fe45071c138 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -942,6 +942,10 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
                         WARN("Texture handle %#x (%p) not unset properly.\n", i + 1, entry->object);
                         break;

+                    case DDRAW_HANDLE_MATRIX:
+                        WARN("Leftover matrix handle %#x (%p), deleting.\n", i + 1, entry->object);
+                        break;
+
                     default:
                         WARN("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type);
                         break;