April 2016 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Added new heap_strndupAtoW helper and use it in HttpAddRequestHeadersA.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: d282a64280f3e147f09adae9e3e3152b1d20dbb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d282a64280f3e147f09adae9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:12 2016 +0200 wininet: Added new heap_strndupAtoW helper and use it in HttpAddRequestHeadersA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 14 +++++--------- dlls/wininet/internet.h | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bdc659d..ef0b36e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1376,21 +1376,17 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest, BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, LPCSTR lpszHeader, DWORD dwHeaderLength, DWORD dwModifier) { - DWORD len; - LPWSTR hdr; + WCHAR *headers = NULL; BOOL r; TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); - len = MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, NULL, 0 ); - hdr = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, hdr, len ); - if( dwHeaderLength != ~0U ) - dwHeaderLength = len; + if(lpszHeader) + headers = heap_strndupAtoW(lpszHeader, dwHeaderLength, &dwHeaderLength); - r = HttpAddRequestHeadersW( hHttpRequest, hdr, dwHeaderLength, dwModifier ); + r = HttpAddRequestHeadersW(hHttpRequest, headers, dwHeaderLength, dwModifier); - heap_free( hdr ); + heap_free(headers); return r; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8c3a1f1..eb3a023 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -166,6 +166,25 @@ static inline LPWSTR heap_strndupW(LPCWSTR str, UINT max_len) return ret; } +static inline WCHAR *heap_strndupAtoW(const char *str, int len_a, DWORD *len_w) +{ + WCHAR *ret = NULL; + + if(str) { + size_t len; + if(len_a < 0) len_a = strlen(str); + len = MultiByteToWideChar(CP_ACP, 0, str, len_a, NULL, 0); + ret = heap_alloc((len+1)*sizeof(WCHAR)); + if(ret) { + MultiByteToWideChar(CP_ACP, 0, str, len_a, ret, len); + ret[len] = 0; + *len_w = len; + } + } + + return ret; +} + static inline WCHAR *heap_strdupAtoW(const char *str) { LPWSTR ret = NULL;

1 0

Jacek Caban : wininet: Use heap_strndupAtoW in InternetOpenUrlA.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 82d413d96d49e47485a4f7fad5b7ba6a73814f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d413d96d49e47485a4f7fad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:21 2016 +0200 wininet: Use heap_strndupAtoW in InternetOpenUrlA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 537bf7d..a534a96 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3706,9 +3706,8 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { HINTERNET rc = NULL; - DWORD lenHeaders = 0; LPWSTR szUrl = NULL; - LPWSTR szHeaders = NULL; + WCHAR *headers = NULL; TRACE("\n"); @@ -3719,20 +3718,17 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, } if(lpszHeaders) { - lenHeaders = MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, NULL, 0 ); - szHeaders = heap_alloc(lenHeaders*sizeof(WCHAR)); - if(!szHeaders) { + headers = heap_strndupAtoW(lpszHeaders, dwHeadersLength, &dwHeadersLength); + if(!headers) { heap_free(szUrl); return NULL; } - MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, szHeaders, lenHeaders); } - rc = InternetOpenUrlW(hInternet, szUrl, szHeaders, - lenHeaders, dwFlags, dwContext); + rc = InternetOpenUrlW(hInternet, szUrl, headers, dwHeadersLength, dwFlags, dwContext); heap_free(szUrl); - heap_free(szHeaders); + heap_free(headers); return rc; }

1 0

Jacek Caban : wininet: Rewrite InternetCrackUrlA to properly handle errors.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: f1a8c8ae0a4d7a54ce08df2256881ae3f48dac30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a8c8ae0a4d7a54ce08df225… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:31 2016 +0200 wininet: Rewrite InternetCrackUrlA to properly handle errors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 244 ++++++++++++++++++++---------------------------- 1 file changed, 99 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1a8c8ae0a4d7a54ce08d…

1 0

