April 2015 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Allow texture updates in some cases even when mip levels don't match.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 5af656ea85e22a00304f1904e91ccfee52a6ccc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af656ea85e22a00304f1904e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 23:34:27 2015 +0200 wined3d: Allow texture updates in some cases even when mip levels don't match. --- dlls/wined3d/device.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a3fbe25..1f4216a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3533,7 +3533,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture) { enum wined3d_resource_type type; - unsigned int level_count, i; + unsigned int level_count, i, j, src_size, dst_size, src_skip_levels = 0; HRESULT hr; struct wined3d_context *context; @@ -3565,12 +3565,20 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Check that both textures have the identical numbers of levels. */ - level_count = wined3d_texture_get_level_count(src_texture); - if (wined3d_texture_get_level_count(dst_texture) != level_count) + level_count = min(wined3d_texture_get_level_count(src_texture), + wined3d_texture_get_level_count(dst_texture)); + + src_size = max(src_texture->resource.width, src_texture->resource.height); + dst_size = max(dst_texture->resource.width, dst_texture->resource.height); + if (type == WINED3D_RTYPE_VOLUME) { - WARN("Source and destination have different level counts, returning WINED3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; + src_size = max(src_size, src_texture->resource.depth); + dst_size = max(dst_size, dst_texture->resource.depth); + } + while (src_size > dst_size) + { + src_size >>= 1; + ++src_skip_levels; } /* Make sure that the destination texture is loaded. */ @@ -3588,7 +3596,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, for (i = 0; i < level_count; ++i) { - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, + i + src_skip_levels)); dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); if (FAILED(hr)) @@ -3604,16 +3613,23 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { struct wined3d_surface *src_surface; struct wined3d_surface *dst_surface; + unsigned int src_levels = wined3d_texture_get_level_count(src_texture); + unsigned int dst_levels = wined3d_texture_get_level_count(dst_texture); - for (i = 0; i < level_count * 6; ++i) + for (i = 0; i < 6; ++i) { - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); - dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); - hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); - if (FAILED(hr)) + for (j = 0; j < level_count; ++j) { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, + i * src_levels + j + src_skip_levels)); + dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, + i * dst_levels + j)); + hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); + if (FAILED(hr)) + { + WARN("Failed to update surface, hr %#x.\n", hr); + return hr; + } } } break; @@ -3624,7 +3640,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, for (i = 0; i < level_count; ++i) { hr = device_update_volume(device, - volume_from_resource(wined3d_texture_get_sub_resource(src_texture, i)), + volume_from_resource(wined3d_texture_get_sub_resource(src_texture, + i + src_skip_levels)), volume_from_resource(wined3d_texture_get_sub_resource(dst_texture, i))); if (FAILED(hr)) {

1 0

Matteo Bruni : wined3d: Report ATI1N and ATI2N volume textures as not supported.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 15720f09de76c451f0f145cd2a6d2312324d9bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=15720f09de76c451f0f145cd2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 23:34:24 2015 +0200 wined3d: Report ATI1N and ATI2N volume textures as not supported. --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8a7075d..eb2cbfa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2311,6 +2311,11 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = getFmtIdx(WINED3DFMT_DXT5); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ + idx = getFmtIdx(WINED3DFMT_ATI1N); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = getFmtIdx(WINED3DFMT_ATI2N); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info)

1 0

Nikolay Sivov : shell32/tests: Some more tests for IShellWindows implementation.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: f57b5ea2fb6e210e7d349865f01aabb207bbb180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57b5ea2fb6e210e7d349865f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 20:20:57 2015 +0300 shell32/tests: Some more tests for IShellWindows implementation. --- dlls/shell32/tests/shelldispatch.c | 87 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 925bf78..f973f1f 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -502,13 +502,100 @@ todo_wine { todo_wine ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); if (hr == S_FALSE) /* winxp and earlier */ { + win_skip("SWC_DESKTOP is not supported, some tests will be skipped.\n"); /* older versions allowed to regiser SWC_DESKTOP and access it with FindWindowSW */ ok(disp == NULL, "got %p\n", disp); ok(ret == 0, "got %d\n", ret); } else { + IShellFolderViewDual *view; + IShellBrowser *sb, *sb2; + IServiceProvider *sp; + IDispatch *doc, *app; + ITypeInfo *typeinfo; + TYPEATTR *typeattr; + IWebBrowser2 *wb; + IShellView *sv; + IUnknown *unk; + UINT count; + todo_wine ok(disp != NULL, "got %p\n", disp); + if (disp) { + + /* IDispatch-related tests */ + count = 10; + hr = IDispatch_GetTypeInfoCount(disp, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = IDispatch_GetTypeInfo(disp, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&typeattr->guid, &IID_IWebBrowser2), "type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); + + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); + + /* IWebBrowser2 */ + hr = IDispatch_QueryInterface(disp, &IID_IWebBrowser2, (void**)&wb); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWebBrowser2_Refresh(wb); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWebBrowser2_get_Application(wb, &app); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(disp == app, "got %p, %p\n", app, disp); + IDispatch_Release(app); + + hr = IWebBrowser2_get_Document(wb, &doc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_GetTypeInfo(doc, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&typeattr->guid, &IID_IShellFolderViewDual3), "type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); + IDispatch_Release(doc); + + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); + + IWebBrowser2_Release(wb); + + /* IServiceProvider */ + hr = IDispatch_QueryInterface(disp, &IID_IShellFolderViewDual, (void**)&view); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(disp, &IID_IServiceProvider, (void**)&sp); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(sb == sb2, "got %p, %p\n", sb, sb2); + IShellBrowser_Release(sb2); + IShellBrowser_Release(sb); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IShellBrowser, (void**)&sb2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IShellBrowser_Release(sb2); + IUnknown_Release(unk); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellView, (void**)&sv); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + IServiceProvider_Release(sp); + } ok(ret != HandleToUlong(hwnd), "got %d\n", ret); if (disp) IDispatch_Release(disp); }

