July 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Added _newEnum() support for IXMLDOMNamedNodeMap.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 1625dae7e3bc5de76e0445b3e5f91e33ad78f4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1625dae7e3bc5de76e0445b3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 3 10:06:59 2012 +0400 msxml3: Added _newEnum() support for IXMLDOMNamedNodeMap. --- dlls/msxml3/nodemap.c | 32 +++++++++++-- dlls/msxml3/tests/domdoc.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 6fac505..c6be169 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -typedef struct _xmlnodemap +typedef struct { DispatchEx dispex; IXMLDOMNamedNodeMap IXMLDOMNamedNodeMap_iface; @@ -53,10 +53,22 @@ typedef struct _xmlnodemap xmlNodePtr node; LONG iterator; + IEnumVARIANT *enumvariant; const struct nodemap_funcs *funcs; } xmlnodemap; +static HRESULT nodemap_get_item(IUnknown *iface, LONG index, VARIANT *item) +{ + V_VT(item) = VT_DISPATCH; + return IXMLDOMNamedNodeMap_get_item((IXMLDOMNamedNodeMap*)iface, index, (IXMLDOMNode**)&V_DISPATCH(item)); +} + +static const struct enumvariant_funcs nodemap_enumvariant = { + nodemap_get_item, + NULL +}; + static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) { return CONTAINING_RECORD(iface, xmlnodemap, IXMLDOMNamedNodeMap_iface); @@ -80,6 +92,16 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( { *ppvObject = iface; } + else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) + { + if (!This->enumvariant) + { + HRESULT hr = create_enumvariant((IUnknown*)iface, FALSE, &nodemap_enumvariant, &This->enumvariant); + if (FAILED(hr)) return hr; + } + + return IEnumVARIANT_QueryInterface(This->enumvariant, &IID_IEnumVARIANT, ppvObject); + } else if (dispex_query_interface(&This->dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; @@ -119,6 +141,7 @@ static ULONG WINAPI xmlnodemap_Release( if ( ref == 0 ) { xmldoc_release( This->node->doc ); + if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); release_dispex(&This->dispex); heap_free( This ); } @@ -275,11 +298,11 @@ static HRESULT WINAPI xmlnodemap_reset( static HRESULT WINAPI xmlnodemap__newEnum( IXMLDOMNamedNodeMap *iface, - IUnknown** ppUnk) + IUnknown** enumv) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - FIXME("(%p)->(%p)\n", This, ppUnk); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, enumv); + return create_enumvariant((IUnknown*)iface, TRUE, &nodemap_enumvariant, (IEnumVARIANT**)enumv); } static const struct IXMLDOMNamedNodeMapVtbl XMLDOMNamedNodeMapVtbl = @@ -423,6 +446,7 @@ IXMLDOMNamedNodeMap *create_nodemap(xmlNodePtr node, const struct nodemap_funcs This->node = node; This->ref = 1; This->iterator = 0; + This->enumvariant = NULL; This->funcs = funcs; init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMNamedNodeMap_iface, &xmlnodemap_dispex); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4b68e74..9919f4e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1749,6 +1749,11 @@ static const char default_ns_doc[] = { " d=\"d attr\" />" }; +static const char attributes_map[] = { + "<?xml version=\"1.0\"?>" + "<a attr1=\"value1\" attr2=\"value2\" attr3=\"value3\" attr4=\"value4\" />" +}; + static const WCHAR nonexistent_fileW[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -12176,6 +12181,114 @@ static void test_putref_schemas(void) IXMLDOMDocument2_Release(doc); } +static void test_namedmap_newenum(void) +{ + IEnumVARIANT *enum1, *enum2, *enum3; + IXMLDOMNamedNodeMap *map; + IUnknown *unk1, *unk2; + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + IXMLDOMNode *node; + VARIANT_BOOL b; + HRESULT hr; + VARIANT v; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(attributes_map), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_attributes(elem, &map); + EXPECT_HR(hr, S_OK); + IXMLDOMElement_Release(elem); + + enum1 = NULL; + EXPECT_REF(map, 1); + hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IEnumVARIANT, (void**)&enum1); + EXPECT_HR(hr, S_OK); + ok(enum1 != NULL, "got %p\n", enum1); + EXPECT_REF(map, 1); + EXPECT_REF(enum1, 2); + + enum2 = NULL; + hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IEnumVARIANT, (void**)&enum2); + EXPECT_HR(hr, S_OK); + ok(enum2 == enum1, "got %p\n", enum2); + + IEnumVARIANT_Release(enum2); + + EXPECT_REF(map, 1); + hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(map, 2); + EXPECT_REF(enum2, 1); + ok(enum2 != enum1, "got %p, %p\n", enum2, enum1); + + IEnumVARIANT_Release(enum1); + + /* enumerator created with _newEnum() doesn't share IUnknown* with main object */ + hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(map, 3); + EXPECT_REF(enum2, 2); + ok(unk1 != unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum3); + EXPECT_HR(hr, S_OK); + ok(enum2 != enum3, "got %p, %p\n", enum2, enum3); + IEnumVARIANT_Release(enum3); + + /* iteration tests */ + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + hr = IXMLDOMNamedNodeMap_nextNode(map, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + V_VT(&v) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum2, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr1")), "got node name %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + VariantClear(&v); + + hr = IXMLDOMNamedNodeMap_nextNode(map, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr2")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + IEnumVARIANT_Release(enum2); + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12256,6 +12369,7 @@ START_TEST(domdoc) test_get_namespaces(); test_put_data(); test_putref_schemas(); + test_namedmap_newenum(); test_xsltemplate();

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 6333fa753a196c14acc18c42c1a32b601d5eca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6333fa753a196c14acc18c42c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 3 09:13:55 2012 +0200 Assorted spelling fixes. --- dlls/dinput/device.c | 6 +++--- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/locale.c | 4 ++-- dlls/wbemprox/query.c | 2 +- dlls/ws2_32/socket.c | 2 +- programs/wineconsole/curses.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f5b7b4b..bf5fd1b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -605,7 +605,7 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, for (i=0; i < lpdiaf->dwNumActions; i++) { - /* Don't touch an user configured action */ + /* Don't touch a user configured action */ if (lpdiaf->rgoAction[i].dwHow == DIAH_USERCONFIG) continue; if ((lpdiaf->rgoAction[i].dwSemantic & devMask) == devMask) @@ -619,7 +619,7 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; - /* Assure that the object exists */ + /* Make sure the object exists */ odf = dataformat_to_odf_by_type(df, inst, type); if (odf != NULL) @@ -632,7 +632,7 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, } else if (!(dwFlags & DIDBAM_PRESERVE)) { - /* we must clear action data belonging to other devices */ + /* We must clear action data belonging to other devices */ memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a39d065..c5ecf9e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2494,7 +2494,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) } } - FIXME("buffer is to small\n"); + FIXME("buffer is too small\n"); return EOF; } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c8d4aca..d3b0262 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5530,7 +5530,7 @@ num_get* num_get_char_use_facet(const locale *loc) /* Copies number to dest buffer, validates grouping and skips separators. * Updates first so it points past the number, all digits are skipped. * Returns how exponent needs to changed. - * Size of dest buffer is not specified, assuming it's not smaller then 32: + * Size of dest buffer is not specified, assuming it's not smaller than 32: * strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte) */ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first, @@ -5685,7 +5685,7 @@ int __cdecl num_get_char__Getffldx(const num_get *this, char *dest, istreambuf_i /* Copies number to dest buffer, validates grouping and skips separators. * Updates first so it points past the number, all digits are skipped. * Returns number base (8, 10 or 16). - * Size of dest buffer is not specified, assuming it's not smaller then 25: + * Size of dest buffer is not specified, assuming it's not smaller than 25: * 22(8^22>2^64)+1(detect overflows)+1(sign)+1(nullbyte) = 25 */ int __cdecl num_get_char__Getifld(const num_get *this, char *dest, istreambuf_iterator_char *first, diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 2a7c088..798fda3 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -63,7 +63,7 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_STRING: return sizeof(WCHAR *); default: - ERR("unkown column type %u\n", table->columns[column].type & COL_TYPE_MASK); + ERR("unknown column type %u\n", table->columns[column].type & COL_TYPE_MASK); break; } return sizeof(INT32); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 51016b7..212733b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5605,7 +5605,7 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size memset(p_to, 0, size); /* Use the memory in the same way winsock does. - * First set the pointer for aliases, second set the pointers for addressess. + * First set the pointer for aliases, second set the pointers for addresses. * Third fill the addresses indexes, fourth jump aliases names size. * Fifth fill the hostname. * NOTE: This method is valid for OS version's >= XP. diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 4461c73..4c75a6f 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -670,7 +670,7 @@ static unsigned WCCURSES_FillMouse(INPUT_RECORD* ir) WINE_TRACE("[%u]: (%d, %d) %08lx\n", mevt.id, mevt.x, mevt.y, (unsigned long)mevt.bstate); - /* macros to ease mapping ncurse button numbering to windows' one */ + /* macros to ease mapping ncurses button numbering to windows' one */ #define BTN1_BIT FROM_LEFT_1ST_BUTTON_PRESSED #define BTN2_BIT RIGHTMOST_BUTTON_PRESSED #define BTN3_BIT FROM_LEFT_2ND_BUTTON_PRESSED

1 0

Francois Gouget : dssenh/tests: Add a trailing '\n' to a skip() call.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 91e16801546a83c85df2652a9d52b3dc8c24e51d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e16801546a83c85df2652a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 3 09:14:26 2012 +0200 dssenh/tests: Add a trailing '\n' to a skip() call. --- dlls/dssenh/tests/dssenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b77dd23..332b865 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -74,7 +74,7 @@ static void test_acquire_context(void) &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); if(!result) { - skip("DSS csp is currently not available, skipping tests."); + skip("DSS csp is currently not available, skipping tests.\n"); return; } ok(result, "Expected no errors.\n");

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 691b9b644320cd5fc66e26f4f7bccefc2ee8612c URL: http://source.winehq.org/git/wine.git/?a=commit;h=691b9b644320cd5fc66e26f4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 3 09:15:12 2012 +0200 d3dx9_36/tests: Add a trailing '\n' to ok() calls. --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4952c24..018081c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2458,7 +2458,7 @@ static void test_D3DXSHScale(void) for (order = 0; order < 10; order++) { received_array = D3DXSHScale(b, order, a, 5.0f); - ok(received_array == b, "Expected %p, received %p", b, received_array); + ok(received_array == b, "Expected %p, received %p\n", b, received_array); for (i = 0; i < 100; i++) { @@ -2467,7 +2467,7 @@ static void test_D3DXSHScale(void) /* D3DXSHScale does not modify the elements of the array after the order * order-th element */ else expected = a[i]; - ok(relative_error(b[i], expected) < admitted_error, "order %d, element %d, expected %f, received %f", order, i, expected, b[i]); + ok(relative_error(b[i], expected) < admitted_error, "order %d, element %d, expected %f, received %f\n", order, i, expected, b[i]); } } }