Jacek Caban : wininet/tests: Added tests of InternetCrackUrl with URLs longer than INTERNET_MAX_URL_LENGTH.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 4be4e282b737a7cfbccf18552a581ee6de3ac13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be4e282b737a7cfbccf18552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:42 2016 +0200 wininet/tests: Added tests of InternetCrackUrl with URLs longer than INTERNET_MAX_URL_LENGTH. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 213 +++++++++++++++++++++++++++++++---------------- 1 file changed, 141 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4be4e282b737a7cfbccf1…

1 0

Henri Verbeet : wined3d: Store vertex shader floating point constants as wined3d_vec4 structures.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: b073e5c7b6e76b8295f13f8069031460a5161e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b073e5c7b6e76b8295f13f806… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:55:56 2016 +0200 wined3d: Store vertex shader floating point constants as wined3d_vec4 structures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 15 ++++----------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a48773f..51df0ef 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -695,7 +695,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, /* Load DirectX 9 float constants for vertex shader */ priv->highest_dirty_vs_const = shader_arb_load_constants_f(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, - priv->highest_dirty_vs_const, (struct wined3d_vec4 *)state->vs_consts_f, priv->vshader_const_dirty); + priv->highest_dirty_vs_const, state->vs_consts_f, priv->vshader_const_dirty); shader_arb_vs_local_constants(gl_shader, context, state); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a30157..df5565f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2480,7 +2480,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, || start_register > d3d_info->limits.vs_uniform_count) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_f[start_register * 4], + memcpy(&device->update_state->vs_consts_f[start_register], constants, vector4f_count * sizeof(float) * 4); if (TRACE_ON(d3d)) { @@ -2512,7 +2512,7 @@ HRESULT CDECL wined3d_device_get_vs_consts_f(const struct wined3d_device *device if (!constants || count < 0) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_f[start_register * 4], count * sizeof(float) * 4); + memcpy(constants, &device->state.vs_consts_f[start_register], count * sizeof(float) * 4); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4fd24ba..5096b75 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1331,7 +1331,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context update_mask = context->constant_update_mask & prog->constant_update_mask; if (update_mask & WINED3D_SHADER_CONST_VS_F) - shader_glsl_load_constants_f(vshader, gl_info, (const struct wined3d_vec4 *)state->vs_consts_f, + shader_glsl_load_constants_f(vshader, gl_info, state->vs_consts_f, prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_VS_I) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cb3d494..b7fd1a6 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -675,16 +675,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_vs_consts_f[i]; - TRACE("Setting vs_consts_f[%u] to {%.8e, %.8e, %.8e, %.8e}.\n", idx, - src_state->vs_consts_f[idx * 4 + 0], - src_state->vs_consts_f[idx * 4 + 1], - src_state->vs_consts_f[idx * 4 + 2], - src_state->vs_consts_f[idx * 4 + 3]); + TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&src_state->vs_consts_f[idx])); - stateblock->state.vs_consts_f[idx * 4 + 0] = src_state->vs_consts_f[idx * 4 + 0]; - stateblock->state.vs_consts_f[idx * 4 + 1] = src_state->vs_consts_f[idx * 4 + 1]; - stateblock->state.vs_consts_f[idx * 4 + 2] = src_state->vs_consts_f[idx * 4 + 2]; - stateblock->state.vs_consts_f[idx * 4 + 3] = src_state->vs_consts_f[idx * 4 + 3]; + stateblock->state.vs_consts_f[idx] = src_state->vs_consts_f[idx]; } /* Vertex shader integer constants. */ @@ -970,7 +963,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) { wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], - stateblock->state.vs_consts_f + stateblock->contained_vs_consts_f[i] * 4, 1); + &stateblock->state.vs_consts_f[stateblock->contained_vs_consts_f[i]].x, 1); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { @@ -1325,7 +1318,7 @@ HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, } if (!(state->vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - 4 * sizeof(float) * d3d_info->limits.vs_uniform_count))) + sizeof(*state->vs_consts_f) * d3d_info->limits.vs_uniform_count))) return E_OUTOFMEMORY; if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9ce2281..595af5d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2211,7 +2211,7 @@ struct wined3d_state BOOL vs_consts_b[MAX_CONST_B]; INT vs_consts_i[MAX_CONST_I * 4]; - float *vs_consts_f; + struct wined3d_vec4 *vs_consts_f; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4];

