- wine-devel - winehq.org

[PATCH] ddraw/tests: Make test_depth_readback work on Nvidia GPUs on Windows.
by Stefan Dösinger 19 Jan '18

19 Jan '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- I consider the behavior of these GPUs generally broken, but at least one format is working on all of them. We just don't know in advance which one, and on at least my Geforce 9 an actual game is broken too. This test accepts a few known failure conditions as broken, but expects at least one format to pass in ddraw2 - ddraw4. ddraw1 only has D16, which fails on GF9, so don't even attempt to run the test. I previously seemed to have results with "reversed" 32 bit formats (S8D24/X8D24 instead of D24S8/D24X8), but I could not reproduce this any more today. I suspect I did something wrong with adjusting the expected results for the shifted depth mask. --- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 16 ++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 33 ++++++++++++++++++++++++++++++--- 4 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb56980800..bb954e1d59 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10840,6 +10840,18 @@ static void test_depth_readback(void) ok(!!window, "Failed to create a window.\n"); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (broken(ddraw_is_nvidia(ddraw))) + { + /* ddraw1 only has access to D16 Z buffers (and D24 ones, which are even more + * broken on Nvidia), so don't even attempt to run this test on Nvidia cards + * because some of them have broken D16 readback. See the ddraw7 version of + * this test for a more detailed comment. */ + skip("Some Nvidia GPUs have broken D16 readback, skipping.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a D3D device, skipping tests.\n"); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index faf7cefdc8..41e6fbb55b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12211,7 +12211,7 @@ static void test_set_render_state(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirect3DMaterial2 *blue_background; IDirectDrawSurface *rt, *ds; IDirect3DViewport2 *viewport; @@ -12223,6 +12223,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; void *ptr; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static D3DLVERTEX quad[] = @@ -12307,6 +12308,7 @@ static void test_depth_readback(void) hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -12317,20 +12319,30 @@ static void test_depth_readback(void) depth = *((DWORD *)ptr) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; - ok(abs(expected_depth - depth) <= max_diff, + /* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available. + * Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */ + ok(abs(expected_depth - depth) <= max_diff || broken(ddraw_is_nvidia(ddraw)), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; } } hr = IDirectDrawSurface_Unlock(ds, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); destroy_material(blue_background); IDirectDrawSurface_Release(rt); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1f0b01bdde..f8bf9b7fe1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14313,7 +14313,7 @@ static void test_map_synchronisation(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirectDrawSurface4 *rt, *ds; IDirect3DViewport3 *viewport; DDSURFACEDESC2 surface_desc; @@ -14325,6 +14325,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static struct @@ -14421,6 +14422,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice3_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -14434,21 +14436,32 @@ static void test_depth_readback(void) depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* The ddraw4 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that Geforce 7 also returns garbage data in D24S8, whereas the ddraw7 version + * returns 0 for that format. Give up on pre-filtering formats, accept Nvidia as generally + * broken here, but still expect at least one format (D16 or D24X8 in practise) to pass. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, - "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", - i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + ok(abs(expected_depth - depth) <= max_diff || broken(ddraw_is_nvidia(ddraw)), + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface4_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface4_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); IDirectDrawSurface4_Release(rt); IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2e41ff3715..aa68f4a0e0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13689,7 +13689,7 @@ done: static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, raw_value, passed_fmts = 0; IDirectDrawSurface7 *rt, *ds; DDSURFACEDESC2 surface_desc; IDirect3DDevice7 *device; @@ -13700,6 +13700,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_zero, all_one, all_pass; static struct { @@ -13791,6 +13792,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_zero = all_one = all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -13801,24 +13803,49 @@ static void test_depth_readback(void) hr = IDirectDrawSurface7_Lock(ds, &r, &surface_desc, DDLOCK_READONLY, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); - depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + raw_value = *((DWORD *)surface_desc.lpSurface); + if (raw_value) + all_zero = FALSE; + if (raw_value != 0x00ffffff) + all_one = FALSE; + + depth = raw_value & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs: + * + * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. + * + * Geforce 9 GPUs return return broken data for D16 that resembles the expected data in + * the lower 8 bits and has 0xff in the upper 8 bits. D24X8 works, D24 and D24S8 return + * 0x00ffffff. + * + * Geforce GTX 650 has working D16 and D24, but D24S8 returns 0. + * + * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). + * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, + ok(abs(expected_depth - depth) <= max_diff + || broken(ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface7_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface7_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + IDirectDrawSurface7_Release(rt); IDirectDraw7_Release(ddraw); IDirect3D7_Release(d3d); -- 2.13.6

2 2

[PATCH] [ole32] Make CoWaitForMultipleHandles peek at all posted messages
by Anton Romanov 19 Jan '18

19 Jan '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43728 This matches Windows behaviour and also avoids making CoWaitForMultipleHandles's message_loop constantly spin because of unpeeked/unpumped message in the queue Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/tests/compobj.c | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d136ee623a..48030aee71 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4547,6 +4547,16 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } + if (!apt->win) + { + /* If window is NULL on apartment we don't pump every + * single POSTMESSAGE message. Windows doesn't either but it peeks at + * them so that it will not trigger + * MsgWaitForMultipleObjects next time. + * If we don't do this and happen to have a message that is + * not pumped below we end up in a tight loop */ + PeekMessageW(NULL, NULL, 0, 0, PM_QS_POSTMESSAGE | PM_NOREMOVE | PM_NOYIELD); + } /* some apps (e.g. Visio 2010) don't handle WM_PAINT properly and loop forever, * so after processing 100 messages we go back to checking the wait handles */ while (count++ < 100 && COM_PeekMessage(apt, &msg)) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b46ff03853..127f387e4a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2648,7 +2648,9 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) DWORD index; HRESULT hr; HWND hWnd; + UINT uMSG = 0xc065; MSG msg; + int ret; hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); @@ -2672,6 +2674,23 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + /* Even if CoWaitForMultipleHandles does not pump a message it peeks + * at ALL of them */ + index = 0xdeadbeef; + PostMessageA(NULL, uMSG, 0, 0); + + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + + /* Make sure message was peeked at */ + ret = MsgWaitForMultipleObjectsEx(0, NULL, 2, QS_ALLPOSTMESSAGE, MWMO_ALERTABLE); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); + + /* But not pumped */ + success = PeekMessageA(&msg, NULL, uMSG, uMSG, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + DestroyWindow(hWnd); CoUninitialize(); return 0; @@ -2854,6 +2873,7 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = 0xdeadbeef; PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_NOREMOVE); -- 2.15.1

2 2

[PATCH] user32: Add SysLink to known classes list
by Nikolay Sivov 18 Jan '18

18 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 1 + dlls/user32/tests/class.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e0edb768d0..2aa189733f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -139,6 +139,7 @@ static BOOL is_comctl32_class( const WCHAR *name ) {'S','y','s','D','a','t','e','T','i','m','e','P','i','c','k','3','2',0}, {'S','y','s','H','e','a','d','e','r','3','2',0}, {'S','y','s','I','P','A','d','d','r','e','s','s','3','2',0}, + {'S','y','s','L','i','n','k',0}, {'S','y','s','L','i','s','t','V','i','e','w','3','2',0}, {'S','y','s','M','o','n','t','h','C','a','l','3','2',0}, {'S','y','s','P','a','g','e','r',0}, diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 5a66ede49e..88e4bfcfa4 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1093,6 +1093,7 @@ static void test_comctl32_classes(void) PROGRESS_CLASSA, REBARCLASSNAMEA, STATUSCLASSNAMEA, + "SysLink", WC_TABCONTROLA, TOOLBARCLASSNAMEA, TOOLTIPS_CLASSA, -- 2.15.1

1 0

[PATCH] joy.cpl: Add parameters for Condition FF effects
by Aric Stewart 18 Jan '18

18 Jan '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/joy.cpl/main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)

1 0

[PATCH resend] msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml
by Alex Henrie 18 Jan '18

18 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42468 dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/text.c | 34 +++++++--- 2 files changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c56015235..4f5e536c45 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12108,34 +12108,148 @@ static void test_put_data(void) type++; } - /* \r\n sequence is never escaped */ + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_newline_normalization(void) +{ + const struct msxmlsupported_data_t *table = domdoc_support_data; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; + VARIANT_BOOL b; + BSTR s; + HRESULT hr; + LONG length; + V_VT(&v) = VT_I2; V_I2(&v) = NODE_TEXT; - hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) + { + table++; + continue; + } - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_get_data(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - hr = IXMLDOMText_get_xml(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + /* \r\n is normalized to \n and back to \r\n */ - IXMLDOMText_Release(text); - IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); - IXMLDOMDocument_Release(doc); - free_bstrs(); + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1, "got %d, expected 1\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ + + hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 2, "got %d, expected 2\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* the same normalizations are applied when loading a document as a whole */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* even if xml:space="preserve" */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?>" + "<root xml:space=\"preserve\">foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n" + "<root xml:space=\"preserve\">foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* or preserveWhiteSpace is set */ + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) + { + /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ +todo_wine + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + "got %s\n", wine_dbgstr_w(s)); + } + else + { + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + } + SysFreeString(s); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + free_bstrs(); + table++; + } } static void test_putref_schemas(void) @@ -12719,6 +12833,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_newline_normalization(); test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3a12d4bf62..abd89dbd6b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domtext_transformNode( @@ -616,15 +616,35 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static const WCHAR rnW[] = {'\r','\n',0}; + BSTR normalized_data = NULL; + HRESULT hr; + size_t i, j; TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - if (data && !strcmpW(rnW, data)) - This->node.node->name = xmlStringTextNoenc; - else - domtext_reset_noenc(This); - return node_set_content(&This->node, data); + if (data) + { + /* normalize line endings */ + normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); + if (!normalized_data) return E_OUTOFMEMORY; + for (i = 0, j = 0; data[i]; i++) + { + if (data[i] == '\r') + { + if (data[i + 1] == '\n') i++; /* change \r\n to just \n */ + normalized_data[j++] = '\n'; /* change \r by itself to \n */ + } + else + normalized_data[j++] = data[i]; + } + normalized_data[j] = 0; + } + + domtext_reset_noenc(This); + hr = node_set_content(&This->node, normalized_data); + + SysFreeString(normalized_data); + return hr; } static HRESULT WINAPI domtext_get_length( -- 2.15.1

1 0

[PATCH 20/20] kerberos: Don't fail InitializeSecurityContext if there are unsupported flags.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Kerberos Authentication Tester passes ISC_REQ_CONNECTION along with some other flags that currently lead InitializeSecurityContext to fail. With this patch applied, and the patch that implements switch between NTLM and Kerberos in Negotiate provider Kerberos Authentication Tester works in the real Kerberos environment. This is another fix to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index cdfbbd66bc..640eff7855 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -471,10 +471,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, mapped_context, context_data ); if (context_req & ~supported) - { FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); - return SEC_E_UNSUPPORTED_FUNCTION; - } if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; cred_handle = credhandle_sspi_to_gss( credential ); -- 2.15.1

1 0

[PATCH 19/20] kerberos: Don't include GSS_C_DCE_STYLE in default gss_init_sec_context() flags.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Otherwise the returned ticket won't be accepted by WWW server when wrapped in an HTTP request. Original Rob's patch doesn't have this flag either. This patch is one of the fixes to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 277e15e615..cdfbbd66bc 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -326,7 +326,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam static ULONG flags_isc_req_to_gss( ULONG flags ) { - ULONG ret = GSS_C_DCE_STYLE; + ULONG ret = 0; if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; -- 2.15.1

1 0

[PATCH 18/20] kerberos: Implement SpUnsealMessage.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 295e23f4c5..277e15e615 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -196,6 +196,7 @@ MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_unwrap_iov); MAKE_FUNCPTR(gss_verify_mic); MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR @@ -225,6 +226,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_unwrap_iov) LOAD_FUNCPTR(gss_verify_mic) LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR @@ -875,6 +877,52 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual #endif } +static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER; + iov[3].buffer.length = message->pBuffers[token_idx].cbBuffer; + iov[3].buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_unwrap_iov( &minor_status, ctxt_handle, &conf_state, NULL, iov, 4 ); + TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + + return status_gss_to_sspi( ret ); + +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, @@ -882,7 +930,7 @@ static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = kerberos_SpMakeSignature, kerberos_SpVerifySignature, kerberos_SpSealMessage, - NULL, /* SpUnsealMessage */ + kerberos_SpUnsealMessage, NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ NULL, /* SpCompleteAuthToken */ -- 2.15.1

1 0

[PATCH 17/20] kerberos: Implement SpSealMessage.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 23f84628e6..295e23f4c5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -194,8 +194,10 @@ MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); +MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); MAKE_FUNCPTR(gss_verify_mic); +MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,8 +223,10 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) + LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) LOAD_FUNCPTR(gss_verify_mic) + LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR return TRUE; @@ -815,13 +819,69 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont #endif } +static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) + { + FIXME( "flags %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[3].buffer.length = 0; + iov[3].buffer.value = NULL; + + ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); + message->pBuffers[token_idx].cbBuffer = iov[3].buffer.length; + pgss_release_iov_buffer( &minor_status, iov, 4 ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, kerberos_SpVerifySignature, - NULL, /* SpSealMessage */ + kerberos_SpSealMessage, NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ -- 2.15.1

1 0

[PATCH 16/20] kerberos: Implement SpVerifySignature.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 1cc21706e2..23f84628e6 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -195,6 +195,7 @@ MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_verify_mic); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,6 +222,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_verify_mic) #undef LOAD_FUNCPTR return TRUE; @@ -779,12 +781,46 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON #endif } +static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = message->pBuffers[token_idx].cbBuffer; + token_buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); + TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, - NULL, /* SpVerifySignature */ + kerberos_SpVerifySignature, NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ -- 2.15.1

1 0

[PATCH 15/20] kerberos: Implement SpMakeSignature.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 5e9f49d6a1..1cc21706e2 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); @@ -214,6 +215,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) @@ -736,11 +738,52 @@ static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTION return STATUS_SUCCESS; } +static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + message->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ - NULL, /* SpMakeSignature */ + kerberos_SpMakeSignature, NULL, /* SpVerifySignature */ NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ -- 2.15.1

1 0

[PATCH 14/20] kerberos: Add SpInstanceInit stub.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ceba31608b..5e9f49d6a1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -729,9 +729,16 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } +static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) +{ + FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + + return STATUS_SUCCESS; +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { - NULL, /* SpInstanceInit */ + kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ NULL, /* SpMakeSignature */ NULL, /* SpVerifySignature */ -- 2.15.1

1 0

[PATCH 13/20] kerberos: Add SpUserModeInitialize implementation.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/kerberos.spec | 2 +- dlls/kerberos/krb5_ap.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/kerberos.spec b/dlls/kerberos/kerberos.spec index c41b830e46..7f765b1206 100644 --- a/dlls/kerberos/kerberos.spec +++ b/dlls/kerberos/kerberos.spec @@ -1,7 +1,7 @@ 1 stub SpInitialize 2 stub KerbDomainChangeCallback 3 stdcall SpLsaModeInitialize(long ptr ptr ptr) -4 stub SpUserModeInitialize +4 stdcall SpUserModeInitialize(long ptr ptr ptr) 32 stub SpInstanceInit @ stdcall -private DllMain(long long ptr) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ddd48df5d1..ceba31608b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -728,3 +728,33 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } + +static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = +{ + NULL, /* SpInstanceInit */ + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, + PSECPKG_USER_FUNCTION_TABLE *table, PULONG table_count) +{ + TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &kerberos_user_table; + *table_count = 1; + + return STATUS_SUCCESS; +} -- 2.15.1

1 0

[PATCH] winebrowser: Fix calling convention for wine_get_unix_file_name().
by Huw Davies 18 Jan '18

18 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 304ac14bbc..b1c49e7cd1 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winebrowser); -typedef LPSTR (*wine_get_unix_file_name_t)(LPCWSTR unixname); +typedef LPSTR (*CDECL wine_get_unix_file_name_t)(LPCWSTR unixname); static const WCHAR browser_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', -- 2.12.0

1 0

[PATCH 2/2] testbot: Purge old jobs based on their Submitted timestamp.
by Francois Gouget 18 Jan '18

18 Jan '18

Although it would only happen in case of a major TestBot malfunction, a Job could end up in a state where it will never complete and thus where its Ended field never gets set. So deleting old jobs based on their Ended field could leave us with zombies. This cannot happen with the Submitted timestamp since that field is not nullable. Also, a Job run time is normally very small compared to the expiration time (under a couple of hours compared to several days) so this does not make a significant difference in when a job actually gets deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I did get a Job zombie once on my local TestBot but it was due to bugs in the TestBot code (those did not make it to the production server fortunately). Sill, better safe than sorry. testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6ac22ded..0f126e87 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -61,7 +61,7 @@ if ($JobPurgeDays != 0) my $Jobs = CreateJobs(); foreach my $Job (@{$Jobs->GetItems()}) { - if (defined($Job->Ended) && $Job->Ended < $DeleteBefore) + if ($Job->Submitted < $DeleteBefore) { LogMsg "Deleting job ", $Job->Id, "\n"; $Job->RmTree(); -- 2.15.1

1 0

[PATCH 1/2] testbot: Require that a Job's Submitted field always be set.
by Francois Gouget 18 Jan '18

18 Jan '18

This guarantees we have at least one field to purge old jobs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This requires updating the database schema using update30.sql and restarting the web server and TestBot Engine. testbot/ddl/update30.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/doc/winetestbot-schema.dia | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 testbot/ddl/update30.sql diff --git a/testbot/ddl/update30.sql b/testbot/ddl/update30.sql new file mode 100644 index 00000000..892d8d18 --- /dev/null +++ b/testbot/ddl/update30.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + MODIFY Submitted DATETIME NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index ad8d1a92..cebc2655 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -114,7 +114,7 @@ CREATE TABLE Jobs Priority INT(1) NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled') NOT NULL, Remarks VARCHAR(128) NULL, - Submitted DATETIME NULL, + Submitted DATETIME NOT NULL, Ended DATETIME NULL, PatchId INT(7) NULL, FOREIGN KEY (BranchName) REFERENCES Branches(Name), diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index ef7c3ca7..7a948346 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1450,7 +1450,7 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="nullable"> - <dia:boolean val="true"/> + <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="unique"> <dia:boolean val="false"/> -- 2.15.1

1 0

[PATCH vkd3d 1/8] libs/vkd3d: Add simple format support restrictions.
by Józef Kucia 17 Jan '18

17 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> In the long term, we may need more complex format support filtering. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- After this change all tests passes with recent Nvidia drivers. --- libs/vkd3d/device.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5cf2ecfe8bdc..d84c5796a91b 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1230,6 +1230,30 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if &IID_ID3D12GraphicsCommandList, riid, command_list); } +/* Direct3D feature levels restrict which formats can be optionally supported. */ +static void vkd3d_restrict_format_support_for_feature_level( + D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support, const struct vkd3d_format *format) +{ + static const D3D12_FEATURE_DATA_FORMAT_SUPPORT blacklisted_format_features[] = + { + {DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(blacklisted_format_features); ++i) + { + if (blacklisted_format_features[i].Format == format->dxgi_format) + { + format_support->Support1 &= ~blacklisted_format_features[i].Support1; + format_support->Support2 &= ~blacklisted_format_features[i].Support2; + break; + } + } +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -1378,6 +1402,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX; + vkd3d_restrict_format_support_for_feature_level(data, format); + return S_OK; } -- 2.13.6

3 17

[PATCH v2] usp10: Re-use script caches for the same font.
by Thomas Faber 17 Jan '18

17 Jan '18

v2: use the LOGFONT as the comparison key, not the HDC; add more tests

3 2

[PATCH] po: Update German translation.
by Julian Rüger 17 Jan '18

17 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] testbot/Janitor: Don't undefine variables that are going out of scope.
by Francois Gouget 17 Jan '18

