Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f69cf783df233e9ded04c4df193d39d1b465d424
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f69cf783df233e9ded04c4df19...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue May 17 14:01:53 2016 +0200

wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i().

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d9/device.c        |  3 ++-
 dlls/wined3d/device.c     | 14 +++++++-------
 dlls/wined3d/wined3d.spec |  2 +-
 include/wine/wined3d.h    |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index bfbee07..1938016 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3158,7 +3158,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(IDirect3DDevice9Ex *if
     TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
 
     wined3d_mutex_lock();
-    hr = wined3d_device_get_ps_consts_i(device->wined3d_device, reg_idx, data, count);
+    hr = wined3d_device_get_ps_consts_i(device->wined3d_device,
+            reg_idx, count, (struct wined3d_ivec4 *)data);
     wined3d_mutex_unlock();
 
     return hr;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 1c25f1b..d827528 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2681,17 +2681,17 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device,
 }
 
 HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device,
-        UINT start_register, int *constants, UINT vector4i_count)
+        unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants)
 {
-    UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register);
-
-    TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n",
-            device, start_register, constants, vector4i_count);
+    TRACE("device %p, start_idx %u, count %u, constants %p.\n",
+            device, start_idx, count, constants);
 
-    if (!constants || start_register >= WINED3D_MAX_CONSTS_I)
+    if (!constants || start_idx >= WINED3D_MAX_CONSTS_I)
         return WINED3DERR_INVALIDCALL;
 
-    memcpy(constants, &device->state.ps_consts_i[start_register], count * sizeof(int) * 4);
+    if (count > WINED3D_MAX_CONSTS_I - start_idx)
+        count = WINED3D_MAX_CONSTS_I - start_idx;
+    memcpy(constants, &device->state.ps_consts_i[start_idx], count * sizeof(*constants));
 
     return WINED3D_OK;
 }
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 4219b53..c4446b8 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -72,7 +72,7 @@
 @ cdecl wined3d_device_get_ps_cb(ptr long)
 @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long)
 @ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr)
-@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long)
+@ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr)
 @ cdecl wined3d_device_get_ps_resource_view(ptr long)
 @ cdecl wined3d_device_get_ps_sampler(ptr long)
 @ cdecl wined3d_device_get_raster_status(ptr long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index b01e8e4..af320a4 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2127,7 +2127,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *devi
 HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device,
         unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants);
 HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device,
-        UINT start_register, int *constants, UINT vector4i_count);
+        unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants);
 struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device,
         UINT idx);
 struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx);