February 2018 - Wine-Commits

Jacek Caban : mshtml: Merge htmlembed.c into htmlobject.c.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: ac3b1f3201928673a505fbd967e0e4fd7a200788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3b1f3201928673a505fbd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:57:53 2018 +0100 mshtml: Merge htmlembed.c into htmlobject.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlembed.c | 289 ----------------------------------------------- dlls/mshtml/htmlobject.c | 256 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 256 insertions(+), 290 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac3b1f3201928673a505…

1 0

Roderick Colenbrander : winex11: Implement vkEnumerateInstanceExtensionProperties.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 0c87c1c4b70d26af0427686e05617f3a5ec8f720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c87c1c4b70d26af0427686e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:17 2018 +0100 winex11: Implement vkEnumerateInstanceExtensionProperties. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index b73f379..92f8a0e 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,8 +41,32 @@ static void X11DRV_vkDestroyInstance(VkInstance instance, const VkAllocationCall static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties* properties) { - FIXME("stub: %s %p %p\n", debugstr_a(layer_name), count, properties); - return VK_ERROR_OUT_OF_HOST_MEMORY; + TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); + + /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ + if (layer_name) + { + ERR("Layer enumeration not supported from ICD.\n"); + return VK_ERROR_LAYER_NOT_PRESENT; + } + + if (!properties) + { + /* When properties is NULL, we need to return the number of extensions + * supported. For now report 0 until we add some e.g. + * VK_KHR_win32_surface. Long-term this needs to be an intersection + * between what the native library supports and what thunks we have. + */ + *count = 0; + return VK_SUCCESS; + } + + /* When properties is not NULL, we copy the extensions over and set count + * to the number of copied extensions. For now we don't have much to do as + * we don't support any extensions yet. + */ + *count = 0; + return VK_SUCCESS; } static void * X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name)

1 0

Roderick Colenbrander : winex11: Add Vulkan stubs.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 6a5c85564cce46190ebaa9a426c3115fec14f98d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5c85564cce46190ebaa9a4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:16 2018 +0100 winex11: Add Vulkan stubs. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 8 ++--- dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/init.c | 17 ++++++++++- dlls/winex11.drv/vulkan.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 5 files changed, 93 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index cfd67cf..e6c77ca 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -69,15 +69,15 @@ static BOOL wine_vk_init(void) static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { - FIXME("stub: %p %p %p\n", create_info, allocator, instance); - return VK_ERROR_INCOMPATIBLE_DRIVER; + TRACE("%p %p %p\n", create_info, allocator, instance); + return vk_funcs->p_vkCreateInstance(create_info, allocator, instance); } static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { - FIXME("stub: %p %p %p\n", layer_name, count, properties); - return VK_ERROR_OUT_OF_HOST_MEMORY; + TRACE("%p %p %p\n", layer_name, count, properties); + return vk_funcs->p_vkEnumerateInstanceExtensionProperties(layer_name, count, properties); } static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 463eefd..747f509 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -20,6 +20,7 @@ C_SRCS = \ pen.c \ settings.c \ systray.c \ + vulkan.c \ window.c \ wintab.c \ x11drv_main.c \ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 24ed656..be55371 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -345,6 +345,21 @@ static struct opengl_funcs * X11DRV_wine_get_wgl_driver( PHYSDEV dev, UINT versi return ret; } +/********************************************************************** + * X11DRV_wine_get_vulkan_driver + */ +static const struct vulkan_funcs * X11DRV_wine_get_vulkan_driver( PHYSDEV dev, UINT version ) +{ + const struct vulkan_funcs *ret; + + if (!(ret = get_vulkan_driver( version ))) + { + dev = GET_NEXT_PHYSDEV( dev, wine_get_vulkan_driver ); + ret = dev->funcs->wine_get_vulkan_driver( dev, version ); + } + return ret; +} + static const struct gdi_dc_funcs x11drv_funcs = { @@ -475,7 +490,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_UnrealizePalette, /* pUnrealizePalette */ NULL, /* pWidenPath */ X11DRV_wine_get_wgl_driver, /* wine_get_wgl_driver */ - NULL, /* wine_get_vulkan_driver */ + X11DRV_wine_get_vulkan_driver, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ }; diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c new file mode 100644 index 0000000..b73f379 --- /dev/null +++ b/dlls/winex11.drv/vulkan.c @@ -0,0 +1,71 @@ +/* X11DRV Vulkan implementation + * + * Copyright 2017 Roderick Colenbrander + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "wine/debug.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vulkan); + +static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkInstance *instance) +{ + FIXME("stub: %p %p %p\n", create_info, allocator, instance); + return VK_ERROR_INCOMPATIBLE_DRIVER; +} + +static void X11DRV_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator) +{ + FIXME("stub: %p %p\n", instance, allocator); +} + +static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name, + uint32_t *count, VkExtensionProperties* properties) +{ + FIXME("stub: %s %p %p\n", debugstr_a(layer_name), count, properties); + return VK_ERROR_OUT_OF_HOST_MEMORY; +} + +static void * X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) +{ + FIXME("stub: %p, %s\n", instance, debugstr_a(name)); + return NULL; +} + +static struct vulkan_funcs vulkan_funcs = +{ + X11DRV_vkCreateInstance, + X11DRV_vkDestroyInstance, + X11DRV_vkEnumerateInstanceExtensionProperties, + X11DRV_vkGetInstanceProcAddr +}; + +const struct vulkan_funcs *get_vulkan_driver(UINT version) +{ + if (version != WINE_VULKAN_DRIVER_VERSION) + { + ERR("version mismatch, vulkan wants %u but driver has %u\n", version, WINE_VULKAN_DRIVER_VERSION); + return NULL; + } + + return &vulkan_funcs; +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7203627..abd069e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -223,6 +223,7 @@ extern BOOL shape_layered_windows DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern struct opengl_funcs *get_glx_driver(UINT) DECLSPEC_HIDDEN; +extern const struct vulkan_funcs *get_vulkan_driver(UINT) DECLSPEC_HIDDEN; /* IME support */ extern void IME_SetOpenStatus(BOOL fOpen) DECLSPEC_HIDDEN;

1 0

