September 2011 - Wine-Commits

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 96567b18b04f2c3e87463352d91259ecdf8c1bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=96567b18b04f2c3e87463352d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:54 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp60/msvcp60.spec | 12 ++-- dlls/msvcp70/msvcp70.spec | 22 ++++---- dlls/msvcp71/msvcp71.spec | 18 +++--- dlls/msvcp80/msvcp80.spec | 116 +++++++++++++++++++++--------------------- 5 files changed, 86 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96567b18b04f2c3e87463…

1 0

Piotr Caban : msvcp90: Added basic_string::{begin, rbegin, end, rend} implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 041a5c89c0380741174a518dafe8a664ffc3b4d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041a5c89c0380741174a518da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:30:48 2011 +0200 msvcp90: Added basic_string::{begin,rbegin,end,rend} implementation. --- dlls/msvcp90/msvcp90.spec | 64 ++++++++++---------- dlls/msvcp90/string.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=041a5c89c0380741174a5…

1 0

Piotr Caban : msvcp90: Added basic_string::empty() implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 793abc63d8a52637b2dcb2bd32dff13eee30a63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=793abc63d8a52637b2dcb2bd3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:30:38 2011 +0200 msvcp90: Added basic_string::empty() implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 1522e80..2252856 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3698,12 +3698,12 @@ @ stub -arch=win64 ?egptr@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEBAPEAGXZ @ stub -arch=win32 ?egptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBEPA_WXZ @ stub -arch=win64 ?egptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEBAPEA_WXZ -@ stub -arch=win32 ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ -@ stub -arch=win64 ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_NXZ +@ thiscall -arch=win32 ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ(ptr) MSVCP_basic_string_char_empty +@ cdecl -arch=win64 ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_NXZ(ptr) MSVCP_basic_string_char_empty @ stub -arch=win32 ?empty@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBE_NXZ @ stub -arch=win64 ?empty@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_NXZ -@ stub -arch=win32 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ -@ stub -arch=win64 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_NXZ +@ thiscall -arch=win32 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ(ptr) MSVCP_basic_string_wchar_empty +@ cdecl -arch=win64 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_NXZ(ptr) MSVCP_basic_string_wchar_empty @ stub ?empty(a)locale@std@@SA?AV12(a)XZ @ stub -arch=win32 ?encoding(a)codecvt_base@std@@QBEHXZ @ stub -arch=win64 ?encoding(a)codecvt_base@std@@QEBAHXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6492202..4e967f8 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -834,6 +834,15 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) return this->size; } +/* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ */ +/* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_NXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_empty, 4) +MSVCP_bool __thiscall MSVCP_basic_string_char_empty(basic_string_char *this) +{ + TRACE("%p\n", this); + return this->size == 0; +} + /* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z */ /* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_swap, 8) @@ -1721,6 +1730,15 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this return this->size; } +/* ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ */ +/* ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_NXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_empty, 4) +MSVCP_bool __thiscall MSVCP_basic_string_wchar_empty(basic_string_wchar *this) +{ + TRACE("%p\n", this); + return this->size == 0; +} + /* ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z */ /* ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_swap, 8)

1 0

Piotr Caban : msvcp90: Added set_new_handler implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 870d35c68860c4d9728b805e684fbb44540c0363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870d35c68860c4d9728b805e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:30:29 2011 +0200 msvcp90: Added set_new_handler implementation. --- dlls/msvcp90/misc.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/msvcp90_main.c | 4 ++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 3a3cb9f..bb3b52b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -25,6 +25,8 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); /* ??0_Mutex(a)std@@QAE(a)XZ */ /* ??0_Mutex(a)std@@QEAA(a)XZ */ @@ -191,3 +193,29 @@ unsigned short __cdecl wctype(const char *property) return 0; } + +typedef void (__cdecl *MSVCP_new_handler_func)(void); +static MSVCP_new_handler_func MSVCP_new_handler; +static int __cdecl new_handler_wrapper(MSVCP_size_t unused) +{ + MSVCP_new_handler(); + return 1; +} + +/* ?set_new_handler(a)std@@YAP6AXXZP6AXXZ(a)Z */ +MSVCP_new_handler_func __cdecl set_new_handler(MSVCP_new_handler_func new_handler) +{ + MSVCP_new_handler_func old_handler = MSVCP_new_handler; + + TRACE("%p\n", new_handler); + + MSVCP_new_handler = new_handler; + MSVCRT_set_new_handler(new_handler ? new_handler_wrapper : NULL); + return old_handler; +} + +/* ?set_new_handler(a)std@@YAP6AXXZH(a)Z */ +MSVCP_new_handler_func __cdecl set_new_handler_reset(int unused) +{ + return set_new_handler(NULL); +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 7c331b5..0639a67 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -29,6 +29,7 @@ void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*, extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); +extern void* (__cdecl *MSVCRT_set_new_handler)(void*); /* Copied from dlls/msvcrt/cpp.c */ #ifdef __i386__ /* thiscall functions are i386-specific */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d5baaf4..1522e80 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5310,8 +5310,8 @@ @ stub -arch=win64 ?seekpos@?$basic_stringbuf(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z @ stub -arch=win32 ?seekpos(a)strstreambuf@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z @ stub -arch=win64 ?seekpos(a)strstreambuf@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z -@ stub ?set_new_handler(a)std@@YAP6AXXZH(a)Z -@ stub ?set_new_handler(a)std@@YAP6AXXZP6AXXZ(a)Z +@ cdecl ?set_new_handler(a)std@@YAP6AXXZH(a)Z(long) set_new_handler_reset +@ cdecl ?set_new_handler(a)std@@YAP6AXXZP6AXXZ(a)Z(ptr) set_new_handler @ stub ?setbase(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z @ stub -arch=win32 ?setbuf@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PADH@Z @ stub -arch=win64 ?setbuf@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAPEAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PEAD_J@Z diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index f9c508a..35fabfc 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); +void* (__cdecl *MSVCRT_set_new_handler)(void*); + static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); @@ -38,11 +40,13 @@ static void init_cxx_funcs(void) { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); + MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K(a)ZP6AH0@Z(a)Z"); } else { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); + MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI(a)ZP6AHI@Z(a)Z"); } }

