October 2010 - Wine-Commits

André Hentschel : German translation of the base themes
by Jeremy Newman Oct. 18, 2010

Oct. 18, 2010

Module: website Branch: master Commit: 08f7655e992c4863d198c137132beb4d5935fd8c URL: http://source.winehq.org/git/website.git/?a=commit;h=08f7655e992c4863d198c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 18 19:01:15 2010 +0200 German translation of the base themes --- templates/de/global/themes/winehq/content.template | 82 ++++++++++++++++++++ .../de/global/themes/winehq/content_nobox.template | 78 +++++++++++++++++++ 2 files changed, 160 insertions(+), 0 deletions(-) diff --git a/templates/de/global/themes/winehq/content.template b/templates/de/global/themes/winehq/content.template new file mode 100644 index 0000000..66f7647 --- /dev/null +++ b/templates/de/global/themes/winehq/content.template @@ -0,0 +1,82 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>{$page_title}</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> + <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"> + <meta name="description" content="Open Source Software zum ausführen von Windows-Anwendungen unter anderen Betriebssystemen."> + <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> + <meta name="robots" content="index, follow"> + <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org Alle Rechte vorbehalten."> + <meta name="language" content="German"> + <meta name="revisit-after" content="1"> + <link rel="stylesheet" href="{$root}/styles.css" type="text/css" media="screen"> + <script language="JavaScript" type="text/javascript"> + var web_root="{$root}"; + </script> + <script language="JavaScript" src="{$root}/jquery.js" type="text/javascript"></script> + <script language="JavaScript" src="{$root}/utils.js" type="text/javascript"></script> + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + {$rss_link} +</head> +<body> + + +<div id="logo_glass" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass_sm.png" alt=""></a></div> +<div id="logo_text" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> + + +<div id="logo_blurb">{$page_blurb}</div> + + +<div id="search_box"> + <form action="{$root}/search/" id="cse-search-box" style="margin: 0; padding: 0;"> + <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> + <input type="hidden" name="cof" value="FORID:10"> + <input type="hidden" name="ie" value="UTF-8"> + <span style="color: #ffffff;">Suche:</span> <input type="text" name="q" size="20"> + </form> + <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang={$langCod…"></script> +</div> + + +<div id="tabs" class="pos"> + <ul> + <li class="s"><a href="{$base_url}">WineHQ</a></li> + <li><a href="http://wiki.winehq.org/">Wiki</a></li> + <li><a href="http://appdb.winehq.org/">AppDB</a></li> + <li><a href="http://bugs.winehq.org/">Bugzilla</a></li> + <li><a href="http://forums.winehq.org/">Forum</a></li> + </ul> +</div> + +<div id="main_content"> + <div class="rbox"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 35px 20px 10px 80px"> +  + + +{$page_body} + + +  + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> +</div> + +<div id="footer"> + Hosted By + <a href="http://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" + title="CodeWeavers - Führt Windows-Anwendungen und -Spiele unter Linux und Mac aus"></a> +</div> + + +{$debug_log} + + +</body> +</html> diff --git a/templates/de/global/themes/winehq/content_nobox.template b/templates/de/global/themes/winehq/content_nobox.template new file mode 100644 index 0000000..b112bf9 --- /dev/null +++ b/templates/de/global/themes/winehq/content_nobox.template @@ -0,0 +1,78 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> +<html> +<head> + <title>{$page_title}</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> + <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"> + <meta name="description" content="Open Source Software zum ausführen von Windows-Anwendungen unter anderen Betriebssystemen."> + <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> + <meta name="robots" content="index, follow"> + <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org Alle Rechte vorbehalten."> + <meta name="language" content="German"> + <meta name="revisit-after" content="1"> + <link rel="stylesheet" href="{$root}/styles.css" type="text/css" media="screen"> + <script language="JavaScript" type="text/javascript"> + var web_root="{$root}"; + </script> + <script language="JavaScript" src="{$root}/jquery.js" type="text/javascript"></script> + <script language="JavaScript" src="{$root}/utils.js" type="text/javascript"></script> + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + {$rss_link} +</head> +<body> + + +<div id="logo_glass_big" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> +<div id="logo_text" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> + + +<div id="logo_blurb">{$page_blurb}</div> + + +<div id="search_box"> + <form action="{$root}/search/" id="cse-search-box" style="margin: 0; padding: 0;"> + <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> + <input type="hidden" name="cof" value="FORID:10"> + <input type="hidden" name="ie" value="UTF-8"> + <span style="color: #ffffff;">Suche:</span> <input type="text" name="q" size="20"> + </form> + <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang={$langCod…"></script> +</div> + + +<div id="tabs" class="pos"> + <ul> + <li class="s"><a href="{$base_url}">WineHQ</a></li> + <li><a href="http://wiki.winehq.org/">Wiki</a></li> + <li><a href="http://appdb.winehq.org/">AppDB</a></li> + <li><a href="http://bugs.winehq.org/">Bugzilla</a></li> + <li><a href="http://forums.winehq.org/">Forum</a></li> + </ul> +</div> + +<div id="main_content"> + + +{$page_body} + + +</div> + +<div id="langsel"> + {$langCur} (<a href="{$root}/lang">{$langChange}</a>) +</div> + +<div id="footer"> + Hosted By + <a href="http://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" + title="CodeWeavers - Führt Windows-Anwendungen und -Spiele unter Linux und Mac aus"></a> +</div> + + +{$debug_log} + + +</body> +</html>