Sebastian Lackner : ntdll: Fix condition mask handling in RtlVerifyVersionInfo.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 004d32dae6cbb419e926fb9c6ad410d17b68f56c URL: https://source.winehq.org/git/wine.git/?a=commit;h=004d32dae6cbb419e926fb9c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 27 14:18:38 2018 +0300 ntdll: Fix condition mask handling in RtlVerifyVersionInfo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 14 ------------- dlls/ntdll/version.c | 49 +++++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 49a9357..eb78a38 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -195,9 +195,6 @@ static void test_VerifyVersionInfo(void) VER_MAJORVERSION, VER_EQUAL, VER_MINORVERSION, VER_LESS, - 0, 0, - 0, 0, - TRUE, }, { VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -278,9 +275,6 @@ static void test_VerifyVersionInfo(void) VER_SERVICEPACKMAJOR, VER_EQUAL, VER_SERVICEPACKMINOR, VER_LESS, - 0, 0, - 0, 0, - TRUE, }, { VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -298,8 +292,6 @@ static void test_VerifyVersionInfo(void) VER_MINORVERSION, VER_EQUAL, VER_SERVICEPACKMAJOR, VER_EQUAL, VER_SERVICEPACKMINOR, VER_LESS, - 0, 0, - TRUE, }, { VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -319,7 +311,6 @@ static void test_VerifyVersionInfo(void) VER_MINORVERSION, VER_EQUAL, VER_SERVICEPACKMAJOR, VER_EQUAL, VER_SERVICEPACKMINOR, VER_LESS, - TRUE, }, { VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -362,9 +353,6 @@ static void test_VerifyVersionInfo(void) VER_MAJORVERSION, VER_EQUAL, VER_SERVICEPACKMAJOR, VER_LESS, - 0, 0, - 0, 0, - TRUE, }, { VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -382,8 +370,6 @@ static void test_VerifyVersionInfo(void) VER_MAJORVERSION, VER_EQUAL, VER_MINORVERSION, VER_EQUAL, VER_SERVICEPACKMAJOR, VER_LESS, - 0, 0, - TRUE }, { VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 58ccb95..1674261 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -657,6 +657,34 @@ BOOLEAN WINAPI RtlGetNtProductType( LPDWORD type ) return TRUE; } +static inline UCHAR version_update_condition(UCHAR *last_condition, UCHAR condition) +{ + switch (*last_condition) + { + case 0: + *last_condition = condition; + break; + case VER_EQUAL: + if (condition >= VER_EQUAL && condition <= VER_LESS_EQUAL) + { + *last_condition = condition; + return condition; + } + break; + case VER_GREATER: + case VER_GREATER_EQUAL: + if (condition >= VER_EQUAL && condition <= VER_GREATER_EQUAL) + return condition; + break; + case VER_LESS: + case VER_LESS_EQUAL: + if (condition == VER_EQUAL || (condition >= VER_LESS && condition <= VER_LESS_EQUAL)) + return condition; + break; + } + if (!condition) *last_condition |= 0x10; + return *last_condition & 0xf; +} static inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition) { @@ -733,38 +761,33 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, if(dwTypeMask & (VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR)) { - unsigned char condition = 0; + unsigned char condition, last_condition = 0; BOOLEAN do_next_check = TRUE; if(dwTypeMask & VER_MAJORVERSION) - condition = dwlConditionMask >> 1*3 & 0x07; - else if(dwTypeMask & VER_MINORVERSION) - condition = dwlConditionMask >> 0*3 & 0x07; - else if(dwTypeMask & VER_SERVICEPACKMAJOR) - condition = dwlConditionMask >> 5*3 & 0x07; - else if(dwTypeMask & VER_SERVICEPACKMINOR) - condition = dwlConditionMask >> 4*3 & 0x07; - - if(dwTypeMask & VER_MAJORVERSION) { + condition = version_update_condition(&last_condition, dwlConditionMask >> 1*3 & 0x07); status = version_compare_values(ver.dwMajorVersion, info->dwMajorVersion, condition); do_next_check = (ver.dwMajorVersion == info->dwMajorVersion) && - ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); + ((condition >= VER_EQUAL) && (condition <= VER_LESS_EQUAL)); } if((dwTypeMask & VER_MINORVERSION) && do_next_check) { + condition = version_update_condition(&last_condition, dwlConditionMask >> 0*3 & 0x07); status = version_compare_values(ver.dwMinorVersion, info->dwMinorVersion, condition); do_next_check = (ver.dwMinorVersion == info->dwMinorVersion) && - ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); + ((condition >= VER_EQUAL) && (condition <= VER_LESS_EQUAL)); } if((dwTypeMask & VER_SERVICEPACKMAJOR) && do_next_check) { + condition = version_update_condition(&last_condition, dwlConditionMask >> 5*3 & 0x07); status = version_compare_values(ver.wServicePackMajor, info->wServicePackMajor, condition); do_next_check = (ver.wServicePackMajor == info->wServicePackMajor) && - ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); + ((condition >= VER_EQUAL) && (condition <= VER_LESS_EQUAL)); } if((dwTypeMask & VER_SERVICEPACKMINOR) && do_next_check) { + condition = version_update_condition(&last_condition, dwlConditionMask >> 4*3 & 0x07); status = version_compare_values(ver.wServicePackMinor, info->wServicePackMinor, condition); }

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptStringXtoCP_CPtoX().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: e7b66cfe609cf4109771d562311e93da2209b172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b66cfe609cf4109771d562… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 12:02:37 2018 +0330 usp10/tests: Cleanup test_ScriptStringXtoCP_CPtoX(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 261 ++++++++++++++++++++--------------------------- 1 file changed, 112 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7b66cfe609cf4109771…

1 0

Sebastian Lackner : d3d10_1: Add missing forwards to d3d10.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: c6251b0deb659445c5f03f5a4a7e2906c49726b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6251b0deb659445c5f03f5a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 27 04:21:25 2018 +0000 d3d10_1: Add missing forwards to d3d10. Spotted by Jarkko Korpi. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/d3d10_1.spec | 24 ++++++++++++------------ tools/make_specfiles | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 18eb3ac..10edc3f 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -1,24 +1,24 @@ @ stub RevertToOldImplementation -@ stub D3D10CompileEffectFromMemory -@ stub D3D10CompileShader -@ stub D3D10CreateBlob +@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) d3d10.D3D10CompileEffectFromMemory +@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) d3d10.D3D10CompileShader +@ stdcall D3D10CreateBlob(long ptr) d3d10.D3D10CreateBlob @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory @ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) d3d10.D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock @ stub D3D10DisassembleEffect -@ stub D3D10DisassembleShader -@ stub D3D10GetGeometryShaderProfile -@ stub D3D10GetInputAndOutputSignatureBlob -@ stub D3D10GetInputSignatureBlob -@ stub D3D10GetOutputSignatureBlob -@ stub D3D10GetPixelShaderProfile -@ stub D3D10GetShaderDebugInfo +@ stdcall D3D10DisassembleShader(ptr long long ptr ptr) d3d10.D3D10DisassembleShader +@ stdcall D3D10GetGeometryShaderProfile(ptr) d3d10.D3D10GetGeometryShaderProfile +@ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputAndOutputSignatureBlob +@ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputSignatureBlob +@ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetOutputSignatureBlob +@ stdcall D3D10GetPixelShaderProfile(ptr) d3d10.D3D10GetPixelShaderProfile +@ stdcall D3D10GetShaderDebugInfo(ptr long ptr) d3d10.D3D10GetShaderDebugInfo @ stub D3D10GetVersion -@ stub D3D10GetVertexShaderProfile +@ stdcall D3D10GetVertexShaderProfile(ptr) d3d10.D3D10GetVertexShaderProfile @ stub D3D10PreprocessShader -@ stub D3D10ReflectShader +@ stdcall D3D10ReflectShader(ptr long ptr) d3d10.D3D10ReflectShader @ stub D3D10RegisterLayers @ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) d3d10.D3D10StateBlockMaskDifference @ stdcall D3D10StateBlockMaskDisableAll(ptr) d3d10.D3D10StateBlockMaskDisableAll diff --git a/tools/make_specfiles b/tools/make_specfiles index 6b59b32..1e8a894 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -75,6 +75,10 @@ my @dll_groups = "msvcp120_app", ], [ + "d3d10", + "d3d10_1", + ], + [ "d3dx10_43", "d3dx10_42", "d3dx10_41",

1 0

Jacek Caban : mshtml: Merge htmltablerow.c into htmltable.c.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 865b93495c2b3d4f1f9c113f634dcb63f8472127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865b93495c2b3d4f1f9c113f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:28 2018 +0100 mshtml: Merge htmltablerow.c into htmltable.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmltable.c | 446 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmltablerow.c | 477 --------------------------------------------- 3 files changed, 445 insertions(+), 479 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=865b93495c2b3d4f1f9c…

1 0

Alexandre Julliard : user32/tests: Also test device caps on a released DC.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: f80802edd70851f8b01faf1702c94328ff5b6ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f80802edd70851f8b01faf17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:36:22 2018 +0100 user32/tests: Also test device caps on a released DC. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 587f36f..18ded33 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -40,7 +40,7 @@ static void test_dc_attributes(void) { HDC hdc, old_hdc; HDC hdcs[20]; - INT i, rop, def_rop; + INT i, rop, def_rop, caps; BOOL found_dc; /* test cache DC */ @@ -118,8 +118,29 @@ static void test_dc_attributes(void) ok( rop == 0, "got %d\n", rop ); rop = GetROP2( old_hdc ); ok( rop == 0, "got %d\n", rop ); + caps = GetDeviceCaps( old_hdc, HORZRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( old_hdc, VERTRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( old_hdc, NUMCOLORS ); + ok( caps == 0, "got %d\n", caps ); ok( WindowFromDC( old_hdc ) == 0, "wrong window\n" ); + hdc = GetDC(0); + caps = GetDeviceCaps( hdc, HORZRES ); + ok( caps != 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, VERTRES ); + ok( caps != 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, NUMCOLORS ); + ok( caps != 0, "got %d\n", caps ); + ReleaseDC( 0, hdc ); + caps = GetDeviceCaps( hdc, HORZRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, VERTRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, NUMCOLORS ); + ok( caps == 0, "got %d\n", caps ); + /* test own DC */ hdc = GetDC( hwnd_owndc );

1 0

Alexandre Julliard : kernel32/tests: Add test for loading a dll under different names.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: bab3a3d59d674be6a1cf66b27fff4a287c12c075 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab3a3d59d674be6a1cf66b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 18:20:41 2018 +0100 kernel32/tests: Add test for loading a dll under different names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 25d3bf5..484b602 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1252,6 +1252,94 @@ static void test_Loader(void) section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; } +static void test_filenames(void) +{ + IMAGE_NT_HEADERS nt_header = nt_header_template; + char dll_name[MAX_PATH], long_path[MAX_PATH], short_path[MAX_PATH], buffer[MAX_PATH]; + HMODULE mod, mod2; + BOOL ret; + + nt_header.FileHeader.NumberOfSections = 1; + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + + nt_header.OptionalHeader.SectionAlignment = page_size; + nt_header.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; + nt_header.OptionalHeader.FileAlignment = page_size; + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + page_size; + + create_test_dll( &dos_header, sizeof(dos_header), &nt_header, dll_name ); + strcpy( long_path, dll_name ); + strcpy( strrchr( long_path, '\\' ), "\\this-is-a-long-name.dll" ); + ret = MoveFileA( dll_name, long_path ); + ok( ret, "MoveFileA failed err %u\n", GetLastError() ); + GetShortPathNameA( long_path, short_path, MAX_PATH ); + + mod = LoadLibraryA( short_path ); + ok( mod != NULL, "loading failed err %u\n", GetLastError() ); + GetModuleFileNameA( mod, buffer, MAX_PATH ); + ok( !lstrcmpiA( buffer, short_path ), "got wrong path %s / %s\n", buffer, short_path ); + mod2 = GetModuleHandleA( short_path ); + ok( mod == mod2, "wrong module %p for %s\n", mod2, short_path ); + mod2 = GetModuleHandleA( long_path ); + todo_wine + ok( mod == mod2, "wrong module %p for %s\n", mod2, long_path ); + mod2 = LoadLibraryA( long_path ); + ok( mod2 != NULL, "loading failed err %u\n", GetLastError() ); + todo_wine + ok( mod == mod2, "library loaded twice\n" ); + GetModuleFileNameA( mod2, buffer, MAX_PATH ); + todo_wine + ok( !lstrcmpiA( buffer, short_path ), "got wrong path %s / %s\n", buffer, short_path ); + FreeLibrary( mod2 ); + FreeLibrary( mod ); + + mod = LoadLibraryA( long_path ); + ok( mod != NULL, "loading failed err %u\n", GetLastError() ); + GetModuleFileNameA( mod, buffer, MAX_PATH ); + ok( !lstrcmpiA( buffer, long_path ), "got wrong path %s / %s\n", buffer, long_path ); + mod2 = GetModuleHandleA( short_path ); + todo_wine + ok( mod == mod2, "wrong module %p for %s\n", mod2, short_path ); + mod2 = GetModuleHandleA( long_path ); + ok( mod == mod2, "wrong module %p for %s\n", mod2, long_path ); + mod2 = LoadLibraryA( short_path ); + ok( mod2 != NULL, "loading failed err %u\n", GetLastError() ); + todo_wine + ok( mod == mod2, "library loaded twice\n" ); + GetModuleFileNameA( mod2, buffer, MAX_PATH ); + todo_wine + ok( !lstrcmpiA( buffer, long_path ), "got wrong path %s / %s\n", buffer, long_path ); + FreeLibrary( mod2 ); + FreeLibrary( mod ); + + strcpy( dll_name, long_path ); + strcpy( strrchr( dll_name, '\\' ), "\\this-is-another-name.dll" ); + ret = CreateHardLinkA( dll_name, long_path, NULL ); + ok( ret, "CreateHardLinkA failed err %u\n", GetLastError() ); + if (ret) + { + mod = LoadLibraryA( dll_name ); + ok( mod != NULL, "loading failed err %u\n", GetLastError() ); + GetModuleFileNameA( mod, buffer, MAX_PATH ); + ok( !lstrcmpiA( buffer, dll_name ), "got wrong path %s / %s\n", buffer, dll_name ); + mod2 = GetModuleHandleA( long_path ); + todo_wine + ok( mod == mod2, "wrong module %p for %s\n", mod2, long_path ); + mod2 = LoadLibraryA( long_path ); + ok( mod2 != NULL, "loading failed err %u\n", GetLastError() ); + todo_wine + ok( mod == mod2, "library loaded twice\n" ); + GetModuleFileNameA( mod2, buffer, MAX_PATH ); + todo_wine + ok( !lstrcmpiA( buffer, dll_name ), "got wrong path %s / %s\n", buffer, short_path ); + FreeLibrary( mod2 ); + FreeLibrary( mod ); + DeleteFileA( dll_name ); + } + DeleteFileA( long_path ); +} + /* Verify linking style of import descriptors */ static void test_ImportDescriptors(void) { @@ -3488,6 +3576,7 @@ START_TEST(loader) } test_Loader(); + test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); test_section_access();

1 0

Jacek Caban : mshtml: Merge htmliframe.c into htmlframe.c.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 48365004b0472ac577507b5f50321443719b9bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=48365004b0472ac577507b5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:57:43 2018 +0100 mshtml: Merge htmliframe.c into htmlframe.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlframe.c | 590 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmliframe.c | 616 ------------------------------------------- dlls/mshtml/mshtml_private.h | 4 - 4 files changed, 587 insertions(+), 624 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48365004b0472ac57750…

1 0

Jacek Caban : mshtml: Merge htmloption.c into htmlselect.c.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 6683740c669f6b6122bde77b793e332150b2658a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6683740c669f6b6122bde77b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:18 2018 +0100 mshtml: Merge htmloption.c into htmlselect.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmloption.c | 623 ----------------------------------------------- dlls/mshtml/htmlselect.c | 592 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 591 insertions(+), 625 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6683740c669f6b6122bd…

1 0

Jacek Caban : mshtml: Merge htmlframebase.c into htmlframe.c.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 1f8ff829d99bb35b18159eb4c6f515d4c90f78fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8ff829d99bb35b18159eb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:57:29 2018 +0100 mshtml: Merge htmlframebase.c into htmlframe.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlframe.c | 742 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlframebase.c | 752 -------------------------------------------- 3 files changed, 731 insertions(+), 764 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f8ff829d99bb35b1815…

1 0

Roderick Colenbrander : winevulkan: Define vulkan driver interface.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 3de61a9dd93f2879398ee118f8219b8cd3be67c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3de61a9dd93f2879398ee118… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:15 2018 +0100 winevulkan: Define vulkan driver interface. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 2 ++ dlls/gdi32/driver.c | 6 +++++ dlls/gdi32/enhmfdrv/dc.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/gdi32.spec | 3 +++ dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/gdi32/vulkan.c | 41 +++++++++++++++++++++++++++++ dlls/wineandroid.drv/init.c | 1 + dlls/winemac.drv/gdi.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/make_vulkan | 61 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 22 +++++++++++++++- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 5 +++- include/wine/vulkan_driver.h | 23 +++++++++++++++++ 20 files changed, 174 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3de61a9dd93f2879398e…

1 0

Józef Kucia : d3d9: Make warning message in d3d9_device_StretchRect() more accurate.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 1c5c550713f5081532475792930276d2469a9a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5c550713f5081532475792… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:34 2018 +0100 d3d9: Make warning message in d3d9_device_StretchRect() more accurate. 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/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e8798a7..aac0961 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1625,7 +1625,7 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { - WARN("Destination is a texture.\n"); + WARN("Destination is a regular texture.\n"); goto done; }

1 0

Józef Kucia : wined3d: Terminate long debug strings with ellipsis.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: f234ce16be08ad7da3cf27cf4784f4b743a7924c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f234ce16be08ad7da3cf27cf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 27 10:17:33 2018 +0100 wined3d: Terminate long debug strings with ellipsis. 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a9db5e0..a54e18e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4162,7 +4162,7 @@ static void init_debug_buffer(struct debug_buffer *buffer, const char *default_s buffer->size = ARRAY_SIZE(buffer->str); } -static BOOL debug_append(struct debug_buffer *buffer, const char *str, const char *separator) +static void debug_append(struct debug_buffer *buffer, const char *str, const char *separator) { int size; @@ -4172,12 +4172,12 @@ static BOOL debug_append(struct debug_buffer *buffer, const char *str, const cha if (size == -1 || size >= buffer->size) { buffer->size = 0; - return FALSE; + strcpy(&buffer->str[ARRAY_SIZE(buffer->str) - 4], "..."); + return; } buffer->ptr += size; buffer->size -= size; - return TRUE; } const char *wined3d_debug_resource_access(DWORD access)

1 0

Jacek Caban : mshtml: Merge htmltablecell.c into htmltable.c.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: eb1494cec8952dd2d9bd1081170f9a397a1e8604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1494cec8952dd2d9bd1081… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:38 2018 +0100 mshtml: Merge htmltablecell.c into htmltable.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmltable.c | 484 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmltablecell.c | 515 -------------------------------------------- 3 files changed, 483 insertions(+), 517 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb1494cec8952dd2d9bd…

1 0

Fabian Maurer : comctl32/progress: Fix wrapping of values in PBM_STEPIT and add tests.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 9036a84b0f119a32c8ee9d222a2c691cd144a186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9036a84b0f119a32c8ee9d22… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Feb 27 13:43:13 2018 +0300 comctl32/progress: Fix wrapping of values in PBM_STEPIT and add tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/progress.c | 10 +++++++-- dlls/comctl32/tests/progress.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 80cced4..28d9fd2 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -655,8 +655,14 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, INT oldVal; oldVal = infoPtr->CurVal; infoPtr->CurVal += infoPtr->Step; - if(infoPtr->CurVal > infoPtr->MaxVal) - infoPtr->CurVal = infoPtr->MinVal; + if (infoPtr->CurVal > infoPtr->MaxVal) + { + infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MinVal; + } + if (infoPtr->CurVal < infoPtr->MinVal) + { + infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MaxVal; + } if(oldVal != infoPtr->CurVal) { TRACE("PBM_STEPIT: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 9dd4b55..d3b219c 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -237,6 +237,56 @@ static void test_setcolors(void) DestroyWindow(progress); } +static void test_PBM_STEPIT(void) +{ + struct stepit_test + { + int min; + int max; + int step; + } stepit_tests[] = + { + { 3, 15, 5 }, + { 3, 15, -5 }, + { 3, 15, 50 }, + }; + HWND progress; + int i, j; + + for (i = 0; i < sizeof(stepit_tests)/sizeof(stepit_tests[0]); i++) + { + struct stepit_test *test = &stepit_tests[i]; + LRESULT ret; + + progress = create_progress(0); + + ret = SendMessageA(progress, PBM_SETRANGE32, test->min, test->max); + ok(ret != 0, "Unexpected return value.\n"); + + SendMessageA(progress, PBM_SETPOS, test->min, 0); + SendMessageA(progress, PBM_SETSTEP, test->step, 0); + + for (j = 0; j < test->max; j++) + { + int pos = SendMessageA(progress, PBM_GETPOS, 0, 0); + int current; + + pos += test->step; + if (pos > test->max) + pos = (pos - test->min) % (test->max - test->min) + test->min; + if (pos < test->min) + pos = (pos - test->min) % (test->max - test->min) + test->max; + + SendMessageA(progress, PBM_STEPIT, 0, 0); + + current = SendMessageA(progress, PBM_GETPOS, 0, 0); + ok(current == pos, "Unexpected position %d, expected %d.\n", current, pos); + } + + DestroyWindow(progress); + } +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -260,6 +310,7 @@ START_TEST(progress) test_redraw(); test_setcolors(); + test_PBM_STEPIT(); cleanup(); }

1 0

Roderick Colenbrander : winevulkan: Implement global Vulkan function stubs and loading.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 054b7934bd0cad05ed4edbcc5b810c9763ff9fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=054b7934bd0cad05ed4edbcc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:14 2018 +0100 winevulkan: Implement global Vulkan function stubs and loading. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ef22a45..228ced7 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -34,12 +34,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 -void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + +struct vulkan_func +{ + const char *name; + void *func; +}; + +static void *wine_vk_get_global_proc_addr(const char *name); + +static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkInstance *instance) +{ + FIXME("stub: %p %p %p\n", create_info, allocator, instance); + return VK_ERROR_INCOMPATIBLE_DRIVER; +} + +static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, + uint32_t *count, VkExtensionProperties *properties) +{ + FIXME("stub: %p %p %p\n", layer_name, count, properties); + return VK_ERROR_OUT_OF_HOST_MEMORY; +} + +static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { - FIXME("stub: %p %s\n", instance, debugstr_a(name)); + void *func; + + TRACE("%p %s\n", instance, debugstr_a(name)); + + if (!name) + return NULL; + + /* vkGetInstanceProcAddr can load most Vulkan functions when an instance is passed in, however + * for a NULL instance it can only load global functions. + */ + func = wine_vk_get_global_proc_addr(name); + if (func) + { + return func; + } + if (!instance) + { + FIXME("Global function '%s' not found\n", debugstr_a(name)); + return NULL; + } + + FIXME("Unsupported device or instance function: '%s'\n", debugstr_a(name)); return NULL; } +void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) +{ + TRACE("%p %s\n", instance, debugstr_a(name)); + + /* Initial version of the Vulkan ICD spec required vkGetInstanceProcAddr to be + * exported. vk_icdGetInstanceProcAddr was added later to separete ICD calls from + * Vulkan API. One of them in our case should forward to the other, so just forward + * to the older vkGetInstanceProcAddr. + */ + return wine_vkGetInstanceProcAddr(instance, name); +} + VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_version) { uint32_t req_version; @@ -69,3 +128,25 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) } return TRUE; } + +static const struct vulkan_func vk_global_dispatch_table[] = +{ + {"vkCreateInstance", &wine_vkCreateInstance}, + {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, + {"vkGetInstanceProcAddr", &wine_vkGetInstanceProcAddr}, +}; + +static void *wine_vk_get_global_proc_addr(const char *name) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(vk_global_dispatch_table); i++) + { + if (strcmp(name, vk_global_dispatch_table[i].name) == 0) + { + TRACE("Found name=%s in global table\n", debugstr_a(name)); + return vk_global_dispatch_table[i].func; + } + } + return NULL; +}

