wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Jacek Caban : vbscript: Added interp_val implementation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: aad758921c2efc6442fc6dfc3836b3a27658527e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad758921c2efc6442fc6dfc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:23:25 2011 +0200 vbscript: Added interp_val implementation. --- dlls/vbscript/interp.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1327c17..5e41845 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -684,8 +684,24 @@ static HRESULT interp_const(exec_ctx_t *ctx) static HRESULT interp_val(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t val; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if(!val.owned) { + V_VT(&v) = VT_EMPTY; + hres = VariantCopy(&v, val.v); + if(FAILED(hres)) + return hres; + } + + return stack_push(ctx, val.owned ? val.v : &v); } static HRESULT interp_pop(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Added for..to statement compiler implementation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 8244e4c0c7011ef1bf5d06f63ae8b5b94b5ea6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8244e4c0c7011ef1bf5d06f63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:23:10 2011 +0200 vbscript: Added for..to statement compiler implementation. --- dlls/vbscript/compile.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 30 ++++++++++++++++++ dlls/vbscript/vbscript.h | 4 ++ 3 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9cfe45b..1f1f041 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -169,6 +169,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) return S_OK; } +static HRESULT push_instr_uint(compile_ctx_t *ctx, vbsop_t op, unsigned arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.uint = arg; + return S_OK; +} + static HRESULT push_instr_addr(compile_ctx_t *ctx, vbsop_t op, unsigned arg) { unsigned ret; @@ -603,6 +615,68 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * return S_OK; } +static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) +{ + unsigned step_instr, instr; + BSTR identifier; + HRESULT hres; + + identifier = alloc_bstr_arg(ctx, stat->identifier); + if(!identifier) + return E_OUTOFMEMORY; + + hres = compile_expression(ctx, stat->from_expr); + if(FAILED(hres)) + return hres; + + instr = push_instr(ctx, OP_assign_ident); + if(instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, instr)->arg1.bstr = identifier; + + hres = compile_expression(ctx, stat->to_expr); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_val) == -1) + return E_OUTOFMEMORY; + + if(stat->step_expr) { + hres = compile_expression(ctx, stat->step_expr); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_val) == -1) + return E_OUTOFMEMORY; + }else { + hres = push_instr_int(ctx, OP_short, 1); + if(FAILED(hres)) + return hres; + } + + step_instr = push_instr(ctx, OP_step); + if(step_instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, step_instr)->arg2.bstr = identifier; + + hres = compile_statement(ctx, stat->body); + if(FAILED(hres)) + return hres; + + instr = push_instr(ctx, OP_incc); + if(instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, instr)->arg1.bstr = identifier; + + hres = push_instr_addr(ctx, OP_jmp, step_instr); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, step_instr)->arg1.uint = ctx->instr_cnt; + + return push_instr_uint(ctx, OP_pop, 2); +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { HRESULT hres; @@ -799,6 +873,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_EXITSUB: hres = compile_exitsub_statement(ctx); break; + case STAT_FORTO: + hres = compile_forto_statement(ctx, (forto_statement_t*)stat); + break; case STAT_FUNC: hres = compile_function_statement(ctx, (function_statement_t*)stat); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c2ffd98..1327c17 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -682,6 +682,22 @@ static HRESULT interp_const(exec_ctx_t *ctx) return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned); } +static HRESULT interp_val(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_pop(exec_ctx_t *ctx) +{ + const unsigned n = ctx->instr->arg1.uint; + + TRACE("%u\n", n); + + stack_popn(ctx, n); + return S_OK; +} + static HRESULT interp_new(exec_ctx_t *ctx) { const WCHAR *arg = ctx->instr->arg1.bstr; @@ -710,6 +726,13 @@ static HRESULT interp_new(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_step(exec_ctx_t *ctx) +{ + const BSTR ident = ctx->instr->arg2.bstr; + FIXME("%s\n", debugstr_w(ident)); + return E_NOTIMPL; +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; @@ -1439,6 +1462,13 @@ static HRESULT interp_neg(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_incc(exec_ctx_t *ctx) +{ + const BSTR ident = ctx->instr->arg1.bstr; + FIXME("%s\n", debugstr_w(ident)); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index bd55719..4b0a569 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -199,6 +199,7 @@ typedef enum { X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ X(imp, 1, 0, 0) \ + X(incc, 1, ARG_BSTR, 0) \ X(is, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ @@ -218,13 +219,16 @@ typedef enum { X(nothing, 1, 0, 0) \ X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ + X(pop, 1, ARG_UINT, 0) \ X(ret, 0, 0, 0) \ X(set_ident, 1, ARG_BSTR, 0) \ X(set_member, 1, ARG_BSTR, 0) \ X(short, 1, ARG_INT, 0) \ + X(step, 0, ARG_ADDR, ARG_BSTR) \ X(stop, 1, 0, 0) \ X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \ + X(val, 1, 0, 0) \ X(xor, 1, 0, 0) typedef enum {

1 0

Jacek Caban : vbscript: Added for..to statement parser implementation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: d935c21ccf6bf48cab6ddafd3372106357bcc5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d935c21ccf6bf48cab6ddafd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:22:40 2011 +0200 vbscript: Added for..to statement parser implementation. --- dlls/vbscript/lex.c | 6 ++++++ dlls/vbscript/parse.h | 10 ++++++++++ dlls/vbscript/parser.y | 28 ++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f42d2fd..ac3d65e 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -44,6 +44,7 @@ static const WCHAR errorW[] = {'e','r','r','o','r',0}; static const WCHAR exitW[] = {'e','x','i','t',0}; static const WCHAR explicitW[] = {'e','x','p','l','i','c','i','t',0}; static const WCHAR falseW[] = {'f','a','l','s','e',0}; +static const WCHAR forW[] = {'f','o','r',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; static const WCHAR getW[] = {'g','e','t',0}; static const WCHAR gotoW[] = {'g','o','t','o',0}; @@ -68,9 +69,11 @@ static const WCHAR publicW[] = {'p','u','b','l','i','c',0}; static const WCHAR remW[] = {'r','e','m',0}; static const WCHAR resumeW[] = {'r','e','s','u','m','e',0}; static const WCHAR setW[] = {'s','e','t',0}; +static const WCHAR stepW[] = {'s','t','e','p',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; static const WCHAR subW[] = {'s','u','b',0}; static const WCHAR thenW[] = {'t','h','e','n',0}; +static const WCHAR toW[] = {'t','o',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; static const WCHAR untilW[] = {'u','n','t','i','l',0}; static const WCHAR wendW[] = {'w','e','n','d',0}; @@ -99,6 +102,7 @@ static const struct { {exitW, tEXIT}, {explicitW, tEXPLICIT}, {falseW, tFALSE}, + {forW, tFOR}, {functionW, tFUNCTION}, {getW, tGET}, {gotoW, tGOTO}, @@ -123,9 +127,11 @@ static const struct { {remW, tREM}, {resumeW, tRESUME}, {setW, tSET}, + {stepW, tSTEP}, {stopW, tSTOP}, {subW, tSUB}, {thenW, tTHEN}, + {toW, tTO}, {trueW, tTRUE}, {untilW, tUNTIL}, {wendW, tWEND}, diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 8e4be57..a5bd505 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -106,6 +106,7 @@ typedef enum { STAT_EXITFUNC, STAT_EXITPROP, STAT_EXITSUB, + STAT_FORTO, STAT_FUNC, STAT_IF, STAT_ONERROR, @@ -198,6 +199,15 @@ typedef struct { typedef struct { statement_t stat; + const WCHAR *identifier; + expression_t *from_expr; + expression_t *to_expr; + expression_t *step_expr; + statement_t *body; +} forto_statement_t; + +typedef struct { + statement_t stat; BOOL resume_next; } onerror_statement_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8435e92..3b30051 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -52,6 +52,7 @@ static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expr static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); static statement_t *new_while_statement(parser_ctx_t*,statement_type_t,expression_t*,statement_t*); +static statement_t *new_forto_statement(parser_ctx_t*,const WCHAR*,expression_t*,expression_t*,expression_t*,statement_t*); static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); static statement_t *new_onerror_statement(parser_ctx_t*,BOOL); @@ -102,7 +103,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token tIS tLTEQ tGTEQ tMOD %token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP %token tBYREF tBYVAL %token tOPTION tEXPLICIT %token tSTOP @@ -118,7 +119,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression -%type <expression> Arguments_opt ArgumentList_opt ArgumentList +%type <expression> Arguments_opt ArgumentList_opt ArgumentList Step_opt %type <bool> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl @@ -186,6 +187,8 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; } + | tFOR tIdentifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT + { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -206,6 +209,10 @@ DoType : tWHILE { $$ = TRUE; } | tUNTIL { $$ = FALSE; } +Step_opt + : /* empty */ { $$ = NULL;} + | tSTEP Expression { $$ = $2; } + IfStatement : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } @@ -626,6 +633,23 @@ static statement_t *new_while_statement(parser_ctx_t *ctx, statement_type_t type return &stat->stat; } +static statement_t *new_forto_statement(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *from_expr, + expression_t *to_expr, expression_t *step_expr, statement_t *body) +{ + forto_statement_t *stat; + + stat = new_statement(ctx, STAT_FORTO, sizeof(*stat)); + if(!stat) + return NULL; + + stat->identifier = identifier; + stat->from_expr = from_expr; + stat->to_expr = to_expr; + stat->step_expr = step_expr; + stat->body = body; + return &stat->stat; +} + static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, statement_t *if_stat, elseif_decl_t *elseif_decl, statement_t *else_stat) {

1 0

Alexandre Julliard : gdi32/tests: Add some tests for overlapping blits.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 0e91f9990ea9aea9d2eb1750cc6a160d59c70b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e91f9990ea9aea9d2eb1750c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 13:14:08 2011 +0200 gdi32/tests: Add some tests for overlapping blits. --- dlls/gdi32/tests/dib.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index a1c9d27..d2da1c9 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -103,6 +103,15 @@ static const char *sha1_graphics_a8r8g8b8[] = "7da9dd3d40d44d92deb9883fb7110443c2d5769a", "e358efb1c11172e40855de620bdb8a8e545cd790", "9e0c2596c6ecb4f1bc97b18ec3ca493d37626608", + "58806549380c964e7a53ad54821d2eb86fa5b9ce", + "7fc30d3058c235ce39088de0a598b8c7fe7ca61f", + "52a6c769c227f2bb1949097c4c87fed5ee0cbcb1", + "8a010d4c5af51fcc34d51be3197878782bdf63e7", + "c84c2c33e22eb7e5c4a2faad3b3b99a359d77528", + "41bcc1f57c60bdec3c4d1e749084a12867f91224", + "94645300d6eb51020a7ef8261dee2941cd51b5df", + "c56f5bdc9cac4f0bc81c33295d9aed8eaf4cb1f2", + "21cdfde38ac7edbb241ec83d82f31286e90c4629", NULL }; @@ -135,6 +144,15 @@ static const char *sha1_graphics_a8b8g8r8[] = "abdf003699364fe45fab7dc61e67c606d0063b40", "89abaadff4e68c738cf9251c51e3609564843381", "f6aa3f907f620b9f3493f03cb3b4b292df3a9545", + "77d0ad32938147aa4038c1eced232b7b5a5f88f3", + "43d36e57b702ce56eb250bf53f1ecc4680990cfe", + "fd6e0ebb52710ebcdd8dd69931165c83c4930b41", + "71b9756fdfeedce1e6db201176d21a981b881662", + "5319528d9af750c172ae62ee85ddb2eaef73b193", + "b7ce8aa3c328eedaed7306234ed9bae67708e627", + "19b32a0daa91201725b5e13820c343d0a84ff698", + "abca6a80a99b05722d2d87ce2a8b94ef1ae549e1", + "2ba70994d0b4ce87fdf6fbc33ada11252178061e", NULL }; @@ -167,6 +185,15 @@ static const char *sha1_graphics_24[] = "e649e00efe7fea1eb8b17f7867fe089e5270c44b", "a0bffbbfb0adf6f188479c88da04e25d76ab4822", "92a1ab214dd8027c407814420449119466c92840", + "b58f19c1800344a2b8e017eb784705bdb2bd8450", + "5747a6d5c6ce79731c55e8cf33f7da3025cd35fd", + "955390669afed2369b15b32fa519f2f921cdf1a0", + "201906f7d763b930a98c97f8eeab417f2b65e723", + "5313357d50c40c05a3b3a83d0d2013a138c955a1", + "701c5af1d0c28294ce7d804b5697643c430d22a0", + "b0a959745b2db1d9f449e68e4479a4f36301879c", + "63f764b9bd2f4876ab1ee0f3c0eb55b5a7de5212", + "e171f6ec77bca91d6b8559911bce296c0bac469e", NULL }; @@ -199,6 +226,14 @@ static const char *sha1_graphics_r5g5b5[] = "ecc2991277d7314f55b00e0f284ae3703aeef81e", "656bf3b7121bcd620a0a3ad488f0d66604824577", "d7d8493b5fa7a3a8323d6ac84245093a79f052c1", + "df5dafe96e528c2cc7fd11e4934e298f53cec34b", + "a49530722328ae88fd765792ac0c657efbcce75d", + "aa46aa2226e3121eaefa9d0836418e0b69262d69", + "333f3f2cf3ff15736d59f92a33c45323d3987d6d", + "a6fd83542c3826132e88d3f5e304d604c0056fad", + "a8d6a5285a927ba3a3be34b06a06c70a20d4c1b3", + "e428d213ad02651287894f093413949dcb369208", + "7df915bedcc5951a1b6f828490f7dbb93212e835", NULL }; @@ -231,6 +266,14 @@ static const char *sha1_graphics_r4g4b4[] = "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", "8933450132bf949ba4bc28626968425b5ed2867d", "9928a8f28a66c00069a124f7171b248817005763", + "e4a9dcc3e565cd3a6b7087dd1433f3898bb9cdb2", + "eca4f9b16b3bddfd0735fdd792e0ccaadfb9ba49", + "233e588cf660e2c9b552cf02065cf63fa6655864", + "0740ff74dcd259d9a644ba51ad77ff0d40348951", + "a3345acaf272f2e288626906e3056cd0ced70499", + "957a86fbe8a96dd068db65e4e624a52bcc84af46", + "13b0f240054dc57ba0e2dfde74048496304a2c7f", + "51ef267eb9c15487c9430f505e8a6c929eb2170c", NULL }; @@ -263,6 +306,14 @@ static const char *sha1_graphics_8[] = "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", "c4efce8f7ed2d380ea5dc6fe1ef8448a27827532", "bdc0a354635b879871077c5b712570e469863c99", + "d599bf210423fe3adbb4f1de87d9360de97827d0", + "bae7c8b789e4e9b336c03c4daee3bce63fe039d9", + "cc01f17928f7780cefd423ea653b072eea723a1b", + "c005662a47f14c2f1b7c7fb3b0ef0fc390c6ea6a", + "675cde16a6ad2bcd8d7e72780b07a0ccd8d0393a", + "ea39ac62ca2f815a1d029340c6465994b6f03cb0", + "9a603513cd81acf70cf8b27b0d544e7f672e9d40", + "f4a334e69535de74ee5ed54be93a75120a66e54a", NULL }; @@ -295,6 +346,14 @@ static const char *sha1_graphics_4[] = "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", "4f827ca6927f15191588456f985bf29d2a3b3c24", "e7de769c3d12ea9dd223bef4881c578823bec67e", + "6fb102d020e5554116feefc8482104f3ae2036d2", + "ae546ffd30b837afc7dfcb5c9ce4f01d15b35ddc", + "20c9eb3276c08fdce35755e349bec94b04929812", + "628d837163a25c6520f19c0602383176dbad528e", + "b5a12cff7100290ad43f5ed17a321b42de048893", + "b672afbeeafb44194a821f0def81a8892872937e", + "db0124045882b598feea192186cf7eb7a0387866", + "602d91471378fe24a2d0248bd8a92b624f099fea", NULL }; @@ -340,6 +399,16 @@ static const char *sha1_graphics_1[] = "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", "f2fe295317e795a88edd0b2c52618b8cb0e7f2ce", "ffc78c075d4be66806f6c59180772d5eed963dc0", + "c86eeaeed09871dee4b43722ba512d2d3af7f4d0", + "24b1a6241c81dbb950cfbe5da6798fd59eb36266", + "1007d3b531b4bc3553d4547bc88443fc1f497cf6", + "b71ca46be287598f716bb04fac0a52ad139c70db", + "6589e48498e30ab036fbfe94d73427b2b1238a69", + "4dce919117d2e41df9f5d4d0de14f97ae650046d", + "22c2e078f69d73b7a5cb3f7dcbb8fbaa007ef3ac", + "be36cda370650e6d5fb0570aeb8ced491d0c2b1c", + "4c34cb8e47f9ff4b4348aa2d40cce7cb54d65cb0", + "18f4497e43903e8df5b27da4ceebf62b15550a87", NULL }; @@ -1001,6 +1070,83 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash_broken_todo(bmi, bits, sha1, "hatch brushes", 1, FALSE); /* nt4 is different */ memset(bits, 0xcc, dib_size); + /* overlapping blits */ + + orig_brush = SelectObject(hdc, solid_brush); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 20, 100, 100, hdc, 10, 10, SRCCOPY ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY +x, +y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 10, 100, 100, hdc, 20, 20, SRCCOPY ); + if (bmi->bmiHeader.biBitCount == 1) /* Windows gets this one wrong */ + compare_hash_broken_todo(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, -y",1, FALSE); + else + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 10, 100, 100, hdc, 10, 20, SRCCOPY ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY +x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 20, 100, 100, hdc, 20, 10, SRCCOPY ); + if (bmi->bmiHeader.biBitCount == 1) /* Windows gets this one wrong */ + compare_hash_broken_todo(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, +y", 1, FALSE ); + else + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, +y" ); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 20, 100, 100, hdc, 10, 10, PATPAINT ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT +x, +y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 10, 100, 100, hdc, 20, 20, PATPAINT ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT -x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 10, 100, 100, hdc, 10, 20, PATPAINT ); + if (bmi->bmiHeader.biBitCount >= 24) /* Windows gets this one wrong */ + compare_hash_broken_todo(bmi, bits, sha1, "overlapping BitBlt PATPAINT +x, -y", 1, FALSE); + else + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT +x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 20, 100, 100, hdc, 20, 10, PATPAINT ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT -x, +y" ); + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn);

1 0

Alexandre Julliard : gdi32: Copy bits in the correct order for the overlap case in the individual copy_rect functions .
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 7bcd8fa20e99e4db61078846a441c0a126b31d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcd8fa20e99e4db61078846a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 09:57:58 2011 +0200 gdi32: Copy bits in the correct order for the overlap case in the individual copy_rect functions. --- dlls/gdi32/dibdrv/bitblt.c | 10 +- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/primitives.c | 378 ++++++++++++++++++++++++++-------------- 3 files changed, 253 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bcd8fa20e99e4db61078…

1 0

Alexandre Julliard : gdi32: Add helper functions for copying a DIB line.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 5fd305c31f98d581c165ed4d314fc79d60d8c835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd305c31f98d581c165ed4d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 10:18:14 2011 +0200 gdi32: Add helper functions for copying a DIB line. --- dlls/gdi32/dibdrv/primitives.c | 96 +++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index c102f9c..de0993b 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -104,6 +104,57 @@ static inline void do_rop_codes_mask_8(BYTE *dst, BYTE src, struct rop_codes *co do_rop_mask_8( dst, (src & codes->a1) ^ codes->a2, (src & codes->x1) ^ codes->x2, mask ); } +static inline void do_rop_codes_line_32(DWORD *dst, const DWORD *src, struct rop_codes *codes, int len) +{ + for (; len > 0; len--, src++, dst++) do_rop_codes_32( dst, *src, codes ); +} + +static inline void do_rop_codes_line_16(WORD *dst, const WORD *src, struct rop_codes *codes, int len) +{ + for (; len > 0; len--, src++, dst++) do_rop_codes_16( dst, *src, codes ); +} + +static inline void do_rop_codes_line_8(BYTE *dst, const BYTE *src, struct rop_codes *codes, int len) +{ + for (; len > 0; len--, src++, dst++) do_rop_codes_8( dst, *src, codes ); +} + +static inline void do_rop_codes_line_4(BYTE *dst, int dst_x, const BYTE *src, int src_x, + struct rop_codes *codes, int len) +{ + BYTE src_val; + + for (src += src_x / 2, dst += dst_x / 2; len > 0; len--, dst_x++, src_x++) + { + if (dst_x & 1) + { + if (src_x & 1) src_val = *src++; + else src_val = *src >> 4; + do_rop_codes_mask_8( dst++, src_val, codes, 0x0f ); + } + else + { + if (src_x & 1) src_val = *src++ << 4; + else src_val = *src; + do_rop_codes_mask_8( dst, src_val, codes, 0xf0 ); + } + } +} + +static inline void do_rop_codes_line_1(BYTE *dst, int dst_x, const BYTE *src, int src_x, + struct rop_codes *codes, int len) +{ + BYTE src_val; + + for (src += src_x / 8, dst += dst_x / 8; len > 0; len--, dst_x++, src_x++) + { + src_val = *src & pixel_masks_1[src_x & 7] ? 0xff : 0; + do_rop_codes_mask_8( dst, src_val, codes, pixel_masks_1[dst_x & 7] ); + if ((src_x & 7) == 7) src++; + if ((dst_x & 7) == 7) dst++; + } +} + static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { DWORD *ptr, *start; @@ -706,9 +757,7 @@ static void copy_rect_32(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - do_rop_codes_32( dst_ptr++, *src_ptr++, &codes ); - + do_rop_codes_line_32( dst_start, src_start, &codes, rc->right - rc->left ); dst_start += dst->stride / 4; src_start += src->stride / 4; } @@ -750,12 +799,7 @@ static void copy_rect_24(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - { - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - } + do_rop_codes_line_8( dst_start, src_start, &codes, (rc->right - rc->left) * 3 ); dst_start += dst->stride; src_start += src->stride; } @@ -797,9 +841,7 @@ static void copy_rect_16(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - do_rop_codes_16( dst_ptr++, *src_ptr++, &codes ); - + do_rop_codes_line_16( dst_start, src_start, &codes, rc->right - rc->left ); dst_start += dst->stride / 2; src_start += src->stride / 2; } @@ -841,9 +883,7 @@ static void copy_rect_8(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - + do_rop_codes_line_8( dst_start, src_start, &codes, rc->right - rc->left ); dst_start += dst->stride; src_start += src->stride; } @@ -888,21 +928,7 @@ static void copy_rect_4(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, src_x = origin->x, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++, src_x++) - { - if (x & 1) - { - if (src_x & 1) src_val = *src_ptr++; - else src_val = *src_ptr >> 4; - do_rop_codes_mask_8( dst_ptr++, src_val, &codes, 0x0f ); - } - else - { - if (src_x & 1) src_val = *src_ptr++ << 4; - else src_val = *src_ptr; - do_rop_codes_mask_8( dst_ptr, src_val, &codes, 0xf0 ); - } - } + do_rop_codes_line_4( dst_start, rc->left, src_start, origin->x, &codes, rc->right - rc->left ); dst_start += dst->stride; src_start += src->stride; } @@ -947,15 +973,7 @@ static void copy_rect_1(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - dst_bitpos = rc->left & 7; - src_bitpos = origin->x & 7; - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - { - src_val = *src_ptr & pixel_masks_1[src_bitpos] ? 0xff : 0; - do_rop_codes_mask_8( dst_ptr, src_val, &codes, pixel_masks_1[dst_bitpos] ); - if (dst_bitpos++ == 7) { dst_ptr++, dst_bitpos = 0; } - if (src_bitpos++ == 7) { src_ptr++, src_bitpos = 0; } - } + do_rop_codes_line_1( dst_start, rc->left, src_start, origin->x, &codes, rc->right - rc->left ); dst_start += dst->stride; src_start += src->stride; }

1 0

Alexandre Julliard : gdi32: Copy DIB rectangles in the correct order when source and destination overlap .
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 3ace50119075d51455e6081a48459f1cf09a8c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ace50119075d51455e6081a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 10:11:27 2011 +0200 gdi32: Copy DIB rectangles in the correct order when source and destination overlap. --- dlls/gdi32/dibdrv/bitblt.c | 102 +++++++++++++++++++++++++++++++++++++++++--- dlls/gdi32/dibdrv/dibdrv.h | 5 ++ 2 files changed, 101 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 1d41e11..94ae266 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -431,28 +431,118 @@ static const unsigned char BITBLT_Opcodes[256][MAX_OP_LEN] = { OP(PAT,DST,R2_WHITE) } /* 0xff 1 */ }; +static int get_overlap( const dib_info *dst, const RECT *dst_rect, + const dib_info *src, const RECT *src_rect ) +{ + const char *src_top, *dst_top; + int height, ret = 0; + + if (dst->stride != src->stride) return 0; /* can't be the same dib */ + if (dst_rect->right <= src_rect->left) return 0; + if (dst_rect->left >= src_rect->right) return 0; + + src_top = (const char *)src->bits.ptr + src_rect->top * src->stride; + dst_top = (const char *)dst->bits.ptr + dst_rect->top * dst->stride; + height = (dst_rect->bottom - dst_rect->top) * dst->stride; + + if (dst->stride > 0) + { + if (src_top >= dst_top + height) return 0; + if (src_top + height <= dst_top) return 0; + if (dst_top < src_top) ret |= OVERLAP_ABOVE; + else if (dst_top > src_top) ret |= OVERLAP_BELOW; + } + else + { + if (src_top <= dst_top + height) return 0; + if (src_top + height >= dst_top) return 0; + if (dst_top > src_top) ret |= OVERLAP_ABOVE; + else if (dst_top < src_top) ret |= OVERLAP_BELOW; + } + + if (dst_rect->left < src_rect->left) ret |= OVERLAP_LEFT; + else if (dst_rect->left > src_rect->left) ret |= OVERLAP_RIGHT; + + return ret; +} + static DWORD copy_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src, const RECT *src_rect, HRGN clip, INT rop2 ) { POINT origin; RECT clipped_rect; const WINEREGION *clip_data; - int i; + int i, start, end, overlap; origin.x = src_rect->left; origin.y = src_rect->top; + overlap = get_overlap( dst, dst_rect, src, src_rect ); if (clip == NULL) dst->funcs->copy_rect( dst, dst_rect, src, &origin, rop2 ); else { clip_data = get_wine_region( clip ); - for (i = 0; i < clip_data->numRects; i++) + if (overlap & OVERLAP_BELOW) + { + if (overlap & OVERLAP_RIGHT) /* right to left, bottom to top */ + { + for (i = clip_data->numRects - 1; i >= 0; i--) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + } + else /* left to right, bottom to top */ + { + for (start = clip_data->numRects - 1; start >= 0; start = end) + { + for (end = start - 1; end >= 0; end--) + if (clip_data->rects[start].top != clip_data->rects[end].top) break; + + for (i = end + 1; i <= start; i++) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + } + } + } + else if (overlap & OVERLAP_RIGHT) /* right to left, top to bottom */ + { + for (start = 0; start < clip_data->numRects; start = end) + { + for (end = start + 1; end < clip_data->numRects; end++) + if (clip_data->rects[start].top != clip_data->rects[end].top) break; + + for (i = end - 1; i >= start; i--) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + } + } + else /* left to right, top to bottom */ { - if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + for (i = 0; i < clip_data->numRects; i++) { - origin.x = src_rect->left + clipped_rect.left - dst_rect->left; - origin.y = src_rect->top + clipped_rect.top - dst_rect->top; - dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } } } release_wine_region( clip ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7f0d697..8130900 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -147,6 +147,11 @@ struct rop_codes DWORD a1, a2, x1, x2; }; +#define OVERLAP_LEFT 0x01 /* dest starts left of source */ +#define OVERLAP_RIGHT 0x02 /* dest starts right of source */ +#define OVERLAP_ABOVE 0x04 /* dest starts above source */ +#define OVERLAP_BELOW 0x08 /* dest starts below source */ + extern void get_rop_codes(INT rop, struct rop_codes *codes); extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN;

1 0

Andrew Talbot : crtdll: Supress sign-extension through integer promotion.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 6176fa469a431650b41a1c5598eb7cdcca5067a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6176fa469a431650b41a1c559… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 21 20:44:03 2011 +0100 crtdll: Supress sign-extension through integer promotion. --- dlls/crtdll/crtdll_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index a09f6f6..ac5677f 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -176,7 +176,7 @@ size_t CDECL _strncnt(const char *str, size_t maxlen) */ unsigned int CDECL _strnextc(const char *str) { - return (unsigned int)str[0]; + return (unsigned char)str[0]; }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_display_mode() const.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 013991e6e41c00a64dbcf26d09e1bdd3fd586e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=013991e6e41c00a64dbcf26d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:47 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_display_mode() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fad63e4..d1bec23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3920,7 +3920,7 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, device->devType, caps); } -HRESULT CDECL wined3d_device_get_display_mode(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index edc2e40..91efa2d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2216,7 +2216,7 @@ HRESULT __cdecl wined3d_device_get_current_texture_palette(struct wined3d_device HRESULT __cdecl wined3d_device_get_depth_stencil(struct wined3d_device *device, struct wined3d_surface **depth_stencil); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); -HRESULT __cdecl wined3d_device_get_display_mode(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_device_caps() const.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 72d75b65b7a162be612b6cfd3cc9794bf8dd7b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d75b65b7a162be612b6cfd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:46 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_device_caps() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f598ea3..fad63e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3913,7 +3913,7 @@ HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_device_caps(struct wined3d_device *device, WINED3DCAPS *caps) +HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a6071ea..edc2e40 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,7 +2215,7 @@ HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *de HRESULT __cdecl wined3d_device_get_current_texture_palette(struct wined3d_device *device, UINT *palette_idx); HRESULT __cdecl wined3d_device_get_depth_stencil(struct wined3d_device *device, struct wined3d_surface **depth_stencil); -HRESULT __cdecl wined3d_device_get_device_caps(struct wined3d_device *device, WINED3DCAPS *caps); +HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *device,

1 0

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 September 2011