wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Hans Leidekker : wbemprox: Add support for 64-bit integer types.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: fc6d667ac000659ad2ac12151476f8712174b48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6d667ac000659ad2ac12151… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:34:23 2012 +0200 wbemprox: Add support for 64-bit integer types. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/query.c | 69 +++++++++++++++++++++++++++++++------------- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index bc82945..837a47e 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 +IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 35b6a0c..0f41d44 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -56,6 +56,9 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_SINT32: case CIM_UINT32: return sizeof(INT32); + case CIM_SINT64: + case CIM_UINT64: + return sizeof(INT64); case CIM_DATETIME: case CIM_STRING: return sizeof(WCHAR *); @@ -78,7 +81,7 @@ static UINT get_row_size( const struct table *table ) return get_column_offset( table, table->num_cols - 1 ) + get_column_size( table, table->num_cols - 1 ); } -static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_PTR *val ) +static HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *val ) { UINT col_offset, row_size; const BYTE *ptr; @@ -89,14 +92,14 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ if (table->columns[column].type & CIM_FLAG_ARRAY) { - *val = (INT_PTR)*(const void **)ptr; + *val = (LONGLONG)(INT_PTR)*(const void **)ptr; return S_OK; } switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_DATETIME: case CIM_STRING: - *val = (INT_PTR)*(const WCHAR **)ptr; + *val = (LONGLONG)(INT_PTR)*(const WCHAR **)ptr; break; case CIM_SINT16: *val = *(const INT16 *)ptr; @@ -110,6 +113,12 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ case CIM_UINT32: *val = *(const UINT32 *)ptr; break; + case CIM_SINT64: + *val = *(const INT64 *)ptr; + break; + case CIM_UINT64: + *val = *(const UINT64 *)ptr; + break; default: ERR("invalid column type %u\n", table->columns[column].type & COL_TYPE_MASK); *val = 0; @@ -122,10 +131,12 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) { static const WCHAR fmt_signedW[] = {'%','d',0}; static const WCHAR fmt_unsignedW[] = {'%','u',0}; + static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; + static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; static const WCHAR fmt_strW[] = {'\"','%','s','\"',0}; - INT_PTR val; + LONGLONG val; BSTR ret; - WCHAR number[12]; + WCHAR number[22]; UINT len; if (table->columns[column].type & CIM_FLAG_ARRAY) @@ -139,9 +150,9 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) { case CIM_DATETIME: case CIM_STRING: - len = strlenW( (const WCHAR *)val ) + 2; + len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - sprintfW( ret, fmt_strW, (const WCHAR *)val ); + sprintfW( ret, fmt_strW, (const WCHAR *)(INT_PTR)val ); return ret; case CIM_SINT16: @@ -154,6 +165,14 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) sprintfW( number, fmt_unsignedW, val ); return SysAllocString( number ); + case CIM_SINT64: + wsprintfW( number, fmt_signed64W, val ); + return SysAllocString( number ); + + case CIM_UINT64: + wsprintfW( number, fmt_unsigned64W, val ); + return SysAllocString( number ); + default: FIXME("unhandled column type %u\n", table->columns[column].type & COL_TYPE_MASK); break; @@ -192,7 +211,7 @@ static void clear_table( struct table *table ) if (type == CIM_STRING || type == CIM_DATETIME || (type & CIM_FLAG_ARRAY)) { void *ptr; - if (get_value( table, i, j, (INT_PTR *)&ptr ) == S_OK) heap_free( ptr ); + if (get_value( table, i, j, (LONGLONG *)&ptr ) == S_OK) heap_free( ptr ); } } } @@ -207,9 +226,9 @@ void destroy_view( struct view *view ) heap_free( view ); } -static BOOL eval_like( INT_PTR lval, INT_PTR rval ) +static BOOL eval_like( LONGLONG lval, LONGLONG rval ) { - const WCHAR *p = (const WCHAR *)lval, *q = (const WCHAR *)rval; + const WCHAR *p = (const WCHAR *)(INT_PTR)lval, *q = (const WCHAR *)(INT_PTR)rval; while (*p && *q) { @@ -225,13 +244,13 @@ static BOOL eval_like( INT_PTR lval, INT_PTR rval ) return TRUE; } -static HRESULT eval_cond( const struct table *, UINT, const struct expr *, INT_PTR * ); +static HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * ); static BOOL eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, - INT_PTR *val ) + LONGLONG *val ) { HRESULT lret, rret; - INT_PTR lval, rval; + LONGLONG lval, rval; lret = eval_cond( table, row, expr->left, &lval ); rret = eval_cond( table, row, expr->right, &rval ); @@ -274,12 +293,12 @@ static BOOL eval_binary( const struct table *table, UINT row, const struct compl } static HRESULT eval_unary( const struct table *table, UINT row, const struct complex_expr *expr, - INT_PTR *val ) + LONGLONG *val ) { HRESULT hr; UINT column; - INT_PTR lval; + LONGLONG lval; hr = get_column_index( table, expr->left->u.propval->name, &column ); if (hr != S_OK) @@ -305,7 +324,7 @@ static HRESULT eval_unary( const struct table *table, UINT row, const struct com } static HRESULT eval_propval( const struct table *table, UINT row, const struct property *propval, - INT_PTR *val ) + LONGLONG *val ) { HRESULT hr; @@ -319,7 +338,7 @@ static HRESULT eval_propval( const struct table *table, UINT row, const struct p } static HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, - INT_PTR *val ) + LONGLONG *val ) { if (!cond) { @@ -335,7 +354,7 @@ static HRESULT eval_cond( const struct table *table, UINT row, const struct expr case EXPR_PROPVAL: return eval_propval( table, row, cond->u.propval, val ); case EXPR_SVAL: - *val = (INT_PTR)cond->u.sval; + *val = (LONGLONG)(INT_PTR)cond->u.sval; return S_OK; case EXPR_IVAL: case EXPR_BVAL: @@ -360,7 +379,7 @@ static HRESULT execute_view( struct view *view ) for (i = 0; i < view->table->num_rows; i++) { HRESULT hr; - INT_PTR val = 0; + LONGLONG val = 0; if (j >= len) { @@ -634,7 +653,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR { HRESULT hr; UINT column, row = view->result[index]; - INT_PTR val; + LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type ); if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; @@ -650,7 +669,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR case CIM_STRING: case CIM_DATETIME: V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = SysAllocString( (const WCHAR *)val ); + V_BSTR( ret ) = SysAllocString( (const WCHAR *)(INT_PTR)val ); break; case CIM_SINT16: V_VT( ret ) = VT_I2; @@ -668,6 +687,14 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR V_VT( ret ) = VT_UI4; V_UI4( ret ) = val; break; + case CIM_SINT64: + V_VT( ret ) = VT_I8; + V_I8( ret ) = val; + break; + case CIM_UINT64: + V_VT( ret ) = VT_UI8; + V_UI8( ret ) = val; + break; default: ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED;

1 0

Hans Leidekker : wbemprox: Store the result index in the class enumerator instead of the view.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: f1f4f1d9d70f9275425f07ddb3848e7a379ab430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f4f1d9d70f9275425f07ddb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:33:52 2012 +0200 wbemprox: Store the result index in the class enumerator instead of the view. --- dlls/wbemprox/class.c | 19 ++++++++++--------- dlls/wbemprox/query.c | 1 - dlls/wbemprox/wbemprox_private.h | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 524ba09..bb2c5e6 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -36,6 +36,7 @@ struct enum_class_object IEnumWbemClassObject IEnumWbemClassObject_iface; LONG refs; struct query *query; + UINT index; }; static inline struct enum_class_object *impl_from_IEnumWbemClassObject( @@ -92,11 +93,10 @@ static HRESULT WINAPI enum_class_object_Reset( IEnumWbemClassObject *iface ) { struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); - struct view *view = ec->query->view; TRACE("%p\n", iface); - view->index = 0; + ec->index = 0; return WBEM_S_NO_ERROR; } @@ -118,14 +118,14 @@ static HRESULT WINAPI enum_class_object_Next( if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); *puReturned = 0; - if (view->index + uCount > view->count) return WBEM_S_FALSE; + if (ec->index + uCount > view->count) return WBEM_S_FALSE; - hr = WbemClassObject_create( NULL, iface, view->index, (void **)apObjects ); + hr = WbemClassObject_create( NULL, iface, ec->index, (void **)apObjects ); if (hr != S_OK) return hr; - view->index++; + ec->index++; *puReturned = 1; - if (view->index == view->count) return WBEM_S_FALSE; + if (ec->index == view->count) return WBEM_S_FALSE; if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } @@ -159,12 +159,12 @@ static HRESULT WINAPI enum_class_object_Skip( if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); - if (view->index + nCount >= view->count) + if (ec->index + nCount >= view->count) { - view->index = view->count - 1; + ec->index = view->count - 1; return WBEM_S_FALSE; } - view->index += nCount; + ec->index += nCount; return WBEM_S_NO_ERROR; } @@ -193,6 +193,7 @@ HRESULT EnumWbemClassObject_create( ec->IEnumWbemClassObject_iface.lpVtbl = &enum_class_object_vtbl; ec->refs = 1; ec->query = query; + ec->index = 0; *ppObj = &ec->IEnumWbemClassObject_iface; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 181549f..35b6a0c 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -172,7 +172,6 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, view->cond = cond; view->result = NULL; view->count = 0; - view->index = 0; *ret = view; return S_OK; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9273744..db3cb3a 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -100,7 +100,6 @@ struct view const struct expr *cond; UINT *result; UINT count; - UINT index; }; struct query

1 0

Hans Leidekker : wbemprox: Set the row count in fill_processor.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 211469dd06c4354790506ad41e0fd8c00cedc0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211469dd06c4354790506ad41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:33:31 2012 +0200 wbemprox: Set the row count in fill_processor. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index eaffc80..7a4ee56 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,6 +376,9 @@ static void fill_processor( struct table *table ) rec->device_id = heap_strdupW( device_id ); offset += sizeof(*rec); } + + TRACE("created %u rows\n", count); + table->num_rows = count; } static void fill_os( struct table *table )

