July 2018 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/WineSendLog: Also show the TestBot job URL in the developer email.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: fc4a17e795f37aa8670fbb6893d777a41a93aa92 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc4a17e795f37aa8670fbb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:41:52 2018 +0200 testbot/WineSendLog: Also show the TestBot job URL in the developer email. Also compute the job url once instead of duplicating that code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index bcd62f3..cda724d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -216,6 +216,10 @@ sub SendLog($) my $StepsTasks = CreateStepsTasks(undef, $Job); my @SortedKeys = sort @{$StepsTasks->GetKeys()}; + my $JobURL = ($UseSSL ? "https://" : "http://") . + "$WebHostName/JobDetails.pl?Key=". $Job->GetKey(); + + # # Send a job summary and all the logs as attachments to the developer # @@ -268,6 +272,8 @@ EOF $TestFailures; } + print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; + # Print the job summary my @FailureKeys; foreach my $Key (@SortedKeys) @@ -501,8 +507,6 @@ EOF Debug("\n-------------------- Mailing list email --------------------\n"); - my $WebSite = ($UseSSL ? "https://" : "http://") . $WebHostName; - if ($Messages) { if ($Debug) @@ -529,11 +533,13 @@ Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? -Full results can be found at + +Full results can be found at: +$JobURL + +Your paranoid android. + EOF - print $Sendmail "$WebSite/JobDetails.pl?Key=", - $Job->GetKey(), "\n\n"; - print $Sendmail "Your paranoid android.\n\n"; print $Sendmail $Messages; close($Sendmail); @@ -558,7 +564,7 @@ EOF # successful or not. DebugTee($Result, "Status: ". ($Messages ? "Failed" : "OK") ."\n"); DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); - DebugTee($Result, "URL: $WebSite/JobDetails.pl?Key=". $Job->GetKey() ."\n"); + DebugTee($Result, "URL: $JobURL\n"); foreach my $Key (@SortedKeys) {

1 0

Francois Gouget : testbot: A minor LogUtils.pm indentation fix.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: f4668bdf3dce386a9777787557cf1c2caacc75f2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f4668bdf3dce386a9777787… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:42:09 2018 +0200 testbot: A minor LogUtils.pm indentation fix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5e6407b..cabd183 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -361,7 +361,7 @@ sub ParseWineTestReport($$$$) } elsif ($Parser->{IsWineTest} and !$Cur->{IsBroken}) { - _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); + _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); } } elsif ($Rc & 0xc0000000)

1 0

Józef Kucia : winemac: Add missing entries to vulkan_funcs.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 0cbbab9dac9cf725287b6ad1a9ba919db46e0e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbbab9dac9cf725287b6ad1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:22 2018 +0200 winemac: Add missing entries to vulkan_funcs. MoltenVK doesn't implement VK_KHR_device_group. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 4d1e496..3f70454 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -475,8 +475,10 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_vkDestroySurfaceKHR, macdrv_vkDestroySwapchainKHR, macdrv_vkEnumerateInstanceExtensionProperties, + NULL, macdrv_vkGetDeviceProcAddr, macdrv_vkGetInstanceProcAddr, + NULL, macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, macdrv_vkGetPhysicalDeviceSurfaceFormatsKHR, macdrv_vkGetPhysicalDeviceSurfacePresentModesKHR,

1 0

Józef Kucia : winevulkan: Generate get_vulkan_driver_*_proc_addr() helper functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: adb926d5a5032130d55e4d39316efdb11cc1fe1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb926d5a5032130d55e4d39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:23 2018 +0200 winevulkan: Generate get_vulkan_driver_*_proc_addr() helper functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 62 ----------------------------------------- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++- dlls/winex11.drv/vulkan.c | 66 -------------------------------------------- include/wine/vulkan_driver.h | 63 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adb926d5a5032130d55e…

1 0