1 0

Vladimir Panteleev : user32: Update last active popup for all parents.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 824c5089d2f0e7257111a65d65e8db94b113c5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=824c5089d2f0e7257111a65d6… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Sat Oct 16 20:22:58 2010 +0300 user32: Update last active popup for all parents. --- dlls/user32/tests/win.c | 23 +++++++++++++++++++++++ server/window.c | 10 +++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 12f2e1c..0acd704 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6256,6 +6256,28 @@ todo_wine ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); } +static void test_GetLastActivePopup(void) +{ + HWND hwndOwner, hwndPopup1, hwndPopup2; + + hwndOwner = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_POPUPWINDOW, + 100, 100, 200, 200, + NULL, 0, GetModuleHandle(0), NULL); + hwndPopup1 = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_POPUPWINDOW, + 100, 100, 200, 200, + hwndOwner, 0, GetModuleHandle(0), NULL); + hwndPopup2 = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_POPUPWINDOW, + 100, 100, 200, 200, + hwndPopup1, 0, GetModuleHandle(0), NULL); + ok( GetLastActivePopup(hwndOwner) == hwndPopup2, "wrong last active popup\n" ); + DestroyWindow( hwndPopup2 ); + DestroyWindow( hwndPopup1 ); + DestroyWindow( hwndOwner ); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -6329,6 +6351,7 @@ START_TEST(win) test_children_zorder(hwndMain); test_popup_zorder(hwndMain2, hwndMain, WS_POPUP); test_popup_zorder(hwndMain2, hwndMain, 0); + test_GetLastActivePopup(); test_keyboard_input(hwndMain); test_mouse_input(hwndMain); test_validatergn(hwndMain); diff --git a/server/window.c b/server/window.c index 503f37e..635dd9b 100644 --- a/server/window.c +++ b/server/window.c @@ -569,9 +569,13 @@ int make_window_active( user_handle_t window ) if (!win) return 0; - /* set last active for window and its owner */ - win->last_active = win->handle; - if ((owner = get_user_object( win->owner, USER_WINDOW ))) owner->last_active = win->handle; + /* set last active for window and its owners */ + owner = win; + while (owner) + { + owner->last_active = win->handle; + owner = get_user_object( owner->owner, USER_WINDOW ); + } return 1; }

1 0

