December 2011 - Wine-Commits

Jacek Caban : jscript: Invoke bytecode directly from expr_eval.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 6b1077e2cbf4462f7b3e721993db9411f77a22b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1077e2cbf4462f7b3e72199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:44:27 2011 +0100 jscript: Invoke bytecode directly from expr_eval. --- dlls/jscript/engine.c | 28 ++++++++-------------------- dlls/jscript/engine.h | 2 -- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 424659f..00035f9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -54,10 +54,7 @@ static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_typ return stat->eval(ctx, stat, rt, ret); } -static inline HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - return compiled_expression_eval(ctx, expr, flags, ei, ret); -} +static HRESULT expr_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) { @@ -3122,7 +3119,7 @@ OP_LIST #undef X }; -static HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; unsigned prev_ip, prev_top; @@ -3131,6 +3128,12 @@ static HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWO TRACE("\n"); + if(expr->instr_off == -1) { + hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); + if(FAILED(hres)) + return hres; + } + prev_top = exec_ctx->top; prev_ip = exec_ctx->ip; exec_ctx->ip = expr->instr_off; @@ -3161,18 +3164,3 @@ static HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWO ret->u.var = *stack_pop(exec_ctx); return S_OK; } - -HRESULT compiled_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - HRESULT hres; - - TRACE("\n"); - - if(expr->instr_off == -1) { - hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); - if(FAILED(hres)) - return hres; - } - - return interp_expression_eval(ctx, expr, flags, ei, ret); -} diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 323e9e3..5ff5933 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -567,6 +567,4 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; - HRESULT compile_subscript(parser_ctx_t*,expression_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : ntdll: Setting WRITECOPY protection on a memory-mapped file is allowed.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: eed406e028102e40a8d33cfd319884015c4496f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed406e028102e40a8d33cfd3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 16 14:44:35 2011 +0800 ntdll: Setting WRITECOPY protection on a memory-mapped file is allowed. --- dlls/kernel32/tests/virtual.c | 21 +++++---------------- dlls/ntdll/virtual.c | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 3812cb2..336fd87 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1787,13 +1787,6 @@ static void test_CreateFileMapping_protection(void) { if (!ret) { - /* FIXME: completely remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY) - { - todo_wine - ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); - continue; - } /* win2k and XP don't support EXEC on file mappings */ if (td[i].prot == PAGE_EXECUTE) { @@ -1809,7 +1802,6 @@ static void test_CreateFileMapping_protection(void) /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ if (td[i].prot == PAGE_EXECUTE_WRITECOPY) { - todo_wine ok(broken(!ret), "%d: VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n", i); continue; } @@ -1827,7 +1819,11 @@ static void test_CreateFileMapping_protection(void) ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); + /* FIXME: remove the condition below once Wine is fixed */ + if (td[i].prot == PAGE_EXECUTE_WRITECOPY) + todo_wine ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); + else + ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == alloc_prot, "%d: %#x != %#x\n", i, info.AllocationProtect, alloc_prot); ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); @@ -2122,13 +2118,6 @@ static void test_mapping(void) ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY view properly\n"); continue; } - /* FIXME: completely remove the condition below once Wine is fixed */ - if (!ret && page_prot[k] == PAGE_WRITECOPY) - { - todo_wine - ok(ret, "VirtualProtect error %d\n", GetLastError()); - continue; - } ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e6ca21a..ee56e71 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2079,26 +2079,30 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); - if ((status = get_vprot_flags( new_prot, &new_vprot ))) return status; - if (new_vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; - new_vprot |= VPROT_COMMITTED; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (!(view = VIRTUAL_FindView( base, size ))) - { - status = STATUS_INVALID_PARAMETER; - } - else + if ((view = VIRTUAL_FindView( base, size ))) { /* Make sure all the pages are committed */ if (get_committed_size( view, base, &vprot ) >= size && (vprot & VPROT_COMMITTED)) { - if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); - if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + if (!(status = get_vprot_flags( new_prot, &new_vprot ))) + { + if ((new_vprot & VPROT_WRITECOPY) && (view->protect & VPROT_VALLOC)) + status = STATUS_INVALID_PAGE_PROTECTION; + else + { + new_vprot |= VPROT_COMMITTED; + if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); + if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + } + } } else status = STATUS_NOT_COMMITTED; } + else status = STATUS_INVALID_PARAMETER; + server_leave_uninterrupted_section( &csVirtual, &sigset ); if (status == STATUS_SUCCESS)

1 0

Dmitry Timoshkov : kernel32: Add a bunch of VirtualProtect tests on an image section.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: bb8d47bd30db5d64e632d0a2becd56532dcd4156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8d47bd30db5d64e632d0a2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 16 14:45:01 2011 +0800 kernel32: Add a bunch of VirtualProtect tests on an image section. --- dlls/kernel32/tests/loader.c | 142 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 2af7cc5..536bda9 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -568,6 +568,146 @@ static BOOL is_mem_writable(DWORD prot) } } +static void test_VirtualProtect(void *base, void *section) +{ + static const struct test_data + { + DWORD prot_set, prot_get; + } td[] = + { + { 0, 0 }, /* 0x00 */ + { PAGE_NOACCESS, PAGE_NOACCESS }, /* 0x01 */ + { PAGE_READONLY, PAGE_READONLY }, /* 0x02 */ + { PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x03 */ + { PAGE_READWRITE, PAGE_WRITECOPY }, /* 0x04 */ + { PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x05 */ + { PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x06 */ + { PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x07 */ + { PAGE_WRITECOPY, PAGE_WRITECOPY }, /* 0x08 */ + { PAGE_WRITECOPY | PAGE_NOACCESS, 0 }, /* 0x09 */ + { PAGE_WRITECOPY | PAGE_READONLY, 0 }, /* 0x0a */ + { PAGE_WRITECOPY | PAGE_NOACCESS | PAGE_READONLY, 0 }, /* 0x0b */ + { PAGE_WRITECOPY | PAGE_READWRITE, 0 }, /* 0x0c */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x0d */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x0e */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x0f */ + + { PAGE_EXECUTE, PAGE_EXECUTE }, /* 0x10 */ + { PAGE_EXECUTE_READ, PAGE_EXECUTE_READ }, /* 0x20 */ + { PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x30 */ + { PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY }, /* 0x40 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0x50 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0x60 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x70 */ + { PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_WRITECOPY }, /* 0x80 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE, 0 }, /* 0x90 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ, 0 }, /* 0xa0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0xb0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE, 0 }, /* 0xc0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0xd0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0xe0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 } /* 0xf0 */ + }; + DWORD ret, orig_prot, old_prot, rw_prot, exec_prot, i, j; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); + + orig_prot = old_prot; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, info.Protect); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, td[i].prot_set, &old_prot); + if (td[i].prot_get) + { + ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + if (info.Protect != td[i].prot_get) + todo_wine ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); + else + ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + } + else + { + ok(!ret, "%d: VirtualProtect should fail\n", i); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + if (td[i].prot_get) + { + if (old_prot != td[i].prot_get) + todo_wine ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); + else + ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); + } + else + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + } + + exec_prot = 0; + + for (i = 0; i <= 4; i++) + { + rw_prot = 0; + + for (j = 0; j <= 4; j++) + { + DWORD prot = exec_prot | rw_prot; + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, prot, &old_prot); + if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) + { + ok(!ret, "VirtualProtect(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + ok(ret, "VirtualProtect(%02x) error %d\n", prot, GetLastError()); + + rw_prot = 1 << j; + } + + exec_prot = 1 << (i + 4); + } + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, orig_prot, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); +} + static void test_section_access(void) { static const struct test_data @@ -699,6 +839,8 @@ static void test_section_access(void) if (info.Protect != PAGE_NOACCESS) ok(!memcmp((const char *)info.BaseAddress, section_data, section.SizeOfRawData), "wrong section data\n"); + test_VirtualProtect(hlib, (char *)hlib + section.VirtualAddress); + /* Windows changes the WRITECOPY to WRITE protection on an image section write (for a changed page only) */ if (is_mem_writable(info.Protect)) {

1 0

Jacek Caban : jscript: Return VARIANT directly from expr_eval.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 47fa932ac05ac32c7028e292d732593faa821835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fa932ac05ac32c7028e292d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:45:37 2011 +0100 jscript: Return VARIANT directly from expr_eval. --- dlls/jscript/engine.c | 165 ++++++++++-------------------------------------- 1 files changed, 35 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47fa932ac05ac32c7028e…

1 0

Nikolay Sivov : msxml3: Don't use libxml2 encoding helpers.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 35c7c694294d5461b84e18b17b65a99068050e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c7c694294d5461b84e18b17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 02:36:53 2011 +0300 msxml3: Don't use libxml2 encoding helpers. --- dlls/msxml3/mxwriter.c | 143 +++++++++++++++++------------------------ dlls/msxml3/tests/saxreader.c | 59 ++++++++++++++++- 2 files changed, 115 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35c7c694294d5461b84e1…

1 0

Francois Gouget : include: Include windef. h and packing directives in rpcasync.h when needed.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: b831594b501876105f88fa5dab85242737fd3594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b831594b501876105f88fa5da… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 20:20:22 2011 +0100 include: Include windef.h and packing directives in rpcasync.h when needed. --- include/rpcasync.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/rpcasync.h b/include/rpcasync.h index d4bf4f8..f0bcb6d 100644 --- a/include/rpcasync.h +++ b/include/rpcasync.h @@ -18,6 +18,13 @@ #ifndef __WINE_RPCASYNC_H #define __WINE_RPCASYNC_H +#ifdef RPC_NO_WINDOWS_H +# include <windef.h> +#endif + +#ifdef __RPC_WIN64__ +# include <pshpack8.h> +#endif typedef struct tagRPC_ERROR_ENUM_HANDLE { @@ -154,6 +161,10 @@ typedef struct _RPC_ASYNC_STATE #define RpcAsyncGetCallHandle(async) (((PRPC_ASYNC_STATE)async)->RuntimeInfo) +#ifdef __RPC_WIN64__ +# include <poppack.h> +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: a02e2c4f600f857bae2bb21defab93c52423bb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02e2c4f600f857bae2bb21de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 15 21:35:06 2011 +0100 po: Update French translation. --- po/fr.po | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/po/fr.po b/po/fr.po index c07d761..deb9e69 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-13 22:35+0100\n" +"PO-Revision-Date: 2011-12-15 21:33+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3566,9 +3566,8 @@ msgid "Boolean object expected" msgstr "Objet booléen attendu" #: jscript.rc:46 -#, fuzzy msgid "Cannot delete '|'" -msgstr "Ne peut terminer cette opération\n" +msgstr "Impossible de supprimer « | »" #: jscript.rc:47 msgid "VBArray object expected" @@ -10091,13 +10090,11 @@ msgid "Parameter error\n" msgstr "Erreur de paramètre\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Le volume dans le lecteur %1!c! est %2\n" -"Le numéro de série du volume est %3!04x!-%4!04x!\n" +"Le numéro de série du volume est %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -10130,11 +10127,11 @@ msgstr "La ligne d'entrée est trop longue.\n" #: cmd.rc:326 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "Le volume dans le lecteur %1!c! est %2\n" #: cmd.rc:327 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "Le volume dans le lecteur %1!c! n'a pas de label.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Alexandre Julliard : winex11: Update MWM hints when the window size changes .
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 5f1f57ce484333c8162de69897c4e8ef234fe6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1f57ce484333c8162de6989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:08:08 2011 +0100 winex11: Update MWM hints when the window size changes. --- dlls/winex11.drv/window.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7d8ac92..63f58a9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1001,6 +1001,32 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR /*********************************************************************** + * set_mwm_hints + */ +static void set_mwm_hints( Display *display, struct x11drv_win_data *data, DWORD style, DWORD ex_style ) +{ + MwmHints mwm_hints; + + mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; + mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); + mwm_hints.functions = MWM_FUNC_MOVE; + if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; + if (!(style & WS_DISABLED)) + { + if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; + if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; + if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + } + TRACE( "%p setting mwm hints to %lx,%lx (style %x exstyle %x)\n", + data->hwnd, mwm_hints.decorations, mwm_hints.functions, style, ex_style ); + + XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), + x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, + (unsigned char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) ); +} + + +/*********************************************************************** * get_process_name * * get the name of the current process for setting class hints @@ -1129,7 +1155,6 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) Window group_leader = data->whole_window; Window owner_win = 0; Atom window_type; - MwmHints mwm_hints; DWORD style, ex_style; HWND owner; @@ -1154,6 +1179,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /* size hints */ set_size_hints( display, data, style ); + set_mwm_hints( display, data, style, ex_style ); /* Only use dialog type for owned popups. Metacity allows making fullscreen * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for @@ -1165,21 +1191,6 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); - mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; - mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); - mwm_hints.functions = MWM_FUNC_MOVE; - if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; - if (!(style & WS_DISABLED)) - { - if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; - if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; - if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; - } - - XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), - x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, - (unsigned char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) ); - /* wm hints */ if (data->wm_hints) { @@ -1468,6 +1479,7 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data const RECT *old_whole_rect, const RECT *old_client_rect ) { DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); + DWORD ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); XWindowChanges changes; unsigned int mask = 0; @@ -1510,6 +1522,7 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data wine_tsx11_lock(); set_size_hints( display, data, style ); + set_mwm_hints( display, data, style, ex_style ); data->configure_serial = NextRequest( display ); XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes );

1 0

Alexandre Julliard : gdi32/tests: Add tests for device capabilities on memory DCs.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 19fe3f0c77b69423e5c4ea3b1d5d71f31b2364d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fe3f0c77b69423e5c4ea3b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:09:02 2011 +0100 gdi32/tests: Add tests for device capabilities on memory DCs. --- dlls/gdi32/tests/dc.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 26b7c61..8c92b5e 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -263,13 +263,98 @@ static void test_GdiConvertToDevmodeW(void) HeapFree(GetProcessHeap(), 0, dmW); } +static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) +{ + static const int caps[] = + { + DRIVERVERSION, + TECHNOLOGY, + HORZSIZE, + VERTSIZE, + HORZRES, + VERTRES, + BITSPIXEL, + PLANES, + NUMBRUSHES, + NUMPENS, + NUMMARKERS, + NUMFONTS, + NUMCOLORS, + PDEVICESIZE, + CURVECAPS, + LINECAPS, + POLYGONALCAPS, + TEXTCAPS, + CLIPCAPS, + RASTERCAPS, + ASPECTX, + ASPECTY, + ASPECTXY, + LOGPIXELSX, + LOGPIXELSY, + SIZEPALETTE, + NUMRESERVED, + COLORRES, + PHYSICALWIDTH, + PHYSICALHEIGHT, + PHYSICALOFFSETX, + PHYSICALOFFSETY, + SCALINGFACTORX, + SCALINGFACTORY, + VREFRESH, + DESKTOPVERTRES, + DESKTOPHORZRES, + BLTALIGNMENT, + SHADEBLENDCAPS, + COLORMGMTCAPS + }; + unsigned int i; + + if (GetObjectType( hdc ) == OBJ_METADC) + for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + ok( GetDeviceCaps( hdc, caps[i] ) == (caps[i] == TECHNOLOGY ? DT_METAFILE : 0), + "wrong caps on %s for %u: %u\n", descr, caps[i], + GetDeviceCaps( hdc, caps[i] ) ); + else + for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), + "mismatched caps on %s for %u: %u/%u\n", descr, caps[i], + GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); + + if (GetObjectType( hdc ) == OBJ_MEMDC) + { + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + HBITMAP dib, old; + + memset( buffer, 0, sizeof(buffer) ); + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = 16; + info->bmiHeader.biHeight = 16; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 8; + info->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( ref_dc, info, DIB_RGB_COLORS, NULL, NULL, 0 ); + old = SelectObject( hdc, dib ); + + for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), + "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], + GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); + + SelectObject( hdc, old ); + DeleteObject( dib ); + } +} + static void test_CreateCompatibleDC(void) { BOOL bRet; - HDC hdc, hNewDC, hdcMetafile; + HDC hdc, hNewDC, hdcMetafile, screen_dc; HBITMAP bitmap; INT caps; + screen_dc = GetDC( 0 ); bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); /* Create a DC compatible with the screen */ @@ -279,6 +364,8 @@ static void test_CreateCompatibleDC(void) caps = GetDeviceCaps( hdc, TECHNOLOGY ); ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + test_device_caps( hdc, screen_dc, "display dc" ); + /* Delete this DC, this should succeed */ bRet = DeleteDC(hdc); ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); @@ -307,9 +394,11 @@ static void test_CreateCompatibleDC(void) ok(hNewDC == NULL, "CreateCompatibleDC succeeded\n"); caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_METAFILE, "wrong caps %u\n", caps ); + test_device_caps( hdcMetafile, screen_dc, "metafile dc" ); DeleteMetaFile( CloseMetaFile( hdcMetafile )); DeleteObject( bitmap ); + ReleaseDC( 0, screen_dc ); } static void test_DC_bitmap(void) @@ -856,6 +945,8 @@ static void test_printer_dc(void) ret = GetDeviceCaps( display_memdc, TECHNOLOGY ); ok( ret == DT_RASDISPLAY, "wrong type %u\n", ret ); + test_device_caps( memdc, hdc, "printer dc" ); + bmp = CreateBitmap( 100, 100, 1, GetDeviceCaps( hdc, BITSPIXEL ), NULL ); orig = SelectObject( memdc, bmp ); ok( orig != NULL, "SelectObject failed\n" );