1 0

Nikolay Sivov : msxml3: Use ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 6b7e1131e5c5df4954ef1aded55ce87754bd36bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b7e1131e5c5df4954ef1ade… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:16:41 2018 +0300 msxml3: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/bsc.c | 4 +- dlls/msxml3/dispex.c | 4 +- dlls/msxml3/factory.c | 2 +- dlls/msxml3/httprequest.c | 10 ++--- dlls/msxml3/main.c | 2 +- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/mxwriter.c | 96 ++++++++++++++++++++++----------------------- dlls/msxml3/saxreader.c | 6 +-- dlls/msxml3/xmldoc.c | 4 +- dlls/msxml3/xmlview.c | 2 +- 10 files changed, 67 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b7e1131e5c5df4954ef…

1 0

Nikolay Sivov : scrrun: Use ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 71627251332eda48274f72a9e96c81e3d251ba8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=71627251332eda48274f72a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:47:22 2018 +0300 scrrun: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 6 +++--- dlls/scrrun/scrrun.c | 2 +- dlls/scrrun/scrrun_private.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 228a5e9..0527531 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3441,13 +3441,13 @@ static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface, switch (SpecialFolder) { case WindowsFolder: - ret = GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ret = GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); break; case SystemFolder: - ret = GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ret = GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); break; case TemporaryFolder: - ret = GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + ret = GetTempPathW(ARRAY_SIZE(pathW), pathW); /* we don't want trailing backslash */ if (ret && pathW[ret-1] == '\\') pathW[ret-1] = 0; diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 5a0513f..8c60c80 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -180,7 +180,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 5083d30..d9ff241 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -18,6 +18,8 @@ #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : comctl32: Use ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: db2a3b7028c7d617c48827f66b8b7e813709c4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db2a3b7028c7d617c48827f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:29:13 2018 +0300 comctl32: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.h | 2 ++ dlls/comctl32/commctrl.c | 4 ++-- dlls/comctl32/datetime.c | 11 +++++------ dlls/comctl32/listview.c | 2 +- dlls/comctl32/monthcal.c | 31 ++++++++++++++----------------- dlls/comctl32/propsheet.c | 10 ++++------ dlls/comctl32/rebar.c | 2 +- dlls/comctl32/syslink.c | 8 ++++---- dlls/comctl32/taskdialog.c | 4 ++-- dlls/comctl32/theme_dialog.c | 3 +-- dlls/comctl32/theming.c | 2 +- dlls/comctl32/toolbar.c | 11 +++++------ dlls/comctl32/tooltips.c | 2 +- dlls/comctl32/trackbar.c | 2 +- dlls/comctl32/treeview.c | 4 ++-- dlls/comctl32/updown.c | 9 ++++----- 16 files changed, 50 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db2a3b7028c7d617c488…

1 0

