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

Matteo Bruni : wined3d: Handle per-vertex point size in the GLSL FFP replacement.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 170dca77414cd2a0012eb66b587fc061b53e1030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170dca77414cd2a0012eb66b5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:37 2015 +0200 wined3d: Handle per-vertex point size in the GLSL FFP replacement. --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/context.c | 3 ++- dlls/wined3d/glsl_shader.c | 5 +++-- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index db9fb79..da20b84 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6475,7 +6475,7 @@ static void test_pointsize(void) {decl, &vs1, &ps1, D3DFVF_XYZ, 32, 32}, {NULL, &novs, &ps1, D3DFVF_XYZ, 32, 62}, {decl, &vs1, &nops, D3DFVF_XYZ, 32, 32}, - /* {NULL, &novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 48}, */ + {NULL, &novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 48}, {decl_psize, &vs1_psize, &ps1, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 24}, }; static const struct diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f9cb71c..491f007 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10325,7 +10325,7 @@ static void pointsize_test(void) {&vs1, &ps2_zw, D3DFVF_XYZ, 32, 32, TRUE, FALSE}, {&vs3, &ps3, D3DFVF_XYZ, 32, 32, FALSE, TRUE}, {&vs3, &ps3_zw, D3DFVF_XYZ, 32, 32, TRUE, FALSE}, - /* {&novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 48, FALSE, FALSE}, */ + {&novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 48, FALSE, FALSE}, {&vs1_psize, &ps1, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 24, FALSE, FALSE}, {&vs3_psize, &ps3, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 24, FALSE, TRUE}, }; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d88995b..9cc7c11 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2785,6 +2785,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, /* We need to deal with frequency data! */ struct wined3d_vertex_declaration *declaration = state->vertex_declaration; BOOL use_vshader = use_vs(state); + BOOL generic_attributes = context->d3d_info->ffp_generic_attributes; unsigned int i; stream_info->use_map = 0; @@ -2829,7 +2830,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, } else { - if (!element->ffp_valid) + if (!generic_attributes && !element->ffp_valid) { WARN("Skipping unsupported fixed function element of format %s and usage %s.\n", debug_d3dformat(element->format->id), debug_d3ddeclusage(element->usage)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa96fbe..37a8f87 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5867,9 +5867,10 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe if (settings->point_size) { - shader_addline(buffer, "gl_PointSize = ffp_point.size / sqrt(ffp_point.c_att" + shader_addline(buffer, "gl_PointSize = %s / sqrt(ffp_point.c_att" " + ffp_point.l_att * length(ec_pos.xyz)" - " + ffp_point.q_att * dot(ec_pos.xyz, ec_pos.xyz));\n"); + " + ffp_point.q_att * dot(ec_pos.xyz, ec_pos.xyz));\n", + settings->per_vertex_point_size ? "ffp_attrib_psize" : "ffp_point.size"); shader_addline(buffer, "gl_PointSize = clamp(gl_PointSize, ffp_point.size_min, ffp_point.size_max);\n"); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 42df5e6..a9231a8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4514,6 +4514,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct settings->transformed = 1; settings->point_size = state->gl_primitive_type == GL_POINTS; + settings->per_vertex_point_size = !!(si->use_map & 1 << WINED3D_FFP_PSIZE); if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) @@ -4539,6 +4540,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct settings->lighting = !!state->render_states[WINED3D_RS_LIGHTING]; settings->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; settings->point_size = state->gl_primitive_type == GL_POINTS; + settings->per_vertex_point_size = !!(si->use_map & 1 << WINED3D_FFP_PSIZE); if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1 << WINED3D_FFP_DIFFUSE))) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9dd9443..c184b72 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1894,10 +1894,11 @@ struct wined3d_ffp_vs_settings DWORD lighting : 1; DWORD localviewer : 1; DWORD point_size : 1; + DWORD per_vertex_point_size : 1; DWORD fog_mode : 2; DWORD texcoords : 8; /* MAX_TEXTURES */ DWORD ortho_fog : 1; - DWORD padding : 14; + DWORD padding : 13; DWORD texgen[MAX_TEXTURES]; };

1 0