1 0

Piotr Caban : msvcp90: Added ctype_base class implementation.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 3cc08032fc36162d3faca6a8c11bc5df4769a770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc08032fc36162d3faca6a8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:31:45 2011 +0100 msvcp90: Added ctype_base class implementation. --- dlls/msvcp90/locale.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 16 ++++---- 2 files changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 03b325d..a3c54dc 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -86,6 +86,10 @@ typedef struct { _Collvec coll; } collate; +typedef struct { + locale_facet facet; +} ctype_base; + /* ?_Id_cnt(a)id@locale(a)std@@0HA */ int locale_id__Id_cnt = 0; @@ -628,6 +632,65 @@ basic_string_wchar __thiscall collate_wchar_transform(const collate *this, return ret; } +/* ??_7ctype_base(a)std@@6B@ */ +extern const vtable_ptr MSVCP_ctype_base_vtable; + +/* ??0ctype_base(a)std@@QAE(a)I@Z */ +/* ??0ctype_base(a)std@@QEAA(a)_K@Z */ +DEFINE_THISCALL_WRAPPER(ctype_base_ctor_refs, 8) +ctype_base* __thiscall ctype_base_ctor_refs(ctype_base *this, MSVCP_size_t refs) +{ + TRACE("(%p %lu)\n", this, refs); + locale_facet_ctor_refs(&this->facet, refs); + this->facet.vtable = &MSVCP_ctype_base_vtable; + return this; +} + +/* ??_Fctype_base(a)std@@QAEXXZ */ +/* ??_Fctype_base(a)std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ctype_base_ctor, 4) +ctype_base* __thiscall ctype_base_ctor(ctype_base *this) +{ + TRACE("(%p)\n", this); + locale_facet_ctor_refs(&this->facet, 0); + this->facet.vtable = &MSVCP_ctype_base_vtable; + return this; +} + +/* ??1ctype_base(a)std@@UAE(a)XZ */ +/* ??1ctype_base(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(ctype_base_dtor, 4) +void __thiscall ctype_base_dtor(ctype_base *this) +{ + TRACE("(%p)\n", this); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_ctype_base_vector_dtor, 8) +ctype_base* __thiscall MSVCP_ctype_base_vector_dtor(ctype_base *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + ctype_base_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + ctype_base_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +/* ?_Xran(a)ctype_base@std@@KAXXZ */ +void __cdecl ctype_base__Xran(void) +{ + throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>"); +} + /* ??0_Locimp(a)locale@std@@AAE(a)_N@Z */ /* ??0_Locimp(a)locale@std@@AEAA(a)_N@Z */ DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor_transparent, 8) @@ -1525,6 +1588,43 @@ const rtti_object_locator collate_short_rtti = { &collate_short_hierarchy }; +static const type_info ctype_base_type_info = { + &MSVCP_ctype_base_vtable, + NULL, + ".?AUctype_base(a)std@@" +}; + +static const rtti_base_descriptor ctype_base_rtti_base_descriptor = { + &ctype_base_type_info, + 1, + { 0, -1, 0}, + 64 +}; + +static const rtti_base_array ctype_base_rtti_base_array = { + { + &ctype_base_rtti_base_descriptor, + &locale_facet_rtti_base_descriptor, + NULL, + NULL + } +}; + +static const rtti_object_hierarchy ctype_base_hierarchy = { + 0, + 0, + 2, + &ctype_base_rtti_base_array +}; + +const rtti_object_locator ctype_base_rtti = { + 0, + 0, + 0, + &ctype_base_type_info, + &ctype_base_hierarchy +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -1540,6 +1640,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(collate_wchar_do_compare) VTABLE_ADD_FUNC(collate_wchar_do_transform) VTABLE_ADD_FUNC(collate_wchar_do_hash)); + __ASM_VTABLE(ctype_base, ""); #ifndef __GNUC__ } #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 0608d9a..64d2e94 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1094,8 +1094,8 @@ @ stub -arch=win64 ??0_Winit(a)std@@QEAA(a)XZ @ stub -arch=win32 ??0codecvt_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0codecvt_base(a)std@@QEAA(a)_K@Z -@ stub -arch=win32 ??0ctype_base(a)std@@QAE(a)I@Z -@ stub -arch=win64 ??0ctype_base(a)std@@QEAA(a)_K@Z +@ thiscall -arch=win32 ??0ctype_base(a)std@@QAE(a)I@Z(ptr long) ctype_base_ctor_refs +@ cdecl -arch=win64 ??0ctype_base(a)std@@QEAA(a)_K@Z(ptr long) ctype_base_ctor_refs @ thiscall -arch=win32 ??0facet(a)locale@std@@IAE(a)I@Z(ptr long) locale_facet_ctor_refs @ cdecl -arch=win64 ??0facet(a)locale@std@@IEAA(a)_K@Z(ptr long) locale_facet_ctor_refs @ thiscall -arch=win32 ??0id(a)locale@std@@QAE(a)I@Z(ptr long) locale_id_ctor_id @@ -1328,8 +1328,8 @@ @ stub -arch=win64 ??1_Winit(a)std@@QEAA(a)XZ @ stub -arch=win32 ??1codecvt_base(a)std@@UAE(a)XZ @ stub -arch=win64 ??1codecvt_base(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1ctype_base(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1ctype_base(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1ctype_base(a)std@@UAE(a)XZ(ptr) ctype_base_dtor +@ cdecl -arch=win64 ??1ctype_base(a)std@@UEAA(a)XZ(ptr) ctype_base_dtor @ thiscall -arch=win32 ??1facet(a)locale@std@@UAE(a)XZ(ptr) locale_facet_dtor @ cdecl -arch=win64 ??1facet(a)locale@std@@UEAA(a)XZ(ptr) locale_facet_dtor @ thiscall -arch=win32 ??1ios_base(a)std@@UAE(a)XZ(ptr) ios_base_dtor @@ -1859,7 +1859,7 @@ # extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable # extern ??_7codecvt_base(a)std@@6B@ -# extern ??_7ctype_base(a)std@@6B@ +@ extern ??_7ctype_base(a)std@@6B@ MSVCP_ctype_base_vtable @ extern ??_7ios_base(a)std@@6B@ MSVCP_ios_base_vtable # extern ??_7messages_base(a)std@@6B@ # extern ??_7money_base(a)std@@6B@ @@ -2083,8 +2083,8 @@ @ cdecl -arch=win64 ??_F_Timevec(a)std@@QEAAXXZ(ptr) _Timevec_ctor @ stub -arch=win32 ??_Fcodecvt_base(a)std@@QAEXXZ @ stub -arch=win64 ??_Fcodecvt_base(a)std@@QEAAXXZ -@ stub -arch=win32 ??_Fctype_base(a)std@@QAEXXZ -@ stub -arch=win64 ??_Fctype_base(a)std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fctype_base(a)std@@QAEXXZ(ptr) ctype_base_ctor +@ cdecl -arch=win64 ??_Fctype_base(a)std@@QEAAXXZ(ptr) ctype_base_ctor @ thiscall -arch=win32 ??_Ffacet(a)locale@std@@QAEXXZ(ptr) locale_facet_ctor @ cdecl -arch=win64 ??_Ffacet(a)locale@std@@QEAAXXZ(ptr) locale_facet_ctor @ thiscall -arch=win32 ??_Fid(a)locale@std@@QAEXXZ(ptr) locale_id_ctor @@ -2882,7 +2882,7 @@ @ stub ?_Xmem(a)tr1@std@@YAXXZ @ stub ?_Xoutrange(a)tr1@std@@YAXXZ @ cdecl ?_Xran(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xran -@ stub ?_Xran(a)ctype_base@std@@KAXXZ +@ cdecl ?_Xran(a)ctype_base@std@@KAXXZ() ctype_base__Xran @ thiscall -arch=win32 ?_Xsgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHPADIH(a)Z(ptr ptr long long) basic_streambuf_char__Xsgetn_s @ cdecl -arch=win64 ?_Xsgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAA_JPEAD_K_J(a)Z(ptr ptr long long) basic_streambuf_char__Xsgetn_s @ stub -arch=win32 ?_Xsgetn_s@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MAEHPAGIH(a)Z

1 0