Alistair Leslie-Hughes : crypt32/tests: Link to crypt API directly.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: d46cbb832c05cb56090d047fe2402d1b3a920a81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d46cbb832c05cb56090d047f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 27 04:21:24 2018 +0000 crypt32/tests: Link to crypt API directly. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 76 ++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d46cbb832c05cb56090d…

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_download_data().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: ec4be4ba40e9235421af8f9f06c28dffc586fc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4be4ba40e9235421af8f9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 10:13:12 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9ef917f..b2fddad 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -562,6 +562,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct unsigned int src_row_pitch, src_slice_pitch; struct wined3d_bo_address data; BYTE *temporary_mem = NULL; + unsigned int level; GLenum target; void *mem; @@ -574,6 +575,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct sub_resource = &texture->sub_resources[sub_resource_idx]; target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; if (target == GL_TEXTURE_2D_ARRAY) { @@ -606,10 +608,10 @@ static void surface_download_data(struct wined3d_surface *surface, const struct return; } - wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); + wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, texture->resource.device->surface_alignment, - wined3d_texture_get_level_pow2_width(texture, surface->texture_level), - wined3d_texture_get_level_pow2_height(texture, surface->texture_level), + wined3d_texture_get_level_pow2_width(texture, level), + wined3d_texture_get_level_pow2_height(texture, level), &src_row_pitch, &src_slice_pitch); if (!(temporary_mem = heap_alloc(src_slice_pitch))) { @@ -634,10 +636,10 @@ static void surface_download_data(struct wined3d_surface *surface, const struct f = *format; f.byte_count = format->conv_byte_count; - wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); + wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(&f, texture->resource.device->surface_alignment, - wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level), + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level), &src_row_pitch, &src_slice_pitch); if (!(temporary_mem = heap_alloc(src_slice_pitch))) @@ -665,25 +667,25 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("Downloading compressed surface %p, level %u, format %#x, type %#x, data %p.\n", - surface, surface->texture_level, format->glFormat, format->glType, mem); + surface, level, format->glFormat, format->glType, mem); - GL_EXTCALL(glGetCompressedTexImage(target, surface->texture_level, mem)); + GL_EXTCALL(glGetCompressedTexImage(target, level, mem)); checkGLcall("glGetCompressedTexImage"); } else { TRACE("Downloading surface %p, level %u, format %#x, type %#x, data %p.\n", - surface, surface->texture_level, format->glFormat, format->glType, mem); + surface, level, format->glFormat, format->glType, mem); - gl_info->gl_ops.gl.p_glGetTexImage(target, surface->texture_level, format->glFormat, format->glType, mem); + gl_info->gl_ops.gl.p_glGetTexImage(target, level, format->glFormat, format->glType, mem); checkGLcall("glGetTexImage"); } if (format->download) { format->download(mem, data.addr, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, - wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level), 1); + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level), 1); } else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { @@ -738,7 +740,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct src_data = mem; dst_data = data.addr; TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); - h = wined3d_texture_get_level_height(texture, surface->texture_level); + h = wined3d_texture_get_level_height(texture, level); for (y = 0; y < h; ++y) { memcpy(dst_data, src_data, dst_row_pitch);

1 0

Zebediah Figura : quartz: Fix a use-after-free in FilterGraph2_Connect().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: e5db13a8c89b557d380abc41dc8999d6f644de40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5db13a8c89b557d380abc41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:27 2018 -0600 quartz: Fix a use-after-free in FilterGraph2_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f9bc47b..0113674 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1049,6 +1049,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (IsEqualGUID(&clsid, &FilterCLSID)) { /* Skip filter (same as the one the output pin belongs to) */ IBaseFilter_Release(pfilter); + pfilter = NULL; goto error; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 12c6ac5fd7b679816d414262c57f288d0ece57d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12c6ac5fd7b679816d414262… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Feb 26 22:11:49 2018 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index f853ed4..8713732 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-05 08:41+0300\n" +"PO-Revision-Date: 2018-02-26 22:09+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -6674,10 +6674,8 @@ msgid "Connection reset by peer.\n" msgstr "Sujungimas nutrauktas kito serverio.\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "Pranešimas 0x%1 nerastas faile %2.\n" +msgstr "Joks parašas nerastas faile.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Sebastian Lackner : server: Keep reference to terminated async in free_async_queue.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 1356afed5a2e5a6ca2cfd2e4df9a4888f2a85205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1356afed5a2e5a6ca2cfd2e4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Feb 26 19:14:24 2018 +0100 server: Keep reference to terminated async in free_async_queue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/async.c b/server/async.c index 4f1bcf1..adbadc5 100644 --- a/server/async.c +++ b/server/async.c @@ -192,10 +192,12 @@ void free_async_queue( struct async_queue *queue ) LIST_FOR_EACH_ENTRY_SAFE( async, next, &queue->queue, struct async, queue_entry ) { + grab_object( &async->obj ); if (!async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); async->fd = NULL; async_terminate( async, STATUS_HANDLES_CLOSED ); async->queue = NULL; + release_object( &async->obj ); } }

1 0

Nikolay Sivov : wshom: Use ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: c0ba650969743026fd258c396049c5f4da7095bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ba650969743026fd258c39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:47:57 2018 +0300 wshom: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 8 ++++---- dlls/wshom.ocx/wshom_main.c | 2 +- dlls/wshom.ocx/wshom_private.h | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index a023786..d7b36cf 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -859,7 +859,7 @@ static HRESULT WINAPI WshShortcut_get_Arguments(IWshShortcut *iface, BSTR *Argum *Arguments = NULL; - hr = IShellLinkW_GetArguments(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + hr = IShellLinkW_GetArguments(This->link, buffW, ARRAY_SIZE(buffW)); if (FAILED(hr)) return hr; @@ -917,7 +917,7 @@ static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *Ic if (!IconPath) return E_POINTER; - hr = IShellLinkW_GetIconLocation(This->link, buffW, sizeof(buffW)/sizeof(WCHAR), &icon); + hr = IShellLinkW_GetIconLocation(This->link, buffW, ARRAY_SIZE(buffW), &icon); if (FAILED(hr)) return hr; sprintfW(pathW, fmtW, buffW, icon); @@ -1006,7 +1006,7 @@ static HRESULT WINAPI WshShortcut_get_WorkingDirectory(IWshShortcut *iface, BSTR return E_POINTER; *WorkingDirectory = NULL; - hr = IShellLinkW_GetWorkingDirectory(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + hr = IShellLinkW_GetWorkingDirectory(This->link, buffW, ARRAY_SIZE(buffW)); if (FAILED(hr)) return hr; *WorkingDirectory = SysAllocString(buffW); @@ -1395,7 +1395,7 @@ static HKEY get_root_key(const WCHAR *path) }; int i; - for (i = 0; i < sizeof(rootkeys)/sizeof(rootkeys[0]); i++) { + for (i = 0; i < ARRAY_SIZE(rootkeys); i++) { if (!strncmpW(path, rootkeys[i].full, strlenW(rootkeys[i].full))) return rootkeys[i].hkey; if (rootkeys[i].abbrev[0] && !strncmpW(path, rootkeys[i].abbrev, strlenW(rootkeys[i].abbrev))) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 0098b02..a44b44c 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -107,7 +107,7 @@ void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for(i = 0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index a10cf26..3d5eb1b 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -25,6 +25,8 @@ #include "ole2.h" #include "olectl.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + /* typelibs */ typedef enum tid_t { NULL_tid,

1 0

Nikolay Sivov : msxml3/saxreader: Allow setting default value for schema-validation feature.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: a62bed3bb86a9580ea8804bab37b45e1a614ec14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a62bed3bb86a9580ea8804ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:16:40 2018 +0300 msxml3/saxreader: Allow setting default value for schema-validation feature. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 13 ++++++++++--- dlls/msxml3/tests/saxreader.c | 22 +++++++++++++++++++--- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2a30475..df721f9 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -104,6 +104,10 @@ static const WCHAR ExhaustiveErrorsW[] = { 'e','x','h','a','u','s','t','i','v','e','-','e','r','r','o','r','s',0 }; +static const WCHAR SchemaValidationW[] = { + 's','c','h','e','m','a','-','v','a','l','i','d','a','t','i','o','n',0 +}; + struct saxreader_feature_pair { saxreader_feature feature; @@ -117,7 +121,8 @@ static const struct saxreader_feature_pair saxreader_feature_map[] = { { LexicalHandlerParEntities, FeatureLexicalHandlerParEntitiesW }, { NamespacePrefixes, FeatureNamespacePrefixesW }, { Namespaces, FeatureNamespacesW }, - { ProhibitDTD, FeatureProhibitDTDW } + { ProhibitDTD, FeatureProhibitDTDW }, + { SchemaValidation, SchemaValidationW }, }; static saxreader_feature get_saxreader_feature(const WCHAR *name) @@ -3222,12 +3227,13 @@ static HRESULT WINAPI isaxxmlreader_getFeature( feature = get_saxreader_feature(feature_name); - if (This->version < MSXML4 && feature == ExhaustiveErrors) + if (This->version < MSXML4 && (feature == ExhaustiveErrors || feature == SchemaValidation)) return E_INVALIDARG; if (feature == Namespaces || feature == NamespacePrefixes || - feature == ExhaustiveErrors) + feature == ExhaustiveErrors || + feature == SchemaValidation) return get_feature_value(This, feature, value); FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature_name), value); @@ -3248,6 +3254,7 @@ static HRESULT WINAPI isaxxmlreader_putFeature( /* accepted cases */ if ((feature == ExhaustiveErrors && value == VARIANT_FALSE) || + (feature == SchemaValidation && value == VARIANT_FALSE) || feature == Namespaces || feature == NamespacePrefixes) { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 29492fa..3ed332e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2789,19 +2789,35 @@ static void test_saxreader_features(void) continue; } - value = VARIANT_TRUE; - hr = ISAXXMLReader_getFeature(reader, _bstr_("exhaustive-errors"), &value); if (IsEqualGUID(entry->guid, &CLSID_SAXXMLReader40) || IsEqualGUID(entry->guid, &CLSID_SAXXMLReader60)) { + value = VARIANT_TRUE; + hr = ISAXXMLReader_getFeature(reader, _bstr_("exhaustive-errors"), &value); ok(hr == S_OK, "Failed to get feature value, hr %#x.\n", hr); ok(value == VARIANT_FALSE, "Unexpected default feature value.\n"); + hr = ISAXXMLReader_putFeature(reader, _bstr_("exhaustive-errors"), VARIANT_FALSE); + ok(hr == S_OK, "Failed to put feature value, hr %#x.\n", hr); + value = VARIANT_TRUE; + hr = ISAXXMLReader_getFeature(reader, _bstr_("schema-validation"), &value); + ok(hr == S_OK, "Failed to get feature value, hr %#x.\n", hr); + ok(value == VARIANT_FALSE, "Unexpected default feature value.\n"); hr = ISAXXMLReader_putFeature(reader, _bstr_("exhaustive-errors"), VARIANT_FALSE); ok(hr == S_OK, "Failed to put feature value, hr %#x.\n", hr); } else - ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); + { + value = 123; + hr = ISAXXMLReader_getFeature(reader, _bstr_("exhaustive-errors"), &value); + ok(hr == E_INVALIDARG, "Failed to get feature value, hr %#x.\n", hr); + ok(value == 123, "Unexpected value %d.\n", value); + + value = 123; + hr = ISAXXMLReader_getFeature(reader, _bstr_("schema-validation"), &value); + ok(hr == E_INVALIDARG, "Failed to get feature value, hr %#x.\n", hr); + ok(value == 123, "Unexpected value %d.\n", value); + } name = feature_names; while (*name)

1 0

Roderick Colenbrander : winevulkan: Add stub ICD.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: fcc7af83229ee46a177311a658b7ec92ee4d8d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc7af83229ee46a177311a6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:12 2018 +0100 winevulkan: Add stub ICD. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/winevulkan/Makefile.in | 6 +++++ dlls/winevulkan/version.rc | 27 ++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 51 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/winevulkan.spec | 2 ++ 6 files changed, 89 insertions(+) diff --git a/configure b/configure index 7ef096d..10ca89a 100755 --- a/configure +++ b/configure @@ -1537,6 +1537,7 @@ enable_wineoss_drv enable_wineps_drv enable_winepulse_drv enable_wineqtdecoder +enable_winevulkan enable_winex11_drv enable_wing32 enable_winhttp @@ -19036,6 +19037,7 @@ wine_fn_config_dll wineps.drv enable_wineps_drv wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll winepulse.drv enable_winepulse_drv wine_fn_config_dll wineqtdecoder enable_wineqtdecoder +wine_fn_config_dll winevulkan enable_winevulkan wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 diff --git a/configure.ac b/configure.ac index 7b796ef..02937ca 100644 --- a/configure.ac +++ b/configure.ac @@ -3690,6 +3690,7 @@ WINE_CONFIG_DLL(wineps.drv) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(winepulse.drv) WINE_CONFIG_DLL(wineqtdecoder) +WINE_CONFIG_DLL(winevulkan) WINE_CONFIG_DLL(winex11.drv) WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in new file mode 100644 index 0000000..0bffb48 --- /dev/null +++ b/dlls/winevulkan/Makefile.in @@ -0,0 +1,6 @@ +MODULE = winevulkan.dll + +C_SRCS = \ + vulkan.c + +RC_SRCS = version.rc diff --git a/dlls/winevulkan/version.rc b/dlls/winevulkan/version.rc new file mode 100644 index 0000000..a62ea75 --- /dev/null +++ b/dlls/winevulkan/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2017 Roderick Colenbrander + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" /* Needed to get PACKAGE_VERSION */ + +#define WINE_FILEDESCRIPTION_STR "Wine Vulkan ICD" +#define WINE_FILENAME_STR "winevulkan.dll" +#define WINE_FILEVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTNAME_STR "Wine Vulkan" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c new file mode 100644 index 0000000..cac907c --- /dev/null +++ b/dlls/winevulkan/vulkan.c @@ -0,0 +1,51 @@ +/* Wine Vulkan ICD implementation + * + * Copyright 2017 Roderick Colenbrander + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" +#include "wine/vulkan.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vulkan); + +void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) +{ + FIXME("stub: %p %s\n", instance, debugstr_a(name)); + return NULL; +} + +VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_version) +{ + FIXME("stub: %p\n", supported_version); + return VK_ERROR_INCOMPATIBLE_DRIVER; +} + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec new file mode 100644 index 0000000..8b87834 --- /dev/null +++ b/dlls/winevulkan/winevulkan.spec @@ -0,0 +1,2 @@ +@ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr +@ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion

1 0

Roderick Colenbrander : winevulkan: Add initial Wine vulkan header.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 460174e53a86524a75988e661a1b2cacc12f7d59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460174e53a86524a75988e66… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:11 2018 +0100 winevulkan: Add initial Wine vulkan header. This file is directly generated from Vulkan's vk.xml. It contains Core and extension Vulkan types and functions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1188 ++++++++ dlls/winevulkan/vk.xml | 6514 +++++++++++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 2423 ++++++++++++++++ 3 files changed, 10125 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=460174e53a86524a7598…

1 0

Jacek Caban : server: Share security descriptor among all pipe instances.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 1ce2201ed8bab2569b5cd1dbed7ae7665f76a515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce2201ed8bab2569b5cd1db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 19:25:08 2018 +0100 server: Share security descriptor among all pipe instances. Based on patch by Jonathan Doron. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 21 ++++++++++---------- server/named_pipe.c | 52 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 235ab12..5cbf6e7 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1209,7 +1209,7 @@ static void test_file_info(void) CloseHandle( client ); } -static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle) +static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle, BOOL todo) { SECURITY_DESCRIPTOR *sec_desc; ULONG length = 0; @@ -1217,8 +1217,10 @@ static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle) status = NtQuerySecurityObject(handle, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, NULL, 0, &length); + todo_wine_if(todo && status == STATUS_PIPE_DISCONNECTED) ok(status == STATUS_BUFFER_TOO_SMALL, "Failed to query object security descriptor length: %08x\n", status); + if(status != STATUS_BUFFER_TOO_SMALL) return NULL; ok(length != 0, "length = 0\n"); sec_desc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, length); @@ -1295,7 +1297,8 @@ static void _test_group(unsigned line, HANDLE handle, SID *expected_sid, BOOL to PSID group_sid; NTSTATUS status; - sec_desc = get_security_descriptor(handle); + sec_desc = get_security_descriptor(handle, todo); + if (!sec_desc) return; status = RtlGetGroupSecurityDescriptor(sec_desc, &group_sid, &defaulted); ok_(__FILE__,line)(status == STATUS_SUCCESS, @@ -1351,13 +1354,13 @@ static void test_security_info(void) ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status); test_group(server, world_sid, FALSE); - test_group(client, world_sid, TRUE); + test_group(client, world_sid, FALSE); /* new instance of pipe server has the same security descriptor */ server2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE, 10, 0x20000, 0x20000, 0, NULL); ok(server2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); - test_group(server2, world_sid, TRUE); + test_group(server2, world_sid, FALSE); /* set client group, server changes as well */ ret = SetSecurityDescriptorGroup(sec_desc, local_sid, FALSE); @@ -1366,8 +1369,8 @@ static void test_security_info(void) ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status); test_group(server, local_sid, FALSE); - test_group(client, local_sid, TRUE); - test_group(server2, local_sid, TRUE); + test_group(client, local_sid, FALSE); + test_group(server2, local_sid, FALSE); CloseHandle(server); /* SD is preserved after closing server object */ @@ -1378,19 +1381,17 @@ static void test_security_info(void) client = CreateFileA(PIPENAME, GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, NULL); ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); - test_group(client, local_sid, TRUE); + test_group(client, local_sid, FALSE); ret = DisconnectNamedPipe(server); ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError()); /* disconnected server may be queried for security info, but client does not */ - test_group(server, local_sid, TRUE); + test_group(server, local_sid, FALSE); status = NtQuerySecurityObject(client, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, NULL, 0, &length); - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status); status = NtSetSecurityObject(client, GROUP_SECURITY_INFORMATION, sec_desc); - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status); /* attempting to create another pipe instance with specified sd fails */ diff --git a/server/named_pipe.c b/server/named_pipe.c index c6b37ce..c77b07f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -150,6 +150,9 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); +static struct security_descriptor *pipe_server_get_sd( struct object *obj ); +static int pipe_server_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ); @@ -166,8 +169,8 @@ static const struct object_ops pipe_server_ops = no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ + pipe_server_get_sd, /* get_sd */ + pipe_server_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -193,6 +196,9 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); +static struct security_descriptor *pipe_client_get_sd( struct object *obj ); +static int pipe_client_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class ); @@ -209,8 +215,8 @@ static const struct object_ops pipe_client_ops = no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ + pipe_client_get_sd, /* get_sd */ + pipe_client_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -583,6 +589,36 @@ static void pipe_end_get_file_info( struct fd *fd, struct named_pipe *pipe, unsi } } +static struct security_descriptor *pipe_server_get_sd( struct object *obj ) +{ + struct pipe_server *server = (struct pipe_server *) obj; + return default_get_sd( &server->pipe->obj ); +} + +static struct security_descriptor *pipe_client_get_sd( struct object *obj ) +{ + struct pipe_client *client = (struct pipe_client *) obj; + if (client->server) return default_get_sd( &client->server->pipe->obj ); + set_error( STATUS_PIPE_DISCONNECTED ); + return NULL; +} + +static int pipe_server_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + struct pipe_server *server = (struct pipe_server *) obj; + return default_set_sd( &server->pipe->obj, sd, set_info ); +} + +static int pipe_client_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + struct pipe_client *client = (struct pipe_client *) obj; + if (client->server) return default_set_sd( &client->server->pipe->obj, sd, set_info ); + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; +} + static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ) { struct pipe_server *server = get_fd_user( fd ); @@ -1170,6 +1206,10 @@ DECL_HANDLER(create_named_pipe) pipe->timeout = req->timeout; pipe->flags = req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE; pipe->sharing = req->sharing; + if (sd) default_set_sd( &pipe->obj, sd, OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION ); } else { @@ -1193,10 +1233,6 @@ DECL_HANDLER(create_named_pipe) { reply->handle = alloc_handle( current->process, server, req->access, objattr->attributes ); server->pipe->instances++; - if (sd) default_set_sd( &server->pipe_end.obj, sd, OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION ); release_object( server ); }

1 0

Zebediah Figura : quartz/tests: Add a test for IGraphBuilder_Connect().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 6c0954d60fdc77df8f9198969a6697145b5b4e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0954d60fdc77df8f919896… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:28 2018 -0600 quartz/tests: Add a test for IGraphBuilder_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 17b2df1..8e9d17e 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -431,6 +431,49 @@ static void rungraph(IFilterGraph2 *graph) ok(hr==1, "Releasing mediacontrol returned: %x\n", hr); } +static void test_graph_builder_connect(WCHAR *filename) +{ + static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; + static const WCHAR inW[] = {'I','n',0}; + IBaseFilter *source_filter, *video_filter; + IPin *pin_in, *pin_out; + IFilterGraph2 *graph; + IVideoWindow *window; + HRESULT hr; + + graph = create_graph(); + + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "Failed to create VideoRenderer: %#x\n", hr); + + hr = IFilterGraph2_AddSourceFilter(graph, filename, NULL, &source_filter); + ok(hr == S_OK, "AddSourceFilter failed: %#x\n", hr); + + hr = IVideoWindow_QueryInterface(window, &IID_IBaseFilter, (void **)&video_filter); + ok(hr == S_OK, "QueryInterface(IBaseFilter) failed: %#x\n", hr); + hr = IFilterGraph2_AddFilter(graph, video_filter, NULL); + ok(hr == S_OK, "AddFilter failed: %#x\n", hr); + + hr = IBaseFilter_FindPin(source_filter, outputW, &pin_out); + ok(hr == S_OK, "FindPin failed: %#x\n", hr); + hr = IBaseFilter_FindPin(video_filter, inW, &pin_in); + ok(hr == S_OK, "FindPin failed: %#x\n", hr); + hr = IFilterGraph2_Connect(graph, pin_out, pin_in); + + if (hr != VFW_E_NO_ACCEPTABLE_TYPES) + { + ok(SUCCEEDED(hr), "Connect failed: %#x\n", hr); + rungraph(graph); + } + + IPin_Release(pin_in); + IPin_Release(pin_out); + IBaseFilter_Release(source_filter); + IBaseFilter_Release(video_filter); + IVideoWindow_Release(window); + IFilterGraph2_Release(graph); +} + static void test_render_run(const WCHAR *file) { IFilterGraph2 *graph; @@ -463,6 +506,8 @@ static void test_render_run(const WCHAR *file) refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); + test_graph_builder_connect(filename); + /* check reference leaks */ h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError());