Józef Kucia : winevulkan: Remove vkAcquireNextImageKHR() from Vulkan driver functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: f59925416a12a9190691205711cdf3258eb1650e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59925416a12a91906912057… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:21 2018 +0200 winevulkan: Remove vkAcquireNextImageKHR() from Vulkan driver functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 6 +++--- dlls/winemac.drv/vulkan.c | 15 --------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winex11.drv/vulkan.c | 15 --------------- include/wine/vulkan_driver.h | 3 +-- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ae7bde7..90f72d0 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1526,7 +1526,6 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) return FALSE; } - dxgi->p_vkAcquireNextImageKHR = vk->p_vkAcquireNextImageKHR; dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; @@ -1547,10 +1546,11 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) ERR("Failed to get device proc "#name".\n"); \ return FALSE; \ } + LOAD_DEVICE_PFN(vkAcquireNextImageKHR) LOAD_DEVICE_PFN(vkCreateFence) - LOAD_DEVICE_PFN(vkWaitForFences) - LOAD_DEVICE_PFN(vkResetFences) LOAD_DEVICE_PFN(vkDestroyFence) + LOAD_DEVICE_PFN(vkResetFences) + LOAD_DEVICE_PFN(vkWaitForFences) #undef LOAD_DEVICE_PFN return TRUE; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d590903..4d1e496 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -63,7 +63,6 @@ typedef struct VkMacOSSurfaceCreateInfoMVK const void *pView; /* NSView */ } VkMacOSSurfaceCreateInfoMVK; -static VkResult (*pvkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateMacOSSurfaceMVK)(VkInstance, const VkMacOSSurfaceCreateInfoMVK*, const VkAllocationCallbacks *, VkSurfaceKHR *); @@ -99,7 +98,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) goto fail; - LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) @@ -190,16 +188,6 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface heap_free(surface); } -static VkResult macdrv_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, - uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) -{ - TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", device, - wine_dbgstr_longlong(swapchain), wine_dbgstr_longlong(timeout), - wine_dbgstr_longlong(semaphore), wine_dbgstr_longlong(fence), index); - - return pvkAcquireNextImageKHR(device, swapchain, timeout, semaphore, fence, index); -} - static VkResult macdrv_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -480,7 +468,6 @@ static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - macdrv_vkAcquireNextImageKHR, macdrv_vkCreateInstance, macdrv_vkCreateSwapchainKHR, macdrv_vkCreateWin32SurfaceKHR, @@ -507,8 +494,6 @@ static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulka name += 2; - if (!strcmp(name, "AcquireNextImageKHR")) - return vulkan_funcs->p_vkAcquireNextImageKHR; if (!strcmp(name, "CreateSwapchainKHR")) return vulkan_funcs->p_vkCreateSwapchainKHR; if (!strcmp(name, "DestroySwapchainKHR")) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3432e4f..7ab92dc 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,7 +130,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 6 +DRIVER_VERSION = 7 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -176,7 +176,6 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_swapchain - "vkAcquireNextImageKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 93c3065..e0d576b 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -74,7 +74,6 @@ typedef struct VkXlibSurfaceCreateInfoKHR Window window; } VkXlibSurfaceCreateInfoKHR; -static VkResult (*pvkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); @@ -114,7 +113,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) #define LOAD_FUNCPTR(f) if (!(p##f = wine_dlsym(vulkan_handle, #f, NULL, 0))) goto fail; #define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(vulkan_handle, #f, NULL, 0); - LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateXlibSurfaceKHR) @@ -223,16 +221,6 @@ void wine_vk_surface_destroy(HWND hwnd) LeaveCriticalSection(&context_section); } -static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, - uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) -{ - TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", device, - wine_dbgstr_longlong(swapchain), wine_dbgstr_longlong(timeout), - wine_dbgstr_longlong(semaphore), wine_dbgstr_longlong(fence), index); - - return pvkAcquireNextImageKHR(device, swapchain, timeout, semaphore, fence, index); -} - static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -532,7 +520,6 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - X11DRV_vkAcquireNextImageKHR, X11DRV_vkCreateInstance, X11DRV_vkCreateSwapchainKHR, X11DRV_vkCreateWin32SurfaceKHR, @@ -561,8 +548,6 @@ static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulka name += 2; - if (!strcmp(name, "AcquireNextImageKHR")) - return vulkan_funcs->p_vkAcquireNextImageKHR; if (!strcmp(name, "CreateSwapchainKHR")) return vulkan_funcs->p_vkCreateSwapchainKHR; if (!strcmp(name, "DestroySwapchainKHR")) diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 790d630..d009f12 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -39,7 +39,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 6 +#define WINE_VULKAN_DRIVER_VERSION 7 struct vulkan_funcs { @@ -47,7 +47,6 @@ struct vulkan_funcs * needs to provide. Other function calls will be provided indirectly by dispatch * tables part of dispatchable Vulkan objects such as VkInstance or vkDevice. */ - VkResult (*p_vkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); VkResult (*p_vkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); VkResult (*p_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); VkResult (*p_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *);

1 0

Józef Kucia : winevulkan: Remove vkEnumerateInstanceVersion() from Vulkan driver functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 5be428f5604065d993d71f743c21718e524345a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5be428f5604065d993d71f74… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:20 2018 +0200 winevulkan: Remove vkEnumerateInstanceVersion() from Vulkan driver functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 16 +++++++++++++++- dlls/winex11.drv/vulkan.c | 18 ------------------ include/wine/vulkan_driver.h | 3 +-- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e922203..3432e4f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,7 +130,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 5 +DRIVER_VERSION = 6 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -144,7 +144,7 @@ FUNCTION_OVERRIDES = { # Global functions "vkCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkEnumerateInstanceExtensionProperties" : {"dispatch" : False, "driver" : True, "thunk" : False}, - "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetInstanceProcAddr": {"dispatch" : False, "driver" : True, "thunk" : False}, # Instance functions diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b07025a..5c156c1 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -58,6 +58,7 @@ static void *wine_vk_find_struct_(void *s, VkStructureType t) static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; +static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { @@ -322,6 +323,8 @@ static BOOL wine_vk_init(void) return FALSE; } + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + return TRUE; } @@ -849,7 +852,16 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); - res = vk_funcs->p_vkEnumerateInstanceVersion(version); + if (p_vkEnumerateInstanceVersion) + { + res = p_vkEnumerateInstanceVersion(version); + } + else + { + *version = VK_API_VERSION_1_0; + res = VK_SUCCESS; + } + TRACE("API version %u.%u.%u.\n", VK_VERSION_MAJOR(*version), VK_VERSION_MINOR(*version), VK_VERSION_PATCH(*version)); *version = min(WINE_VK_VERSION, *version); @@ -1117,6 +1129,8 @@ VkResult WINAPI wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance instance, BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { + TRACE("%p, %u, %p\n", hinst, reason, reserved); + switch (reason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 58c08ad..93c3065 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -82,7 +82,6 @@ static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); -static VkResult (*pvkEnumerateInstanceVersion)(uint32_t *); static VkResult (*pvkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); @@ -132,7 +131,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR) LOAD_FUNCPTR(vkGetSwapchainImagesKHR) LOAD_FUNCPTR(vkQueuePresentKHR) - LOAD_OPTIONAL_FUNCPTR(vkEnumerateInstanceVersion) LOAD_OPTIONAL_FUNCPTR(vkGetDeviceGroupSurfacePresentModesKHR) LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDevicePresentRectanglesKHR) #undef LOAD_FUNCPTR @@ -426,19 +424,6 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static VkResult X11DRV_vkEnumerateInstanceVersion(uint32_t *version) -{ - TRACE("%p\n", version); - - if (!pvkEnumerateInstanceVersion) - { - *version = VK_API_VERSION_1_0; - return VK_SUCCESS; - } - - return pvkEnumerateInstanceVersion(version); -} - static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR *flags) { @@ -555,7 +540,6 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkDestroySurfaceKHR, X11DRV_vkDestroySwapchainKHR, X11DRV_vkEnumerateInstanceExtensionProperties, - X11DRV_vkEnumerateInstanceVersion, X11DRV_vkGetDeviceGroupSurfacePresentModesKHR, X11DRV_vkGetDeviceProcAddr, X11DRV_vkGetInstanceProcAddr, @@ -612,8 +596,6 @@ static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vul return vulkan_funcs->p_vkCreateInstance; if (!strcmp(name, "EnumerateInstanceExtensionProperties")) return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; - if (!strcmp(name, "EnumerateInstanceVersion")) - return vulkan_funcs->p_vkEnumerateInstanceVersion; if (!instance) return NULL; diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 37fe9ad..790d630 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -39,7 +39,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 5 +#define WINE_VULKAN_DRIVER_VERSION 6 struct vulkan_funcs { @@ -55,7 +55,6 @@ struct vulkan_funcs void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); void (*p_vkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); VkResult (*p_vkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); - VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *); VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *); void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *);

1 0

Roderick Colenbrander : winevulkan: Implement vkGetDeviceQueue2.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: d1d9d5495d2b25f23e03e1ea56e113039b9a5fe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d9d5495d2b25f23e03e1ea… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Jul 16 15:18:19 2018 +0200 winevulkan: Implement vkGetDeviceQueue2. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/make_vulkan | 3 ++- dlls/winevulkan/vulkan.c | 35 ++++++++++++++++++++++++++++------- dlls/winevulkan/vulkan_private.h | 2 ++ dlls/winevulkan/vulkan_thunks.c | 1 + dlls/winevulkan/vulkan_thunks.h | 1 + dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 2 ++ 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 2e05979..52ee47a 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -164,7 +164,7 @@ @ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment @ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr @ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue -@ stub vkGetDeviceQueue2 +@ stdcall vkGetDeviceQueue2(ptr ptr ptr) winevulkan.wine_vkGetDeviceQueue2 @ stub vkGetDisplayModePropertiesKHR @ stub vkGetDisplayPlaneCapabilitiesKHR @ stub vkGetDisplayPlaneSupportedDisplaysKHR diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7773f34..e922203 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -161,6 +161,7 @@ FUNCTION_OVERRIDES = { "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkGetDeviceQueue2" : {"dispatch": False, "driver" : False, "thunk" : False}, "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface @@ -402,7 +403,7 @@ class VkFunction(object): # Required is set while parsing which APIs and types are required # and is used by the code generation. - self.required = True if self.driver else False + self.required = True if func_info else False @staticmethod def from_alias(command, alias): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 34ef457..b07025a 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -168,7 +168,7 @@ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPoo /* Helper function to create queues for a given family index. */ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, - uint32_t family_index, uint32_t queue_count) + uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) { struct VkQueue_T *queues; unsigned int i; @@ -182,15 +182,15 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, for (i = 0; i < queue_count; i++) { struct VkQueue_T *queue = &queues[i]; + + queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; queue->device = device; + queue->flags = flags; /* The native device was already allocated with the required number of queues, * so just fetch them from there. */ device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); - - /* Set special header for ICD loader. */ - queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; } return queues; @@ -342,7 +342,7 @@ static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src TRACE("Application name %s, application version %#x\n", debugstr_a(app_info->pApplicationName), app_info->applicationVersion); TRACE("Engine name %s, engine version %#x\n", debugstr_a(app_info->pEngineName), - app_info->engineVersion); + app_info->engineVersion); TRACE("API version %#x\n", app_info->apiVersion); } @@ -633,12 +633,14 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { + uint32_t flags = create_info_host.pQueueCreateInfos[i].flags; uint32_t family_index = create_info_host.pQueueCreateInfos[i].queueFamilyIndex; uint32_t queue_count = create_info_host.pQueueCreateInfos[i].queueCount; TRACE("queueFamilyIndex %u, queueCount %u\n", family_index, queue_count); - object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count); + object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, + queue_count, flags); if (!object->queues[family_index]) { ERR("Failed to allocate memory for queues\n"); @@ -928,11 +930,30 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, uint32_t queue_index, VkQueue *queue) { - TRACE("%p %u %u %p\n", device, family_index, queue_index, queue); + TRACE("%p, %u, %u, %p\n", device, family_index, queue_index, queue); *queue = &device->queues[family_index][queue_index]; } +void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) +{ + const struct wine_vk_structure_header *chain; + struct VkQueue_T *matching_queue; + + TRACE("%p, %p, %p\n", device, info, queue); + + if ((chain = info->pNext)) + FIXME("Ignoring a linked structure of type %#x.\n", chain->sType); + + matching_queue = &device->queues[info->queueFamilyIndex][info->queueIndex]; + if (matching_queue->flags != info->flags) + { + WARN("No matching flags were specified %#x, %#x.\n", matching_queue->flags, info->flags); + matching_queue = VK_NULL_HANDLE; + } + *queue = matching_queue; +} + PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 37af920..2e071a5 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -106,6 +106,8 @@ struct VkQueue_T struct wine_vk_base base; struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ + + VkDeviceQueueCreateFlags flags; }; void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index b88158c..9d637bf 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2966,6 +2966,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkGetDeviceMemoryCommitment", &wine_vkGetDeviceMemoryCommitment}, {"vkGetDeviceProcAddr", &wine_vkGetDeviceProcAddr}, {"vkGetDeviceQueue", &wine_vkGetDeviceQueue}, + {"vkGetDeviceQueue2", &wine_vkGetDeviceQueue2}, {"vkGetEventStatus", &wine_vkGetEventStatus}, {"vkGetFenceStatus", &wine_vkGetFenceStatus}, {"vkGetImageMemoryRequirements", &wine_vkGetImageMemoryRequirements}, diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 86b81ab..a03d115 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -53,6 +53,7 @@ VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *p void WINAPI wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *pName); void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue); +void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue); VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); typedef struct VkAcquireNextImageInfoKHR_host diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 91f7333..8aab0fe 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -166,7 +166,7 @@ @ stdcall wine_vkGetDeviceMemoryCommitment(ptr int64 ptr) @ stdcall wine_vkGetDeviceProcAddr(ptr str) @ stdcall wine_vkGetDeviceQueue(ptr long long ptr) -@ stub vkGetDeviceQueue2 +@ stdcall wine_vkGetDeviceQueue2(ptr ptr ptr) @ stub vkGetDisplayModePropertiesKHR @ stub vkGetDisplayPlaneCapabilitiesKHR @ stub vkGetDisplayPlaneSupportedDisplaysKHR diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 10c1243..965e26f 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -4319,6 +4319,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevic typedef void (VKAPI_PTR *PFN_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetDeviceProcAddr)(VkDevice, const char *); typedef void (VKAPI_PTR *PFN_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *); +typedef void (VKAPI_PTR *PFN_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *); typedef VkResult (VKAPI_PTR *PFN_vkGetEventStatus)(VkDevice, VkEvent); typedef VkResult (VKAPI_PTR *PFN_vkGetFenceStatus)(VkDevice, VkFence); typedef void (VKAPI_PTR *PFN_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements *); @@ -4537,6 +4538,7 @@ VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSu void VKAPI_CALL vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize *pCommittedMemoryInBytes); PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkDevice device, const char *pName); void VKAPI_CALL vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue); +void VKAPI_CALL vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue); VkResult VKAPI_CALL vkGetEventStatus(VkDevice device, VkEvent event); VkResult VKAPI_CALL vkGetFenceStatus(VkDevice device, VkFence fence); void VKAPI_CALL vkGetImageMemoryRequirements(VkDevice device, VkImage image, VkMemoryRequirements *pMemoryRequirements);

1 0

Piotr Caban : msvcr80: Add gets_s implementation.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 6b268e77bbe4f4d77748d028ea090b6afc2dd062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b268e77bbe4f4d77748d028… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 19:29:04 2018 +0200 msvcr80: Add gets_s implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45393 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 62 +++++++++++++++------- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 50 insertions(+), 28 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 4921883..853a43f 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -140,7 +140,7 @@ @ cdecl getc(ptr) ucrtbase.getc @ cdecl getchar() ucrtbase.getchar @ cdecl gets(str) ucrtbase.gets -@ stub gets_s +@ cdecl gets_s(ptr long) ucrtbase.gets_s @ cdecl getwc(ptr) ucrtbase.getwc @ cdecl getwchar() ucrtbase.getwchar @ cdecl putc(long ptr) ucrtbase.putc diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4426987..88698ca 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1700,7 +1700,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3572664..3d116c4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2058,7 +2058,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b7d644a..f317d1f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2204,7 +2204,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ stub ilogb diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2d096fc..0f5d143 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1868,7 +1868,7 @@ @ cdecl getc(ptr) msvcr120.getc @ cdecl getchar() msvcr120.getchar @ cdecl gets(str) msvcr120.gets -@ stub gets_s +@ cdecl gets_s(ptr long) msvcr120.gets_s @ cdecl getwc(ptr) msvcr120.getwc @ cdecl getwchar() msvcr120.getwchar @ stub ilogb diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0df1f0a..b563427 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1382,7 +1382,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7238163..a735005 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1355,7 +1355,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1c7b5a4..2c05f25 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4719,31 +4719,53 @@ int CDECL MSVCRT_getc(MSVCRT_FILE* file) } /********************************************************************* - * gets (MSVCRT.@) + * gets_s (MSVCR80.@) */ -char * CDECL MSVCRT_gets(char *buf) +char * CDECL MSVCRT_gets_s(char *buf, MSVCRT_size_t len) { - int cc; - char * buf_start = buf; + char *buf_start = buf; + int cc; - MSVCRT__lock_file(MSVCRT_stdin); - for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; - cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) - { - if(cc != '\r') - *buf++ = (char)cc; - } - MSVCRT__unlock_file(MSVCRT_stdin); + if (!MSVCRT_CHECK_PMT(buf != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(len != 0)) return NULL; - if ((cc == MSVCRT_EOF) && (buf_start == buf)) - { - TRACE(":nothing read\n"); - return NULL; - } - *buf = '\0'; + MSVCRT__lock_file(MSVCRT_stdin); + for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); + len != 0 && cc != MSVCRT_EOF && cc != '\n'; + cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) + { + if (cc != '\r') + { + *buf++ = (char)cc; + len--; + } + } + MSVCRT__unlock_file(MSVCRT_stdin); - TRACE("got '%s'\n", buf_start); - return buf_start; + if (!len) + { + *buf_start = 0; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return NULL; + } + + if ((cc == MSVCRT_EOF) && (buf_start == buf)) + { + TRACE(":nothing read\n"); + return NULL; + } + *buf = '\0'; + + TRACE("got '%s'\n", buf_start); + return buf_start; +} + +/********************************************************************* + * gets (MSVCRT.@) + */ +char * CDECL MSVCRT_gets(char *buf) +{ + return MSVCRT_gets_s(buf, -1); } /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6304663..1ced9ca 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2337,7 +2337,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl hypot(double double) _hypot

1 0

Zhiyi Zhang : user32: Send notification for the focused button in IsDialogMessage().
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 608aa7f3d743ffdf4072cfb0cbb7780bda44559d URL: https://source.winehq.org/git/wine.git/?a=commit;h=608aa7f3d743ffdf4072cfb0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 15:48:14 2018 +0800 user32: Send notification for the focused button in IsDialogMessage(). When handling WM_KEYDOWN,VK_RETURN messages from a dialog hwnd in IsDialogMessage(), if the focused button is in the dialog, send a BN_CLICKED notification to the dialog proc. This also make it possible for the default button with an id larger than 0xFFFF in the dialog to receive the correct BN_CLICKED notification, which has a null lParam before this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 8 ++++---- dlls/user32/tests/dialog.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 6f23c74..e584cc1 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1252,10 +1252,11 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) case VK_RETURN: { DWORD dw; - if ((GetFocus() == msg->hwnd) && - (SendMessageW (msg->hwnd, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + HWND hwndFocus = GetFocus(); + if (IsChild( hwndDlg, hwndFocus ) && + (SendMessageW( hwndFocus, WM_GETDLGCODE, 0, 0 ) & DLGC_DEFPUSHBUTTON)) { - SendMessageW (hwndDlg, WM_COMMAND, MAKEWPARAM (GetDlgCtrlID(msg->hwnd),BN_CLICKED), (LPARAM)msg->hwnd); + SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( GetDlgCtrlID( hwndFocus ), BN_CLICKED ), (LPARAM)hwndFocus ); } else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { @@ -1266,7 +1267,6 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) else { SendMessageW( hwndDlg, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndDlg, IDOK ) ); - } } return TRUE; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index e1fe803..0604423 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -55,6 +55,7 @@ static LONG g_styleInitialFocusT1, g_styleInitialFocusT2; static BOOL g_bInitialFocusInitDlgResult, g_bReceivedCommand; static BOOL g_terminated; +static BOOL g_button1Clicked; typedef struct { INT_PTR id; @@ -474,6 +475,10 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, g_terminated = TRUE; return 0; } + else if ((wParam == 100 || wParam == 0xFFFF) && lParam) + { + g_button1Clicked = TRUE; + } break; } @@ -788,6 +793,33 @@ static void test_IsDialogMessage(void) UnhookWindowsHookEx(hook); DestroyWindow(g_hwndMain); + + g_hwndMain = CreateWindowA("IsDialogMessageWindowClass", "IsDialogMessageWindowClass", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, g_hinst, 0); + SetFocus(g_hwndButton1); + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndButton1); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndMain); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndButton2); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + /* Button with id larger than 0xFFFF should also work */ + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndMain); + SetWindowLongPtrW(g_hwndButton1, GWLP_ID, 0x1FFFF); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + DestroyWindow(g_hwndMain); }

