October 2010 - Wine-commits

Igor Paliychuk : jscript: Updated Ukrainian translation.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: f8e4a0f3b9d220b3242489d35399230245fa3287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e4a0f3b9d220b3242489d35… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Tue Oct 19 15:27:16 2010 +0300 jscript: Updated Ukrainian translation. --- dlls/jscript/jscript_Uk.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Uk.rc b/dlls/jscript/jscript_Uk.rc index fe756e2..2a80617 100644 --- a/dlls/jscript/jscript_Uk.rc +++ b/dlls/jscript/jscript_Uk.rc @@ -28,6 +28,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Помилка конвертування об'єкту в примітивний тип" IDS_INVALID_CALL_ARG "Невірний виклик процедури або аргумент" + IDS_SUBSCRIPT_OUT_OF_RANGE "Індекс поза діапазоном" IDS_CREATE_OBJ_ERROR "Сервер автоматизації не може створити об'єкт" IDS_NO_PROPERTY "Об'єкт не підтримує цю властивість чи метод" IDS_UNSUPPORTED_ACTION "Об'єкт не підтримує цю дію" @@ -44,6 +45,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Невірне присвоєння" IDS_UNDEFINED "'|' не визначено" IDS_NOT_BOOL "Очікується об'єкт Boolean" + IDS_NOT_VBARRAY "Очікується об'єкт VBArray" IDS_JSCRIPT_EXPECTED "Очікується об'єкт JScript" IDS_REGEXP_SYNTAX_ERROR "Синтаксична помилка в регулярному виразі" IDS_URI_INVALID_CHAR "URI, що буде закодований, містить неприпустимі символи"

1 0

Piotr Caban : jscript: Improved VBArray related tests.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: dcdc6c7013906f555e8c860ab64497e7590f94c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdc6c7013906f555e8c860ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 19 14:00:14 2010 +0200 jscript: Improved VBArray related tests. --- dlls/jscript/tests/api.js | 14 +++++++++----- dlls/jscript/tests/run.c | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1334f7e..6d88b53 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -149,8 +149,8 @@ tmp = Object.prototype.toString.call(this); ok(tmp === "[object Object]", "toString.call(this) = " + tmp); (function () { tmp = Object.prototype.toString.call(arguments); })(); ok(tmp === "[object Object]", "toString.call(arguments) = " + tmp); -(tmp = new VBArray(createArray())).f = Object.prototype.toString; -ok(tmp.f() === "[object Object]", "tmp.f() = " + tmp.f()); +tmp = Object.prototype.toString.call(new VBArray(createArray())); +ok(tmp === "[object Object]", "toString.call(new VBArray()) = " + tmp); ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String"); @@ -1903,8 +1903,7 @@ exception_test(function() {new VBArray();}, "TypeError", -2146823275); exception_test(function() {new VBArray(new VBArray(createArray()));}, "TypeError", -2146823275); exception_test(function() {createArray().lbound("aaa");}, "RangeError", -2146828279); exception_test(function() {createArray().lbound(3);}, "RangeError", -2146828279); -exception_test(function() {tmp = new Object(); tmp.lb = VBArray.prototype.lbound; tmp.lb();}, "TypeError", -2146823275); -exception_test(function() {tmp = new Object(); tmp.lb = VBArray.prototype.lbound; tmp.lb();}, "TypeError", -2146823275); +exception_test(function() {VBArray.prototype.lbound.call(new Object());}, "TypeError", -2146823275); exception_test(function() {createArray().getItem(3);}, "RangeError", -2146828279); function testThisExcept(func, number) { @@ -2253,7 +2252,10 @@ ok(unescape.length == 1, "unescape.length = " + unescape.length); String.length = 3; ok(String.length == 1, "String.length = " + String.length); -var tmp = new VBArray(createArray()); +var tmp = createArray(); +ok(getVT(tmp) == "VT_ARRAY|VT_VARIANT", "getVT(createArray()) = " + getVT(tmp)); +ok(getVT(VBArray(tmp)) == "VT_ARRAY|VT_VARIANT", "getVT(VBArray(tmp)) = " + getVT(VBArray(tmp))); +tmp = new VBArray(tmp); tmp = new VBArray(VBArray(createArray())); ok(tmp.dimensions() == 2, "tmp.dimensions() = " + tmp.dimensions()); ok(tmp.lbound() == 0, "tmp.lbound() = " + tmp.lbound()); @@ -2265,5 +2267,7 @@ ok(tmp.getItem(1, 2) == 3, "tmp.getItem(1, 2) = " + tmp.getItem(1, 2)); ok(tmp.getItem(2, 3) == 33, "tmp.getItem(2, 3) = " + tmp.getItem(2, 3)); ok(tmp.getItem(3, 2) == 13, "tmp.getItem(3, 2) = " + tmp.getItem(3, 2)); ok(tmp.toArray() == "2,3,12,13,22,23,32,33,42,43", "tmp.toArray() = " + tmp.toArray()); +ok(createArray().toArray() == "2,3,12,13,22,23,32,33,42,43", + "createArray.toArray()=" + createArray().toArray()); reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 9bca966..5c1a9f6 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -487,6 +487,9 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case VT_BOOL: V_BSTR(pvarRes) = a2bstr("VT_BOOL"); break; + case VT_ARRAY|VT_VARIANT: + V_BSTR(pvarRes) = a2bstr("VT_ARRAY|VT_VARIANT"); + break; default: ok(0, "unknown vt %d\n", V_VT(pdp->rgvarg)); return E_FAIL;