1 0

Jacek Caban : vbscipt: Added object member assign parser/ compiler implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: a822569db2ec0fab893af53d97a1331720cc3211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a822569db2ec0fab893af53d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:35:33 2011 +0200 vbscipt: Added object member assign parser/compiler implementation. --- dlls/vbscript/compile.c | 7 +++++-- dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parser.y | 4 ++-- dlls/vbscript/vbscript.h | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 8cc55c7..877780d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -303,8 +303,11 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * } if(stat->member_expr->obj_expr) { - FIXME("obj_expr not implemented\n"); - hres = E_NOTIMPL; + hres = compile_expression(ctx, stat->member_expr->obj_expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_bstr(ctx, OP_assign_member, stat->member_expr->identifier); }else { hres = push_instr_bstr(ctx, OP_assign_ident, stat->member_expr->identifier); } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4099642..3212935 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -257,6 +257,12 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) return assign_ident(ctx, arg, v.v, v.owned); } +static HRESULT interp_assign_member(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0d56acd..5d9ae7d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -113,8 +113,8 @@ Statement { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } MemberExpression - : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - /* FIXME: MemberExpressionArgs '.' tIdentifier */ + : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } + | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } Arguments_opt : EmptyBrackets_opt { $$ = NULL; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 49b2cfa..6367c12 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -91,6 +91,7 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ X(assign_ident, 1, ARG_BSTR, 0) \ + X(assign_member, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \

1 0

Jacek Caban : vbscript: Added dim statement parser implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 924da4056bf7a83712c85705f911721666858077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924da4056bf7a83712c85705f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:26 2011 +0200 vbscript: Added dim statement parser implementation. --- dlls/vbscript/parse.h | 13 ++++++++++++- dlls/vbscript/parser.y | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f7b9436..d50889d 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -79,7 +79,8 @@ typedef struct { typedef enum { STAT_ASSIGN, - STAT_CALL + STAT_CALL, + STAT_DIM } statement_type_t; typedef struct _statement_t { @@ -98,6 +99,16 @@ typedef struct { expression_t *value_expr; } assign_statement_t; +typedef struct _dim_decl_t { + const WCHAR *name; + struct _dim_decl_t *next; +} dim_decl_t; + +typedef struct _dim_statement_t { + statement_t stat; + dim_decl_t *dim_decls; +} dim_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 5d9ae7d..b5e740e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,7 +46,10 @@ static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expre static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); - static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); +static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); +static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); + +static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -60,6 +63,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + dim_decl_t *dim_decl; LONG lng; BOOL bool; double dbl; @@ -89,6 +93,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt +%type <dim_decl> DimDeclList %% @@ -111,11 +116,16 @@ Statement | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } | MemberExpression Arguments_opt '=' Expression { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } + | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } +DimDeclList /* FIXME: Support arrays */ + : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } + | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } + Arguments_opt : EmptyBrackets_opt { $$ = NULL; } | '(' ArgumentList ')' { $$ = $2; } @@ -341,6 +351,31 @@ static statement_t *new_assign_statement(parser_ctx_t *ctx, member_expression_t return &stat->stat; } +static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t *next) +{ + dim_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->name = name; + decl->next = next; + return decl; +} + +static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) +{ + dim_statement_t *stat; + + stat = new_statement(ctx, STAT_DIM, sizeof(*stat)); + if(!stat) + return NULL; + + stat->dim_decls = decls; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret;

1 0

Jacek Caban : vbscript: Added interp_assign_member implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 151056bde2848c20505914c67627ea8c1fbe3300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151056bde2848c20505914c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:35:50 2011 +0200 vbscript: Added interp_assign_member implementation. --- dlls/vbscript/interp.c | 59 +++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 2 + dlls/vbscript/vbscript_main.c | 32 ++++++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3212935..45a7504 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -144,6 +144,33 @@ static inline void release_val(variant_val_t *v) VariantClear(v->v); } +static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) +{ + VARIANT *v = stack_pop(ctx); + + if(V_VT(v) == VT_DISPATCH) { + *ret = V_DISPATCH(v); + return S_OK; + } + + if(V_VT(v) != (VT_VARIANT|VT_BYREF)) { + FIXME("not supported type: %s\n", debugstr_variant(v)); + VariantClear(v); + return E_FAIL; + } + + v = V_BYREF(v); + if(V_VT(v) != VT_DISPATCH) { + FIXME("not disp %s\n", debugstr_variant(v)); + return E_FAIL; + } + + if(V_DISPATCH(v)) + IDispatch_AddRef(V_DISPATCH(v)); + *ret = V_DISPATCH(v); + return S_OK; +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -259,8 +286,36 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) static HRESULT interp_assign_member(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + BSTR identifier = ctx->instr->arg1.bstr; + variant_val_t val; + IDispatch *obj; + DISPID id; + HRESULT hres; + + TRACE("%s\n", debugstr_w(identifier)); + + hres = stack_pop_disp(ctx, &obj); + if(FAILED(hres)) + return hres; + + if(!obj) { + FIXME("NULL obj\n"); + return E_FAIL; + } + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) { + IDispatch_Release(obj); + return hres; + } + + hres = disp_get_id(obj, identifier, &id); + if(SUCCEEDED(hres)) + hres = disp_propput(ctx->script, obj, id, val.v); + + release_val(&val); + IDispatch_Release(obj); + return hres; } static HRESULT interp_ret(exec_ctx_t *ctx) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 6367c12..226f0d2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -158,6 +158,8 @@ HRESULT exec_script(script_ctx_t*,function_t*) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 1527281..43ab484 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -31,6 +31,38 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + if(V_ISBYREF(v)) + return wine_dbg_sprintf("{V_BYREF -> %s}", debugstr_variant(V_BYREF(v))); + + switch(V_VT(v)) { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I2: + return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); + case VT_I4: + return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_UI4: + return wine_dbg_sprintf("{VT_UI4: %u}", V_UI4(v)); + case VT_R8: + return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); + case VT_BOOL: + return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + default: + return wine_dbg_sprintf("{vt %d}", V_VT(v)); + } +} + #define MIN_BLOCK_SIZE 128 static inline DWORD block_size(DWORD block)