1 0

André Hentschel : winedbg: Check for visible window station before displaying crash dialog.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 13f9461e99398f4080bf0fdd68a03f57a5427002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f9461e99398f4080bf0fdd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 13 19:49:40 2018 +0200 winedbg: Check for visible window station before displaying crash dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35928 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/crashdlg.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index a925378..cda2642 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -48,6 +48,20 @@ int msgbox_res_id(HWND hwnd, UINT textid, UINT captionid, UINT type) return IDCANCEL; } +static BOOL is_visible(void) +{ + USEROBJECTFLAGS flags; + HWINSTA winstation; + + if (!(winstation = GetProcessWindowStation())) + return FALSE; + + if (!(GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL))) + return FALSE; + + return flags.dwFlags & WSF_VISIBLE; +} + static WCHAR *get_program_name(HANDLE hProcess) { WCHAR image_name[MAX_PATH]; @@ -362,7 +376,7 @@ int display_crash_dialog(void) /* dbg_curr_process->handle is not set */ HANDLE hProcess; - if (!DBG_IVAR(ShowCrashDialog)) + if (!DBG_IVAR(ShowCrashDialog) || !is_visible()) return TRUE; hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dbg_curr_pid);

1 0

Piotr Caban : msvcp110: Add _Syserror_map implementation.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: c92b71f6e80bce782139882743fd578a0ef1dfbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c92b71f6e80bce7821398827… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 16:33:01 2018 +0200 msvcp110: Add _Syserror_map implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp90/misc.c | 186 ++++++++++++++++++++++++++++++++++++ 5 files changed, 194 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c92b71f6e80bce782139…

1 0

Zhiyi Zhang : user32/tests: Fix a memory leak.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 8318b11d7f0f1a50be447b515aa6d0b11eb18827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8318b11d7f0f1a50be447b51… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 15:35:58 2018 +0800 user32/tests: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 807a85b..e1fe803 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -787,6 +787,7 @@ static void test_IsDialogMessage(void) ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); UnhookWindowsHookEx(hook); + DestroyWindow(g_hwndMain); }

1 0

Piotr Caban : include/msvcrt: Add POSIX error codes to errno.h.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: e68944583307f8773b9323ba1c0da6f13974792d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68944583307f8773b9323ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 16:32:55 2018 +0200 include/msvcrt: Add POSIX error codes to errno.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/errno.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/msvcrt/errno.h b/include/msvcrt/errno.h index dddc013..ac56c19 100644 --- a/include/msvcrt/errno.h +++ b/include/msvcrt/errno.h @@ -63,6 +63,50 @@ # define STRUNCATE 80 +#ifndef _CRT_NO_POSIX_ERROR_CODES +# define EADDRINUSE 100 +# define EADDRNOTAVAIL 101 +# define EAFNOSUPPORT 102 +# define EALREADY 103 +# define EBADMSG 104 +# define ECANCELED 105 +# define ECONNABORTED 106 +# define ECONNREFUSED 107 +# define ECONNRESET 108 +# define EDESTADDRREQ 109 +# define EHOSTUNREACH 110 +# define EIDRM 111 +# define EINPROGRESS 112 +# define EISCONN 113 +# define ELOOP 114 +# define EMSGSIZE 115 +# define ENETDOWN 116 +# define ENETRESET 117 +# define ENETUNREACH 118 +# define ENOBUFS 119 +# define ENODATA 120 +# define ENOLINK 121 +# define ENOMSG 122 +# define ENOPROTOOPT 123 +# define ENOSR 124 +# define ENOSTR 125 +# define ENOTCONN 126 +# define ENOTRECOVERABLE 127 +# define ENOTSOCK 128 +# define ENOTSUP 129 +# define EOPNOTSUPP 130 +# define EOTHER 131 +# define EOVERFLOW 132 +# define EOWNERDEAD 133 +# define EPROTO 134 +# define EPROTONOSUPPORT 135 +# define EPROTOTYPE 136 +# define ETIME 137 +# define ETIMEDOUT 138 +# define ETXTBSY 139 +# define EWOULDBLOCK 140 +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Hugh McMaster : regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 6b620e6d615df5041918b0037fe7fd988c7b20d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b620e6d615df5041918b003… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:50 2018 +0000 regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index de96ded..a3cf17b 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -40,6 +40,7 @@ struct edit_params { HKEY hkey; const WCHAR *value_name; + DWORD type; void *data; DWORD size; }; @@ -159,7 +160,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara data = heap_xalloc(size); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); - lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, params->type, data, size); heap_free(data); if (lRet == ERROR_SUCCESS) @@ -351,6 +352,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) params.hkey = hKey; params.value_name = valueName; + params.type = type; params.data = stringValueData; params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd,

1 0

Alexandre Julliard : user32: Return the full MINMAXINFO data from WINPOS_GetMinMaxInfo().
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 1373e004009515427dea812b6052974492d157dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1373e004009515427dea812b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 10:32:49 2018 +0200 user32: Return the full MINMAXINFO data from WINPOS_GetMinMaxInfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 9 +++------ dlls/user32/win.h | 3 +-- dlls/user32/winpos.c | 53 ++++++++++++++++++++++++---------------------------- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1398458..3535c1b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1569,12 +1569,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, cy = cs->cy; if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) { - POINT maxSize, maxPos, minTrack, maxTrack; - WINPOS_GetMinMaxInfo( hwnd, &maxSize, &maxPos, &minTrack, &maxTrack); - if (maxTrack.x < cx) cx = maxTrack.x; - if (maxTrack.y < cy) cy = maxTrack.y; - if (minTrack.x > cx) cx = minTrack.x; - if (minTrack.y > cy) cy = minTrack.y; + MINMAXINFO info = WINPOS_GetMinMaxInfo( hwnd ); + cx = max( min( cx, info.ptMaxTrackSize.x ), info.ptMinTrackSize.x ); + cy = max( min( cy, info.ptMaxTrackSize.y ), info.ptMinTrackSize.y ); } if (cx < 0) cx = 0; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 9794aab..15331c3 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -121,8 +121,7 @@ static inline void WIN_ReleasePtr( WND *ptr ) extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; extern BOOL WINPOS_RedrawIconTitle( HWND hWnd ) DECLSPEC_HIDDEN; -extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack, - POINT *maxTrack ) DECLSPEC_HIDDEN; +extern MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) DECLSPEC_HIDDEN; extern LONG WINPOS_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos) DECLSPEC_HIDDEN; extern HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ) DECLSPEC_HIDDEN; extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index dc2816a..ed3c105 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -740,8 +740,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) * * Get the minimized and maximized information for a window. */ -void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, - POINT *minTrack, POINT *maxTrack ) +MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { MINMAXINFO MinMax; HMONITOR monitor; @@ -837,10 +836,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y, MinMax.ptMinTrackSize.y ); - if (maxSize) *maxSize = MinMax.ptMaxSize; - if (maxPos) *maxPos = MinMax.ptMaxPosition; - if (minTrack) *minTrack = MinMax.ptMinTrackSize; - if (maxTrack) *maxTrack = MinMax.ptMaxTrackSize; + return MinMax; } @@ -943,8 +939,8 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) { UINT swpFlags = 0; - POINT size; LONG old_style; + MINMAXINFO minmax; WINDOWPLACEMENT wpl; TRACE("%p %u\n", hwnd, cmd ); @@ -1006,7 +1002,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) old_style = GetWindowLongW( hwnd, GWL_STYLE ); if ((old_style & WS_MAXIMIZE) && (old_style & WS_VISIBLE)) return SWP_NOSIZE | SWP_NOMOVE; - WINPOS_GetMinMaxInfo( hwnd, &size, &wpl.ptMaxPosition, NULL, NULL ); + minmax = WINPOS_GetMinMaxInfo( hwnd ); old_style = WIN_SetStyle( hwnd, WS_MAXIMIZE, WS_MINIMIZE ); if (old_style & WS_MINIMIZE) @@ -1016,8 +1012,8 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) } if (!(old_style & WS_MAXIMIZE)) swpFlags |= SWP_STATECHANGED; - SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, - wpl.ptMaxPosition.x + size.x, wpl.ptMaxPosition.y + size.y ); + SetRect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y, + minmax.ptMaxPosition.x + minmax.ptMaxSize.x, minmax.ptMaxPosition.y + minmax.ptMaxSize.y ); break; case SW_SHOWNOACTIVATE: @@ -1033,11 +1029,11 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (win_get_flags( hwnd ) & WIN_RESTORE_MAX) { /* Restore to maximized position */ - WINPOS_GetMinMaxInfo( hwnd, &size, &wpl.ptMaxPosition, NULL, NULL); + minmax = WINPOS_GetMinMaxInfo( hwnd ); WIN_SetStyle( hwnd, WS_MAXIMIZE, 0 ); swpFlags |= SWP_STATECHANGED; - SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, - wpl.ptMaxPosition.x + size.x, wpl.ptMaxPosition.y + size.y ); + SetRect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y, + minmax.ptMaxPosition.x + minmax.ptMaxSize.x, minmax.ptMaxPosition.y + minmax.ptMaxSize.y ); break; } } @@ -1597,19 +1593,18 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) */ LONG WINPOS_HandleWindowPosChanging( HWND hwnd, WINDOWPOS *winpos ) { - POINT minTrack, maxTrack; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); if (winpos->flags & SWP_NOSIZE) return 0; if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0)) { - WINPOS_GetMinMaxInfo( hwnd, NULL, NULL, &minTrack, &maxTrack ); - if (winpos->cx > maxTrack.x) winpos->cx = maxTrack.x; - if (winpos->cy > maxTrack.y) winpos->cy = maxTrack.y; + MINMAXINFO info = WINPOS_GetMinMaxInfo( hwnd ); + winpos->cx = min( winpos->cx, info.ptMaxTrackSize.x ); + winpos->cy = min( winpos->cy, info.ptMaxTrackSize.y ); if (!(style & WS_MINIMIZE)) { - if (winpos->cx < minTrack.x ) winpos->cx = minTrack.x; - if (winpos->cy < minTrack.y ) winpos->cy = minTrack.y; + winpos->cx = max( winpos->cx, info.ptMinTrackSize.x ); + winpos->cy = max( winpos->cy, info.ptMinTrackSize.y ); } } return 0; @@ -2727,7 +2722,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) LONG hittest = (LONG)(wParam & 0x0f); WPARAM syscommand = wParam & 0xfff0; HCURSOR hDragCursor = 0, hOldCursor = 0; - POINT minTrack, maxTrack; + MINMAXINFO minmax; POINT capturePoint, pt; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL thickframe = HAS_THICKFRAME( style ); @@ -2770,7 +2765,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) /* Get min/max info */ - WINPOS_GetMinMaxInfo( hwnd, NULL, NULL, &minTrack, &maxTrack ); + minmax = WINPOS_GetMinMaxInfo( hwnd ); WIN_GetRectangles( hwnd, COORDS_PARENT, &sizingRect, NULL ); origRect = sizingRect; if (style & WS_CHILD) @@ -2789,23 +2784,23 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (ON_LEFT_BORDER(hittest)) { - mouseRect.left = max( mouseRect.left, sizingRect.right-maxTrack.x+capturePoint.x-sizingRect.left ); - mouseRect.right = min( mouseRect.right, sizingRect.right-minTrack.x+capturePoint.x-sizingRect.left ); + mouseRect.left = max( mouseRect.left, sizingRect.right-minmax.ptMaxTrackSize.x+capturePoint.x-sizingRect.left ); + mouseRect.right = min( mouseRect.right, sizingRect.right-minmax.ptMinTrackSize.x+capturePoint.x-sizingRect.left ); } else if (ON_RIGHT_BORDER(hittest)) { - mouseRect.left = max( mouseRect.left, sizingRect.left+minTrack.x+capturePoint.x-sizingRect.right ); - mouseRect.right = min( mouseRect.right, sizingRect.left+maxTrack.x+capturePoint.x-sizingRect.right ); + mouseRect.left = max( mouseRect.left, sizingRect.left+minmax.ptMinTrackSize.x+capturePoint.x-sizingRect.right ); + mouseRect.right = min( mouseRect.right, sizingRect.left+minmax.ptMaxTrackSize.x+capturePoint.x-sizingRect.right ); } if (ON_TOP_BORDER(hittest)) { - mouseRect.top = max( mouseRect.top, sizingRect.bottom-maxTrack.y+capturePoint.y-sizingRect.top ); - mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minTrack.y+capturePoint.y-sizingRect.top); + mouseRect.top = max( mouseRect.top, sizingRect.bottom-minmax.ptMaxTrackSize.y+capturePoint.y-sizingRect.top ); + mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minmax.ptMinTrackSize.y+capturePoint.y-sizingRect.top); } else if (ON_BOTTOM_BORDER(hittest)) { - mouseRect.top = max( mouseRect.top, sizingRect.top+minTrack.y+capturePoint.y-sizingRect.bottom ); - mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+maxTrack.y+capturePoint.y-sizingRect.bottom ); + mouseRect.top = max( mouseRect.top, sizingRect.top+minmax.ptMinTrackSize.y+capturePoint.y-sizingRect.bottom ); + mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+minmax.ptMaxTrackSize.y+capturePoint.y-sizingRect.bottom ); } /* Retrieve a default cache DC (without using the window style) */