1 0

Francois Gouget : kernel32/tests: Improve some traces for the CreateTimerQueueTimer() tests.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b887e7a963a63d69dd1b99b55b6c3a4f53847ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b887e7a963a63d69dd1b99b55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 3 10:02:51 2012 +0200 kernel32/tests: Improve some traces for the CreateTimerQueueTimer() tests. --- dlls/kernel32/tests/sync.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index d4f6cf7..5cf5269 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -784,10 +784,10 @@ static void test_timer_queue(void) ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); ok(ret, "DeleteTimerQueueEx\n"); - ok(n1 == 1, "Timer callback 1\n"); - ok(n2 < n3, "Timer callback 2 should be much slower than 3\n"); - ok(n4 == 0, "Timer callback 4\n"); - ok(n5 == 1, "Timer callback 5\n"); + ok(n1 == 1, "Timer callback 1 expected 1 got %d\n", n1); + ok(n2 < n3, "Timer callback 2 & 3 expected %d < %d\n", n2, n3); + ok(n4 == 0, "Timer callback 4 expected 0 got %d\n", n4); + ok(n5 == 1, "Timer callback 5 expected 1 got %d\n", n5); /* Test synchronous deletion of the timer/queue with event trigger. */ e = CreateEvent(NULL, TRUE, FALSE, NULL);