1 0

Zebediah Figura : quartz/tests: Avoid using global variables.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 71fb9e65cff6ef06c80cec18425f31b848c79a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71fb9e65cff6ef06c80cec18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:26 2018 -0600 quartz/tests: Avoid using global variables. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 111 ++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71fb9e65cff6ef06c80c…

1 0

Zebediah Figura : quartz/tests: Test IMediaControl on a fully connected graph.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 7db3e3c2dd1c717064c33ca80fbb9a988be82a63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7db3e3c2dd1c717064c33ca8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:25 2018 -0600 quartz/tests: Test IMediaControl on a fully connected graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 168 +++++++++++++++------------------------- 1 file changed, 63 insertions(+), 105 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5fd3107..1f2fe20 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -283,6 +283,68 @@ static void test_basic_video(void) IBasicVideo_Release(pbv); } +static void test_mediacontrol(void) +{ + IMediaSeeking *seeking; + IMediaFilter *filter; + IMediaControl *control; + LONGLONG pos; + GUID format; + HRESULT hr; + + IGraphBuilder_SetDefaultSyncSource(pgraph); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); + ok(hr == S_OK, "QueryInterface(IMediaControl) failed: %08x\n", hr); + + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); + ok(hr == S_OK, "QueryInterface(IMediaFilter) failed: %08x\n", hr); + + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); + ok(hr == S_OK, "QueryInterface(IMediaControl) failed: %08x\n", hr); + + format = GUID_NULL; + hr = IMediaSeeking_GetTimeFormat(seeking, &format); + ok(hr == S_OK, "GetTimeFormat failed: %#x\n", hr); + ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "got %s\n", wine_dbgstr_guid(&format)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %#x\n", hr); + ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %#x\n", hr); + ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "ConvertTimeFormat failed: %#x\n", hr); + ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos)); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); + ok(hr == S_OK, "GetCurrentPosition failed: %#x\n", hr); + ok(pos == 0, "got %s\n", wine_dbgstr_longlong(pos)); + + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); + ok(hr == S_OK, "SetPositions failed: %#x\n", hr); + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_NoPositioning, NULL, AM_SEEKING_ReturnTime); + ok(hr == S_OK, "SetPositions failed: %#x\n", hr); + + IMediaFilter_SetSyncSource(filter, NULL); + pos = 0xdeadbeef; + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); + ok(hr == S_OK, "GetCurrentPosition failed: %#x\n", hr); + ok(pos == 0, "got %s\n", wine_dbgstr_longlong(pos)); + + hr = IMediaControl_GetState(control, 1000, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + IMediaControl_Release(control); + IMediaSeeking_Release(seeking); + IMediaFilter_Release(filter); +} + static void rungraph(void) { HRESULT hr; @@ -304,6 +366,7 @@ static void rungraph(void) IMediaFilter_Release(pmf); test_basic_video(); + test_mediacontrol(); hr = IMediaControl_Run(pmc); ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); @@ -555,109 +618,6 @@ static void test_graph_builder(void) releasefiltergraph(); } -static void test_graph_builder_addfilter(void) -{ - HRESULT hr; - IBaseFilter *pF = NULL; - static const WCHAR testFilterW[] = {'t','e','s','t','F','i','l','t','e','r',0}; - - if (!createfiltergraph()) - return; - - hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); - ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned: %x\n", hr); - - /* create video filter */ - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (LPVOID*)&pF); - ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); - ok(pF != NULL, "pF is NULL\n"); - if (!pF) { - skip("failed to created filter, skipping\n"); - return; - } - - hr = IGraphBuilder_AddFilter(pgraph, pF, NULL); - ok(hr == S_OK, "IGraphBuilder_AddFilter returned: %x\n", hr); - IBaseFilter_Release(pF); -} - -static void test_mediacontrol(void) -{ - HRESULT hr; - LONGLONG pos = 0xdeadbeef; - GUID format = GUID_NULL; - IMediaSeeking *seeking = NULL; - IMediaFilter *filter = NULL; - IMediaControl *control = NULL; - - IGraphBuilder_SetDefaultSyncSource(pgraph); - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); - ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); - if (FAILED(hr)) - return; - - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); - ok(hr == S_OK, "QueryInterface IMediaFilter failed: %08x\n", hr); - if (FAILED(hr)) - { - IMediaSeeking_Release(seeking); - return; - } - - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); - ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); - if (FAILED(hr)) - { - IMediaSeeking_Release(seeking); - IMediaFilter_Release(filter); - return; - } - - format = GUID_NULL; - hr = IMediaSeeking_GetTimeFormat(seeking, &format); - ok(hr == S_OK, "GetTimeFormat failed: %08x\n", hr); - ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "GetTimeFormat: unexpected format %s\n", wine_dbgstr_guid(&format)); - - pos = 0xdeadbeef; - hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); - ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); - - pos = 0xdeadbeef; - hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); - ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); - - pos = 0xdeadbeef; - hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); - ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); - - hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); - ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); - - hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); - ok(hr == S_OK, "SetPositions failed: %08x\n", hr); - hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_NoPositioning, NULL, AM_SEEKING_ReturnTime); - ok(hr == S_OK, "SetPositions failed: %08x\n", hr); - - IMediaFilter_SetSyncSource(filter, NULL); - pos = 0xdeadbeef; - hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); - ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); - - hr = IMediaControl_GetState(control, 1000, NULL); - ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr); - - IMediaControl_Release(control); - IMediaSeeking_Release(seeking); - IMediaFilter_Release(filter); - releasefiltergraph(); -} - static void test_filter_graph2(void) { HRESULT hr; @@ -2344,8 +2304,6 @@ START_TEST(filtergraph) test_render_run(avifile); test_render_run(mpegfile); test_graph_builder(); - test_graph_builder_addfilter(); - test_mediacontrol(); test_filter_graph2(); test_render_filter_priority(); test_aggregate_filter_graph();

1 0

Michael Stefaniuc : dmband/tests: Add IDirectMusicObject::ParseDescriptor( ) tests.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 0994e22932d34c934ba12b7193701cf6364245a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0994e22932d34c934ba12b71… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 27 00:38:37 2018 +0100 dmband/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index f3042ea..6c615f6 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "initguid.h" #include "dmusici.h" +#include "dmusicf.h" #include "dmplugin.h" DEFINE_GUID(IID_IDirectMusicBandTrackPrivate, 0x53466056, 0x6dc4, 0x11d1, 0xbf, 0x7b, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef); @@ -242,6 +243,203 @@ static void test_bandtrack(void) while (IDirectMusicTrack8_Release(dmt8)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + static const LARGE_INTEGER zero; + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + DWORD valid; + const WCHAR s_inam[] = {'I','N','A','M','\0'}; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), + "Got class guid %s, expected CLSID_DirectMusicBand\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), + "Got class guid %s, expected CLSID_DirectMusicBand\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_INVALID_BAND, + "ParseDescriptor failed: %08x, expected DMUS_E_INVALID_BAND\n", hr); + + /* All desc chunks, extra DMUS_OBJ_DATE */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), + "Got class guid %s, expected CLSID_DirectMusicBand\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, + "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, + desc.ftDate.dwLowDateTime); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -257,6 +455,7 @@ START_TEST(dmband) test_COM_bandtrack(); test_dmband(); test_bandtrack(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Nikolay Sivov : comctl32/tests: Add a test for TTN_SHOW order.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 7d9cf7f4b51a137ad8488a8f441d1a444a459d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d9cf7f4b51a137ad8488a8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:28:35 2018 +0300 comctl32/tests: Add a test for TTN_SHOW order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 108 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index c260e3d..7f37d5f 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -25,9 +25,18 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +enum seq_index +{ + PARENT_SEQ_INDEX = 0, + NUM_MSG_SEQUENCES +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + static void test_create_tooltip(BOOL is_v6) { HWND parent, hwnd; @@ -264,17 +273,51 @@ static void test_customdraw(void) { static const CHAR testcallbackA[] = "callback"; +static RECT g_ttip_rect; static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { + static LONG defwndproc_counter = 0; + struct message msg; + LRESULT ret; + if (message == WM_NOTIFY && lParam) { NMTTDISPINFOA *ttnmdi = (NMTTDISPINFOA*)lParam; + NMHDR *hdr = (NMHDR *)lParam; + RECT rect; - if (ttnmdi->hdr.code == TTN_GETDISPINFOA) + if (hdr->code != NM_CUSTOMDRAW) + { + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = hdr->code; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + } + + switch (hdr->code) + { + case TTN_GETDISPINFOA: lstrcpyA(ttnmdi->lpszText, testcallbackA); + break; + case TTN_SHOW: + GetWindowRect(hdr->hwndFrom, &rect); + todo_wine + ok(!EqualRect(&g_ttip_rect, &rect), "Unexpected window rectangle.\n"); + break; + } } - return DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter++; + if (IsWindowUnicode(hwnd)) + ret = DefWindowProcW(hwnd, message, wParam, lParam); + else + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; } static void register_parent_wnd_class(void) @@ -1134,11 +1177,70 @@ static void test_TTM_ADDTOOL(BOOL is_v6) DestroyWindow(hwnd); } +static const struct message ttn_show_parent_seq[] = +{ + { WM_NOTIFY, sent|id, 0, 0, TTN_SHOW }, + { 0 } +}; + +static void test_TTN_SHOW(void) +{ + HWND hwndTip, hwnd; + TTTOOLINFOA ti; + RECT rect; + BOOL ret; + + hwnd = create_parent_window(); + ok(hwnd != NULL, "Failed to create parent window.\n"); + + /* Put cursor outside the window */ + GetWindowRect(hwnd, &rect); + SetCursorPos(rect.right + 200, 0); + + ShowWindow(hwnd, SW_SHOWNORMAL); + flush_events(100); + + /* Create tooltip */ + hwndTip = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, NULL, TTS_ALWAYSTIP, 10, 10, 300, 300, + hwnd, NULL, NULL, 0); + ok(hwndTip != NULL, "Failed to create tooltip window.\n"); + + SetWindowPos(hwndTip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + ti.cbSize = sizeof(TTTOOLINFOA); + ti.hwnd = hwnd; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = TTF_SUBCLASS; + ti.uId = 0x1234abcd; + ti.lpszText = (LPSTR)"This is a test tooltip"; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(ret, "Failed to add a tool.\n"); + + /* Make tooltip appear quickly */ + SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1, 0)); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* Put cursor inside window, tooltip will appear immediately */ + GetWindowRect(hwnd, &rect); + SetCursorPos((rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2); + flush_events(200); + + ok_sequence(sequences, PARENT_SEQ_INDEX, ttn_show_parent_seq, "TTN_SHOW parent seq", FALSE); + + DestroyWindow(hwndTip); + DestroyWindow(hwnd); +} + START_TEST(tooltips) { ULONG_PTR ctx_cookie; HANDLE hCtx; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + LoadLibraryA("comctl32.dll"); register_parent_wnd_class(); @@ -1153,6 +1255,7 @@ START_TEST(tooltips) test_setinfo(FALSE); test_margin(); test_TTM_ADDTOOL(FALSE); + test_TTN_SHOW(); if (!load_v6_module(&ctx_cookie, &hCtx)) return; @@ -1164,6 +1267,7 @@ START_TEST(tooltips) test_setinfo(TRUE); test_margin(); test_TTM_ADDTOOL(TRUE); + test_TTN_SHOW(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Michael Müller : kernelbase: Add stub for QuirkIsEnabled.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 7d9c95269b0b84bda0d063b3dd560b10b28c6b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d9c95269b0b84bda0d063b3… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 27 04:21:26 2018 +0000 kernelbase: Add stub for QuirkIsEnabled. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-quirks-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec index e8f77c7..1485512 100644 --- a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec +++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub QuirkGetData @ stub QuirkGetData2 -@ stub QuirkIsEnabled +@ stdcall QuirkIsEnabled(ptr) kernelbase.QuirkIsEnabled @ stub QuirkIsEnabled2 @ stdcall QuirkIsEnabled3(ptr ptr) kernelbase.QuirkIsEnabled3 @ stub QuirkIsEnabledForPackage diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1a6f1ff..aa67372 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1223,7 +1223,7 @@ @ stdcall QueueUserWorkItem(ptr ptr long) kernel32.QueueUserWorkItem # @ stub QuirkGetData # @ stub QuirkGetData2 -# @ stub QuirkIsEnabled +@ stdcall QuirkIsEnabled(ptr) # @ stub QuirkIsEnabled2 @ stdcall QuirkIsEnabled3(ptr ptr) # @ stub QuirkIsEnabledForPackage diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 9c89ff4..6871aca 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -1,4 +1,5 @@ /* + * Copyright 2016 Michael Müller * Copyright 2017 Andrey Gusev * * This library is free software; you can redistribute it and/or @@ -76,6 +77,15 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po } /*********************************************************************** + * QuirkIsEnabled (KERNELBASE.@) + */ +BOOL WINAPI QuirkIsEnabled(void *arg) +{ + FIXME("(%p): stub\n", arg); + return FALSE; +} + +/*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)

1 0

Roderick Colenbrander : winevulkan: Implement vk_icdNegotiateICDInterfaceVersion.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 112e6835bbe7c3a0ff9eea51ed558fa53b177878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=112e6835bbe7c3a0ff9eea51… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:13 2018 +0100 winevulkan: Implement vk_icdNegotiateICDInterfaceVersion. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index cac907c..ef22a45 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -27,6 +27,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +/* For now default to 4 as it felt like a reasonable version feature wise to support. + * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version + * as it is unlikely we will implement physical device extensions, which the loader is not + * aware off. Version 5 adds more extensive version checks. Something to tackle later. + */ +#define WINE_VULKAN_ICD_VERSION 4 + void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) { FIXME("stub: %p %s\n", instance, debugstr_a(name)); @@ -35,8 +42,21 @@ void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *na VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_version) { - FIXME("stub: %p\n", supported_version); - return VK_ERROR_INCOMPATIBLE_DRIVER; + uint32_t req_version; + + TRACE("%p\n", supported_version); + + /* The spec is not clear how to handle this. Mesa drivers don't check, but it + * is probably best to not explode. VK_INCOMPLETE seems to be the closest value. + */ + if (!supported_version) + return VK_INCOMPLETE; + + req_version = *supported_version; + *supported_version = min(req_version, WINE_VULKAN_ICD_VERSION); + TRACE("Loader requested ICD version %u, returning %u\n", req_version, *supported_version); + + return VK_SUCCESS; } BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in wined3d_surface_upload_data ().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 78366806a0b2810ca9b16d0efb1696bffcf20de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78366806a0b2810ca9b16d0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 10:13:13 2018 +0330 wined3d: Explicitly calculate the sub-resource level in wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2fddad..9dff68f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -785,7 +785,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; - unsigned int layer; + unsigned int level, layer; GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", @@ -811,6 +811,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; layer = sub_resource_idx / texture->level_count; if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) @@ -834,19 +835,19 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - target, surface->texture_level, layer, dst_point->x, dst_point->y, + target, level, layer, dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) { if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_point->x, dst_point->y, layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr)); } } @@ -861,12 +862,12 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w { if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_point->x, y, layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, y, + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_point->x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); } @@ -885,18 +886,18 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - target, surface->texture_level, layer, dst_point->x, dst_point->y, + target, level, layer, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + GL_EXTCALL(glTexSubImage3D(target, level, dst_point->x, dst_point->y, layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in device_clear_render_targets ().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: bca2fc4189f7aee48afea6471afd17f33c73d7e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca2fc4189f7aee48afea647… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 10:13:11 2018 +0330 wined3d: Explicitly calculate the sub-resource level in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5ec0705..648e352 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -281,11 +281,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } else { + unsigned int ds_level = dsv->sub_resource_idx % depth_stencil->container->level_count; + render_offscreen = TRUE; - drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, - depth_stencil->texture_level); - drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, - depth_stencil->texture_level); + drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, ds_level); + drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, ds_level); } if (depth_stencil)

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_upload_from_surface ().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: d635d7e51dd3837cfae1c7d92b6e9b9ac413470a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d635d7e51dd3837cfae1c7d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 10:13:14 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9dff68f..ada7193 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -934,6 +934,7 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_texture *dst_texture = dst_surface->container; unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_gl_info *gl_info; + unsigned int src_level, dst_level; struct wined3d_context *context; struct wined3d_bo_address data; UINT update_w, update_h; @@ -950,16 +951,18 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, * just to overwrite them again. */ update_w = src_rect->right - src_rect->left; update_h = src_rect->bottom - src_rect->top; - if (update_w == wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level) - && update_h == wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level)) + dst_level = dst_sub_resource_idx % dst_texture->level_count; + if (update_w == wined3d_texture_get_level_width(dst_texture, dst_level) + && update_h == wined3d_texture_get_level_height(dst_texture, dst_level)) wined3d_texture_prepare_texture(dst_texture, context, FALSE); else wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + src_level = src_sub_resource_idx % src_texture->level_count; wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->sub_resources[src_sub_resource_idx].locations); - wined3d_texture_get_pitch(src_texture, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); wined3d_surface_upload_data(dst_surface, gl_info, src_texture->resource.format, src_rect, src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data));

1 0

Nikolay Sivov : msxml3/saxreader: Accept external-general-entities and external-parameter-entities.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 585e12fa9d3fbf3e3460350e44597d7c0ec18ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=585e12fa9d3fbf3e3460350e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:16:39 2018 +0300 msxml3/saxreader: Accept external-general-entities and external-parameter-entities. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 05c774b..2a30475 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -3247,16 +3247,17 @@ static HRESULT WINAPI isaxxmlreader_putFeature( feature = get_saxreader_feature(feature_name); /* accepted cases */ - if ((feature == ExternalGeneralEntities && value == VARIANT_FALSE) || - (feature == ExternalParameterEntities && value == VARIANT_FALSE) || - (feature == ExhaustiveErrors && value == VARIANT_FALSE) || + if ((feature == ExhaustiveErrors && value == VARIANT_FALSE) || feature == Namespaces || feature == NamespacePrefixes) { return set_feature_value(This, feature, value); } - if (feature == LexicalHandlerParEntities || feature == ProhibitDTD) + if (feature == LexicalHandlerParEntities || + feature == ProhibitDTD || + feature == ExternalGeneralEntities || + feature == ExternalParameterEntities) { FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature_name), value); return set_feature_value(This, feature, value);

1 0

Nikolay Sivov : msxml3/saxreader: Accept disabled "exhaustive-errors" property.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 1d78226f514b3026eea466404afde9bae4e8b72f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d78226f514b3026eea46640… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:16:38 2018 +0300 msxml3/saxreader: Accept disabled "exhaustive-errors" property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 14 +++++++++++++- dlls/msxml3/tests/saxreader.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e8d5b27..05c774b 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -100,6 +100,10 @@ static const WCHAR FeatureNamespacePrefixesW[] = { '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 }; +static const WCHAR ExhaustiveErrorsW[] = { + 'e','x','h','a','u','s','t','i','v','e','-','e','r','r','o','r','s',0 +}; + struct saxreader_feature_pair { saxreader_feature feature; @@ -107,6 +111,7 @@ struct saxreader_feature_pair }; static const struct saxreader_feature_pair saxreader_feature_map[] = { + { ExhaustiveErrors, ExhaustiveErrorsW }, { ExternalGeneralEntities, FeatureExternalGeneralEntitiesW }, { ExternalParameterEntities, FeatureExternalParameterEntitiesW }, { LexicalHandlerParEntities, FeatureLexicalHandlerParEntitiesW }, @@ -3216,7 +3221,13 @@ static HRESULT WINAPI isaxxmlreader_getFeature( TRACE("(%p)->(%s %p)\n", This, debugstr_w(feature_name), value); feature = get_saxreader_feature(feature_name); - if (feature == Namespaces || feature == NamespacePrefixes) + + if (This->version < MSXML4 && feature == ExhaustiveErrors) + return E_INVALIDARG; + + if (feature == Namespaces || + feature == NamespacePrefixes || + feature == ExhaustiveErrors) return get_feature_value(This, feature, value); FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature_name), value); @@ -3238,6 +3249,7 @@ static HRESULT WINAPI isaxxmlreader_putFeature( /* accepted cases */ if ((feature == ExternalGeneralEntities && value == VARIANT_FALSE) || (feature == ExternalParameterEntities && value == VARIANT_FALSE) || + (feature == ExhaustiveErrors && value == VARIANT_FALSE) || feature == Namespaces || feature == NamespacePrefixes) { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 9ebed62..29492fa 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2789,6 +2789,20 @@ static void test_saxreader_features(void) continue; } + value = VARIANT_TRUE; + hr = ISAXXMLReader_getFeature(reader, _bstr_("exhaustive-errors"), &value); + if (IsEqualGUID(entry->guid, &CLSID_SAXXMLReader40) || + IsEqualGUID(entry->guid, &CLSID_SAXXMLReader60)) + { + ok(hr == S_OK, "Failed to get feature value, hr %#x.\n", hr); + ok(value == VARIANT_FALSE, "Unexpected default feature value.\n"); + + hr = ISAXXMLReader_putFeature(reader, _bstr_("exhaustive-errors"), VARIANT_FALSE); + ok(hr == S_OK, "Failed to put feature value, hr %#x.\n", hr); + } + else + ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); + name = feature_names; while (*name) {

1 0

Francois Gouget : testbot: Show the VM configuration details when submitting a job.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: tools Branch: master Commit: 5a92f4bf051c2e416a2b72a28595887dc638755e URL: https://source.winehq.org/git/tools.git/?a=commit;h=5a92f4bf051c2e416a2b72a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:44:33 2018 +0100 testbot: Show the VM configuration details when submitting a job. The VMs are now shown in a table and their short description can be expanded to show the full configuration. This can help select the right set of VMs for the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 40 +++++++++++++++++++++++----------------- testbot/web/WineTestBot.css | 13 +++++++++++++ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 0e9aef3..875384e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -230,7 +230,12 @@ sub GenerateFields($) { print "<div><input type='hidden' name='ShowAll' value='1'></div>\n"; } - + print "<div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'></th>\n"; + print "<th class='Record'>VM Name</th>\n"; + print "<th class='Record'>Description</th>\n"; + print "</th><tbody>\n"; + my $VMs = CreateVMs(); if ($self->{FileType} eq "exe64" || $self->{FileType} eq "dll64") { @@ -249,36 +254,37 @@ sub GenerateFields($) { $VMs->AddFilter("Role", ["base"]); } + my $Even = 1; my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); foreach my $VMKey (@$SortedKeys) { my $VM = $VMs->GetItem($VMKey); my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - print "<div class='ItemProperty'><label>", - $self->CGI->escapeHTML($VM->Name); - if ($VM->Description) - { - print " (", $self->CGI->escapeHTML($VM->Description), ")"; - } - my $Checked = 1; - if ($VM->Status eq 'offline') - { - print " [offline]"; - $Checked = undef; - } - elsif ($VM->Status eq 'maintenance') + print "<tr class='", ($Even ? "even" : "odd"), + "'><td><input name='$FieldName' type='checkbox'"; + $Even = !$Even; + my ($Checked, $Status) = (1, ""); + if ($VM->Status =~ /^(offline|maintenance)$/) { - print " [maintenance]"; + $Status = " [". $VM->Status ."]"; $Checked = undef; } - print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($Checked and ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; } - print "/></div></div>\n"; + print "/></td>\n"; + + print "<td>", $self->CGI->escapeHTML($VM->Name), "</td>\n"; + print "<td><details><summary>", + $self->CGI->escapeHTML($VM->Description || $VM->Name), + "$Status</summary>", + $self->CGI->escapeHTML($VM->Details || "No details!"), + "</details></td>"; + print "</tr>\n"; } + print "</tbody></table>\n"; } else { diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 2ccce24..ebc622e 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -317,6 +317,19 @@ h2 padding-bottom: 0.1em; } +details +{ + font-style: italic; + color: #505050; +} + +summary +{ + font-style: normal; + color: black; +} + + pre { margin: 0;

1 0

Francois Gouget : testbot: Show the VM configuration on the Job details page.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: tools Branch: master Commit: d9d84229e4e63ee659a10442aa60852ceeda7b8a URL: https://source.winehq.org/git/tools.git/?a=commit;h=d9d84229e4e63ee659a1044… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:44:04 2018 +0100 testbot: Show the VM configuration on the Job details page. This makes it easier to use the VM configuration details when analyzing the test results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e825da4..7ca7889 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -248,6 +248,12 @@ sub GenerateBody($) my $VM = $Item->VM; print "<h2><a name='k", $self->escapeHTML($Key), "'></a>" , $self->escapeHTML($Item->GetTitle()), "</h2>\n"; + + print "<details><summary>", + $self->CGI->escapeHTML($VM->Description || $VM->Name), "</summary>", + $self->CGI->escapeHTML($VM->Details || "No details!"), + "</details>\n"; + my $ScreenshotParamName = "scrshot_$Key"; my $FullLogParamName = "log_$Key"; my $LogName = "$TaskDir/log"; @@ -321,6 +327,7 @@ sub GenerateBody($) } } print "</div>\n"; + if (open LOGFILE, "<$LogName") { my $HasLogEntries = !1;

1 0

Francois Gouget : testbot/web: Add the VM name as a tooltip for reverts on the Activity page.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: tools Branch: master Commit: 23bbea1472d08f34cfabd2af9b516b379aec059e URL: https://source.winehq.org/git/tools.git/?a=commit;h=23bbea1472d08f34cfabd2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:48:28 2018 +0100 testbot/web: Add the VM name as a tooltip for reverts on the Activity page. This helps keep track of which column corresponds to which VM when scrolling down the activity page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 91153b3..d5fe6f3 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -238,6 +238,10 @@ EOF { $Label = $VMStatus->{details} || $VMStatus->{status}; } + elsif ($VMStatus->{status} eq "reverting") + { + $Label = "<a class='title' title='". $VM->Name ."'>reverting</a>"; + } else { $Label = $VMStatus->{status};

1 0

Francois Gouget : testbot: Fail test units that spam the test report.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: tools Branch: master Commit: afc41c0fdcf87692f34cad61b1d9d5538dd89b26 URL: https://source.winehq.org/git/tools.git/?a=commit;h=afc41c0fdcf87692f34cad6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 27 02:43:45 2018 +0100 testbot: Fail test units that spam the test report. To not exceed the maximum report size, each test unit must print less than 2.5KB of traces on average. So report tests that hog more than 10 times that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 8 ++++++++ testbot/lib/WineTestBot/Config.pm | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 65faf72..46b11f3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -511,6 +511,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # track of the current one. Note that for the TestBot we don't count or # complain about misplaced skips. my ($CurrentDll, $CurrentUnit) = ("", ""); + my $UnitSize = 0; my ($LineFailures, $LineTodos, $LineSkips) = (0, 0, 0); my ($SummaryFailures, $SummaryTodos, $SummarySkips) = (0, 0, 0); my ($CurrentIsBroken, %CurrentPids, $CurrentRc, $LogFailures); @@ -564,6 +565,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # so only use them as a fallback. $LineFailures ||= $SummaryFailures; + if ($UnitSize > $MaxUnitSize) + { + LogTaskError("$CurrentDll:$CurrentUnit prints too much data ($UnitSize bytes)\n"); + $LogFailures++; + } if (!$CurrentIsBroken and defined $CurrentRc) { # Check the exit code, particularly against failures reported @@ -601,6 +607,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures += $LineFailures; $CurrentDll = $CurrentUnit = ""; + $UnitSize = 0; $LineFailures = $LineTodos = $LineSkips = 0; $SummaryFailures = $SummaryTodos = $SummarySkips = 0; $CurrentIsBroken = 0; @@ -610,6 +617,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) foreach my $Line (<$LogFile>) { + $UnitSize += length($Line); if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 02c9dac..9052fc4 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -32,7 +32,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout - $BuildTimeout $ReconfigTimeout $TagPrefix + $BuildTimeout $ReconfigTimeout $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel @@ -47,7 +47,7 @@ require Exporter; $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout - $TagPrefix $ProjectName $PatchesMailingList + $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel $TunnelDefaults $PrettyHostNames $JobPurgeDays $JobArchiveDays @@ -96,6 +96,8 @@ $BuildTimeout = 5 * 60; # How long to let a full recompilation run before forcibly shutting it down # (in seconds). $ReconfigTimeout = 45 * 60; +# Maximum amount of traces for a test unit. +$MaxUnitSize = 32 * 1024; $ProjectName = "Wine"; $PatchesMailingList = "wine-devel";

1 0

Jacek Caban : mshtml: Support X-UA-Compatible HTTP header.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 9ae8b8c00f2cca205fdf4ce76e221778b7dfbea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae8b8c00f2cca205fdf4ce7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 18:21:11 2018 +0100 mshtml: Support X-UA-Compatible HTTP header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/mutation.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/navigate.c | 9 ++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 71c477a..f754bad 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -147,6 +147,7 @@ HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,request_data_t*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT submit_form(HTMLOuterWindow*,const WCHAR*,IUri*,nsIInputStream*) DECLSPEC_HIDDEN; +void process_document_response_headers(HTMLDocumentNode*,IBinding*) DECLSPEC_HIDDEN; void init_bscallback(BSCallback*,const BSCallbackVtbl*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 4e1e053..555a99b 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shlguid.h" +#include "wininet.h" #include "mshtml_private.h" #include "htmlscript.h" @@ -394,6 +395,8 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) static const WCHAR edgeW[] = {'e','d','g','e',0}; + TRACE("%s\n", debugstr_w(p)); + if(p[0] != 'I' || p[1] != 'E' || p[2] != '=') return FALSE; p += 3; @@ -432,6 +435,39 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) return TRUE; } +void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding) +{ + IWinInetHttpInfo *http_info; + char buf[1024]; + DWORD size; + HRESULT hres; + + hres = IBinding_QueryInterface(binding, &IID_IWinInetHttpInfo, (void**)&http_info); + if(FAILED(hres)) { + TRACE("No IWinInetHttpInfo\n"); + return; + } + + size = sizeof(buf); + strcpy(buf, "X-UA-Compatible"); + hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_CUSTOM, buf, &size, NULL, NULL); + if(hres == S_OK && size) { + compat_mode_t document_mode; + WCHAR *header; + + TRACE("size %u\n", size); + + header = heap_strdupAtoW(buf); + if(header && parse_ua_compatible(header, &document_mode)) { + TRACE("setting document mode %d\n", document_mode); + doc->document_mode = document_mode; + } + heap_free(header); + } + + IWinInetHttpInfo_Release(http_info); +} + static void process_meta_element(HTMLDocumentNode *doc, nsIDOMHTMLMetaElement *meta_element) { nsAString http_equiv_str, content_str; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a8d3330..9d6076d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1003,9 +1003,16 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) } if(This->is_doc_channel) { + HRESULT hres; + if(!This->bsc.window) return E_ABORT; /* Binding aborted in OnStartRequest call. */ - update_window_doc(This->bsc.window); + hres = update_window_doc(This->bsc.window); + if(FAILED(hres)) + return hres; + + if(This->bsc.binding) + process_document_response_headers(This->bsc.window->doc, This->bsc.binding); if(This->bsc.window->base.outer_window->readystate != READYSTATE_LOADING) set_ready_state(This->bsc.window->base.outer_window, READYSTATE_LOADING); }

1 0

Alex Henrie : ieframe/tests: Mark an IE test as todo on x64 and ARM.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: a067ceb538e4fc8b7a95c5bf763201232c213faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a067ceb538e4fc8b7a95c5bf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 12 19:48:23 2018 -0700 ieframe/tests: Mark an IE test as todo on x64 and ARM. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/ie.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index cb901d7..37845dc 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -261,6 +261,9 @@ static void test_InternetExplorer(void) return; hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); +#ifndef __i386__ +todo_wine +#endif ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); if (hres != S_OK) { IUnknown_Release(unk);

1 0

Jacek Caban : urlmon: Use HttpQueryInfoA in IWinInetHttpInfo:: QueryInfo implementation.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 216ad43f18fdf08b1c76758120c6bedbdf7043c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216ad43f18fdf08b1c767581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 18:21:02 2018 +0100 urlmon: Use HttpQueryInfoA in IWinInetHttpInfo::QueryInfo implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/http.c | 8 +++---- dlls/urlmon/tests/protocol.c | 51 +++++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 2fd9be6..9cc6117 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -912,11 +912,9 @@ static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption if(!This->base.request) return E_FAIL; - if(!HttpQueryInfoW(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) { - if(pBuffer) - memset(pBuffer, 0, *pcbBuffer); - return S_OK; - } + if(!HttpQueryInfoA(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) + return S_FALSE; + return S_OK; } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index d88aa07..4ca4327 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -940,6 +940,39 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, return S_OK; } +static void test_http_info(IInternetProtocol *protocol) +{ + IWinInetHttpInfo *info; + char buf[1024]; + DWORD size, len; + HRESULT hres; + + static const WCHAR connectionW[] = {'c','o','n','n','e','c','t','i','o','n',0}; + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&info); + ok(hres == S_OK, "Could not get IWinInterHttpInfo iface: %08x\n", hres); + + size = sizeof(buf); + strcpy(buf, "connection"); + hres = IWinInetHttpInfo_QueryInfo(info, HTTP_QUERY_CUSTOM, buf, &size, NULL, NULL); + if(tested_protocol != FTP_TEST) { + ok(hres == S_OK, "QueryInfo failed: %08x\n", hres); + + ok(!strcmp(buf, "Keep-Alive"), "buf = %s\n", buf); + len = strlen(buf); + ok(size == len, "size = %u, expected %u\n", size, len); + + size = sizeof(buf); + memcpy(buf, connectionW, sizeof(connectionW)); + hres = IWinInetHttpInfo_QueryInfo(info, HTTP_QUERY_CUSTOM, buf, &size, NULL, NULL); + ok(hres == S_FALSE, "QueryInfo returned %08x\n", hres); + }else { + ok(hres == S_FALSE, "QueryInfo failed: %08x\n", hres); + } + + IWinInetHttpInfo_Release(info); +} + static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { @@ -1071,6 +1104,9 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR "grcfBSCF = %08x\n", grfBSCF); } + if((grfBSCF & BSCF_FIRSTDATANOTIFICATION) && !binding_test) + test_http_info(async_protocol); + if(!(bindf & BINDF_FROMURLMON) && !(grfBSCF & BSCF_LASTDATANOTIFICATION)) { if(state == STATE_CONNECTING) { @@ -3129,19 +3165,6 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); } -static void test_http_info(IInternetProtocol *protocol) -{ - IWinInetHttpInfo *info; - HRESULT hres; - - hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&info); - ok(hres == S_OK, "Could not get IWinInterHttpInfo iface: %08x\n", hres); - - /* TODO */ - - IWinInetHttpInfo_Release(info); -} - /* is_first refers to whether this is the first call to this function * _for this url_ */ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tymed) @@ -3183,7 +3206,6 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym ULONG ref; test_priority(async_protocol); - test_http_info(async_protocol); SET_EXPECT(ReportProgress_COOKIE_SENT); if(http_is_first) { @@ -3452,7 +3474,6 @@ static void test_ftp_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); test_priority(async_protocol); - test_http_info(async_protocol); SET_EXPECT(GetBindInfo); SET_EXPECT(ReportProgress_FINDINGRESOURCE);

1 0