November 2011 - Wine-commits

Matteo Bruni : ddraw: Reorder formats in EnumTextureFormats.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: ca83e14aba73a2dfa6410331229fb155ba53c78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca83e14aba73a2dfa64103312… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 23 01:31:41 2011 +0100 ddraw: Reorder formats in EnumTextureFormats. --- dlls/ddraw/device.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c33ddbb..e678e90 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1059,17 +1059,15 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, static const enum wined3d_format_id FormatList[] = { - /* 32 bit */ - WINED3DFMT_B8G8R8A8_UNORM, - WINED3DFMT_B8G8R8X8_UNORM, - /* 24 bit */ - WINED3DFMT_B8G8R8_UNORM, - /* 16 Bit */ + /* 16 bit */ + WINED3DFMT_B5G5R5X1_UNORM, WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B4G4R4A4_UNORM, WINED3DFMT_B5G6R5_UNORM, - WINED3DFMT_B5G5R5X1_UNORM, - /* 8 Bit */ + /* 32 bit */ + WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B8G8R8A8_UNORM, + /* 8 bit */ WINED3DFMT_B2G3R3_UNORM, WINED3DFMT_P8_UINT, /* FOURCC codes */ @@ -1211,17 +1209,15 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, static const enum wined3d_format_id FormatList[] = { - /* 32 bit */ - WINED3DFMT_B8G8R8A8_UNORM, - WINED3DFMT_B8G8R8X8_UNORM, - /* 24 bit */ - WINED3DFMT_B8G8R8_UNORM, - /* 16 Bit */ + /* 16 bit */ + WINED3DFMT_B5G5R5X1_UNORM, WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B4G4R4A4_UNORM, WINED3DFMT_B5G6R5_UNORM, - WINED3DFMT_B5G5R5X1_UNORM, - /* 8 Bit */ + /* 32 bit */ + WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B8G8R8A8_UNORM, + /* 8 bit */ WINED3DFMT_B2G3R3_UNORM, WINED3DFMT_P8_UINT, /* FOURCC codes - Not in this version*/

1 0

Henri Verbeet : wined3d: Remove the special case for loop and rep in shader_get_registers_used().
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: a8504f4f57fe44a2a368e85fed11f4ecd143d29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8504f4f57fe44a2a368e85fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 08:51:41 2011 +0100 wined3d: Remove the special case for loop and rep in shader_get_registers_used(). SM4 loops don't have control parameters. --- dlls/wined3d/shader.c | 37 ++++++++++--------------------------- 1 files changed, 10 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d7ba818..11be333 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -595,33 +595,6 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st list_add_head(&shader->constantsB, &lconst->entry); reg_maps->local_bool_consts |= (1 << dst.reg.idx); } - /* If there's a loop in the shader. */ - else if (ins.handler_idx == WINED3DSIH_LOOP - || ins.handler_idx == WINED3DSIH_REP) - { - struct wined3d_shader_src_param src, rel_addr; - - fe->shader_read_src_param(fe_data, &ptr, &src, &rel_addr); - - /* Rep and Loop always use an integer constant for the control parameters. */ - if (ins.handler_idx == WINED3DSIH_REP) - { - reg_maps->integer_constants |= 1 << src.reg.idx; - } - else - { - fe->shader_read_src_param(fe_data, &ptr, &src, &rel_addr); - reg_maps->integer_constants |= 1 << src.reg.idx; - } - - cur_loop_depth++; - if (cur_loop_depth > max_loop_depth) max_loop_depth = cur_loop_depth; - } - else if (ins.handler_idx == WINED3DSIH_ENDLOOP - || ins.handler_idx == WINED3DSIH_ENDREP) - { - cur_loop_depth--; - } /* For subroutine prototypes. */ else if (ins.handler_idx == WINED3DSIH_LABEL) { @@ -795,6 +768,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_IFC) reg_maps->usesifc = 1; else if (ins.handler_idx == WINED3DSIH_CALL) reg_maps->usescall = 1; else if (ins.handler_idx == WINED3DSIH_POW) reg_maps->usespow = 1; + else if (ins.handler_idx == WINED3DSIH_LOOP + || ins.handler_idx == WINED3DSIH_REP) + { + ++cur_loop_depth; + if (cur_loop_depth > max_loop_depth) + max_loop_depth = cur_loop_depth; + } + else if (ins.handler_idx == WINED3DSIH_ENDLOOP + || ins.handler_idx == WINED3DSIH_ENDREP) + --cur_loop_depth; limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i)

1 0

Henri Verbeet : wined3d: Don' t return a surface for a NULL dc in wined3d_device_get_surface_from_dc().
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 08e8b0a70a13b8914155f95c8d21163d91eb2a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e8b0a70a13b8914155f95c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 08:51:42 2011 +0100 wined3d: Don't return a surface for a NULL dc in wined3d_device_get_surface_from_dc(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e70841..db849a4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5871,6 +5871,9 @@ HRESULT CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *de TRACE("device %p, dc %p, surface %p.\n", device, dc, surface); + if (!dc) + return WINED3DERR_INVALIDCALL; + LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) { if (resource->resourceType == WINED3DRTYPE_SURFACE)

1 0

Alexandre Julliard : user32: Don' t allow activating a WS_CHILD top-level window through SetFocus.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 9687ceaf1df1f61159b03966d2d3f796b80b7406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9687ceaf1df1f61159b03966d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 21:39:37 2011 +0100 user32: Don't allow activating a WS_CHILD top-level window through SetFocus. --- dlls/user32/focus.c | 6 +++++- dlls/user32/tests/win.c | 27 +++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 70a2a8a..81169db 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -266,7 +266,11 @@ HWND WINAPI SetFocus( HWND hwnd ) LONG style = GetWindowLongW( hwndTop, GWL_STYLE ); if (style & (WS_MINIMIZE | WS_DISABLED)) return 0; parent = GetAncestor( hwndTop, GA_PARENT ); - if (!parent || parent == GetDesktopWindow()) break; + if (!parent || parent == GetDesktopWindow()) + { + if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return 0; + break; + } if (parent == get_hwnd_message_parent()) return 0; hwndTop = parent; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 804d452..a090389 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2513,7 +2513,7 @@ static LRESULT WINAPI set_focus_on_activate_proc(HWND hwnd, UINT msg, WPARAM wp, static void test_SetFocus(HWND hwnd) { - HWND child, child2; + HWND child, child2, ret; WNDPROC old_wnd_proc; /* check if we can set focus to non-visible windows */ @@ -2588,9 +2588,32 @@ todo_wine ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); todo_wine ok( GetFocus() == child, "Focus should be on child %p, not %p\n", child, GetFocus() ); - SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc); + SetFocus( hwnd ); + SetParent( child, GetDesktopWindow()); + SetParent( child2, child ); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); + ok( GetFocus() == hwnd, "Focus should be on parent %p\n", hwnd ); + ret = SetFocus( child2 ); + ok( ret == 0, "SetFocus %p should fail\n", child2); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); + ok( GetFocus() == hwnd, "Focus should be on parent %p\n", hwnd ); + ret = SetFocus( child ); + ok( ret == 0, "SetFocus %p should fail\n", child); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); + ok( GetFocus() == hwnd, "Focus should be on parent %p\n", hwnd ); + SetWindowLongW( child, GWL_STYLE, WS_POPUP|WS_CHILD ); + SetFocus( child2 ); + ok( GetActiveWindow() == child, "child window %p should be active\n", child); + ok( GetFocus() == child2, "Focus should be on child2 %p\n", child2 ); + SetFocus( hwnd ); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); + ok( GetFocus() == hwnd, "Focus should be on parent %p\n", hwnd ); + SetFocus( child ); + ok( GetActiveWindow() == child, "child window %p should be active\n", child); + ok( GetFocus() == child, "Focus should be on child %p\n", child ); + DestroyWindow( child2 ); DestroyWindow( child ); }