1 0

Piotr Caban : msvcp90: Sync spec files.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: d1f0fe954f37bcdf529a9f51a8ff165277b21098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f0fe954f37bcdf529a9f51a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:42 2012 +0200 msvcp90: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 430 +++++++++++++++++++------------------- dlls/msvcp70/msvcp70.spec | 394 ++++++++++++++++++------------------ dlls/msvcp71/msvcp71.spec | 460 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 484 +++++++++++++++++++++--------------------- 4 files changed, 884 insertions(+), 884 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1f0fe954f37bcdf529a9…

1 0

Piotr Caban : msvcp90: Added partial implementation of locale_ctor_cstr function.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 1f8fcf30f3ef343d557e0e7d8fb6005f7be3f6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8fcf30f3ef343d557e0e7d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:16 2012 +0200 msvcp90: Added partial implementation of locale_ctor_cstr function. --- dlls/msvcp90/locale.c | 417 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 391 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f8fcf30f3ef343d557e0…

1 0

Piotr Caban : msvcp90: Allocate different id' s for facets in use_facet functions.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 705fe163da3538ec6e98e738bb9ab921b20ea9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=705fe163da3538ec6e98e738b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:03 2012 +0200 msvcp90: Allocate different id's for facets in use_facet functions. --- dlls/msvcp90/locale.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7b98539..df0592f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1531,7 +1531,7 @@ ctype_char* ctype_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, ctype_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id)); if(fac) { _Lockit_dtor(&lock); return (ctype_char*)fac; @@ -2286,7 +2286,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, ctype_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -2751,7 +2751,7 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, codecvt_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id)); if(fac) { _Lockit_dtor(&lock); return (codecvt_char*)fac; @@ -3463,7 +3463,7 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_char*)fac; @@ -3819,7 +3819,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3865,7 +3865,7 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_short_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -4262,7 +4262,7 @@ num_get* num_get_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_get_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -5372,7 +5372,7 @@ num_get* num_get_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_get_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id)); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -6222,7 +6222,7 @@ num_put* num_put_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_put_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id)); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6833,7 +6833,7 @@ num_put* num_put_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_put_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac;

