wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Matteo Bruni : wined3d: Handle per-vertex point size in the GLSL FFP replacement.
by Alexandre Julliard 17 Jun '15

17 Jun '15

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

Piotr Caban : msvcp110: Fix _Collvec structure layout.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: 3f3e2ba2c7008f41e1bc6d4c2bbe7338d464be95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3e2ba2c7008f41e1bc6d4c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 17 11:47:36 2015 +0200 msvcp110: Fix _Collvec structure layout. --- dlls/msvcp90/locale.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 66d27ce..b975741 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -62,15 +62,6 @@ 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; - - _locale_t loc = _get_current_locale(); - ret = loc->locinfo->lc_handle; - _free_locale(loc); - return ret; -} #else LCID* __cdecl ___lc_handle_func(void); #endif @@ -129,8 +120,13 @@ typedef struct { } _Locinfo; typedef struct { +#if _MSVCP_VER < 110 LCID handle; +#endif unsigned page; +#if _MSVCP_VER >= 110 + wchar_t *lc_name; +#endif } _Collvec; typedef struct { @@ -664,7 +660,11 @@ ULONGLONG __cdecl _Getcoll(void) TRACE("\n"); ret.collvec.page = ___lc_collate_cp_func(); +#if _MSVCP_VER < 110 ret.collvec.handle = ___lc_handle_func()[LC_COLLATE]; +#else + ret.collvec.lc_name = ___lc_locale_name_func()[LC_COLLATE]; +#endif return ret.ull; } @@ -1091,10 +1091,11 @@ int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, TRACE("(%s %s)\n", debugstr_an(first1, last1-first1), debugstr_an(first2, last2-first2)); - if(coll) - lcid = coll->handle; - else - lcid = ___lc_handle_func()[LC_COLLATE]; +#if _MSVCP_VER < 110 + lcid = (coll ? coll->handle : ___lc_handle_func()[LC_COLLATE]); +#else + lcid = LocaleNameToLCID(coll ? coll->lc_name : ___lc_locale_name_func()[LC_COLLATE], 0); +#endif return CompareStringA(lcid, 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; } @@ -1425,15 +1426,15 @@ static collate* collate_short_use_facet(const locale *loc) int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2, const _Collvec *coll) { - LCID lcid; - TRACE("(%s %s)\n", debugstr_wn(first1, last1-first1), debugstr_wn(first2, last2-first2)); - if(coll) - lcid = coll->handle; - else - lcid = ___lc_handle_func()[LC_COLLATE]; - return CompareStringW(lcid, 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; +#if _MSVCP_VER < 110 + return CompareStringW(coll ? coll->handle : ___lc_handle_func()[LC_COLLATE], + 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; +#else + return CompareStringEx(coll ? coll->lc_name : ___lc_locale_name_func()[LC_COLLATE], + 0, first1, last1-first1, first2, last2-first2, NULL, NULL, 0)-CSTR_EQUAL; +#endif } /* ?do_compare@?$collate@_W@std@@MBEHPB_W000@Z */

1 0

Piotr Caban : msvcp110: Use ___lc_locale_name_func in _Getdateorder.
by Alexandre Julliard 17 Jun '15

17 Jun '15

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 17 Jun '15

17 Jun '15

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

Piotr Caban : msvcr120: Add ___lc_locale_name_func implementation.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: f55192aabc999b665886fd8dead69cfb00526f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55192aabc999b665886fd8de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 17 11:46:42 2015 +0200 msvcr120: Add ___lc_locale_name_func implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 51 +++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 88 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 5 ++- 6 files changed, 146 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55192aabc999b665886f…

1 0

Iván Matellanes : msvcirt: Print error messages in unimplemented functions.
by Alexandre Julliard 17 Jun '15

17 Jun '15

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

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

