January 2018 - Wine-commits

Matteo Bruni : advapi32/tests: Fully initialize ACLs (Valgrind).
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: f6f5c96677be7dfd7fc62b80fb822fdfa7b1c4fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f5c96677be7dfd7fc62b80… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 10 22:59:03 2018 +0100 advapi32/tests: Fully initialize ACLs (Valgrind). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 51dcf90..a710174 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3559,7 +3559,7 @@ static void test_CreateDirectoryA(void) sa.bInheritHandle = TRUE; InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); - pDacl = HeapAlloc(GetProcessHeap(), 0, 100); + pDacl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 100); bret = InitializeAcl(pDacl, 100, ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, @@ -6306,6 +6306,7 @@ static void test_AddMandatoryAce(void) HeapFree(GetProcessHeap(), 0, sd2); CloseHandle(handle); + memset(buffer_acl, 0, sizeof(buffer_acl)); ret = InitializeAcl(acl, 256, ACL_REVISION); ok(ret, "InitializeAcl failed with %u\n", GetLastError()); @@ -6792,6 +6793,7 @@ static void test_maximum_allowed(void) ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); ok(ret, "InitializeSecurityDescriptor failed with %u\n", GetLastError()); + memset(buffer_acl, 0, sizeof(buffer_acl)); ret = InitializeAcl(acl, 256, ACL_REVISION); ok(ret, "InitializeAcl failed with %u\n", GetLastError()); ret = SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE); @@ -6921,6 +6923,7 @@ static void test_token_security_descriptor(void) ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + memset(buffer_acl, 0, sizeof(buffer_acl)); ret = InitializeAcl(acl, 256, ACL_REVISION); ok(ret, "InitializeAcl failed with error %u\n", GetLastError());

1 0