Alexandre Julliard : kernel32/tests: Add some tests for NtAreMappedFilesTheSame.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 971e9a2239caca8af1a0a7b4fda56b7b263dc4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=971e9a2239caca8af1a0a7b4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 19:07:49 2010 +0200 kernel32/tests: Add some tests for NtAreMappedFilesTheSame. --- dlls/kernel32/tests/virtual.c | 139 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index f95fdd9..d4c4827 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -21,8 +21,11 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winerror.h" #include "wine/test.h" @@ -34,6 +37,7 @@ static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); static UINT (WINAPI *pResetWriteWatch)(LPVOID,SIZE_T); +static NTSTATUS (WINAPI *pNtAreMappedFilesTheSame)(PVOID,PVOID); /* ############################### */ @@ -832,6 +836,138 @@ static void test_NtMapViewOfSection(void) CloseHandle(hProcess); } +static void test_NtAreMappedFilesTheSame(void) +{ + static const char testfile[] = "testfile.xxx"; + HANDLE file, file2, mapping, map2; + void *ptr, *ptr2; + NTSTATUS status; + char path[MAX_PATH]; + + if (!pNtAreMappedFilesTheSame) + { + win_skip( "NtAreMappedFilesTheSame not available\n" ); + return; + } + + file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + SetFilePointer( file, 4096, NULL, FILE_BEGIN ); + SetEndOfFile( file ); + + mapping = CreateFileMappingA( file, NULL, PAGE_READWRITE, 0, 4096, NULL ); + ok( mapping != 0, "CreateFileMapping error %u\n", GetLastError() ); + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); + + file2 = CreateFileA( testfile, 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, 0, 4096, NULL ); + ok( map2 != 0, "CreateFileMapping error %u\n", GetLastError() ); + ptr2 = MapViewOfFile( map2, FILE_MAP_READ, 0, 0, 4096 ); + ok( ptr2 != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); + status = pNtAreMappedFilesTheSame( ptr, ptr2 ); + ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + UnmapViewOfFile( ptr2 ); + + ptr2 = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); + ok( ptr2 != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); + status = pNtAreMappedFilesTheSame( ptr, ptr2 ); + ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + UnmapViewOfFile( ptr2 ); + CloseHandle( map2 ); + + map2 = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 4096, NULL ); + ok( map2 != 0, "CreateFileMapping error %u\n", GetLastError() ); + ptr2 = MapViewOfFile( map2, FILE_MAP_READ, 0, 0, 4096 ); + ok( ptr2 != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); + status = pNtAreMappedFilesTheSame( ptr, ptr2 ); + ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + UnmapViewOfFile( ptr2 ); + CloseHandle( map2 ); + CloseHandle( file2 ); + + status = pNtAreMappedFilesTheSame( ptr, ptr ); + ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + + status = pNtAreMappedFilesTheSame( ptr, (char *)ptr + 30 ); + ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + + status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); + 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 + 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 ); + + UnmapViewOfFile( ptr ); + CloseHandle( mapping ); + CloseHandle( file ); + + status = pNtAreMappedFilesTheSame( GetModuleHandleA("ntdll.dll"), + GetModuleHandleA("kernel32.dll") ); + 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 ); + strcat( path, "\\kernel32.dll" ); + file = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 4096, NULL ); + ok( mapping != 0, "CreateFileMapping error %u\n", GetLastError() ); + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); + status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); + ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + UnmapViewOfFile( ptr ); + CloseHandle( mapping ); + + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL ); + ok( mapping != 0, "CreateFileMapping error %u\n", GetLastError() ); + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); + status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); + todo_wine + ok( status == STATUS_SUCCESS, "NtAreMappedFilesTheSame returned %x\n", status ); + UnmapViewOfFile( ptr ); + CloseHandle( mapping ); + + CloseHandle( file ); + DeleteFileA( testfile ); +} + static void test_CreateFileMapping(void) { HANDLE handle, handle2; @@ -1271,11 +1407,14 @@ START_TEST(virtual) pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pGetWriteWatch = (void *) GetProcAddress(hkernel32, "GetWriteWatch"); pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); + pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), + "NtAreMappedFilesTheSame" ); test_VirtualAllocEx(); test_VirtualAlloc(); test_MapViewOfFile(); test_NtMapViewOfSection(); + test_NtAreMappedFilesTheSame(); test_CreateFileMapping(); test_IsBadReadPtr(); test_IsBadWritePtr();

1 0