1 0

Alexandre Julliard : oleaut32: Remove unnecessary consts.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 18f7ec3670375f6389b36527fbfe1216fe795e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f7ec3670375f6389b36527… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 10:14:52 2018 +0200 oleaut32: Remove unnecessary consts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 24 ++++++++++++------------ include/oleauto.h | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index eeef992..37c4be5 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3781,7 +3781,7 @@ HRESULT WINAPI VarCyFromUI8(ULONG64 ullIn, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyAdd(const CY cyLeft, const CY cyRight, CY* pCyOut) +HRESULT WINAPI VarCyAdd(CY cyLeft, CY cyRight, CY* pCyOut) { double l,r; _VarR8FromCy(cyLeft, &l); @@ -3804,7 +3804,7 @@ HRESULT WINAPI VarCyAdd(const CY cyLeft, const CY cyRight, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyMul(const CY cyLeft, const CY cyRight, CY* pCyOut) +HRESULT WINAPI VarCyMul(CY cyLeft, CY cyRight, CY* pCyOut) { double l,r; _VarR8FromCy(cyLeft, &l); @@ -3827,7 +3827,7 @@ HRESULT WINAPI VarCyMul(const CY cyLeft, const CY cyRight, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyMulI4(const CY cyLeft, LONG lRight, CY* pCyOut) +HRESULT WINAPI VarCyMulI4(CY cyLeft, LONG lRight, CY* pCyOut) { double d; @@ -3850,7 +3850,7 @@ HRESULT WINAPI VarCyMulI4(const CY cyLeft, LONG lRight, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCySub(const CY cyLeft, const CY cyRight, CY* pCyOut) +HRESULT WINAPI VarCySub(CY cyLeft, CY cyRight, CY* pCyOut) { double l,r; _VarR8FromCy(cyLeft, &l); @@ -3872,7 +3872,7 @@ HRESULT WINAPI VarCySub(const CY cyLeft, const CY cyRight, CY* pCyOut) * Success: S_OK. pCyOut contains the absolute value. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyAbs(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyAbs(CY cyIn, CY* pCyOut) { if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo) return DISP_E_OVERFLOW; @@ -3898,7 +3898,7 @@ HRESULT WINAPI VarCyAbs(const CY cyIn, CY* pCyOut) * - The difference between this function and VarCyInt() is that VarCyInt() rounds * negative numbers away from 0, while this function rounds them towards zero. */ -HRESULT WINAPI VarCyFix(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyFix(CY cyIn, CY* pCyOut) { pCyOut->int64 = cyIn.int64 / CY_MULTIPLIER; pCyOut->int64 *= CY_MULTIPLIER; @@ -3922,7 +3922,7 @@ HRESULT WINAPI VarCyFix(const CY cyIn, CY* pCyOut) * - The difference between this function and VarCyFix() is that VarCyFix() rounds * negative numbers towards 0, while this function rounds them away from zero. */ -HRESULT WINAPI VarCyInt(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyInt(CY cyIn, CY* pCyOut) { pCyOut->int64 = cyIn.int64 / CY_MULTIPLIER; pCyOut->int64 *= CY_MULTIPLIER; @@ -3947,7 +3947,7 @@ HRESULT WINAPI VarCyInt(const CY cyIn, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyNeg(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyNeg(CY cyIn, CY* pCyOut) { if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo) return DISP_E_OVERFLOW; @@ -3970,7 +3970,7 @@ HRESULT WINAPI VarCyNeg(const CY cyIn, CY* pCyOut) * Success: S_OK. * Failure: E_INVALIDARG, if cDecimals is less than 0. */ -HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut) +HRESULT WINAPI VarCyRound(CY cyIn, int cDecimals, CY* pCyOut) { if (cDecimals < 0) return E_INVALIDARG; @@ -4008,7 +4008,7 @@ HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut) * compare is less, equal or greater than source respectively. * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ -HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight) +HRESULT WINAPI VarCyCmp(CY cyLeft, CY cyRight) { HRESULT hRet; CY result; @@ -4042,7 +4042,7 @@ HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight) * less than, equal to or greater than cyLeft respectively. * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ -HRESULT WINAPI VarCyCmpR8(const CY cyLeft, double dblRight) +HRESULT WINAPI VarCyCmpR8(CY cyLeft, double dblRight) { HRESULT hRet; CY cyRight; @@ -4069,7 +4069,7 @@ HRESULT WINAPI VarCyCmpR8(const CY cyLeft, double dblRight) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyMulI8(const CY cyLeft, LONG64 llRight, CY* pCyOut) +HRESULT WINAPI VarCyMulI8(CY cyLeft, LONG64 llRight, CY* pCyOut) { double d; diff --git a/include/oleauto.h b/include/oleauto.h index 07c46ad..32b3b46 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -561,18 +561,18 @@ HRESULT WINAPI VarDecNeg(const DECIMAL*,DECIMAL*); HRESULT WINAPI VarDecRound(const DECIMAL*,int,DECIMAL*); HRESULT WINAPI VarDecSub(const DECIMAL*,const DECIMAL*,DECIMAL*); -HRESULT WINAPI VarCyAbs(const CY,CY*); -HRESULT WINAPI VarCyAdd(const CY,const CY,CY*); -HRESULT WINAPI VarCyCmp(const CY,const CY); -HRESULT WINAPI VarCyCmpR8(const CY,DOUBLE); -HRESULT WINAPI VarCyFix(const CY,CY*); -HRESULT WINAPI VarCyInt(const CY,CY*); -HRESULT WINAPI VarCyMul(const CY,CY,CY*); -HRESULT WINAPI VarCyMulI4(const CY,LONG,CY*); -HRESULT WINAPI VarCyMulI8(const CY,LONG64,CY*); -HRESULT WINAPI VarCyNeg(const CY,CY*); -HRESULT WINAPI VarCyRound(const CY,INT,CY*); -HRESULT WINAPI VarCySub(const CY,const CY,CY*); +HRESULT WINAPI VarCyAbs(CY,CY*); +HRESULT WINAPI VarCyAdd(CY,CY,CY*); +HRESULT WINAPI VarCyCmp(CY,CY); +HRESULT WINAPI VarCyCmpR8(CY,DOUBLE); +HRESULT WINAPI VarCyFix(CY,CY*); +HRESULT WINAPI VarCyInt(CY,CY*); +HRESULT WINAPI VarCyMul(CY,CY,CY*); +HRESULT WINAPI VarCyMulI4(CY,LONG,CY*); +HRESULT WINAPI VarCyMulI8(CY,LONG64,CY*); +HRESULT WINAPI VarCyNeg(CY,CY*); +HRESULT WINAPI VarCyRound(CY,INT,CY*); +HRESULT WINAPI VarCySub(CY,CY,CY*); HRESULT WINAPI VarAdd(LPVARIANT,LPVARIANT,LPVARIANT); HRESULT WINAPI VarAnd(LPVARIANT,LPVARIANT,LPVARIANT);

1 0

Michael Müller : gdi32: Treat lpResults as optional in GetCharacterPlacement.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 96721e4291378f0c2dfe6948df95691752250b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96721e4291378f0c2dfe6948… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 16 08:30:57 2018 +0100 gdi32: Treat lpResults as optional in GetCharacterPlacement. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 13 ++++++++++++- dlls/gdi32/tests/font.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 41ec07d..c4b7cfb 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3204,10 +3204,18 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, TRACE("%s, %d, %d, 0x%08x\n", debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); + lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); + + if (!lpResults) + { + ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, NULL, dwFlags); + HeapFree(GetProcessHeap(), 0, lpStringW); + return ret; + } + /* both structs are equal in size */ memcpy(&resultsW, lpResults, sizeof(resultsW)); - lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); if(lpResults->lpOutString) resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); @@ -3262,6 +3270,9 @@ GetCharacterPlacementW( TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); + if (!lpResults) + return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0; + TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n", lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8f5454b..0d07709 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4939,6 +4939,39 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } +static void test_GetCharacterPlacement(void) +{ + GCP_RESULTSA result; + DWORD size, size2; + WCHAR glyphs[20]; + HDC hdc; + + hdc = CreateCompatibleDC(0); + ok(!!hdc, "CreateCompatibleDC failed\n"); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpGlyphs = glyphs; + result.nGlyphs = 20; + + size = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, &result, 0); + ok(size, "GetCharacterPlacementA failed!\n"); + + size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0); + ok(size2, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, NULL, GCP_REORDER); + ok(size2, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + size = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, &result, GCP_REORDER); + ok(size, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + DeleteDC(hdc); +} + static void test_CreateFontIndirect(void) { LOGFONTA lf, getobj_lf; @@ -6875,6 +6908,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -11); test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); + test_GetCharacterPlacement(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); test_oemcharset();

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: bddb067d85332de8d8a403bb6b36ce6a68e9b05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bddb067d85332de8d8a403bb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Jul 15 16:49:31 2018 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 103 ++++++++++++++------------------------------------------------- 1 file changed, 23 insertions(+), 80 deletions(-) diff --git a/po/uk.po b/po/uk.po index 85264ed..444db62 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-04-12 17:02+0300\n" +"PO-Revision-Date: 2018-07-15 16:35+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -3432,46 +3432,36 @@ msgid "Publishers..." msgstr "Видавці..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Підключення по локальній мережі" +msgstr "Підключення" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Параметри Wine" +msgstr "Автоматичне налаштування" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Використовувати автоматичне виявлення веб-проксі (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Використовувати автоматичне налаштування проксі (PAC)" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Адреса" +msgstr "Адреса:" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Локальний сервер" +msgstr "Проксі-сервер" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Використовувати проксі-сервер" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Нема портів" +msgstr "Порт:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3742,18 +3732,19 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"Властивість 'writable' не може бути встановлена на 'true' для цього об'єкта" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Неможливо перевизначити властивість, яка не підлягає налаштуванню '|'" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Неможливо змінити властивість, яка не підлягає запису '|'" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Властивість не може одночасно мати доступ і значення" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8635,10 +8626,8 @@ msgid "&Browse..." msgstr "&Огляд..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Тип файлу" +msgstr "Тип файлу:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8649,14 +8638,10 @@ msgid "Size:" msgstr "Розмір:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Дата створення" +msgstr "Дата створення:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" msgstr "&Властивості:" @@ -8669,28 +8654,20 @@ msgid "&Archive" msgstr "&Архівний" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Відкрити:" +msgstr "Відкрити за допомогою:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "З&мінити значок..." +msgstr "З&мінити..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Змінено" +msgstr "Остання зміна:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Останні зміни:" +msgstr "Останній доступ:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -12945,10 +12922,8 @@ msgid "Confirm Value Delete" msgstr "Підтвердження видалення значення" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?" +msgstr "Ви впевнені, що хочете видалити вибране значення реєстру?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14918,6 +14893,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Програма зазнала збій, але WineDbg не вдалося приєднатись до процесу, щоб " +"отримати більш детальну інформацію." #: winedbg.rc:41 msgid "(unidentified)" @@ -15782,41 +15759,6 @@ msgid "D" msgstr "Д" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15882,6 +15824,7 @@ msgstr "" "[/A] Копіює лише файли з властивістю АРХІВНИЙ.\n" "[/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n" "\tвластивість АРХІВНИЙ.\n" +"[/K] Копіює властивості файлу, без цього властивості не зберігаються.\n" "[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після " "вказаної дати.\n" "\tЯкщо дата не вказана, копіює лише ті файли, які новіші в початковій теці.\n"

1 0

Ken Thomases : winemac: Disable macOS' s App Nap energy-saving feature by default for Wine GUI processes.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 250944b64304ee85d92955d2a901268ab08b720e URL: https://source.winehq.org/git/wine.git/?a=commit;h=250944b64304ee85d92955d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jul 15 22:54:15 2018 -0500 winemac: Disable macOS's App Nap energy-saving feature by default for Wine GUI processes. App Nap defers timer firings and I/O if the app is not visibly or audibly updating. An app is supposed to disable it during user-requested or background activity, but we can't know when the Windows app is engaged in such. Since it's not generally acceptable for timers or IO to be deferred, we have to disable it at all times. The user can re-enable it by setting the following registry setting: [HKEY\Software\Wine\Mac Driver] "EnableAppNap"="y" Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 7 +++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 239c11f..efbd657 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -235,6 +235,13 @@ static NSString* WineLocalizedString(unsigned int stringID) [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; [NSApp activateIgnoringOtherApps:YES]; +#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 + if (!enable_app_nap && [NSProcessInfo instancesRespondToSelector:@selector(beginActivityWithOptions:reason:)]) + { + [[[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityUserInitiatedAllowingIdleSystemSleep + reason:@"Running Windows program"] retain]; // intentional leak + } +#endif mainMenu = [[[NSMenu alloc] init] autorelease]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index acab5df..6bad790 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -166,6 +166,7 @@ extern int gl_surface_mode DECLSPEC_HIDDEN; extern CFDictionaryRef localized_strings DECLSPEC_HIDDEN; extern int retina_enabled DECLSPEC_HIDDEN; /* Whether Retina mode is enabled via registry setting. */ extern int retina_on DECLSPEC_HIDDEN; /* Whether Retina mode is currently active (enabled and display is in default mode). */ +extern int enable_app_nap DECLSPEC_HIDDEN; static inline CGRect cgrect_mac_from_win(CGRect rect) { diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 491ab06..4bd7411 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -60,6 +60,7 @@ int use_precise_scrolling = TRUE; int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; int retina_enabled = FALSE; HMODULE macdrv_module = 0; +int enable_app_nap = FALSE; CFDictionaryRef localized_strings; @@ -197,6 +198,9 @@ static void setup_options(void) gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; } + if (!get_config_key(hkey, appkey, "EnableAppNap", buffer, sizeof(buffer))) + enable_app_nap = IS_OPTION_TRUE(buffer[0]); + /* Don't use appkey. The DPI and monitor sizes should be consistent for all processes in the prefix. */ if (!get_config_key(hkey, NULL, "RetinaMode", buffer, sizeof(buffer)))

1 0

Ken Thomases : winemac: Don't change the window's color space.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: ed7e0573882d9fd36e47f6178809d5f3726f8c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed7e0573882d9fd36e47f617… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Jul 14 14:01:37 2018 -0500 winemac: Don't change the window's color space. This was originally done to improve performance at the expense of visually- correct rendering. I've reconsidered that trade-off. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4c59faf..4143d14 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -385,7 +385,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (readonly, copy, nonatomic) NSArray* childWineWindows; - - (void) updateColorSpace; - (void) updateForGLSubviews; - (BOOL) becameEligibleParentOrChild; @@ -968,7 +967,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [window setShowsResizeIndicator:NO]; [window setHasShadow:wf->shadow]; [window setAcceptsMouseMovedEvents:YES]; - [window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setDelegate:window]; [window setBackgroundColor:[NSColor clearColor]]; [window setOpaque:NO]; @@ -1927,9 +1925,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (needEnableScreenUpdates) NSEnableScreenUpdates(); - if (!equalSizes) - [self updateColorSpace]; - if (!enteringFullScreen && [[NSProcessInfo processInfo] systemUptime] - enteredFullScreenTime > 1.0) nonFullscreenFrame = frame; @@ -2601,35 +2596,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return [childWindows objectsAtIndexes:indexes]; } - // We normally use the generic/calibrated RGB color space for the window, - // rather than the device color space, to avoid expensive color conversion - // which slows down drawing. However, for windows displaying OpenGL, having - // a different color space than the screen greatly reduces frame rates, often - // limiting it to the display refresh rate. - // - // To avoid this, we switch back to the screen color space whenever the - // window is covered by a view with an attached OpenGL context. - - (void) updateColorSpace - { - NSRect contentRect = [[self contentView] frame]; - BOOL coveredByGLView = FALSE; - WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; - if ([view isKindOfClass:[WineContentView class]] && view.everHadGLContext) - { - NSRect frame = [view convertRect:[view bounds] toView:nil]; - if (NSContainsRect(frame, contentRect)) - coveredByGLView = TRUE; - } - - if (coveredByGLView) - [self setColorSpace:nil]; - else - [self setColorSpace:[NSColorSpace genericRGBColorSpace]]; - } - - (void) updateForGLSubviews { - [self updateColorSpace]; if (gl_surface_mode == GL_SURFACE_BEHIND) [self checkTransparency]; }

1 0

Jason Edmeades : cmd: Fix statements after 'else' inside for loops.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 6cb520476a79fd7ff5a67c1a1064de9c267fdbc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb520476a79fd7ff5a67c1a… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:29 2018 +0100 cmd: Fix statements after 'else' inside for loops. When inside a for loop, an 'if' statement is processed and the true part taken. Once all the commands in the true are processed, the else part is parsed, and a flag set to skip all commands in the else part. Unfortunately this flag is left on even when the if statement ends, meaning subsequent commands are also skipped. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 18 +++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 34 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 +++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1ee4fcc..088632f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1571,10 +1571,12 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* execute all appropriate commands */ curPosition = *cmdList; - WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d)\n", + WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d) processThese(%d)\n", *cmdList, (*cmdList)->prevDelim, - (*cmdList)->bracketDepth, myDepth); + (*cmdList)->bracketDepth, + myDepth, + processThese); /* Execute any statements appended to the line */ /* FIXME: Only if previous call worked for && or failed for || */ @@ -1613,6 +1615,18 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, if (*cmd) { WCMD_execute (cmd, (*cmdList)->redirects, cmdList, FALSE); } + } else { + /* Loop skipping all commands until we get back to the current + depth, including skipping commands and their subsequent + pipes (eg cmd | prog) */ + do { + *cmdList = (*cmdList)->nextcommand; + } while (*cmdList && + ((*cmdList)->bracketDepth > myDepth || + (*cmdList)->prevDelim)); + + /* After the else is complete, we need to now process subsequent commands */ + processThese = TRUE; } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; } else if (!processThese) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5ca2427..b9e9b25 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -418,6 +418,7 @@ if 1==1 (echo n1) else echo n2|echo n3 if 1==1 (echo o1) else echo o2&&echo o3 if 1==1 (echo p1) else echo p2||echo p3 if 1==1 (echo q1) else echo q2&echo q3 +echo --- echo --- chain else (if false) if 1==0 echo a1 else echo a2 if 1==0 echo b1|echo b2 else echo b3 @@ -1371,6 +1372,39 @@ for /L %%i in (2,2,1) do ( echo %%i echo FAILED ) +echo --- ifs inside for loops +for %%i in (test) do ( + echo a1 + if 1==1 ( + echo b1 + ) else ( + echo c1 + ) + echo d1 +) +for %%i in (test) do ( + echo a2 + if 1==1 ( + echo b2 + ) else echo c2 + echo d2 +) +for %%i in (test) do ( + echo a3 + if 1==0 ( + echo b3 + ) else echo c3 + echo d3 +) +for %%i in (test) do ( + echo a4 + if 1==0 ( + echo b4 + ) else ( + echo c4 + ) + echo d4 +) echo --- set /a goto :testseta diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0a7c75a..3118359 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -428,6 +428,7 @@ n1 o1 p1 q1 +(a)todo_wine@--- --- chain else (if false) @todo_wine(a)j3 --- @@ -982,6 +983,19 @@ ErrorLevel 0 -1 1 3 +--- ifs inside for loops +a1 +b1 +d1 +a2 +b2 +d2 +a3 +c3 +d3 +a4 +c4 +d4 --- set /a ------ individual operations WINE_foo correctly 3

1 0

Jason Edmeades : cmd: Handle special case tokens=* in for /f.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 4030a952095398e5a42f0a74213f6a1e9186c4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4030a952095398e5a42f0a74… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:27 2018 +0100 cmd: Handle special case tokens=* in for /f. for /f allows a special syntax of tokens=* (rather than tokens=1* for example) which just means put the whole line into the next variable). Note the handling of the 'next variable' was wrong in the case of it being 'A' or 'a' as the wrap calculation was wrong, but this only affected using this new syntax. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 28 ++++++++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ff58484..1ee4fcc 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1831,6 +1831,14 @@ static int WCMD_for_nexttoken(int lasttoken, WCHAR *tokenstr, int nextnumber1, nextnumber2 = -1; WCHAR *nextchar; + /* It is valid syntax tokens=* which just means get whole line */ + if (*pos == '*') { + if (doall) *doall = TRUE; + if (totalfound) (*totalfound)++; + nexttoken = 0; + break; + } + /* Get the next number */ nextnumber1 = strtoulW(pos, &nextchar, 10); @@ -1959,22 +1967,22 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, */ lasttoken = -1; nexttoken = WCMD_for_nexttoken(lasttoken, forf_tokens, &totalfound, - NULL, &thisduplicate); + &starfound, &thisduplicate); varidx = FOR_VAR_IDX(variable); /* Empty out variables */ for (varoffset=0; - varidx >= 0 && varoffset<totalfound && ((varidx+varoffset)%26); + varidx >= 0 && varoffset<totalfound && (((varidx%26) + varoffset) < 26); varoffset++) { forloopcontext.variable[varidx + varoffset] = (WCHAR *)nullW; - /* Stop if we walk beyond z or Z */ - if (((varidx+varoffset) % 26) == 0) break; } - /* Loop extracting the tokens */ + /* Loop extracting the tokens + Note: nexttoken of 0 means there were no tokens requested, to handle + the special case of tokens=* */ varoffset = 0; WINE_TRACE("Parsing buffer into tokens: '%s'\n", wine_dbgstr_w(buffer)); - while (varidx >= 0 && (nexttoken > lasttoken)) { + while (varidx >= 0 && (nexttoken > 0 && (nexttoken > lasttoken))) { anyduplicates |= thisduplicate; /* Extract the token number requested and set into the next variable context */ @@ -1982,9 +1990,9 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, WINE_TRACE("Parsed token %d(%d) as parameter %s\n", nexttoken, varidx + varoffset, wine_dbgstr_w(parm)); if (varidx >=0) { - forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); + if (parm) forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); varoffset++; - if (((varidx + varoffset) %26) == 0) break; + if (((varidx%26)+varoffset) >= 26) break; } /* Find the next token */ @@ -1995,12 +2003,12 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, /* If all the rest of the tokens were requested, and there is still space in the variable range, write them now */ - if (!anyduplicates && starfound && varidx >= 0 && ((varidx+varoffset) % 26)) { + if (!anyduplicates && starfound && varidx >= 0 && (((varidx%26) + varoffset) < 26)) { nexttoken++; WCMD_parameter_with_delims(buffer, (nexttoken-1), &parm, FALSE, FALSE, forf_delims); WINE_TRACE("Parsed allremaining tokens (%d) as parameter %s\n", varidx + varoffset, wine_dbgstr_w(parm)); - forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); + if (parm) forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); } /* Execute the body of the foor loop with these values */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0a8122c..5ca2427 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1744,6 +1744,12 @@ for /f "tokens=1,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k for /f "tokens=1,1,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o for /f "tokens=2,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o for /f "tokens=3,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o +rem Special case tokens=* +echo 3.14>testfile +FOR /F "tokens=*" %%A IN (testfile) DO @echo 1:%%A,%%B +FOR /F "tokens=1*" %%A IN (testfile) DO @echo 2:%%A,%%B +FOR /F "tokens=2*" %%A IN (testfile) DO @echo 3:%%A,%%B +del testfile cd .. rd /s/q foobar echo ------ parameter splitting @@ -1756,6 +1762,12 @@ goto :forFParameterSplittingEnd echo %~0 %~1 %~2 %~3 %~4 %~5 goto :eof :forFParameterSplittingEnd +echo 3.14>testfile +FOR /F "delims=. tokens=*" %%A IN (testfile) DO @echo 4:%%A,%%B +FOR /F "delims=. tokens=1*" %%A IN (testfile) DO @echo 5:%%A,%%B +FOR /F "delims=. tokens=2*" %%A IN (testfile) DO @echo 6:%%A,%%B +FOR /F "delims=. tokens=3*" %%A IN (testfile) DO @echo 7:%%A,%%B +del testfile echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7f4f724..0a7c75a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1234,9 +1234,14 @@ h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o(a)or_broken@h=%h i=a j=b k=c l=d e f g m h=%h i=a j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=a j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o +1:3.14,%B +2:3.14, ------ parameter splitting :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ +4:3.14,%B +5:3,14 +6:14, ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

Hugh McMaster : regedit: Don't check if heap_xalloc() succeeded in the caller.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 1291c6ded4d49c3ed44f19352c506ea7fd53580c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1291c6ded4d49c3ed44f1935… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:45 2018 +0000 regedit: Don't check if heap_xalloc() succeeded in the caller. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 3e5b9dd..00dcbec 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -157,14 +157,9 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); pData = heap_xalloc(cbData); - if (pData) - { - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); - } - else - lRet = ERROR_OUTOFMEMORY; + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); + lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + heap_free(pData); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1);

1 0

Hugh McMaster : regedit: Replace Hungarian notation used with struct edit_params members.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a131cff7a88e85575b71c15fbb31aa5c861cc839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a131cff7a88e85575b71c15f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:49 2018 +0000 regedit: Replace Hungarian notation used with struct edit_params members. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 63cb869..de96ded 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -38,10 +38,10 @@ static BOOL isDecimal; struct edit_params { - HKEY hKey; - LPCWSTR lpszValueName; - void *pData; - LONG cbData; + HKEY hkey; + const WCHAR *value_name; + void *data; + DWORD size; }; static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_list va_args) @@ -136,31 +136,31 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { struct edit_params *params; - LPBYTE pData; - LONG cbData; + BYTE *data; + LONG size; LONG lRet; switch(uMsg) { case WM_INITDIALOG: params = (struct edit_params *)lParam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - if (params->lpszValueName) - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->lpszValueName); + if (params->value_name) + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->size, (LPARAM)params->data); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); - cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - pData = heap_xalloc(cbData); + size = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); + data = heap_xalloc(size); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + heap_free(data); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1); @@ -349,10 +349,10 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { struct edit_params params; - params.hKey = hKey; - params.lpszValueName = valueName; - params.pData = stringValueData; - params.cbData = len; + params.hkey = hKey; + params.value_name = valueName; + params.data = stringValueData; + params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); }

