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

Michael Müller : wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 05a10d5fc80c36f7d2ed5ab3ef733f9539e08984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a10d5fc80c36f7d2ed5ab3e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Apr 26 23:38:52 2016 +0200 wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 82fd10b..66ba526 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5733,7 +5733,8 @@ static void test_connection_failure(void) static void test_default_service_port(void) { HINTERNET session, connect, request; - DWORD error; + DWORD size, error; + char buffer[128]; BOOL ret; session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -5753,6 +5754,50 @@ static void test_default_service_port(void) ok(error == ERROR_INTERNET_SECURITY_CHANNEL_ERROR || error == ERROR_INTERNET_CANNOT_CONNECT, "got %u\n", error); + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + ok(!strcmp(buffer, "test.winehq.org:80"), "Expected test.winehg.org:80, got '%s'\n", buffer); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + todo_wine ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "test.winehq.org"), "Expected test.winehg.org, got '%s'\n", buffer); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, 0, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); + InternetCloseHandle(request); InternetCloseHandle(connect); InternetCloseHandle(session);

1 0

Michael Stefaniuc : user32: Use wine_dbgstr_rect() to print a RECT.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 959b9d1cbb4a24daa47a3a5735030075443a0f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959b9d1cbb4a24daa47a3a573… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 26 20:58:55 2016 +0200 user32: Use wine_dbgstr_rect() to print a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 4faea6b..7b283cc 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -642,7 +642,7 @@ BOOL WINAPI AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) { FIXME("(%p, %d, %d, %d): stub\n", rect, b, c, d); if (rect) - FIXME("rect: [[%d, %d], [%d, %d]]\n", rect->left, rect->top, rect->right, rect->bottom); + FIXME("rect: %s\n", wine_dbgstr_rect(rect)); /* Calls OffsetRect */ return FALSE; }

1 0

Nikolay Sivov : uxtheme/tests: Only link dynamically for functions that could be missing.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 1e54d38058e2c46f9caaaee83840a1dc35ed4b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e54d38058e2c46f9caaaee83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 21:57:23 2016 +0300 uxtheme/tests: Only link dynamically for functions that could be missing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/Makefile.in | 2 +- dlls/uxtheme/tests/system.c | 120 ++++++++++++++--------------------------- 2 files changed, 40 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e54d38058e2c46f9caaa…

1 0

Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_set_ps_consts_f().
by Alexandre Julliard April 27, 2016

April 27, 2016

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_set_vs_consts_f().
by Alexandre Julliard April 27, 2016

April 27, 2016

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: Store pixel shader floating point constants as wined3d_vec4 structures.
by Alexandre Julliard April 27, 2016

April 27, 2016

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: Store vertex shader floating point constants as wined3d_vec4 structures.
by Alexandre Julliard April 27, 2016

April 27, 2016

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

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in surface_load_location().
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: fdd9a4cb929f084187bbea64eca8968a9bfd838f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd9a4cb929f084187bbea64e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 26 17:56:03 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a1c125a..c3c028c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3068,7 +3068,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) { TRACE("Surface previously discarded, nothing to do.\n"); - wined3d_surface_prepare(surface, context, location); + wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); wined3d_texture_validate_location(texture, sub_resource_idx, location); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); goto done;

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in surface_load_sysmem().
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: bf8feb8b51f07b546e92615e619943acd50c7f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8feb8b51f07b546e92615e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 26 17:56:02 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 28da2eb..a1c125a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2782,12 +2782,14 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD static void surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_texture *texture = surface->container; struct wined3d_texture_sub_resource *sub_resource; - wined3d_surface_prepare(surface, context, dst_location); + wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); - sub_resource = surface_get_sub_resource(surface); + sub_resource = &texture->sub_resources[sub_resource_idx]; if (sub_resource->locations & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); @@ -2800,8 +2802,6 @@ static void surface_load_sysmem(struct wined3d_surface *surface, /* Download the surface to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - struct wined3d_texture *texture = surface->container; - wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); surface_download_data(surface, gl_info, dst_location);

1 0

Damjan Jovanovic : winex11.drv: Really ignore the drop effect returned from IDropTarget::DragEnter.
by Alexandre Julliard April 26, 2016

April 26, 2016

Module: wine Branch: master Commit: cd5b868fa0e414cc400a936c532d63ac1dd6eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5b868fa0e414cc400a936c5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 25 03:00:11 2016 +0200 winex11.drv: Really ignore the drop effect returned from IDropTarget::DragEnter. Commit a2f3d9740642ca6d4a7c63175f7e8db34120c2b9 wanted to ignore the drop effect returned in IDropTarget::DragEnter, but never did so, instead it just copied effect to effect_ignore so it can later be logged. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0d18110..cbc917a 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -307,7 +307,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) { DWORD effect_ignore = effect; hr = IDropTarget_DragEnter(dropTarget, &XDNDDataObject, - MK_LBUTTON, pointl, &effect); + MK_LBUTTON, pointl, &effect_ignore); if (hr == S_OK) { XDNDAccepted = TRUE;

1 0