1 0

Sebastian Lackner : wine.inf: Add timezone information for Europe/ {Kaliningrad, Istanbul}.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 8319445933fa149b6874420786f638732ef35699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8319445933fa149b687442078… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 19:30:09 2015 +0200 wine.inf: Add timezone information for Europe/{Kaliningrad, Istanbul}. --- loader/wine.inf.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 31924ac..08e8ebd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2875,6 +2875,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2072",1,88, HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2078",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,1e,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,1e,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2089",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,29,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,29,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2095",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,2f,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,2f,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Display",,"Europe/Kaliningrad" +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Dlt",,"Kaliningrad Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Std",,"Kaliningrad Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Display",,"Asia/Seoul" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Dlt",,"Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Std",,"Korea Standard Time" @@ -3023,6 +3027,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Display",,"Pacific/Tonga HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Dlt",,"Tonga Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Std",,"Tonga Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Display",,"Europe/Istanbul" +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Dlt",,"Turkey Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Std",,"Turkey Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Display",,"Asia/Ulaanbaatar" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Dlt",,"Ulaanbaatar Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Std",,"Ulaanbaatar Standard Time"

1 0

Sebastian Lackner : wine.inf: 'Central Brazilian Standard Time' should refer to America/Campo_Grande.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: f651fe48d6b53c2d9e11bbe17490b2be7a34681f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f651fe48d6b53c2d9e11bbe17… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 18:54:00 2015 +0200 wine.inf: 'Central Brazilian Standard Time' should refer to America/Campo_Grande. The original timezone America/Manaus is already covered by 'SA Western Standard Time'. --- loader/wine.inf.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9381a5d..a2854e3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2664,10 +2664,15 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Display",,"Asia/D HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Dlt",,"Central Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Std",,"Central Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Display",,"America/Manaus" +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Display",,"America/Campo_Grande" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Dlt",,"Central Brazilian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Std",,"Central Brazilian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2015",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2023",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2026",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2034",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2037",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Display",,"Europe/Belgrade" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Dlt",,"Central Europe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Std",,"Central Europe Standard Time"

1 0