1 0

Alexandre Julliard : user32: Retrieve the screen metrics from the monitor information.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 56dfe6708b4ed7fea06f3fd69756e7795be0a4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=56dfe6708b4ed7fea06f3fd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 15:06:38 2018 +0200 user32: Retrieve the screen metrics from the monitor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 50 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6a22f95..5f08640 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -458,20 +458,26 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A struct monitor_info { int count; + RECT primary_rect; RECT virtual_rect; }; static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { + MONITORINFO mi; struct monitor_info *info = (struct monitor_info *)lp; info->count++; UnionRect( &info->virtual_rect, &info->virtual_rect, rect ); + mi.cbSize = sizeof(mi); + if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY)) + info->primary_rect = mi.rcMonitor; return TRUE; } static void get_monitors_info( struct monitor_info *info ) { info->count = 0; + SetRectEmpty( &info->primary_rect ); SetRectEmpty( &info->virtual_rect ); EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info ); } @@ -2527,6 +2533,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, */ INT WINAPI GetSystemMetrics( INT index ) { + struct monitor_info info; NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; @@ -2536,16 +2543,6 @@ INT WINAPI GetSystemMetrics( INT index ) /* some metrics are dynamic */ switch (index) { - case SM_CXSCREEN: - hdc = get_display_dc(); - ret = GetDeviceCaps( hdc, HORZRES ); - release_display_dc( hdc ); - return ret; - case SM_CYSCREEN: - hdc = get_display_dc(); - ret = GetDeviceCaps( hdc, VERTRES ); - release_display_dc( hdc ); - return ret; case SM_CXVSCROLL: case SM_CYHSCROLL: ncm.cbSize = sizeof(ncm); @@ -2749,32 +2746,27 @@ INT WINAPI GetSystemMetrics( INT index ) return 0; /* FIXME */ case SM_MOUSEWHEELPRESENT: return 1; + case SM_CXSCREEN: + get_monitors_info( &info ); + return info.primary_rect.right - info.primary_rect.left; + case SM_CYSCREEN: + get_monitors_info( &info ); + return info.primary_rect.bottom - info.primary_rect.top; case SM_XVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.left; - } + get_monitors_info( &info ); + return info.virtual_rect.left; case SM_YVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.top; - } + get_monitors_info( &info ); + return info.virtual_rect.top; case SM_CXVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.right - rect.left; - } + get_monitors_info( &info ); + return info.virtual_rect.right - info.virtual_rect.left; case SM_CYVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.bottom - rect.top; - } + get_monitors_info( &info ); + return info.virtual_rect.bottom - info.virtual_rect.top; case SM_CMONITORS: - { - struct monitor_info info; get_monitors_info( &info ); return info.count; - } case SM_SAMEDISPLAYFORMAT: return 1; case SM_IMMENABLED:

1 0

Hugh McMaster : regedit: Always display DWORD values in hexadecimal when initializing the editor dialog.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 32f487bdb2483f96864411f948d35c8f0eaa8bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f487bdb2483f96864411f9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:48 2018 +0000 regedit: Always display DWORD values in hexadecimal when initializing the editor dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 00dcbec..63cb869 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -106,7 +106,8 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L case WM_INITDIALOG: SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); - CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, isDecimal ? IDC_DWORD_DEC : IDC_DWORD_HEX); + CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, IDC_DWORD_HEX); + isDecimal = FALSE; return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -280,9 +281,8 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } } else if ( type == REG_DWORD ) { - const WCHAR u[] = {'%','u',0}; - const WCHAR x[] = {'%','x',0}; - wsprintfW(stringValueData, isDecimal ? u : x, *((DWORD*)stringValueData)); + static const WCHAR x[] = {'%','x',0}; + wsprintfW(stringValueData, x, *((DWORD*)stringValueData)); if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData);

1 0

Hugh McMaster : regedit: Free allocated memory after calling GetValueName( ).
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a7a08e2927ec5b99b2f97fe2acffca4cdf0ef8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a08e2927ec5b99b2f97fe2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:46 2018 +0000 regedit: Free allocated memory after calling GetValueName(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 5 +++-- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index ed0c5bb..4d828c0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -853,10 +853,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_MODIFY: case ID_EDIT_MODIFY_BIN: { - LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); - WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + WCHAR *valueName = GetValueName(g_pChildWnd->hListWnd); + WCHAR *keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); ModifyValue(hWnd, hKeyRoot, keyPath, valueName); heap_free(keyPath); + heap_free(valueName); break; } case ID_EDIT_FIND: diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index f42f9c2..7584828 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -63,7 +63,7 @@ LPWSTR GetItemText(HWND hwndLV, UINT item) return NULL; } -LPCWSTR GetValueName(HWND hwndLV) +WCHAR *GetValueName(HWND hwndLV) { INT item; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index edcc901..ae03440 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -150,7 +150,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); HWND StartValueRename(HWND hwndLV); LPWSTR GetItemText(HWND hwndLV, UINT item); -LPCWSTR GetValueName(HWND hwndLV); +WCHAR *GetValueName(HWND hwndLV); BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); BOOL IsDefaultValue(HWND hwndLV, int i);

1 0

Jason Edmeades : cmd: Expand the storage space for qualifiers.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: dce5f89e48cc63668b90fbf2a435cbb54bcf4571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dce5f89e48cc63668b90fbf2… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:28 2018 +0100 cmd: Expand the storage space for qualifiers. When parsing a command, after the first '/' we store the characters away in quals. The command itself can be MAXSTRING in bytes, but the quals was limited to MAX_PATH. This is incorrect, as you can provide very long qualifiers as well. Expand the space to allow the maximum size possible. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d97a0..8d6eb6b 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -204,7 +204,7 @@ typedef struct _FOR_CONTEXT { * (uppercased and concatenated) and parameters entered, with environment * variables and batch parameters substitution already done. */ -extern WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +extern WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING]; extern DWORD errorlevel; extern BATCH_CONTEXT *context; extern FOR_CONTEXT forloopcontext; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0d02f1f..8fe2d57 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -38,7 +38,7 @@ extern struct env_stack *pushd_directories; BATCH_CONTEXT *context = NULL; DWORD errorlevel; -WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING]; BOOL interactive; FOR_CONTEXT forloopcontext; /* The 'for' loop context */ BOOL delayedsubst = FALSE; /* The current delayed substitution setting */

1 0

Hugh McMaster : regedit: Remove array already present in main.h.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 2686166cc1e07ab65749b21dfaa2734b200deb0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2686166cc1e07ab65749b21d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:44 2018 +0000 regedit: Remove array already present in main.h. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b938b61..4ef99ec 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); #define REG_VAL_BUF_SIZE 4096 -extern const WCHAR* reg_class_namesW[]; - static HKEY reg_class_keys[] = { HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA

1 0

Alex Henrie : winevulkan: Correct spelling of "of" in a comment.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a8df2c61d8d4541b7b55f50d86b59a12da2d1768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8df2c61d8d4541b7b55f50d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 15 23:28:40 2018 -0600 winevulkan: Correct spelling of "of" in a comment. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a06cfa1..34ef457 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -30,7 +30,7 @@ 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. + * aware of. Version 5 adds more extensive version checks. Something to tackle later. */ #define WINE_VULKAN_ICD_VERSION 4

1 0

