January 2018 - Wine-Devel - list.winehq.org

[v2 PATCH] ddraw/tests: Move CreateSurface() invalid arguments test
by Nikolay Sivov Jan. 11, 2018

Jan. 11, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: moved to different test function dlls/ddraw/tests/ddraw1.c | 13 +++++++++++ dlls/ddraw/tests/ddraw2.c | 13 +++++++++++ dlls/ddraw/tests/ddraw4.c | 13 +++++++++++ dlls/ddraw/tests/ddraw7.c | 13 +++++++++++ dlls/ddraw/tests/dsurface.c | 55 --------------------------------------------- 5 files changed, 52 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d276565763..d1f28a2752 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3320,6 +3320,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8b23c01b07..eb1385a87e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3521,6 +3521,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5eb391abd9..d8ea3a773e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3652,6 +3652,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d5969ab949..8eecde0196 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3382,6 +3382,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw7_Release(ddraw); } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0f775a0062..90de8b00b2 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2476,60 +2476,6 @@ static void partial_block_lock_test(void) IDirectDraw7_Release(dd7); } -static void create_surface_test(void) -{ - HRESULT hr; - IDirectDraw2 *ddraw2; - IDirectDraw4 *ddraw4; - IDirectDraw7 *ddraw7; - IDirectDrawSurface *surface; - IDirectDrawSurface4 *surface4; - IDirectDrawSurface7 *surface7; - - hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &ddraw2); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw2_CreateSurface(ddraw2, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw2_Release(ddraw2); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &ddraw4); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw4_CreateSurface(ddraw4, NULL, &surface4, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw4_Release(ddraw4); - - if (!pDirectDrawCreateEx) - { - skip("DirectDrawCreateEx not available, skipping IDirectDraw7 tests.\n"); - return; - } - hr = pDirectDrawCreateEx(NULL, (void **) &ddraw7, &IID_IDirectDraw7, NULL); - ok(SUCCEEDED(hr), "DirectDrawCreateEx failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreateSurface(ddsd=NULL, pre-SCL) returned %#x," - " expected %#x.\n", hr, DDERR_NOCOOPERATIVELEVELSET); - - hr = IDirectDraw7_SetCooperativeLevel(ddraw7, NULL, DDSCL_NORMAL); - ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw7_Release(ddraw7); -} - START_TEST(dsurface) { HRESULT ret; @@ -2581,6 +2527,5 @@ START_TEST(dsurface) zbufferbitdepth_test(); pixelformat_flag_test(); partial_block_lock_test(); - create_surface_test(); ReleaseDirectDraw(); } -- 2.15.1

2 1

[PATCH 1/1] wininet: Fix crash when connection is null in NETCON_secure_connect
by Wei Xie Jan. 11, 2018

Jan. 11, 2018

request->netconn may be released before call NETCON_secure_connect. 5029 if(!request->contentLength) 5030 http_release_netconn(request, TRUE); 5121 if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) 5122 { 5123 res = NETCON_secure_connect(request->netconn, request->server); I don't know how write a test patch ------------------ 武汉深之度科技有限公司 Wuhan Deepin Technology Co., Ltd. 　　谢威手机：18038104349 武汉：武汉市光谷大道77号光谷金融港B18栋6楼北京：北京市西城区新街口外大街28号院普天德胜B座603室上海：上海市长宁区愚园路1258号15A01室官网：www.deepin.org　　官博：深度操作系统

2 3

[PATCH] services/tests: Fix resource leak.
by Andrey Gusev Jan. 11, 2018

Jan. 11, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/services/tests/service.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 98419497a5..728d515f85 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -561,6 +561,7 @@ static void test_runner(void (*p_run_test)(void)) WaitForSingleObject(thread, INFINITE); CloseHandle(event_handle); CloseHandle(pipe_handle); + CloseHandle(thread); } START_TEST(service) -- 2.13.6

1 0

[PATCH 2/2] kernel32: Return the list of module handles even if needed argument is null.
by Akihiro Sagawa Jan. 11, 2018

Jan. 11, 2018

Touhou Shinpiroku relays on this behaviour. Fixes Bug 44347. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/module.c | 14 ++++++++++---- dlls/psapi/tests/psapi_main.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] psapi/tests: Add more EnumProcessModules tests.
by Akihiro Sagawa Jan. 11, 2018

Jan. 11, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[PATCH] ddraw/tests: Move CreateSurface() invalid arguments test
by Nikolay Sivov Jan. 11, 2018