Piotr Caban : jscript: Added VBArray.toArray() implementation.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 29cdb21218df8c3e6d78ccd5a85ececfa9cb1876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cdb21218df8c3e6d78ccd5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:48:13 2010 +0200 jscript: Added VBArray.toArray() implementation. --- dlls/jscript/tests/api.js | 1 + dlls/jscript/vbarray.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d891fba..85bd556 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2264,5 +2264,6 @@ ok(tmp.ubound("2") == 3, "tmp.ubound(\"2\") = " + tmp.ubound("2")); 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()); reportSuccess(); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 887e19b..0366aa8 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -134,8 +134,49 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DIS static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VBArrayInstance *vbarray; + jsdisp_t *array; + VARIANT *v; + int i, size = 1, ubound, lbound; + HRESULT hres; + + TRACE("\n"); + + vbarray = vbarray_this(vthis); + if(!vbarray) + return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); + + for(i=1; i<=SafeArrayGetDim(vbarray->safearray); i++) { + SafeArrayGetLBound(vbarray->safearray, i, &lbound); + SafeArrayGetUBound(vbarray->safearray, i, &ubound); + size *= ubound-lbound+1; + } + + hres = SafeArrayAccessData(vbarray->safearray, (void**)&v); + if(FAILED(hres)) + return hres; + + hres = create_array(ctx, 0, &array); + if(FAILED(hres)) { + SafeArrayUnaccessData(vbarray->safearray); + return hres; + } + + for(i=0; i<size; i++) { + hres = jsdisp_propput_idx(array, i, v, ei, caller); + if(FAILED(hres)) { + SafeArrayUnaccessData(vbarray->safearray); + jsdisp_release(array); + return hres; + } + v++; + } + + SafeArrayUnaccessData(vbarray->safearray); + + if(retv) + var_set_jsdisp(retv, array); + return S_OK; } static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added VBArray.getItem() implementation.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 41d7f8fc4686c85a4e2aabcd1c2d91611aec34a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d7f8fc4686c85a4e2aabcd1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:47:56 2010 +0200 jscript: Added VBArray.getItem() implementation. --- dlls/jscript/tests/api.js | 5 +++++ dlls/jscript/vbarray.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 07fa59b..d891fba 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1904,6 +1904,8 @@ exception_test(function() {new VBArray(new VBArray(createArray()));}, "TypeError exception_test(function() {(new VBArray(createArray())).lbound("aaa");}, "RangeError", -2146828279); exception_test(function() {(new VBArray(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() {(new VBArray(createArray())).getItem(3);}, "RangeError", -2146828279); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number); @@ -2259,5 +2261,8 @@ ok(tmp.lbound(1) == 0, "tmp.lbound(1) = " + tmp.lbound(1)); ok(tmp.lbound(2, 1) == 2, "tmp.lbound(2, 1) = " + tmp.lbound(2, 1)); ok(tmp.ubound() == 4, "tmp.ubound() = " + tmp.ubound()); ok(tmp.ubound("2") == 3, "tmp.ubound(\"2\") = " + tmp.ubound("2")); +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)); reportSuccess(); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 2ad3db1..887e19b 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -63,8 +63,41 @@ static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VBArrayInstance *vbarray; + int i, *indexes, size; + VARIANT out; + HRESULT hres; + + TRACE("\n"); + + vbarray = vbarray_this(vthis); + if(!vbarray) + return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); + + size = arg_cnt(dp); + if(size < SafeArrayGetDim(vbarray->safearray)) + return throw_range_error(ctx, ei, IDS_SUBSCRIPT_OUT_OF_RANGE, NULL); + + indexes = heap_alloc(sizeof(int)*size); + for(i=0; i<size; i++) { + hres = to_int32(ctx, get_arg(dp, i), ei, indexes+i); + if(FAILED(hres)) { + heap_free(indexes); + return hres; + } + } + + hres = SafeArrayGetElement(vbarray->safearray, indexes, (void*)&out); + heap_free(indexes); + if(hres == DISP_E_BADINDEX) + return throw_range_error(ctx, ei, IDS_SUBSCRIPT_OUT_OF_RANGE, NULL); + else if(FAILED(hres)) + return hres; + + if(retv) + hres = VariantCopy(retv, &out); + + return hres; } static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added VBArray handling to to_object().
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 5a787b3a7f6bd9e751d1b3f48febb8ea50b74ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a787b3a7f6bd9e751d1b3f48… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:48:25 2010 +0200 jscript: Added VBArray handling to to_object(). --- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 7 +++++++ dlls/jscript/tests/api.js | 6 +++--- dlls/jscript/vbarray.c | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ab63bce..70b3765 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -243,6 +243,7 @@ HRESULT create_regexp_var(script_ctx_t*,VARIANT*,VARIANT*,jsdisp_t**); HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,jsdisp_t**); HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,jsdisp_t**); HRESULT create_number(script_ctx_t*,VARIANT*,jsdisp_t**); +HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**); typedef enum { NO_HINT, diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3024f3b..f1e1564 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -633,6 +633,13 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) *disp = to_disp(dispex); break; + case VT_ARRAY|VT_VARIANT: + hres = create_vbarray(ctx, V_ARRAY(v), &dispex); + if(FAILED(hres)) + return hres; + + *disp = to_disp(dispex); + break; default: FIXME("unsupported vt %d\n", V_VT(v)); return E_NOTIMPL; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 85bd556..1334f7e 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1901,11 +1901,11 @@ exception_test(function() {new null;}, "TypeError", -2146823281); exception_test(function() {new nullDisp;}, "TypeError", -2146827850); exception_test(function() {new VBArray();}, "TypeError", -2146823275); exception_test(function() {new VBArray(new VBArray(createArray()));}, "TypeError", -2146823275); -exception_test(function() {(new VBArray(createArray())).lbound("aaa");}, "RangeError", -2146828279); -exception_test(function() {(new VBArray(createArray())).lbound(3);}, "RangeError", -2146828279); +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() {(new VBArray(createArray())).getItem(3);}, "RangeError", -2146828279); +exception_test(function() {createArray().getItem(3);}, "RangeError", -2146828279); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 0366aa8..db56f81 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -325,3 +325,18 @@ HRESULT create_vbarray_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsd jsdisp_release(&vbarray->dispex); return hres; } + +HRESULT create_vbarray(script_ctx_t *ctx, SAFEARRAY *sa, jsdisp_t **ret) +{ + VBArrayInstance *vbarray; + HRESULT hres; + + hres = alloc_vbarray(ctx, NULL, &vbarray); + if(FAILED(hres)) + return hres; + + SafeArrayCopy(sa, &vbarray->safearray); + + *ret = &vbarray->dispex; + return S_OK; +}

