June 2016 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Store GL view class for each wined3d format.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: e76d1789591fc0c383e882a474bce36bdce0e419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76d1789591fc0c383e882a47… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 7 13:24:37 2016 +0200 wined3d: Store GL view class for each wined3d format. 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/wined3d/utils.c | 133 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 135 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8b60ec5..aa2c775 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2453,6 +2453,137 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); } +static GLenum lookup_gl_view_class(GLenum internal_format) +{ + static const struct + { + GLenum internal_format; + GLenum view_class; + } + view_classes[] = + { + /* 128-bit */ + {GL_RGBA32F, GL_VIEW_CLASS_128_BITS}, + {GL_RGBA32UI, GL_VIEW_CLASS_128_BITS}, + {GL_RGBA32I, GL_VIEW_CLASS_128_BITS}, + /* 96-bit */ + {GL_RGB32F, GL_VIEW_CLASS_96_BITS}, + {GL_RGB32UI, GL_VIEW_CLASS_96_BITS}, + {GL_RGB32I, GL_VIEW_CLASS_96_BITS}, + /* 64-bit */ + {GL_RGBA16F, GL_VIEW_CLASS_64_BITS}, + {GL_RG32F, GL_VIEW_CLASS_64_BITS}, + {GL_RGBA16UI, GL_VIEW_CLASS_64_BITS}, + {GL_RG32UI, GL_VIEW_CLASS_64_BITS}, + {GL_RGBA16I, GL_VIEW_CLASS_64_BITS}, + {GL_RG32I, GL_VIEW_CLASS_64_BITS}, + {GL_RGBA16, GL_VIEW_CLASS_64_BITS}, + {GL_RGBA16_SNORM, GL_VIEW_CLASS_64_BITS}, + /* 48-bit */ + {GL_RGB16, GL_VIEW_CLASS_48_BITS}, + {GL_RGB16_SNORM, GL_VIEW_CLASS_48_BITS}, + {GL_RGB16F, GL_VIEW_CLASS_48_BITS}, + {GL_RGB16UI, GL_VIEW_CLASS_48_BITS}, + {GL_RGB16I, GL_VIEW_CLASS_48_BITS}, + /* 32-bit */ + {GL_RG16F, GL_VIEW_CLASS_32_BITS}, + {GL_R11F_G11F_B10F, GL_VIEW_CLASS_32_BITS}, + {GL_R32F, GL_VIEW_CLASS_32_BITS}, + {GL_RGB10_A2UI, GL_VIEW_CLASS_32_BITS}, + {GL_RGBA8UI, GL_VIEW_CLASS_32_BITS}, + {GL_RG16UI, GL_VIEW_CLASS_32_BITS}, + {GL_R32UI, GL_VIEW_CLASS_32_BITS}, + {GL_RGBA8I, GL_VIEW_CLASS_32_BITS}, + {GL_RG16I, GL_VIEW_CLASS_32_BITS}, + {GL_R32I, GL_VIEW_CLASS_32_BITS}, + {GL_RGB10_A2, GL_VIEW_CLASS_32_BITS}, + {GL_RGBA8, GL_VIEW_CLASS_32_BITS}, + {GL_RG16, GL_VIEW_CLASS_32_BITS}, + {GL_RGBA8_SNORM, GL_VIEW_CLASS_32_BITS}, + {GL_RG16_SNORM, GL_VIEW_CLASS_32_BITS}, + {GL_SRGB8_ALPHA8, GL_VIEW_CLASS_32_BITS}, + {GL_RGB9_E5, GL_VIEW_CLASS_32_BITS}, + /* 24-bit */ + {GL_RGB8, GL_VIEW_CLASS_24_BITS}, + {GL_RGB8_SNORM, GL_VIEW_CLASS_24_BITS}, + {GL_SRGB8, GL_VIEW_CLASS_24_BITS}, + {GL_RGB8UI, GL_VIEW_CLASS_24_BITS}, + {GL_RGB8I, GL_VIEW_CLASS_24_BITS}, + /* 16-bit */ + {GL_R16F, GL_VIEW_CLASS_16_BITS}, + {GL_RG8UI, GL_VIEW_CLASS_16_BITS}, + {GL_R16UI, GL_VIEW_CLASS_16_BITS}, + {GL_RG8I, GL_VIEW_CLASS_16_BITS}, + {GL_R16I, GL_VIEW_CLASS_16_BITS}, + {GL_RG8, GL_VIEW_CLASS_16_BITS}, + {GL_R16, GL_VIEW_CLASS_16_BITS}, + {GL_RG8_SNORM, GL_VIEW_CLASS_16_BITS}, + {GL_R16_SNORM, GL_VIEW_CLASS_16_BITS}, + /* 8-bit */ + {GL_R8UI, GL_VIEW_CLASS_8_BITS}, + {GL_R8I, GL_VIEW_CLASS_8_BITS}, + {GL_R8, GL_VIEW_CLASS_8_BITS}, + {GL_R8_SNORM, GL_VIEW_CLASS_8_BITS}, + + /* RGTC1 */ + {GL_COMPRESSED_RED_RGTC1, GL_VIEW_CLASS_RGTC1_RED}, + {GL_COMPRESSED_SIGNED_RED_RGTC1, GL_VIEW_CLASS_RGTC1_RED}, + /* RGTC2 */ + {GL_COMPRESSED_RG_RGTC2, GL_VIEW_CLASS_RGTC2_RG}, + {GL_COMPRESSED_SIGNED_RG_RGTC2, GL_VIEW_CLASS_RGTC2_RG}, + + /* BPTC unorm */ + {GL_COMPRESSED_RGBA_BPTC_UNORM, GL_VIEW_CLASS_BPTC_UNORM}, + {GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM, GL_VIEW_CLASS_BPTC_UNORM}, + /* BPTC float */ + {GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT, GL_VIEW_CLASS_BPTC_FLOAT}, + {GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT, GL_VIEW_CLASS_BPTC_FLOAT}, + + /* DXT1 RGB */ + {GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_VIEW_CLASS_S3TC_DXT1_RGB}, + {GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, GL_VIEW_CLASS_S3TC_DXT1_RGB}, + /* DXT1 RGBA */ + {GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_VIEW_CLASS_S3TC_DXT1_RGBA}, + {GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_VIEW_CLASS_S3TC_DXT1_RGBA}, + /* DXT3 */ + {GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_VIEW_CLASS_S3TC_DXT3_RGBA}, + {GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_VIEW_CLASS_S3TC_DXT3_RGBA}, + /* DXT5 */ + {GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_VIEW_CLASS_S3TC_DXT5_RGBA}, + {GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_VIEW_CLASS_S3TC_DXT5_RGBA}, + }; + + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(view_classes); ++i) + { + if (view_classes[i].internal_format == internal_format) + return view_classes[i].view_class; + } + + return GL_NONE; +} + +static void query_view_class(struct wined3d_format *format) +{ + GLenum internal_view_class, gamma_view_class, rt_view_class; + + internal_view_class = lookup_gl_view_class(format->glInternal); + gamma_view_class = lookup_gl_view_class(format->glGammaInternal); + rt_view_class = lookup_gl_view_class(format->rtInternal); + + if (internal_view_class == gamma_view_class || gamma_view_class == rt_view_class) + { + format->gl_view_class = internal_view_class; + TRACE("Format %s is member of GL view class %#x.\n", + debug_d3dformat(format->id), format->gl_view_class); + } + else + { + format->gl_view_class = GL_NONE; + } +} + static void query_internal_format(struct wined3d_adapter *adapter, struct wined3d_format *format, const struct wined3d_format_texture_info *texture_info, struct wined3d_gl_info *gl_info, BOOL srgb_write_supported, BOOL srgb_format) @@ -2522,6 +2653,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, } } + query_view_class(format); + if (format->glInternal && format->flags[WINED3D_GL_RES_TYPE_RB] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c31b41d..2d921f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3537,6 +3537,8 @@ struct wined3d_format struct color_fixup_desc color_fixup; void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth); + + GLenum gl_view_class; }; const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info,