Jacek Caban : secur32: Fixed compilation on with gnutls.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 72747526b1242f436db9e68d319c37484ce02109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72747526b1242f436db9e68d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 17 13:01:14 2015 +0200 secur32: Fixed compilation on with gnutls. --- dlls/secur32/schannel_gnutls.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bb463c1..c0b6f80 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -76,7 +76,10 @@ MAKE_FUNCPTR(gnutls_transport_set_pull_function); MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR - +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#endif static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) @@ -258,7 +261,7 @@ static DWORD schannel_get_protocol(gnutls_protocol_t proto) } } -static ALG_ID schannel_get_cipher_algid(gnutls_cipher_algorithm_t cipher) +static ALG_ID schannel_get_cipher_algid(int cipher) { switch (cipher) {

1 0

Piotr Caban : msvcp110: Use ___lc_locale_name_func in _Getdateorder.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 0b58d83dec63dcaee9159f81945145145d920d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b58d83dec63dcaee9159f819… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 17 11:47:24 2015 +0200 msvcp110: Use ___lc_locale_name_func in _Getdateorder. --- dlls/msvcp90/locale.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 45a2af8..66d27ce 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -761,9 +761,15 @@ int __cdecl _Getdateorder(void) { WCHAR date_fmt[2]; +#if _MSVCP_VER < 110 if(!GetLocaleInfoW(___lc_handle_func()[LC_TIME], LOCALE_ILDATE, date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) return DATEORDER_no_order; +#else + if(!GetLocaleInfoEx(___lc_locale_name_func()[LC_TIME], LOCALE_ILDATE, + date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) + return DATEORDER_no_order; +#endif if(*date_fmt == '0') return DATEORDER_mdy; if(*date_fmt == '1') return DATEORDER_dmy;

1 0

Piotr Caban : msvcp110: Use ___lc_locale_name_func in _Getctype.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: bcc290028210fe6606587314399a93700b41433c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc290028210fe66065873143… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 17 11:47:12 2015 +0200 msvcp110: Use ___lc_locale_name_func in _Getctype. --- dlls/msvcp90/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1be7357..45a2af8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -61,6 +61,7 @@ MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*, const locale* __cdecl locale_classic(void); #if _MSVCP_VER >= 110 +wchar_t ** __cdecl ___lc_locale_name_func(void); static LCID* ___lc_handle_func(void) { LCID *ret; @@ -688,8 +689,7 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) #if _MSVCP_VER < 110 ret->handle = ___lc_handle_func()[LC_COLLATE]; #else - /* FIXME: use ___lc_locale_name_func() */ - ret->name = NULL; + ret->name = ___lc_locale_name_func()[LC_COLLATE]; #endif ret->delfl = TRUE; table = malloc(sizeof(short[256]));

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sputc.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 540f644ceb2d9b54b62c79d48ce1c4e6135051d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540f644ceb2d9b54b62c79d48… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 16 11:32:29 2015 +0200 msvcirt: Add implementation of streambuf::sputc. --- dlls/msvcirt/msvcirt.c | 10 ++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 45 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 03db71c..c2e6c14 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -355,6 +355,7 @@ int __thiscall streambuf_out_waiting(const streambuf *this) /* Unexported */ DEFINE_THISCALL_WRAPPER(streambuf_overflow, 8) +#define call_streambuf_overflow(this, c) CALL_VTBL_FUNC(this, 28, int, (streambuf*, int), (this, c)) int __thiscall streambuf_overflow(streambuf *this, int c) { return EOF; @@ -528,6 +529,15 @@ int __thiscall streambuf_sgetc(streambuf *this) return call_streambuf_underflow(this); } +/* ?sputc(a)streambuf@@QAEHH(a)Z */ +/* ?sputc(a)streambuf@@QEAAHH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sputc, 8) +int __thiscall streambuf_sputc(streambuf *this, int ch) +{ + TRACE("(%p %d)\n", this, ch); + return (this->pptr < this->epptr) ? *this->pptr++ = ch : call_streambuf_overflow(this, ch); +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index e879a7f..7d6df5f 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -704,8 +704,8 @@ @ stub -arch=win64 ?snextc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z # int __thiscall streambuf::sputbackc(char) @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z -@ stub -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z # int __thiscall streambuf::sputc(int) -@ stub -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z +@ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) streambuf_sputc +@ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) streambuf_sputc @ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z # int __thiscall streambuf::sputn(char const *,int) @ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ # struct _iobuf * __thiscall stdiobuf::stdiofile(void) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 7155740..6c60dd0 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -62,6 +62,7 @@ static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static void (*__thiscall p_streambuf_setlock)(streambuf*); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); static int (*__thiscall p_streambuf_sgetc)(streambuf*); +static int (*__thiscall p_streambuf_sputc)(streambuf*, int); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); @@ -147,6 +148,7 @@ static BOOL init(void) SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QEAAHXZ"); + SET(p_streambuf_sputc, "?sputc(a)streambuf@@QEAAHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); } else { @@ -163,6 +165,7 @@ static BOOL init(void) SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QAEXXZ"); SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QAEHXZ"); + SET(p_streambuf_sputc, "?sputc(a)streambuf@@QAEHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); } @@ -171,7 +174,20 @@ static BOOL init(void) return TRUE; } -static int underflow_count; +static int overflow_count, underflow_count; +static streambuf *test_overflow_this; + +#ifdef __i386__ +static int __thiscall test_streambuf_overflow(int ch) +#else +static int __thiscall test_streambuf_overflow(streambuf *this, int ch) +#endif +{ + overflow_count++; + if (!test_overflow_this->unbuffered) + test_overflow_this->pptr = test_overflow_this->pbase + 5; + return ch; +} #ifdef __i386__ static int __thiscall test_streambuf_underflow(void) @@ -243,10 +259,11 @@ static void test_streambuf(void) ok(sb3.ebuf == NULL, "wrong ebuf pointer, expected %p got %p\n", NULL, sb3.ebuf); memcpy(test_streambuf_vtbl, sb.vtable, sizeof(test_streambuf_vtbl)); + test_streambuf_vtbl[7] = (vtable_ptr)&test_streambuf_overflow; test_streambuf_vtbl[8] = (vtable_ptr)&test_streambuf_underflow; sb2.vtable = test_streambuf_vtbl; sb3.vtable = test_streambuf_vtbl; - underflow_count = 0; + overflow_count = underflow_count = 0; /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); @@ -430,6 +447,30 @@ static void test_streambuf(void) ok(underflow_count == 3, "no call to underflow expected\n"); ok(sb3.stored_char == 'b', "wrong stored character, expected 'b' got %c\n", sb3.stored_char); + /* sputc */ + *sb.pbase = 'a'; + ret = (int) call_func2(p_streambuf_sputc, &sb, 'c'); + ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); + ok(overflow_count == 0, "no call to overflow expected\n"); + ok(*sb.pbase == 'c', "expected 'c' in the put area, got %c\n", *sb.pbase); + ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); + test_overflow_this = &sb2; + ret = (int) call_func2(p_streambuf_sputc, &sb2, 'c'); + ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); + ok(overflow_count == 1, "expected call to overflow\n"); + ok(sb2.pptr == sb2.pbase + 5, "wrong put pointer, expected %p got %p\n", sb2.pbase + 5, sb2.pptr); + test_overflow_this = &sb3; + ret = (int) call_func2(p_streambuf_sputc, &sb3, 'c'); + ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); + ok(overflow_count == 2, "expected call to overflow\n"); + sb3.pbase = sb3.pptr = sb3.base; + sb3.epptr = sb3.ebuf; + ret = (int) call_func2(p_streambuf_sputc, &sb3, 'c'); + ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); + ok(overflow_count == 2, "no call to overflow expected\n"); + ok(*sb3.pbase == 'c', "expected 'c' in the put area, got %c\n", *sb3.pbase); + sb3.pbase = sb3.pptr = sb3.epptr = NULL; + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 14846f3..79f5902 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -692,8 +692,8 @@ @ stub -arch=win64 ?snextc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z -@ stub -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z -@ stub -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z +@ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z +@ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z @ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z @ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index c794b6e..86d3985 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -764,8 +764,8 @@ @ stub -arch=win64 ?snextc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z -@ stub -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z -@ stub -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z +@ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z +@ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z @ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z @ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ

1 0

Matteo Bruni : wined3d: Cleanup and simplify texture sampling code generation.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: f6e7e01744602a55200019642dada5715fd51822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e7e01744602a55200019642… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:39 2015 +0200 wined3d: Cleanup and simplify texture sampling code generation. Makes it easier to support the different names and syntax in GLSL 1.50 in the (hopefully) near future. --- dlls/wined3d/glsl_shader.c | 329 ++++++++++++++------------------------------- 1 file changed, 98 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6e7e01744602a5520001…

1 0

Iván Matellanes : msvcirt: Print error messages in unimplemented functions.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 7a89251c2f57fc2084a9c1aa9d42bd0d8139ad46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a89251c2f57fc2084a9c1aa9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 16 11:32:37 2015 +0200 msvcirt: Print error messages in unimplemented functions. --- dlls/msvcirt/msvcirt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index c2e6c14..47a7f28 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -358,6 +358,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_overflow, 8) #define call_streambuf_overflow(this, c) CALL_VTBL_FUNC(this, 28, int, (streambuf*, int), (this, c)) int __thiscall streambuf_overflow(streambuf *this, int c) { + ERR("overflow is not implemented in streambuf\n"); return EOF; } @@ -484,6 +485,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_underflow, 4) #define call_streambuf_underflow(this) CALL_VTBL_FUNC(this, 32, int, (streambuf*), (this)) int __thiscall streambuf_underflow(streambuf *this) { + ERR("underflow is not implemented in streambuf\n"); return EOF; }

