January 2010 - Wine-commits

Andrew Nguyen : ntdll/tests: Remove useless ifdef statements.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 83dbc3d46a86b1f93db3d924ade72bb1c6537b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83dbc3d46a86b1f93db3d924a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:46:39 2010 -0600 ntdll/tests: Remove useless ifdef statements. --- dlls/ntdll/tests/time.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 2e9adbc..cecf4a2 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -20,8 +20,6 @@ #include "ntdll_test.h" -#ifdef __WINE_WINTERNL_H - #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 #define SECSPERDAY 86400 @@ -95,15 +93,12 @@ static void test_pRtlTimeToTimeFields(void) litime.QuadPart += (LONGLONG) tftest.Day * TICKSPERSEC * SECSPERDAY; } } -#endif START_TEST(time) { -#ifdef __WINE_WINTERNL_H HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); -#endif }

1 0

Andrew Nguyen : ntdll/tests: Report skip when time conversion functions are not available.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: bffdda5ab20ce96e59ec5fae54592f097eca4bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffdda5ab20ce96e59ec5fae5… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:46:44 2010 -0600 ntdll/tests: Report skip when time conversion functions are not available. --- dlls/ntdll/tests/time.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index cecf4a2..16530c4 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -101,4 +101,6 @@ START_TEST(time) pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); + else + win_skip("Required time conversion functions are not available\n"); }

1 0

Nikolay Sivov : msxml3/tests: Fix interface leak and message typo.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: e6edbc451de81f1258cb27d3f113971bbbe7aedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6edbc451de81f1258cb27d3f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:44:19 2010 +0300 msxml3/tests: Fix interface leak and message typo. --- dlls/msxml3/tests/domdoc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 87ad9b5..49ffe1d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -509,8 +509,8 @@ static char *list_to_string(IXMLDOMNodeList *list) return buf; } -#define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, exptected %s\n", str, expstr); } -#define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, exptected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); } +#define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, expected %s\n", str, expstr); } +#define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, expected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); } static void test_domdoc( void ) { @@ -1071,6 +1071,7 @@ static void test_domnode( void ) r = IXMLDOMNode_get_ownerDocument( element, &owner ); ok( r == S_OK, "get_ownerDocument return code\n"); ok( owner != doc, "get_ownerDocument return\n"); + IXMLDOMDocument_Release(owner); type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( element, &type);

1 0

