October 2014 - Wine-Commits

Jacek Caban : jscript: Added support for '-' CC expression.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 9b41bb0345a98d23778c91da692a5a0e97cecfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b41bb0345a98d23778c91da6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:44 2014 +0200 jscript: Added support for '-' CC expression. --- dlls/jscript/cc_parser.y | 3 +++ dlls/jscript/tests/cc.js | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 83d8b4e..d25022b 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -66,6 +66,7 @@ static int cc_parser_lex(void *lval, parser_ctx_t *ctx) case '(': case ')': case '+': + case '-': case '*': case '/': return *ctx->ptr++; @@ -105,6 +106,8 @@ CCAdditiveExpression : CCMultiplicativeExpression { $$ = $1; } | CCAdditiveExpression '+' CCMultiplicativeExpression { $$ = ccval_num(get_ccnum($1) + get_ccnum($3)); } + | CCAdditiveExpression '-' CCMultiplicativeExpression + { $$ = ccval_num(get_ccnum($1) - get_ccnum($3)); } CCMultiplicativeExpression : CCUnaryExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 32f827e..7ce3682 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -140,6 +140,12 @@ ok(@test === false, "@test = " + @test); @set @test = (0 != true) ok(@test === true, "@test = " + @test); +(a)set @test = (true-2) +ok(@test === -1, "@test = " + @test); + +(a)set @test = (true-(a)_jscript) +ok(@test === 0, "@test = " + @test); + @if (false) this wouldn not parse "@end

1 0