1 0

André Hentschel : ntdll: Set TPIDRURW inline on ARM.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 113329526717eb71b913fdfa8ca9cc702918b6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=113329526717eb71b913fdfa8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 16 22:10:43 2015 +0200 ntdll: Set TPIDRURW inline on ARM. --- dlls/ntdll/signal_arm.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6509046..1f6da96 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -912,21 +912,6 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } -/********************************************************************** - * set_tpidrurw - * - * Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. - */ -#ifdef __ARM_ARCH_7A__ -extern void set_tpidrurw( TEB *teb ); -__ASM_GLOBAL_FUNC( set_tpidrurw, - "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */ - "bx lr" ) -#else -void set_tpidrurw( TEB *teb ) -{ -} -#endif /********************************************************************** * signal_init_thread @@ -940,7 +925,12 @@ void signal_init_thread( TEB *teb ) pthread_key_create( &teb_key, NULL ); init_done = TRUE; } - set_tpidrurw( teb ); + +#ifdef __ARM_ARCH_7A__ + /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ + __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); +#endif + pthread_setspecific( teb_key, teb ); }

1 0

Andrew Eikum : include: Upgrade interface definitions to XAudio2 2.8.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 97536c16789d44effa57ed9429114ee79d4a7f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97536c16789d44effa57ed942… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 16 14:44:01 2015 -0500 include: Upgrade interface definitions to XAudio2 2.8. This updates IXAudio2, IXAudio2SourceVoice, and IXAudio2MasteringVoice to version 2.8. New interfaces are created for breaking changes from version 2.7. The implementation in dlls/xaudio2_7 is updated to match. --- dlls/xaudio2_7/xaudio_dll.c | 240 ++++++++++++++++++++++++++++++++++---------- include/audiosessiontypes.h | 12 +++ include/xaudio2.idl | 126 +++++++++++++++++------ 3 files changed, 295 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97536c16789d44effa57e…