Piotr Caban : jscript: Added implementation of Array.reverse.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 6f61893685b466357f264a367503cee183f39352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f61893685b466357f264a367… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:17:30 2010 +0100 jscript: Added implementation of Array.reverse. --- dlls/jscript/array.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 26 ++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 873ab6e..bb54493 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -469,8 +469,41 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *jsthis; + DWORD length, k, l; + VARIANT v1, v2; + HRESULT hres1, hres2; + + TRACE("\n"); + + hres1 = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres1)) + return hres1; + + for(k=0; k<length/2; k++) { + l = length-k-1; + + hres1 = jsdisp_propget_idx(jsthis, k, &v1, ei, sp); + hres2 = jsdisp_propget_idx(jsthis, l, &v2, ei, sp); + + if(hres1 == DISP_E_UNKNOWNNAME) + jsdisp_delete_idx(jsthis, l); + else + jsdisp_propput_idx(jsthis, l, &v1, ei, sp); + + if(hres2 == DISP_E_UNKNOWNNAME) + jsdisp_delete_idx(jsthis, k); + else + jsdisp_propput_idx(jsthis, k, &v2, ei, sp); + } + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(jsthis); + IDispatch_AddRef(V_DISPATCH(retv)); + } + + return S_OK; } /* ECMA-262 3rd Edition 15.4.4.9 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7ad2984..69deab2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -688,6 +688,31 @@ ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.v ok(arr === arr.valueOf(), "arr !== arr.valueOf"); arr = [1,2,3]; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr.toString() === "3,2,1", "arr.toString() = " + arr.toString()); + +arr = []; +arr[3] = 5; +arr[5] = 1; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 6, "arr.length = " + arr.length); +ok(arr.toString() === "1,,5,,,", "arr.toString() = " + arr.toString()); + +arr = new Object(); +arr.length = 3; +arr[0] = "aa"; +arr[2] = 2; +arr[7] = 3; +arr.reverse = Array.prototype.reverse; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr[0] === 2 && arr[1] === undefined && arr[2] === "aa", "unexpected array"); + +arr = [1,2,3]; tmp = arr.unshift(0); ok(tmp === (invokeVersion < 2 ? undefined : 4), "[1,2,3].unshift(0) returned " +tmp); ok(arr.length === 4, "arr.length = " + arr.length); @@ -1854,6 +1879,7 @@ testArrayHostThis("shift"); testArrayHostThis("slice"); testArrayHostThis("splice"); testArrayHostThis("unshift"); +testArrayHostThis("reverse"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Piotr Caban : shlwapi: Fix MLBuildResURLW implementation.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 147ea8b7c6fb6621fdb4e171d756a9e715262d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=147ea8b7c6fb6621fdb4e171d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:18:55 2010 +0100 shlwapi: Fix MLBuildResURLW implementation. --- dlls/shlwapi/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f8a5162..544b529 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2384,7 +2384,7 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, dwResLen = strlenW(lpszRes) + 1; if (dwDestLen >= dwResLen + 1) { - lpszDest[szResLen + dwPathLen + dwResLen] = '/'; + lpszDest[szResLen + dwPathLen-1] = '/'; memcpy(lpszDest + szResLen + dwPathLen, lpszRes, dwResLen * sizeof(WCHAR)); hRet = S_OK; }

1 0

Piotr Caban : jscript: Make Array.join generic.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: db137cc975cd05451f5235ebe948fc640204be84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db137cc975cd05451f5235ebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:17:50 2010 +0100 jscript: Make Array.join generic. --- dlls/jscript/array.c | 16 +++++++--------- dlls/jscript/tests/api.js | 11 +++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index bb54493..5acfa01 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -342,20 +342,18 @@ static HRESULT array_join(script_ctx_t *ctx, DispatchEx *array, DWORD length, co } /* ECMA-262 3rd Edition 15.4.4.5 */ -static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, +static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { + DispatchEx *jsthis; DWORD length; HRESULT hres; TRACE("\n"); - if(is_vclass(jsthis, JSCLASS_ARRAY)) { - length = array_from_vdisp(jsthis)->length; - }else { - FIXME("dispid is not Array\n"); - return E_NOTIMPL; - } + hres = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres)) + return hres; if(arg_cnt(dp)) { BSTR sep; @@ -364,11 +362,11 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA if(FAILED(hres)) return hres; - hres = array_join(ctx, jsthis->u.jsdisp, length, sep, retv, ei, caller); + hres = array_join(ctx, jsthis, length, sep, retv, ei, caller); SysFreeString(sep); }else { - hres = array_join(ctx, jsthis->u.jsdisp, length, default_separatorW, retv, ei, caller); + hres = array_join(ctx, jsthis, length, default_separatorW, retv, ei, caller); } return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 69deab2..40193a7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -654,6 +654,16 @@ ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +arr = new Object(); +arr.length = 3; +arr[0] = "aa"; +arr[2] = 2; +arr[7] = 3; +arr.join = Array.prototype.join; +tmp = arr.join(","); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(tmp === "aa,,2", "tmp = " + tmp); + arr = [5,true,2,-1,3,false,"2.5"]; tmp = arr.sort(function(x,y) { return y-x; }); ok(tmp === arr, "tmp !== arr"); @@ -1880,6 +1890,7 @@ testArrayHostThis("slice"); testArrayHostThis("splice"); testArrayHostThis("unshift"); testArrayHostThis("reverse"); +testArrayHostThis("join"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Paul Vriens : user32/tests: Run tests again on Win95.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 5da7043c521ad0fe44dfd0ef09c6034e25b93cb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da7043c521ad0fe44dfd0ef0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 15 09:31:28 2010 +0100 user32/tests: Run tests again on Win95. --- dlls/user32/tests/win.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 34ff9d0..7bf498e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -52,6 +52,7 @@ static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); +static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -2707,12 +2708,15 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, case WM_CAPTURECHANGED: /* now try to release capture from menu. this should fail */ - memset(&gti, 0, sizeof(GUITHREADINFO)); - gti.cbSize = sizeof(GUITHREADINFO); - status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); - ok(status, "GetGUIThreadInfo() failed!\n"); + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } cap_wnd = GetCapture(); - ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); @@ -2727,11 +2731,14 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, ok(!status, "ReleaseCapture should have failed!\n"); /* check that thread info did not change */ - memset(&gti, 0, sizeof(GUITHREADINFO)); - gti.cbSize = sizeof(GUITHREADINFO); - status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); - ok(status, "GetGUIThreadInfo() failed!\n"); - ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } /* verify that no capture change took place */ cap_wnd2 = GetCapture(); @@ -2755,6 +2762,10 @@ static void test_capture_4(void) HWND hwnd; WNDCLASSA wclass; HINSTANCE hInstance = GetModuleHandleA( NULL ); + + if (!pGetGUIThreadInfo) + win_skip("GetGUIThreadInfo is not available\n"); + wclass.lpszClassName = "TestCapture4Class"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = test_capture_4_proc; @@ -5881,6 +5892,7 @@ START_TEST(win) pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); + pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); if (!RegisterWindowClasses()) assert(0);

1 0

Christian Costa : msvcr71: Add forward to msvcrt for ?swprintf@@ YAHPAGIPBGZZ and ?vswprintf@@YAHPAGIPBGPAD@Z.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 6c9cd6cb402e48a94375503dc5528dfdf748963f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9cd6cb402e48a94375503dc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:34:52 2010 +0100 msvcr71: Add forward to msvcrt for ?swprintf@@YAHPAGIPBGZZ and ?vswprintf@@YAHPAGIPBGPAD(a)Z. --- dlls/msvcr71/msvcr71.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 2a35217..d4323b3 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -42,11 +42,11 @@ @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ(a)Z @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ(a)Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ(a)Z -@ stub ?swprintf@@YAHPAGIPBGZZ +@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf @ stub ?swprintf@@YAHPA_WIPB_WZZ @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ -@ stub ?vswprintf@@YAHPAGIPBGPAD(a)Z +@ cdecl ?vswprintf@@YAHPAGIPBGPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf @ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z @ cdecl -i386 ?what(a)exception@@UBEPBDXZ() msvcrt.?what(a)exception@@UBEPBDXZ @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMViewport.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: ef527d81eb12ac7d743d28db2607fd041cf56bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef527d81eb12ac7d743d28db2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:36:54 2010 +0100 d3drm: Add definitions for IDirect3DRMViewport. --- include/d3drmdef.h | 16 ++++++ include/d3drmobj.h | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef527d81eb12ac7d743d2…

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMViewport2.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 3246b65ce549f94003d76dd4cb2b7b411594bec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3246b65ce549f94003d76dd4c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:37:00 2010 +0100 d3drm: Add definitions for IDirect3DRMViewport2. --- include/d3drmobj.h | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3246b65ce549f94003d76…

1 0