17 Jan '18

There is no point. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 4f0e4de0..6ac22ded 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -72,7 +72,6 @@ if ($JobPurgeDays != 0) } } } - $Jobs = undef; } # Delete PatchSets that are more than a day old @@ -123,7 +122,6 @@ if ($JobPurgeDays != 0) } } } - $Patches = undef; } # Archive old Jobs, that is remove all their associated files @@ -146,7 +144,6 @@ if ($JobArchiveDays != 0) $Job->Save(); } } - $Jobs = undef; } # Purge the deleted users and VMs if they are not referenced anymore @@ -286,5 +283,4 @@ if ($JobPurgeDays != 0) } } } - $RecordGroups = undef; } -- 2.15.1

1 0

[PATCH] testbot: Fix the CompareRecordGroups() documentation and variable names.
by Francois Gouget 17 Jan '18

17 Jan '18

The RecordGroup Id is an AUTO_INCREMENT field. These never wrap! Also, while that field is defined as an INT(6), it is a 32 bit integer anyway so we will not run out of ids for a long time. Generally speaking, for integers the display width (6 here) is meaningless as far as the TestBot is concerned. Also use more descriptive variable names. $a and $b were a bit misleading too since they have special meaning in the context of the sort() function, meaning which they don't have here. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/RecordGroups.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index fc1c2528..707d0acd 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -95,12 +95,12 @@ sub CreateRecordGroups(;$) sub CompareRecordGroups($$) { - my ($a, $b) = @_; + my ($RecordGroup1, $RecordGroup2) = @_; - # The Id will wrap eventually so sort by Timestamp - # and only use the Id to break ties. - return $a->Timestamp <=> $b->Timestamp || - $a->Id <=> $b->Id; + # The Timestamps have a 1 second granularity and may have duplicates. + # So use the Id to break ties. + return $RecordGroup1->Timestamp <=> $RecordGroup2->Timestamp || + $RecordGroup1->Id <=> $RecordGroup2->Id; } =pod -- 2.15.1

1 0

[PATCH] testbot: Return the activity records as a sorted list.
by Francois Gouget 17 Jan '18

17 Jan '18

The callers need a sorted list rather than a random access structure. So this avoids forcing them to deal with sorting the activity records again and mildly speeds things up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 33 ++++++++++++++++++--------------- testbot/web/Activity.pl | 4 ++-- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5a5d2328..58169aee 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -44,9 +44,13 @@ require Exporter; =item C<GetActivity()> Loads the records for the specified VMs and processes them to build a structure -describing the TestBot activity. The structure is as follows: +describing the TestBot activity. - { <GroupNo1> => { +Returns a list of the activity records, sorted from the oldest to the newest. +Each entry contains a structure grouping all the state and event information +for the specified timestamp. Entries have the following structure: + + { start => <StartTimestamp>, end => <EndTimestamp>, runnable => <RunnableTasksCount>, @@ -78,12 +82,10 @@ describing the TestBot activity. The structure is as follows: ... }, }, - }, - <GroupNo2> => { - ... - }, - ... - } + } + +GetActivity() also returns a table with the number of records and record groups +that were processed. =back =cut @@ -91,14 +93,16 @@ describing the TestBot activity. The structure is as follows: sub GetActivity($) { my ($VMs) = @_; - my ($Activity, $Counters) = ({}, {}); + my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); - foreach my $RecordGroup (@{$RecordGroups->GetItems()}) + foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { - $Activity->{$RecordGroup->Id} = { start => $RecordGroup->Timestamp }; + my $Group = { start => $RecordGroup->Timestamp }; + $ActivityHash->{$RecordGroup->Id} = $Group; + push @$Activity, $Group; } ### And then load all the Records in one go @@ -110,7 +114,7 @@ sub GetActivity($) $Counters->{records} = $Records->GetItemsCount(); foreach my $Record (@{$Records->GetItems()}) { - my $Group = $Activity->{$Record->RecordGroupId}; + my $Group = $ActivityHash->{$Record->RecordGroupId}; if ($Record->Type eq "tasks" and $Record->Name eq "counters") { ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; @@ -196,9 +200,8 @@ sub GetActivity($) ### Fill the holes in the table, compute end times, etc. my ($LastGroup, %LastStatusVMs); - foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) + foreach my $Group (@$Activity) { - my $Group = $Activity->{$RecordGroup->Id}; my $StatusVMs = $Group->{statusvms}; my $ResultVMs = $Group->{resultvms}; next if (!$StatusVMs and !$ResultVMs); @@ -380,7 +383,7 @@ sub GetStatistics($) my ($Activity, $Counters) = GetActivity($VMs); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; - foreach my $Group (values %$Activity) + foreach my $Group (@$Activity) { if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) { diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5a730df4..f8b7b5ad 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -133,9 +133,9 @@ EOF print "<tbody>\n"; my ($Activity, $_Counters) = GetActivity($VMs); - foreach my $GroupNo (sort { $b <=> $a } keys %$Activity) + for (my $Index = @$Activity; $Index--; ) { - my $Group = $Activity->{$GroupNo}; + my $Group = $Activity->[$Index]; next if (!$Group->{statusvms}); print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>"; -- 2.15.1

1 0

[PATCH] ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity).
by Thomas Faber 16 Jan '18

16 Jan '18

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 323ee68fc09b..dc65e374b9ad 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1444,6 +1444,7 @@ static DWORD parse_com_class_misc(const xmlstr_t *value) static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) { struct progids *progids = &entity->u.comclass.progids; + WCHAR **new_progids; if (progids->allocated == 0) { @@ -1453,8 +1454,10 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) if (progids->allocated == progids->num) { + new_progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, 2 * progids->allocated * sizeof(WCHAR*)); + if (!new_progids) return FALSE; progids->allocated *= 2; - progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + progids->progids = new_progids; } if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE; -- 2.15.1

1 0

[PATCH] ole2disp.dll16: Implement SafeArrayGet[UBound|LBound].
by Gijs Vermeulen 16 Jan '18

16 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ole2disp.dll16/ole2disp.c | 36 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index d61b5e8c5a..fb2dde6db2 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -116,6 +116,42 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) return sa->cbElements; } +/****************************************************************************** + * SafeArrayGetUBound [OLE2DISP.19] + */ +HRESULT WINAPI SafeArrayGetUBound16(SAFEARRAY *sa, UINT16 dim, LONG *ubound) +{ + TRACE("(%p,%u,%p)\n", sa, dim, ubound); + + if (!sa || !ubound) + return E_INVALIDARG16; + + if(!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *ubound = sa->rgsabound[sa->cDims - dim].lLbound + sa->rgsabound[sa->cDims - dim].cElements - 1; + + return S_OK; +} + +/****************************************************************************** + * SafeArrayGetLBound [OLE2DISP.20] + */ +HRESULT WINAPI SafeArrayGetLBound16(SAFEARRAY *sa, UINT16 dim, LONG *lbound) +{ + TRACE("(%p,%u,%p)\n", sa, dim, lbound); + + if (!sa || !lbound) + return E_INVALIDARG16; + + if(!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *lbound = sa->rgsabound[sa->cDims - dim].lLbound; + + return S_OK; +} + /****************************************************************************** * SafeArrayLock [OLE2DISP.21] */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4b8af41172..7b00ac353b 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -16,8 +16,8 @@ 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 -19 stub SAFEARRAYGETUBOUND -20 stub SAFEARRAYGETLBOUND +19 pascal SafeArrayGetUBound(ptr word ptr) SafeArrayGetUBound16 +20 pascal SafeArrayGetLBound(ptr word ptr) SafeArrayGetLBound16 21 pascal SafeArrayLock(ptr) SafeArrayLock16 22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 pascal SafeArrayAccessData(ptr ptr) SafeArrayAccessData16 -- 2.15.1

2 1

[PATCH vkd3d 1/7] libs/vkd3d-shader: Fix uninitialized error code in vkd3d_shader_parser_init().
by Józef Kucia 16 Jan '18

16 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6522dd69258d..bf1a3916888d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,9 +41,9 @@ static HRESULT vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, if (!(parser->data = shader_sm4_init(shader_desc->byte_code, shader_desc->byte_code_size, &shader_desc->output_signature))) { - WARN("Failed to initialize shader parser, hr %#x.\n", hr); + WARN("Failed to initialize shader parser.\n"); free_shader_desc(shader_desc); - return hr; + return E_INVALIDARG; } shader_sm4_read_header(parser->data, &parser->ptr, &parser->shader_version); -- 2.13.6

2 13

[PATCH] urlmon/tests: Add some more PARSE_PATH_FROM_URL tests
by Nikolay Sivov 16 Jan '18

16 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fd82c0b1f8..a0e3f61606 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7389,6 +7389,9 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE}, + {"file:/c:/dir/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\dir\\test.mp3",S_OK}, + {"file:/c:/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, + {"file://c:\\test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, /* PARSE_URL_FROM_PATH tests. */ /* This function almost seems to useless (just returns the absolute uri). */ @@ -10566,11 +10569,11 @@ static void test_CoInternetParseIUri(void) { if(SUCCEEDED(hr)) { DWORD len = lstrlenA(test.property); ok(!strcmp_aw(test.property, result) || (test.property2 && !strcmp_aw(test.property2, result)), - "Error: Expected %s but got %s instead on uri_parse_tests[%d].\n", - test.property, wine_dbgstr_w(result), i); + "Error: Expected %s but got %s instead on uri_parse_tests[%d] - %s.\n", + test.property, wine_dbgstr_w(result), i, wine_dbgstr_w(uriW)); ok(len == result_len || (test.property2 && lstrlenA(test.property2) == result_len), - "Error: Expected %d, but got %d instead on uri_parse_tests[%d].\n", - len, result_len, i); + "Error: Expected %d, but got %d instead on uri_parse_tests[%d] - %s.\n", + len, result_len, i, wine_dbgstr_w(uriW)); } else { ok(!result_len, "Error: Expected 'result_len' to be 0, but was %d on uri_parse_tests[%d].\n", -- 2.15.1

2 1

[PATCH] winetest/gather: Remove support for obsolete statuses.
by Francois Gouget 16 Jan '18

16 Jan '18

dissect is now responsible for detecting crashes and reporting them as 'failed crash' in the summary file. So gather no longer needs to assume negative exit codes identify crashes. 'failed -2' should not happen at all. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The obsolete statuses were removed over 6 months ago (see commit ee648b52fea5) so we no longer have any file containing them. This means it should now be safe to remove support for them. winetest/gather | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index fbf03975..ac6c3501 100755 --- a/winetest/gather +++ b/winetest/gather @@ -633,8 +633,6 @@ sub get_result_title($$) if ($result->{status} eq "missing") { return "Test did not run for an unknown reason"; } if ($result->{status} eq "mixed") { return "Mixed results"; } if ($result->{status} eq "crash") { return "Test crashed"; } - if ($result->{status} eq "-2") { return "Test failed"; } - if ($result->{status} =~ /^-/) { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } return ""; } @@ -701,8 +699,6 @@ sub singletest($$$) { else { $msg = $status eq "crash" ? "crashed" : - $status eq "-2" ? "failed" : - $status =~ /^-/ ? "crashed" : $status eq "258" ? "timeout": "failed"; } $title = join(" | ", $prefix, $title); -- 2.15.1

1 0

[PATCH] testbot: Document Item::OnDelete().
by Francois Gouget 16 Jan '18

16 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 88c9d1ae..62961308 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -433,6 +433,25 @@ sub Validate($) return (undef, undef); } +=pod +=over 12 + +=item C<OnDelete()> + +Prepares the item for deletion. + +The default implementation deletes any related 'Detailref' object as these +have a foreign key referencing this Item, which would prevent its deletion. +This allows the deletion of Items even if the database does not support +'ON DELETE CASCADE'. To preserve this behavior OnDelete() implementations +should remove any other foreign key that would prevent the deletion of an Item. + +Returns undef if successful, or an error message if the Item should not be +deleted or something prevents its deletion. + +=back +=cut + sub OnDelete($) { my ($self) = @_; -- 2.15.1

1 0

[PATCH vkd3d 1/7] build: Use linker version scripts to control visibility.
by Józef Kucia 15 Jan '18

15 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This should help us to not leak libvkd3d-shader symbols from libvkd3d in the next commit. ld-version-script.m4 is imported from gnulib. It's used in a lot of projects. --- Makefile.am | 9 +++++++ configure.ac | 2 ++ libs/vkd3d-shader/vkd3d_shader.map | 14 +++++++++++ libs/vkd3d-utils/vkd3d_utils.map | 13 +++++++++++ libs/vkd3d/vkd3d.map | 18 ++++++++++++++ m4/ld-version-script.m4 | 48 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+) create mode 100644 libs/vkd3d-shader/vkd3d_shader.map create mode 100644 libs/vkd3d-utils/vkd3d_utils.map create mode 100644 libs/vkd3d/vkd3d.map create mode 100644 m4/ld-version-script.m4 diff --git a/Makefile.am b/Makefile.am index 2876f6486df4..190a7ac8d134 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,9 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ +if HAVE_LD_VERSION_SCRIPT +libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map +endif libvkd3d_la_SOURCES = \ include/d3d12.idl \ @@ -85,11 +88,17 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @PTHREAD_LIBS@ @VULKAN_LIBS@ +if HAVE_LD_VERSION_SCRIPT +libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map +endif libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la +if HAVE_LD_VERSION_SCRIPT +libvkd3d_utils_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map +endif EXTRA_DIST = LICENSE diff --git a/configure.ac b/configure.ac index 5614f791fe64..b886058fef51 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,8 @@ AM_SILENT_RULES([yes]) LT_PREREQ([2.4.2]) LT_INIT +gl_LD_VERSION_SCRIPT + dnl Check compiler specific flags AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map new file mode 100644 index 000000000000..31ee4a90c970 --- /dev/null +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -0,0 +1,14 @@ +{ +global: + vkd3d_shader_compile_dxbc; + vkd3d_shader_find_signature_element; + vkd3d_shader_free_root_signature; + vkd3d_shader_free_shader_code; + vkd3d_shader_free_shader_signature; + vkd3d_shader_parse_input_signature; + vkd3d_shader_parse_root_signature; + vkd3d_shader_scan_dxbc; + vkd3d_shader_serialize_root_signature; + +local: *; +}; diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map new file mode 100644 index 000000000000..42df666bd6a7 --- /dev/null +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -0,0 +1,13 @@ +{ +global: + D3D12CreateDevice; + D3D12CreateRootSignatureDeserializer; + D3D12GetDebugInterface; + D3D12SerializeRootSignature; + vkd3d_create_event; + vkd3d_destroy_event; + vkd3d_signal_event; + vkd3d_wait_event; + +local: *; +}; diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map new file mode 100644 index 000000000000..db638f6dd35c --- /dev/null +++ b/libs/vkd3d/vkd3d.map @@ -0,0 +1,18 @@ +{ +global: + vkd3d_create_device; + vkd3d_create_image_resource; + vkd3d_create_instance; + vkd3d_create_root_signature_deserializer; + vkd3d_get_vk_device; + vkd3d_get_vk_format; + vkd3d_get_vk_instance; + vkd3d_get_vk_physical_device; + vkd3d_get_vk_queue; + vkd3d_get_vk_queue_family_index; + vkd3d_instance_decref; + vkd3d_instance_incref; + vkd3d_serialize_root_signature; + +local: *; +}; diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4 new file mode 100644 index 000000000000..4364f9f7a81e --- /dev/null +++ b/m4/ld-version-script.m4 @@ -0,0 +1,48 @@ +# ld-version-script.m4 serial 4 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Simon Josefsson + +# FIXME: The test below returns a false positive for mingw +# cross-compiles, 'local:' statements does not reduce number of +# exported symbols in a DLL. Use --disable-ld-version-script to work +# around the problem. + +# gl_LD_VERSION_SCRIPT +# -------------------- +# Check if LD supports linker scripts, and define automake conditional +# HAVE_LD_VERSION_SCRIPT if so. +AC_DEFUN([gl_LD_VERSION_SCRIPT], +[ + AC_ARG_ENABLE([ld-version-script], + [AS_HELP_STRING([--enable-ld-version-script], + [enable linker version script (default is enabled when possible)])], + [have_ld_version_script=$enableval], + [AC_CACHE_CHECK([if LD -Wl,--version-script works], + [gl_cv_sys_ld_version_script], + [gl_cv_sys_ld_version_script=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" + echo foo >conftest.map + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [], + [cat > conftest.map <<EOF +VERS_1 { + global: sym; +}; + +VERS_2 { + global: sym; +} VERS_1; +EOF + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [gl_cv_sys_ld_version_script=yes])]) + rm -f conftest.map + LDFLAGS=$save_LDFLAGS]) + have_ld_version_script=$gl_cv_sys_ld_version_script]) + AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], + [test "$have_ld_version_script" = yes]) +]) -- 2.13.6

3 17

[PATCH] d3d8/tests: Fix resource leak.
by Andrey Gusev 15 Jan '18

15 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d8/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9188f0ee4..e372c25dc8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8514,6 +8514,7 @@ START_TEST(device) || current_mode.dmPelsHeight != registry_mode.dmPelsHeight) { skip("Current mode does not match registry mode, skipping test.\n"); + FreeLibrary(d3d8_handle); return; } @@ -8527,6 +8528,7 @@ START_TEST(device) if (!(d3d8 = Direct3DCreate8(D3D_SDK_VERSION))) { skip("could not create D3D8\n"); + FreeLibrary(d3d8_handle); return; } IDirect3D8_Release(d3d8); @@ -8602,4 +8604,5 @@ START_TEST(device) test_clip_planes_limits(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); + FreeLibrary(d3d8_handle); } -- 2.13.6

2 1

[PATCH] libs/vkd3d-shader: Validate the DXBC version.
by Henri Verbeet 15 Jan '18

15 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6aa2ffa..331b619 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1814,6 +1814,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -1828,7 +1829,13 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size); -- 2.1.4

