wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Sebastian Lackner : server: Add missing linebreak to a dump message.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 240d8ed7e96ccf140543cc5c24124c8c6f481a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240d8ed7e96ccf140543cc5c2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 26 00:06:52 2016 +0200 server: Add missing linebreak to a dump message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/completion.c b/server/completion.c index 4069c0c..8b8983a 100644 --- a/server/completion.c +++ b/server/completion.c @@ -104,7 +104,7 @@ static void completion_dump( struct object *obj, int verbose ) struct completion *completion = (struct completion *) obj; assert( obj->ops == &completion_ops ); - fprintf( stderr, "Completion depth=%u", completion->depth ); + fprintf( stderr, "Completion depth=%u\n", completion->depth ); } static struct object_type *completion_get_type( struct object *obj )

1 0

Michael Müller : ws2_32: Fix getaddrinfo with IPPROTO_IPV6 protocol.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: ea18c740f79a6ad7e96f3655b5927ac496e5cb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea18c740f79a6ad7e96f3655b… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 25 22:12:21 2016 +0200 ws2_32: Fix getaddrinfo with IPPROTO_IPV6 protocol. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +++ dlls/ws2_32/tests/sock.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8d58631..a2e6912 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6471,6 +6471,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr else if (IS_IPX_PROTO(punixhints->ai_protocol) && punixhints->ai_socktype != SOCK_DGRAM) punixhints->ai_socktype = 0; + + else if (punixhints->ai_protocol == IPPROTO_IPV6) + punixhints->ai_protocol = 0; } /* getaddrinfo(3) is thread safe, no need to wrap in CS */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00555a9..9e0c2f9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -170,24 +170,32 @@ static const struct addr_hint_tests } hinttests[] = { {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0 }, {AF_UNSPEC, SOCK_STREAM, IPPROTO_UDP, 0 }, + {AF_UNSPEC, SOCK_STREAM, IPPROTO_IPV6,0 }, {AF_UNSPEC, SOCK_DGRAM, IPPROTO_TCP, 0 }, {AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, 0 }, + {AF_UNSPEC, SOCK_DGRAM, IPPROTO_IPV6,0 }, {AF_INET, SOCK_STREAM, IPPROTO_TCP, 0 }, {AF_INET, SOCK_STREAM, IPPROTO_UDP, 0 }, + {AF_INET, SOCK_STREAM, IPPROTO_IPV6,0 }, {AF_INET, SOCK_DGRAM, IPPROTO_TCP, 0 }, {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0 }, + {AF_INET, SOCK_DGRAM, IPPROTO_IPV6,0 }, {AF_UNSPEC, 0, IPPROTO_TCP, 0 }, {AF_UNSPEC, 0, IPPROTO_UDP, 0 }, + {AF_UNSPEC, 0, IPPROTO_IPV6,0 }, {AF_UNSPEC, SOCK_STREAM, 0, 0 }, {AF_UNSPEC, SOCK_DGRAM, 0, 0 }, {AF_INET, 0, IPPROTO_TCP, 0 }, {AF_INET, 0, IPPROTO_UDP, 0 }, + {AF_INET, 0, IPPROTO_IPV6,0 }, {AF_INET, SOCK_STREAM, 0, 0 }, {AF_INET, SOCK_DGRAM, 0, 0 }, {AF_UNSPEC, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT }, {AF_UNSPEC, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT }, + {AF_UNSPEC, 999, IPPROTO_IPV6,WSAESOCKTNOSUPPORT }, {AF_INET, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT }, {AF_INET, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT }, + {AF_INET, 999, IPPROTO_IPV6,WSAESOCKTNOSUPPORT }, {AF_UNSPEC, SOCK_STREAM, 999, 0 }, {AF_UNSPEC, SOCK_STREAM, 999, 0 }, {AF_INET, SOCK_DGRAM, 999, 0 },

1 0

Francois Gouget : mshtml/tests: A spelling fix for a dom ok() message.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: ea12d857b45ed93631549ba521736d4f6f66ddb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea12d857b45ed93631549ba52… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:57 2016 +0200 mshtml/tests: A spelling fix for a dom ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9e8d8b5..7a39d34 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5775,7 +5775,7 @@ static void test_location(IHTMLDocument2 *doc) SysFreeString(str); ref = IHTMLLocation_Release(location); - ok(!ref, "location chould be destroyed here\n"); + ok(!ref, "location should be destroyed here\n"); } static void test_plugins_col(IHTMLDocument2 *doc)