1 0

Nikolay Sivov : riched20/tests: Some more EM_SETSEL tests.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: fd4affc0cb1f2eca603a4f954d513ab25ff2f486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4affc0cb1f2eca603a4f954… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 17:41:07 2015 +0300 riched20/tests: Some more EM_SETSEL tests. --- dlls/riched20/tests/editor.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c3470d4..9adc507 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4428,7 +4428,7 @@ struct exsetsel_s { int _getsel_todo_wine; }; -const struct exsetsel_s exsetsel_tests[] = { +static const struct exsetsel_s exsetsel_tests[] = { /* sanity tests */ {5, 10, 10, 5, 10, 0}, {15, 17, 17, 15, 17, 0}, @@ -4452,6 +4452,9 @@ const struct exsetsel_s exsetsel_tests[] = { /* test if cpMin > cpMax */ {15, 19, 18, 15, 18, 0}, {19, 15, 18, 15, 18, 0}, + /* cpMin == strlen() && cpMax > cpMin */ + {17, 18, 18, 17, 18 }, + {17, 50, 18, 17, 18 }, }; static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { @@ -4515,6 +4518,7 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) static void test_EM_SETSEL(void) { + char buffA[32]; HWND hwndRichEdit = new_richedit(NULL); int i; const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); @@ -4528,6 +4532,11 @@ static void test_EM_SETSEL(void) check_EM_SETSEL(hwndRichEdit, &exsetsel_tests[i], i); } + SendMessageA(hwndRichEdit, EM_SETSEL, 17, 18); + buffA[0] = 123; + SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); + ok(buffA[0] == 0, "selection text %s\n", buffA); + DestroyWindow(hwndRichEdit); }

1 0