April 2017 - Wine-commits - list.winehq.org

Huw Davies : explorer: Don't alter the shell imagelist.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 6eeb389d15274f2a62293ecdb587138ebe1b415b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eeb389d15274f2a62293ecdb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 24 08:59:42 2017 +0100 explorer: Don't alter the shell imagelist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 8bfb826..43466dc 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -105,42 +105,43 @@ static ULONG WINAPI IExplorerBrowserEventsImpl_fnRelease(IExplorerBrowserEvents return ref; } -static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImageList *icon_list, COMBOBOXEXITEMW *item) +static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST child_pidl, IImageList *icon_list, COMBOBOXEXITEMW *item) { STRRET strret; HRESULT hres; - IExtractIconW *extract_icon; - UINT reserved; - WCHAR icon_file[MAX_PATH]; - INT icon_index; - UINT icon_flags; - HICON icon; + PIDLIST_ABSOLUTE parent_pidl, pidl; + SHFILEINFOW info; + IImageList *list; + strret.uType=STRRET_WSTR; - hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret); + hres = IShellFolder_GetDisplayNameOf( folder, child_pidl, SHGDN_FORADDRESSBAR, &strret ); if(SUCCEEDED(hres)) - hres = StrRetToStrW(&strret, pidl, &item->pszText); + hres = StrRetToStrW(&strret, child_pidl, &item->pszText); if(FAILED(hres)) { WINE_WARN("Could not get name for pidl\n"); return FALSE; } - hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW, - &reserved,(void**)&extract_icon); - if(SUCCEEDED(hres)) - { - item->mask |= CBEIF_IMAGE; - IExtractIconW_GetIconLocation(extract_icon,GIL_FORSHELL,icon_file, - sizeof(icon_file)/sizeof(WCHAR), - &icon_index,&icon_flags); - IExtractIconW_Extract(extract_icon,icon_file,icon_index,NULL,&icon,20); - item->iImage = ImageList_AddIcon((HIMAGELIST)icon_list,icon); - IExtractIconW_Release(extract_icon); - } - else + + item->mask &= ~CBEIF_IMAGE; + hres = SHGetIDListFromObject( (IUnknown *)folder, &parent_pidl ); + if (FAILED(hres)) return FALSE; + + pidl = ILCombine( parent_pidl, child_pidl ); + if (pidl) { - item->mask &= ~CBEIF_IMAGE; - WINE_WARN("Could not get an icon for %s\n",wine_dbgstr_w(item->pszText)); + list = (IImageList *)SHGetFileInfoW( (WCHAR *)pidl, 0, &info, sizeof(info), + SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_SYSICONINDEX ); + if (list) + { + IImageList_Release( list ); + item->iImage = info.iIcon; + item->mask |= CBEIF_IMAGE; + } + ILFree( pidl ); } + ILFree( parent_pidl ); + return TRUE; } @@ -153,7 +154,6 @@ static void update_path_box(explorer_info *info) LPITEMIDLIST desktop_pidl; IEnumIDList *ids; - ImageList_Remove((HIMAGELIST)info->icon_list,-1); SendMessageW(info->path_box,CB_RESETCONTENT,0,0); SHGetDesktopFolder(&desktop); IShellFolder_QueryInterface(desktop,&IID_IPersistFolder2,(void**)&persist);

1 0

Nikolay Sivov : shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 5badc91a0fe9933f0dc60ca8a74b68cf66559b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5badc91a0fe9933f0dc60ca8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 13:21:42 2017 +0300 shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 3 ++- dlls/shell32/tests/ebrowser.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index bbccf88..07046502 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -782,7 +782,8 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface, { *ppvObject = &This->IExplorerBrowser_iface; } - else if(IsEqualIID(riid, &IID_IShellBrowser)) + else if(IsEqualIID(riid, &IID_IShellBrowser) || + IsEqualIID(riid, &IID_IOleWindow)) { *ppvObject = &This->IShellBrowser_iface; } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c04a2b4..7db5842 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -575,7 +575,7 @@ static void test_QueryInterface(void) test_qinterface(IID_IUnknown, S_OK); test_qinterface(IID_IExplorerBrowser, S_OK); test_qinterface(IID_IShellBrowser, S_OK); - todo_wine test_qinterface(IID_IOleWindow, S_OK); + test_qinterface(IID_IOleWindow, S_OK); test_qinterface(IID_ICommDlgBrowser, S_OK); test_qinterface(IID_ICommDlgBrowser2, S_OK); test_qinterface(IID_ICommDlgBrowser3, S_OK);