Jacek Caban : jscript: Added support for conditional compilation @if/@elif /@else/@end.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: afba44d3244f93effbd48ecc93358f897ec713ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=afba44d3244f93effbd48ecc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:12 2014 +0200 jscript: Added support for conditional compilation @if/@elif/@else/@end. --- dlls/jscript/lex.c | 93 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/jscript/parser.h | 1 + 2 files changed, 81 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 357b905..3daaf47 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -63,6 +63,9 @@ static const WCHAR voidW[] = {'v','o','i','d',0}; static const WCHAR whileW[] = {'w','h','i','l','e',0}; static const WCHAR withW[] = {'w','i','t','h',0}; +static const WCHAR elifW[] = {'e','l','i','f',0}; +static const WCHAR endW[] = {'e','n','d',0}; + static const struct { const WCHAR *word; int token; @@ -942,6 +945,61 @@ int try_parse_ccval(parser_ctx_t *ctx, ccval_t *r) return 0; } +static int skip_code(parser_ctx_t *ctx, BOOL exec_else) +{ + int if_depth = 1; + const WCHAR *ptr; + + while(1) { + ptr = strchrW(ctx->ptr, '@'); + if(!ptr) { + WARN("No @end\n"); + return lex_error(ctx, JS_E_EXPECTED_CCEND); + } + ctx->ptr = ptr+1; + + if(!check_keyword(ctx, endW, NULL)) { + if(--if_depth) + continue; + return 0; + } + + if(exec_else && !check_keyword(ctx, elifW, NULL)) { + if(if_depth > 1) + continue; + + if(!skip_spaces(ctx) || *ctx->ptr != '(') + return lex_error(ctx, JS_E_MISSING_LBRACKET); + + if(!parse_cc_expr(ctx)) + return -1; + + if(!get_ccbool(ctx->ccval)) + continue; /* skip block of code */ + + /* continue parsing */ + ctx->cc_if_depth++; + return 0; + } + + if(exec_else && !check_keyword(ctx, elseW, NULL)) { + if(if_depth > 1) + continue; + + /* parse else block */ + ctx->cc_if_depth++; + return 0; + } + + if(!check_keyword(ctx, ifW, NULL)) { + if_depth++; + continue; + } + + ctx->ptr++; + } +} + static int cc_token(parser_ctx_t *ctx, void *lval) { unsigned id_len = 0; @@ -949,8 +1007,6 @@ static int cc_token(parser_ctx_t *ctx, void *lval) static const WCHAR cc_onW[] = {'c','c','_','o','n',0}; static const WCHAR setW[] = {'s','e','t',0}; - static const WCHAR elifW[] = {'e','l','i','f',0}; - static const WCHAR endW[] = {'e','n','d',0}; ctx->ptr++; @@ -989,23 +1045,34 @@ static int cc_token(parser_ctx_t *ctx, void *lval) } if(!check_keyword(ctx, ifW, NULL)) { - FIXME("@if not implemented\n"); - return lex_error(ctx, E_NOTIMPL); - } + if(!skip_spaces(ctx) || *ctx->ptr != '(') + return lex_error(ctx, JS_E_MISSING_LBRACKET); - if(!check_keyword(ctx, elifW, NULL)) { - FIXME("@elif not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!parse_cc_expr(ctx)) + return -1; + + if(get_ccbool(ctx->ccval)) { + /* continue parsing block inside if */ + ctx->cc_if_depth++; + return 0; + } + + return skip_code(ctx, TRUE); } - if(!check_keyword(ctx, elseW, NULL)) { - FIXME("@else not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!check_keyword(ctx, elifW, NULL) || !check_keyword(ctx, elseW, NULL)) { + if(!ctx->cc_if_depth) + return lex_error(ctx, JS_E_SYNTAX); + + return skip_code(ctx, FALSE); } if(!check_keyword(ctx, endW, NULL)) { - FIXME("@end not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!ctx->cc_if_depth) + return lex_error(ctx, JS_E_SYNTAX); + + ctx->cc_if_depth--; + return 0; } if(!ctx->script->cc) diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index cb4e9c4..ab5744a 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -42,6 +42,7 @@ typedef struct _parser_ctx_t { HRESULT hres; ccval_t ccval; + unsigned cc_if_depth; heap_pool_t heap; } parser_ctx_t;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface().
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: c5d917777a564219d455224f6234dcaae8b4df1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d917777a564219d455224f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:55 2014 +0200 wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface(). This is never used. --- dlls/wined3d/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index acf3f46..272b5de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3168,12 +3168,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI switch (conversion_type) { - case WINED3D_CT_NONE: - { - memcpy(dst, src, pitch * height); - break; - } - case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) {

1 0

Joris van der Wel : server: A new function "set_sd_defaults_from_token".
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 6d19aa83bf2f302f7a658f48cb326e167b48c645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d19aa83bf2f302f7a658f48c… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Sep 17 15:35:26 2014 +0200 server: A new function "set_sd_defaults_from_token". --- server/object.c | 25 ++++++++++++++++--------- server/object.h | 2 ++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/server/object.c b/server/object.c index 11ef0ce..ec196c1 100644 --- a/server/object.c +++ b/server/object.c @@ -423,12 +423,12 @@ struct security_descriptor *default_get_sd( struct object *obj ) return obj->sd; } -int default_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ) +int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ) { struct security_descriptor new_sd, *new_sd_ptr; int present; - const SID *owner, *group; + const SID *owner = NULL, *group = NULL; const ACL *sacl, *dacl; char *ptr; @@ -446,9 +446,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, owner = sd_get_owner( obj->sd ); new_sd.owner_len = obj->sd->owner_len; } - else + else if (token) { - owner = token_get_user( current->process->token ); + owner = token_get_user( token ); new_sd.owner_len = security_sid_len( owner ); } @@ -462,9 +462,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, group = sd_get_group( obj->sd ); new_sd.group_len = obj->sd->group_len; } - else + else if (token) { - group = token_get_primary_group( current->process->token ); + group = token_get_primary_group( token ); new_sd.group_len = security_sid_len( group ); } @@ -494,9 +494,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, if (obj->sd && present) new_sd.dacl_len = obj->sd->dacl_len; - else + else if (token) { - dacl = token_get_default_dacl( current->process->token ); + dacl = token_get_default_dacl( token ); new_sd.dacl_len = dacl->AclSize; } } @@ -521,6 +521,13 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, return 1; } +/** Set the security descriptor using the current primary token for defaults. */ +int default_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + return set_sd_defaults_from_token( obj, sd, set_info, current->process->token ); +} + struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { diff --git a/server/object.h b/server/object.h index bb3ff21..dd93b76e 100644 --- a/server/object.h +++ b/server/object.h @@ -139,6 +139,8 @@ extern struct fd *no_get_fd( struct object *obj ); extern unsigned int no_map_access( struct object *obj, unsigned int access ); extern struct security_descriptor *default_get_sd( struct object *obj ); extern int default_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +extern int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ); extern struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attributes ); extern struct object *no_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options );

1 0

Sebastian Lackner : shlwapi: Fixed swapped argument order in SHLWAPI_DupSharedHandle command.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 5e4f15db1f8cf6de4a6ef8ad0aa073b9488293d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4f15db1f8cf6de4a6ef8ad0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 02:39:49 2014 +0200 shlwapi: Fixed swapped argument order in SHLWAPI_DupSharedHandle command. --- dlls/shlwapi/ordinal.c | 6 +++--- dlls/shlwapi/tests/ordinal.c | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 303c63a..e5da1cf 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -106,7 +106,7 @@ static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, if (hSrc) { /* Make handle available to dest process */ - if (!DuplicateHandle(hDst, hShared, hSrc, &hRet, + if (!DuplicateHandle(hSrc, hShared, hDst, &hRet, dwAccess, 0, dwOptions | DUPLICATE_SAME_ACCESS)) hRet = NULL; @@ -201,7 +201,7 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), + hDup = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, FILE_MAP_ALL_ACCESS, 0); /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); @@ -252,7 +252,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get a copy of the handle for our process, closing the source handle */ - hClose = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), + hClose = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 481a771..64b07f3 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -505,16 +505,13 @@ static void test_alloc_shared(int argc, char **argv) if (hmem2) { p = pSHLockShared(hmem2, procid); - todo_wine ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); if (p != NULL) ok(p->value == 0xDEADBEEF, "Wrong value in shared memory: %d instead of %d\n", p->value, 0xDEADBEEF); ret = pSHUnlockShared(p); - todo_wine ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); ret = pSHFreeShared(hmem2, procid); - todo_wine ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } }

1 0

Sebastian Lackner : msvcp110: Export ? _BADOFF@std@@3_JB on both i386 and win64.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: a95a50925b7d7ebfe88f8d57d326b75565e74305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95a50925b7d7ebfe88f8d57d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 29 00:21:28 2014 +0200 msvcp110: Export ?_BADOFF(a)std@@3_JB on both i386 and win64. --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 593976e..6d3118a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1148,7 +1148,7 @@ @ stub -arch=i386 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IAEXABV123@@Z @ stub -arch=win64 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ(a)Z -@ extern -arch=win64 ?_BADOFF(a)std@@3_JB std_BADOFF +@ extern ?_BADOFF(a)std@@3_JB std_BADOFF @ stub ?_Byte_reverse_table(a)details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str

1 0

Sebastian Lackner : shlwapi/tests: Add SH*Shared inter-process tests.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: cad3e3e5dcd65a946a1234d7645f797628d94409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad3e3e5dcd65a946a1234d76… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 02:36:47 2014 +0200 shlwapi/tests: Add SH*Shared inter-process tests. --- dlls/shlwapi/tests/ordinal.c | 101 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 93 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index cb90d31..481a771 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -444,12 +444,20 @@ static void test_SHSearchMapInt(void) ok(i == values[0], "Len 3, expected %d, got %d\n", values[0], i); } -static void test_alloc_shared(void) +struct shared_struct { + DWORD value; + HANDLE handle; +}; + +static void test_alloc_shared(int argc, char **argv) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; DWORD procid; - HANDLE hmem; - int val; - int* p; + HANDLE hmem, hmem2 = 0; + struct shared_struct val, *p; BOOL ret; procid=GetCurrentProcessId(); @@ -458,19 +466,82 @@ static void test_alloc_shared(void) ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); - val=0x12345678; - hmem=pSHAllocShared(&val,4,procid); + val.value = 0x12345678; + val.handle = 0; + hmem = pSHAllocShared(&val, sizeof(val), procid); ok(hmem!=NULL,"SHAllocShared(NULL...) failed: %u\n", GetLastError()); p=pSHLockShared(hmem,procid); ok(p!=NULL,"SHLockShared failed: %u\n", GetLastError()); if (p!=NULL) - ok(*p==val,"Wrong value in shared memory: %d instead of %d\n",*p,val); + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); ret = pSHUnlockShared(p); ok( ret, "SHUnlockShared failed: %u\n", GetLastError()); + sprintf(cmdline, "%s %s %d %p", argv[0], argv[1], procid, hmem); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "could not create child process error: %u\n", GetLastError()); + if (ret) + { + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + p = pSHLockShared(hmem, procid); + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL && p->value != 0x12345678) + { + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + hmem2 = p->handle; + ok(hmem2 != NULL, "Expected handle in shared memory\n"); + } + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + } + ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); + + if (hmem2) + { + p = pSHLockShared(hmem2, procid); + todo_wine + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL) + ok(p->value == 0xDEADBEEF, "Wrong value in shared memory: %d instead of %d\n", p->value, 0xDEADBEEF); + ret = pSHUnlockShared(p); + todo_wine + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, procid); + todo_wine + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); + } +} + +static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) +{ + struct shared_struct val, *p; + BOOL ret; + + p = pSHLockShared(hmem, procid); + ok(p != NULL || broken(p == NULL) /* Windows 7/8 */, "SHLockShared failed: %u\n", GetLastError()); + if (p == NULL) + { + win_skip("Subprocess failed to modify shared memory, skipping test\n"); + return; + } + + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); + p->value++; + + val.value = 0xDEADBEEF; + val.handle = 0; + p->handle = pSHAllocShared(&val, sizeof(val), procid); + ok(p->handle != NULL, "SHAllocShared failed: %u\n", GetLastError()); + + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); } static void test_fdsa(void) @@ -3057,6 +3128,9 @@ static void test_SHSetParentHwnd(void) START_TEST(ordinal) { + char **argv; + int argc; + hShlwapi = GetModuleHandleA("shlwapi.dll"); is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ @@ -3069,6 +3143,17 @@ START_TEST(ordinal) init_pointers(); + argc = winetest_get_mainargs(&argv); + if (argc >= 4) + { + DWORD procid; + HANDLE hmem; + sscanf(argv[2], "%d", &procid); + sscanf(argv[3], "%p", &hmem); + test_alloc_shared_remote(procid, hmem); + return; + } + hmlang = LoadLibraryA("mlang.dll"); pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); @@ -3077,7 +3162,7 @@ START_TEST(ordinal) test_GetAcceptLanguagesA(); test_SHSearchMapInt(); - test_alloc_shared(); + test_alloc_shared(argc, argv); test_fdsa(); test_GetShellSecurityDescriptor(); test_SHPackDispParams();

1 0