Jan. 11, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 15 +++++++++++++ dlls/ddraw/tests/ddraw2.c | 15 +++++++++++++ dlls/ddraw/tests/ddraw4.c | 15 +++++++++++++ dlls/ddraw/tests/ddraw7.c | 15 +++++++++++++ dlls/ddraw/tests/dsurface.c | 55 --------------------------------------------- 5 files changed, 60 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d276565763..7aad9ecac5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2012,6 +2012,21 @@ static void test_surface_qi(void) IDirectDrawSurface_Release(surface); IDirectDraw_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8b23c01b07..e39392e20e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2127,6 +2127,21 @@ static void test_surface_qi(void) IDirectDrawSurface_Release(surface); IDirectDraw2_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw2_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5eb391abd9..051826260b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2278,6 +2278,21 @@ static void test_surface_qi(void) IDirectDrawSurface4_Release(surface); IDirectDraw4_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw4_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d5969ab949..aeac144adc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2009,6 +2009,21 @@ static void test_surface_qi(void) IDirectDrawSurface7_Release(surface); IDirectDraw7_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw7_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0f775a0062..90de8b00b2 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2476,60 +2476,6 @@ static void partial_block_lock_test(void) IDirectDraw7_Release(dd7); } -static void create_surface_test(void) -{ - HRESULT hr; - IDirectDraw2 *ddraw2; - IDirectDraw4 *ddraw4; - IDirectDraw7 *ddraw7; - IDirectDrawSurface *surface; - IDirectDrawSurface4 *surface4; - IDirectDrawSurface7 *surface7; - - hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &ddraw2); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw2_CreateSurface(ddraw2, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw2_Release(ddraw2); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &ddraw4); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw4_CreateSurface(ddraw4, NULL, &surface4, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw4_Release(ddraw4); - - if (!pDirectDrawCreateEx) - { - skip("DirectDrawCreateEx not available, skipping IDirectDraw7 tests.\n"); - return; - } - hr = pDirectDrawCreateEx(NULL, (void **) &ddraw7, &IID_IDirectDraw7, NULL); - ok(SUCCEEDED(hr), "DirectDrawCreateEx failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreateSurface(ddsd=NULL, pre-SCL) returned %#x," - " expected %#x.\n", hr, DDERR_NOCOOPERATIVELEVELSET); - - hr = IDirectDraw7_SetCooperativeLevel(ddraw7, NULL, DDSCL_NORMAL); - ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw7_Release(ddraw7); -} - START_TEST(dsurface) { HRESULT ret; @@ -2581,6 +2527,5 @@ START_TEST(dsurface) zbufferbitdepth_test(); pixelformat_flag_test(); partial_block_lock_test(); - create_surface_test(); ReleaseDirectDraw(); } -- 2.15.1

2 1

[PATCH] comctl32/tests: Remove noisy trace
by Nikolay Sivov Jan. 11, 2018

Jan. 11, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4bba327e82..18e874a00f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -640,14 +640,6 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa LRESULT ret; struct message msg; - /* some debug output for style changing */ - if ((message == WM_STYLECHANGING || - message == WM_STYLECHANGED) && lParam) - { - STYLESTRUCT *style = (STYLESTRUCT*)lParam; - trace("\told style: 0x%08x, new style: 0x%08x\n", style->styleOld, style->styleNew); - } - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; -- 2.15.1

1 0

[PATCH 1/2] advapi32/tests: Fix a couple of leaks (Valgrind).
by Matteo Bruni Jan. 10, 2018

Jan. 10, 2018

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I don't know that we care a lot about the leak fixed in the first hunk. If we go with it, the LocalFree() ideally should be removed when we'll get rid of the todo_wine. For bug 43310. dlls/advapi32/tests/security.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 51dcf90851..769328be81 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6570,6 +6570,7 @@ static void test_system_security_access(void) /* privilege is checked on access */ err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + LocalFree( sd ); priv.PrivilegeCount = 1; priv.Privileges[0].Luid = luid; @@ -7082,6 +7083,7 @@ static void test_token_security_descriptor(void) CloseHandle(info.hThread); LocalFree(acl_child); + HeapFree(GetProcessHeap(), 0, sd2); LocalFree(psid); CloseHandle(token3); -- 2.13.6

3 4

[PATCH] mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled
by Nikolay Sivov Jan. 10, 2018

Jan. 10, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 7 ++++++- dlls/mshtml/tests/jstest.html | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b00346759f..845983ccd6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6683,7 +6683,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) hres = IHTMLWindow5_get_XMLHttpRequest(window, &var); ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres); - ok(V_VT(&var) == VT_DISPATCH, "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + + if (V_VT(&var) == VT_EMPTY) { + skip("Native XMLHTTP support is missing or disabled.\n"); + return; + } factory = NULL; hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index cce805032c..8d399d0747 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -1,5 +1,8 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> function ok(b,m) { return external.ok(b, m); @@ -355,8 +358,12 @@ function test_text_node() { } function test_xhr() { + if (typeof(XMLHttpRequest) != "object") { + win_skip("XMLHTTPRequest is not available or disabled"); + return; + } + ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n"); - ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest)); var xhr = new XMLHttpRequest(); ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); -- 2.15.1

5 5

[PATCH] mshtml/tests: Skip test_listener_order tests on IE7.
by Jacek Caban Jan. 10, 2018

Jan. 10, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.html | 5 +++++ 1 file changed, 5 insertions(+)

1 0