1 0

Piotr Caban : msvcp90: Added _Fiopen functions implementation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: ccb4c4846641b81baddfd854c63b78f9092bf5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb4c4846641b81baddfd854c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:44 2012 +0200 msvcp90: Added _Fiopen functions implementation. --- dlls/msvcp90/ios.c | 47 +++++++++++++++++++++++++++++++++++--------- dlls/msvcp90/msvcp90.spec | 12 +++++----- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 0950077..ae9e519 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2036,12 +2036,9 @@ MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) return this->file != NULL; } -/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PB_WHH@Z */ -/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEB_WHH@Z */ -/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PBGHH@Z */ -/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEBGHH@Z */ -DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_wchar, 16) -basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char *this, const wchar_t *name, int mode, int prot) +/* ?_Fiopen@std@@YAPAU_iobuf@@PB_WHH@Z */ +/* ?_Fiopen@std@@YAPEAU_iobuf@@PEB_WHH@Z */ +FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) { static const wchar_t rW[] = {'r',0}; static const struct { @@ -2064,10 +2061,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char int mode_idx; FILE *f = NULL; - TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); - - if(basic_filebuf_char_is_open(this)) - return NULL; + TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) if(str_mode[mode_idx].mode == real_mode) @@ -2096,6 +2090,39 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char return NULL; } + return f; +} + +/* ?_Fiopen@std@@YAPAU_iobuf@@PBDHH@Z */ +/* ?_Fiopen@std@@YAPEAU_iobuf@@PEBDHH@Z */ +FILE* __cdecl _Fiopen(const char *name, int mode, int prot) +{ + wchar_t nameW[FILENAME_MAX]; + + TRACE("(%s %d %d)\n", name, mode, prot); + + if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) + return NULL; + return _Fiopen_wchar(nameW, mode, prot); +} + +/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PB_WHH@Z */ +/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEB_WHH@Z */ +/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PBGHH@Z */ +/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEBGHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_wchar, 16) +basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char *this, const wchar_t *name, int mode, int prot) +{ + FILE *f = NULL; + + TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); + + if(basic_filebuf_char_is_open(this)) + return NULL; + + if(!(f = _Fiopen_wchar(name, mode, prot))) + return NULL; + basic_filebuf_char__Init(this, f, INITFL_open); basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(this->base.loc)); return this; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 7126603..ff042d9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2206,12 +2206,12 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBAPEADPEADDH@Z(ptr ptr long long) num_put_wchar__Ffmt @ thiscall -arch=win32 ?_Findarr@ios_base@std@@AAEAAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr@ios_base@std@@AEAAAEAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr -@ stub -arch=win32 ?_Fiopen@std@@YAPAU_iobuf@@PBDHH@Z -@ stub -arch=win64 ?_Fiopen@std@@YAPEAU_iobuf@@PEBDHH@Z -@ stub -arch=win32 ?_Fiopen@std@@YAPAU_iobuf@@PBGHH@Z -@ stub -arch=win64 ?_Fiopen@std@@YAPEAU_iobuf@@PEBGHH@Z -@ stub -arch=win32 ?_Fiopen@std@@YAPAU_iobuf@@PB_WHH@Z -@ stub -arch=win64 ?_Fiopen@std@@YAPEAU_iobuf@@PEB_WHH@Z +@ cdecl -arch=win32 ?_Fiopen@std@@YAPAU_iobuf@@PBDHH@Z(str long long) _Fiopen +@ cdecl -arch=win64 ?_Fiopen@std@@YAPEAU_iobuf@@PEBDHH@Z(str long long) _Fiopen +@ cdecl -arch=win32 ?_Fiopen@std@@YAPAU_iobuf@@PBGHH@Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win64 ?_Fiopen@std@@YAPEAU_iobuf@@PEBGHH@Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win32 ?_Fiopen@std@@YAPAU_iobuf@@PB_WHH@Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win64 ?_Fiopen@std@@YAPEAU_iobuf@@PEB_WHH@Z(wstr long long) _Fiopen_wchar @ cdecl -arch=win32 ?_Fput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DPBDIIII@Z(ptr ptr long ptr ptr long str long long long long) num_put_char__Fput @ cdecl -arch=win64 ?_Fput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DPEBD_K333@Z(ptr ptr ptr ptr long str long long long long) num_put_char__Fput @ stub -arch=win32 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPBDIIII@Z

