September 2011 - Wine-commits

Jacek Caban : vbscript: Added '\' expression parser/compiler implementation .
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 3c47b1d2f033b170d781e6efed0c48f5bcbd03ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c47b1d2f033b170d781e6efe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:14 2011 +0200 vbscript: Added '\' expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 8 ++++++-- dlls/vbscript/vbscript.h | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 99505f6..98b8abd 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -359,6 +359,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); + case EXPR_IDIV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_idiv); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 49b4621..602a259 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -666,6 +666,12 @@ static HRESULT interp_mod(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_idiv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index fde8512..3d180ce 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -23,6 +23,7 @@ typedef enum { EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, + EXPR_IDIV, EXPR_MEMBER, EXPR_MOD, EXPR_NEG, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4f8aa23..89cc569 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -91,7 +91,7 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -198,8 +198,12 @@ ModExpression | ModExpression tMOD IntdivExpression { $$ = new_binary_expression(ctx, EXPR_MOD, $1, $3); CHECK_ERROR; } IntdivExpression - : UnaryExpression /* FIXME */ { $$ = $1; } + : MultiplicativeExpression { $$ = $1; } + | IntdivExpression '\\' MultiplicativeExpression + { $$ = new_binary_expression(ctx, EXPR_IDIV, $1, $3); CHECK_ERROR; } +MultiplicativeExpression + : UnaryExpression /* FIXME */ { $$ = $1; } UnaryExpression : LiteralExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a33b570..a460233 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -108,6 +108,7 @@ typedef enum { X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(idiv, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \

1 0