1 0

Piotr Caban : jscript: Added VBArray.ubound() implementation.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 2aa7e3c6147ad53ab7edd8be160bfddf95af82b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa7e3c6147ad53ab7edd8be1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:47:37 2010 +0200 jscript: Added VBArray.ubound() implementation. --- dlls/jscript/tests/api.js | 2 ++ dlls/jscript/vbarray.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a6c0c5a..72ed4ea 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2256,5 +2256,7 @@ tmp = new VBArray(VBArray(createArray())); ok(tmp.lbound() == 0, "tmp.lbound() = " + tmp.lbound()); ok(tmp.lbound(1) == 0, "tmp.lbound(1) = " + tmp.lbound(1)); ok(tmp.lbound(2, 1) == 2, "tmp.lbound(2, 1) = " + tmp.lbound(2, 1)); +ok(tmp.ubound() == 4, "tmp.ubound() = " + tmp.ubound()); +ok(tmp.ubound("2") == 3, "tmp.ubound(\"2\") = " + tmp.ubound("2")); reportSuccess(); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 12bb7c0..1257d56 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -99,8 +99,32 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DI static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VBArrayInstance *vbarray; + int dim; + HRESULT hres; + + TRACE("\n"); + + vbarray = vbarray_this(vthis); + if(!vbarray) + return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); + + if(arg_cnt(dp)) { + hres = to_int32(ctx, get_arg(dp, 0), ei, &dim); + if(FAILED(hres)) + return hres; + } else + dim = 1; + + hres = SafeArrayGetUBound(vbarray->safearray, dim, &dim); + if(hres == DISP_E_BADINDEX) + return throw_range_error(ctx, ei, IDS_SUBSCRIPT_OUT_OF_RANGE, NULL); + else if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, dim); + return S_OK; } static HRESULT VBArray_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added VBArray.dimensions() implementation.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 2f4607887fee4284cf7cfaf061ea51fa4522e51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4607887fee4284cf7cfaf06… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:47:46 2010 +0200 jscript: Added VBArray.dimensions() implementation. --- dlls/jscript/tests/api.js | 1 + dlls/jscript/vbarray.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 72ed4ea..07fa59b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2253,6 +2253,7 @@ ok(String.length == 1, "String.length = " + String.length); var tmp = new VBArray(createArray()); tmp = new VBArray(VBArray(createArray())); +ok(tmp.dimensions() == 2, "tmp.dimensions() = " + tmp.dimensions()); ok(tmp.lbound() == 0, "tmp.lbound() = " + tmp.lbound()); ok(tmp.lbound(1) == 0, "tmp.lbound(1) = " + tmp.lbound(1)); ok(tmp.lbound(2, 1) == 2, "tmp.lbound(2, 1) = " + tmp.lbound(2, 1)); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 1257d56..2ad3db1 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -47,8 +47,17 @@ static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis) static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VBArrayInstance *vbarray; + + TRACE("\n"); + + vbarray = vbarray_this(vthis); + if(!vbarray) + return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); + + if(retv) + num_set_val(retv, SafeArrayGetDim(vbarray->safearray)); + return S_OK; } static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added VBArray stub.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 705ce33a6eafb8beb4ab9de5879967af32369707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705ce33a6eafb8beb4ab9de58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:46:59 2010 +0200 jscript: Added VBArray stub. --- dlls/jscript/Makefile.in | 3 +- dlls/jscript/global.c | 11 ++- dlls/jscript/jscript.h | 5 +- dlls/jscript/object.c | 2 +- dlls/jscript/tests/api.js | 8 ++ dlls/jscript/vbarray.c | 160 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 183 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 76eabc1..07fc1be 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -41,7 +41,8 @@ C_SRCS = \ number.c \ object.c \ regexp.c \ - string.c + string.c \ + vbarray.c IDL_TLB_SRCS = jsglobal.idl diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 8655d8a..81aee50 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -248,8 +248,9 @@ static HRESULT JSGlobal_ActiveXObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD f static HRESULT JSGlobal_VBArray(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return constructor_call(ctx->vbarray_constr, flags, dp, retv, ei, sp); } static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -1039,7 +1040,7 @@ static const builtin_prop_t JSGlobal_props[] = { {SyntaxErrorW, JSGlobal_SyntaxError, PROPF_CONSTR|1}, {TypeErrorW, JSGlobal_TypeError, PROPF_CONSTR|1}, {URIErrorW, JSGlobal_URIError, PROPF_CONSTR|1}, - {VBArrayW, JSGlobal_VBArray, PROPF_METHOD|1}, + {VBArrayW, JSGlobal_VBArray, PROPF_CONSTR|1}, {decodeURIW, JSGlobal_decodeURI, PROPF_METHOD|1}, {decodeURIComponentW, JSGlobal_decodeURIComponent, PROPF_METHOD|1}, {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD|1}, @@ -1106,6 +1107,10 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = create_vbarray_constr(ctx, object_prototype, &ctx->vbarray_constr); + if(FAILED(hres)) + return hres; + return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index e9318e5..ab63bce 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -84,7 +84,8 @@ typedef enum { JSCLASS_OBJECT, JSCLASS_REGEXP, JSCLASS_STRING, - JSCLASS_ARGUMENTS + JSCLASS_ARGUMENTS, + JSCLASS_VBARRAY } jsclass_t; jsdisp_t *iface_to_jsdisp(IUnknown*); @@ -304,6 +305,7 @@ struct _script_ctx_t { jsdisp_t *object_constr; jsdisp_t *regexp_constr; jsdisp_t *string_constr; + jsdisp_t *vbarray_constr; }; void script_release(script_ctx_t*); @@ -326,6 +328,7 @@ HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**); HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**); HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**); HRESULT create_string_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**); +HRESULT create_vbarray_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**); IUnknown *create_ax_site(script_ctx_t*); diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index bbb0372..eb1d435 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -52,7 +52,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ static const WCHAR *names[] = {objectW, arrayW, booleanW, dateW, errorW, - functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW}; + functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW}; TRACE("\n"); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 956ea55..f792968 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2194,6 +2194,14 @@ testFunctions(Function.prototype, [ ["toString", 0] ]); +testFunctions(VBArray.prototype, [ + ["dimensions", 0], + ["getItem", 1], + ["lbound", 0], + ["toArray", 0], + ["ubound", 0] + ]); + ok(ActiveXObject.length == 1, "ActiveXObject.length = " + ActiveXObject.length); ok(Array.length == 1, "Array.length = " + Array.length); ok(Boolean.length == 1, "Boolean.length = " + Boolean.length); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c new file mode 100644 index 0000000..27ec533 --- /dev/null +++ b/dlls/jscript/vbarray.c @@ -0,0 +1,160 @@ +/* + * Copyright 2010 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + jsdisp_t dispex; + + SAFEARRAY *safearray; +} VBArrayInstance; + +static const WCHAR dimensionsW[] = {'d','i','m','e','n','s','i','o','n','s',0}; +static const WCHAR getItemW[] = {'g','e','t','I','t','e','m',0}; +static const WCHAR lboundW[] = {'l','b','o','u','n','d',0}; +static const WCHAR toArrayW[] = {'t','o','A','r','r','a','y',0}; +static const WCHAR uboundW[] = {'u','b','o','u','n','d',0}; + +static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT VBArray_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + + switch(flags) { + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static void VBArray_destructor(jsdisp_t *dispex) +{ + heap_free(dispex); +} + +static const builtin_prop_t VBArray_props[] = { + {dimensionsW, VBArray_dimensions, PROPF_METHOD}, + {getItemW, VBArray_getItem, PROPF_METHOD|1}, + {lboundW, VBArray_lbound, PROPF_METHOD}, + {toArrayW, VBArray_toArray, PROPF_METHOD}, + {uboundW, VBArray_ubound, PROPF_METHOD} +}; + +static const builtin_info_t VBArray_info = { + JSCLASS_VBARRAY, + {NULL, VBArray_value, 0}, + sizeof(VBArray_props)/sizeof(*VBArray_props), + VBArray_props, + VBArray_destructor, + NULL +}; + +static HRESULT alloc_vbarray(script_ctx_t *ctx, jsdisp_t *object_prototype, VBArrayInstance **ret) +{ + VBArrayInstance *vbarray; + HRESULT hres; + + vbarray = heap_alloc_zero(sizeof(VBArrayInstance)); + if(!vbarray) + return E_OUTOFMEMORY; + + if(object_prototype) + hres = init_dispex(&vbarray->dispex, ctx, &VBArray_info, object_prototype); + else + hres = init_dispex_from_constr(&vbarray->dispex, ctx, &VBArray_info, ctx->vbarray_constr); + + if(FAILED(hres)) { + heap_free(vbarray); + return hres; + } + + *ret = vbarray; + return S_OK; +} + +static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + + switch(flags) { + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +HRESULT create_vbarray_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) +{ + VBArrayInstance *vbarray; + HRESULT hres; + + static const WCHAR VBArrayW[] = {'V','B','A','r','r','a','y',0}; + + hres = alloc_vbarray(ctx, object_prototype, &vbarray); + if(FAILED(hres)) + return hres; + + hres = create_builtin_function(ctx, VBArrayConstr_value, VBArrayW, NULL, PROPF_CONSTR|1, &vbarray->dispex, ret); + + jsdisp_release(&vbarray->dispex); + return hres; +}

1 0

Piotr Caban : jscript: Implement VBArray constructor.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 17fc64157c2c7288243d54f629f2284696360607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fc64157c2c7288243d54f62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:47:15 2010 +0200 jscript: Implement VBArray constructor. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 7 +++++++ dlls/jscript/tests/run.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/jscript/vbarray.c | 40 ++++++++++++++++++++++++++++++++++++++-- 5 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index b8c7ad1..7906637 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -40,6 +40,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Illegal assignment" IDS_UNDEFINED "'|' is undefined" IDS_NOT_BOOL "Boolean object expected" + IDS_NOT_VBARRAY "VBArray object expected" IDS_JSCRIPT_EXPECTED "JScript object expected" IDS_REGEXP_SYNTAX_ERROR "Syntax error in regular expression" IDS_URI_INVALID_CHAR "URI to be encoded contains invalid characters" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 074bdcd..76f45e2 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -36,6 +36,7 @@ #define IDS_ILLEGAL_ASSIGN 0x1390 #define IDS_UNDEFINED 0x1391 #define IDS_NOT_BOOL 0x1392 +#define IDS_NOT_VBARRAY 0x1395 #define IDS_JSCRIPT_EXPECTED 0x1396 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_URI_INVALID_CHAR 0x13A0 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f792968..16572ad 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -149,6 +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()); ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String"); @@ -1897,6 +1899,8 @@ exception_test(function() {"test" in nullDisp;}, "TypeError", -2146823281); exception_test(function() {new 3;}, "TypeError", -2146827843); exception_test(function() {new null;}, "TypeError", -2146823281); exception_test(function() {new nullDisp;}, "TypeError", -2146827850); +exception_test(function() {new VBArray();}, "TypeError", -2146823275); +exception_test(function() {new VBArray(new VBArray(createArray()));}, "TypeError", -2146823275); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number); @@ -2244,4 +2248,7 @@ ok(unescape.length == 1, "unescape.length = " + unescape.length); String.length = 3; ok(String.length == 1, "String.length = " + String.length); +var tmp = new VBArray(createArray()); +tmp = new VBArray(VBArray(createArray())); + reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index de4d872..9bca966 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -83,6 +83,7 @@ DEFINE_EXPECT(ActiveScriptSite_OnScriptError); #define DISPID_GLOBAL_TESTTHIS 0x1009 #define DISPID_GLOBAL_TESTTHIS2 0x100a #define DISPID_GLOBAL_INVOKEVERSION 0x100b +#define DISPID_TEST_CREATEARRAY 0x100c #define DISPID_TESTOBJ_PROP 0x2000 @@ -356,6 +357,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_INVOKEVERSION; return S_OK; } + if(!strcmp_wa(bstrName, "createArray")) { + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_TEST_CREATEARRAY; + return S_OK; + } if(strict_dispid_check) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); @@ -570,6 +576,41 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_TEST_CREATEARRAY: { + SAFEARRAYBOUND bound[2]; + VARIANT *data; + int i,j; + + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + bound[0].lLbound = 0; + bound[0].cElements = 5; + bound[1].lLbound = 2; + bound[1].cElements = 2; + + V_VT(pvarRes) = VT_ARRAY|VT_VARIANT; + V_ARRAY(pvarRes) = SafeArrayCreate(VT_VARIANT, 2, bound); + + SafeArrayAccessData(V_ARRAY(pvarRes), (void**)&data); + for(i=0; i<5; i++) { + for(j=2; j<4; j++) { + V_VT(data) = VT_I4; + V_I4(data) = i*10+j; + data++; + } + } + SafeArrayUnaccessData(V_ARRAY(pvarRes)); + + return S_OK; + } } ok(0, "unexpected call %x\n", id); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 27ec533..e7388a9 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -34,6 +34,16 @@ static const WCHAR lboundW[] = {'l','b','o','u','n','d',0}; static const WCHAR toArrayW[] = {'t','o','A','r','r','a','y',0}; static const WCHAR uboundW[] = {'u','b','o','u','n','d',0}; +static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp) +{ + return (VBArrayInstance*)vdisp->u.jsdisp; +} + +static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis) +{ + return is_vclass(jsthis, JSCLASS_VBARRAY) ? vbarray_from_vdisp(jsthis) : NULL; +} + static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -85,7 +95,10 @@ static HRESULT VBArray_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS static void VBArray_destructor(jsdisp_t *dispex) { - heap_free(dispex); + VBArrayInstance *vbarray = (VBArrayInstance*)dispex; + + SafeArrayDestroy(vbarray->safearray); + heap_free(vbarray); } static const builtin_prop_t VBArray_props[] = { @@ -131,9 +144,32 @@ static HRESULT alloc_vbarray(script_ctx_t *ctx, jsdisp_t *object_prototype, VBAr static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); + VARIANT *arg; + VBArrayInstance *vbarray; + HRESULT hres; + + TRACE("\n"); switch(flags) { + case DISPATCH_METHOD: + 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; + + case DISPATCH_CONSTRUCT: + 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); + + hres = alloc_vbarray(ctx, NULL, &vbarray); + if(FAILED(hres)) + return hres; + SafeArrayCopy(V_ARRAY(arg), &vbarray->safearray); + + var_set_jsdisp(retv, &vbarray->dispex); + break; + default: FIXME("unimplemented flags: %x\n", flags); return E_NOTIMPL;

1 0