1 0

Henri Verbeet : wined3d: Store pixel shader floating point constants as wined3d_vec4 structures.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: e6b647d121b0793f3bb59baa37e3d27401cffe62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b647d121b0793f3bb59baa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:55:57 2016 +0200 wined3d: Store pixel shader floating point constants as wined3d_vec4 structures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 15 ++++----------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 51df0ef..266f5f5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -707,7 +707,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, /* Load DirectX 9 float constants for pixel shader */ priv->highest_dirty_ps_const = shader_arb_load_constants_f(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, - priv->highest_dirty_ps_const, (struct wined3d_vec4 *)state->ps_consts_f, priv->pshader_const_dirty); + priv->highest_dirty_ps_const, state->ps_consts_f, priv->pshader_const_dirty); shader_arb_ps_local_constants(gl_shader, context, state, rt_height); if (context->constant_update_mask & WINED3D_SHADER_CONST_PS_NP2_FIXUP) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df5565f..6342ee3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2715,7 +2715,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, || start_register > d3d_info->limits.ps_uniform_count) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_f[start_register * 4], + memcpy(&device->update_state->ps_consts_f[start_register], constants, vector4f_count * sizeof(float) * 4); if (TRACE_ON(d3d)) { @@ -2746,7 +2746,7 @@ HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device if (!constants || count < 0) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_f[start_register * 4], count * sizeof(float) * 4); + memcpy(constants, &device->state.ps_consts_f[start_register], count * sizeof(float) * 4); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5096b75..f8c4a99 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1404,7 +1404,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_PS_F) - shader_glsl_load_constants_f(pshader, gl_info, (const struct wined3d_vec4 *)state->ps_consts_f, + shader_glsl_load_constants_f(pshader, gl_info, state->ps_consts_f, prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_PS_I) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b7fd1a6..3f9cb34 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -713,16 +713,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_ps_consts_f[i]; - TRACE("Setting ps_consts_f[%u] to {%.8e, %.8e, %.8e, %.8e}.\n", idx, - src_state->ps_consts_f[idx * 4 + 0], - src_state->ps_consts_f[idx * 4 + 1], - src_state->ps_consts_f[idx * 4 + 2], - src_state->ps_consts_f[idx * 4 + 3]); + TRACE("Setting ps_consts_f[%u] to %s.\n", idx, debug_vec4(&src_state->ps_consts_f[idx])); - stateblock->state.ps_consts_f[idx * 4 + 0] = src_state->ps_consts_f[idx * 4 + 0]; - stateblock->state.ps_consts_f[idx * 4 + 1] = src_state->ps_consts_f[idx * 4 + 1]; - stateblock->state.ps_consts_f[idx * 4 + 2] = src_state->ps_consts_f[idx * 4 + 2]; - stateblock->state.ps_consts_f[idx * 4 + 3] = src_state->ps_consts_f[idx * 4 + 3]; + stateblock->state.ps_consts_f[idx] = src_state->ps_consts_f[idx]; } /* Pixel shader integer constants. */ @@ -985,7 +978,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) { wined3d_device_set_ps_consts_f(device, stateblock->contained_ps_consts_f[i], - stateblock->state.ps_consts_f + stateblock->contained_ps_consts_f[i] * 4, 1); + &stateblock->state.ps_consts_f[stateblock->contained_ps_consts_f[i]].x, 1); } for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { @@ -1322,7 +1315,7 @@ HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, return E_OUTOFMEMORY; if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - 4 * sizeof(float) * d3d_info->limits.ps_uniform_count))) + sizeof(*state->ps_consts_f) * d3d_info->limits.ps_uniform_count))) { HeapFree(GetProcessHeap(), 0, state->vs_consts_f); return E_OUTOFMEMORY; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 595af5d..274f620 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2215,7 +2215,7 @@ struct wined3d_state BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4]; - float *ps_consts_f; + struct wined3d_vec4 *ps_consts_f; struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1];