2 1

[website] German translation for release 3.0-rc6
by Julian Rüger 15 Jan '18

15 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

d3d8:device test timeout
by Alex Henrie 15 Jan '18

15 Jan '18

Hi all, I spent some time today trying to figure out why the d3d8:device tests are timing out (it's the #1 bug on Jeremy's list [1]). The timeout occurs within test_lost_device, which changes the foreground window to the desktop, then changes it back to the controlling window of the D3D device. Usually that's not a problem, but this particular machine is so traumatized by the experience that it locks up when you try to reset or release the device afterwards. The exact hangup occurs in d3d8/tests/device.c:7721.[2] By the way, despite the comments in this function, the test machine does return D3DERR_DEVICELOST. Also, the Windows 8 d3d8:device failures are a completely unrelated crash that happens intermittently on Windows 10 as well. I regret that I was only able to narrow down the problem and could not come up with a good solution. Hopefully another one of you will know how to fix this. -Alex [1] https://www.winehq.org/~jwhite/320152b06de1.html [2] https://source.winehq.org/git/wine.git/blob/320152b06de1d08f6f13b9edeca467f…

2 2

[PATCH] schannel/tests: Avoid dereferencing a null function pointer
by Alex Henrie 15 Jan '18

15 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes a test crash on my Windows 10 machine. We have seen the same crash at least once on the test VMs too. dlls/schannel/tests/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 4240dd76cb..fb350d5e62 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -213,6 +213,11 @@ static void testGetInfo(void) pTables = getNextSecPkgTable(pTables, Version); if (!pTables) return; + if (!pTables->GetInfo) + { + win_skip("GetInfo function missing\n"); + return; + } status = pTables->GetInfo(&PackageInfo); ok(status == STATUS_SUCCESS || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ -- 2.15.1

2 3

[PATCH] usp10: Re-use script caches for the same DC.
by Thomas Faber 15 Jan '18

15 Jan '18

This significantly (50% in my tests) speeds up loading large files in notepad. Tests show that native seems to do something similar.

2 3

[PATCH] compobj.dll16: Add StringFromIID.
by Gijs Vermeulen 14 Jan '18

14 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- StringFromIID is also forwarded to StringFromCLSID in ole32. Helps for bug 9805. dlls/compobj.dll16/compobj.c | 1 + dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index af69bf8bc4..4eddacece3 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -434,6 +434,7 @@ _xmalloc16(DWORD size, SEGPTR *ptr) { /****************************************************************************** * StringFromCLSID [COMPOBJ.19] + * StringFromIID [COMPOBJ.14] * Converts a GUID into the respective string representation. * The target string is allocated using the OLE IMalloc. * diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 71dba80fdf..2ef011fcb0 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -11,7 +11,7 @@ 11 stub COFREELIBRARY 12 stub COFREEALLLIBRARIES 13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16 -14 stub STRINGFROMIID +14 pascal StringFromIID(ptr ptr) StringFromCLSID16 15 pascal CoDisconnectObject(ptr long) CoDisconnectObject16 16 stub CORELEASEMARSHALDATA 17 pascal -ret16 CoFreeUnusedLibraries() CoFreeUnusedLibraries16 -- 2.15.1

1 0

Re: [PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg
by Nikolay Sivov 14 Jan '18

14 Jan '18

On 1/13/2018 8:31 PM, Vijay Kiran Kamuju wrote: > For bug #44270 > > Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> > --- > dlls/shdocvw/shdocvw.spec | 4 ++-- > dlls/shdocvw/shdocvw_main.c | 27 +++++++++++++++++++++++++++ > 2 files changed, 29 insertions(+), 2 deletions(-) > > diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec > index 0d581b26d2fa..485d1608dbab 100644 > --- a/dlls/shdocvw/shdocvw.spec > +++ b/dlls/shdocvw/shdocvw.spec > @@ -113,8 +113,8 @@ > @ stub DoAddToFavDlgW > @ stdcall DoFileDownload(wstr) > @ stub DoFileDownloadEx > -@ stub DoOrganizeFavDlg > -@ stub DoOrganizeFavDlgW > +@ stdcall DoOrganizeFavDlg(long str) > +@ stdcall DoOrganizeFavDlgW(long wstr) > @ stub DoPrivacyDlg > @ stub HlinkFrameNavigate > @ stub HlinkFrameNavigateNHL > diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c > index 5d89f77e919f..151aac039f1d 100644 > --- a/dlls/shdocvw/shdocvw_main.c > +++ b/dlls/shdocvw/shdocvw_main.c > @@ -560,3 +560,30 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) > FIXME("(%s) stub\n", debugstr_w(filename)); > return FALSE; > } > + > +/****************************************************************** > + * DoOrganizeFavDlgW (SHDOCVW.@) > + */ > +BOOL WINAPI DoOrganizeFavDlgW(HWND handle, LPCWSTR path) > +{ > + FIXME("(%p %s) stub\n", handle, debugstr_w(path)); > + return FALSE; > +} > + > +/****************************************************************** > + * DoOrganizeFavDlg (SHDOCVW.@) > + */ > +BOOL WINAPI DoOrganizeFavDlg(HWND handle, LPCSTR path) Did you check that it takes A-string? Please add a TRACE() too, and use better names for arguments. > +{ > + LPWSTR pathW = NULL; > + DWORD res; 'res' should be BOOL. > + > + if (pathW) { > + DWORD len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); > + pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > + MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); > + } For consistency please use heap_alloc(). Also this block is never executed. > + res = DoOrganizeFavDlgW(handle, pathW); > + heap_free(pathW); > + return res; > +} > P.S. I see you're sending patches to wine-patches still, please use wine-devel instead, wine-patches is not actively used anymore.

2 3

[PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg (try 2)
by Vijay Kiran Kamuju 14 Jan '18

14 Jan '18

For bug #44270 Changes from try1: rename variables and use heap_alloc Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shdocvw/shdocvw.spec | 4 ++-- dlls/shdocvw/shdocvw_main.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 0d581b26d2fa..485d1608dbab 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -113,8 +113,8 @@ @ stub DoAddToFavDlgW @ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW +@ stdcall DoOrganizeFavDlg(long str) +@ stdcall DoOrganizeFavDlgW(long wstr) @ stub DoPrivacyDlg @ stub HlinkFrameNavigate @ stub HlinkFrameNavigateNHL diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5d89f77e919f..52c622c6099f 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -560,3 +560,32 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND hwnd, LPCWSTR initDir) +{ + FIXME("(%p %s) stub\n", hwnd, debugstr_w(initDir)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND hwnd, LPCSTR initDir) +{ + LPWSTR initDirW = NULL; + BOOL res; + + TRACE("(%p %s)\n", hwnd, debugstr_a(initDir)); + + if (initDir) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, initDir, -1, NULL, 0); + initDirW = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, initDir, -1, initDirW, len); + } + res = DoOrganizeFavDlgW(hwnd, initDirW); + heap_free(initDirW); + return res; +} -- 2.15.1

1 0

[PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg (try 2)
by Vijay Kiran Kamuju 14 Jan '18

14 Jan '18

For bug #44270 Changes from try1: rename variables and use heap_alloc Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shdocvw/shdocvw.spec | 4 ++-- dlls/shdocvw/shdocvw_main.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 0d581b26d2fa..485d1608dbab 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -113,8 +113,8 @@ @ stub DoAddToFavDlgW @ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW +@ stdcall DoOrganizeFavDlg(long str) +@ stdcall DoOrganizeFavDlgW(long wstr) @ stub DoPrivacyDlg @ stub HlinkFrameNavigate @ stub HlinkFrameNavigateNHL diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5d89f77e919f..151aac039f1d 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -560,3 +560,30 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND handle, LPCWSTR path) +{ + FIXME("(%p %s) stub\n", handle, debugstr_w(path)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND handle, LPCSTR path) +{ + LPWSTR pathW = NULL; + DWORD res; + + if (pathW) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); + pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); + } + res = DoOrganizeFavDlgW(handle, pathW); + heap_free(pathW); + return res; +} -- 2.15.1

1 0

[PATCH] msvcrt: Introduce vsprintf & vswprintf helper functions.
by Gijs Vermeulen 14 Jan '18

14 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcrt/wcs.c | 436 +++++++++++++++++++++++------------------------------- 1 file changed, 189 insertions(+), 247 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 098e0d5ba8..a6c586eb97 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -720,22 +720,6 @@ printf_arg arg_clbk_positional(void *ctx, int pos, int type, __ms_va_list *valis return args[pos]; } -/********************************************************************* - * _vsnprintf (MSVCRT.@) - */ -int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, - const char *format, __ms_va_list valist ) -{ - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; - - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, NULL, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); - return ret; -} - #if _MSVCR_VER>=140 static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) @@ -758,94 +742,69 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) return len; } -/********************************************************************* - * __stdio_common_vsprintf (UCRTBASE.@) - */ -int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) +static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) { - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; + struct _str_ctx_w *out = ctx; - if (options & ~UCRTBASE_PRINTF_MASK) - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_a(puts_clbk_str_c99_a, - &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); + if(!out->buf) + return len; - if(!str) - return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) - return ret>len ? -1 : ret; - if(ret>=len) { - if(len) str[len-1] = 0; - return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + if(out->len < len) { + memcpy(out->buf, str, out->len*sizeof(MSVCRT_wchar_t)); + out->buf += out->len; + out->len = 0; + return len; } - return ret; -} - -#endif /* _MSVCR_VER>=140 */ - -/********************************************************************* - * _vsnprintf_l (MSVCRT.@) - */ -int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) -{ - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); - return ret; -} - -/********************************************************************* - * _vsprintf_l (MSVCRT.@) - */ -int CDECL MSVCRT_vsprintf_l( char *str, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) -{ - return MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); + memcpy(out->buf, str, len*sizeof(MSVCRT_wchar_t)); + out->buf += len; + out->len -= len; + return len; } -/********************************************************************* - * _sprintf_l (MSVCRT.@) - */ -int WINAPIV MSVCRT_sprintf_l(char *str, const char *format, - MSVCRT__locale_t locale, ...) -{ - int retval; - __ms_va_list valist; - __ms_va_start(valist, locale); - retval = MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); - __ms_va_end(valist); - return retval; -} +#endif /* _MSVCR_VER>=140 */ -static int CDECL MSVCRT_vsnprintf_s_l_opt( char *str, MSVCRT_size_t sizeOfBuffer, - MSVCRT_size_t count, const char *format, DWORD options, - MSVCRT__locale_t locale, __ms_va_list valist ) +static int vsprintf_helper(DWORD options, char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, + const char *format, MSVCRT__locale_t locale, __ms_va_list valist) { static const char nullbyte = '\0'; - struct _str_ctx_a ctx; + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_a puts_ctx; int len, ret; + BOOL postional, secure, c99, initially_positional; - if(sizeOfBuffer<count+1 || count==-1) - len = sizeOfBuffer; - else - len = count+1; + len = sizeOfBuffer; + postional = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; + initially_positional = postional; + secure = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; + c99 = (options & UCRTBASE_PRINTF_MASK) && !secure; + + if(secure && !postional) + if(sizeOfBuffer>count+1 && count!=-1) len = count+1; + + puts_ctx.len = len; + puts_ctx.buf = str; + + if(postional) { + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_a(args_ctx, format, valist); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(!ret) + postional = FALSE; + } - ctx.len = len; - ctx.buf = str; - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); + ret = pf_printf_a(c99 ? puts_clbk_str_c99_a : puts_clbk_str_a, + &puts_ctx, format, locale, options, + postional ? arg_clbk_positional : arg_clbk_valist, + postional ? args_ctx : NULL, + postional ? NULL : &valist); + puts_clbk_str_a(&puts_ctx, 1, &nullbyte); - if(ret<0 || ret==len) { + if((secure && !initially_positional) && (ret<0 || ret==len)) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); memset(str, 0, sizeOfBuffer); @@ -855,28 +814,61 @@ static int CDECL MSVCRT_vsnprintf_s_l_opt( char *str, MSVCRT_size_t sizeOfBuffer return -1; } + if(c99){ + if(!str) + return ret; + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } + } + return ret; } -static int MSVCRT_vsnwprintf_s_l_opt( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, - MSVCRT_size_t count, const MSVCRT_wchar_t *format, DWORD options, - MSVCRT__locale_t locale, __ms_va_list valist) +static int vswprintf_helper(DWORD options, MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx; + static const char nullbyte = '\0'; + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_w puts_ctx; int len, ret; + BOOL postional, secure, c99, initially_positional; len = sizeOfBuffer; - if(count!=-1 && len>count+1) - len = count+1; + postional = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; + initially_positional = postional; + secure = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; + c99 = (options & UCRTBASE_PRINTF_MASK) && !secure; + + if(secure && !postional) + if(sizeOfBuffer>count+1 && count!=-1) len = count+1; + + puts_ctx.len = len; + puts_ctx.buf = str; + + if(postional) { + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_w(args_ctx, format, valist); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(!ret) + postional = FALSE; + } - ctx.len = len; - ctx.buf = str; - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); + ret = pf_printf_w(c99 ? puts_clbk_str_c99_w : puts_clbk_str_w, + &puts_ctx, format, locale, options, + postional ? arg_clbk_positional : arg_clbk_valist, + postional ? args_ctx : NULL, + postional ? NULL : &valist); + puts_clbk_str_w(&puts_ctx, 1, &nullbyte); - if(ret<0 || ret==len) { + if((secure && !initially_positional) && (ret<0 || ret==len)) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); @@ -886,9 +878,76 @@ static int MSVCRT_vsnwprintf_s_l_opt( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfB return -1; } + if(c99){ + if(!str) + return ret; + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } + } + return ret; } +/********************************************************************* + * _vsnprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, + const char *format, __ms_va_list valist ) +{ + return vsprintf_helper(0, str, len, 0, format, NULL, valist); +} + +#if _MSVCR_VER>=140 + +/********************************************************************* + * __stdio_common_vsprintf (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return vsprintf_helper(options & UCRTBASE_PRINTF_MASK, str, len, 0, format, locale, valist); +} + +#endif /* _MSVCR_VER>=140 */ + +/********************************************************************* + * _vsnprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return vsprintf_helper(0, str, len, format, locale, valist); +} + +/********************************************************************* + * _vsprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_l( char *str, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); +} + +/********************************************************************* + * _sprintf_l (MSVCRT.@) + */ +int WINAPIV MSVCRT_sprintf_l(char *str, const char *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); + __ms_va_end(valist); + return retval; +} + /********************************************************************* * _vsnprintf_s_l (MSVCRT.@) */ @@ -896,7 +955,8 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - return MSVCRT_vsnprintf_s_l_opt(str, sizeOfBuffer, count, format, 0, locale, valist); + return vsprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, sizeOfBuffer, count, format, + locale, valist); } /********************************************************************* @@ -942,7 +1002,8 @@ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnprintf_s_l_opt(str, sizeOfBuffer, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vsprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, + sizeOfBuffer, count, format, locale, valist); } /********************************************************************* @@ -954,7 +1015,8 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vswprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, + sizeOfBuffer, count, format, locale, valist); } /********************************************************************* @@ -974,9 +1036,7 @@ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, char *str, MSVCRT_size_t count, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - if (options & ~UCRTBASE_PRINTF_MASK) - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnprintf_s_l_opt(str, INT_MAX, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return MSVCRT__stdio_common_vsnprintf_s(options, str, INT_MAX, count, format, locale, valist); } #endif /* _MSVCR_VER>=140 */ @@ -1011,28 +1071,8 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) int CDECL MSVCRT__vscprintf_p_l(const char *format, MSVCRT__locale_t locale, __ms_va_list args) { - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_a puts_ctx = {INT_MAX, NULL}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_a(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) { - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_valist, NULL, &args); - } else { - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_positional, args_ctx, NULL); - } - - return ret; + return vsprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + NULL, INT_MAX, 0, format, locale, args); } /********************************************************************* @@ -1103,14 +1143,7 @@ int WINAPIV MSVCRT__scprintf(const char *format, ...) int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, NULL, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - return ret; + return vswprintf_helper(0, str, len, 0, format, NULL, valist); } /********************************************************************* @@ -1120,41 +1153,7 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - return ret; -} - -static int MSVCRT_vswprintf_p_l_opt(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, - const MSVCRT_wchar_t *format, DWORD options, MSVCRT__locale_t locale, __ms_va_list args) -{ - static const MSVCRT_wchar_t nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_w puts_ctx = {length, buffer}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_w(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &args); - else - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_positional, args_ctx, NULL); - - puts_clbk_str_w(&puts_ctx, 1, &nullbyte); - return ret; + return vswprintf_helper(0, str, len, 0, format, locale, valist); } /********************************************************************* @@ -1163,7 +1162,8 @@ static int MSVCRT_vswprintf_p_l_opt(MSVCRT_wchar_t *buffer, MSVCRT_size_t length int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, args); + return vswprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + buffer, length, 0, format, locale, args); } #if _MSVCR_VER>=80 @@ -1173,7 +1173,7 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, NULL, args); + return MSVCRT_vswprintf_p_l(buffer, length, format, NULL, args); } #endif @@ -1187,7 +1187,8 @@ int CDECL MSVCRT__stdio_common_vswprintf_p( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vswprintf_p_l_opt(str, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vswprintf_helper((options & UCRTBASE_PRINTF_MASK) | (MSVCRT_PRINTF_POSITIONAL_PARAMS | + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER), str, count, 0, format, locale, valist); } #endif @@ -1198,7 +1199,8 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer MSVCRT_size_t count, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, 0, locale, valist); + return vswprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, sizeOfBuffer, count, format, + locale, valist); } /********************************************************************* @@ -1268,26 +1270,6 @@ int WINAPIV MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsign #if _MSVCR_VER>=140 -static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) -{ - struct _str_ctx_w *out = ctx; - - if(!out->buf) - return len; - - if(out->len < len) { - memcpy(out->buf, str, out->len*sizeof(MSVCRT_wchar_t)); - out->buf += out->len; - out->len = 0; - return len; - } - - memcpy(out->buf, str, len*sizeof(MSVCRT_wchar_t)); - out->buf += len; - out->len -= len; - return len; -} - /********************************************************************* * __stdio_common_vswprintf (UCRTBASE.@) */ @@ -1295,25 +1277,9 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_w(puts_clbk_str_c99_w, - &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - - if(!str) - return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) - return ret>len ? -1 : ret; - if(ret>=len) { - if(len) str[len-1] = 0; - return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; - } - return ret; + return vswprintf_helper(options & UCRTBASE_PRINTF_MASK, str, len, 0, format, locale, valist); } #endif /* _MSVCR_VER>=140 */ @@ -1444,7 +1410,8 @@ int CDECL MSVCRT__vscwprintf_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t l */ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args ) { - return MSVCRT_vswprintf_p_l_opt( NULL, INT_MAX, format, 0, locale, args ); + return vswprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, NULL, INT_MAX, + 0, format, locale, args); } #if _MSVCR_VER>=80 @@ -1453,7 +1420,7 @@ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t */ int CDECL MSVCRT__vscwprintf_p(const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(NULL, INT_MAX, format, 0, NULL, args); + return MSVCRT__vscwprintf_p_l(NULL, INT_MAX, format, 0, NULL, args); } #endif @@ -1476,40 +1443,14 @@ int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElemen format, locale, args ); } -static int MSVCRT_vsprintf_p_l_opt(char *buffer, MSVCRT_size_t length, const char *format, - DWORD options, MSVCRT__locale_t locale, __ms_va_list args) -{ - static const char nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_a puts_ctx = {length, buffer}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_a(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_valist, NULL, &args); - else - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_positional, args_ctx, NULL); - - puts_clbk_str_a(&puts_ctx, 1, &nullbyte); - return ret; -} - /********************************************************************* * _vsprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vsprintf_p_l_opt(buffer, length, format, 0, locale, args); + return vsprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, buffer, length, + 0, format, locale, args); } /********************************************************************* @@ -1530,7 +1471,8 @@ int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsprintf_p_l_opt(buffer, length, format, options & UCRTBASE_PRINTF_MASK, locale, args); + return vsprintf_helper((options & UCRTBASE_PRINTF_MASK) | (MSVCRT_PRINTF_POSITIONAL_PARAMS | + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER), buffer, length, 0, format, locale, args); } #endif @@ -1591,7 +1533,7 @@ int WINAPIV MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, int r; __ms_va_start(valist, locale); - r = MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, valist); + r = MSVCRT_vswprintf_p_l(buffer, length, format, locale, valist); __ms_va_end(valist); return r; -- 2.15.1