1 0

Piotr Caban : jscript: Add index, input and lastIndex properties to regexp functions results.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: b9b11c6c67450e7aab707b20016e036def72d161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b11c6c67450e7aab707b200… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 19 13:54:48 2010 +0200 jscript: Add index, input and lastIndex properties to regexp functions results. --- dlls/jscript/regexp.c | 28 ++++++++++++++++++++++++++++ dlls/jscript/tests/regexp.js | 4 ++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 5d75144..8edfd97 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3590,6 +3590,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res static const WCHAR indexW[] = {'i','n','d','e','x',0}; static const WCHAR inputW[] = {'i','n','p','u','t',0}; + static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; static const WCHAR zeroW[] = {'0',0}; hres = create_array(ctx, parens_cnt+1, &array); @@ -3617,6 +3618,11 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res if(FAILED(hres)) break; + V_I4(&var) = result->str-input+result->len; + hres = jsdisp_propput_name(array, lastIndexW, &var, ei, NULL/*FIXME*/); + if(FAILED(hres)) + break; + V_VT(&var) = VT_BSTR; V_BSTR(&var) = input; hres = jsdisp_propput_name(array, inputW, &var, ei, NULL/*FIXME*/); @@ -3918,6 +3924,10 @@ HRESULT create_regexp_var(script_ctx_t *ctx, VARIANT *src_arg, VARIANT *flags_ar HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, BSTR str, VARIANT *retv, jsexcept_t *ei) { + static const WCHAR indexW[] = {'i','n','d','e','x',0}; + static const WCHAR inputW[] = {'i','n','p','u','t',0}; + static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; + RegExpInstance *regexp = (RegExpInstance*)re; match_result_t *match_result; DWORD match_cnt, i, length; @@ -3985,6 +3995,24 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, BSTR str, break; } + while(SUCCEEDED(hres)) { + V_VT(&var) = VT_I4; + V_I4(&var) = match_result[match_cnt-1].str-str; + hres = jsdisp_propput_name(array, indexW, &var, ei, NULL/*FIXME*/); + if(FAILED(hres)) + break; + + V_I4(&var) = match_result[match_cnt-1].str-str+match_result[match_cnt-1].len; + hres = jsdisp_propput_name(array, lastIndexW, &var, ei, NULL/*FIXME*/); + if(FAILED(hres)) + break; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = str; + hres = jsdisp_propput_name(array, inputW, &var, ei, NULL/*FIXME*/); + break; + } + heap_free(match_result); if(SUCCEEDED(hres) && retv) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 26919f9..4d513e0 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -50,6 +50,7 @@ ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex); m = re.exec(" aabaaa"); ok(re.lastIndex === 3, "re.lastIndex = " + re.lastIndex); ok(m.index === 1, "m.index = " + m.index); +ok(m.lastIndex == 3, "m.lastIndex = " + m.lastIndex); ok(m.input === " aabaaa", "m.input = " + m.input); ok(m.length === 1, "m.length = " + m.length); ok(m[0] === "aa", "m[0] = " + m[0]); @@ -194,6 +195,9 @@ ok(typeof(m) === "object", "typeof m is not object"); ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); +ok(m.index === 3, "m.index = " + m.index); +ok(m.input === "abcabc", "m.input = " + m.input); +ok(m.lastIndex === 5, "m.lastIndex = " + m.lastIndex); m = "abcabcg".match("ab", "g"); ok(typeof(m) === "object", "typeof m is not object");