1 0

Nikolay Sivov : msxml3: Fixed ISupportErrorInfo for IXMLDOMNamedNodeMap.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: c2976f2d5faa77b2bcf8eda762c022862500ad95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2976f2d5faa77b2bcf8eda76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 23:02:54 2011 +0300 msxml3: Fixed ISupportErrorInfo for IXMLDOMNamedNodeMap. --- dlls/msxml3/nodemap.c | 7 +++-- dlls/msxml3/tests/domdoc.c | 55 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index d8cc8f3..c075ac6 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -308,7 +308,7 @@ static HRESULT WINAPI support_error_QueryInterface( REFIID riid, void** ppvObject ) { xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); return IXMLDOMNamedNodeMap_QueryInterface(&This->IXMLDOMNamedNodeMap_iface, riid, ppvObject); } @@ -330,8 +330,9 @@ static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) { - FIXME("(%p)->(%s)\n", iface, debugstr_guid(riid)); - return S_FALSE; + xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); + TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); + return IsEqualGUID(riid, &IID_IXMLDOMNamedNodeMap) ? S_OK : S_FALSE; } static const struct ISupportErrorInfoVtbl support_error_vtbl = diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8757886..0e36ae7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2815,14 +2815,6 @@ static void test_domnode( void ) if (map) { - ISupportErrorInfo *support_error; - r = IXMLDOMNamedNodeMap_QueryInterface( map, &IID_ISupportErrorInfo, (void**)&support_error ); - ok( r == S_OK, "ret %08x\n", r ); - - r = ISupportErrorInfo_InterfaceSupportsErrorInfo( support_error, &IID_IXMLDOMNamedNodeMap ); - todo_wine EXPECT_HR(r, S_OK); - ISupportErrorInfo_Release( support_error ); - str = SysAllocString( szdl ); r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_OK, "getNamedItem returned wrong code\n"); @@ -10733,10 +10725,14 @@ static const supporterror_t supporterror_test[] = { static void test_supporterrorinfo(void) { - static REFIID iids[4] = { &IID_IXMLDOMDocument, &IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3 }; + static REFIID iids[5] = { &IID_IXMLDOMNode, &IID_IXMLDOMDocument, + &IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3 }; const supporterror_t *ptr = supporterror_test; ISupportErrorInfo *errorinfo, *info2; + IXMLDOMNamedNodeMap *map, *map2; IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL b; IUnknown *unk; REFIID *iid; void *dummy; @@ -10794,8 +10790,13 @@ static void test_supporterrorinfo(void) hr = IXMLDOMDocument_createNode(doc, type, _bstr_(ptr->name), NULL, &node); ok(hr == S_OK, "%d: got 0x%08x\n", ptr->type, hr); + EXPECT_REF(node, 1); hr = IXMLDOMNode_QueryInterface(node, &IID_ISupportErrorInfo, (void**)&errorinfo); ok(hr == S_OK, "%d: got 0x%08x\n", ptr->type, hr); + EXPECT_REF(node, 1); + + hr = ISupportErrorInfo_QueryInterface(errorinfo, &IID_IXMLDOMNode, &dummy); + ok(hr == E_NOINTERFACE, "%d: got 0x%08x\n", ptr->type, hr); iid = ptr->iids; @@ -10817,6 +10818,42 @@ static void test_supporterrorinfo(void) ptr++; } + /* IXMLDOMNamedNodeMap */ + b = VARIANT_FALSE; + hr = IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_attributes(elem, &map); + EXPECT_HR(hr, S_OK); + + EXPECT_REF(map, 1); + hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_ISupportErrorInfo, (void**)&errorinfo); + EXPECT_HR(hr, S_OK); + EXPECT_REF(map, 2); + + hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, &IID_IXMLDOMNamedNodeMap); + EXPECT_HR(hr, S_OK); + + hr = ISupportErrorInfo_QueryInterface(errorinfo, &IID_IXMLDOMNamedNodeMap, (void**)&map2); + EXPECT_HR(hr, S_OK); + ok(map == map2, "got %p\n", map2); + IXMLDOMNamedNodeMap_Release(map2); + + EXPECT_REF(errorinfo, 2); + hr = ISupportErrorInfo_QueryInterface(errorinfo, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + EXPECT_REF(errorinfo, 3); + EXPECT_REF(map, 3); + IUnknown_Release(unk); + + ISupportErrorInfo_Release(errorinfo); + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Frédéric Delanoy : msvcrt: Avoid hardcoding array lengths.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 520a92de339fd555670fb38109df1b3e9ed78c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520a92de339fd555670fb3810… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 22 23:00:37 2011 +0100 msvcrt: Avoid hardcoding array lengths. --- dlls/msvcrt/dir.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 01f63ec..28f5314 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -273,7 +273,7 @@ int CDECL MSVCRT__wchdir(const MSVCRT_wchar_t * newdir) */ int CDECL MSVCRT__chdrive(int newdrive) { - WCHAR buffer[3] = {'A', ':', 0}; + WCHAR buffer[] = {'A', ':', 0}; buffer[0] += newdrive - 1; if (!SetCurrentDirectoryW( buffer )) @@ -801,7 +801,7 @@ char* CDECL MSVCRT__getdcwd(int drive, char * buf, int size) else { char dir[MAX_PATH]; - char drivespec[4] = {'A', ':', 0}; + char drivespec[] = {'A', ':', 0}; int dir_len; drivespec[0] += drive - 1; @@ -886,7 +886,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wgetdcwd(int drive, MSVCRT_wchar_t * buf, int size */ unsigned int CDECL MSVCRT__getdiskfree(unsigned int disk, struct MSVCRT__diskfree_t * d) { - WCHAR drivespec[4] = {'@', ':', '\\', 0}; + WCHAR drivespec[] = {'@', ':', '\\', 0}; DWORD ret[4]; unsigned int err;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.33
by Jeremy Newman 23 Nov '11

23 Nov '11

Module: website Branch: master Commit: 45dd20b32543ddbf20779c419367b2260ca09f09 URL: http://source.winehq.org/git/website.git/?a=commit;h=45dd20b32543ddbf20779c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Nov 22 18:56:31 2011 +0100 Polish translation for release 1.3.33 --- news/pl/2011111801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011111801.xml b/news/pl/2011111801.xml new file mode 100644 index 0000000..7b789a4 --- /dev/null +++ b/news/pl/2011111801.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 18, 2011</date> +<title>Wydano Wine 1.3.33</title> +<body> + Wydanie rozwojowe Wine 1.3.33 jest już dostępne. + <a href="{$root}/announce/1.3.33">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wyjścia tekstowego w silniku DIB.</li> + <li>Ulepszona obsługa dla pośredników sieciowych HTTP.</li> + <li>Nowa wersja silnika Gecko.</li> + <li>Kilka poprawek dla kursora.</li> + <li>Pewne poprawki w dwukierunkowym układzie tekstu.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.33.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : shlwapi: Convert dialogs to po files.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 3d818c3aa83b614a9ef7a6ddb974ee2e39d31feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d818c3aa83b614a9ef7a6ddb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:20:10 2011 +0100 shlwapi: Convert dialogs to po files. --- dlls/shlwapi/Makefile.in | 30 +--------------------- dlls/shlwapi/shlwapi.rc | 14 ++++++++++ dlls/shlwapi/shlwapi_Da.rc | 37 -------------------------- dlls/shlwapi/shlwapi_De.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_En.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Eo.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Es.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Fi.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Fr.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_He.rc | 41 ----------------------------- dlls/shlwapi/shlwapi_Hu.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_It.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Ja.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Ko.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Lt.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Nl.rc | 37 -------------------------- dlls/shlwapi/shlwapi_No.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Pl.rc | 38 --------------------------- dlls/shlwapi/shlwapi_Pt.rc | 41 ----------------------------- dlls/shlwapi/shlwapi_Ro.rc | 38 --------------------------- dlls/shlwapi/shlwapi_Ru.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Si.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Sk.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Sr.rc | 56 ---------------------------------------- dlls/shlwapi/shlwapi_Sv.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Tr.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Uk.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Zh.rc | 56 ---------------------------------------- po/ar.po | 51 +++++++++++++++++++++++------------- po/bg.po | 52 +++++++++++++++++++++++------------- po/ca.po | 52 +++++++++++++++++++++++------------- po/cs.po | 52 +++++++++++++++++++++++------------- po/da.po | 51 +++++++++++++++++++++++------------- po/de.po | 51 +++++++++++++++++++++++------------- po/el.po | 52 +++++++++++++++++++++++------------- po/en.po | 51 +++++++++++++++++++++++------------- po/en_US.po | 51 +++++++++++++++++++++++------------- po/eo.po | 51 +++++++++++++++++++++++------------- po/es.po | 51 +++++++++++++++++++++++------------- po/fa.po | 51 +++++++++++++++++++++++------------- po/fi.po | 51 +++++++++++++++++++++++------------- po/fr.po | 51 +++++++++++++++++++++++------------- po/he.po | 51 +++++++++++++++++++++++------------- po/hi.po | 51 +++++++++++++++++++++++------------- po/hu.po | 51 +++++++++++++++++++++++------------- po/it.po | 51 +++++++++++++++++++++++------------- po/ja.po | 51 +++++++++++++++++++++++------------- po/ko.po | 51 +++++++++++++++++++++++------------- po/lt.po | 51 +++++++++++++++++++++++------------- po/ml.po | 51 +++++++++++++++++++++++------------- po/nb_NO.po | 51 +++++++++++++++++++++++------------- po/nl.po | 51 +++++++++++++++++++++++------------- po/or.po | 51 +++++++++++++++++++++++------------- po/pa.po | 51 +++++++++++++++++++++++------------- po/pl.po | 51 +++++++++++++++++++++++------------- po/pt_BR.po | 51 +++++++++++++++++++++++------------- po/pt_PT.po | 51 +++++++++++++++++++++++------------- po/rm.po | 51 +++++++++++++++++++++++------------- po/ro.po | 51 +++++++++++++++++++++++------------- po/ru.po | 51 +++++++++++++++++++++++------------- po/sk.po | 51 +++++++++++++++++++++++------------- po/sl.po | 51 +++++++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 51 +++++++++++++++++++++++------------- po/sr_RS(a)latin.po | 51 +++++++++++++++++++++++------------- po/sv.po | 51 +++++++++++++++++++++++------------- po/te.po | 51 +++++++++++++++++++++++------------- po/th.po | 52 +++++++++++++++++++++++------------- po/tr.po | 51 +++++++++++++++++++++++------------- po/uk.po | 51 +++++++++++++++++++++++------------- po/wa.po | 51 +++++++++++++++++++++++------------- po/wine.pot | 51 +++++++++++++++++++++++------------- po/zh_CN.po | 51 +++++++++++++++++++++++------------- po/zh_TW.po | 61 ++++++++++++++++++++++++++----------------- 73 files changed, 1465 insertions(+), 1925 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d818c3aa83b614a9ef7a…

1 0

Jacek Caban : jscript: Added tests of unary '+' on not existent property.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: dcca57fd87d84bef6f71a809d771d73c3719711f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcca57fd87d84bef6f71a809d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:31:29 2011 +0100 jscript: Added tests of unary '+' on not existent property. --- dlls/jscript/tests/lang.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7cd20dd..c85907c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -216,6 +216,10 @@ tmp = new Object(); ok((~tmp.nonexistent) === -1, "!tmp.nonexistent = " + ~tmp.nonexistent); ok(!("nonexistent" in tmp), "nonexistent is in tmp after '~' expression") +tmp = new Object(); +ok(isNaN(tmp.nonexistent), "!tmp.nonexistent = " + (+tmp.nonexistent)); +ok(!("nonexistent" in tmp), "nonexistent is in tmp after '+' expression") + tmp = 0; if(true) tmp = 1;

1 0

Jacek Caban : jscript: Use bytecode for '+' expression implementation.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: b1b0aadaab522d8ca97c31e3ac4483d65d167594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b0aadaab522d8ca97c31e3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:31:44 2011 +0100 jscript: Use bytecode for '+' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 16 ++++++++++++---- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1bc887c..1e496a8 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -107,6 +107,8 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_ADD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_EQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1f5863a..cbfde6d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2213,13 +2213,21 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.1 */ -HRESULT add_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_add(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT *l, *r, ret; + HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); + + TRACE("%s + %s\n", debugstr_variant(l), debugstr_variant(r)); + + hres = add_eval(ctx->parser->script, l, r, &ctx->ei, &ret); + if(FAILED(hres)) + return hres; - return binary_expr_eval(ctx, expr, add_eval, ei, ret); + return stack_push(ctx, &ret); } /* ECMA-262 3rd Edition 11.6.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c004af3..829274d 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -42,6 +42,7 @@ typedef struct _func_stack { } func_stack_t; #define OP_LIST \ + X(add, 1, 0) \ X(bneg, 1, 0) \ X(eq2, 1, 0) \ X(neg, 1, 0) \ @@ -529,7 +530,6 @@ HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT in_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT add_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 92c79fc..98813b4 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1313,7 +1313,7 @@ static const expression_eval_t expression_eval_table[] = { binary_and_expression_eval, instanceof_expression_eval, in_expression_eval, - add_expression_eval, + compiled_expression_eval, sub_expression_eval, mul_expression_eval, div_expression_eval,

1 0