June 2015 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Handle point sprites with PS 3.0.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: 92fbe333d05fd444090c86cbe158b94fd5d5af68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fbe333d05fd444090c86cbe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 00:37:29 2015 +0200 wined3d: Handle point sprites with PS 3.0. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 14 +++++++++----- dlls/wined3d/shader.c | 3 +++ dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 7 ++++--- 7 files changed, 22 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92fbe333d05fd444090c8…

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for fog parameters.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: 614e52e89746b34826fb17c98b1b2ffc6bcbd9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=614e52e89746b34826fb17c98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 00:37:33 2015 +0200 wined3d: Don't use the builtin FFP uniforms for fog parameters. --- dlls/wined3d/glsl_shader.c | 81 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 19 +++++----- 2 files changed, 81 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=614e52e89746b34826fb1…

1 0

Matteo Bruni : wined3d: Introduce a get_fog_start_end() function.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: b02a166cc84a1c61db9e91e26e6b8e0a8662fd19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02a166cc84a1c61db9e91e26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 00:37:32 2015 +0200 wined3d: Introduce a get_fog_start_end() function. --- dlls/wined3d/state.c | 41 +------------------------------------- dlls/wined3d/utils.c | 45 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 917d155..b7d7f92 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1006,47 +1006,8 @@ void state_fogstartend(struct wined3d_context *context, const struct wined3d_sta { const struct wined3d_gl_info *gl_info = context->gl_info; float fogstart, fogend; - union { - DWORD d; - float f; - } tmpvalue; - - switch(context->fog_source) { - case FOGSOURCE_VS: - fogstart = 1.0f; - fogend = 0.0f; - break; - - case FOGSOURCE_COORD: - fogstart = 255.0f; - fogend = 0.0f; - break; - case FOGSOURCE_FFP: - tmpvalue.d = state->render_states[WINED3D_RS_FOGSTART]; - fogstart = tmpvalue.f; - tmpvalue.d = state->render_states[WINED3D_RS_FOGEND]; - fogend = tmpvalue.f; - /* Special handling for fogstart == fogend. In d3d with vertex - * fog, everything is fogged. With table fog, everything with - * fog_coord < fog_start is unfogged, and fog_coord > fog_start - * is fogged. Windows drivers disagree when fog_coord == fog_start. */ - if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE - && fogstart == fogend) - { - fogstart = -INFINITY; - fogend = 0.0f; - } - break; - - default: - /* This should not happen.context->fog_source is set in wined3d, not the app. - * Still this is needed to make the compiler happy - */ - ERR("Unexpected fog coordinate source\n"); - fogstart = 0.0f; - fogend = 0.0f; - } + get_fog_start_end(context, state, &fogstart, &fogend); gl_info->gl_ops.gl.p_glFogf(GL_FOG_START, fogstart); checkGLcall("glFogf(GL_FOG_START, fogstart)"); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2a4ac83..ed4262a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3654,6 +3654,51 @@ void get_pointsize(const struct wined3d_context *context, const struct wined3d_s *out_pointsize = pointsize.f; } +void get_fog_start_end(const struct wined3d_context *context, const struct wined3d_state *state, + float *start, float *end) +{ + union + { + DWORD d; + float f; + } tmpvalue; + + switch (context->fog_source) + { + case FOGSOURCE_VS: + *start = 1.0f; + *end = 0.0f; + break; + + case FOGSOURCE_COORD: + *start = 255.0f; + *end = 0.0f; + break; + + case FOGSOURCE_FFP: + tmpvalue.d = state->render_states[WINED3D_RS_FOGSTART]; + *start = tmpvalue.f; + tmpvalue.d = state->render_states[WINED3D_RS_FOGEND]; + *end = tmpvalue.f; + /* Special handling for fog_start == fog_end. In d3d with vertex + * fog, everything is fogged. With table fog, everything with + * fog_coord < fog_start is unfogged, and fog_coord > fog_start + * is fogged. Windows drivers disagree when fog_coord == fog_start. */ + if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE && *start == *end) + { + *start = -INFINITY; + *end = 0.0f; + } + break; + + default: + /* This should not happen, context->fog_source is set in wined3d, not the app. */ + ERR("Unexpected fog coordinate source.\n"); + *start = 0.0f; + *end = 0.0f; + } +} + /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9de679..93cfd9e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3074,6 +3074,8 @@ void get_pointsize_minmax(const struct wined3d_context *context, const struct wi float *out_min, float *out_max) DECLSPEC_HIDDEN; void get_pointsize(const struct wined3d_context *context, const struct wined3d_state *state, float *out_pointsize, float *out_att) DECLSPEC_HIDDEN; +void get_fog_start_end(const struct wined3d_context *context, const struct wined3d_state *state, + float *start, float *end) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : d3d8/tests: Port the point size test to D3D8.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: 53ff3279e4db958a3c3c7e47d91ccbd5f0a5e126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ff3279e4db958a3c3c7e47d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 01:21:10 2015 +0200 d3d8/tests: Port the point size test to D3D8. --- dlls/d3d8/tests/visual.c | 511 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 511 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53ff3279e4db958a3c3c7…

1 0

Matteo Bruni : d3d9/tests: Add more tests for point size.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: 386b5ded61a023e1343fd56be781057c6ebc4236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=386b5ded61a023e1343fd56be… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 01:21:09 2015 +0200 d3d9/tests: Add more tests for point size. --- dlls/d3d9/tests/visual.c | 361 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 326 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=386b5ded61a023e1343fd…

1 0