1 0

Józef Kucia : wined3d: Add ARB_texture_view extension.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 2a5b4fd884801a7f394ade49142fbfdba195243c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5b4fd884801a7f394ade491… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 7 13:24:38 2016 +0200 wined3d: Add ARB_texture_view extension. 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/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d9d4e5..45b3625 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -160,6 +160,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, {"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE }, {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, + {"GL_ARB_texture_view", ARB_TEXTURE_VIEW }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, @@ -2706,6 +2707,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage2D) USE_GL_FUNC(glTexStorage3D) + /* GL_ARB_texture_view */ + USE_GL_FUNC(glTextureView) /* GL_ARB_timer_query */ USE_GL_FUNC(glQueryCounter) USE_GL_FUNC(glGetQueryObjectui64v) @@ -3538,6 +3541,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, + {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index aa39d07..a0d80fa 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -95,6 +95,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RGB10_A2UI, ARB_TEXTURE_STORAGE, ARB_TEXTURE_SWIZZLE, + ARB_TEXTURE_VIEW, ARB_TIMER_QUERY, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA,

1 0

Józef Kucia : wined3d: Create texture views for shader resource views.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: e86693f95676c5358dba0f5c446c0c88bab42244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86693f95676c5358dba0f5c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 7 13:24:39 2016 +0200 wined3d: Create texture views for shader resource views. 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/wined3d/context.c | 11 +-- dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 164 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 7 ++ 4 files changed, 168 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e86693f95676c5358dba0…

1 0

Zhenbo Li : winegstreamer: Remove a condition which is always true.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 0c0c86a8c7c93e7edbca8a7840c945f4159c3059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0c86a8c7c93e7edbca8a784… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jun 7 20:12:22 2016 +0800 winegstreamer: Remove a condition which is always true. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 92804e3..1de9b41 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1962,8 +1962,9 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, props.cbAlign = 1; props.cbPrefix = 0; - if (SUCCEEDED(hr) && IPin_QueryAccept(iface, pmt) != S_OK) + if (IPin_QueryAccept(iface, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; + if (SUCCEEDED(hr)) { IPin_QueryDirection(pReceivePin, &pindirReceive); if (pindirReceive != PINDIR_OUTPUT) {

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontFace3:: GetRecommendedRenderingMode().
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 69caad4469800b37684a4c825a9a04f623bffd75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69caad4469800b37684a4c825… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 6 20:31:30 2016 +0300 dwrite: Implement IDWriteFontFace3::GetRecommendedRenderingMode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 58 +++++++++++++++++++++++++++--- dlls/dwrite/tests/font.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 142 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69caad4469800b37684a4…

1 0

Vincent Povirk : explorer: Hide empty folders in the start menu.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 8006fd41f0fe495ccbec69d33f6e36d580dcb70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8006fd41f0fe495ccbec69d33… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 13:53:38 2016 -0500 explorer: Hide empty folders in the start menu. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/startmenu.c | 61 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index e9c651b..15bb7b5 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -131,6 +131,50 @@ static HRESULT pidl_to_shellfolder(LPITEMIDLIST pidl, LPWSTR *displayname, IShel return hr; } +static BOOL shell_folder_is_empty(IShellFolder* folder) +{ + IEnumIDList* enumidl; + LPITEMIDLIST pidl=NULL; + + if (IShellFolder_EnumObjects(folder, NULL, SHCONTF_NONFOLDERS, &enumidl) == S_OK) + { + if (IEnumIDList_Next(enumidl, 1, &pidl, NULL) == S_OK) + { + CoTaskMemFree(pidl); + IEnumIDList_Release(enumidl); + return FALSE; + } + + IEnumIDList_Release(enumidl); + } + + if (IShellFolder_EnumObjects(folder, NULL, SHCONTF_FOLDERS, &enumidl) == S_OK) + { + BOOL found = FALSE; + IShellFolder *child_folder; + + while (!found && IEnumIDList_Next(enumidl, 1, &pidl, NULL) == S_OK) + { + if (IShellFolder_BindToObject(folder, pidl, NULL, &IID_IShellFolder, (void *)&child_folder) == S_OK) + { + if (!shell_folder_is_empty(child_folder)) + found = TRUE; + + IShellFolder_Release(child_folder); + } + + CoTaskMemFree(pidl); + } + + IEnumIDList_Release(enumidl); + + if (found) + return FALSE; + } + + return TRUE; +} + /* add an individual file or folder to the menu, takes ownership of pidl */ static struct menu_item* add_shell_item(struct menu_item* parent, LPITEMIDLIST pidl) { @@ -161,6 +205,15 @@ static struct menu_item* add_shell_item(struct menu_item* parent, LPITEMIDLIST p IShellFolder_BindToObject(parent->folder, pidl, NULL, &IID_IShellFolder, (void *)&item->folder); } + if (item->folder && shell_folder_is_empty(item->folder)) + { + IShellFolder_Release(item->folder); + HeapFree(GetProcessHeap(), 0, item->displayname); + HeapFree(GetProcessHeap(), 0, item); + CoTaskMemFree(pidl); + return NULL; + } + parent_menu = parent->menuhandle; item->parent = parent; @@ -411,9 +464,13 @@ void do_startmenu(HWND hwnd) if (!public_startmenu.folder) pidl_to_shellfolder(public_startmenu.pidl, NULL, &public_startmenu.folder); - fill_menu(&user_startmenu); + if (!shell_folder_is_empty(user_startmenu.folder) || + !shell_folder_is_empty(public_startmenu.folder)) + { + fill_menu(&user_startmenu); - AppendMenuW(root_menu.menuhandle, MF_SEPARATOR, 0, NULL); + AppendMenuW(root_menu.menuhandle, MF_SEPARATOR, 0, NULL); + } if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl))) add_shell_item(&root_menu, pidl);

1 0

Vincent Povirk : gdiplus/tests: Accept empty metafiles having 0 size on Windows.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: f42ff6feab01b0019a684e7dd607ea90cffaf2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42ff6feab01b0019a684e7dd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 16:00:49 2016 -0500 gdiplus/tests: Accept empty metafiles having 0 size on Windows. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 550dc6b..741f752 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -888,8 +888,10 @@ static void test_nullframerect(void) { expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); @@ -908,8 +910,10 @@ static void test_nullframerect(void) { expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipDeleteGraphics(graphics); expect(Ok, stat); @@ -1279,8 +1283,10 @@ static void test_frameunit(void) expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); @@ -1290,8 +1296,10 @@ static void test_frameunit(void) expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Return visible clip bounds in world coordinates.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: be5b27069058821e442be0f7466ecb80aa0a8dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5b27069058821e442be0f74… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 16:00:50 2016 -0500 gdiplus: Return visible clip bounds in world coordinates. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 ++++++++ dlls/gdiplus/tests/graphics.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index dac52ef..8353809 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4297,6 +4297,7 @@ GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics *graphics, GpRectF *rect { GpRegion *clip_rgn; GpStatus stat; + GpMatrix device_to_world; TRACE("(%p, %p)\n", graphics, rect); @@ -4313,6 +4314,13 @@ GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics *graphics, GpRectF *rect if((stat = get_visible_clip_region(graphics, clip_rgn)) != Ok) goto cleanup; + /* transform to world coordinates */ + if((stat = get_graphics_transform(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &device_to_world)) != Ok) + goto cleanup; + + if((stat = GdipTransformRegion(clip_rgn, &device_to_world)) != Ok) + goto cleanup; + /* get bounds of the region */ stat = GdipGetRegionBounds(clip_rgn, graphics, rect); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 3ee3363..cf5652b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2313,6 +2313,29 @@ static void test_GdipGetVisibleClipBounds_window(void) recti.X, recti.Y, recti.Width, recti.Height, exp.X, exp.Y, exp.Width, exp.Height); + /* window bounds with transform applied */ + status = GdipResetClip(graphics); + expect(Ok, status); + + status = GdipScaleWorldTransform(graphics, 0.5, 0.5, MatrixOrderPrepend); + expect(Ok, status); + + exp.X = window.X * 2.0; + exp.Y = window.Y * 2.0; + exp.Width = window.Width * 2.0; + exp.Height = window.Height * 2.0; + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == exp.X && + rectf.Y == exp.Y && + rectf.Width == exp.Width && + rectf.Height == exp.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be " + "twice the window size (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + exp.X, exp.Y, exp.Width, exp.Height); + GdipDeleteGraphics(graphics); EndPaint(hwnd, &ps); }

1 0

Andreas Maier : msi: Use special error control flag in CreateService.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: ddc1baa43227c4496df950644d0dd324e5ebff00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc1baa43227c4496df950644… Author: Andreas Maier <andy1.m(a)gmx.de> Date: Mon Jun 6 23:34:10 2016 +0200 msi: Use special error control flag in CreateService. Signed-off-by: Andreas Maier <andy1.m(a)gmx.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 15 ++++++++++++++- include/msidefs.h | 5 +++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 370007c..a3b84af 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5811,6 +5811,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; + BOOL is_vital; SERVICE_DESCRIPTIONW sd = {NULL}; UINT ret = ERROR_SUCCESS; @@ -5849,6 +5850,13 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 11), &args); deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); + /* Should the complete install fail if CreateService fails? */ + is_vital = (err_control & msidbServiceInstallErrorControlVital); + + /* Remove the msidbServiceInstallErrorControlVital-flag from err_control. + CreateService (under Windows) would fail if not. */ + err_control &= ~msidbServiceInstallErrorControlVital; + /* fetch the service path */ row = MSI_QueryGetRecord(package->db, query, comp); if (!row) @@ -5890,7 +5898,12 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) if (!service) { if (GetLastError() != ERROR_SERVICE_EXISTS) - ERR("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); + { + WARN("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); + if (is_vital) + ret = ERROR_INSTALL_FAILURE; + + } } else if (sd.lpDescription) { diff --git a/include/msidefs.h b/include/msidefs.h index 640bfa1..c37e5b8 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -200,6 +200,11 @@ enum msidbServiceControlEvent msidbServiceControlEventUninstallDelete = 0x00000080, }; +enum msidbServiceInstallErrorControl +{ + msidbServiceInstallErrorControlVital = 0x00008000 +}; + enum msidbMoveFileOptions { msidbMoveFileOptionsMove = 0x00000001,

1 0

Andreas Maier : msi/tests: Delete TestService after testing.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 62eb31d8521fe6533b54e57210c8dc75a44cd4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62eb31d8521fe6533b54e5721… Author: Andreas Maier <andy1.m(a)gmx.de> Date: Mon Jun 6 23:35:16 2016 +0200 msi/tests: Delete TestService after testing. Signed-off-by: Andreas Maier <andy1.m(a)gmx.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 243e61b..fe7f9a2 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5427,6 +5427,30 @@ static void test_start_stop_services(void) DeleteFileA(msifile); } +static void delete_TestService(void) +{ + BOOL ret; + SC_HANDLE manager, service; + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) + return; + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService doesn't exist\n"); + + if (service) + { + ret = DeleteService( service ); + ok( ret, "failed to delete service %u\n", GetLastError() ); + + CloseServiceHandle(service); + } + CloseServiceHandle(manager); + +} + static void test_delete_services(void) { UINT r; @@ -5492,6 +5516,7 @@ static void test_delete_services(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: + delete_TestService(); delete_test_files(); DeleteFileA(msifile); } @@ -5500,7 +5525,9 @@ static void test_install_services(void) { UINT r; SC_HANDLE manager, service; - BOOL ret; + LONG res; + HKEY hKey; + DWORD err_control, err_controlsize, err_controltype; if (is_process_limited()) { @@ -5550,20 +5577,8 @@ static void test_install_services(void) ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); - ok(manager != NULL, "can't open service manager\n"); - if (!manager) goto error; - - service = OpenServiceA(manager, "TestService", GENERIC_ALL); - ok(service != NULL, "TestService doesn't exist\n"); - - ret = DeleteService( service ); - ok( ret, "failed to delete service %u\n", GetLastError() ); - - CloseServiceHandle(service); - CloseServiceHandle(manager); - error: + delete_TestService(); delete_test_files(); DeleteFileA(msifile); }

1 0