1 0

Francois Gouget : kernel32/tests: Test deleting a timer right after creating it.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: d31b6335f2d2b6576f32d88254d83a6b4d182c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31b6335f2d2b6576f32d8825… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 3 10:03:07 2012 +0200 kernel32/tests: Test deleting a timer right after creating it. --- dlls/kernel32/tests/sync.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 5cf5269..4068b22 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -704,11 +704,11 @@ static void CALLBACK timer_queue_cb6(PVOID p, BOOLEAN timedOut) static void test_timer_queue(void) { - HANDLE q, t1, t2, t3, t4, t5; - int n1, n2, n3, n4, n5; + HANDLE q, t0, t1, t2, t3, t4, t5; + int n0, n1, n2, n3, n4, n5; struct timer_queue_data1 d1, d2, d3, d4; HANDLE e, et1, et2; - BOOL ret; + BOOL ret, ret0; if (!pChangeTimerQueueTimer || !pCreateTimerQueue || !pCreateTimerQueueTimer || !pDeleteTimerQueueEx || !pDeleteTimerQueueTimer) @@ -731,6 +731,18 @@ static void test_timer_queue(void) q = pCreateTimerQueue(); ok(q != NULL, "CreateTimerQueue\n"); + /* Not called. */ + t0 = NULL; + n0 = 0; + ret = pCreateTimerQueueTimer(&t0, q, timer_queue_cb1, &n0, 0, + 300, 0); + ok(ret, "CreateTimerQueueTimer\n"); + ok(t0 != NULL, "CreateTimerQueueTimer\n"); + ret0 = pDeleteTimerQueueTimer(q, t0, NULL); + ok((!ret0 && GetLastError() == ERROR_IO_PENDING) || + broken(ret0), /* Win 2000 & XP & 2003 */ + "DeleteTimerQueueTimer ret=%d le=%u\n", ret0, GetLastError()); + /* Called once. */ t1 = NULL; n1 = 0; @@ -784,6 +796,8 @@ static void test_timer_queue(void) ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); ok(ret, "DeleteTimerQueueEx\n"); + todo_wine + ok(n0 == 1 || broken(ret0 && n0 == 0), "Timer callback 0 expected 1 got %d\n", n0); ok(n1 == 1, "Timer callback 1 expected 1 got %d\n", n1); ok(n2 < n3, "Timer callback 2 & 3 expected %d < %d\n", n2, n3); ok(n4 == 0, "Timer callback 4 expected 0 got %d\n", n4);