Huw Davies : comctl32: Remove button wrap states when TBSTYLE_WRAPABLE is cleared.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: eb8df37a696317bf4f067071fd351a1737da41b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8df37a696317bf4f067071f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 29 16:49:49 2015 +0100 comctl32: Remove button wrap states when TBSTYLE_WRAPABLE is cleared. --- dlls/comctl32/tests/toolbar.c | 10 ++++++++++ dlls/comctl32/toolbar.c | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 365bfe2..4bbffd3 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1085,6 +1085,7 @@ static void test_sizes(void) HWND hToolbar = NULL; HIMAGELIST himl, himl2; TBBUTTONINFOA tbinfo; + TBBUTTON button; int style; int i; int fontheight = system_font_height(); @@ -1100,9 +1101,13 @@ static void test_sizes(void) check_sizes(); SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0); check_sizes(); + SendMessageA(hToolbar, TB_GETBUTTON, 5, (LPARAM)&button); + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "got %08x\n", button.fsState); /* after setting the TBSTYLE_WRAPABLE the TBSTATE_WRAP is ignored */ SetWindowLongA(hToolbar, GWL_STYLE, style|TBSTYLE_WRAPABLE); check_sizes(); + SendMessageA(hToolbar, TB_GETBUTTON, 5, (LPARAM)&button); + ok(button.fsState == TBSTATE_ENABLED, "got %08x\n", button.fsState); /* adding new buttons with TBSTYLE_WRAPABLE doesn't add a new row */ SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); check_sizes(); @@ -1111,6 +1116,11 @@ static void test_sizes(void) for (i=0; i<15; i++) SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); check_sizes_todo(0x4); + SendMessageA(hToolbar, TB_GETBUTTON, 31, (LPARAM)&button); + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "got %08x\n", button.fsState); + SetWindowLongA(hToolbar, GWL_STYLE, style); + SendMessageA(hToolbar, TB_GETBUTTON, 31, (LPARAM)&button); + ok(button.fsState == TBSTATE_ENABLED, "got %08x\n", button.fsState); rebuild_toolbar_with_buttons(&hToolbar); SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b2f13c5..b86ae9f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4918,6 +4918,13 @@ TOOLBAR_SetState (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) return TRUE; } +static inline void unwrap(TOOLBAR_INFO *info) +{ + int i; + + for (i = 0; i < info->nNumButtons; i++) + info->buttons[i].fsState &= ~TBSTATE_WRAP; +} static LRESULT TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) @@ -4935,7 +4942,11 @@ TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) TOOLBAR_CheckStyle(infoPtr); if ((dwOldStyle ^ style) & TBSTYLE_WRAPABLE) + { + if (dwOldStyle & TBSTYLE_WRAPABLE) + unwrap(infoPtr); TOOLBAR_CalcToolbar(infoPtr); + } else if ((dwOldStyle ^ style) & CCS_VERT) TOOLBAR_LayoutToolbar(infoPtr);

1 0

Henri Verbeet : ddraw/tests: Don' t destroy the background material until the viewport is done with it in test_material () (Valgrind).
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 6569337cb78a78b4e80ec3303019b16b48d73535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6569337cb78a78b4e80ec3303… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:36 2015 +0200 ddraw/tests: Don't destroy the background material until the viewport is done with it in test_material() (Valgrind). --- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9860957..da550b5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5195,10 +5195,10 @@ static void test_p8_rgb_blit(void) static void test_material(void) { + IDirect3DMaterial *background, *material; IDirect3DExecuteBuffer *execute_buffer; D3DMATERIALHANDLE mat_handle, tmp; D3DEXECUTEBUFFERDESC exec_desc; - IDirect3DMaterial *material; IDirect3DViewport *viewport; IDirect3DDevice *device; IDirectDrawSurface *rt; @@ -5245,11 +5245,10 @@ static void test_material(void) hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - material = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); viewport = create_viewport(device, 0, 0, 640, 480); - viewport_set_background(device, viewport, material); + viewport_set_background(device, viewport, background); - destroy_material(material); material = create_emissive_material(device, 0.0f, 1.0f, 0.0f, 0.0f); hr = IDirect3DMaterial_GetHandle(material, device, &mat_handle); ok(SUCCEEDED(hr), "Failed to get material handle, hr %#x.\n", hr); @@ -5342,6 +5341,7 @@ static void test_material(void) IDirect3DExecuteBuffer_Release(execute_buffer); destroy_viewport(device, viewport); + destroy_material(background); destroy_material(material); IDirectDrawSurface_Release(rt); refcount = IDirect3DDevice_Release(device); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 29971e5..ce31cd6 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6247,8 +6247,8 @@ static void test_p8_rgb_blit(void) static void test_material(void) { + IDirect3DMaterial2 *background, *material; D3DMATERIALHANDLE mat_handle, tmp; - IDirect3DMaterial2 *material; IDirect3DViewport2 *viewport; IDirect3DDevice2 *device; IDirectDrawSurface *rt; @@ -6293,13 +6293,12 @@ static void test_material(void) hr = IDirect3DDevice2_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - material = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); viewport = create_viewport(device, 0, 0, 640, 480); - viewport_set_background(device, viewport, material); + viewport_set_background(device, viewport, background); hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); - destroy_material(material); material = create_emissive_material(device, 0.0f, 1.0f, 0.0f, 0.0f); hr = IDirect3DMaterial2_GetHandle(material, device, &mat_handle); ok(SUCCEEDED(hr), "Failed to get material handle, hr %#x.\n", hr); @@ -6377,6 +6376,7 @@ static void test_material(void) ok(compare_color(color, 0x00000000, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); + destroy_material(background); destroy_material(material); IDirectDrawSurface_Release(rt); refcount = IDirect3DDevice2_Release(device);