Austin English : ntoskrnl.exe: Add a stub for KeFlushQueuedDpcs.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: af00d2cc1f8dde41b39426d7fc968205a30cf68a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af00d2cc1f8dde41b39426d7… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 13 18:10:04 2018 -0500 ntoskrnl.exe: Add a stub for KeFlushQueuedDpcs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45448 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 41f3862..a061241 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3546,3 +3546,8 @@ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); return TRUE; } + +void WINAPI KeFlushQueuedDpcs(void) +{ + FIXME("stub!\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 64597c4..907fba8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -532,7 +532,7 @@ @ stub KeFindConfigurationEntry @ stub KeFindConfigurationNextEntry @ stub KeFlushEntireTb -@ stub KeFlushQueuedDpcs +@ stdcall KeFlushQueuedDpcs() @ stdcall KeGetCurrentThread() @ stub KeGetPreviousMode @ stub KeGetRecommendedSharedDataAlignment

1 0

Jactry Zeng : riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 6e264bbd1ddf0d271d4506462ecd4f20f4a20597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e264bbd1ddf0d271d450646… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 13 17:11:27 2018 +0800 riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 130 ++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 64 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 88b5adf..5d312ca 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -600,6 +600,21 @@ static void setup_thiscall_wrappers(void) #endif /* __i386__ */ } +static void hf_to_cf(HFONT hf, CHARFORMAT2W *cf) +{ + LOGFONTW lf; + + GetObjectW(hf, sizeof(lf), &lf); + lstrcpyW(cf->szFaceName, lf.lfFaceName); + cf->yHeight = MulDiv(abs(lf.lfHeight), 1440, GetDeviceCaps(GetDC(NULL), LOGPIXELSY)); + if (lf.lfWeight > FW_NORMAL) cf->dwEffects |= CFE_BOLD; + if (lf.lfItalic) cf->dwEffects |= CFE_ITALIC; + if (lf.lfUnderline) cf->dwEffects |= CFE_UNDERLINE; + if (lf.lfStrikeOut) cf->dwEffects |= CFE_SUBSCRIPT; + cf->bPitchAndFamily = lf.lfPitchAndFamily; + cf->bCharSet = lf.lfCharSet; +} + /*************************************************************************/ /* Conformance test functions. */ @@ -697,81 +712,68 @@ static void test_TxSetText(void) ITextHost_Release(host); } +#define CHECK_TXGETNATURALSIZE(res,width,height,hdc,rect,string) \ + _check_txgetnaturalsize(res, width, height, hdc, rect, string, __LINE__) +static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hdc, RECT rect, LPCWSTR string, int line) +{ + RECT expected_rect = rect; + LONG expected_width, expected_height; + + DrawTextW(hdc, string, -1, &expected_rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL | DT_WORDBREAK); + expected_width = expected_rect.right - expected_rect.left; + expected_height = expected_rect.bottom - expected_rect.top; + ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08x.\n", res); + ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, + "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); + ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", + height, expected_height); +} + static void test_TxGetNaturalSize(void) { ITextServices *txtserv; ITextHost *host; HRESULT result; - BOOL ret; - - /* This value is used when calling TxGetNaturalSize. MSDN says - that this is not supported however a null pointer cannot be - used as it will cause a segmentation violation. The values in - the structure being pointed to are required to be INT_MAX - otherwise calculations can give wrong values. */ - const SIZEL psizelExtent = {INT_MAX,INT_MAX}; - - static const WCHAR oneA[] = {'A',0}; - - /* Results of measurements */ - LONG xdim, ydim; - - /* The device context to do the tests in */ + SIZEL extent; + static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + LONG width, height; HDC hdcDraw; - - /* Variables with the text metric information */ - INT charwidth_caps_text[26]; - TEXTMETRICA tmInfo_text; + HWND hwnd; + RECT rect; + CHARFORMAT2W cf; + LRESULT lresult; + HFONT hf; if (!init_texthost(&txtserv, &host)) return; - hdcDraw = GetDC(NULL); - SaveDC(hdcDraw); - - /* Populate the metric strucs */ - SetMapMode(hdcDraw,MM_TEXT); - GetTextMetricsA(hdcDraw, &tmInfo_text); - SetLastError(0xdeadbeef); - ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("GetCharWidth32 is not available\n"); - goto cleanup; - } - - /* Make measurements in MM_TEXT */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 100, 100, 0, 0, 0, NULL); + hdcDraw = GetDC(hwnd); SetMapMode(hdcDraw,MM_TEXT); - xdim = 0; ydim = 0; - - result = ITextServices_TxSetText(txtserv, oneA); - ok(result == S_OK, "ITextServices_TxSetText failed (result = %x)\n", result); - if (result != S_OK) { - skip("Could not set text\n"); - goto cleanup; - } - - SetLastError(0xdeadbeef); - result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, - hdcDraw, NULL, NULL, - TXTNS_FITTOCONTENT, &psizelExtent, - &xdim, &ydim); - todo_wine ok(result == S_OK || broken(result == E_FAIL), /* WINXP Arabic Language */ - "TxGetNaturalSize gave unexpected return value (result = %x)\n", result); - if (result == S_OK) { - todo_wine ok(ydim == tmInfo_text.tmHeight, - "Height calculated incorrectly (expected %d, got %d)\n", - tmInfo_text.tmHeight, ydim); - /* The native DLL adds one pixel extra when calculating widths. */ - todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, - "Width calculated incorrectly (expected %d {+1}, got %d)\n", - charwidth_caps_text[0], xdim); - } else - skip("TxGetNaturalSize measurements not performed (xdim = %d, ydim = %d, result = %x, error = %x)\n", - xdim, ydim, result, GetLastError()); - -cleanup: - RestoreDC(hdcDraw,1); - ReleaseDC(NULL,hdcDraw); + GetClientRect(hwnd, &rect); + + memset(&cf, 0, sizeof(cf)); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &cf); + result = ITextServices_TxSendMessage(txtserv, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + SelectObject(hdcDraw, hf); + + result = ITextServices_TxSetText(txtserv, test_text); + ok(result == S_OK, "ITextServices_TxSetText failed: 0x%08x.\n", result); + + extent.cx = -1; extent.cy = -1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &extent, &width, &height); + todo_wine CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); + + ReleaseDC(hwnd, hdcDraw); + DestroyWindow(hwnd); ITextServices_Release(txtserv); ITextHost_Release(host); }

1 0

Jacek Caban : mshtml: Use DWORD for event id argument in node-specific event handlers.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a660f673cb7d6d04e0f2a9a98cff439b5403365b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a660f673cb7d6d04e0f2a9a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 12:28:18 2018 +0200 mshtml: Use DWORD for event id argument in node-specific event handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlform.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 7c845bb..2f53a3b 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -727,7 +727,7 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 4fe03bf..a5ebfe7 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -403,7 +403,7 @@ static HRESULT HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index c22fa9e..4b1b6f6 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -781,7 +781,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, return S_OK; } -static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface);

1 0

Jactry Zeng : riched20: Some cleanup for CHARFORMAT convertor functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 8d506cb216023996ea84fc2c336fe74c325ade56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d506cb216023996ea84fc2c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 13 17:11:35 2018 +0800 riched20: Some cleanup for CHARFORMAT convertor functions. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 +++++++++--------- dlls/riched20/editor.h | 4 ++-- dlls/riched20/style.c | 37 ++++++++++++++++++++----------------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 820b038..8020117 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3901,17 +3901,17 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return editor->nEventMask; case EM_SETCHARFORMAT: { - CHARFORMAT2W buf, *p; + CHARFORMAT2W p; BOOL bRepaint = TRUE; - p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam); - if (p == NULL) return 0; + if (!cfany_to_cf2w(&p, (CHARFORMAT2W *)lParam)) + return 0; if (wParam & SCF_ALL) { if (editor->mode & TM_PLAINTEXT) { - ME_SetDefaultCharFormat(editor, p); + ME_SetDefaultCharFormat(editor, &p); } else { ME_Cursor start; ME_SetCursorToStart(editor, &start); - ME_SetCharFormat(editor, &start, NULL, p); + ME_SetCharFormat(editor, &start, NULL, &p); editor->nModifyStep = 1; } } else if (wParam & SCF_SELECTION) { @@ -3923,13 +3923,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_MoveCursorWords(editor, &end, +1); start = end; ME_MoveCursorWords(editor, &start, -1); - ME_SetCharFormat(editor, &start, &end, p); + ME_SetCharFormat(editor, &start, &end, &p); } bRepaint = ME_IsSelection(editor); - ME_SetSelectionCharFormat(editor, p); + ME_SetSelectionCharFormat(editor, &p); if (bRepaint) editor->nModifyStep = 1; } else { /* SCF_DEFAULT */ - ME_SetDefaultCharFormat(editor, p); + ME_SetDefaultCharFormat(editor, &p); } ME_CommitUndo(editor); if (bRepaint) @@ -3953,7 +3953,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_GetDefaultCharFormat(editor, &tmp); else ME_GetSelectionCharFormat(editor, &tmp); - ME_CopyToCFAny(dst, &tmp); + cf2w_to_cfany(dst, &tmp); return tmp.dwMask; } case EM_SETPARAFORMAT: diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0f0e56e..141c63a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -61,8 +61,8 @@ void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) DECLSPEC_HIDDEN; void ME_DumpStyle(ME_Style *s) DECLSPEC_HIDDEN; -CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) DECLSPEC_HIDDEN; -void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) DECLSPEC_HIDDEN; +BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; +BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc) DECLSPEC_HIDDEN; /* only works with 2W structs */ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) DECLSPEC_HIDDEN; /* ditto */ diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0b85d69..97e98a7 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -33,7 +33,7 @@ static int all_refs = 0; * sizeof(char[AW]) */ -CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) +BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) { if (from->cbSize == sizeof(CHARFORMATA)) { @@ -43,7 +43,7 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) if (f->dwMask & CFM_FACE) { MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); } - return to; + return TRUE; } if (from->cbSize == sizeof(CHARFORMATW)) { @@ -52,7 +52,7 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) /* theoretically, we don't need to zero the remaining memory */ ZeroMemory(&to->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); - return to; + return TRUE; } if (from->cbSize == sizeof(CHARFORMAT2A)) { @@ -65,13 +65,18 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) /* copy the rest of the 2A structure to 2W */ CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); - return to; + return TRUE; + } + if (from->cbSize == sizeof(CHARFORMAT2W)) + { + CopyMemory(to, from, sizeof(CHARFORMAT2W)); + return TRUE; } - return (from->cbSize >= sizeof(CHARFORMAT2W)) ? from : NULL; + return FALSE; } -static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) +BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) { assert(from->cbSize == sizeof(CHARFORMAT2W)); if (to->cbSize == sizeof(CHARFORMATA)) @@ -80,14 +85,14 @@ static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(CP_ACP, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), NULL, NULL); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ - return to; + return TRUE; } if (to->cbSize == sizeof(CHARFORMATW)) { CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ - return to; + return TRUE; } if (to->cbSize == sizeof(CHARFORMAT2A)) { @@ -99,16 +104,14 @@ static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) /* copy the rest of the 2A structure to 2W */ CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W,wWeight)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ - return to; + return TRUE; } - assert(to->cbSize >= sizeof(CHARFORMAT2W)); - return from; -} - -void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) -{ - if (ME_ToCFAny(to, from) == from) - CopyMemory(to, from, to->cbSize); + if (to->cbSize == sizeof(CHARFORMAT2W)) + { + CopyMemory(to, from, sizeof(CHARFORMAT2W)); + return TRUE; + } + return FALSE; } ME_Style *ME_MakeStyle(CHARFORMAT2W *style)

1 0

Ken Thomases : winemac: Interpret Windows bitmap data, especially window surfaces, as sRGB.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 650997d71db173c59a6480998168d5b89b7688c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=650997d71db173c59a648099… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jul 15 13:52:57 2018 -0500 winemac: Interpret Windows bitmap data, especially window surfaces, as sRGB. This makes the display match that of native apps. For example, the UI of Mac Steam vs. Windows Steam or a PNG shown in iexplore.exe vs. Preview. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/image.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winemac.drv/surface.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index 4090350..e5f3a4c 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -85,7 +85,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol else alpha_format = kCGImageAlphaNoneSkipFirst; - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); if (!colorspace) { WARN("failed to create colorspace\n"); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 67e0dce..91c5b88 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -357,7 +357,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, for (i = 0; i < count; i++) data_bits[i] ^= xor_bits[i]; - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGray); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGrayGamma2_2); if (!colorspace) { WARN("failed to create colorspace\n"); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 1230bbe..73daeca 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -384,7 +384,7 @@ CGImageRef create_surface_image(void *window_surface, CGRect *rect, int copy_dat visrect = CGRectOffset(*rect, -surface->header.rect.left, -surface->header.rect.top); - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); bytes_per_row = get_dib_stride(width, 32); offset = CGRectGetMinX(visrect) * 4 + (height - CGRectGetMaxY(visrect)) * bytes_per_row; size = min(CGRectGetHeight(visrect) * bytes_per_row,

1 0

Jason Edmeades : cmd: Fix handle leak in if exists.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: f634fe15db1d6f09615505eb445b9e748720dbeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f634fe15db1d6f09615505eb… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:26 2018 +0100 cmd: Fix handle leak in if exists. Fixes regression in f53d57c8549dc439eb73354bfd37acd1e4e86cfd. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 57a41c4..ff58484 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2844,7 +2844,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) WIN32_FIND_DATAW fd; HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); test = (hff != INVALID_HANDLE_VALUE ); - if (!test) FindClose(hff); + if (test) FindClose(hff); WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); }

1 0

Józef Kucia : d3d11/tests: Add more tests for multisample resolve.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 73b782c9877b84f7ff07c61415040de0dbca0ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b782c9877b84f7ff07c614… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:24 2018 +0200 d3d11/tests: Add more tests for multisample resolve. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index be7c907..5e324b1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27036,6 +27036,47 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, &color, 0xffbf7f40, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, }; if (!init_test_context(&test_context, NULL))