1 0

Sergey Guralnik : user32: Add test for ComboBox repositioning behavior.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: fb4545847ed6a76f615b0b16c16e277874eba571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4545847ed6a76f615b0b16c… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue Jul 3 12:30:49 2012 +0400 user32: Add test for ComboBox repositioning behavior. --- dlls/user32/tests/msg.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 27a5476..3102cf2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5720,6 +5720,21 @@ static const struct message WmKeyDownComboSeq[] = { 0 } }; +static const struct message WmSetPosComboSeq[] = +{ + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_CHILDACTIVATE, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_WINDOWPOSCHANGING, sent|defwinproc }, + { WM_NCCALCSIZE, sent|defwinproc|wparam, TRUE }, + { WM_WINDOWPOSCHANGED, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + static WNDPROC old_combobox_proc; static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -5807,6 +5822,10 @@ static void test_combobox_messages(void) log_all_parent_messages--; ok_sequence(WmKeyDownComboSeq, "WM_KEYDOWN/VK_DOWN on a ComboBox", FALSE); + flush_sequence(); + SetWindowPos(combo, 0, 10, 10, 120, 130, SWP_NOZORDER); + ok_sequence(WmSetPosComboSeq, "repositioning messages on a ComboBox", TRUE); + DestroyWindow(combo); DestroyWindow(parent); }

1 0