1 0

Józef Kucia : d3d10core/tests: Allow passing any interface to get_refcount().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 11462929314e2ae0b0e5d340c3333eedaf029dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11462929314e2ae0b0e5d340c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:24 2017 +0200 d3d10core/tests: Allow passing any interface to get_refcount(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 133 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11462929314e2ae0b0e5d…

1 0

Józef Kucia : d3d11/tests: Allow passing any interface to get_refcount().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 2553ea2e3db4465858f4deb9175b1f21f130cf1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2553ea2e3db4465858f4deb91… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:25 2017 +0200 d3d11/tests: Allow passing any interface to get_refcount(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 157 ++++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2553ea2e3db4465858f4d…

1 0

Józef Kucia : d3d10core/tests: Check device refcount after CreateInputLayout().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 69961bc2410fb3710046cfa63ed2eb4d81e9fd47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69961bc2410fb3710046cfa63… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:26 2017 +0200 d3d10core/tests: Check device refcount after CreateInputLayout(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 49de3f8..f6621e8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9271,9 +9271,9 @@ static void test_create_input_layout(void) { {"POSITION", 0, DXGI_FORMAT_UNKNOWN, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, }; + ULONG refcount, expected_refcount; ID3D10InputLayout *input_layout; ID3D10Device *device; - ULONG refcount; unsigned int i; HRESULT hr; @@ -9318,11 +9318,15 @@ static void test_create_input_layout(void) for (i = 0; i < ARRAY_SIZE(vertex_formats); ++i) { + expected_refcount = get_refcount(device) + 1; layout_desc->Format = vertex_formats[i]; hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); + refcount = get_refcount(device); + todo_wine ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", + refcount, expected_refcount); ID3D10InputLayout_Release(input_layout); }

1 0

Józef Kucia : d3d11/tests: Check device refcount after CreateInputLayout().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: c84e395d65eed04bf500b262600f8ee8c5271a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84e395d65eed04bf500b2626… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:27 2017 +0200 d3d11/tests: Check device refcount after CreateInputLayout(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5313d84..d4a34c6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10267,9 +10267,9 @@ static void test_create_input_layout(void) { {"POSITION", 0, DXGI_FORMAT_UNKNOWN, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; + ULONG refcount, expected_refcount; ID3D11InputLayout *input_layout; ID3D11Device *device; - ULONG refcount; unsigned int i; HRESULT hr; @@ -10314,11 +10314,15 @@ static void test_create_input_layout(void) for (i = 0; i < ARRAY_SIZE(vertex_formats); ++i) { + expected_refcount = get_refcount(device) + 1; layout_desc->Format = vertex_formats[i]; hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); + refcount = get_refcount(device); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", + refcount, expected_refcount); ID3D11InputLayout_Release(input_layout); }

1 0

Stefan Dösinger : ddraw/tests: Prefer 16 bit depth buffers in ddraw1 and 2.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 0aa9302b086c18fc9423e31ff1fc7ee3d6e67107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa9302b086c18fc9423e31ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:50 2017 +0200 ddraw/tests: Prefer 16 bit depth buffers in ddraw1 and 2. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 +++++- dlls/ddraw/tests/ddraw2.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 26d0423..ea8a3b0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -431,7 +431,11 @@ static IDirectDraw *create_ddraw(void) static IDirect3DDevice *create_device(IDirectDraw *ddraw, HWND window, DWORD coop_level) { - static const DWORD z_depths[] = {32, 24, 16}; + /* Prefer 16 bit depth buffers because Nvidia gives us an unpadded D24 buffer if we ask + * for 24 bit and handles such buffers incorrectly in DDBLT_DEPTHFILL. AMD only supports + * 16 bit buffers in ddraw1/2. Stencil was added in ddraw4, so we cannot create a D24S8 + * buffer here. */ + static const DWORD z_depths[] = {16, 32, 24}; IDirectDrawSurface *surface, *ds; IDirect3DDevice *device = NULL; DDSURFACEDESC surface_desc; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2784a55..39e9190 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -301,7 +301,11 @@ static IDirectDraw2 *create_ddraw(void) static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, DWORD coop_level) { - static const DWORD z_depths[] = {32, 24, 16}; + /* Prefer 16 bit depth buffers because Nvidia gives us an unpadded D24 buffer if we ask + * for 24 bit and handles such buffers incorrectly in DDBLT_DEPTHFILL. AMD only supports + * 16 bit buffers in ddraw1/2. Stencil was added in ddraw4, so we cannot create a D24S8 + * buffer here. */ + static const DWORD z_depths[] = {16, 32, 24}; IDirectDrawSurface *surface, *ds; IDirect3DDevice2 *device = NULL; DDSURFACEDESC surface_desc;

1 0

Stefan Dösinger : d3d9/tests: Accept alpha channel differences in shadow_test.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 2303b5a896312670e8c37c89abcfbb36c5465149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2303b5a896312670e8c37c89a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:51 2017 +0200 d3d9/tests: Accept alpha channel differences in shadow_test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index db29c3f..f9b147e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14670,7 +14670,11 @@ static void shadow_test(void) for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); - ok(color_match(color, expected_colors[j].color, 0), + /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, + * whereas other GPUs (all AMD, newer Nvidia) return the same value they return in .rgb. + * Accept alpha mismatches as broken but make sure to check the color channels. */ + ok(color_match(color, expected_colors[j].color, 0) + || broken(color_match(color & 0x00ffffff, expected_colors[j].color & 0x00ffffff, 0)), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color);

1 0

Stefan Dösinger : d3d8/tests: Accept alpha channel differences in shadow_test.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 688493bb3ceef292a7a607decb008ed0d63f8e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=688493bb3ceef292a7a607dec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:52 2017 +0200 d3d8/tests: Accept alpha channel differences in shadow_test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4f0c397..14eb6ea 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4069,7 +4069,11 @@ static void shadow_test(void) for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); - ok(color_match(color, expected_colors[j].color, 0), + /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, + * whereas other GPUs (all AMD, newer Nvidia) return the same value they return in .rgb. + * Accept alpha mismatches as broken but make sure to check the color channels. */ + ok(color_match(color, expected_colors[j].color, 0) + || broken(color_match(color & 0x00ffffff, expected_colors[j].color & 0x00ffffff, 0)), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color);

1 0

Stefan Dösinger : d3d9/tests: WARP returns a random color in uninitialized color attributes.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 9ce5b4096fd6ccab6ea9fac5f7033db09cd2167a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce5b4096fd6ccab6ea9fac5f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 22:47:55 2017 +0200 d3d9/tests: WARP returns a random color in uninitialized color attributes. ea8ba70a made the broken(warp) condition too strict. This patch reverts back to the old behavior of accepting any result from WARP. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f9b147e..25aa35b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8087,14 +8087,13 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - /* WARP and r500 return a color from a previous draw. In case of WARP it is the last draw, which happens to - * be the one with quad4_color above. AMD's r500 uses the last D3DCOLOR attribute, which is the one from - * quad3_color. + /* WARP and r500 return a color from a previous draw. In case of WARP it is random, although most of the + * time it is the color of the last draw, which happens to be the one with quad4_color above. AMD's r500 + * uses the last D3DCOLOR attribute, which is the one from quad3_color. * * Newer AMD cards and Nvidia return zero. */ color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) - || broken(color_match(color, 0x00ffff00, 1) && warp), + ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) || broken(warp), "Got unexpected color 0x%08x for no color attribute test.\n", color); IDirect3DDevice9_SetVertexShader(device, NULL);

1 0