1 1

Introducing Hybrid Synchronization Objects
by Daniel Santos 13 Jan '18

13 Jan '18

Hello, After putting this project down for a little while I've finally picked it back up and have it working and passing its tests. This is still a proof-of-concept and needs a lot more cleanup before it's ready for staging or any serious review. I would be most interested to discover additional programs whos performance improves with this patch set (the Star Wars Battlefronts I and II by Pandemic were the original impetus of this). You must start your program with STAGING_SHARED_MEMORY=1 STAGING_SHM_SYNC=1 to enable it and I have hosted the patches on my github to anyone interested in trying it out: git clone https://github.com/daniel-santos/wine git checkout hybrid-sync Although somewhat complex, this implements a fast synchronization framework that: * Can support semaphores, mutexes and events (only semaphores implemented right now) * Is scaleable, * Can share objects with other processes, * Can perform most operations without a server call, and * Provides reasonably strong shared memory integrity guarantees with well-defined behaviour when shared memory is corrupted or altered incorrectly. I have called them "Hybrid" objects because they have a private and shared memory portion. When another process opens one, the shared memory portion is migrated to a new memory region shared only by the processes that have access to the object. This migration works even when multiple threads and processes are performing operations on the object. Scaleability is achieved through the use of memfd-backed shared memory slab caches on the server, from which all shared memory is allocated. Since it uses memfd and futexes it's only supported on Linux. Initial support is for x86 systems, but ARM, PPC, can be added without too much effort. I have not yet closely examined a BSD implementation. How It Works Every struct process in the server can have one or more struct process_group objects associated with it. These represent unique sets of processes that are sharing objects. When a client requests a new synchronization object, the server looks for a process_group that only contains the calling process and creates one if none exists -- this also creates a new slab cache, which allocates a block of shared memory. When another process later requests to open the object, the server finds or creates a process_group with exactly the two processes in it and then migrates the shared portion of the object to the new shared memory slab. The migration is transparent to the client -- if a process is waiting (natively) on the object it awakens its threads when the migration is done so that one of them can request the new shared memory data, map it into memory and continue its operation. Similarly, when a process closes such an object, it is again migrated back to a process_group that only contains the remaining processes who have access to it (or destroys it). Sometimes traditional server-side synchronization objects are needed (e.g., for a critical section) and these are created by adding a new SYNC_OBJECT_ACCESS_SERVER_ONLY access flag to the request. The shared portion of the object is 64-bits: * 32-bits of data, * 4-bits of flags, and * a 28-bit FNV1a hash The 28 bits of hash are verified with every operation to detect if the shared memory portion of the object has been incorrectly modified. Although not infallible, the chances are somewhere around one in a million that an incorrect modification would not be detected. Other Solutions I should note that the addition of SGX extensions, although intended for cryptography and sensitive data, might provide a superior solution to optimizing synchronization objects as well as many other operations that require a server call. An SGX enclave provides a mechanism to share memory in userspace while restricting, at the CPU level, what code is allowed to read or alter that memory. This could be exploited to write a sort-of Wine Demi-Kernel that lives in the process space of each client process, reading and manipulating memory shared from wineserver with exceptional integrity guarantees. Thanks, Daniel

1 0

Release
by Alexandre Julliard 12 Jan '18

12 Jan '18

Folks, I think that at this point, we have fixed most of the bugs that could be fixed during code freeze, so it looks like rc6 is going to be the last rc. Please test it to confirm that there are no last minute issues. Unless something major comes up, I'm planning to release the final 3.0 in a few days (as soon as I'm done writing the release notes...) Thank you all for your work! -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH vkd3d 01/12] libs/vkd3d: Validate miplevel count while creating resources.
by Józef Kucia 12 Jan '18

12 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> vkd3d_log2i() is imported from wined3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 1 + include/private/vkd3d_common.h | 32 ++++++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 40 +++++++++++++++++++++++++++++++++++----- m4/check-builtin-functions.m4 | 10 ++++++++++ tests/d3d12.c | 25 +++++++++++++++++++++++++ 5 files changed, 103 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 27c03a6c9400..d13b440755cd 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ AS_IF([test "x$with_spirv_tools" = "xyes"], PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) dnl Check for functions +VKD3D_CHECK_BUILTIN_CLZ VKD3D_CHECK_BUILTIN_POPCOUNT VKD3D_CHECK_SYNC_ADD_AND_FETCH_FUNC VKD3D_CHECK_SYNC_SUB_AND_FETCH_FUNC diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index ce8f32e1b1aa..2e3873b82440 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -50,6 +50,38 @@ static inline unsigned int vkd3d_popcount(unsigned int v) #endif } +/* Undefined for x == 0. */ +static inline unsigned int vkd3d_log2i(unsigned int x) +{ +#ifdef HAVE_BUILTIN_CLZ + return __builtin_clz(x) ^ 0x1f; +#else + static const unsigned int l[] = + { + ~0u, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + unsigned int i; + + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 + : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif +} + #ifndef _WIN32 # if HAVE_SYNC_ADD_AND_FETCH static inline LONG InterlockedIncrement(LONG volatile *x) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 72848a4457b7..264578bd31a8 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -103,14 +103,16 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, } static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_device *device, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc) + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; + const D3D12_RESOURCE_DESC *desc; VkImageCreateInfo image_info; VkResult vr; + desc = &resource->desc; + if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) { WARN("Invalid DXGI format %#x.\n", desc->Format); @@ -606,6 +608,30 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) return impl_from_ID3D12Resource(iface); } +static HRESULT validate_buffer_desc(const D3D12_RESOURCE_DESC *desc) +{ + if (desc->MipLevels != 1) + { + WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); + return E_INVALIDARG; + } + + return S_OK; +} + +static HRESULT validate_texture_desc(D3D12_RESOURCE_DESC *desc) +{ + if (!desc->MipLevels) + { + unsigned int size = max(desc->Width, desc->Height); + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + size = max(size, desc->DepthOrArraySize); + desc->MipLevels = vkd3d_log2i(size) + 1; + } + + return S_OK; +} + static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, @@ -658,8 +684,10 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: - if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, desc, - &resource->u.vk_buffer))) + if (FAILED(hr = validate_buffer_desc(&resource->desc))) + return hr; + if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, + &resource->desc, &resource->u.vk_buffer))) return hr; if (!(resource->gpu_address = vkd3d_gpu_va_allocator_allocate(&device->gpu_va_allocator, desc->Width, resource))) @@ -679,8 +707,10 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st case D3D12_RESOURCE_DIMENSION_TEXTURE1D: case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + if (FAILED(hr = validate_texture_desc(&resource->desc))) + return hr; resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; - if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags, desc))) + if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; if (FAILED(hr = vkd3d_allocate_image_memory(resource, device, heap_properties, heap_flags))) { diff --git a/m4/check-builtin-functions.m4 b/m4/check-builtin-functions.m4 index c09eb4748a3a..2b24a802a3e3 100644 --- a/m4/check-builtin-functions.m4 +++ b/m4/check-builtin-functions.m4 @@ -18,6 +18,16 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return __sync_sub_and_fetch((in [Define to 1 if you have __sync_sub_and_fetch.])], [AC_MSG_RESULT([no])])]) +dnl VKD3D_CHECK_BUILTIN_CLZ +AC_DEFUN([VKD3D_CHECK_BUILTIN_CLZ], +[AC_MSG_CHECKING([for __builtin_clz]) +AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return __builtin_clz(0); }])], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_BUILTIN_CLZ], + [1], + [Define to 1 if you have __builtin_clz.])], + [AC_MSG_RESULT([no])])]) + dnl VKD3D_CHECK_BUILTIN_POPCOUNT AC_DEFUN([VKD3D_CHECK_BUILTIN_POPCOUNT], [AC_MSG_CHECKING([for __builtin_popcount]) diff --git a/tests/d3d12.c b/tests/d3d12.c index dfc9257bff61..55116204a209 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2213,6 +2213,24 @@ static void test_create_committed_resource(void) refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + resource_desc.MipLevels = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + resource_desc = ID3D12Resource_GetDesc(resource); + ok(resource_desc.MipLevels == 6, "Got unexpected miplevels %u.\n", resource_desc.MipLevels); + ID3D12Resource_Release(resource); + resource_desc.MipLevels = 10; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + resource_desc = ID3D12Resource_GetDesc(resource); + ok(resource_desc.MipLevels == 10, "Got unexpected miplevels %u.\n", resource_desc.MipLevels); + ID3D12Resource_Release(resource); + resource_desc.MipLevels = 1; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &clear_value, &IID_ID3D12Resource, (void **)&resource); @@ -2291,6 +2309,13 @@ static void test_create_committed_resource(void) refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + resource_desc.MipLevels = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Failed to create committed resource, hr %#x.\n", hr); + resource_desc.MipLevels = 1; + /* The clear value must be NULL for buffers. */ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, &clear_value, -- 2.13.6

3 25

[PATCH] comctl32/tests: Add EM_GETLINE test
by Nikolay Sivov 12 Jan '18

12 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 9feb9b42bc..77116837df 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -558,6 +558,17 @@ static HWND create_editcontrol (DWORD style, DWORD exstyle) return handle; } +static HWND create_editcontrolW(DWORD style, DWORD exstyle) +{ + static const WCHAR testtextW[] = {'T','e','s','t',' ','t','e','x','t',0}; + HWND handle; + + handle = CreateWindowExW(exstyle, WC_EDITW, testtextW, style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok(handle != NULL, "Failed to create Edit control.\n"); + return handle; +} + static HWND create_child_editcontrol (DWORD style, DWORD exstyle) { HWND parentWnd; @@ -2922,6 +2933,55 @@ static void test_paste(void) DestroyWindow(hMultilineEdit); } +static void test_EM_GETLINE(void) +{ + HWND hwnd[2]; + int i; + + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + { + static const WCHAR strW[] = {'t','e','x','t',0}; + static const char *str = "text"; + WCHAR buffW[16]; + char buff[16]; + int r; + + todo_wine_if(i == 0) + ok(IsWindowUnicode(hwnd[i]), "Expected unicode window.\n"); + + SendMessageA(hwnd[i], WM_SETTEXT, 0, (LPARAM)str); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 0, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 1, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hwnd[i]); + } +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -2961,6 +3021,7 @@ START_TEST(edit) test_contextmenu(); test_EM_GETHANDLE(); test_paste(); + test_EM_GETLINE(); UnregisterWindowClasses(); -- 2.15.1

1 0

[PATCH] user32/tests: Add EM_GETLINE test
by Nikolay Sivov 12 Jan '18

12 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/edit.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e334be1ddd..de8a349e13 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -557,6 +557,18 @@ static HWND create_editcontrol (DWORD style, DWORD exstyle) return handle; } +static HWND create_editcontrolW(DWORD style, DWORD exstyle) +{ + static const WCHAR testtextW[] = {'T','e','s','t',' ','t','e','x','t',0}; + static const WCHAR editW[] = {'E','d','i','t',0}; + HWND handle; + + handle = CreateWindowExW(exstyle, editW, testtextW, style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok(handle != NULL, "Failed to create Edit control.\n"); + return handle; +} + static HWND create_child_editcontrol (DWORD style, DWORD exstyle) { HWND parentWnd; @@ -2936,6 +2948,57 @@ static void test_paste(void) DestroyWindow(hMultilineEdit); } +static void test_EM_GETLINE(void) +{ + HWND hwnd[2]; + int i; + + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + { + static const WCHAR strW[] = {'t','e','x','t',0}; + static const char *str = "text"; + WCHAR buffW[16]; + char buff[16]; + int r; + + if (i == 0) + ok(!IsWindowUnicode(hwnd[i]), "Expected ansi window.\n"); + else + ok(IsWindowUnicode(hwnd[i]), "Expected unicode window.\n"); + + SendMessageA(hwnd[i], WM_SETTEXT, 0, (LPARAM)str); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 0, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 1, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hwnd[i]); + } +} + START_TEST(edit) { BOOL b; @@ -2970,6 +3033,7 @@ START_TEST(edit) test_contextmenu(); test_EM_GETHANDLE(); test_paste(); + test_EM_GETLINE(); UnregisterWindowClasses(); } -- 2.15.1

1 0

[PATCH] msxml3/tests: Use temporary user directory for test files
by Nikolay Sivov 12 Jan '18