Jacek Caban : mshtml/tests: Skip test_listener_order tests on IE7.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 5dbf2726fe984e821ef29febd4a7c6c02c2b02cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dbf2726fe984e821ef29feb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 10 22:59:55 2018 +0100 mshtml/tests: Skip test_listener_order tests on IE7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 39860ff..8bf2c50 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -235,6 +235,11 @@ function test_attach_event() { } function test_listener_order() { + if(!("documentMode" in document)) { + win_skip("Skipping test_listener_order on too old IE"); + return; + } + var div = document.createElement("div"); document.body.appendChild(div);

1 0

Zebediah Figura : hlink: Implement IHlinkBrowseContext_GetObject().
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: c2953ba45775cdaf4c2653cc6337ea93031e04b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2953ba45775cdaf4c2653cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 9 20:59:39 2018 -0600 hlink: Implement IHlinkBrowseContext_GetObject(). Fixes a regression introduced by 00aca1476efd573cbf9d31a45c3d484f6fa6055b. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 27 ++++++++++++++--- dlls/hlink/tests/browse_ctx.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index ee8509d..2038768 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -98,10 +98,11 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) return ref; } +static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; + static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) { - static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); IMoniker *mon; IMoniker *composite; @@ -125,11 +126,29 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, return S_OK; } -static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face, +static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* iface, IMoniker *pimk, BOOL fBindifRootRegistered, IUnknown **ppiunk) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + IMoniker *mon; + IMoniker *composite; + IRunningObjectTable *ROT; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pimk, fBindifRootRegistered, ppiunk); + + hr = CreateItemMoniker(NULL, szIdent, &mon); + if (FAILED(hr)) return hr; + CreateGenericComposite(mon, pimk, &composite); + + GetRunningObjectTable(0, &ROT); + hr = IRunningObjectTable_GetObject(ROT, composite, ppiunk); + + IRunningObjectTable_Release(ROT); + IMoniker_Release(composite); + IMoniker_Release(mon); + + return hr; } static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 40d132b..3193525 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -131,12 +131,82 @@ static void test_BrowseWindowInfo(void) IHlinkBrowseContext_Release(bc); } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl UnknownVtbl = { + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release, +}; + +static IUnknown Unknown = { &UnknownVtbl }; + +static void test_GetObject(void) +{ + IHlinkBrowseContext *bc; + IMoniker *dummy; + IBindCtx *bindctx; + IUnknown *unk; + WCHAR one[] = {'1',0}; + WCHAR five[] = {'5',0}; + DWORD cookie; + HRESULT hres; + + hres = CreateBindCtx(0, &bindctx); + ok(hres == S_OK, "CreateBindCtx() failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(one, five, &dummy); + ok(hres == S_OK, "CreateItemMoniker() failed: 0x%08x\n", hres); + + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void **)&bc); + ok(hres == S_OK, "HlinkCreateBrowseContext() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_Register(bc, 0, &Unknown, dummy, &cookie); + ok(hres == S_OK, "Register() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == S_OK, "GetObject() failed: 0x%08x\n", hres); + ok(unk == &Unknown, "wrong object returned\n"); + + hres = IHlinkBrowseContext_Revoke(bc, cookie); + ok(hres == S_OK, "Revoke() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + IHlinkBrowseContext_Release(bc); +} + START_TEST(browse_ctx) { CoInitialize(NULL); test_SetInitialHlink(); test_BrowseWindowInfo(); + test_GetObject(); CoUninitialize(); }

1 0

Nikolay Sivov : comctl32/tests: Enable more ListView tests on Comctl32 v6.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 07ea3acbda5173d243ffc59233a2febcaed4d731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ea3acbda5173d243ffc592… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 10 10:17:20 2018 +0300 comctl32/tests: Enable more ListView tests on Comctl32 v6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f291698..1df8648 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6225,6 +6225,25 @@ START_TEST(listview) test_multiselect(); test_insertitem(); test_header_proc(); + test_images(); + test_checkboxes(); + test_items(); + test_color(); + test_columns(); + test_sorting(); + test_ownerdata(); + test_norecompute(); + test_nosortheader(); + test_columnscreation(); + test_indentation(); + test_finditem(); + test_hover(); + test_destroynotify(); + test_createdragimage(); + test_dispinfo(); + test_LVM_SETITEMTEXT(); + test_LVM_REDRAWITEMS(); + test_oneclickactivate(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : comctl32/tests: Add some state image tests for ListView.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 24fa2e8954cd98eabda05c93e29da0d10ecfcaf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fa2e8954cd98eabda05c93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 10 10:17:21 2018 +0300 comctl32/tests: Add some state image tests for ListView. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1df8648..1dd0fe1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6135,6 +6135,95 @@ todo_wine DestroyWindow(hwnd); } +static void test_state_image(void) +{ + static const DWORD styles[] = + { + LVS_ICON, + LVS_REPORT, + LVS_SMALLICON, + LVS_LIST, + }; + int i; + + for (i = 0; i < sizeof(styles)/sizeof(styles[0]); i++) + { + static char text[] = "Item"; + static char subtext[] = "Subitem"; + char buff[16]; + LVITEMA item; + HWND hwnd; + int r; + + hwnd = create_listview_control(styles[i]); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 0; + item.pszText = text; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(r == 0, "Failed to insert an item.\n"); + + item.mask = LVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to set item state.\n"); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = subtext; + r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to set subitem text.\n"); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get item state.\n"); + ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED), "Unexpected item state %#x.\n", item.state); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + todo_wine + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 2; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + todo_wine + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem text %d.\n", r); + ok(!strcmp(buff, subtext), "Unexpected subitem text %s.\n", buff); + + DestroyWindow(hwnd); + } +} + START_TEST(listview) { HMODULE hComctl32; @@ -6207,6 +6296,7 @@ START_TEST(listview) test_header_proc(); test_oneclickactivate(); test_callback_mask(); + test_state_image(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6244,6 +6334,7 @@ START_TEST(listview) test_LVM_SETITEMTEXT(); test_LVM_REDRAWITEMS(); test_oneclickactivate(); + test_state_image(); unload_v6_module(ctx_cookie, hCtx);

1 0

Józef Kucia : include: Add EnableMouseInPointer() declaration.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 45ea40a14a6584ec60333af14a0ed6aef31be85f URL: https://source.winehq.org/git/wine.git/?a=commit;h=45ea40a14a6584ec60333af1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 9 15:57:54 2018 +0100 include: Add EnableMouseInPointer() declaration. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 75bfe2b..05bf590 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3576,6 +3576,7 @@ WINUSERAPI INT WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTP #define DrawTextEx WINELIB_NAME_AW(DrawTextEx) WINUSERAPI BOOL WINAPI EmptyClipboard(void); WINUSERAPI BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT); +WINUSERAPI BOOL WINAPI EnableMouseInPointer(BOOL); WINUSERAPI BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); WINUSERAPI BOOL WINAPI EnableWindow(HWND,BOOL); WINUSERAPI BOOL WINAPI EndDeferWindowPos(HDWP);

1 0

Piotr Caban : concrt140: Fix Concurrency:: is_current_task_group_canceling spec entry.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 5890c3d0506fba366935a8a1d19c6a7d0c0e64fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5890c3d0506fba366935a8a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 10 18:09:00 2018 +0100 concrt140: Fix Concurrency::is_current_task_group_canceling spec entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 0f96d7e..3777533 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -477,7 +477,7 @@ @ stub ?from_numa_node(a)location@Concurrency@@SA?AV12(a)G@Z @ thiscall -arch=i386 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ(ptr) msvcr120.?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ @ cdecl -arch=win64 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ(ptr) msvcr120.?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ thiscall -arch=i386 ?lock(a)critical_section@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?lock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)reader_writer_lock@Concurrency@@QAEXXZ

1 0

Alex Henrie : kernel32/tests: Drop module test workarounds for Windows <= 2000.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 84a5c59604ba88d7768a4fd2f7e08eccbdd10259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a5c59604ba88d7768a4fd2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 10 10:19:03 2018 -0700 kernel32/tests: Drop module test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 162 +++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84a5c59604ba88d7768a…

1 0

Alex Henrie : msxml3/tests: Add missing return value checks to domdoc tests (Coverity).
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: b8711196b14b5240962a1191affc0700a464507e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8711196b14b5240962a1191… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 21:19:47 2018 -0700 msxml3/tests: Add missing return value checks to domdoc tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 87a885d..26555d2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6460,7 +6460,8 @@ static void test_save(void) hr = IXMLDOMDocument_loadXML(doc, _bstr_(win1252xml), &b); EXPECT_HR(hr, S_OK); - CreateStreamOnHGlobal(NULL, TRUE, &stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); V_VT(&dest) = VT_UNKNOWN; V_UNKNOWN(&dest) = (IUnknown*)stream; hr = IXMLDOMDocument_save(doc, dest); @@ -10950,7 +10951,8 @@ static void test_dispex(void) /* IXMLDOMNodeList */ hr = IXMLDOMDocument_getElementsByTagName(doc, _bstr_("*"), &node_list); EXPECT_HR(hr, S_OK); - IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); test_domobj_dispex(unk); IUnknown_Release(unk); IXMLDOMNodeList_Release(node_list);

1 0

Alex Henrie : msxml3/tests: Make put_data_types const.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 53a55fbdb1784e8f3514d15a8545e2e80f9f06ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=53a55fbdb1784e8f3514d15a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 21:19:48 2018 -0700 msxml3/tests: Make put_data_types const. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 26555d2..1306590 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11993,7 +11993,7 @@ static void test_get_namespaces(void) free_bstrs(); } -static DOMNodeType put_data_types[] = { +static const DOMNodeType put_data_types[] = { NODE_TEXT, NODE_CDATA_SECTION, NODE_PROCESSING_INSTRUCTION, @@ -12006,7 +12006,7 @@ static void test_put_data(void) static const WCHAR test_data[] = {'t','e','s','t',' ','n','o','d','e',' ','d','a','t','a',0}; WCHAR buff[100], *data; IXMLDOMDocument *doc; - DOMNodeType *type; + const DOMNodeType *type; IXMLDOMText *text; IXMLDOMNode *node; VARIANT v;

1 0