Jacek Caban : vbscript: Added interp_idiv implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 80eff04037e0639b2976ed67c6b0b08181aa99f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80eff04037e0639b2976ed67c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:28 2011 +0200 vbscript: Added interp_idiv implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 602a259..925da12 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -668,8 +668,26 @@ static HRESULT interp_mod(exec_ctx_t *ctx) static HRESULT interp_idiv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarIdiv(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_neg(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d5565bd..b6330b2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -106,6 +106,11 @@ Call ok(getVT(2 mod null) = "VT_NULL", "getVT(2 mod null) = " & getVT(2 mod null Call ok(getVT(null mod 2) = "VT_NULL", "getVT(null mod 2) = " & getVT(null mod 2)) 'FIXME: Call ok(empty mod 2 = 0, "empty mod 2 = " & (empty mod 2)) +Call ok(5 \ 2 = 2, "5 \ 2 = " & (5\2)) +Call ok(4.6 \ 1.5 = 2, "4.6 \ 1.5 = " & (4.6\1.5)) +Call ok(4.6 \ 1.49 = 5, "4.6 \ 1.49 = " & (4.6\1.49)) +Call ok(2+3\4 = 2, "2+3\4 = " & (2+3\4)) + if false then ok false, "if false called" end if

1 0

Jacek Caban : vbscript: Added multiplicative expression parser/ compiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 2f3c235a44a258f4dbe99890c31f2d467bf6ba46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3c235a44a258f4dbe99890c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:39 2011 +0200 vbscript: Added multiplicative expression parser/compiler implementation. --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 9 ++++++++- dlls/vbscript/vbscript.h | 2 ++ 5 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 98b8abd..d14e8de 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -353,6 +353,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); + case EXPR_DIV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: @@ -365,6 +367,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mod); + case EXPR_MUL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_NEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NEQUAL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 925da12..4feb2a9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -690,6 +690,18 @@ static HRESULT interp_idiv(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_div(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_mul(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 3d180ce..e15a851 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -20,12 +20,14 @@ typedef enum { EXPR_ADD, EXPR_BOOL, EXPR_CONCAT, + EXPR_DIV, EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, EXPR_IDIV, EXPR_MEMBER, EXPR_MOD, + EXPR_MUL, EXPR_NEG, EXPR_NEQUAL, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 89cc569..7d574d1 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -91,7 +91,7 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -203,6 +203,13 @@ IntdivExpression { $$ = new_binary_expression(ctx, EXPR_IDIV, $1, $3); CHECK_ERROR; } MultiplicativeExpression + : ExpExpression { $$ = $1; } + | MultiplicativeExpression '*' ExpExpression + { $$ = new_binary_expression(ctx, EXPR_MUL, $1, $3); CHECK_ERROR; } + | MultiplicativeExpression '/' ExpExpression + { $$ = new_binary_expression(ctx, EXPR_DIV, $1, $3); CHECK_ERROR; } + +ExpExpression : UnaryExpression /* FIXME */ { $$ = $1; } UnaryExpression diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a460233..690cad3 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -103,6 +103,7 @@ typedef enum { X(assign_member, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ + X(div, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ @@ -113,6 +114,7 @@ typedef enum { X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ X(mod, 1, 0, 0) \ + X(mul, 1, 0, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_mul implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 8a526743a1d74348ba256277eb85d95bea67326d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a526743a1d74348ba256277e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:50 2011 +0200 vbscript: Added interp_mul implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4feb2a9..ace9c7c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -698,8 +698,26 @@ static HRESULT interp_div(exec_ctx_t *ctx) static HRESULT interp_mul(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarMul(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_neg(exec_ctx_t *ctx)

1 0

Francois Gouget : gdiplus: Use Liberation Mono as a fallback for Courier New for the monospace family .
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 4c13e84a7c5a69f1040fe6a347d3f819fbbf1146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c13e84a7c5a69f1040fe6a34… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 13 01:47:27 2011 +0200 gdiplus: Use Liberation Mono as a fallback for Courier New for the monospace family. --- dlls/gdiplus/font.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 3624391..169e28f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -816,10 +816,20 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamily) { static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; + static const WCHAR LiberationMono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o','\0'}; + GpStatus stat; if (nativeFamily == NULL) return InvalidParameter; - return GdipCreateFontFamilyFromName(CourierNew, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(CourierNew, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + stat = GdipCreateFontFamilyFromName(LiberationMono, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + ERR("Missing 'Courier New' font\n"); + + return stat; } /*****************************************************************************

1 0

Piotr Caban : msvcrt: Improve operator new implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 45dc6c0e22204bef77ce942f09b43b7c9443bcf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dc6c0e22204bef77ce942f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:30:17 2011 +0200 msvcrt: Improve operator new implementation. --- dlls/msvcrt/heap.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 548dd82..4557c1a 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ~(alignment - 1)) - offset)) -typedef void (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); +typedef int (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; @@ -54,14 +54,28 @@ static MSVCRT_size_t MSVCRT_sbh_threshold = 0; */ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) { - void *retval = HeapAlloc(GetProcessHeap(), 0, size); - TRACE("(%ld) returning %p\n", size, retval); - if(retval) return retval; - LOCK_HEAP; - if(MSVCRT_new_handler) - (*MSVCRT_new_handler)(size); - UNLOCK_HEAP; - return retval; + void *retval; + int freed; + + do + { + retval = HeapAlloc(GetProcessHeap(), 0, size); + if(retval) + { + TRACE("(%ld) returning %p\n", size, retval); + return retval; + } + + LOCK_HEAP; + if(MSVCRT_new_handler) + freed = (*MSVCRT_new_handler)(size); + else + freed = 0; + UNLOCK_HEAP; + } while(freed); + + TRACE("(%ld) out of memory\n", size); + return NULL; }

1 0

Piotr Caban : msvcp90: Added set_new_handler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

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

Piotr Caban : msvcp90: Added basic_string::empty() implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

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 basic_string::{begin, rbegin, end, rend} implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

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::_Chassign implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 97ebf771840d886343c5af6b1dcac92d8723eeb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ebf771840d886343c5af6b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:30:58 2011 +0200 msvcp90: Added basic_string::_Chassign implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4654d2c..d0c29d0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2114,12 +2114,12 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ stub -arch=win32 ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win64 ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win32 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z -@ stub -arch=win64 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z +@ thiscall -arch=win32 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign +@ cdecl -arch=win64 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign @ stub -arch=win32 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IAEXIIG(a)Z @ stub -arch=win64 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IEAAX_K0G(a)Z -@ stub -arch=win32 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z -@ stub -arch=win64 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z +@ thiscall -arch=win32 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign +@ cdecl -arch=win64 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign @ stub -arch=win32 ?_Cin_func(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ # extern -arch=win64 ?_Cl@?5???$log(a)M@std@@YA?AV?$complex(a)M@1(a)AEBV21@@Z(a)4MB diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6d66677..5664e87 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -731,6 +731,16 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr( MSVCP_char_traits_char_length(str)); } +/* ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z */ +/* ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_Chassign, 16) +void __thiscall MSVCP_basic_string_char_Chassign(basic_string_char *this, + MSVCP_size_t off, MSVCP_size_t count, char ch) +{ + TRACE("%p %lu %lu %c\n", this, off, count, ch); + MSVCP_char_traits_char_assignn(basic_string_char_ptr(this)+off, count, ch); +} + /* ?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 */ @@ -1690,6 +1700,16 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr( MSVCP_char_traits_wchar_length(str)); } +/* ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z */ +/* ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_Chassign, 16) +void __thiscall MSVCP_basic_string_wchar_Chassign(basic_string_wchar *this, + MSVCP_size_t off, MSVCP_size_t count, wchar_t ch) +{ + TRACE("%p %lu %lu %c\n", this, off, count, ch); + MSVCP_char_traits_wchar_assignn(basic_string_wchar_ptr(this)+off, count, ch); +} + /* ?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