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

Iván Matellanes : msvcirt: Add initial implementation of streambuf.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: ee28dbf5424e1605b52fa99c5bb1850e7b9b065c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee28dbf5424e1605b52fa99c5… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 3 21:10:23 2015 +0200 msvcirt: Add initial implementation of streambuf. --- dlls/msvcirt/msvcirt.c | 276 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.h | 3 + dlls/msvcirt/msvcirt.spec | 70 +++++------ dlls/msvcrt20/msvcrt20.spec | 70 +++++------ dlls/msvcrt40/msvcrt40.spec | 70 +++++------ 5 files changed, 384 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee28dbf5424e1605b52fa…

1 0

Iván Matellanes : msvcirt/tests: Add initial tests for streambuf.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 4cd21cf727b34ac2379f4896cf04a3a51abde8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd21cf727b34ac2379f4896c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 3 21:10:33 2015 +0200 msvcirt/tests: Add initial tests for streambuf. --- configure | 1 + configure.ac | 1 + dlls/msvcirt/tests/Makefile.in | 4 + dlls/msvcirt/tests/msvcirt.c | 213 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cd21cf727b34ac2379f4…

1 0

Ken Thomases : configure: Add a check for libunwind.h.
by Alexandre Julliard 05 Jun '15

05 Jun '15

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

Ken Thomases : ntdll: Add support for using libunwind to unwind the stack for x86_64.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: bbcfa6b4ee5d7fea47c61c84d0bbe789e1ec4466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbcfa6b4ee5d7fea47c61c84d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 5 00:41:24 2015 -0500 ntdll: Add support for using libunwind to unwind the stack for x86_64. On OS X, Apple uses compact unwind info in preference to DWARF unwind info. --- dlls/ntdll/signal_x86_64.c | 216 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 215 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbcfa6b4ee5d7fea47c61…

1 0

Matteo Bruni : wined3d: Handle point sprites with PS 3.0.
by Alexandre Julliard 05 Jun '15

05 Jun '15

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 : d3d9/tests: Add more tests for point size.
by Alexandre Julliard 05 Jun '15

05 Jun '15

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

Matteo Bruni : d3d8/tests: Port the point size test to D3D8.
by Alexandre Julliard 05 Jun '15

05 Jun '15

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 : wined3d: Introduce a get_fog_start_end() function.
by Alexandre Julliard 05 Jun '15

05 Jun '15

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 : wined3d: Don' t use the builtin FFP uniforms for fog parameters.
by Alexandre Julliard 05 Jun '15

05 Jun '15

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

Alexandre Julliard : user32: Disallow format 0 in SetClipboardData.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 0aa1af219fd01253fda1724fc1c009e5aba9fa32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa1af219fd01253fda1724fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 17:30:28 2015 +0900 user32: Disallow format 0 in SetClipboardData. --- dlls/user32/clipboard.c | 6 ++++++ dlls/user32/tests/clipboard.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index cd3fdd75..ae6b887 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -400,6 +400,12 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) TRACE("(%04X, %p) !\n", wFormat, hData); + if (!wFormat) + { + SetLastError( ERROR_CLIPBOARD_NOT_OPEN ); + return 0; + } + /* If it's not owned, data can only be set if the format isn't available and its rendering is not delayed */ if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index e3ca808..25da45b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -111,6 +111,7 @@ static void test_RegisterClipboardFormatA(void) char buf[256]; int len; BOOL ret; + HANDLE handle; format_id = RegisterClipboardFormatA("my_cool_clipboard_format"); ok(format_id > 0xc000 && format_id < 0xffff, "invalid clipboard format id %04x\n", format_id); @@ -165,6 +166,25 @@ todo_wine ret = OpenClipboard(0); ok( ret, "OpenClipboard error %d\n", GetLastError()); + /* try some invalid/unregistered formats */ + SetLastError( 0xdeadbeef ); + handle = SetClipboardData( 0, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( !handle, "SetClipboardData succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError()); + handle = SetClipboardData( 0x1234, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( handle != 0, "SetClipboardData failed err %d\n", GetLastError()); + handle = SetClipboardData( 0x123456, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( handle != 0, "SetClipboardData failed err %d\n", GetLastError()); + handle = SetClipboardData( 0xffff8765, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( handle != 0, "SetClipboardData failed err %d\n", GetLastError()); + + ok( IsClipboardFormatAvailable( 0x1234 ), "format missing\n" ); + ok( IsClipboardFormatAvailable( 0x123456 ), "format missing\n" ); + ok( IsClipboardFormatAvailable( 0xffff8765 ), "format missing\n" ); + ok( !IsClipboardFormatAvailable( 0 ), "format available\n" ); + ok( !IsClipboardFormatAvailable( 0x3456 ), "format available\n" ); + ok( !IsClipboardFormatAvailable( 0x8765 ), "format available\n" ); + trace("# of formats available: %d\n", CountClipboardFormats()); format_id = 0;

1 0