1 0

Alexandre Julliard : ntdll: Get rid of the FILE_VIEW typedef.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 31d37b34892aa816e40958d7e80f55c80ea5b392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d37b34892aa816e40958d7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 15:34:36 2010 +0200 ntdll: Get rid of the FILE_VIEW typedef. --- dlls/ntdll/virtual.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a42ed5f..3ab3eb3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -70,7 +70,7 @@ WINE_DECLARE_DEBUG_CHANNEL(module); #endif /* File view */ -typedef struct file_view +struct file_view { struct list entry; /* Entry in global view list */ void *base; /* Base address */ @@ -78,7 +78,7 @@ typedef struct file_view HANDLE mapping; /* Handle to the file mapping */ unsigned int protect; /* Protection for all pages at allocation time */ BYTE prot[1]; /* Protection byte for each page */ -} FILE_VIEW; +}; /* Conversion from VPROT_* to Win32 flags */ @@ -196,7 +196,7 @@ static int VIRTUAL_GetUnixProt( BYTE vprot ) /*********************************************************************** * VIRTUAL_DumpView */ -static void VIRTUAL_DumpView( FILE_VIEW *view ) +static void VIRTUAL_DumpView( struct file_view *view ) { UINT i, count; char *addr = view->base; @@ -238,7 +238,7 @@ static void VIRTUAL_Dump(void) TRACE( "Dump of all virtual memory views:\n" ); server_enter_uninterrupted_section( &csVirtual, &sigset ); - LIST_FOR_EACH_ENTRY( view, &views_list, FILE_VIEW, entry ) + LIST_FOR_EACH_ENTRY( view, &views_list, struct file_view, entry ) { VIRTUAL_DumpView( view ); } @@ -597,7 +597,7 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) * TRUE: Success * FALSE: Failure */ -static BOOL VIRTUAL_SetProt( FILE_VIEW *view, /* [in] Pointer to view */ +static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ void *base, /* [in] Starting address */ size_t size, /* [in] Size in bytes */ BYTE vprot ) /* [in] Protections to use */ @@ -1403,7 +1403,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); SIZE_T size = nt->OptionalHeader.SizeOfImage; IMAGE_SECTION_HEADER *sec; - FILE_VIEW *view; + struct file_view *view; void *base; int i; @@ -1438,7 +1438,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) */ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ) { - FILE_VIEW *view; + struct file_view *view; NTSTATUS status; sigset_t sigset; SIZE_T size; @@ -1499,7 +1499,7 @@ void virtual_clear_thread_stack(void) */ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) { - FILE_VIEW *view; + struct file_view *view; NTSTATUS ret = STATUS_ACCESS_VIOLATION; sigset_t sigset; @@ -1538,7 +1538,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) */ BOOL virtual_handle_stack_fault( void *addr ) { - FILE_VIEW *view; + struct file_view *view; BOOL ret = FALSE; RtlEnterCriticalSection( &csVirtual ); /* no need for signal masking inside signal handler */ @@ -1882,7 +1882,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ */ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type ) { - FILE_VIEW *view; + struct file_view *view; char *base; sigset_t sigset; NTSTATUS status = STATUS_SUCCESS; @@ -1966,7 +1966,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG new_prot, ULONG *old_prot ) { - FILE_VIEW *view; + struct file_view *view; sigset_t sigset; NTSTATUS status = STATUS_SUCCESS; char *base; @@ -2083,7 +2083,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, MEMORY_INFORMATION_CLASS info_class, PVOID buffer, SIZE_T len, SIZE_T *res_len ) { - FILE_VIEW *view; + struct file_view *view; char *base, *alloc_base = 0; struct list *ptr; SIZE_T size = 0; @@ -2561,7 +2561,7 @@ done: */ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) { - FILE_VIEW *view; + struct file_view *view; NTSTATUS status = STATUS_NOT_MAPPED_VIEW; sigset_t sigset; void *base = ROUND_ADDR( addr, page_mask ); @@ -2598,7 +2598,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, SIZE_T *size_ptr, ULONG unknown ) { - FILE_VIEW *view; + struct file_view *view; NTSTATUS status = STATUS_SUCCESS; sigset_t sigset; void *addr = ROUND_ADDR( *addr_ptr, page_mask );