1 0

Henri Verbeet : ddraw: Release the surface clipper (if any) in ddraw_surface_wined3d_object_destroyed() (Valgrind).
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 4a416f8d37ca87d1f42cc536dee2be9f0fccba64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a416f8d37ca87d1f42cc536d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:34 2015 +0200 ddraw: Release the surface clipper (if any) in ddraw_surface_wined3d_object_destroyed() (Valgrind). --- dlls/ddraw/surface.c | 3 +++ dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 4 +++- dlls/ddraw/tests/ddraw7.c | 4 +++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0d2d731..f716cfc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5615,6 +5615,9 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren /* Reduce the ddraw surface count. */ list_remove(&surface->surface_list_entry); + if (surface->clipper) + IDirectDrawClipper_Release(&surface->clipper->IDirectDrawClipper_iface); + if (surface == surface->ddraw->primary) surface->ddraw->primary = NULL; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 839b2b7..9860957 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -627,6 +627,7 @@ static void test_clipper_blt(void) IDirectDraw *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -819,7 +820,8 @@ static void test_clipper_blt(void) IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 42f65bc..29971e5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -521,6 +521,7 @@ static void test_clipper_blt(void) IDirectDraw2 *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -713,7 +714,8 @@ static void test_clipper_blt(void) IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ddb7a1d..c3f6f95 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -742,6 +742,7 @@ static void test_clipper_blt(void) IDirectDraw4 *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -934,7 +935,8 @@ static void test_clipper_blt(void) IDirectDrawSurface4_Release(dst_surface); IDirectDrawSurface4_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1f43646..e151fb7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -666,6 +666,7 @@ static void test_clipper_blt(void) IDirectDraw7 *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -858,7 +859,8 @@ static void test_clipper_blt(void) IDirectDrawSurface7_Release(dst_surface); IDirectDrawSurface7_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw7_Release(ddraw); }

1 0

Henri Verbeet : dxgi: Initialize auto_restore_display_mode in dxgi_factory_CreateSwapChain() ( Valgrind).
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: eb27944e789745adc4738925bb6af68c77b5ca21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb27944e789745adc4738925b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:33 2015 +0200 dxgi: Initialize auto_restore_display_mode in dxgi_factory_CreateSwapChain() (Valgrind). --- dlls/dxgi/factory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index df36d82..a66585e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -229,6 +229,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa wined3d_desc.flags = 0; /* WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL? */ wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; + wined3d_desc.auto_restore_display_mode = TRUE; hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, &wined3d_swapchain); IWineDXGIDevice_Release(dxgi_device);

1 0

Henri Verbeet : ddraw/tests: Release the palette after a GetPalette() call in PaletteTest() (Valgrind).
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 8633fd625a8c7ce6835cc084bfdc717a814317d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8633fd625a8c7ce6835cc084b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:37 2015 +0200 ddraw/tests: Release the palette after a GetPalette() call in PaletteTest() (Valgrind). --- dlls/ddraw/tests/dsurface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index fe5b676..bfa1386 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2263,6 +2263,7 @@ static void PaletteTest(void) hr = IDirectDrawSurface_GetPalette(backbuffer, &palette); ok(hr == DD_OK, "CreateSurface returned: %x\n",hr); + IDirectDrawPalette_Release(palette); IDirectDrawSurface_Release(backbuffer); IDirectDrawSurface_Release(lpSurf);

1 0