Ken Thomases : configure: Add a check for libunwind.h.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: 260832c5c86b6d22f7b77da5b834fc652755a3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=260832c5c86b6d22f7b77da5b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 5 00:40:23 2015 -0500 configure: Add a check for libunwind.h. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 5 insertions(+) diff --git a/configure b/configure index 1759dba..fa52cf7 100755 --- a/configure +++ b/configure @@ -6626,6 +6626,7 @@ for ac_header in \ lber.h \ ldap.h \ libproc.h \ + libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ diff --git a/configure.ac b/configure.ac index 445c9d4..79110c1 100644 --- a/configure.ac +++ b/configure.ac @@ -424,6 +424,7 @@ AC_CHECK_HEADERS(\ lber.h \ ldap.h \ libproc.h \ + libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ diff --git a/include/config.h.in b/include/config.h.in index 0f435d1..eb61a94 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -360,6 +360,9 @@ /* Define to 1 if you have the <libproc.h> header file. */ #undef HAVE_LIBPROC_H +/* Define to 1 if you have the <libunwind.h> header file. */ +#undef HAVE_LIBUNWIND_H + /* Define to 1 if you have the <libv4l1.h> header file. */ #undef HAVE_LIBV4L1_H

1 0

Qian Hong : server: Fix type name of directory file.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: ef3ed04cdc96c1a885f9796013b480fb7f5bc243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3ed04cdc96c1a885f979601… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:37 2015 +0800 server: Fix type name of directory file. --- dlls/ntdll/tests/om.c | 6 +++--- server/change.c | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1fa9c47..0f9008a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -783,11 +783,11 @@ static void test_query_object(void) memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); - todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); diff --git a/server/change.c b/server/change.c index 11d9b93..59d1819 100644 --- a/server/change.c +++ b/server/change.c @@ -148,13 +148,14 @@ static struct security_descriptor *dir_get_sd( struct object *obj ); static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); static void dir_dump( struct object *obj, int verbose ); +static struct object_type *dir_get_type( struct object *obj ); static void dir_destroy( struct object *obj ); static const struct object_ops dir_ops = { sizeof(struct dir), /* size */ dir_dump, /* dump */ - no_get_type, /* get_type */ + dir_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -250,6 +251,13 @@ static void dir_dump( struct object *obj, int verbose ) fprintf( stderr, "Dirfile fd=%p filter=%08x\n", dir->fd, dir->filter ); } +static struct object_type *dir_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'F','i','l','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + /* enter here directly from SIGIO signal handler */ void do_change_notify( int unix_fd ) {

1 0

Qian Hong : server: Fix type name of File.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: f208c50cc024fe14d038c517f301196b5c344d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f208c50cc024fe14d038c517f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:25 2015 +0800 server: Fix type name of File. --- dlls/ntdll/tests/om.c | 6 +++--- server/file.c | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b7ef99e..1fa9c47 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -799,11 +799,11 @@ static void test_query_object(void) memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); - todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); DeleteFileA( file1 ); pNtClose( handle ); diff --git a/server/file.c b/server/file.c index 792bbe0..e70304f 100644 --- a/server/file.c +++ b/server/file.c @@ -64,6 +64,7 @@ struct file static unsigned int generic_file_map_access( unsigned int access ); static void file_dump( struct object *obj, int verbose ); +static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); @@ -77,7 +78,7 @@ static const struct object_ops file_ops = { sizeof(struct file), /* size */ file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -273,6 +274,13 @@ static void file_dump( struct object *obj, int verbose ) fprintf( stderr, "File fd=%p\n", file->fd ); } +static struct object_type *file_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'F','i','l','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + static int file_get_poll_events( struct fd *fd ) { struct file *file = get_fd_user( fd );

1 0

Sebastian Lackner : ntdll/tests: Don' t call lstrlenW on non-null-terminated buffer.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: d6a044c86a2977376341b6ac3a151366ec11d0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a044c86a2977376341b6ac3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 4 16:12:58 2015 +0200 ntdll/tests: Don't call lstrlenW on non-null-terminated buffer. --- dlls/ntdll/tests/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 21aa31f..730b0f1 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -350,7 +350,7 @@ static void test_NtQueryDirectoryFile_case(void) } mask.Buffer = testmask; - mask.Length = mask.MaximumLength = lstrlenW(testmask) * sizeof(WCHAR); + mask.Length = mask.MaximumLength = sizeof(testmask); pNtQueryDirectoryFile(dirh, NULL, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, FALSE); ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status);

1 0

Ken Thomases : configure: Warn for a 64-bit build without CFI directive support.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: 8c60dc0706c8f7674b2bf0106555bc44ac971ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c60dc0706c8f7674b2bf0106… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 4 13:57:59 2015 -0500 configure: Warn for a 64-bit build without CFI directive support. --- configure | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configure b/configure index f47c09e..279c3bc 100755 --- a/configure +++ b/configure @@ -14649,6 +14649,10 @@ $as_echo "#define __ASM_CFI(str) str" >>confdefs.h else $as_echo "#define __ASM_CFI(str) \"\"" >>confdefs.h + if test "x$enable_win64" = "xyes" + then + as_fn_append wine_warnings "|building 64-bit Wine without support for CFI directives; exception handling will not work properly." + fi fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer" diff --git a/configure.ac b/configure.ac index c61a975..9b25196 100644 --- a/configure.ac +++ b/configure.ac @@ -1987,6 +1987,10 @@ then AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables]) else AC_DEFINE([__ASM_CFI(str)],[""]) + if test "x$enable_win64" = "xyes" + then + WINE_WARNING([building 64-bit Wine without support for CFI directives; exception handling will not work properly.]) + fi fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer"

1 0