1 0

Alexandre Julliard : ntdll: More complete implementation of NtAreMappedFilesTheSame.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: e7c67c0cb1b1fd0ad745ea23a7dfdfd448b0c06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c67c0cb1b1fd0ad745ea23a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 16:14:40 2010 +0200 ntdll: More complete implementation of NtAreMappedFilesTheSame. --- dlls/kernel32/tests/virtual.c | 22 ++++++++++++------- dlls/ntdll/virtual.c | 47 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d4c4827..e7b0b77 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -901,26 +901,21 @@ static void test_NtAreMappedFilesTheSame(void) ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( ptr, (void *)0xdeadbeef ); - todo_wine ok( status == STATUS_CONFLICTING_ADDRESSES || status == STATUS_INVALID_ADDRESS, "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( ptr, NULL ); - todo_wine ok( status == STATUS_INVALID_ADDRESS, "NtAreMappedFilesTheSame returned %x\n", status ); - status = pNtAreMappedFilesTheSame( ptr, (void *)0x10000 ); - todo_wine + status = pNtAreMappedFilesTheSame( ptr, (void *)GetProcessHeap() ); ok( status == STATUS_CONFLICTING_ADDRESSES, "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( NULL, NULL ); - todo_wine ok( status == STATUS_INVALID_ADDRESS, "NtAreMappedFilesTheSame returned %x\n", status ); ptr2 = VirtualAlloc( NULL, 0x10000, MEM_COMMIT, PAGE_READWRITE ); ok( ptr2 != NULL, "VirtualAlloc error %u\n", GetLastError() ); status = pNtAreMappedFilesTheSame( ptr, ptr2 ); - todo_wine ok( status == STATUS_CONFLICTING_ADDRESSES, "NtAreMappedFilesTheSame returned %x\n", status ); VirtualFree( ptr2, 0, MEM_RELEASE ); @@ -933,11 +928,9 @@ static void test_NtAreMappedFilesTheSame(void) ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( GetModuleHandleA("kernel32.dll"), GetModuleHandleA("kernel32.dll") ); - todo_wine ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( GetModuleHandleA("kernel32.dll"), (char *)GetModuleHandleA("kernel32.dll") + 4096 ); - todo_wine ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); GetSystemDirectoryA( path, MAX_PATH ); @@ -961,6 +954,19 @@ static void test_NtAreMappedFilesTheSame(void) status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); todo_wine ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); + + file2 = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + ok( file2 != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + map2 = CreateFileMappingA( file2, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL ); + ok( map2 != 0, "CreateFileMapping error %u\n", GetLastError() ); + ptr2 = MapViewOfFile( map2, FILE_MAP_READ, 0, 0, 0 ); + ok( ptr2 != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); + status = pNtAreMappedFilesTheSame( ptr, ptr2 ); + ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); + UnmapViewOfFile( ptr2 ); + CloseHandle( map2 ); + CloseHandle( file2 ); + UnmapViewOfFile( ptr ); CloseHandle( mapping ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3ab3eb3..a1faabf 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1013,6 +1013,26 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /*********************************************************************** + * stat_mapping_file + * + * Stat the underlying file for a memory view. + */ +static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) +{ + NTSTATUS status; + int unix_fd, needs_close; + + if (!view->mapping) return STATUS_NOT_MAPPED_VIEW; + if (!(status = server_get_unix_fd( view->mapping, 0, &unix_fd, &needs_close, NULL, NULL ))) + { + if (fstat( unix_fd, st ) == -1) status = FILE_GetNtStatus(); + if (needs_close) close( unix_fd ); + } + return status; +} + + +/*********************************************************************** * map_image * * Map an executable (PE format) image into memory. @@ -2780,7 +2800,32 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *bu */ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) { + struct file_view *view1, *view2; + struct stat st1, st2; + NTSTATUS status; + sigset_t sigset; + TRACE("%p %p\n", addr1, addr2); - return STATUS_NOT_SAME_DEVICE; + server_enter_uninterrupted_section( &csVirtual, &sigset ); + + view1 = VIRTUAL_FindView( addr1, 0 ); + view2 = VIRTUAL_FindView( addr2, 0 ); + + if (!view1 || !view2) + status = STATUS_INVALID_ADDRESS; + else if ((view1->protect & VPROT_VALLOC) || (view2->protect & VPROT_VALLOC)) + status = STATUS_CONFLICTING_ADDRESSES; + else if (!(view1->protect & VPROT_IMAGE) || !(view2->protect & VPROT_IMAGE)) + status = STATUS_NOT_SAME_DEVICE; + else if (view1 == view2) + status = STATUS_SUCCESS; + else if (!stat_mapping_file( view1, &st1 ) && !stat_mapping_file( view2, &st2 ) && + st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) + status = STATUS_SUCCESS; + else + status = STATUS_NOT_SAME_DEVICE; + + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return status; }