1 0

Francois Gouget : msvcrt: The fpclass() constants are not defines.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 8e382e97e9c1209695b2ac621423852f7799d794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e382e97e9c1209695b2ac621… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 25 01:09:46 2016 +0200 msvcrt: The fpclass() constants are not defines. Solaris is the only platform that has fpclass() and it defines the constants in the fpclass_t enum. So this reverts commit b0047713142de79eba454d1196b230d53781518f. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b9e0533..402e8b2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -665,36 +665,16 @@ int CDECL MSVCRT__fpclass(double num) #if defined(HAVE_FPCLASS) || defined(fpclass) switch (fpclass( num )) { -#ifdef FP_SNAN case FP_SNAN: return MSVCRT__FPCLASS_SNAN; -#endif -#ifdef FP_QNAN case FP_QNAN: return MSVCRT__FPCLASS_QNAN; -#endif -#ifdef FP_NINF case FP_NINF: return MSVCRT__FPCLASS_NINF; -#endif -#ifdef FP_PINF case FP_PINF: return MSVCRT__FPCLASS_PINF; -#endif -#ifdef FP_NDENORM case FP_NDENORM: return MSVCRT__FPCLASS_ND; -#endif -#ifdef FP_PDENORM case FP_PDENORM: return MSVCRT__FPCLASS_PD; -#endif -#ifdef FP_NZERO case FP_NZERO: return MSVCRT__FPCLASS_NZ; -#endif -#ifdef FP_PZERO case FP_PZERO: return MSVCRT__FPCLASS_PZ; -#endif -#ifdef FP_NNORM case FP_NNORM: return MSVCRT__FPCLASS_NN; -#endif -#ifdef FP_PNORM case FP_PNORM: return MSVCRT__FPCLASS_PN; -#endif default: return MSVCRT__FPCLASS_PN; } #elif defined (fpclassify)

1 0