1 0

Michael Stefaniuc : dmloader: Reimplement ParseDescriptor() for DirectMusicContainer.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: cb403450ebf66a178e70f6d487b492a6591f741f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb403450ebf66a178e70f6d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:47 2018 +0200 dmloader: Reimplement ParseDescriptor() for DirectMusicContainer. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 197 +++++++------------------------------------ dlls/dmloader/tests/loader.c | 17 +++- 2 files changed, 44 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb403450ebf66a178e70…

1 0

Józef Kucia : wined3d: Separate feature level checks from shader model checks.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a622fbf9f332b624842df6a0377009c342667293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a622fbf9f332b624842df6a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:22 2018 +0200 wined3d: Separate feature level checks from shader model checks. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 21 ++++++++++++++------- dlls/wined3d/glsl_shader.c | 4 ---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ecc4ed..e422005 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1844,13 +1844,20 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps, - const struct fragment_caps *fragment_caps) +static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, + const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { - if (shader_caps->vs_version >= 5) - return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) - return WINED3D_FEATURE_LEVEL_10; + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + if (shader_caps->vs_version >= 5 + && gl_info->supported[ARB_DRAW_INDIRECT] + && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) + return WINED3D_FEATURE_LEVEL_11; + + if (shader_caps->vs_version == 4) + return WINED3D_FEATURE_LEVEL_10; + } + if (shader_caps->vs_version == 3) return WINED3D_FEATURE_LEVEL_9_SM3; if (shader_caps->vs_version == 2) @@ -4306,7 +4313,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; d3d_info->shader_color_key = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->feature_level = feature_level_from_caps(&shader_caps, &fragment_caps); + d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e922c8..0c73aba 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11242,8 +11242,6 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *gl_info) { BOOL shader_model_4 = gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SAMPLER_OBJECTS] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_TEXTURE_SWIZZLE]; @@ -11251,14 +11249,12 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_CULL_DISTANCE] && gl_info->supported[ARB_DERIVATIVE_CONTROL] - && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] && gl_info->supported[ARB_TESSELLATION_SHADER] - && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) return 5;

1 0

Michael Stefaniuc : dmusic: Sync up the dmobject.[ch] files.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 7028142771f43b41858e6fd6bb1c7738ae6bcf4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7028142771f43b41858e6fd6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:43 2018 +0200 dmusic: Sync up the dmobject.[ch] files. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 53 ++++++++++++ dlls/dmcompos/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmcompos/dmobject.h | 53 ++++++++++++ dlls/dmloader/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmloader/dmobject.h | 53 ++++++++++++ dlls/dmscript/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmscript/dmobject.h | 53 ++++++++++++ dlls/dmstyle/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmstyle/dmobject.h | 53 ++++++++++++ dlls/dmusic/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 53 ++++++++++++ dlls/dswave/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dswave/dmobject.h | 53 ++++++++++++ 14 files changed, 1855 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7028142771f43b41858e…

1 0

Michael Stefaniuc : dmusic: Reimplement ParseDescriptor() for DirectMusicCollection.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 8e0f94986e245899c11d442c9bd00ff8b2f7ff43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e0f94986e245899c11d442c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:44 2018 +0200 dmusic: Reimplement ParseDescriptor() for DirectMusicCollection. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/collection.c | 208 ++++----------------------------------------- dlls/dmusic/tests/dmusic.c | 18 ++-- 2 files changed, 28 insertions(+), 198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e0f94986e245899c11d…

1 0

Michael Stefaniuc : dmstyle: Reimplement ParseDescriptor() for DirectMusicStyle.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 55587efd3a46f15bedf43227da7fd462e8585ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55587efd3a46f15bedf43227… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:48 2018 +0200 dmstyle: Reimplement ParseDescriptor() for DirectMusicStyle. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 177 +++++++------------------------------------ dlls/dmstyle/tests/dmstyle.c | 15 ++-- 2 files changed, 39 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55587efd3a46f15bedf4…

1 0

Józef Kucia : wined3d: Take into account all shader stages when determining feature level.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: d97ca4b86f408b584a82e8500fe6333336301e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97ca4b86f408b584a82e850… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:23 2018 +0200 wined3d: Take into account all shader stages when determining feature level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e422005..bb8d5af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1847,22 +1847,29 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { + unsigned int shader_model; + + shader_model = min(shader_caps->vs_version, shader_caps->ps_version); + shader_model = min(shader_model, max(shader_caps->gs_version, 3)); + shader_model = min(shader_model, max(shader_caps->hs_version, 4)); + shader_model = min(shader_model, max(shader_caps->ds_version, 4)); + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) { - if (shader_caps->vs_version >= 5 + if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) + if (shader_model == 4) return WINED3D_FEATURE_LEVEL_10; } - if (shader_caps->vs_version == 3) + if (shader_model == 3) return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_caps->vs_version == 2) + if (shader_model == 2) return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_caps->vs_version == 1) + if (shader_model == 1) return WINED3D_FEATURE_LEVEL_8; if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3)

1 0

Piotr Caban : msi: Fix condition evaluation when comparing literal and integer.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 7837ae20cdeabab661da7bb5dae24f5ffefe17ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=7837ae20cdeabab661da7bb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 13 13:12:51 2018 +0200 msi: Fix condition evaluation when comparing literal and integer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45445 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/tests/package.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index ce06199..a8c9734 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -218,7 +218,7 @@ boolean_factor: } else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL) { - $$ = FALSE; + $$ = ($2 == COND_NE || $2 == COND_INE ); } else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */ { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ace9b35..d6d90ce 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2097,6 +2097,10 @@ static void test_condition(void) ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "&nofeature<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "\"\"<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiEvaluateConditionA(hpkg, "$nocomponent=\"\"");

1 0

Michael Stefaniuc : dmband: Reimplement ParseDescriptor() for DirectMusicBand.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 9348c093d4df2139eb320633f0f6176c441a647a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9348c093d4df2139eb320633… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:45 2018 +0200 dmband: Reimplement ParseDescriptor() for DirectMusicBand. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/band.c | 184 +++++++++------------------------------------ dlls/dmband/tests/dmband.c | 25 ++++-- 2 files changed, 57 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9348c093d4df2139eb32…

1 0

Michael Stefaniuc : dmcompos: Reimplement ParseDescriptor() for DirectMusicChordMap.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 003bdbd50bb0929616af2c7c22571297e095da25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=003bdbd50bb0929616af2c7c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:46 2018 +0200 dmcompos: Reimplement ParseDescriptor() for DirectMusicChordMap. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/chordmap.c | 169 ++++++----------------------------------- dlls/dmcompos/tests/dmcompos.c | 17 +++-- 2 files changed, 37 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=003bdbd50bb0929616af…

1 0

Jactry Zeng : zh-cn: Update Simplified Chinese translation.
by Jeremy Newman July 16, 2018

July 16, 2018

Module: website Branch: master Commit: e0ddb1a2eca2e72541d88f4f5716e05627d2a24c URL: https://source.winehq.org/git/website.git/?a=commit;h=e0ddb1a2eca2e72541d88… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 13 18:12:09 2018 +0800 zh-cn: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/home.template | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/templates/zh-cn/home.template b/templates/zh-cn/home.template index 6c48ee0..19194e6 100644 --- a/templates/zh-cn/home.template +++ b/templates/zh-cn/home.template @@ -101,7 +101,7 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download_zhcn"> <span class="winehq_badge fa-4x fa-layers fa-fw"> <i class="winehq_badge_inner fas fa-square"></i> <i class="fa-inverse fas fa-download" data-fa-transform="shrink-6"></i> @@ -161,20 +161,6 @@ <h1 class="title"><a href="{$root}/news">新闻与更新</a></h1> - <p class="newstitle"><a href="/news/2018030801">WineConf 2018 - 25 周年庆祝</a></p> - <div class="newsblock"> - <p>The Wine Project is pleased to announce that WineConf 2018 will - take place on June 29 - July 1 2018 in The Hague, The - Netherlands. This will coincide with the 25th anniversary of Wine.</p> - <p>WineConf is the Wine Project's annual conference, where members of - the Wine community, the broader Free Software community and interested - users meet up over food and beverages. We traditionally also have a - number of talks by attendees, as well as some formal and informal - discussions about anything vaguely Wine related.</p> - <p>Please see the <a href="https://wiki.winehq.org/WineConf2018">WineConf2018 page</a> - for further details.</p> - </div> -  <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> 更多新闻...</a></p>

1 0

Francois Gouget : testbot/WineSendLog: Fix identifying and reporting timeouts to the mailing list.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: tools Branch: master Commit: 074f362dc9ba3694982530a6cdf7b5623c58891b URL: https://source.winehq.org/git/tools.git/?a=commit;h=074f362dc9ba3694982530a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 13 12:07:04 2018 +0200 testbot/WineSendLog: Fix identifying and reporting timeouts to the mailing list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f095bce..ac14e11 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -139,9 +139,9 @@ sub ReadLog($$$) while (! $Found && defined($Line = <LOG>)) { $Line =~ s/[\r\n]*$//; - if ($Line =~ m/${BaseName}:${TestSet} done/) + if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done/) { - if ($Line =~ m/${BaseName}:${TestSet} done $258$/) + if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done $258$/) { push @Messages, "The test timed out"; } @@ -192,7 +192,7 @@ sub CompareLogs($$$$) { if ($Line =~ m/: Test failed: / || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at / || - $Line =~ m/Timeout/i) + $Line =~ m/The test timed out/) { $Messages .= "$Line\n"; } @@ -301,7 +301,7 @@ EOF print SENDMAIL "\n$CurrentDll:\n"; $PrintedDll = $CurrentDll; } - if ($Line =~ m/^[^:]+:([^ ]+) done $258$/) + if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done $258$/) { print SENDMAIL "$1: The test timed out\n"; }

1 0

Francois Gouget : testbot: Remove the Patch::AffectsTests field.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: tools Branch: master Commit: d050ff8d64e99d34f3bf72d7c7b77f73c633194c URL: https://source.winehq.org/git/tools.git/?a=commit;h=d050ff8d64e99d34f3bf72d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 13 12:05:19 2018 +0200 testbot: Remove the Patch::AffectsTests field. Patches which impact Wine must be tested too so this field is unused and no longer relevant. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update40.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Patches.pm | 1 - 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/testbot/ddl/update40.sql b/testbot/ddl/update40.sql new file mode 100644 index 0000000..8fa4606 --- /dev/null +++ b/testbot/ddl/update40.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Patches + DROP AffectsTests; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 96fcdcb..8862c6c 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -68,7 +68,6 @@ CREATE TABLE Patches WebPatchId INT(7) NULL, Received DATETIME NOT NULL, Disposition VARCHAR(40) NOT NULL, - AffectsTests ENUM('Y', 'N') NOT NULL, FromName VARCHAR(40) NULL, FromEMail VARCHAR(40) NULL, Subject VARCHAR(120) NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index d3efcb8..c54897a 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1092,29 +1092,6 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> - <dia:string>#AffectsTests#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> <dia:string>#FromName#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 23b9217..f5ef431 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -346,7 +346,6 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), - CreateBasicPropertyDescriptor("AffectsTests", "Affects tests", !1, 1, "B", 1), CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120),

1 0

Serge Gautherie : guiddef.h: REF* types do not depend on CINTERFACE.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 54f58769fee73a55675d503e0281e8f381a8e8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f58769fee73a55675d503e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Jul 13 16:30:50 2018 +0200 guiddef.h: REF* types do not depend on CINTERFACE. Addendum to 4626db2bb2a61cdceb00e0e346628062ee51aade. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 36c932c..2adde9c 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -130,12 +130,12 @@ typedef GUID FMTID,*LPFMTID; #define REFCLSID const CLSID & #define REFIID const IID & #define REFFMTID const FMTID & -#else /* !defined(__cplusplus) && !defined(CINTERFACE) */ +#else /* !defined(__cplusplus) */ #define REFGUID const GUID* __MIDL_CONST #define REFCLSID const CLSID* __MIDL_CONST #define REFIID const IID* __MIDL_CONST #define REFFMTID const FMTID* __MIDL_CONST -#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */ +#endif /* !defined(__cplusplus) */ #if defined(__cplusplus) && !defined(CINTERFACE) #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))

1 0