1 0

Henri Verbeet : wined3d: Allow FBO blits again between surfaces with fixups if they have the same format .
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: ca381b610c50e3a44713f536ced61e30e0e4f152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca381b610c50e3a44713f536c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 19 11:59:59 2010 +0200 wined3d: Allow FBO blits again between surfaces with fixups if they have the same format. For some reason f1ca14cb5ba259b8eab9bccbb9a4813027c3beb8 disabled this. --- dlls/wined3d/surface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7bc2a5d..b51fecd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4979,10 +4979,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ && ((dst_format->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; - if (!is_identity_fixup(src_format->color_fixup) - || !is_identity_fixup(dst_format->color_fixup)) - return FALSE; - if (!(src_format->id == dst_format->id || (is_identity_fixup(src_format->color_fixup) && is_identity_fixup(dst_format->color_fixup))))

1 0

Henri Verbeet : wined3d: Always pass a valid rectangle to surface_get_blt_info().
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 8a96a8cc1fc16d7fd554f6bc7e2ec2b9aa819e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a96a8cc1fc16d7fd554f6bc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 19 12:00:00 2010 +0200 wined3d: Always pass a valid rectangle to surface_get_blt_info(). --- dlls/wined3d/surface.c | 53 +++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b51fecd..fe46665 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -149,22 +149,11 @@ static inline void cube_coords_float(const RECT *r, UINT w, UINT h, struct float f->b = ((r->bottom * 2.0f) / h) - 1.0f; } -static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, GLsizei h, struct blt_info *info) +static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLsizei h, struct blt_info *info) { GLfloat (*coords)[3] = info->coords; - RECT rect; struct float_rect f; - if (rect_in) - rect = *rect_in; - else - { - rect.left = 0; - rect.top = h; - rect.right = w; - rect.bottom = 0; - } - switch (target) { default: @@ -174,20 +163,20 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, info->binding = GL_TEXTURE_BINDING_2D; info->bind_target = GL_TEXTURE_2D; info->tex_type = tex_2d; - coords[0][0] = (float)rect.left / w; - coords[0][1] = (float)rect.top / h; + coords[0][0] = (float)rect->left / w; + coords[0][1] = (float)rect->top / h; coords[0][2] = 0.0f; - coords[1][0] = (float)rect.right / w; - coords[1][1] = (float)rect.top / h; + coords[1][0] = (float)rect->right / w; + coords[1][1] = (float)rect->top / h; coords[1][2] = 0.0f; - coords[2][0] = (float)rect.left / w; - coords[2][1] = (float)rect.bottom / h; + coords[2][0] = (float)rect->left / w; + coords[2][1] = (float)rect->bottom / h; coords[2][2] = 0.0f; - coords[3][0] = (float)rect.right / w; - coords[3][1] = (float)rect.bottom / h; + coords[3][0] = (float)rect->right / w; + coords[3][1] = (float)rect->bottom / h; coords[3][2] = 0.0f; break; @@ -195,17 +184,17 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, info->binding = GL_TEXTURE_BINDING_RECTANGLE_ARB; info->bind_target = GL_TEXTURE_RECTANGLE_ARB; info->tex_type = tex_rect; - coords[0][0] = rect.left; coords[0][1] = rect.top; coords[0][2] = 0.0f; - coords[1][0] = rect.right; coords[1][1] = rect.top; coords[1][2] = 0.0f; - coords[2][0] = rect.left; coords[2][1] = rect.bottom; coords[2][2] = 0.0f; - coords[3][0] = rect.right; coords[3][1] = rect.bottom; coords[3][2] = 0.0f; + coords[0][0] = rect->left; coords[0][1] = rect->top; coords[0][2] = 0.0f; + coords[1][0] = rect->right; coords[1][1] = rect->top; coords[1][2] = 0.0f; + coords[2][0] = rect->left; coords[2][1] = rect->bottom; coords[2][2] = 0.0f; + coords[3][0] = rect->right; coords[3][1] = rect->bottom; coords[3][2] = 0.0f; break; case GL_TEXTURE_CUBE_MAP_POSITIVE_X: info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = tex_cube; - cube_coords_float(&rect, w, h, &f); + cube_coords_float(rect, w, h, &f); coords[0][0] = 1.0f; coords[0][1] = -f.t; coords[0][2] = -f.l; coords[1][0] = 1.0f; coords[1][1] = -f.t; coords[1][2] = -f.r; @@ -217,7 +206,7 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = tex_cube; - cube_coords_float(&rect, w, h, &f); + cube_coords_float(rect, w, h, &f); coords[0][0] = -1.0f; coords[0][1] = -f.t; coords[0][2] = f.l; coords[1][0] = -1.0f; coords[1][1] = -f.t; coords[1][2] = f.r; @@ -229,7 +218,7 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = tex_cube; - cube_coords_float(&rect, w, h, &f); + cube_coords_float(rect, w, h, &f); coords[0][0] = f.l; coords[0][1] = 1.0f; coords[0][2] = f.t; coords[1][0] = f.r; coords[1][1] = 1.0f; coords[1][2] = f.t; @@ -241,7 +230,7 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = tex_cube; - cube_coords_float(&rect, w, h, &f); + cube_coords_float(rect, w, h, &f); coords[0][0] = f.l; coords[0][1] = -1.0f; coords[0][2] = -f.t; coords[1][0] = f.r; coords[1][1] = -1.0f; coords[1][2] = -f.t; @@ -253,7 +242,7 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = tex_cube; - cube_coords_float(&rect, w, h, &f); + cube_coords_float(rect, w, h, &f); coords[0][0] = f.l; coords[0][1] = -f.t; coords[0][2] = 1.0f; coords[1][0] = f.r; coords[1][1] = -f.t; coords[1][2] = 1.0f; @@ -265,7 +254,7 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = tex_cube; - cube_coords_float(&rect, w, h, &f); + cube_coords_float(rect, w, h, &f); coords[0][0] = -f.l; coords[0][1] = -f.t; coords[0][2] = -1.0f; coords[1][0] = -f.r; coords[1][1] = -f.t; coords[1][2] = -1.0f; @@ -4070,6 +4059,7 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl GLint compare_mode = GL_NONE; struct blt_info info; GLint old_binding = 0; + RECT rect; glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_VIEWPORT_BIT); @@ -4084,7 +4074,8 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glViewport(0, 0, w, h); - surface_get_blt_info(target, NULL, w, h, &info); + SetRect(&rect, 0, h, w, 0); + surface_get_blt_info(target, &rect, w, h, &info); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); glGetIntegerv(info.binding, &old_binding); glBindTexture(info.bind_target, texture);