Nikolay Sivov : msvcrt: Fix calloc() prototype.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 21fd1d37293c112c1659f2f8fd4f90f240816c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21fd1d37293c112c1659f2f8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 24 21:51:26 2016 +0300 msvcrt: Fix calloc() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/heap.c | 4 ++-- dlls/msvcrt/tests/file.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 0f1343d..610525d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -273,7 +273,7 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) { MSVCRT__onexit_t *newtable; TRACE("expanding table\n"); - newtable = MSVCRT_calloc(sizeof(void *),MSVCRT_atexit_table_size + 32); + newtable = MSVCRT_calloc(MSVCRT_atexit_table_size + 32, sizeof(void *)); if (!newtable) { TRACE("failed!\n"); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 71e578d..c4f89b1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -512,7 +512,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) last_fd++; *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * last_fd; - *block = MSVCRT_calloc(*size, 1); + *block = MSVCRT_calloc(1, *size); if (!*block) { *size = 0; @@ -660,7 +660,7 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) && MSVCRT__isatty(file->_file)) return FALSE; - file->_base = MSVCRT_calloc(MSVCRT_INTERNAL_BUFSIZ,1); + file->_base = MSVCRT_calloc(1, MSVCRT_INTERNAL_BUFSIZ); if(file->_base) { file->_bufsiz = MSVCRT_INTERNAL_BUFSIZ; file->_flag |= MSVCRT__IOMYBUF; diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index a908846..52a5287 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -392,9 +392,9 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count) +void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { - return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, size*count); + return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, count*size); } /********************************************************************* diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index dbb6cef..42ec34b 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2262,8 +2262,8 @@ static void test_write_flush_size(FILE *file, int bufsize) fpos_t pos, pos2; fd = fileno(file); - inbuffer = calloc(bufsize + 1, 1); - outbuffer = calloc(bufsize + 1, 1); + inbuffer = calloc(1, bufsize + 1); + outbuffer = calloc(1, bufsize + 1); _snprintf(outbuffer, bufsize + 1, "0,1,2,3,4,5,6,7,8,9"); for (size = bufsize + 1; size >= bufsize - 1; size--) {

1 0

Marcus Meissner : hidclass.sys: Add missing case/missing HeapFree ( Coverity).
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: bb590b3f9f68917855fe822c31ef50d40af7d4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb590b3f9f68917855fe822c3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 23 20:03:10 2016 +0200 hidclass.sys: Add missing case/missing HeapFree (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index d97184f..5a6a0a7 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -292,10 +292,9 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_ID: { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - ULONG type = irpsp->Parameters.QueryId.IdType; WCHAR *id = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*REGSTR_VAL_MAX_HCID_LEN); - TRACE("IRP_MN_QUERY_ID[%i]\n", type); - switch (type) + TRACE("IRP_MN_QUERY_ID[%i]\n", irpsp->Parameters.QueryId.IdType); + switch (irpsp->Parameters.QueryId.IdType) { case BusQueryHardwareIDs: case BusQueryCompatibleIDs: @@ -326,6 +325,10 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = (ULONG_PTR)id; rc = STATUS_SUCCESS; break; + case BusQueryDeviceSerialNumber: + FIXME("BusQueryDeviceSerialNumber not implemented\n"); + HeapFree(GetProcessHeap(), 0, id); + break; } break; }

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in surface_load_ds_location().
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 02a664c093bb27a28dd2b99e644cd590e54e0252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a664c093bb27a28dd2b99e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 25 17:19:34 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 88187e8..319e32a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2570,6 +2570,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, /* Context activation is done by the caller. */ static void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2580,7 +2581,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win /* TODO: Make this work for modes other than FBO */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; - if (!(surface_get_sub_resource(surface)->locations & location)) + if (!(texture->sub_resources[sub_resource_idx].locations & location)) { w = surface->ds_current_size.cx; h = surface->ds_current_size.cy; @@ -2599,7 +2600,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win return; } - wined3d_surface_prepare(surface, context, location); + wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); if (location == WINED3D_LOCATION_TEXTURE_RGB) {

1 0

Henri Verbeet : wined3d: Pas a wined3d_vec4 structure to shader_arb_load_constants_f().
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 6d2f710d660de4ac6ed550363fcf37b50deb0af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2f710d660de4ac6ed550363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 17:19:33 2016 +0200 wined3d: Pas a wined3d_vec4 structure to shader_arb_load_constants_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 91 +++++++++++++++++++++++---------------- dlls/wined3d/utils.c | 8 ++++ dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 65 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fac97fe..a48773f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -360,21 +360,20 @@ static unsigned int reserved_vs_const(const struct arb_vshader_private *shader_d * or GL_FRAGMENT_PROGRAM_ARB (for pixel shaders) */ /* Context activation is done by the caller. */ -static unsigned int shader_arb_load_constantsF(const struct wined3d_shader *shader, +static unsigned int shader_arb_load_constants_f(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, GLuint target_type, unsigned int max_constants, - const float *constants, char *dirty_consts) + const struct wined3d_vec4 *constants, char *dirty_consts) { struct wined3d_shader_lconst *lconst; - DWORD i, j; - unsigned int ret; + unsigned int ret, i, j; if (TRACE_ON(d3d_constants)) { - for(i = 0; i < max_constants; i++) { - if(!dirty_consts[i]) continue; - TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, - constants[i * 4 + 0], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + for (i = 0; i < max_constants; ++i) + { + if (!dirty_consts[i]) + continue; + TRACE_(d3d_constants)("Loading constant %u: %s.\n", i, debug_vec4(&constants[i])); } } @@ -387,26 +386,39 @@ static unsigned int shader_arb_load_constantsF(const struct wined3d_shader *shad /* ps 1.x supports only 8 constants, clamp only those. When switching between 1.x and higher * shaders, the first 8 constants are marked dirty for reload */ - for(; i < min(8, max_constants); i++) { - if(!dirty_consts[i]) continue; + for (; i < min(8, max_constants); ++i) + { + if (!dirty_consts[i]) + continue; dirty_consts[i] = 0; - j = 4 * i; - if (constants[j + 0] > 1.0f) lcl_const[0] = 1.0f; - else if (constants[j + 0] < -1.0f) lcl_const[0] = -1.0f; - else lcl_const[0] = constants[j + 0]; + if (constants[i].x > 1.0f) + lcl_const[0] = 1.0f; + else if (constants[i].x < -1.0f) + lcl_const[0] = -1.0f; + else + lcl_const[0] = constants[i].x; - if (constants[j + 1] > 1.0f) lcl_const[1] = 1.0f; - else if (constants[j + 1] < -1.0f) lcl_const[1] = -1.0f; - else lcl_const[1] = constants[j + 1]; + if (constants[i].y > 1.0f) + lcl_const[1] = 1.0f; + else if (constants[i].y < -1.0f) + lcl_const[1] = -1.0f; + else + lcl_const[1] = constants[i].y; - if (constants[j + 2] > 1.0f) lcl_const[2] = 1.0f; - else if (constants[j + 2] < -1.0f) lcl_const[2] = -1.0f; - else lcl_const[2] = constants[j + 2]; + if (constants[i].z > 1.0f) + lcl_const[2] = 1.0f; + else if (constants[i].z < -1.0f) + lcl_const[2] = -1.0f; + else + lcl_const[2] = constants[i].z; - if (constants[j + 3] > 1.0f) lcl_const[3] = 1.0f; - else if (constants[j + 3] < -1.0f) lcl_const[3] = -1.0f; - else lcl_const[3] = constants[j + 3]; + if (constants[i].w > 1.0f) + lcl_const[3] = 1.0f; + else if (constants[i].w < -1.0f) + lcl_const[3] = -1.0f; + else + lcl_const[3] = constants[i].w; GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, lcl_const)); } @@ -427,23 +439,30 @@ static unsigned int shader_arb_load_constantsF(const struct wined3d_shader *shad * GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, i, max_constants, constants + (i * 4))); */ - for(; i < max_constants; i++) { - if(!dirty_consts[i]) continue; + for (; i < max_constants; ++i) + { + if (!dirty_consts[i]) + continue; /* Find the next block of dirty constants */ dirty_consts[i] = 0; j = i; - for(i++; (i < max_constants) && dirty_consts[i]; i++) { + for (++i; (i < max_constants) && dirty_consts[i]; ++i) + { dirty_consts[i] = 0; } - GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, j, i - j, constants + (j * 4))); + GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, j, i - j, &constants[j].x)); } - } else { - for(; i < max_constants; i++) { - if(dirty_consts[i]) { + } + else + { + for (; i < max_constants; ++i) + { + if (dirty_consts[i]) + { dirty_consts[i] = 0; - GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, constants + (i * 4))); + GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, &constants[i].x)); } } } @@ -675,8 +694,8 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; /* Load DirectX 9 float constants for vertex shader */ - priv->highest_dirty_vs_const = shader_arb_load_constantsF(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, - priv->highest_dirty_vs_const, state->vs_consts_f, priv->vshader_const_dirty); + 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); shader_arb_vs_local_constants(gl_shader, context, state); } @@ -687,8 +706,8 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, UINT rt_height = state->fb->render_targets[0]->height; /* Load DirectX 9 float constants for pixel shader */ - priv->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, - priv->highest_dirty_ps_const, state->ps_consts_f, priv->pshader_const_dirty); + 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); 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/utils.c b/dlls/wined3d/utils.c index c7bf5bb..e2e3ec9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3365,6 +3365,14 @@ const char *debug_color(const struct wined3d_color *color) color->r, color->g, color->b, color->a); } +const char *debug_vec4(const struct wined3d_vec4 *v) +{ + if (!v) + return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e}", + v->x, v->y, v->z, v->w); +} + const char *debug_d3dformat(enum wined3d_format_id format_id) { switch (format_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3cc7ece..9ce2281 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3095,13 +3095,14 @@ const char *debug_d3dsamplerstate(enum wined3d_sampler_state state) DECLSPEC_HID const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_type) DECLSPEC_HIDDEN; const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN; +const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN; const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN; const char *debug_d3dpool(enum wined3d_pool pool) DECLSPEC_HIDDEN; const char *debug_fboattachment(GLenum attachment) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; -const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN; const char *debug_shader_type(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; +const char *debug_vec4(const struct wined3d_vec4 *v) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage,