Jacek Caban : mshtml: Force cycle collection when releasing main document object.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: ecf667ad771abbb7b6a7624627d8851c4af670f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf667ad771abbb7b6a762462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 11:05:30 2012 +0200 mshtml: Force cycle collection when releasing main document object. --- dlls/mshtml/htmldoc.c | 11 +++++ dlls/mshtml/nsiface.idl | 111 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5e98cea..53e98c7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2319,6 +2319,11 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) TRACE("(%p) ref = %u\n", This, ref); if(!ref) { + nsIDOMWindowUtils *window_utils = NULL; + + if(This->basedoc.window && This->basedoc.window->nswindow) + get_nsinterface((nsISupports*)This->basedoc.window->nswindow, &IID_nsIDOMWindowUtils, (void**)&window_utils); + if(This->basedoc.doc_node) { This->basedoc.doc_node->basedoc.doc_obj = NULL; htmldoc_release(&This->basedoc.doc_node->basedoc); @@ -2355,6 +2360,12 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) if(This->nscontainer) NSContainer_Release(This->nscontainer); heap_free(This); + + /* Force cycle collection */ + if(window_utils) { + nsIDOMWindowUtils_CycleCollect(window_utils, NULL, 0); + nsIDOMWindowUtils_Release(window_utils); + } } return ref; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index c5fe3db..006a1cc 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -149,6 +149,7 @@ typedef nsISupports nsIDOMDOMTokenList; typedef nsISupports nsITransferable; typedef nsISupports nsIDOMHTMLHeadElement; typedef nsISupports nsIDOMFileList; +typedef nsISupports nsIDOMFile; typedef nsISupports nsIControllers; typedef nsISupports nsIDOMValidityState; typedef nsISupports nsIPluginInstanceOwner; @@ -177,6 +178,10 @@ typedef nsISupports nsILocalFile; typedef nsISupports nsIDOMHTMLMenuElement; typedef nsISupports nsIDOMCaretPosition; typedef nsISupports nsIFrameRequestCallback; +typedef nsISupports nsICycleCollectorListener; +typedef nsISupports nsIDOMHTMLCanvasElement; +typedef nsISupports nsIQueryContentEventResult; +typedef nsISupports nsIDOMBlob; typedef void *JSContext; typedef void *JSObject; @@ -2620,6 +2625,110 @@ interface nsIDOMEvent : nsISupports nsresult StopImmediatePropagation(); } +[ + object, + uuid(73b48170-55d5-11e1-b86c-0800200c9a66), + local +] +interface nsIDOMWindowUtils : nsISupports +{ + nsresult GetImageAnimationMode(PRUint16 *aImageAnimationMode); + nsresult SetImageAnimationMode(PRUint16 aImageAnimationMode); + nsresult GetDocCharsetIsForced(bool *aDocCharsetIsForced); + nsresult GetCursorType(PRInt16 *_retval); + nsresult GetDocumentMetadata(const nsAString *aName, nsAString *_retval); + nsresult Redraw(PRUint32 aCount, PRUint32 *_retval); + nsresult SetCSSViewport(float aWidthPx, float aHeightPx); + nsresult SetDisplayPortForElement(float aXPx, float aYPx, float aWidthPx, float aHeightPx, nsIDOMElement *aElement); + nsresult SetResolution(float aXResolution, float aYResolution); + nsresult SendMouseEvent(const nsAString *aType, float aX, float aY, PRInt32 aButton, + PRInt32 aClickCount, PRInt32 aModifiers, bool aIgnoreRootScrollFrame); + nsresult SendTouchEvent(const nsAString *aType, PRUint32 *aIdentifiers, PRInt32 *aXs, PRInt32 *aYs, + PRUint32 *aRxs, PRUint32 *aRys, float *aRotationAngles, float *aForces, PRUint32 count, PRInt32 aModifiers, + bool aIgnoreRootScrollFrame, bool *_retval); + nsresult SendMouseEventToWindow(const nsAString *aType, float aX, float aY, PRInt32 aButton, PRInt32 aClickCount, + PRInt32 aModifiers, bool aIgnoreRootScrollFrame); + nsresult SendMouseScrollEvent(const nsAString *aType, float aX, float aY, PRInt32 aButton, PRInt32 aScrollFlags, + PRInt32 aDelta, PRInt32 aModifiers); + nsresult SendKeyEvent(const nsAString *aType, PRInt32 aKeyCode, PRInt32 aCharCode, PRInt32 aModifiers, + bool aPreventDefault, bool *_retval); + nsresult SendNativeKeyEvent(PRInt32 aNativeKeyboardLayout, PRInt32 aNativeKeyCode, PRInt32 aModifierFlags, + const nsAString *aCharacters, const nsAString *aUnmodifiedCharacters); + nsresult SendNativeMouseEvent(PRInt32 aScreenX, PRInt32 aScreenY, PRInt32 aNativeMessage, PRInt32 aModifierFlags, + nsIDOMElement *aElement); + nsresult ActivateNativeMenuItemAt(const nsAString *indexString); + nsresult ForceUpdateNativeMenuAt(const nsAString *indexString); + nsresult Focus(nsIDOMElement *aElement); + nsresult GarbageCollect(nsICycleCollectorListener *aListener, PRInt32 aExtraForgetSkippableCalls); + nsresult CycleCollect(nsICycleCollectorListener *aListener, PRInt32 aExtraForgetSkippableCalls); + nsresult SendSimpleGestureEvent(const nsAString *aType, float aX, float aY, PRUint32 aDirection, double aDelta, + PRInt32 aModifiers); + nsresult ElementFromPoint(float aX, float aY, bool aIgnoreRootScrollFrame, bool aFlushLayout, nsIDOMElement **_retval); + nsresult NodesFromRect(float aX, float aY, float aTopSize, float aRightSize, float aBottomSize, float aLeftSize, + bool aIgnoreRootScrollFrame, bool aFlushLayout, nsIDOMNodeList **_retval); + nsresult CompareCanvases(nsIDOMHTMLCanvasElement *aCanvas1, nsIDOMHTMLCanvasElement *aCanvas2, + PRUint32 *aMaxDifference, PRUint32 *_retval); + nsresult GetIsMozAfterPaintPending(bool *aIsMozAfterPaintPending); + nsresult SuppressEventHandling(bool aSuppress); + nsresult ClearMozAfterPaintEvents(); + nsresult DisableNonTestMouseEvents(bool aDisable); + nsresult GetScrollXY(bool aFlushLayout, PRInt32 *aScrollX, PRInt32 *aScrollY); + nsresult GetIMEIsOpen(bool *aIMEIsOpen); + nsresult GetIMEStatus(PRUint32 *aIMEStatus); + nsresult GetScreenPixelsPerCSSPixel(float *aScreenPixelsPerCSSPixel); + nsresult DispatchDOMEventViaPresShell(nsIDOMNode *aTarget, nsIDOMEvent *aEvent, bool aTrusted, bool *_retval); + nsresult GetClassName(const /*JS::Value*/ void *aObject, JSContext* cx, char **_retval); + nsresult SendContentCommandEvent(const nsAString *aType, nsITransferable *aTransferable); + nsresult SendCompositionEvent(const nsAString *aType, const nsAString *aData, const nsAString *aLocale); + nsresult SendTextEvent(const nsAString *aCompositionString, PRInt32 aFirstClauseLength, PRUint32 aFirstClauseAttr, + PRInt32 aSecondClauseLength, PRUint32 aSecondClauseAttr, PRInt32 aThirdClauseLength, PRUint32 aThirdClauseAttr, + PRInt32 aCaretStart, PRInt32 aCaretLength); + nsresult SendQueryContentEvent(PRUint32 aType, PRUint32 aOffset, PRUint32 aLength, PRInt32 aX, PRInt32 aY, + nsIQueryContentEventResult **_retval); + nsresult SendSelectionSetEvent(PRUint32 aOffset, PRUint32 aLength, bool aReverse, bool *_retval); + nsresult GetVisitedDependentComputedStyle(nsIDOMElement *aElement, const nsAString *aPseudoElement, + const nsAString *aPropertyName, nsAString *_retval); + nsresult GetParent(const /*JS::Value*/ void *obj, JSContext *cx, /*JS::Value*/ void *_retval); + nsresult GetOuterWindowID(PRUint64 *aOuterWindowID); + nsresult GetCurrentInnerWindowID(PRUint64 *aCurrentInnerWindowID); + nsresult EnterModalState(); + nsresult LeaveModalState(); + nsresult EnterModalStateWithWindow(nsIDOMWindow **_retval); + nsresult LeaveModalStateWithWindow(nsIDOMWindow *aWindow); + nsresult IsInModalState(bool *_retval); + nsresult SuspendTimeouts(); + nsresult ResumeTimeouts(); + nsresult GoOnline(); + nsresult GetLayerManagerType(nsAString *aLayerManagerType); + nsresult StartFrameTimeRecording(); + nsresult StopFrameTimeRecording(PRUint32 *frameCount, float **frameTime); + nsresult GetDisplayDPI(float *aDisplayDPI); + nsresult GetOuterWindowWithId(PRUint64 aOuterWindowID, nsIDOMWindow **_retval); + nsresult RenderDocument(const void /*nsRect*/ *aRect, PRUint32 aFlags, int /*nscolor*/ aBackgroundColor, + void /*gfxContext*/ *aThebesContext); + nsresult AdvanceTimeAndRefresh(PRInt64 aMilliseconds); + nsresult RestoreNormalRefresh(); + nsresult ComputeAnimationDistance(nsIDOMElement *element, const nsAString *property, const nsAString *value1, + const nsAString *value2, double *_retval); + nsresult WrapDOMFile(nsIFile *aFile, nsIDOMFile **_retval); + nsresult GetFocusedInputType(char **aFocusedInputType); + nsresult FindElementWithViewId(long /*nsViewID*/ aId, nsIDOMElement **_retval); + nsresult LeafLayersPartitionWindow(bool *_retval); + nsresult GetMayHaveTouchEventListeners(bool *aMayHaveTouchEventListeners); + nsresult CheckAndClearPaintedState(nsIDOMElement *aElement, bool *_retval); + nsresult GetFileId(nsIDOMBlob *aBlob, PRInt64 *_retval); + nsresult GetFileReferences(const nsAString *aDatabaseName, PRInt64 aId, PRInt32 *aRefCnt, PRInt32 *aDBRefCnt, + PRInt32 *aSliceRefCnt, bool *_retval); + nsresult IsIncrementalGCEnabled(JSContext *cx, bool *_retval); + nsresult StartPCCountProfiling(JSContext *cx); + nsresult StopPCCountProfiling(JSContext *cx); + nsresult PurgePCCounts(JSContext *cx); + nsresult GetPCCountScriptCount(JSContext *cx, PRInt32 *_retval); + nsresult GetPCCountScriptSummary(PRInt32 script, JSContext *cx, nsAString *_retval); + nsresult GetPCCountScriptContents(PRInt32 script, JSContext *cx, nsAString *_retval); + nsresult GetPaintingSuppressed(bool *aPaintingSuppressed); +} + cpp_quote("#define CONTEXT_NONE 0x00") cpp_quote("#define CONTEXT_LINK 0x01") cpp_quote("#define CONTEXT_IMAGE 0x02") @@ -2654,7 +2763,7 @@ interface nsIDOMUIEvent : nsIDOMEvent nsresult GetPageX(PRInt32 *aPageX); nsresult GetPageY(PRInt32 *aPageY); nsresult GetWhich(PRUint32 *aWhich); - nsresult GetRangeParent(nsIDOMNode * *aRangeParent); + nsresult GetRangeParent(nsIDOMNode **aRangeParent); nsresult GetRangeOffset(PRInt32 *aRangeOffset); nsresult GetCancelBubble(bool *aCancelBubble); nsresult SetCancelBubble(bool aCancelBubble);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 665f1eee16196f92806d4ee0610c1b10222cb594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=665f1eee16196f92806d4ee06… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 3 04:23:14 2012 +0200 po: Update German translation. --- po/de.po | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 649488f..7463643 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-20 21:55+0200\n" +"PO-Revision-Date: 2012-07-03 01:38+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -9719,6 +9719,32 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Startet ein Programm, oder öffnet ein Dokument in dem Programm, das " +"normalerweise für Dateien mit dieser Dateiendung benutzt wird.\n" +"Aufruf:\n" +"start [Optionen] Dateiname_Programm [...]\n" +"start [Optionen] Dateiname_Dokument\n" +"\n" +"Optionen:\n" +"\"titel\" Spezifiziert den Titel für Kindfenster.\n" +"/d Ordner Startet das Programm im angegebenen Verzeichnis.\n" +"/b Für dieses Programm wird keine neue Konsole erstellt.\n" +"/i Startet das Programm mit einem neuen Satz Umgebungsvariablen.\n" +"/min Startet das Programm minimiert.\n" +"/max Startet das Programm maximiert.\n" +"/low Startet das Programm in der Leerlauf-Prioritätsklasse.\n" +"/normal Startet das Programm in der normalen Prioritätsklasse.\n" +"/high Startet das Programm in der hohen Prioritätsklasse.\n" +"/realtime Startet das Programm in der Echtzeit-Prioritätsklasse.\n" +"/abovenormal Startet das Programm in der gehobenen Prioritätsklasse.\n" +"/belownormal Startet das Programm in der abgesenkten Prioritätsklasse.\n" +"/node Startet das Programm auf dem angegebenen NUMA-Knoten.\n" +"/affinity Maske Startet das Programm mit der angegebenen Affinitätsmaske.\n" +"/wait Wartet, bis das Programm endet und beendet sich selbst mit " +"dessen Exitcode.\n" +"/unix Öffnet einen Unix-Dateinamen wie mit dem Windows-Explorer.\n" +"/ProgIDOpen Öffnet ein Dokument mit der angegebenen progID.\n" +"/? Zeigt diese Hilfe an und beendet sich.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n"

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b03e74e3586d981b4b2cd156e8be490d920a6d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03e74e3586d981b4b2cd156e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jul 2 21:51:31 2012 +0900 po: Update Korean translation. --- po/ko.po | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/po/ko.po b/po/ko.po index 44cb03f..da0088b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9617,6 +9617,32 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"프로그램을 시작하거나, 파일 확장자에서 보통 사용하는 프로그램으로 문서를 엽니" +"다\n" +"사용법:\n" +"start [옵션] 프로그램_파일이름 [...]\n" +"start [옵션] 문서_파일이름\n" +"\n" +"옵션:\n" +"\"제목\" 자식 창의 제목 지정합니다.\n" +"/d 디렉토리 지정한 디렉토리에서 프로그램을 실행합니다.\n" +"/b 프로그램을 위해 새 콘솔을 만들지 않습니다.\n" +"/i 깨끗한 환경 변수로 프로그램을 시작합니다.\n" +"/min 프로그램을 최소화된 상태로 시작합니다.\n" +"/max 프로그램을 최대화된 상태로 시작합니다.\n" +"/low 프로그램을 낮은 우선 순위 클래스로 시작합니다.\n" +"/normal 프로그램을 보통 우선 순위 클래스로 시작합니다.\n" +"/high 프로그램을 높은 우선 순위 클래스로 시작합니다.\n" +"/realtime 프로그램을 실시간 우선 순위 클래스로 시작합니다.\n" +"/abovenormal 프로그램을 보통이상 우선 순위 클래스로 시작합니다.\n" +"/belownormal 프로그램을 보통이하 우선 순위 클래스로 시작합니다.\n" +"/node n 지정한 NUMA 노드로 프로그램을 시작합니다.\n" +"/affinity 마스크 지정한 친화도 마스크로 프로그램을 시작합니다.\n" +"/wait 시작된 프로그램이 끝나기를 기다리고,프로그램이 끝났을때 종료코드" +"로 끝납니다 /unix 유닉스 파일이름을 사용하고, 윈도우즈 탐색기같이 파일" +"을 시작합니다.\n" +"/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" +"/? 도움말을 보여주고 끝냅니다.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n"

1 0