1 0

Henri Verbeet : wined3d: Properly flip in surface_blt_to_drawable().
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 1237e8065eefd3f001db84b62db356c01a9438f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1237e8065eefd3f001db84b62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 19 12:00:01 2010 +0200 wined3d: Properly flip in surface_blt_to_drawable(). We want to flip the coordinate system, not just the rectangle. --- dlls/wined3d/surface.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fe46665..6ebffbe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4336,16 +4336,12 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT context = context_acquire(device, This); context_apply_blit_state(context, device); + + dst_rect = src_rect; if (context->render_offscreen) { - dst_rect.left = src_rect.left; - dst_rect.right = src_rect.right; - dst_rect.top = src_rect.bottom; - dst_rect.bottom = src_rect.top; - } - else - { - dst_rect = src_rect; + dst_rect.top = This->currentDesc.Height - dst_rect.top; + dst_rect.bottom = This->currentDesc.Height - dst_rect.bottom; } swapchain = This->container.type == WINED3D_CONTAINER_SWAPCHAIN ? This->container.u.swapchain : NULL;

1 0

Henri Verbeet : wined3d: Remove a FIXME in context_apply_blit_state().
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 53f2765445fc6b5bfcf7415bac33bcc6be60deb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f2765445fc6b5bfcf7415ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 19 12:00:02 2010 +0200 wined3d: Remove a FIXME in context_apply_blit_state(). There are some legitimate cases for this codepath, for example when blitting to a render target with fixups or a color key. --- dlls/wined3d/context.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6f9d9d7..00b6031 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2065,7 +2065,6 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp if (context->render_offscreen) { - FIXME("Applying blit state for an offscreen target with ORM_FBO. This should be avoided.\n"); surface_internal_preload(context->current_rt, SRGB_RGB); ENTER_GL();

1 0

Piotr Caban : jscript: Improved error handling in VBArray functions.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 185ef44d008b2541c09653d7b461d8eb435a4b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185ef44d008b2541c09653d7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 19 13:52:21 2010 +0200 jscript: Improved error handling in VBArray functions. --- dlls/jscript/jscript.h | 6 ++++++ dlls/jscript/vbarray.c | 26 +++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 70b3765..a14c2b4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -377,6 +377,12 @@ static inline DOUBLE num_val(const VARIANT *v) return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); } +static inline void num_set_int(VARIANT *v, INT i) +{ + V_VT(v) = VT_I4; + V_I4(v) = i; +} + static inline void num_set_val(VARIANT *v, DOUBLE d) { if(d == (DOUBLE)(INT)d) { diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index db56f81..8bdeb70 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -56,7 +56,7 @@ static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); if(retv) - num_set_val(retv, SafeArrayGetDim(vbarray->safearray)); + num_set_int(retv, SafeArrayGetDim(vbarray->safearray)); return S_OK; } @@ -79,6 +79,9 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DI return throw_range_error(ctx, ei, IDS_SUBSCRIPT_OUT_OF_RANGE, NULL); indexes = heap_alloc(sizeof(int)*size); + if(!indexes) + return E_OUTOFMEMORY; + for(i=0; i<size; i++) { hres = to_int32(ctx, get_arg(dp, i), ei, indexes+i); if(FAILED(hres)) { @@ -127,7 +130,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DIS return hres; if(retv) - num_set_val(retv, dim); + num_set_int(retv, dim); return S_OK; } @@ -206,7 +209,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DIS return hres; if(retv) - num_set_val(retv, dim); + num_set_int(retv, dim); return S_OK; } @@ -286,8 +289,8 @@ static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags if(arg_cnt(dp)<1 || V_VT((arg = get_arg(dp, 0)))!=(VT_ARRAY|VT_VARIANT)) return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); - VariantCopy(retv, arg); - break; + hres = VariantCopy(retv, arg); + return hres; case DISPATCH_CONSTRUCT: if(arg_cnt(dp)<1 || V_VT((arg = get_arg(dp, 0)))!=(VT_ARRAY|VT_VARIANT)) @@ -296,7 +299,12 @@ static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags hres = alloc_vbarray(ctx, NULL, &vbarray); if(FAILED(hres)) return hres; - SafeArrayCopy(V_ARRAY(arg), &vbarray->safearray); + + hres = SafeArrayCopy(V_ARRAY(arg), &vbarray->safearray); + if(FAILED(hres)) { + jsdisp_release(&vbarray->dispex); + return hres; + } var_set_jsdisp(retv, &vbarray->dispex); break; @@ -335,7 +343,11 @@ HRESULT create_vbarray(script_ctx_t *ctx, SAFEARRAY *sa, jsdisp_t **ret) if(FAILED(hres)) return hres; - SafeArrayCopy(sa, &vbarray->safearray); + hres = SafeArrayCopy(sa, &vbarray->safearray); + if(FAILED(hres)) { + jsdisp_release(&vbarray->dispex); + return hres; + } *ret = &vbarray->dispex; return S_OK;

1 0