17 Jun '15

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@streambuf@@QAEHH@Z */ +/* ?sputc@streambuf@@QEAAHH@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@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@streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc@streambuf@@QAEHD@Z # int __thiscall streambuf::sputbackc(char) @ stub -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z -@ stub -arch=win32 ?sputc@streambuf@@QAEHH@Z # int __thiscall streambuf::sputc(int) -@ stub -arch=win64 ?sputc@streambuf@@QEAAHH@Z +@ thiscall -arch=win32 ?sputc@streambuf@@QAEHH@Z(ptr long) streambuf_sputc +@ cdecl -arch=win64 ?sputc@streambuf@@QEAAHH@Z(ptr long) streambuf_sputc @ stub -arch=win32 ?sputn@streambuf@@QAEHPBDH@Z # int __thiscall streambuf::sputn(char const *,int) @ stub -arch=win64 ?sputn@streambuf@@QEAAHPEBDH@Z @ stub -arch=win32 ?stdiofile@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@streambuf@@UEAAPEAV1@PEADH@Z"); SET(p_streambuf_setlock, "?setlock@streambuf@@QEAAXXZ"); SET(p_streambuf_sgetc, "?sgetc@streambuf@@QEAAHXZ"); + SET(p_streambuf_sputc, "?sputc@streambuf@@QEAAHH@Z"); SET(p_streambuf_sync, "?sync@streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock@streambuf@@QEAAXXZ"); } else { @@ -163,6 +165,7 @@ static BOOL init(void) SET(p_streambuf_setbuf, "?setbuf@streambuf@@UAEPAV1@PADH@Z"); SET(p_streambuf_setlock, "?setlock@streambuf@@QAEXXZ"); SET(p_streambuf_sgetc, "?sgetc@streambuf@@QAEHXZ"); + SET(p_streambuf_sputc, "?sputc@streambuf@@QAEHH@Z"); SET(p_streambuf_sync, "?sync@streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock@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@streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc@streambuf@@QAEHD@Z @ stub -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z -@ stub -arch=win32 ?sputc@streambuf@@QAEHH@Z -@ stub -arch=win64 ?sputc@streambuf@@QEAAHH@Z +@ thiscall -arch=win32 ?sputc@streambuf@@QAEHH@Z(ptr long) msvcirt.?sputc@streambuf@@QAEHH@Z +@ cdecl -arch=win64 ?sputc@streambuf@@QEAAHH@Z(ptr long) msvcirt.?sputc@streambuf@@QEAAHH@Z @ stub -arch=win32 ?sputn@streambuf@@QAEHPBDH@Z @ stub -arch=win64 ?sputn@streambuf@@QEAAHPEBDH@Z @ stub -arch=win32 ?stdiofile@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@streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc@streambuf@@QAEHD@Z @ stub -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z -@ stub -arch=win32 ?sputc@streambuf@@QAEHH@Z -@ stub -arch=win64 ?sputc@streambuf@@QEAAHH@Z +@ thiscall -arch=win32 ?sputc@streambuf@@QAEHH@Z(ptr long) msvcirt.?sputc@streambuf@@QAEHH@Z +@ cdecl -arch=win64 ?sputc@streambuf@@QEAAHH@Z(ptr long) msvcirt.?sputc@streambuf@@QEAAHH@Z @ stub -arch=win32 ?sputn@streambuf@@QAEHPBDH@Z @ stub -arch=win64 ?sputn@streambuf@@QEAAHPEBDH@Z @ stub -arch=win32 ?stdiofile@stdiobuf@@QAEPAU_iobuf@@XZ

1 0

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

17 Jun '15

Module: wine Branch: master Commit: b08d0bc75de8224b95d299b83290fcbc0b00c18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08d0bc75de8224b95d299b83… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 16 11:32:19 2015 +0200 msvcirt: Add implementation of streambuf::sgetc. --- dlls/msvcirt/msvcirt.c | 19 ++++++++++++++++-- dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 46 +++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 8c05fe3..03db71c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -36,7 +36,7 @@ typedef struct { const vtable_ptr *vtable; int allocated; int unbuffered; - int unknown; + int stored_char; char *base; char *ebuf; char *pbase; @@ -98,7 +98,7 @@ streambuf* __thiscall streambuf_reserve_ctor(streambuf *this, char *buffer, int TRACE("(%p %p %d)\n", this, buffer, length); this->vtable = &MSVCP_streambuf_vtable; this->allocated = 0; - this->unknown = -1; + this->stored_char = EOF; this->do_lock = -1; this->base = NULL; streambuf_setbuf(this, buffer, length); @@ -480,6 +480,7 @@ int __thiscall streambuf_unbuffered_get(const streambuf *this) /* Unexported */ 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) { return EOF; @@ -513,6 +514,20 @@ int __thiscall streambuf_xsputn(streambuf *this, const char *data, int length) return 0; } +/* ?sgetc@streambuf@@QAEHXZ */ +/* ?sgetc@streambuf@@QEAAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_sgetc, 4) +int __thiscall streambuf_sgetc(streambuf *this) +{ + TRACE("(%p)\n", this); + if (this->unbuffered) { + if (this->stored_char == EOF) + this->stored_char = call_streambuf_underflow(this); + return this->stored_char; + } else + return call_streambuf_underflow(this); +} + /****************************************************************** * ??1ios@@UAE@XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index c9f5c06..e879a7f 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -693,8 +693,8 @@ @ cdecl -arch=win64 ?setp@streambuf@@IEAAXPEAD0@Z(ptr ptr ptr) streambuf_setp @ stub -arch=win32 ?setrwbuf@stdiobuf@@QAEHHH@Z # int __thiscall stdiobuf::setrwbuf(int,int) @ stub -arch=win64 ?setrwbuf@stdiobuf@@QEAAHHH@Z -@ stub -arch=win32 ?sgetc@streambuf@@QAEHXZ # int __thiscall streambuf::sgetc(void) -@ stub -arch=win64 ?sgetc@streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sgetc@streambuf@@QAEHXZ(ptr) streambuf_sgetc +@ cdecl -arch=win64 ?sgetc@streambuf@@QEAAHXZ(ptr) streambuf_sgetc @ stub -arch=win32 ?sgetn@streambuf@@QAEHPADH@Z # int __thiscall streambuf::sgetn(char *,int) @ stub -arch=win64 ?sgetn@streambuf@@QEAAHPEADH@Z # @ extern ?sh_none@filebuf@@2HB # static int const filebuf::sh_none diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 1a6ce5d..7155740 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -28,7 +28,7 @@ typedef struct { const vtable_ptr *vtable; int allocated; int unbuffered; - int unknown; + int stored_char; char *base; char *ebuf; char *pbase; @@ -61,6 +61,7 @@ static void (*__thiscall p_streambuf_pbump)(streambuf*, int); 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_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); @@ -145,6 +146,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb@streambuf@@IEAAXPEAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UEAAPEAV1@PEADH@Z"); SET(p_streambuf_setlock, "?setlock@streambuf@@QEAAXXZ"); + SET(p_streambuf_sgetc, "?sgetc@streambuf@@QEAAHXZ"); SET(p_streambuf_sync, "?sync@streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock@streambuf@@QEAAXXZ"); } else { @@ -160,6 +162,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb@streambuf@@IAEXPAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UAEPAV1@PADH@Z"); SET(p_streambuf_setlock, "?setlock@streambuf@@QAEXXZ"); + SET(p_streambuf_sgetc, "?sgetc@streambuf@@QAEHXZ"); SET(p_streambuf_sync, "?sync@streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock@streambuf@@QAEXXZ"); } @@ -168,6 +171,18 @@ static BOOL init(void) return TRUE; } +static int underflow_count; + +#ifdef __i386__ +static int __thiscall test_streambuf_underflow(void) +#else +static int __thiscall test_streambuf_underflow(streambuf *this) +#endif +{ + underflow_count++; + return 'u'; +} + struct streambuf_lock_arg { streambuf *sb; @@ -197,6 +212,7 @@ static DWORD WINAPI lock_streambuf(void *arg) static void test_streambuf(void) { streambuf sb, sb2, sb3, *psb; + vtable_ptr test_streambuf_vtbl[11]; struct streambuf_lock_arg lock_arg; HANDLE thread; char reserve[16]; @@ -226,6 +242,12 @@ static void test_streambuf(void) ok(sb3.base == NULL, "wrong base pointer, expected %p got %p\n", NULL, sb3.base); 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[8] = (vtable_ptr)&test_streambuf_underflow; + sb2.vtable = test_streambuf_vtbl; + sb3.vtable = test_streambuf_vtbl; + underflow_count = 0; + /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); call_func1(p_streambuf_setlock, &sb); @@ -386,6 +408,28 @@ static void test_streambuf(void) ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + /* sgetc */ + ret = (int) call_func1(p_streambuf_sgetc, &sb2); + ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(underflow_count == 1, "expected call to underflow\n"); + ok(sb2.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb2.stored_char); + sb2.gptr = sb2.eback; + *sb2.gptr = 'a'; + ret = (int) call_func1(p_streambuf_sgetc, &sb2); + ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(underflow_count == 2, "expected call to underflow\n"); + ok(sb2.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb2.stored_char); + sb2.gptr = sb2.egptr; + ret = (int) call_func1(p_streambuf_sgetc, &sb3); + ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(underflow_count == 3, "expected call to underflow\n"); + ok(sb3.stored_char == 'u', "wrong stored character, expected 'u' got %c\n", sb3.stored_char); + sb3.stored_char = 'b'; + ret = (int) call_func1(p_streambuf_sgetc, &sb3); + ok(ret == 'b', "expected 'b' got '%c'\n", ret); + 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); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 9d212fe..14846f3 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -681,8 +681,8 @@ @ cdecl -arch=win64 ?setp@streambuf@@IEAAXPEAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IEAAXPEAD0@Z @ stub -arch=win32 ?setrwbuf@stdiobuf@@QAEHHH@Z @ stub -arch=win64 ?setrwbuf@stdiobuf@@QEAAHHH@Z -@ stub -arch=win32 ?sgetc@streambuf@@QAEHXZ -@ stub -arch=win64 ?sgetc@streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sgetc@streambuf@@QAEHXZ(ptr) msvcirt.?sgetc@streambuf@@QAEHXZ +@ cdecl -arch=win64 ?sgetc@streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc@streambuf@@QEAAHXZ @ stub -arch=win32 ?sgetn@streambuf@@QAEHPADH@Z @ stub -arch=win64 ?sgetn@streambuf@@QEAAHPEADH@Z # @ extern ?sh_none@filebuf@@2HB diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a1cabf9..c794b6e 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -753,8 +753,8 @@ @ cdecl -arch=win64 ?setp@streambuf@@IEAAXPEAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IEAAXPEAD0@Z @ stub -arch=win32 ?setrwbuf@stdiobuf@@QAEHHH@Z @ stub -arch=win64 ?setrwbuf@stdiobuf@@QEAAHHH@Z -@ stub -arch=win32 ?sgetc@streambuf@@QAEHXZ -@ stub -arch=win64 ?sgetc@streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sgetc@streambuf@@QAEHXZ(ptr) msvcirt.?sgetc@streambuf@@QAEHXZ +@ cdecl -arch=win64 ?sgetc@streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc@streambuf@@QEAAHXZ @ stub -arch=win32 ?sgetn@streambuf@@QAEHPADH@Z @ stub -arch=win64 ?sgetn@streambuf@@QEAAHPEADH@Z # @ extern ?sh_none@filebuf@@2HB

1 0

Nikolay Sivov : ole32: Fix a typo in argument name.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: 4cef7ad841fe17b8a9fa879a99a802eacb7dae89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cef7ad841fe17b8a9fa879a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 22:43:23 2015 +0300 ole32: Fix a typo in argument name. --- dlls/ole32/usrmarshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 957338a..fe8ff4f 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -308,7 +308,7 @@ static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffe return pBuffer + sizeof(RemotableHandle); } -static void handle_UserFree(ULONG *pFlags, HANDLE *phMenu) +static void handle_UserFree(ULONG *pFlags, HANDLE *handle) { /* nothing to do */ }

1 0

André Hentschel : ntdll: Set TPIDRURW inline on ARM.
by Alexandre Julliard 17 Jun '15

17 Jun '15

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

← Newer
1
...
22
23
24
25
26
27
28
...
61
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 June 2015