1 0

Henri Verbeet : wined3d: Pass a wined3d_vec4 structure to shader_glsl_load_constants_f().
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: f33c79d38763dd4562f00357084c654a5c01c9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33c79d38763dd4562f003570… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 17:19:32 2016 +0200 wined3d: Pass a wined3d_vec4 structure to shader_glsl_load_constants_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index db2322c..4fd24ba 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -700,20 +700,18 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i } /* Context activation is done by the caller. */ -static void shader_glsl_load_constantsF(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const float *constants, const GLint *constant_locations, const struct constant_heap *heap, - unsigned char *stack, UINT version) +static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, + const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, + unsigned char *stack, unsigned int version) { const struct wined3d_shader_lconst *lconst; /* 1.X pshaders have the constants clamped to [-1;1] implicitly. */ if (shader->reg_maps.shader_version.major == 1 && shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_PIXEL) - walk_constant_heap_clamped(gl_info, (const struct wined3d_vec4 *)constants, - constant_locations, heap, stack, version); + walk_constant_heap_clamped(gl_info, constants, constant_locations, heap, stack, version); else - walk_constant_heap(gl_info, (const struct wined3d_vec4 *)constants, - constant_locations, heap, stack, version); + walk_constant_heap(gl_info, constants, constant_locations, heap, stack, version); if (!shader->load_local_constsF) { @@ -1333,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_constantsF(vshader, gl_info, state->vs_consts_f, + shader_glsl_load_constants_f(vshader, gl_info, (const struct wined3d_vec4 *)state->vs_consts_f, prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_VS_I) @@ -1406,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_constantsF(pshader, gl_info, state->ps_consts_f, + shader_glsl_load_constants_f(pshader, gl_info, (const struct wined3d_vec4 *)state->ps_consts_f, prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_PS_I)

1 0

Henri Verbeet : wined3d: Pass a wined3d_vec4 structure to walk_constant_heap().
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: d7596b08ea62cb7d96298345d284f6c05fae07e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7596b08ea62cb7d96298345d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 17:19:31 2016 +0200 wined3d: Pass a wined3d_vec4 structure to walk_constant_heap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d9f1108..db2322c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -551,7 +551,7 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, const float *constants, +static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) { unsigned int start = ~0U, end = 0; @@ -620,7 +620,7 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con } } if (start <= end) - GL_EXTCALL(glUniform4fv(constant_locations[start], end - start + 1, &constants[start * 4])); + GL_EXTCALL(glUniform4fv(constant_locations[start], end - start + 1, &constants[start].x)); checkGLcall("walk_constant_heap()"); } @@ -712,7 +712,8 @@ static void shader_glsl_load_constantsF(const struct wined3d_shader *shader, con walk_constant_heap_clamped(gl_info, (const struct wined3d_vec4 *)constants, constant_locations, heap, stack, version); else - walk_constant_heap(gl_info, constants, constant_locations, heap, stack, version); + walk_constant_heap(gl_info, (const struct wined3d_vec4 *)constants, + constant_locations, heap, stack, version); if (!shader->load_local_constsF) {

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016