1 0

Piotr Caban : msvcp90: Added locale::facet:: _Register function implementation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: f457511b1db81a951065efc8d23079f191b88e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f457511b1db81a951065efc8d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:21 2012 +0200 msvcp90: Added locale::facet::_Register function implementation. --- dlls/msvcp90/locale.c | 10 ++++++++++ dlls/msvcp90/msvcp90.spec | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5cba182..7b98539 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -223,6 +223,16 @@ void __cdecl locale_facet_register(locale_facet *add) } /* Not exported from msvcp90 */ +/* ?_Register@facet@locale@std@@QAEXXZ */ +/* ?_Register@facet@locale@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(locale_facet__Register, 4) +void __thiscall locale_facet__Register(locale_facet *this) +{ + TRACE("(%p)\n", this); + locale_facet_register(this); +} + +/* Not exported from msvcp90 */ /* ??_7facet@locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale_facet_vtable; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6d2656c..7126603 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5817,3 +5817,5 @@ @ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable @ cdecl -arch=win32 ?facet_Register@facet@locale@std@@CAXPAV123@@Z(ptr) locale_facet_register @ cdecl -arch=win64 ?facet_Register@facet@locale@std@@CAXPEAV123@@Z(ptr) locale_facet_register +@ thiscall -arch=win32 ?_Register@facet@locale@std@@QAEXXZ(ptr) locale_facet__Register +@ cdecl -arch=win64 ?_Register@facet@locale@std@@QEAAXXZ(ptr) locale_facet__Register

1 0

Piotr Caban : msvcp80: Forward basic_string<char>:: erase functions to msvcp90.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3c921119d69d718ea8fb912d14ac9c358c1e3b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c921119d69d718ea8fb912d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:05 2012 +0200 msvcp80: Forward basic_string<char>::erase functions to msvcp90. --- dlls/msvcp80/msvcp80.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index bccae98..5198e27 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3738,10 +3738,10 @@ @ cdecl -arch=win64 ?eq_int_type@?$char_traits@G@std@@SA_NAEBG0@Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits@G@std@@SA_NAEBG0@Z @ cdecl -arch=win32 ?eq_int_type@?$char_traits@_W@std@@SA_NABG0@Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits@_W@std@@SA_NABG0@Z @ cdecl -arch=win64 ?eq_int_type@?$char_traits@_W@std@@SA_NAEBG0@Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits@_W@std@@SA_NAEBG0@Z -@ stub -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z -@ stub -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z -@ stub -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z -@ stub -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z +@ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z +@ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z +@ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z +@ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z(ptr long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z @ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z(ptr long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z @ stub -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@0@Z

1 0

Piotr Caban : msvcp90: Added basic_istream::operator>>(char&) implementation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: c1ae61b07f6f9d85188b7613cfdecb69a1e80597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ae61b07f6f9d85188b7613c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:15:49 2012 +0200 msvcp90: Added basic_istream::operator>>(char&) implementation. --- dlls/msvcp90/ios.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 +++--- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index b3e541e..0950077 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5755,6 +5755,30 @@ basic_istream_char* __cdecl basic_istream_char_get_bstr( return istream; } +/* ??$?5DU?$char_traits@D@std@@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAD@Z */ +/* ??$?5DU?$char_traits@D@std@@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAD@Z */ +basic_istream_char* __cdecl basic_istream_char_read_ch(basic_istream_char *istream, char *ch) +{ + IOSB_iostate state = IOSTATE_failbit; + int c = 0; + + TRACE("(%p %p)\n", istream, ch); + + if(basic_istream_char_sentry_create(istream, FALSE)) { + c = basic_streambuf_char_sbumpc(basic_ios_char_rdbuf_get( + basic_istream_char_get_basic_ios(istream))); + if(c != EOF) { + state = IOSTATE_goodbit; + *ch = c; + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), + state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_wchar* basic_istream_wchar_get_basic_ios(basic_istream_wchar *this) { @@ -6783,6 +6807,30 @@ basic_istream_wchar* __cdecl basic_istream_wchar_get_bstr( return istream; } +/* ??$?5_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AA_W@Z */ +/* ??$?5_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEA_W@Z */ +basic_istream_wchar* __cdecl basic_istream_wchar_read_ch(basic_istream_wchar *istream, wchar_t *ch) +{ + IOSB_iostate state = IOSTATE_failbit; + unsigned short c = 0; + + TRACE("(%p %p)\n", istream, ch); + + if(basic_istream_wchar_sentry_create(istream, FALSE)) { + c = basic_streambuf_wchar_sbumpc(basic_ios_wchar_rdbuf_get( + basic_istream_wchar_get_basic_ios(istream))); + if(c != WEOF) { + state = IOSTATE_goodbit; + *ch = c; + } + } + basic_istream_wchar_sentry_destroy(istream); + + basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), + state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; +} + /* ??0?$basic_iostream@DU?$char_traits@D@std@@@std@@QAE@PAV?$basic_streambuf@DU?$char_traits@D@std@@@1@@Z */ /* ??0?$basic_iostream@DU?$char_traits@D@std@@@std@@QEAA@PEAV?$basic_streambuf@DU?$char_traits@D@std@@@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_iostream_char_ctor, 12) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d1efc78..6d2656c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits@D@std@@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAD@Z -@ stub -arch=win64 ??$?5DU?$char_traits@D@std@@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAD@Z +@ cdecl -arch=win32 ??$?5DU?$char_traits@D@std@@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAD@Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits@D@std@@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAD@Z(ptr ptr) basic_istream_char_read_ch @ stub -arch=win32 ??$?5DU?$char_traits@D@std@@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@PAD@Z @ stub -arch=win64 ??$?5DU?$char_traits@D@std@@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@PEAD@Z @ cdecl -arch=win32 ??$?5DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_istream_char_get_bstr @@ -36,8 +36,8 @@ @ stub -arch=win64 ??$?5U?$char_traits@D@std@@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@PEAC@Z @ stub -arch=win32 ??$?5U?$char_traits@D@std@@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@PAE@Z @ stub -arch=win64 ??$?5U?$char_traits@D@std@@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@PEAE@Z -@ stub -arch=win32 ??$?5_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AA_W@Z -@ stub -arch=win64 ??$?5_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEA_W@Z +@ cdecl -arch=win32 ??$?5_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AA_W@Z(ptr ptr) basic_istream_wchar_read_ch +@ cdecl -arch=win64 ??$?5_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEA_W@Z(ptr ptr) basic_istream_wchar_read_ch @ stub -arch=win32 ??$?5_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@PA_W@Z @ stub -arch=win64 ??$?5_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@PEA_W@Z @ cdecl -arch=win32 ??$?5_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z(ptr ptr) basic_istream_wchar_get_bstr

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
83
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 2012