1 0

Andrew Talbot : winspool.drv: Const-correctness fix.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 4c7f394b74f07aebb4793b88e79dd979e7e61ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f394b74f07aebb4793b88e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Sep 12 23:18:01 2011 +0100 winspool.drv: Const-correctness fix. --- dlls/winspool.drv/info.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index cb74482..abc8478 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -516,6 +516,8 @@ static BOOL CUPS_LoadPrinters(void) static BOOL PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { PRINTER_INFO_2A pinfo2a; + const char *r; + size_t name_len; char *e,*s,*name,*prettyname,*devname; BOOL ret = FALSE, set_default = FALSE; char *port = NULL, *env_default; @@ -523,14 +525,17 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { WCHAR devnameW[MAX_PATH]; while (isspace(*pent)) pent++; - s = strchr(pent,':'); - if(s) *s='\0'; - name = HeapAlloc(GetProcessHeap(), 0, strlen(pent) + 1); - strcpy(name,pent); - if(s) { - *s=':'; - pent = s; - } else + r = strchr(pent,':'); + if (r) + name_len = r - pent; + else + name_len = strlen(pent); + name = HeapAlloc(GetProcessHeap(), 0, name_len + 1); + memcpy(name, pent, name_len); + name[name_len] = '\0'; + if (r) + pent = r; + else pent = ""; TRACE("name=%s entry=%s\n",name, pent);

1 0

Piotr Caban : msvcp90: Added basic_string::append functions.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 4c66393c47dd9e8849d11b2355402ab21676e344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c66393c47dd9e8849d11b235… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:39 2011 +0200 msvcp90: Added basic_string::append functions. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- dlls/msvcp90/string.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 51a2ea1..060bfd0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2921,14 +2921,14 @@ @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z(ptr ptr long long) MSVCP_basic_string_char_append_substr @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_char_append_substr @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z(ptr long long) MSVCP_basic_string_char_append_len_ch -@ stub -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD0@Z -@ stub -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD0@Z(ptr ptr ptr) MSVCP_basic_string_char_append_beg_end +@ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD0@Z(ptr ptr ptr) MSVCP_basic_string_char_append_beg_end @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD@Z(ptr str) MSVCP_basic_string_char_append_cstr @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD@Z(ptr str) MSVCP_basic_string_char_append_cstr @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD_K@Z(ptr str long) MSVCP_basic_string_char_append_cstr_len @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBDI@Z(ptr str long) MSVCP_basic_string_char_append_cstr_len -@ stub -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z -@ stub -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr) MSVCP_basic_string_char_append_iter +@ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr ptr ptr) MSVCP_basic_string_char_append_iter @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z(ptr long long) MSVCP_basic_string_char_append_len_ch @ stub -arch=win32 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)ABV12@@Z @ stub -arch=win64 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)AEBV12@@Z @@ -2949,14 +2949,14 @@ @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@II(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_append_substr @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_append_substr @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)I_W@Z(ptr long long) MSVCP_basic_string_wchar_append_len_ch -@ stub -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W0@Z -@ stub -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W0@Z(ptr ptr ptr) MSVCP_basic_string_wchar_append_beg_end +@ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W0@Z(ptr ptr ptr) MSVCP_basic_string_wchar_append_beg_end @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_append_cstr @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_append_cstr @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W_K@Z(ptr wstr long) MSVCP_basic_string_wchar_append_cstr_len @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_WI@Z(ptr wstr long) MSVCP_basic_string_wchar_append_cstr_len -@ stub -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z -@ stub -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr) MSVCP_basic_string_wchar_append_iter +@ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr ptr) MSVCP_basic_string_wchar_append_iter @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K_W@Z(ptr long long) MSVCP_basic_string_wchar_append_len_ch @ thiscall -arch=win32 ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) MSVCP_basic_string_char_assign @ cdecl -arch=win64 ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) MSVCP_basic_string_char_assign diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 300c8bd..d8a7728 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -994,6 +994,24 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr( MSVCP_char_traits_char_length(append)); } +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD0@Z */ +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_beg_end, 12) +basic_string_char* __thiscall MSVCP_basic_string_char_append_beg_end( + basic_string_char *this, const char *beg, const char *end) +{ + return MSVCP_basic_string_char_append_cstr_len(this, beg, end-beg); +} + +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_iter, 20) +basic_string_char* __thiscall MSVCP_basic_string_char_append_iter( + basic_string_char *this, String_iterator_char beg, String_iterator_char end) +{ + return MSVCP_basic_string_char_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); +} + /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_len_ch, 12) @@ -1996,6 +2014,24 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr( MSVCP_char_traits_wchar_length(append)); } +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W0@Z */ +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_beg_end, 12) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_beg_end( + basic_string_wchar *this, const wchar_t *beg, const wchar_t *end) +{ + return MSVCP_basic_string_wchar_append_cstr_len(this, beg, end-beg); +} + +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_iter, 20) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_iter( + basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) +{ + return MSVCP_basic_string_wchar_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); +} + /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)I_W@Z */ /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_len_ch, 12)