12 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1306590894..7c56015235 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10155,16 +10155,20 @@ static void write_to_file(const char *name, const char *data) static void test_load(void) { IXMLDOMDocument *doc, *doc2; + BSTR pathW, bstr1, bstr2; IXMLDOMNodeList *list; IXMLDOMElement *elem; + char path[MAX_PATH]; VARIANT_BOOL b; VARIANT src; HRESULT hr; - BSTR path, bstr1, bstr2; void* ptr; + GetTempPathA(MAX_PATH, path); + strcat(path, "winetest.xml"); + /* prepare a file */ - write_to_file("test.xml", win1252xml); + write_to_file(path, win1252xml); doc = create_document(&IID_IXMLDOMDocument); @@ -10175,11 +10179,11 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); - path = _bstr_("test.xml"); + pathW = _bstr_(path); /* load from path: VT_BSTR */ V_VT(&src) = VT_BSTR; - V_BSTR(&src) = path; + V_BSTR(&src) = pathW; hr = IXMLDOMDocument_load(doc, src, &b); EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); @@ -10191,7 +10195,7 @@ static void test_load(void) /* load from a path: VT_BSTR|VT_BYREF */ V_VT(&src) = VT_BSTR | VT_BYREF; - V_BSTRREF(&src) = &path; + V_BSTRREF(&src) = &pathW; hr = IXMLDOMDocument_load(doc, src, &b); EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); @@ -10229,13 +10233,13 @@ static void test_load(void) ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(bstr1); - DeleteFileA("test.xml"); + DeleteFileA(path); /* load from existing path, no xml content */ - write_to_file("test.xml", nocontent); + write_to_file(path, nocontent); V_VT(&src) = VT_BSTR; - V_BSTR(&src) = path; + V_BSTR(&src) = pathW; b = VARIANT_TRUE; hr = IXMLDOMDocument_load(doc, src, &b); ok(hr == S_FALSE, "got 0x%08x\n", hr); @@ -10246,7 +10250,7 @@ static void test_load(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(bstr1 == NULL, "got %p\n", bstr1); - DeleteFileA("test.xml"); + DeleteFileA(path); IXMLDOMDocument_Release(doc); doc = create_document(&IID_IXMLDOMDocument); -- 2.15.1

1 0

[PATCH] user32: Make functions use display dc thread-safe
by 吕果 12 Jan '18

12 Jan '18

Some functions in sysparams.c invoke get_display_dc to get display dc and then use it without lock mechanism. it will cause condition race in multi-thread. PS: I dont't kown how to make a test than can stably run into this problem, but call GetSystemMetrics(SM_CXSCREEN) within a tight loop in different thread will get zero finally.

4 3

[PATCH v2 1/2] shell32/tests: Drop shell folder test dynamic imports for Windows <= 2000
by Alex Henrie 12 Jan '18

12 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 672 +++++++++++++++-------------------------- 1 file changed, 238 insertions(+), 434 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1ee02743f5..c8cbfda05f 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -45,17 +45,6 @@ DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0 static IMalloc *ppM; -static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*); -static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); -static HRESULT (WINAPI *pSHGetFolderPathAndSubDirA)(HWND, int, HANDLE, DWORD, LPCSTR, LPSTR); -static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); -static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); -static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); -static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); -static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); -static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); -static void (WINAPI *pILFree)(LPITEMIDLIST); -static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); static HRESULT (WINAPI *pSHCreateItemFromRelativeName)(IShellItem*,PCWSTR,IBindCtx*,REFIID,void**); @@ -65,18 +54,13 @@ static HRESULT (WINAPI *pSHCreateShellItemArray)(LPCITEMIDLIST,IShellFolder*,UIN static HRESULT (WINAPI *pSHCreateShellItemArrayFromIDLists)(UINT, PCIDLIST_ABSOLUTE*, IShellItemArray**); static HRESULT (WINAPI *pSHCreateShellItemArrayFromDataObject)(IDataObject*, REFIID, void **); static HRESULT (WINAPI *pSHCreateShellItemArrayFromShellItem)(IShellItem*, REFIID, void **); -static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); -static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); -static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); -static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); -static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static WCHAR *make_wstr(const char *str) @@ -115,7 +99,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) - MAKEFUNC(SHBindToParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -125,13 +108,6 @@ static void init_function_pointers(void) MAKEFUNC(SHCreateShellItemArrayFromIDLists); MAKEFUNC(SHCreateShellItemArrayFromDataObject); MAKEFUNC(SHCreateShellItemArrayFromShellItem); - MAKEFUNC(SHGetFolderPathA); - MAKEFUNC(SHGetFolderPathAndSubDirA); - MAKEFUNC(SHGetPathFromIDListW); - MAKEFUNC(SHGetSpecialFolderPathA); - MAKEFUNC(SHGetSpecialFolderPathW); - MAKEFUNC(SHGetSpecialFolderLocation); - MAKEFUNC(SHParseDisplayName); MAKEFUNC(SHGetKnownFolderPath); MAKEFUNC(SHGetNameFromIDList); MAKEFUNC(SHGetItemFromDataObject); @@ -141,15 +117,6 @@ static void init_function_pointers(void) MAKEFUNC(SHGetPathFromIDListEx); #undef MAKEFUNC -#define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) - MAKEFUNC_ORD(ILFindLastID, 16); - MAKEFUNC_ORD(ILIsEqual, 21); - MAKEFUNC_ORD(ILCombine, 25); - MAKEFUNC_ORD(SHILCreateFromPath, 28); - MAKEFUNC_ORD(ILFree, 155); - MAKEFUNC_ORD(SHSimpleIDListFromPathAW, 162); -#undef MAKEFUNC_ORD - /* test named exports */ ptr = GetProcAddress(hmod, "ILFree"); ok(broken(ptr == 0) || ptr != 0, "expected named export for ILFree\n"); @@ -177,12 +144,8 @@ static void init_function_pointers(void) #undef TESTNAMED } - hmod = GetModuleHandleA("shlwapi.dll"); - pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); - hmod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void*)GetProcAddress(hmod, "IsWow64Process"); - pGetSystemWow64DirectoryW = (void*)GetProcAddress(hmod, "GetSystemWow64DirectoryW"); hr = SHGetMalloc(&ppM); ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); @@ -225,12 +188,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "Expected SHGetDesktopFolder to return S_OK, got 0x%08x\n", hr); if(hr != S_OK) return; - /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ if (pSHCreateShellItem) { if (0) { - /* null name and pidl, also crashes on Windows 8 */ + /* null name and pidl, crashes on Windows 8 */ hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, NULL, NULL, NULL, 0); ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); @@ -244,7 +206,7 @@ static void test_ParseDisplayName(void) ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); } else - win_skip("Tests would crash on W2K and below\n"); + win_skip("SHCreateShellItem requires XP SP1 or later\n"); MultiByteToWideChar(CP_ACP, 0, cInetTestA, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, @@ -253,8 +215,8 @@ static void test_ParseDisplayName(void) "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } @@ -265,8 +227,8 @@ static void test_ParseDisplayName(void) "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } @@ -299,13 +261,8 @@ static void test_ParseDisplayName(void) /* I thought that perhaps the DesktopFolder's ParseDisplayName would recognize the * path corresponding to CSIDL_PERSONAL and return a CLSID_MyDocuments PIDL. Turns * out it doesn't. The magic seems to happen in the file dialogs, then. */ - if (!pSHGetSpecialFolderPathW || !pILFindLastID) - { - win_skip("SHGetSpecialFolderPathW and/or ILFindLastID are not available\n"); - goto finished; - } - bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); + bRes = SHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %u\n", GetLastError()); if (!bRes) goto finished; @@ -313,12 +270,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "DesktopFolder->ParseDisplayName failed. hr = %08x.\n", hr); if (hr != S_OK) goto finished; - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31 || - pILFindLastID(newPIDL)->mkid.abID[0] == 0xb1, /* Win98 */ - "Last pidl should be of type PT_FOLDER or PT_IESPECIAL2, but is: %02x\n", - pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x31, + "Last pidl should be of type PT_FOLDER, but is: %02x\n", + ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); - + finished: IShellFolder_Release(IDesktopFolder); } @@ -602,7 +558,7 @@ if (0) IShellFolder_Release(psfChild); } - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -628,7 +584,7 @@ if (0) broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -654,7 +610,7 @@ if (0) broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -662,59 +618,42 @@ if (0) win_skip("Failed to create .foo testfile.\n"); /* And on the desktop */ - if(pSHGetSpecialFolderPathA) - { - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_html); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) - { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == S_OK || - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - if(!DeleteFileA(pathA)) - trace("Failed to delete: %d\n", GetLastError()); + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_html); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - } - else - win_skip("Failed to create .html testfile.\n"); + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_foo); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) - { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - DeleteFileA(pathA); - } - else - win_skip("Failed to create .foo testfile.\n"); - } + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void **)&psfChild); + ok(hr == S_OK || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); + if(!DeleteFileA(pathA)) + trace("Failed to delete: %d\n", GetLastError()); + + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_foo); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void **)&psfChild); + ok(hr == E_FAIL || /* Vista+ */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); + DeleteFileA(pathA); IShellFolder_Release(psfDesktop); } @@ -737,6 +676,10 @@ static void test_GetDisplayName(void) static const WCHAR wszFileName[] = { 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; static const WCHAR wszDirName[] = { 'w','i','n','e','t','e','s','t',0 }; + /* It's ok to use this fixed path. Call will fail anyway. */ + WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; + LPITEMIDLIST pidlNew; + /* I'm trying to figure if there is a functional difference between calling * SHGetPathFromIDListW and calling GetDisplayNameOf(SHGDN_FORPARSING) after * binding to the shellfolder. One thing I thought of was that perhaps @@ -745,13 +688,8 @@ static void test_GetDisplayName(void) * no functional difference in this respect. */ - if(!pSHGetSpecialFolderPathA) { - win_skip("SHGetSpecialFolderPathA is not available\n"); - return; - } - /* First creating a directory in MyDocuments and a file in this directory. */ - result = pSHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); + result = SHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); ok(result, "SHGetSpecialFolderPathA failed! Last error: %u\n", GetLastError()); if (!result) return; @@ -787,7 +725,7 @@ static void test_GetDisplayName(void) return; } - pidlLast = pILFindLastID(pidlTestFile); + pidlLast = ILFindLastID(pidlTestFile); ok(pidlLast->mkid.cb >=76 || broken(pidlLast->mkid.cb == 28) || /* W2K */ broken(pidlLast->mkid.cb == 40), /* Win9x, WinME */ @@ -816,77 +754,52 @@ static void test_GetDisplayName(void) IUnknown_Release(psfFile); } - if (!pSHBindToParent) - { - win_skip("SHBindToParent is missing\n"); - DeleteFileA(szTestFile); - RemoveDirectoryA(szTestDir); - return; - } - /* Some tests for IShellFolder::SetNameOf */ - if (pSHGetFolderPathAndSubDirA) - { - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); - ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); - if (hr == S_OK) { - /* It's ok to use this fixed path. Call will fail anyway. */ - WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; - LPITEMIDLIST pidlNew; - - /* The pidl returned through the last parameter of SetNameOf is a simple one. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); - ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - if (hr == S_OK) - { - ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, - "pidl returned from SetNameOf should be simple!\n"); + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); + ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); - /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf - * is implemented on top of SHFileOperation in WinXP. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, - SHGDN_FORPARSING, NULL); - ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); + /* The pidl returned through the last parameter of SetNameOf is a simple one. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); + ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - /* Rename the file back to its original name. SetNameOf ignores the fact, that the - * SHGDN flags specify an absolute path. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); - ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); + ok (((ITEMIDLIST *)((BYTE *)pidlNew + pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); - pILFree(pidlNew); - } + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); - IShellFolder_Release(psfPersonal); - } - } - else - win_skip("Avoid needs of interaction on Win2k\n"); + /* Rename the file back to its original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); + + ILFree(pidlNew); + IShellFolder_Release(psfPersonal); /* Deleting the file and the directory */ DeleteFileA(szTestFile); RemoveDirectoryA(szTestDir); /* SHGetPathFromIDListW still works, although the file is not present anymore. */ - if (pSHGetPathFromIDListW) - { - result = pSHGetPathFromIDListW(pidlTestFile, wszTestFile2); - ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); - } + result = SHGetPathFromIDListW(pidlTestFile, wszTestFile2); + ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); /* SHBindToParent fails, if called with a NULL PIDL. */ - hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(NULL, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); ok (hr != S_OK, "SHBindToParent(NULL) should fail!\n"); /* But it succeeds with an empty PIDL. */ - hr = pSHBindToParent(pidlEmpty, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlEmpty, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent(empty PIDL) should succeed! hr = %08x\n", hr); ok (pidlLast == pidlEmpty, "The last element of an empty PIDL should be the PIDL itself!\n"); if (hr == S_OK) IShellFolder_Release(psfPersonal); - + /* Binding to the folder and querying the display name of the file also works. */ - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(psfDesktop); @@ -895,9 +808,9 @@ static void test_GetDisplayName(void) /* This test shows that Windows doesn't allocate a new pidlLast, but returns a pointer into * pidlTestFile (In accordance with MSDN). */ - ok (pILFindLastID(pidlTestFile) == pidlLast, + ok (ILFindLastID(pidlTestFile) == pidlLast, "SHBindToParent doesn't return the last id of the pidl param!\n"); - + hr = IShellFolder_GetDisplayNameOf(psfPersonal, pidlLast, SHGDN_FORPARSING, &strret); ok (hr == S_OK, "Personal->GetDisplayNameOf failed! hr = %08x\n", hr); if (hr != S_OK) { @@ -906,13 +819,10 @@ static void test_GetDisplayName(void) return; } - if (pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); - } - + hr = StrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); + ILFree(pidlTestFile); IShellFolder_Release(psfDesktop); IShellFolder_Release(psfPersonal); @@ -1246,21 +1156,15 @@ static void test_SHGetPathFromIDList(void) 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; LPITEMIDLIST pidlPrograms; - if(!pSHGetPathFromIDListW || !pSHGetSpecialFolderPathW) - { - win_skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); - return; - } - /* Calling SHGetPathFromIDListW with no pidl should return the empty string */ wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(NULL, wszPath); + result = SHGetPathFromIDListW(NULL, wszPath); ok(!result, "Expected failure\n"); ok(!wszPath[0], "Expected empty string\n"); /* Calling SHGetPathFromIDListW with an empty pidl should return the desktop folder's path. */ - result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; @@ -1273,7 +1177,7 @@ static void test_SHGetPathFromIDList(void) return; } - result = pSHGetPathFromIDListW(pidlEmpty, wszPath); + result = SHGetPathFromIDListW(pidlEmpty, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return; ok(!lstrcmpiW(wszDesktop, wszPath), "SHGetPathFromIDListW didn't return desktop path for empty pidl!\n"); @@ -1293,7 +1197,7 @@ static void test_SHGetPathFromIDList(void) SetLastError(0xdeadbeef); wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(pidlMyComputer, wszPath); + result = SHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n"); ok (GetLastError()==0xdeadbeef || GetLastError()==ERROR_SUCCESS, /* Vista and higher */ @@ -1306,7 +1210,7 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlMyComputer); - result = pSHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!result) { IShellFolder_Release(psfDesktop); @@ -1341,15 +1245,12 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); return; } - if (pStrRetToBufW) - { - pStrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); - ok(0 == lstrcmpW(wszFileName, wszPath), - "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " - "returned incorrect path for file placed on desktop\n"); - } + StrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); + ok(0 == lstrcmpW(wszFileName, wszPath), + "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " + "returned incorrect path for file placed on desktop\n"); - result = pSHGetPathFromIDListW(pidlTestFile, wszPath); + result = SHGetPathFromIDListW(pidlTestFile, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); ok(0 == lstrcmpW(wszFileName, wszPath), "SHGetPathFromIDListW returned incorrect path for file placed on desktop\n"); @@ -1381,11 +1282,11 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); /* Test if we can get the path from the start menu "program files" PIDL. */ - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); ok(hr == S_OK, "SHGetFolderLocation failed: 0x%08x\n", hr); SetLastError(0xdeadbeef); - result = pSHGetPathFromIDListW(pidlPrograms, wszPath); + result = SHGetPathFromIDListW(pidlPrograms, wszPath); IMalloc_Free(ppM, pidlPrograms); ok(result, "SHGetPathFromIDListW failed\n"); } @@ -1501,7 +1402,7 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC "Wrong variant type for 'Target' property!\n"); if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG; - result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return E_INVALIDARG; @@ -1578,17 +1479,6 @@ static void test_FolderShortcut(void) { static const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; - if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) { - win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n"); - return; - } - - if (!pSHGetFolderPathAndSubDirA) - { - win_skip("FolderShortcut test doesn't work on Win2k\n"); - return; - } - /* These tests basically show, that CLSID_FolderShortcuts are initialized * via their IPersistPropertyBag interface. And that the target folder * is taken from the IPropertyBag's 'Target' property. @@ -1623,11 +1513,11 @@ static void test_FolderShortcut(void) { return; } - result = pSHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return; - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); hr = IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); @@ -1668,16 +1558,16 @@ static void test_FolderShortcut(void) { ok (hr == S_OK, "IPersistFolder3::Initialize failed! hr = %08x\n", hr); if (hr != S_OK) { IPersistFolder3_Release(pPersistFolder3); - pILFree(pidlWineTestFolder); + ILFree(pidlWineTestFolder); return; } hr = IPersistFolder3_GetCurFolder(pPersistFolder3, &pidlCurrentFolder); ok(hr == S_OK, "IPersistFolder3_GetCurFolder failed! hr=0x%08x\n", hr); - ok(pILIsEqual(pidlCurrentFolder, pidlWineTestFolder), + ok(ILIsEqual(pidlCurrentFolder, pidlWineTestFolder), "IPersistFolder3_GetCurFolder should return pidlWineTestFolder!\n"); - pILFree(pidlCurrentFolder); - pILFree(pidlWineTestFolder); + ILFree(pidlCurrentFolder); + ILFree(pidlWineTestFolder); hr = IPersistFolder3_QueryInterface(pPersistFolder3, &IID_IShellFolder, (LPVOID*)&pShellFolder); IPersistFolder3_Release(pPersistFolder3); @@ -1691,7 +1581,7 @@ static void test_FolderShortcut(void) { return; } - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); /* Next few lines are meant to show that children of FolderShortcuts are not FolderShortcuts, @@ -1715,7 +1605,7 @@ static void test_FolderShortcut(void) { hr = IShellFolder_BindToObject(pShellFolder, pidlSubFolder, NULL, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); IShellFolder_Release(pShellFolder); - pILFree(pidlSubFolder); + ILFree(pidlSubFolder); ok (hr == S_OK, "IShellFolder::BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1767,9 +1657,7 @@ static void test_ITEMIDLIST_format(void) { { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; int i; - if (!pSHGetSpecialFolderPathW) return; - - bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); + bResult = SHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!bResult) return; @@ -1796,7 +1684,7 @@ static void test_ITEMIDLIST_format(void) { hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, (LPVOID*)&psfPersonal); IShellFolder_Release(psfDesktop); - pILFree(pidlPersonal); + ILFree(pidlPersonal); ok(hr == S_OK, "psfDesktop->BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1907,7 +1795,7 @@ static void test_ITEMIDLIST_format(void) { } } - pILFree(pidlFile); + ILFree(pidlFile); } IShellFolder_Release(psfPersonal); @@ -1923,16 +1811,11 @@ static void test_SHGetFolderPathA(void) HRESULT hr; HKEY key; - if (!pSHGetFolderPathA) - { - win_skip("SHGetFolderPathA not present\n"); - return; - } if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Program Files (x86) not supported\n" ); @@ -1965,9 +1848,9 @@ static void test_SHGetFolderPathA(void) RegCloseKey( key ); } - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Common Files (x86) not supported\n" ); @@ -2012,17 +1895,7 @@ static void test_SHGetFolderPathAndSubDirA(void) static char testpath[MAX_PATH]; static char toolongpath[MAX_PATH+1]; - if(!pSHGetFolderPathAndSubDirA) - { - win_skip("SHGetFolderPathAndSubDirA not present!\n"); - return; - } - - if(!pSHGetFolderPathA) { - win_skip("SHGetFolderPathA not present!\n"); - return; - } - if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) + if(FAILED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) { win_skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); return; @@ -2043,11 +1916,11 @@ static void test_SHGetFolderPathAndSubDirA(void) } /* test invalid second parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); /* test fourth parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); switch(ret) { case S_OK: /* winvista */ ok(!strncmp(appdata, testpath, strlen(appdata)), @@ -2063,40 +1936,40 @@ static void test_SHGetFolderPathAndSubDirA(void) /* test fifth parameter */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); for(i=0; i< MAX_PATH; i++) toolongpath[i] = '0' + i % 10; toolongpath[MAX_PATH] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); ok((S_OK == ret) || (E_INVALIDARG == ret), "expected S_OK or E_INVALIDARG, got %x\n", ret); /* test a not existing path */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), ret); /* create a directory inside a not existing directory */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!strncmp(appdata, testpath, strlen(appdata)), "expected %s to start with %s\n", testpath, appdata); @@ -2181,40 +2054,27 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ - "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); - } + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); /* editing name is also read from the resource */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ - "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); - } + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); /* parsing name is unchanged */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); - } + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); IShellFolder_Release(IDesktopFolder); IShellFolder_Release(testIShellFolder); @@ -2253,16 +2113,8 @@ static void test_SHCreateShellItem(void) return; } - if(pSHGetSpecialFolderLocation) - { - ret = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); - ok(ret == S_OK, "Got 0x%08x\n", ret); - } - else - { - win_skip("pSHGetSpecialFolderLocation missing.\n"); - pidl_desktop = NULL; - } + ret = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(ret == S_OK, "Got 0x%08x\n", ret); MultiByteToWideChar(CP_ACP, 0, curdirA, -1, curdirW, MAX_PATH); @@ -2280,7 +2132,7 @@ static void test_SHCreateShellItem(void) ret = IShellFolder_ParseDisplayName(currentfolder, NULL, NULL, testfileW, NULL, &pidl_testfile, NULL); ok(SUCCEEDED(ret), "ParseDisplayName returned %x\n", ret); - pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); + pidl_abstestfile = ILCombine(pidl_cwd, pidl_testfile); shellitem = (void*)0xdeadbeef; ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); @@ -2308,7 +2160,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2328,7 +2180,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2346,7 +2198,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2369,7 +2221,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2390,7 +2242,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2410,7 +2262,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2495,7 +2347,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2515,7 +2367,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2592,7 +2444,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare fail: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2683,7 +2535,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2715,10 +2567,10 @@ static void test_SHCreateShellItem(void) win_skip("No SHCreateItemInKnownFolder or SHGetKnownFolderPath\n"); DeleteFileA(".\\testfile"); - pILFree(pidl_abstestfile); - pILFree(pidl_testfile); - pILFree(pidl_desktop); - pILFree(pidl_cwd); + ILFree(pidl_abstestfile); + ILFree(pidl_testfile); + ILFree(pidl_desktop); + ILFree(pidl_cwd); IShellFolder_Release(currentfolder); IShellFolder_Release(desktopfolder); } @@ -2742,11 +2594,8 @@ static void test_SHGetNameFromIDList(void) return; } - /* These should be available on any platform that passed the above test. */ + /* This should be available on any platform that passed the above test. */ ok(pSHCreateShellItem != NULL, "SHCreateShellItem missing.\n"); - ok(pSHBindToParent != NULL, "SHBindToParent missing.\n"); - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - ok(pStrRetToBufW != NULL, "StrRetToBufW missing.\n"); if(0) { @@ -2758,7 +2607,7 @@ static void test_SHGetNameFromIDList(void) ok(hres == E_INVALIDARG, "Got 0x%08x\n", hres); /* Test the desktop */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2786,7 +2635,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2797,16 +2646,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == TRUE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == TRUE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2814,10 +2660,10 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); /* Test the control panel */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2845,7 +2691,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2856,16 +2702,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == FALSE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == FALSE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */, @@ -2874,7 +2717,7 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); } static void test_SHGetItemFromDataObject(void) @@ -2979,7 +2822,7 @@ static void test_SHGetItemFromDataObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3054,7 +2897,7 @@ static void test_ShellItemCompare(void) { hr = pSHCreateShellItem(NULL, NULL, pidl_testfile, &psi[i]); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testfile); + ILFree(pidl_testfile); } if(FAILED(hr)) failed = TRUE; } @@ -3289,8 +3132,6 @@ static void test_SHGetIDListFromObject(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes native */ @@ -3321,7 +3162,7 @@ static void test_SHGetIDListFromObject(void) HeapFree(GetProcessHeap(), 0, punkimpl); pidl_desktop = NULL; - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(pidl_desktop != NULL, "Failed to get desktop pidl.\n"); SHGetDesktopFolder(&psfdesktop); @@ -3339,7 +3180,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(shellitem); } @@ -3353,7 +3194,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } hres = IShellFolder_CreateViewObject(psfdesktop, NULL, &IID_IShellView, (void**)&psv); @@ -3370,7 +3211,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } /* Test IDataObject */ @@ -3397,7 +3238,7 @@ static void test_SHGetIDListFromObject(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(pidl != NULL, "pidl is NULL.\n"); ok(ILIsEqual(pidl, apidl[0]), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); IDataObject_Release(pdo); } @@ -3425,7 +3266,7 @@ static void test_SHGetIDListFromObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3434,7 +3275,7 @@ static void test_SHGetIDListFromObject(void) } IShellFolder_Release(psfdesktop); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_SHGetItemFromObject(void) @@ -3527,8 +3368,6 @@ static void test_SHCreateShellItemArray(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes under native */ @@ -3548,10 +3387,10 @@ static void test_SHCreateShellItemArray(void) hr = pSHCreateShellItemArray(NULL, pdesktopsf, 1, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); hr = pSHCreateShellItemArray(pidl, NULL, 0, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pILFree(pidl); + ILFree(pidl); GetCurrentDirectoryW(MAX_PATH, cTestDirW); myPathAddBackslashW(cTestDirW); @@ -3572,7 +3411,7 @@ static void test_SHCreateShellItemArray(void) if(FAILED(hr)) { skip("Failed to set up environment for SHCreateShellItemArray tests.\n"); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); return; } @@ -3624,14 +3463,14 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_abs, pidl), "Pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IShellItemArray_Release(psia); } } @@ -3676,8 +3515,8 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl2 != NULL, "pidl2 was null.\n"); ok(ILIsEqual(pidl1, pidl2), "pidls not equal.\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); IShellItem_Release(psi2); } hr = IShellItemArray_GetItemAt(psia, 1, &psi2); @@ -3752,10 +3591,10 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl != NULL, "pidl as NULL.\n"); ok(ILIsEqual(pidl, pidl_abs), "pidls differ.\n"); - pILFree(pidl); + ILFree(pidl); IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } IShellItemArray_Release(psia); @@ -3764,7 +3603,7 @@ static void test_SHCreateShellItemArray(void) IDataObject_Release(pdo); } for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } else skip("No files found - skipping test.\n"); @@ -3843,7 +3682,7 @@ static void test_SHCreateShellItemArray(void) WCHAR desktoppath[MAX_PATH]; BOOL result; - result = pSHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); hr = IShellItem_GetDisplayName(psi, SIGDN_DESKTOPABSOLUTEPARSING, &path); @@ -3948,7 +3787,7 @@ static void test_SHCreateShellItemArray(void) IShellItemArray_Release(psia); } - pILFree(pidltest1); + ILFree(pidltest1); } IShellFolder_Release(pdesktopsf); @@ -3957,7 +3796,7 @@ static void test_SHCreateShellItemArray(void) skip("No SHCreateShellItemArrayFromIDLists.\n"); IShellFolder_Release(psf); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); } @@ -3991,7 +3830,7 @@ static void test_ShellItemArrayEnumItems(void) hr = IShellFolder_BindToObject(pdesktopsf, pidl_testdir, NULL, (REFIID)&IID_IShellFolder, (void**)&psf); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testdir); + ILFree(pidl_testdir); } IShellFolder_Release(pdesktopsf); if (FAILED(hr)) return; @@ -4110,7 +3949,7 @@ static void test_ShellItemArrayEnumItems(void) } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } } @@ -4127,7 +3966,7 @@ static void test_ShellItemBindToHandler(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4162,7 +4001,7 @@ static void test_ShellItemBindToHandler(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_desktop, pidl_tmp), "Pidl not equal (%p, %p)\n", pidl_desktop, pidl_tmp); - pILFree(pidl_tmp); + ILFree(pidl_tmp); } IPersistFolder2_Release(ppf2); } @@ -4276,7 +4115,7 @@ static void test_ShellItemBindToHandler(void) else skip("Failed to create ShellItem.\n"); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_ShellItemGetAttributes(void) @@ -4297,13 +4136,13 @@ static void test_ShellItemGetAttributes(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { hr = pSHCreateShellItem(NULL, NULL, pidl_desktop, &psi); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } if(FAILED(hr)) { @@ -4338,7 +4177,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_folder1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); lstrcpyW(buf, curdirW); lstrcatW(buf, testfile1W); @@ -4346,7 +4185,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_file1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); IShellFolder_Release(pdesktopsf); @@ -4421,7 +4260,7 @@ static void test_ShellItemArrayGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); for(i = 0; i < 5; i++) - pILFree((LPITEMIDLIST)pidl_array[i]); + ILFree((LPITEMIDLIST)pidl_array[i]); /* [testfolder/, testfolder/testfolder2] seems to break in Vista */ attr = 0xdeadbeef; @@ -4477,71 +4316,65 @@ static void test_SHParseDisplayName(void) HRESULT hr; BOOL ret, is_wow64; - if (!pSHParseDisplayName) - { - win_skip("SHParseDisplayName isn't available\n"); - return; - } - if (0) { /* crashes on native */ - pSHParseDisplayName(NULL, NULL, NULL, 0, NULL); + SHParseDisplayName(NULL, NULL, NULL, 0, NULL); nameW[0] = 0; - pSHParseDisplayName(nameW, NULL, NULL, 0, NULL); + SHParseDisplayName(nameW, NULL, NULL, 0, NULL); } pidl1 = (LPITEMIDLIST)0xdeadbeef; - hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); ok(broken(hr == E_OUTOFMEMORY) /* < Vista */ || hr == E_INVALIDARG, "failed %08x\n", hr); ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); /* dummy name */ nameW[0] = 0; - hr = pSHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, nameW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* with path */ GetWindowsDirectoryW( dirW, MAX_PATH ); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, dirW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* system32 is not redirected to syswow64 on WOW64 */ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - if (is_wow64 && pGetSystemWow64DirectoryW) + if (is_wow64) { UINT len; *dirW = 0; len = GetSystemDirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); *dirW = 0; - len = pGetSystemWow64DirectoryW(dirW, MAX_PATH); + len = GetSystemWow64DirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == FALSE, "expected different idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); } IShellFolder_Release(desktop); @@ -4595,7 +4428,7 @@ static void test_desktop_IPersist(void) hr = IPersistFolder2_GetCurFolder(ppf2, &pidl); ok(hr == S_OK, "got %08x\n", hr); ok(pidl != NULL, "pidl was NULL.\n"); - if(SUCCEEDED(hr)) pILFree(pidl); + if(SUCCEEDED(hr)) ILFree(pidl); IPersistFolder2_Release(ppf2); } @@ -4613,12 +4446,6 @@ static void test_GetUIObject(void) const WCHAR filename[] = {'\\','t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; - if(!pSHBindToParent) - { - win_skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -4636,7 +4463,7 @@ static void test_GetUIObject(void) { IShellFolder *psf; LPCITEMIDLIST pidl_child; - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4692,9 +4519,7 @@ static void test_GetUIObject(void) (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); -#define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA) - - if(count && !is_win2k()) /* Test is interactive on w2k, so skip */ + if(count) { CMINVOKECOMMANDINFO cmi; ZeroMemory(&cmi, sizeof(CMINVOKECOMMANDINFO)); @@ -4711,14 +4536,13 @@ static void test_GetUIObject(void) (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), "Got 0x%08x\n", hr); } -#undef is_win2k DestroyMenu(hmenu); IContextMenu_Release(pcm); } IShellFolder_Release(psf); } - if(pILFree) pILFree(pidl); + ILFree(pidl); } IShellFolder_Release(psf_desktop); @@ -4733,22 +4557,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) STRRET filename; HRESULT hr; - if(!pSHBindToParent){ - win_skip("SHBindToParent is not available, not performing full PIDL verification\n"); - if(path) - ok_(__FILE__,l)(pidl != NULL, "Expected PIDL to be non-NULL\n"); - else - ok_(__FILE__,l)(pidl == NULL, "Expected PIDL to be NULL\n"); - return; - } - if(path){ if(!pidl){ ok_(__FILE__,l)(0, "didn't get expected path (%s), instead: NULL\n", wine_dbgstr_w(path)); return; } - hr = pSHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&parent, &child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void **)&parent, &child); ok_(__FILE__,l)(hr == S_OK, "SHBindToParent failed: 0x%08x\n", hr); if(FAILED(hr)) return; @@ -4786,30 +4601,25 @@ static void test_SHSimpleIDListFromPath(void) LPITEMIDLIST pidl = NULL; - if(!pSHSimpleIDListFromPathAW){ - win_skip("SHSimpleIDListFromPathAW not available\n"); - return; - } - br = CreateDirectoryA(adirA, NULL); ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); br = RemoveDirectoryA(adirA); ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); } /* IFileSystemBindData impl */ @@ -5207,9 +5017,9 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].pidl = NULL; if(has_unicode) - hr = pSHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); else - hr = pSHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath((const void *)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE; @@ -5271,12 +5081,6 @@ static void test_SHCreateDefaultContextMenu(void) return; } - if(!pSHBindToParent) - { - skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -5293,7 +5097,7 @@ static void test_SHCreateDefaultContextMenu(void) if(SUCCEEDED(hr)) { - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, (LPCITEMIDLIST*)&pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void **)&folder, (const ITEMIDLIST **)&pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); IShellFolder_QueryInterface(folder,&IID_IPersistFolder2,(void**)&persist); @@ -5366,7 +5170,7 @@ static void test_DataObject(void) hres = IShellFolder_GetUIObjectOf(desktop, NULL, 1, (LPCITEMIDLIST*)&apidl, &IID_IDataObject, NULL, (void**)&data_obj); ok(hres == S_OK, "got %x\n", hres); - pILFree(apidl); + ILFree(apidl); IShellFolder_Release(desktop); cf_shellidlist = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); -- 2.15.1

1 1

[PATCH] shell32/tests: Drop shell folder test workarounds for Windows <= 2000
by Alex Henrie 12 Jan '18

12 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Coverity has been complaining about them. The most straightforward solution is to remove them all. dlls/shell32/tests/shlfolder.c | 905 ++++++++++++++--------------------------- 1 file changed, 312 insertions(+), 593 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1ee02743f5..46ce514260 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -45,17 +45,6 @@ DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0 static IMalloc *ppM; -static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*); -static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); -static HRESULT (WINAPI *pSHGetFolderPathAndSubDirA)(HWND, int, HANDLE, DWORD, LPCSTR, LPSTR); -static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); -static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); -static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); -static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); -static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); -static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); -static void (WINAPI *pILFree)(LPITEMIDLIST); -static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); static HRESULT (WINAPI *pSHCreateItemFromRelativeName)(IShellItem*,PCWSTR,IBindCtx*,REFIID,void**); @@ -65,18 +54,13 @@ static HRESULT (WINAPI *pSHCreateShellItemArray)(LPCITEMIDLIST,IShellFolder*,UIN static HRESULT (WINAPI *pSHCreateShellItemArrayFromIDLists)(UINT, PCIDLIST_ABSOLUTE*, IShellItemArray**); static HRESULT (WINAPI *pSHCreateShellItemArrayFromDataObject)(IDataObject*, REFIID, void **); static HRESULT (WINAPI *pSHCreateShellItemArrayFromShellItem)(IShellItem*, REFIID, void **); -static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); -static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); -static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); -static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); -static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static WCHAR *make_wstr(const char *str) @@ -115,7 +99,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) - MAKEFUNC(SHBindToParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -125,13 +108,6 @@ static void init_function_pointers(void) MAKEFUNC(SHCreateShellItemArrayFromIDLists); MAKEFUNC(SHCreateShellItemArrayFromDataObject); MAKEFUNC(SHCreateShellItemArrayFromShellItem); - MAKEFUNC(SHGetFolderPathA); - MAKEFUNC(SHGetFolderPathAndSubDirA); - MAKEFUNC(SHGetPathFromIDListW); - MAKEFUNC(SHGetSpecialFolderPathA); - MAKEFUNC(SHGetSpecialFolderPathW); - MAKEFUNC(SHGetSpecialFolderLocation); - MAKEFUNC(SHParseDisplayName); MAKEFUNC(SHGetKnownFolderPath); MAKEFUNC(SHGetNameFromIDList); MAKEFUNC(SHGetItemFromDataObject); @@ -141,15 +117,6 @@ static void init_function_pointers(void) MAKEFUNC(SHGetPathFromIDListEx); #undef MAKEFUNC -#define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) - MAKEFUNC_ORD(ILFindLastID, 16); - MAKEFUNC_ORD(ILIsEqual, 21); - MAKEFUNC_ORD(ILCombine, 25); - MAKEFUNC_ORD(SHILCreateFromPath, 28); - MAKEFUNC_ORD(ILFree, 155); - MAKEFUNC_ORD(SHSimpleIDListFromPathAW, 162); -#undef MAKEFUNC_ORD - /* test named exports */ ptr = GetProcAddress(hmod, "ILFree"); ok(broken(ptr == 0) || ptr != 0, "expected named export for ILFree\n"); @@ -177,12 +144,8 @@ static void init_function_pointers(void) #undef TESTNAMED } - hmod = GetModuleHandleA("shlwapi.dll"); - pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); - hmod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void*)GetProcAddress(hmod, "IsWow64Process"); - pGetSystemWow64DirectoryW = (void*)GetProcAddress(hmod, "GetSystemWow64DirectoryW"); hr = SHGetMalloc(&ppM); ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); @@ -225,12 +188,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "Expected SHGetDesktopFolder to return S_OK, got 0x%08x\n", hr); if(hr != S_OK) return; - /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ if (pSHCreateShellItem) { if (0) { - /* null name and pidl, also crashes on Windows 8 */ + /* null name and pidl, crashes on Windows 8 */ hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, NULL, NULL, NULL, 0); ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); @@ -244,29 +206,26 @@ static void test_ParseDisplayName(void) ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); } else - win_skip("Tests would crash on W2K and below\n"); + win_skip("SHCreateShellItem requires XP SP1 or later\n"); MultiByteToWideChar(CP_ACP, 0, cInetTestA, -1, cTestDirW, MAX_PATH); - hr = IShellFolder_ParseDisplayName(IDesktopFolder, - NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - todo_wine ok(hr == S_OK || broken(hr == E_FAIL) /* NT4 */, - "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); + todo_wine ok(hr == S_OK, "ParseDisplayName returned %08x, expected SUCCESS\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } MultiByteToWideChar(CP_ACP, 0, cInetTest2A, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - todo_wine ok(hr == S_OK || broken(hr == E_FAIL) /* NT4 */, - "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); + todo_wine ok(hr == S_OK, "ParseDisplayName returned %08x, expected SUCCESS\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } @@ -278,10 +237,10 @@ static void test_ParseDisplayName(void) } MultiByteToWideChar(CP_ACP, 0, cNonExistDir1A, -1, cTestDirW, MAX_PATH); - hr = IShellFolder_ParseDisplayName(IDesktopFolder, + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL), - "ParseDisplayName returned %08x, expected 80070002 or E_FAIL\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "ParseDisplayName returned %08x, expected 0x80070002\n", hr); res = GetFileAttributesA(cNonExistDir2A); if(res != INVALID_FILE_ATTRIBUTES) @@ -291,21 +250,15 @@ static void test_ParseDisplayName(void) } MultiByteToWideChar(CP_ACP, 0, cNonExistDir2A, -1, cTestDirW, MAX_PATH); - hr = IShellFolder_ParseDisplayName(IDesktopFolder, + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL) || (hr == E_INVALIDARG), - "ParseDisplayName returned %08x, expected 80070002, E_FAIL or E_INVALIDARG\n", hr); + todo_wine ok(hr == E_INVALIDARG, "ParseDisplayName returned %08x, expected E_INVALIDARG\n", hr); /* I thought that perhaps the DesktopFolder's ParseDisplayName would recognize the * path corresponding to CSIDL_PERSONAL and return a CLSID_MyDocuments PIDL. Turns * out it doesn't. The magic seems to happen in the file dialogs, then. */ - if (!pSHGetSpecialFolderPathW || !pILFindLastID) - { - win_skip("SHGetSpecialFolderPathW and/or ILFindLastID are not available\n"); - goto finished; - } - bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); + bRes = SHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %u\n", GetLastError()); if (!bRes) goto finished; @@ -313,12 +266,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "DesktopFolder->ParseDisplayName failed. hr = %08x.\n", hr); if (hr != S_OK) goto finished; - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31 || - pILFindLastID(newPIDL)->mkid.abID[0] == 0xb1, /* Win98 */ - "Last pidl should be of type PT_FOLDER or PT_IESPECIAL2, but is: %02x\n", - pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x31, + "Last pidl should be of type PT_FOLDER, but is: %02x\n", + ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); - + finished: IShellFolder_Release(IDesktopFolder); } @@ -441,7 +393,6 @@ static void test_EnumObjects(IShellFolder *iFolder) flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); ok(flags == (attrs[i]) || - flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR) || /* Win9x, NT4 */ flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); @@ -449,9 +400,7 @@ static void test_EnumObjects(IShellFolder *iFolder) hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == attrs[i] || - flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ - "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(flags == attrs[i], "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); flags = ~0u; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); @@ -512,12 +461,8 @@ static void test_BindToObject(void) hr = IShellFolder_BindToObject(psfMyComputer, pidlEmpty, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with empty pidl! hr = %08x\n", hr); -if (0) -{ - /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfMyComputer, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with NULL pidl! hr = %08x\n", hr); -} cChars = GetSystemDirectoryA(szSystemDir, MAX_PATH); ok (cChars > 0 && cChars < MAX_PATH, "GetSystemDirectoryA failed! LastError: %u\n", GetLastError()); @@ -544,13 +489,9 @@ if (0) ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with empty pidl! hr = %08x\n", hr); -if (0) -{ - /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfSystemDir, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with NULL pidl! hr = %08x\n", hr); -} IShellFolder_Release(psfSystemDir); @@ -586,23 +527,19 @@ if (0) { IPersist *pp; hr = IShellFolder_QueryInterface(psfChild, &IID_IPersist, (void**)&pp); - ok(hr == S_OK || - broken(hr == E_NOINTERFACE), /* Win9x, NT4, W2K */ - "Got 0x%08x\n", hr); + ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { CLSID id; hr = IPersist_GetClassID(pp, &id); ok(hr == S_OK, "Got 0x%08x\n", hr); - /* CLSID_ShellFSFolder on some w2k systems */ - ok(IsEqualIID(&id, &CLSID_ShellDocObjView) || broken(IsEqualIID(&id, &CLSID_ShellFSFolder)), - "Unexpected classid %s\n", wine_dbgstr_guid(&id)); + ok(IsEqualIID(&id, &CLSID_ShellDocObjView), "Unexpected classid %s\n", wine_dbgstr_guid(&id)); IPersist_Release(pp); } IShellFolder_Release(psfChild); } - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -623,12 +560,10 @@ if (0) { hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - hr == E_INVALIDARG || /* W2K item in top dir */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -649,12 +584,10 @@ if (0) { hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - hr == E_INVALIDARG || /* W2K item in top dir */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -662,59 +595,55 @@ if (0) win_skip("Failed to create .foo testfile.\n"); /* And on the desktop */ - if(pSHGetSpecialFolderPathA) + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_html); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if(hfile != INVALID_HANDLE_VALUE) { - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_html); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == S_OK || - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - if(!DeleteFileA(pathA)) - trace("Failed to delete: %d\n", GetLastError()); - + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); + ok(hr == S_OK || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); } - else - win_skip("Failed to create .html testfile.\n"); + if(!DeleteFileA(pathA)) + trace("Failed to delete: %d\n", GetLastError()); + + } + else + win_skip("Failed to create .html testfile.\n"); - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_foo); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_foo); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if(hfile != INVALID_HANDLE_VALUE) + { + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - DeleteFileA(pathA); + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); + ok(hr == E_FAIL || /* Vista+ */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); } - else - win_skip("Failed to create .foo testfile.\n"); + DeleteFileA(pathA); } + else + win_skip("Failed to create .foo testfile.\n"); IShellFolder_Release(psfDesktop); } @@ -745,13 +674,8 @@ static void test_GetDisplayName(void) * no functional difference in this respect. */ - if(!pSHGetSpecialFolderPathA) { - win_skip("SHGetSpecialFolderPathA is not available\n"); - return; - } - /* First creating a directory in MyDocuments and a file in this directory. */ - result = pSHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); + result = SHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); ok(result, "SHGetSpecialFolderPathA failed! Last error: %u\n", GetLastError()); if (!result) return; @@ -787,11 +711,8 @@ static void test_GetDisplayName(void) return; } - pidlLast = pILFindLastID(pidlTestFile); - ok(pidlLast->mkid.cb >=76 || - broken(pidlLast->mkid.cb == 28) || /* W2K */ - broken(pidlLast->mkid.cb == 40), /* Win9x, WinME */ - "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb); + pidlLast = ILFindLastID(pidlTestFile); + ok(pidlLast->mkid.cb >= 76, "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb); if (pidlLast->mkid.cb >= 28) { ok(!lstrcmpA((CHAR*)&pidlLast->mkid.abID[12], szFileName), "Filename should be stored as ansi-string at this position!\n"); @@ -809,95 +730,79 @@ static void test_GetDisplayName(void) */ hr = IShellFolder_BindToObject(psfDesktop, pidlTestFile, NULL, &IID_IUnknown, (VOID**)&psfFile); ok (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_NOTIMPL || /* Vista */ - broken(hr == S_OK), /* Win9x, W2K */ + hr == E_NOTIMPL, /* Vista */ "hr = %08x\n", hr); if (hr == S_OK) { IUnknown_Release(psfFile); } - if (!pSHBindToParent) - { - win_skip("SHBindToParent is missing\n"); - DeleteFileA(szTestFile); - RemoveDirectoryA(szTestDir); - return; - } - /* Some tests for IShellFolder::SetNameOf */ - if (pSHGetFolderPathAndSubDirA) + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); + if (hr == S_OK) { - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); - ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); - if (hr == S_OK) { - /* It's ok to use this fixed path. Call will fail anyway. */ - WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; - LPITEMIDLIST pidlNew; - - /* The pidl returned through the last parameter of SetNameOf is a simple one. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); + /* It's ok to use this fixed path. Call will fail anyway. */ + WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; + LPITEMIDLIST pidlNew; + + /* The pidl returned through the last parameter of SetNameOf is a simple one. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); + ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); + if (hr == S_OK) + { + ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); + + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, + SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); + + /* Rename the file back to its original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - if (hr == S_OK) - { - ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, - "pidl returned from SetNameOf should be simple!\n"); - - /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf - * is implemented on top of SHFileOperation in WinXP. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, - SHGDN_FORPARSING, NULL); - ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); - - /* Rename the file back to its original name. SetNameOf ignores the fact, that the - * SHGDN flags specify an absolute path. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); - ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - pILFree(pidlNew); - } - - IShellFolder_Release(psfPersonal); + ILFree(pidlNew); } + + IShellFolder_Release(psfPersonal); } - else - win_skip("Avoid needs of interaction on Win2k\n"); /* Deleting the file and the directory */ DeleteFileA(szTestFile); RemoveDirectoryA(szTestDir); /* SHGetPathFromIDListW still works, although the file is not present anymore. */ - if (pSHGetPathFromIDListW) - { - result = pSHGetPathFromIDListW(pidlTestFile, wszTestFile2); - ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); - } + result = SHGetPathFromIDListW(pidlTestFile, wszTestFile2); + ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); /* SHBindToParent fails, if called with a NULL PIDL. */ - hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(NULL, &IID_IShellFolder, (void**)&psfPersonal, &pidlLast); ok (hr != S_OK, "SHBindToParent(NULL) should fail!\n"); /* But it succeeds with an empty PIDL. */ - hr = pSHBindToParent(pidlEmpty, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlEmpty, &IID_IShellFolder, (void**)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent(empty PIDL) should succeed! hr = %08x\n", hr); ok (pidlLast == pidlEmpty, "The last element of an empty PIDL should be the PIDL itself!\n"); if (hr == S_OK) IShellFolder_Release(psfPersonal); - + /* Binding to the folder and querying the display name of the file also works. */ - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (void**)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(psfDesktop); return; } - /* This test shows that Windows doesn't allocate a new pidlLast, but returns a pointer into + /* This test shows that Windows doesn't allocate a new pidlLast, but returns a pointer into * pidlTestFile (In accordance with MSDN). */ - ok (pILFindLastID(pidlTestFile) == pidlLast, + ok (ILFindLastID(pidlTestFile) == pidlLast, "SHBindToParent doesn't return the last id of the pidl param!\n"); - + hr = IShellFolder_GetDisplayNameOf(psfPersonal, pidlLast, SHGDN_FORPARSING, &strret); ok (hr == S_OK, "Personal->GetDisplayNameOf failed! hr = %08x\n", hr); if (hr != S_OK) { @@ -906,13 +811,10 @@ static void test_GetDisplayName(void) return; } - if (pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); - } - + hr = StrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); + ILFree(pidlTestFile); IShellFolder_Release(psfDesktop); IShellFolder_Release(psfPersonal); @@ -950,11 +852,10 @@ static void test_CallForAttributes(void) hr = SHGetDesktopFolder(&psfDesktop); ok (hr == S_OK, "SHGetDesktopFolder failed! hr = %08x\n", hr); if (hr != S_OK) return; - - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyDocuments, NULL, + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyDocuments, NULL, &pidlMyDocuments, NULL); - ok (hr == S_OK || - broken(hr == E_INVALIDARG), /* Win95, NT4 */ + ok (hr == S_OK, "Desktop's ParseDisplayName failed to parse MyDocuments's CLSID! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(psfDesktop); @@ -1049,32 +950,11 @@ static void test_GetAttributesOf(void) LPCITEMIDLIST pidlEmpty = (LPCITEMIDLIST)&emptyitem; LPITEMIDLIST pidlMyComputer; DWORD dwFlags; - static const DWORD desktopFlags[] = { - /* WinXP */ - SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER, - /* Win2k */ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_STREAM | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER, - /* WinMe, Win9x, WinNT*/ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER - }; - static const DWORD myComputerFlags[] = { - /* WinXP */ - SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER, - /* Win2k */ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_STREAM | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER, - /* WinMe, Win9x, WinNT */ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_HASSUBFOLDER, - /* Win95, WinNT when queried directly */ - SFGAO_CANLINK | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER - }; - WCHAR wszMyComputer[] = { + static const DWORD desktopFlags = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + static const DWORD myComputerFlags = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | + SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + WCHAR wszMyComputer[] = { ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-', 'A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}',0 }; char cCurrDirA [MAX_PATH] = {0}; @@ -1082,8 +962,7 @@ static void test_GetAttributesOf(void) static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; IShellFolder *IDesktopFolder, *testIShellFolder; ITEMIDLIST *newPIDL; - int len, i; - BOOL foundFlagsMatch; + int len; hr = SHGetDesktopFolder(&psfDesktop); ok (hr == S_OK, "SHGetDesktopFolder failed! hr = %08x\n", hr); @@ -1093,26 +972,14 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, &pidlEmpty, &dwFlags); ok (hr == S_OK, "Desktop->GetAttributesOf(empty pidl) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(desktopFlags) / sizeof(desktopFlags[0]); i++) - { - if (desktopFlags[i] == dwFlags) - foundFlagsMatch = TRUE; - } - ok (foundFlagsMatch, "Wrong Desktop attributes: %08x\n", dwFlags); + ok (dwFlags == desktopFlags, "Wrong Desktop attributes: %08x\n", dwFlags); /* .. or with no itemidlist at all. */ dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 0, NULL, &dwFlags); ok (hr == S_OK, "Desktop->GetAttributesOf(NULL) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(desktopFlags) / sizeof(desktopFlags[0]); i++) - { - if (desktopFlags[i] == dwFlags) - foundFlagsMatch = TRUE; - } - ok (foundFlagsMatch, "Wrong Desktop attributes: %08x\n", dwFlags); - + ok (dwFlags == desktopFlags, "Wrong Desktop attributes: %08x\n", dwFlags); + /* Testing the attributes of the MyComputer shellfolder */ hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyComputer, NULL, &pidlMyComputer, NULL); ok (hr == S_OK, "Desktop's ParseDisplayName failed to parse MyComputer's CLSID! hr = %08x\n", hr); @@ -1127,14 +994,8 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, (LPCITEMIDLIST*)&pidlMyComputer, &dwFlags); ok (hr == S_OK, "Desktop->GetAttributesOf(MyComputer) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) - { - if ((myComputerFlags[i] | SFGAO_CANLINK) == dwFlags) - foundFlagsMatch = TRUE; - } todo_wine - ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); + ok (dwFlags == (myComputerFlags | SFGAO_CANLINK), "Wrong MyComputer attributes: %08x\n", dwFlags); hr = IShellFolder_BindToObject(psfDesktop, pidlMyComputer, NULL, &IID_IShellFolder, (LPVOID*)&psfMyComputer); ok (hr == S_OK, "Desktop failed to bind to MyComputer object! hr = %08x\n", hr); @@ -1144,21 +1005,13 @@ static void test_GetAttributesOf(void) hr = IShellFolder_GetAttributesOf(psfMyComputer, 1, &pidlEmpty, &dwFlags); todo_wine - ok (hr == E_INVALIDARG || - broken(hr == S_OK), /* W2K and earlier */ - "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); + ok (hr == E_INVALIDARG, "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags); ok (hr == S_OK, "MyComputer->GetAttributesOf(NULL) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) - { - if (myComputerFlags[i] == dwFlags) - foundFlagsMatch = TRUE; - } todo_wine - ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); + ok (dwFlags == myComputerFlags, "Wrong MyComputer attributes: %08x\n", dwFlags); IShellFolder_Release(psfMyComputer); @@ -1246,34 +1099,19 @@ static void test_SHGetPathFromIDList(void) 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; LPITEMIDLIST pidlPrograms; - if(!pSHGetPathFromIDListW || !pSHGetSpecialFolderPathW) - { - win_skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); - return; - } - /* Calling SHGetPathFromIDListW with no pidl should return the empty string */ wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(NULL, wszPath); + result = SHGetPathFromIDListW(NULL, wszPath); ok(!result, "Expected failure\n"); ok(!wszPath[0], "Expected empty string\n"); /* Calling SHGetPathFromIDListW with an empty pidl should return the desktop folder's path. */ - result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; - /* Check if we are on Win9x */ - SetLastError(0xdeadbeef); - lstrcmpiW(wszDesktop, wszDesktop); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Most W-calls are not implemented\n"); - return; - } - - result = pSHGetPathFromIDListW(pidlEmpty, wszPath); + result = SHGetPathFromIDListW(pidlEmpty, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return; ok(!lstrcmpiW(wszDesktop, wszPath), "SHGetPathFromIDListW didn't return desktop path for empty pidl!\n"); @@ -1293,7 +1131,7 @@ static void test_SHGetPathFromIDList(void) SetLastError(0xdeadbeef); wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(pidlMyComputer, wszPath); + result = SHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n"); ok (GetLastError()==0xdeadbeef || GetLastError()==ERROR_SUCCESS, /* Vista and higher */ @@ -1306,7 +1144,7 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlMyComputer); - result = pSHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!result) { IShellFolder_Release(psfDesktop); @@ -1341,15 +1179,12 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); return; } - if (pStrRetToBufW) - { - pStrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); - ok(0 == lstrcmpW(wszFileName, wszPath), - "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " - "returned incorrect path for file placed on desktop\n"); - } + StrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); + ok(0 == lstrcmpW(wszFileName, wszPath), + "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " + "returned incorrect path for file placed on desktop\n"); - result = pSHGetPathFromIDListW(pidlTestFile, wszPath); + result = SHGetPathFromIDListW(pidlTestFile, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); ok(0 == lstrcmpW(wszFileName, wszPath), "SHGetPathFromIDListW returned incorrect path for file placed on desktop\n"); @@ -1381,11 +1216,11 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); /* Test if we can get the path from the start menu "program files" PIDL. */ - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); ok(hr == S_OK, "SHGetFolderLocation failed: 0x%08x\n", hr); SetLastError(0xdeadbeef); - result = pSHGetPathFromIDListW(pidlPrograms, wszPath); + result = SHGetPathFromIDListW(pidlPrograms, wszPath); IMalloc_Free(ppM, pidlPrograms); ok(result, "SHGetPathFromIDListW failed\n"); } @@ -1478,11 +1313,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC 'T','a','r','g','e','t','K','n','o','w','n','F','o','l','d','e','r',0 }; static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - + if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { - ok(V_VT(pVar) == VT_I4 || - broken(V_VT(pVar) == VT_BSTR), /* Win2k */ - "Wrong variant type for 'TargetSpecialFolder' property!\n"); + ok(V_VT(pVar) == VT_I4, "Wrong variant type for 'TargetSpecialFolder' property!\n"); return E_INVALIDARG; } @@ -1495,13 +1328,11 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC if (!lstrcmpW(pszPropName, wszTarget)) { WCHAR wszPath[MAX_PATH]; BOOL result; - - ok(V_VT(pVar) == VT_BSTR || - broken(V_VT(pVar) == VT_EMPTY), /* Win2k */ - "Wrong variant type for 'Target' property!\n"); + + ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'Target' property!\n"); if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG; - result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return E_INVALIDARG; @@ -1578,17 +1409,6 @@ static void test_FolderShortcut(void) { static const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; - if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) { - win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n"); - return; - } - - if (!pSHGetFolderPathAndSubDirA) - { - win_skip("FolderShortcut test doesn't work on Win2k\n"); - return; - } - /* These tests basically show, that CLSID_FolderShortcuts are initialized * via their IPersistPropertyBag interface. And that the target folder * is taken from the IPropertyBag's 'Target' property. @@ -1623,11 +1443,11 @@ static void test_FolderShortcut(void) { return; } - result = pSHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return; - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); hr = IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); @@ -1668,16 +1488,16 @@ static void test_FolderShortcut(void) { ok (hr == S_OK, "IPersistFolder3::Initialize failed! hr = %08x\n", hr); if (hr != S_OK) { IPersistFolder3_Release(pPersistFolder3); - pILFree(pidlWineTestFolder); + ILFree(pidlWineTestFolder); return; } hr = IPersistFolder3_GetCurFolder(pPersistFolder3, &pidlCurrentFolder); ok(hr == S_OK, "IPersistFolder3_GetCurFolder failed! hr=0x%08x\n", hr); - ok(pILIsEqual(pidlCurrentFolder, pidlWineTestFolder), + ok(ILIsEqual(pidlCurrentFolder, pidlWineTestFolder), "IPersistFolder3_GetCurFolder should return pidlWineTestFolder!\n"); - pILFree(pidlCurrentFolder); - pILFree(pidlWineTestFolder); + ILFree(pidlCurrentFolder); + ILFree(pidlWineTestFolder); hr = IPersistFolder3_QueryInterface(pPersistFolder3, &IID_IShellFolder, (LPVOID*)&pShellFolder); IPersistFolder3_Release(pPersistFolder3); @@ -1691,7 +1511,7 @@ static void test_FolderShortcut(void) { return; } - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); /* Next few lines are meant to show that children of FolderShortcuts are not FolderShortcuts, @@ -1715,7 +1535,7 @@ static void test_FolderShortcut(void) { hr = IShellFolder_BindToObject(pShellFolder, pidlSubFolder, NULL, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); IShellFolder_Release(pShellFolder); - pILFree(pidlSubFolder); + ILFree(pidlSubFolder); ok (hr == S_OK, "IShellFolder::BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1767,9 +1587,7 @@ static void test_ITEMIDLIST_format(void) { { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; int i; - if (!pSHGetSpecialFolderPathW) return; - - bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); + bResult = SHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!bResult) return; @@ -1796,7 +1614,7 @@ static void test_ITEMIDLIST_format(void) { hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, (LPVOID*)&psfPersonal); IShellFolder_Release(psfDesktop); - pILFree(pidlPersonal); + ILFree(pidlPersonal); ok(hr == S_OK, "psfDesktop->BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1837,13 +1655,10 @@ static void test_ITEMIDLIST_format(void) { * current habit of storing the long filename here, which seems to work * just fine. */ todo_wine - ok(pidlFile->mkid.abID[18] == '~' || - broken(pidlFile->mkid.abID[34] == '~'), /* Win2k */ - "Should be derived 8.3 name!\n"); + ok(pidlFile->mkid.abID[18] == '~', "Should be derived 8.3 name!\n"); if (i == 0) /* First file name has an even number of chars. No need for alignment. */ - ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0' || - broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 1), /* Win2k */ + ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0', "Alignment byte, where there shouldn't be!\n"); if (i == 1) /* Second file name has an uneven number of chars => alignment byte */ @@ -1853,9 +1668,7 @@ static void test_ITEMIDLIST_format(void) { /* The offset of the FileStructW member is stored as a WORD at the end of the pidl. */ cbOffset = *(WORD*)(((LPBYTE)pidlFile)+pidlFile->mkid.cb-sizeof(WORD)); ok ((cbOffset >= sizeof(struct FileStructA) && - cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) || - broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 1) || /* Win2k on short names */ - broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 12 + 1), /* Win2k on long names */ + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)), "Wrong offset value (%d) stored at the end of the PIDL\n", cbOffset); if (cbOffset >= sizeof(struct FileStructA) && @@ -1907,7 +1720,7 @@ static void test_ITEMIDLIST_format(void) { } } - pILFree(pidlFile); + ILFree(pidlFile); } IShellFolder_Release(psfPersonal); @@ -1923,16 +1736,11 @@ static void test_SHGetFolderPathA(void) HRESULT hr; HKEY key; - if (!pSHGetFolderPathA) - { - win_skip("SHGetFolderPathA not present\n"); - return; - } if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Program Files (x86) not supported\n" ); @@ -1965,9 +1773,9 @@ static void test_SHGetFolderPathA(void) RegCloseKey( key ); } - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Common Files (x86) not supported\n" ); @@ -2012,17 +1820,7 @@ static void test_SHGetFolderPathAndSubDirA(void) static char testpath[MAX_PATH]; static char toolongpath[MAX_PATH+1]; - if(!pSHGetFolderPathAndSubDirA) - { - win_skip("SHGetFolderPathAndSubDirA not present!\n"); - return; - } - - if(!pSHGetFolderPathA) { - win_skip("SHGetFolderPathA not present!\n"); - return; - } - if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) + if(FAILED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) { win_skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); return; @@ -2043,11 +1841,11 @@ static void test_SHGetFolderPathAndSubDirA(void) } /* test invalid second parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); /* test fourth parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); switch(ret) { case S_OK: /* winvista */ ok(!strncmp(appdata, testpath, strlen(appdata)), @@ -2063,40 +1861,40 @@ static void test_SHGetFolderPathAndSubDirA(void) /* test fifth parameter */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); for(i=0; i< MAX_PATH; i++) toolongpath[i] = '0' + i % 10; toolongpath[MAX_PATH] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); - ok((S_OK == ret) || (E_INVALIDARG == ret), "expected S_OK or E_INVALIDARG, got %x\n", ret); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); + ok((S_OK == ret) || (E_INVALIDARG == ret), "expected E_INVALIDARG, got %x\n", ret); /* test a not existing path */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), ret); /* create a directory inside a not existing directory */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!strncmp(appdata, testpath, strlen(appdata)), "expected %s to start with %s\n", testpath, appdata); @@ -2181,13 +1979,12 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) + if (hr == S_OK) { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } @@ -2195,13 +1992,12 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) + if (hr == S_OK) { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } @@ -2209,9 +2005,9 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) + if (hr == S_OK) { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } @@ -2253,16 +2049,8 @@ static void test_SHCreateShellItem(void) return; } - if(pSHGetSpecialFolderLocation) - { - ret = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); - ok(ret == S_OK, "Got 0x%08x\n", ret); - } - else - { - win_skip("pSHGetSpecialFolderLocation missing.\n"); - pidl_desktop = NULL; - } + ret = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(ret == S_OK, "Got 0x%08x\n", ret); MultiByteToWideChar(CP_ACP, 0, curdirA, -1, curdirW, MAX_PATH); @@ -2280,7 +2068,7 @@ static void test_SHCreateShellItem(void) ret = IShellFolder_ParseDisplayName(currentfolder, NULL, NULL, testfileW, NULL, &pidl_testfile, NULL); ok(SUCCEEDED(ret), "ParseDisplayName returned %x\n", ret); - pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); + pidl_abstestfile = ILCombine(pidl_cwd, pidl_testfile); shellitem = (void*)0xdeadbeef; ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); @@ -2308,7 +2096,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2328,7 +2116,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2346,7 +2134,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2369,7 +2157,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2390,7 +2178,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2410,7 +2198,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2495,7 +2283,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2515,7 +2303,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2592,7 +2380,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare fail: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2683,7 +2471,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2715,10 +2503,10 @@ static void test_SHCreateShellItem(void) win_skip("No SHCreateItemInKnownFolder or SHGetKnownFolderPath\n"); DeleteFileA(".\\testfile"); - pILFree(pidl_abstestfile); - pILFree(pidl_testfile); - pILFree(pidl_desktop); - pILFree(pidl_cwd); + ILFree(pidl_abstestfile); + ILFree(pidl_testfile); + ILFree(pidl_desktop); + ILFree(pidl_cwd); IShellFolder_Release(currentfolder); IShellFolder_Release(desktopfolder); } @@ -2742,11 +2530,8 @@ static void test_SHGetNameFromIDList(void) return; } - /* These should be available on any platform that passed the above test. */ + /* This should be available on any platform that passed the above test. */ ok(pSHCreateShellItem != NULL, "SHCreateShellItem missing.\n"); - ok(pSHBindToParent != NULL, "SHBindToParent missing.\n"); - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - ok(pStrRetToBufW != NULL, "StrRetToBufW missing.\n"); if(0) { @@ -2758,7 +2543,7 @@ static void test_SHGetNameFromIDList(void) ok(hres == E_INVALIDARG, "Got 0x%08x\n", hres); /* Test the desktop */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2786,7 +2571,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2797,16 +2582,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == TRUE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == TRUE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2814,10 +2596,10 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); /* Test the control panel */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2845,7 +2627,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2856,16 +2638,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == FALSE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == FALSE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */, @@ -2874,7 +2653,7 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); } static void test_SHGetItemFromDataObject(void) @@ -2979,7 +2758,7 @@ static void test_SHGetItemFromDataObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3054,7 +2833,7 @@ static void test_ShellItemCompare(void) { hr = pSHCreateShellItem(NULL, NULL, pidl_testfile, &psi[i]); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testfile); + ILFree(pidl_testfile); } if(FAILED(hr)) failed = TRUE; } @@ -3289,8 +3068,6 @@ static void test_SHGetIDListFromObject(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes native */ @@ -3321,7 +3098,7 @@ static void test_SHGetIDListFromObject(void) HeapFree(GetProcessHeap(), 0, punkimpl); pidl_desktop = NULL; - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(pidl_desktop != NULL, "Failed to get desktop pidl.\n"); SHGetDesktopFolder(&psfdesktop); @@ -3339,7 +3116,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(shellitem); } @@ -3353,7 +3130,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } hres = IShellFolder_CreateViewObject(psfdesktop, NULL, &IID_IShellView, (void**)&psv); @@ -3370,7 +3147,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } /* Test IDataObject */ @@ -3397,7 +3174,7 @@ static void test_SHGetIDListFromObject(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(pidl != NULL, "pidl is NULL.\n"); ok(ILIsEqual(pidl, apidl[0]), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); IDataObject_Release(pdo); } @@ -3425,7 +3202,7 @@ static void test_SHGetIDListFromObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3434,7 +3211,7 @@ static void test_SHGetIDListFromObject(void) } IShellFolder_Release(psfdesktop); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_SHGetItemFromObject(void) @@ -3527,8 +3304,6 @@ static void test_SHCreateShellItemArray(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes under native */ @@ -3548,10 +3323,10 @@ static void test_SHCreateShellItemArray(void) hr = pSHCreateShellItemArray(NULL, pdesktopsf, 1, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); hr = pSHCreateShellItemArray(pidl, NULL, 0, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pILFree(pidl); + ILFree(pidl); GetCurrentDirectoryW(MAX_PATH, cTestDirW); myPathAddBackslashW(cTestDirW); @@ -3572,7 +3347,7 @@ static void test_SHCreateShellItemArray(void) if(FAILED(hr)) { skip("Failed to set up environment for SHCreateShellItemArray tests.\n"); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); return; } @@ -3624,14 +3399,14 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_abs, pidl), "Pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IShellItemArray_Release(psia); } } @@ -3676,8 +3451,8 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl2 != NULL, "pidl2 was null.\n"); ok(ILIsEqual(pidl1, pidl2), "pidls not equal.\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); IShellItem_Release(psi2); } hr = IShellItemArray_GetItemAt(psia, 1, &psi2); @@ -3752,10 +3527,10 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl != NULL, "pidl as NULL.\n"); ok(ILIsEqual(pidl, pidl_abs), "pidls differ.\n"); - pILFree(pidl); + ILFree(pidl); IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } IShellItemArray_Release(psia); @@ -3764,7 +3539,7 @@ static void test_SHCreateShellItemArray(void) IDataObject_Release(pdo); } for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } else skip("No files found - skipping test.\n"); @@ -3843,7 +3618,7 @@ static void test_SHCreateShellItemArray(void) WCHAR desktoppath[MAX_PATH]; BOOL result; - result = pSHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); hr = IShellItem_GetDisplayName(psi, SIGDN_DESKTOPABSOLUTEPARSING, &path); @@ -3948,7 +3723,7 @@ static void test_SHCreateShellItemArray(void) IShellItemArray_Release(psia); } - pILFree(pidltest1); + ILFree(pidltest1); } IShellFolder_Release(pdesktopsf); @@ -3957,7 +3732,7 @@ static void test_SHCreateShellItemArray(void) skip("No SHCreateShellItemArrayFromIDLists.\n"); IShellFolder_Release(psf); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); } @@ -3991,7 +3766,7 @@ static void test_ShellItemArrayEnumItems(void) hr = IShellFolder_BindToObject(pdesktopsf, pidl_testdir, NULL, (REFIID)&IID_IShellFolder, (void**)&psf); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testdir); + ILFree(pidl_testdir); } IShellFolder_Release(pdesktopsf); if (FAILED(hr)) return; @@ -4110,7 +3885,7 @@ static void test_ShellItemArrayEnumItems(void) } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } } @@ -4127,7 +3902,7 @@ static void test_ShellItemBindToHandler(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4162,7 +3937,7 @@ static void test_ShellItemBindToHandler(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_desktop, pidl_tmp), "Pidl not equal (%p, %p)\n", pidl_desktop, pidl_tmp); - pILFree(pidl_tmp); + ILFree(pidl_tmp); } IPersistFolder2_Release(ppf2); } @@ -4276,7 +4051,7 @@ static void test_ShellItemBindToHandler(void) else skip("Failed to create ShellItem.\n"); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_ShellItemGetAttributes(void) @@ -4297,13 +4072,13 @@ static void test_ShellItemGetAttributes(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { hr = pSHCreateShellItem(NULL, NULL, pidl_desktop, &psi); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } if(FAILED(hr)) { @@ -4338,7 +4113,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_folder1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); lstrcpyW(buf, curdirW); lstrcatW(buf, testfile1W); @@ -4346,7 +4121,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_file1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); IShellFolder_Release(pdesktopsf); @@ -4421,7 +4196,7 @@ static void test_ShellItemArrayGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); for(i = 0; i < 5; i++) - pILFree((LPITEMIDLIST)pidl_array[i]); + ILFree((LPITEMIDLIST)pidl_array[i]); /* [testfolder/, testfolder/testfolder2] seems to break in Vista */ attr = 0xdeadbeef; @@ -4477,71 +4252,65 @@ static void test_SHParseDisplayName(void) HRESULT hr; BOOL ret, is_wow64; - if (!pSHParseDisplayName) - { - win_skip("SHParseDisplayName isn't available\n"); - return; - } - if (0) { /* crashes on native */ - pSHParseDisplayName(NULL, NULL, NULL, 0, NULL); + SHParseDisplayName(NULL, NULL, NULL, 0, NULL); nameW[0] = 0; - pSHParseDisplayName(nameW, NULL, NULL, 0, NULL); + SHParseDisplayName(nameW, NULL, NULL, 0, NULL); } pidl1 = (LPITEMIDLIST)0xdeadbeef; - hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); ok(broken(hr == E_OUTOFMEMORY) /* < Vista */ || hr == E_INVALIDARG, "failed %08x\n", hr); ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); /* dummy name */ nameW[0] = 0; - hr = pSHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, nameW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* with path */ GetWindowsDirectoryW( dirW, MAX_PATH ); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, dirW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* system32 is not redirected to syswow64 on WOW64 */ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - if (is_wow64 && pGetSystemWow64DirectoryW) + if (is_wow64) { UINT len; *dirW = 0; len = GetSystemDirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); *dirW = 0; - len = pGetSystemWow64DirectoryW(dirW, MAX_PATH); + len = GetSystemWow64DirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == FALSE, "expected different idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); } IShellFolder_Release(desktop); @@ -4559,7 +4328,7 @@ static void test_desktop_IPersist(void) ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_QueryInterface(desktop, &IID_IPersist, (void**)&persist); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* NT4, W9X */, "failed %08x\n", hr); + ok(hr == S_OK, "failed %08x\n", hr); if (hr == S_OK) { @@ -4595,7 +4364,7 @@ static void test_desktop_IPersist(void) hr = IPersistFolder2_GetCurFolder(ppf2, &pidl); ok(hr == S_OK, "got %08x\n", hr); ok(pidl != NULL, "pidl was NULL.\n"); - if(SUCCEEDED(hr)) pILFree(pidl); + if(SUCCEEDED(hr)) ILFree(pidl); IPersistFolder2_Release(ppf2); } @@ -4613,12 +4382,6 @@ static void test_GetUIObject(void) const WCHAR filename[] = {'\\','t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; - if(!pSHBindToParent) - { - win_skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -4631,12 +4394,12 @@ static void test_GetUIObject(void) CreateFilesFolders(); hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr); + ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { IShellFolder *psf; LPCITEMIDLIST pidl_child; - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4692,9 +4455,7 @@ static void test_GetUIObject(void) (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); -#define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA) - - if(count && !is_win2k()) /* Test is interactive on w2k, so skip */ + if(count) { CMINVOKECOMMANDINFO cmi; ZeroMemory(&cmi, sizeof(CMINVOKECOMMANDINFO)); @@ -4711,14 +4472,13 @@ static void test_GetUIObject(void) (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), "Got 0x%08x\n", hr); } -#undef is_win2k DestroyMenu(hmenu); IContextMenu_Release(pcm); } IShellFolder_Release(psf); } - if(pILFree) pILFree(pidl); + ILFree(pidl); } IShellFolder_Release(psf_desktop); @@ -4733,22 +4493,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) STRRET filename; HRESULT hr; - if(!pSHBindToParent){ - win_skip("SHBindToParent is not available, not performing full PIDL verification\n"); - if(path) - ok_(__FILE__,l)(pidl != NULL, "Expected PIDL to be non-NULL\n"); - else - ok_(__FILE__,l)(pidl == NULL, "Expected PIDL to be NULL\n"); - return; - } - if(path){ if(!pidl){ ok_(__FILE__,l)(0, "didn't get expected path (%s), instead: NULL\n", wine_dbgstr_w(path)); return; } - hr = pSHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&parent, &child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&parent, &child); ok_(__FILE__,l)(hr == S_OK, "SHBindToParent failed: 0x%08x\n", hr); if(FAILED(hr)) return; @@ -4786,30 +4537,25 @@ static void test_SHSimpleIDListFromPath(void) LPITEMIDLIST pidl = NULL; - if(!pSHSimpleIDListFromPathAW){ - win_skip("SHSimpleIDListFromPathAW not available\n"); - return; - } - br = CreateDirectoryA(adirA, NULL); ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); br = RemoveDirectoryA(adirA); ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); } /* IFileSystemBindData impl */ @@ -4920,28 +4666,22 @@ static void test_ParseDisplayNamePBC(void) /* fails on unknown dir with no IBindCtx */ hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, adirW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afileW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afile2W, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* fails on unknown dir with IBindCtx with no IFileSystemBindData */ hres = CreateBindCtx(0, &pbc); ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* unknown dir with IBindCtx with IFileSystemBindData */ hres = IBindCtx_RegisterObjectParam(pbc, wFileSystemBindData, (IUnknown*)&fsbd); @@ -4951,24 +4691,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_fail; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -4978,24 +4715,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_nul; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5005,24 +4739,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_junk; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5032,24 +4763,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_invalid; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5059,24 +4787,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_valid; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5207,9 +4932,9 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].pidl = NULL; if(has_unicode) - hr = pSHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); else - hr = pSHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE; @@ -5271,12 +4996,6 @@ static void test_SHCreateDefaultContextMenu(void) return; } - if(!pSHBindToParent) - { - skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -5289,11 +5008,11 @@ static void test_SHCreateDefaultContextMenu(void) CreateFilesFolders(); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, path, NULL, &pidl, 0); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr); + ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, (LPCITEMIDLIST*)&pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, (LPCITEMIDLIST*)&pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); IShellFolder_QueryInterface(folder,&IID_IPersistFolder2,(void**)&persist); @@ -5366,7 +5085,7 @@ static void test_DataObject(void) hres = IShellFolder_GetUIObjectOf(desktop, NULL, 1, (LPCITEMIDLIST*)&apidl, &IID_IDataObject, NULL, (void**)&data_obj); ok(hres == S_OK, "got %x\n", hres); - pILFree(apidl); + ILFree(apidl); IShellFolder_Release(desktop); cf_shellidlist = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); @@ -5498,7 +5217,7 @@ START_TEST(shlfolder) { init_function_pointers(); /* if OleInitialize doesn't get called, ParseDisplayName returns - CO_E_NOTINITIALIZED for malformed directory names on win2k. */ + CO_E_NOTINITIALIZED for malformed directory names */ OleInitialize(NULL); test_ParseDisplayName(); -- 2.15.1

2 2

[PATCH 1/4] ddraw/tests: Avoid touching unsupported clip planes.
by Józef Kucia 11 Jan '18

11 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- It seems to corrupt memory on Windows 10. The next test crashes. --- dlls/ddraw/tests/ddraw7.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d5969ab94929..c904e77849d7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13340,7 +13340,7 @@ static void test_clip_planes_limits(void) trace("Max user clip planes: %u.\n", caps.wMaxUserClipPlanes); - for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + for (i = 0; i < caps.wMaxUserClipPlanes; ++i) { memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice7_GetClipPlane(device, i, plane); @@ -13353,13 +13353,13 @@ static void test_clip_planes_limits(void) plane[0] = 2.0f; plane[1] = 8.0f; plane[2] = 5.0f; - for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + for (i = 0; i < caps.wMaxUserClipPlanes; ++i) { plane[3] = i; hr = IDirect3DDevice7_SetClipPlane(device, i, plane); ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", i, hr); } - for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + for (i = 0; i < caps.wMaxUserClipPlanes; ++i) { memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice7_GetClipPlane(device, i, plane); -- 2.13.6

3 8

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel