February 2018 - Wine-Commits

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