1 0

Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_set_vs_consts_f().
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: d3a326076346b316ab18f31e00c3aabb9eab16ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a326076346b316ab18f31e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:55:58 2016 +0200 wined3d: Pass wined3d_vec4 structures to wined3d_device_set_vs_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 31 ++++++++++++------------------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4590d0f..847adad 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2434,7 +2434,7 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac } wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, data, count); + hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 57258c4..53486bc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2813,7 +2813,8 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_vs_consts_f(device->wined3d_device, + reg_idx, count, (const struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6342ee3..7afdff8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2465,37 +2465,30 @@ HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, - UINT start_register, const float *constants, UINT vector4f_count) + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { - UINT i; const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4f_count %u.\n", - device, start_register, constants, vector4f_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - /* Specifically test start_register > limit to catch MAX_UINT overflows - * when adding start_register + vector4f_count. */ - if (!constants - || start_register + vector4f_count > d3d_info->limits.vs_uniform_count - || start_register > d3d_info->limits.vs_uniform_count) + if (!constants || start_idx >= d3d_info->limits.vs_uniform_count + || count > d3d_info->limits.vs_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_f[start_register], - constants, vector4f_count * sizeof(float) * 4); + memcpy(&device->update_state->vs_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { - for (i = 0; i < vector4f_count; ++i) - TRACE("Set FLOAT constant %u to {%.8e, %.8e, %.8e, %.8e}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + for (i = 0; i < count; ++i) + TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } if (device->recording) - memset(device->recording->changed.vertexShaderConstantsF + start_register, 1, - sizeof(*device->recording->changed.vertexShaderConstantsF) * vector4f_count); + memset(&device->recording->changed.vertexShaderConstantsF[start_idx], 1, + count * sizeof(*device->recording->changed.vertexShaderConstantsF)); else - device->shader_backend->shader_update_float_vertex_constants(device, start_register, vector4f_count); - + device->shader_backend->shader_update_float_vertex_constants(device, start_idx, count); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3f9cb34..2672377 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -956,7 +956,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) { wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], - &stateblock->state.vs_consts_f[stateblock->contained_vs_consts_f[i]].x, 1); + 1, &stateblock->state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8bf6726..26a0c07 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -150,7 +150,7 @@ @ cdecl wined3d_device_set_viewport(ptr ptr) @ cdecl wined3d_device_set_vs_cb(ptr long ptr) @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) -@ cdecl wined3d_device_set_vs_consts_f(ptr long ptr long) +@ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 90b84d5..d789470 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2241,7 +2241,7 @@ void __cdecl wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, s HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device, - UINT start_register, const float *constants, UINT vector4f_count); + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device, UINT start_register, const int *constants, UINT vector4i_count); void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_get_vs_consts_f().
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 67ec18ba2c748f180ef5f06f67ccdfd38c9460db URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ec18ba2c748f180ef5f06f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:55:59 2016 +0200 wined3d: Pass wined3d_vec4 structures to wined3d_device_get_vs_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 847adad..1424342 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2457,7 +2457,7 @@ static HRESULT WINAPI d3d8_device_GetVertexShaderConstant(IDirect3DDevice8 *ifac } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, start_register, data, count); + hr = wined3d_device_get_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 53486bc..be5e9f7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2836,7 +2836,8 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_f(device->wined3d_device, + reg_idx, count, (struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7afdff8..76b7eaf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2494,18 +2494,18 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_vs_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count) + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - int count = min(vector4f_count, d3d_info->limits.vs_uniform_count - start_register); - TRACE("device %p, start_register %u, constants %p, vector4f_count %u.\n", - device, start_register, constants, vector4f_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || count < 0) + if (!constants || start_idx >= d3d_info->limits.vs_uniform_count + || count > d3d_info->limits.vs_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_f[start_register], count * sizeof(float) * 4); + memcpy(constants, &device->state.vs_consts_f[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 26a0c07..e23bb03 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,7 +94,7 @@ @ cdecl wined3d_device_get_viewport(ptr ptr) @ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) -@ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) @ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d789470..d0151c3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2153,7 +2153,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_de HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count); + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_set_ps_consts_f().
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 574e29418184e530e96f2c121b265eef15453cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=574e29418184e530e96f2c121… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:56:00 2016 +0200 wined3d: Pass wined3d_vec4 structures to wined3d_device_set_ps_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 30 ++++++++++++------------------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1424342..21de2d6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2730,7 +2730,7 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface iface, start_register, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, data, count); + hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index be5e9f7..ce67292 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3108,7 +3108,8 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_ps_consts_f(device->wined3d_device, + reg_idx, count, (const struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 76b7eaf..9af2b70 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2693,36 +2693,30 @@ HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, - UINT start_register, const float *constants, UINT vector4f_count) + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { - UINT i; const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4f_count %u.\n", - device, start_register, constants, vector4f_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - /* Specifically test start_register > limit to catch MAX_UINT overflows - * when adding start_register + vector4f_count. */ - if (!constants - || start_register + vector4f_count > d3d_info->limits.ps_uniform_count - || start_register > d3d_info->limits.ps_uniform_count) + if (!constants || start_idx >= d3d_info->limits.ps_uniform_count + || count > d3d_info->limits.ps_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_f[start_register], - constants, vector4f_count * sizeof(float) * 4); + memcpy(&device->update_state->ps_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { - for (i = 0; i < vector4f_count; ++i) - TRACE("Set FLOAT constant %u to {%.8e, %.8e, %.8e, %.8e}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + for (i = 0; i < count; ++i) + TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } if (device->recording) - memset(device->recording->changed.pixelShaderConstantsF + start_register, 1, - sizeof(*device->recording->changed.pixelShaderConstantsF) * vector4f_count); + memset(&device->recording->changed.pixelShaderConstantsF[start_idx], 1, + count * sizeof(*device->recording->changed.pixelShaderConstantsF)); else - device->shader_backend->shader_update_float_pixel_constants(device, start_register, vector4f_count); + device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2672377..036d594 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -978,7 +978,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) { wined3d_device_set_ps_consts_f(device, stateblock->contained_ps_consts_f[i], - &stateblock->state.ps_consts_f[stateblock->contained_ps_consts_f[i]].x, 1); + 1, &stateblock->state.ps_consts_f[stateblock->contained_ps_consts_f[i]]); } for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e23bb03..42039f6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -130,7 +130,7 @@ @ cdecl wined3d_device_set_primitive_type(ptr long) @ cdecl wined3d_device_set_ps_cb(ptr long ptr) @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) -@ cdecl wined3d_device_set_ps_consts_f(ptr long ptr long) +@ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) @ cdecl wined3d_device_set_ps_sampler(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d0151c3..5eea884 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2209,7 +2209,7 @@ void __cdecl wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, s HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, - UINT start_register, const float *constants, UINT vector4f_count); + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, UINT start_register, const int *constants, UINT vector4i_count); void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_get_ps_consts_f().
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 1fe83c0d7e4af20a50132aabedc570c5f4f2babe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe83c0d7e4af20a50132aabe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:56:01 2016 +0200 wined3d: Pass wined3d_vec4 structures to wined3d_device_get_ps_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 21de2d6..ed953fe 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2746,7 +2746,7 @@ static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface iface, start_register, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, data, count); + hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ce67292..b0ef724 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3124,7 +3124,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantF(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_f(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_f(device->wined3d_device, + reg_idx, count, (struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9af2b70..e0a7370 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2722,18 +2722,18 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count) + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - int count = min(vector4f_count, d3d_info->limits.ps_uniform_count - start_register); - TRACE("device %p, start_register %u, constants %p, vector4f_count %u.\n", - device, start_register, constants, vector4f_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || count < 0) + if (!constants || start_idx >= d3d_info->limits.ps_uniform_count + || count > d3d_info->limits.ps_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_f[start_register], count * sizeof(float) * 4); + memcpy(constants, &device->state.ps_consts_f[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 42039f6..4eb2470 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -71,7 +71,7 @@ @ cdecl wined3d_device_get_primitive_type(ptr ptr) @ 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 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_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5eea884..4cfe1e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2117,7 +2117,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_de HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count); + 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); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device,

1 0