1 0

Piotr Caban : msvcp90: Added basic_string::_Copy_s implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 6e043df036002dca2a223b44aeb4047be552b857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e043df036002dca2a223b44a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:07 2011 +0200 msvcp90: Added basic_string::_Copy_s implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d0c29d0..515e05f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2139,12 +2139,12 @@ @ stub -arch=win64 ?_Copy@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IEAAX_K0(a)Z @ stub -arch=win32 ?_Copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII(a)Z @ stub -arch=win64 ?_Copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0(a)Z -@ stub -arch=win32 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADIII(a)Z -@ stub -arch=win64 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K11(a)Z +@ thiscall -arch=win32 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADIII(a)Z(ptr ptr long long long) MSVCP_basic_string_char_Copy_s +@ cdecl -arch=win64 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K11(a)Z(ptr ptr long long long) MSVCP_basic_string_char_Copy_s @ stub -arch=win32 ?_Copy_s@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIPAGIII(a)Z @ stub -arch=win64 ?_Copy_s@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEAG_K11(a)Z -@ stub -arch=win32 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WIII(a)Z -@ stub -arch=win64 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K11(a)Z +@ thiscall -arch=win32 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WIII(a)Z(ptr ptr long long long) MSVCP_basic_string_wchar_Copy_s +@ cdecl -arch=win64 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K11(a)Z(ptr ptr long long long) MSVCP_basic_string_wchar_Copy_s @ cdecl -arch=win32 ?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)Z(ptr long ptr long) MSVCP_char_traits_char__Copy_s @ cdecl -arch=win64 ?_Copy_s@?$char_traits(a)D@std@@SAPEADPEAD_KPEBD1(a)Z(ptr long ptr long) MSVCP_char_traits_char__Copy_s @ cdecl -arch=win32 ?_Copy_s@?$char_traits(a)G@std@@SAPAGPAGIPBGI(a)Z(ptr long ptr long) MSVCP_char_traits_short__Copy_s diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 5664e87..47c0c03 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -741,6 +741,25 @@ void __thiscall MSVCP_basic_string_char_Chassign(basic_string_char *this, MSVCP_char_traits_char_assignn(basic_string_char_ptr(this)+off, count, ch); } +/* ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADIII(a)Z */ +/* ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K11(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_Copy_s, 20) +MSVCP_size_t __thiscall MSVCP_basic_string_char_Copy_s(const basic_string_char *this, + char *dest, MSVCP_size_t size, MSVCP_size_t off, MSVCP_size_t count) +{ + TRACE("%p %p %lu %lu %lu\n", this, dest, size, off, count); + + if(this->size < off) + MSVCP__String_base_Xran(); + + if(count > this->size-off) + count = this->size-off; + + MSVCP_char_traits_char__Copy_s(dest, size, + basic_string_char_const_ptr(this)+off, count); + return count; +} + /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ */ /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ @@ -1710,6 +1729,25 @@ void __thiscall MSVCP_basic_string_wchar_Chassign(basic_string_wchar *this, MSVCP_char_traits_wchar_assignn(basic_string_wchar_ptr(this)+off, count, ch); } +/* ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WIII(a)Z */ +/* ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K11(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_Copy_s, 20) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_Copy_s(const basic_string_wchar *this, + wchar_t *dest, MSVCP_size_t size, MSVCP_size_t off, MSVCP_size_t count) +{ + TRACE("%p %p %lu %lu %lu\n", this, dest, size, off, count); + + if(this->size < off) + MSVCP__String_base_Xran(); + + if(count > this->size-off) + count = this->size-off; + + MSVCP_char_traits_wchar__Copy_s(dest, size, + basic_string_wchar_const_ptr(this)+off, count); + return count; +} + /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */ /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ */ /* ?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */

1 0