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

Alexandre Julliard : user32: Implement monitor rectangle filtering on the user32 side.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: aac37e8d0b64f487c9fcf538a1a1a73e9cfb8669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aac37e8d0b64f487c9fcf538… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 13:50:26 2018 +0200 user32: Implement monitor rectangle filtering on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 75 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 67eb90a..e1044e94 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -21,6 +21,7 @@ #include "config.h" #include <assert.h> +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -3562,49 +3563,79 @@ BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) return ret; } -#ifdef __i386__ -/* Some apps pass a non-stdcall callback to EnumDisplayMonitors, - * so we need a small assembly wrapper to call it. - * MJ's Help Diagnostic expects that %ecx contains the address to the rect. - */ -struct enumdisplaymonitors_lparam +struct enum_mon_data { MONITORENUMPROC proc; LPARAM lparam; + HDC hdc; + POINT origin; + RECT limit; }; -extern BOOL CALLBACK enumdisplaymonitors_callback_wrapper(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam); -__ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, +#ifdef __i386__ +/* Some apps pass a non-stdcall callback to EnumDisplayMonitors, + * so we need a small assembly wrapper to call it. + * MJ's Help Diagnostic expects that %ecx contains the address to the rect. + */ +extern BOOL enum_mon_callback_wrapper( HMONITOR monitor, LPRECT rect, struct enum_mon_data *data ); +__ASM_GLOBAL_FUNC( enum_mon_callback_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "subl $8,%esp\n\t" - "movl 20(%ebp),%eax\n\t" /* struct enumdisplaymonitors_lparam *orig = (struct enumdisplaymonitors_lparam*)lparam */ - "pushl 4(%eax)\n\t" /* push orig->lparam */ - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "movl 16(%ebp),%ecx\n\t" - "call *(%eax)\n\t" /* call orig->proc */ + "movl 16(%ebp),%eax\n\t" /* data */ + "movl 12(%ebp),%ecx\n\t" /* rect */ + "pushl 4(%eax)\n\t" /* data->lparam */ + "pushl %ecx\n\t" /* rect */ + "pushl 8(%eax)\n\t" /* data->hdc */ + "pushl 8(%ebp)\n\t" /* monitor */ + "call *(%eax)\n\t" /* data->proc */ "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret $16" ) + "ret" ) #endif /* __i386__ */ +static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + struct enum_mon_data *data = (struct enum_mon_data *)lp; + RECT monrect = *rect; + + OffsetRect( &monrect, -data->origin.x, -data->origin.y ); + if (!IntersectRect( &monrect, &monrect, &data->limit )) return TRUE; +#ifdef __i386__ + return enum_mon_callback_wrapper( monitor, &monrect, data ); +#else + return data->proc( monitor, data->hdc, &monrect, data->lparam ); +#endif +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { -#ifdef __i386__ - struct enumdisplaymonitors_lparam orig = { proc, lp }; - proc = enumdisplaymonitors_callback_wrapper; - lp = (LPARAM)&orig; -#endif - return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); + struct enum_mon_data data; + + data.proc = proc; + data.lparam = lp; + data.hdc = hdc; + + if (hdc) + { + if (!GetDCOrgEx( hdc, &data.origin )) return FALSE; + if (GetClipBox( hdc, &data.limit ) == ERROR) return FALSE; + } + else + { + data.origin.x = data.origin.y = 0; + data.limit.left = data.limit.top = INT_MIN; + data.limit.right = data.limit.bottom = INT_MAX; + } + if (rect && !IntersectRect( &data.limit, &data.limit, rect )) return TRUE; + return USER_Driver->pEnumDisplayMonitors( 0, NULL, enum_mon_callback, (LPARAM)&data ); }

1 0

Alexandre Julliard : user32: Move monitor functions to sysparams.c.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 2be5b054d3dd48be8105be62b78dab40e1d46cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be5b054d3dd48be8105be62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 13:49:03 2018 +0200 user32: Move monitor functions to sysparams.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 208 ------------------------------------------------ dlls/user32/sysparams.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2be5b054d3dd48be8105…

1 0

Zhiyi Zhang : user32: Fix menu item rectangle calculation in GetMenuItemRect().
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: a205401b385d06ed8204c5f3ed3abccdebbeb129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a205401b385d06ed8204c5f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 23:04:38 2018 +0800 user32: Fix menu item rectangle calculation in GetMenuItemRect(). This fixes the menu of BibleWorks 10 not showing up and some todo in tests. Sysmenu is in non-client area. And because MapWindowPoints() should not be used with non-client area coordinates. Doing so results in wrong coordinates for sysmenu item rectangles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 +++++++-- dlls/user32/tests/menu.c | 71 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab1ae9b..bae4500 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5306,6 +5306,7 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { POPUPMENU *menu; UINT pos; + RECT window_rect; TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); @@ -5324,9 +5325,17 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) *rect = menu->items[pos].rect; OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); - release_menu_ptr(menu); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Popup menu item draws in the client area */ + if (menu->wFlags & MF_POPUP) MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + else + { + /* Sysmenu draws in the non-client area */ + GetWindowRect(hwnd, &window_rect); + OffsetRect(rect, window_rect.left, window_rect.top); + } + + release_menu_ptr(menu); return TRUE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7f338ce..6a4990f 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -341,6 +341,62 @@ static void test_getmenubarinfo(void) DestroyWindow(hwnd); } +static void test_GetMenuItemRect(void) +{ + HWND hwnd; + HMENU hmenu; + HMENU popup_hmenu; + RECT window_rect; + RECT item_rect; + POINT client_top_left; + INT caption_height; + BOOL ret; + + hwnd = CreateWindowW((LPCWSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, + NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed with error %d\n", GetLastError()); + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + popup_hmenu = CreatePopupMenu(); + ok(popup_hmenu != NULL, "CreatePopupMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(popup_hmenu, MF_STRING, 0, "Popup"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(hmenu, MF_STRING | MF_POPUP, (UINT_PTR)popup_hmenu, "Menu"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + /* Get the menu item rectangle of the displayed sysmenu item */ + ret = GetMenuItemRect(hwnd, hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + GetWindowRect(hwnd, &window_rect); + /* Get the screen coordinate of the left top corner of the client rectangle */ + client_top_left.x = 0; + client_top_left.y = 0; + MapWindowPoints(hwnd, 0, &client_top_left, 1); + caption_height = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYCAPTION); + + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right <= window_rect.right, "Expect item_rect.right %d <= %d\n", item_rect.right, window_rect.right); + /* A gap of 1 pixel is added deliberately in commit 75f9e64, so using equal operator would fail on Wine. + * Check that top and bottom are correct with 1 pixel margin tolerance */ + ok(item_rect.top - (window_rect.top + caption_height) <= 1, "Expect item_rect.top %d - %d <= 1\n", item_rect.top, + window_rect.top + caption_height); + ok(item_rect.bottom - (client_top_left.y - 1) <= 1, "Expect item_rect.bottom %d - %d <= 1\n", item_rect.bottom, + client_top_left.y - 1); + + /* Get the item rectangle of the not yet displayed popup menu item. */ + ret = GetMenuItemRect(hwnd, popup_hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right == client_top_left.x, "Expect item_rect.right %d == %d\n", item_rect.right, client_top_left.x); + ok(item_rect.top == client_top_left.y, "Expect item_rect.top %d == %d\n", item_rect.top, client_top_left.y); + ok(item_rect.bottom == client_top_left.y, "Expect item_rect.bottom %d == %d\n", item_rect.bottom, + client_top_left.y); + + DestroyWindow(hwnd); +} + static void test_system_menu(void) { WCHAR testW[] = {'t','e','s','t',0}; @@ -1734,7 +1790,7 @@ static void test_menu_iteminfo( void ) Only the low word of the dwTypeData is used. Use a magic bitmap here (Word 95 uses this to create its MDI menu buttons) */ TMII_INSMI( MIIM_TYPE, MFT_BITMAP | MFT_RIGHTJUSTIFY, -1, -1, 0, 0, 0, -1, - (HMENU)MAKELONG(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); + (HMENU)MAKELPARAM(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); TMII_GMII ( MIIM_TYPE, 80, MFT_BITMAP | MFT_RIGHTJUSTIFY, 0, 0, 0, 0, 0, 0, HBMMENU_MBAR_CLOSE, 0, HBMMENU_MBAR_CLOSE, NULL, OK, OK ); @@ -1780,7 +1836,7 @@ static void test_menu_iteminfo( void ) Only the low word of the dwTypeData is used. Use a magic bitmap here (Word 95 uses this to create its MDI menu buttons) */ TMII_INSMI( MIIM_TYPE, MFT_BITMAP | MFT_RIGHTJUSTIFY, -1, -1, 0, 0, 0, -1, - (HMENU)MAKELONG(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); + (HMENU)MAKELPARAM(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); TMII_GMII ( MIIM_TYPE, 80, MFT_BITMAP | MFT_RIGHTJUSTIFY, 0, 0, 0, 0, 0, 0, HBMMENU_MBAR_CLOSE, 0, HBMMENU_MBAR_CLOSE, NULL, OK, OK ); @@ -2188,15 +2244,15 @@ static struct menu_mouse_tests_s { { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, FALSE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{2, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } @@ -4199,6 +4255,7 @@ START_TEST(menu) test_subpopup_locked_by_menu(); test_menu_ownerdraw(); test_getmenubarinfo(); + test_GetMenuItemRect(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo();

1 0

Józef Kucia : vulkan-1/tests: Enumerate queue families.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: adeeb0dc2173cfddab7c03b651b6b51647979ef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adeeb0dc2173cfddab7c03b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 17 15:05:53 2018 +0200 vulkan-1/tests: Enumerate queue families. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index bf83a28..1d2f66f 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -149,6 +149,28 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) +{ + VkPhysicalDeviceProperties device_properties; + VkQueueFamilyProperties *properties; + uint32_t i, count; + + vkGetPhysicalDeviceProperties(vk_physical_device, &device_properties); + + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); + properties = heap_calloc(count, sizeof(*properties)); + ok(!!properties, "Failed to allocate memory.\n"); + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); + + for (i = 0; i < count; ++i) + { + trace("Device '%s', queue family %u: flags %#x count %u.\n", + device_properties.deviceName, i, properties[i].queueFlags, properties[i].queueCount); + } + + heap_free(properties); +} + static void test_physical_device_groups(void) { PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR; @@ -248,5 +270,6 @@ START_TEST(vulkan) { test_instance_version(); for_each_device(enumerate_physical_device); + for_each_device(enumerate_device_queues); test_physical_device_groups(); }

1 0

Austin English : ntoskrnl.exe: Add IoReleaseRemoveLockAndWaitEx stub.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 235f6da846093ae04c6024320975ce42a33ba99e URL: https://source.winehq.org/git/wine.git/?a=commit;h=235f6da846093ae04c602432… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 16 15:52:32 2018 -0500 ntoskrnl.exe: Add IoReleaseRemoveLockAndWaitEx stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43642 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a061241..80e9b9e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3547,7 +3547,18 @@ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) return TRUE; } +/********************************************************************* + * KeFlushQueuedDpcs (NTOSKRNL.@) + */ void WINAPI KeFlushQueuedDpcs(void) { FIXME("stub!\n"); } + +/********************************************************************* + * IoReleaseRemoveLockAndWaitEx (NTOSKRNL.@) + */ +void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG size) +{ + FIXME("stub: %p %p %u\n", lock, tag, size); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 907fba8..662445a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -436,7 +436,7 @@ @ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) @ stdcall IoRegisterShutdownNotification(ptr) @ stdcall IoReleaseCancelSpinLock(long) -@ stub IoReleaseRemoveLockAndWaitEx +@ stdcall IoReleaseRemoveLockAndWaitEx(ptr ptr long) @ stub IoReleaseRemoveLockEx @ stub IoReleaseVpbSpinLock @ stub IoRemoveShareAccess

1 0

Ken Thomases : dbghelp: Fix loading of Mach-O load commands for 64-bit binaries.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 3ff8fa7ed1d28b38703125b0c8c632410e3fd980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff8fa7ed1d28b38703125b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 16 15:44:36 2018 -0500 dbghelp: Fix loading of Mach-O load commands for 64-bit binaries. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/macho_module.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 9990850..a29794e 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -89,6 +89,7 @@ struct image_file_map #ifdef HAVE_MACH_O_LOADER_H struct mach_header mach_header; + size_t header_size; /* size of real header in file */ const struct load_command* load_commands; const struct uuid_command* uuid; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9401dfb..05130b7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -415,7 +415,7 @@ static const struct load_command* macho_map_load_commands(struct macho_file_map* if (fmap->load_commands == IMAGE_NO_MAP) { fmap->load_commands = (const struct load_command*) macho_map_range( - fmap, sizeof(fmap->mach_header), fmap->mach_header.sizeofcmds, NULL); + fmap, fmap->header_size, fmap->mach_header.sizeofcmds, NULL); TRACE("Mapped load commands: %p\n", fmap->load_commands); } @@ -433,7 +433,7 @@ static void macho_unmap_load_commands(struct macho_file_map* fmap) { TRACE("Unmapping load commands: %p\n", fmap->load_commands); macho_unmap_range(NULL, (const void**)&fmap->load_commands, fmap, - sizeof(fmap->mach_header), fmap->mach_header.sizeofcmds); + fmap->header_size, fmap->mach_header.sizeofcmds); } } @@ -666,6 +666,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, ifm->modtype = DMT_MACHO; ifm->addr_size = (pcs->is_64bit) ? 64 : 32; + fmap->header_size = (pcs->is_64bit) ? sizeof(struct mach_header_64) : sizeof(struct mach_header); len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); if (!(filename = HeapAlloc(GetProcessHeap(), 0, len)))

1 0

Vincent Povirk : mscoree: Use upgrade code to find installed Wine Mono version.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: cb6e92d3287e9768b2e535c0b3fa159b19ec26cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6e92d3287e9768b2e535c0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 16 13:57:29 2018 -0500 mscoree: Use upgrade code to find installed Wine Mono version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45317 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 42f8169..c4876fe 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -669,8 +669,10 @@ static BOOL install_wine_mono(void) { BOOL is_wow64 = FALSE; HMODULE hmsi; + UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); char versionstringbuf[15]; + char productcodebuf[39]; UINT res; DWORD buffer_size; PROCESS_INFORMATION pi; @@ -681,7 +683,7 @@ static BOOL install_wine_mono(void) BOOL ret; static const char* mono_version = "4.7.1"; - static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; + static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; static const WCHAR argsW[] = @@ -703,11 +705,22 @@ static BOOL install_wine_mono(void) return FALSE; } - pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + pMsiEnumRelatedProductsA = (void*)GetProcAddress(hmsi, "MsiEnumRelatedProductsA"); - buffer_size = sizeof(versionstringbuf); + res = pMsiEnumRelatedProductsA(mono_upgrade_code, 0, 0, productcodebuf); - res = pMsiGetProductInfoA(mono_product_code, "VersionString", versionstringbuf, &buffer_size); + if (res == ERROR_SUCCESS) + { + pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + + buffer_size = sizeof(versionstringbuf); + + res = pMsiGetProductInfoA(productcodebuf, "VersionString", versionstringbuf, &buffer_size); + } + else if (res != ERROR_NO_MORE_ITEMS) + { + ERR("MsiEnumRelatedProducts failed, err=%u\n", res); + } FreeLibrary(hmsi);

1 0

Michael Stefaniuc : dmime: Don't crash when DMSegment loads a MIDI file.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: c8e493cb0c16ef28d9109e3b14f63d9587a8f013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e493cb0c16ef28d9109e3b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 16 23:39:01 2018 +0200 dmime: Don't crash when DMSegment loads a MIDI file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31829 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index dc46069..9a9872b 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -790,10 +790,16 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st if (!stream) return E_POINTER; - if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF) + if (stream_get_chunk(stream, &riff) != S_OK || + (riff.id != FOURCC_RIFF && riff.id != mmioFOURCC('M','T','h','d'))) return DMUS_E_UNSUPPORTED_STREAM; - stream_reset_chunk_start(stream, &riff); + + if (riff.id == mmioFOURCC('M','T','h','d')) { + FIXME("MIDI file loading not supported\n"); + return S_OK; + } + hr = IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream, &This->dmobj.desc); if (FAILED(hr))

1 0

Nikolay Sivov : comctl32/button: Use per-window dpi settings.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 40298cc69a9966b678ec45ad4d9ca1aea55d33a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40298cc69a9966b678ec45ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 14:13:05 2018 +0300 comctl32/button: Use per-window dpi settings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 507820c..56968f9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1092,8 +1092,8 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) GetClientRect(infoPtr->hwnd, &client); rbox = rtext = client; - checkBoxWidth = 12 * GetDeviceCaps( hDC, LOGPIXELSX ) / 96 + 1; - checkBoxHeight = 12 * GetDeviceCaps( hDC, LOGPIXELSY ) / 96 + 1; + checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; + checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset );

1 0

Vincent Povirk : appwiz.cpl: Update Wine Mono to 4.7.3.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 36e87e031726499becbf06163ccd7431eedd2e7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=36e87e031726499becbf0616… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 16 13:57:30 2018 -0500 appwiz.cpl: Update Wine Mono to 4.7.3. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45317 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index aede3d0..4e87467 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.7.1" -#define MONO_SHA "2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa" +#define MONO_VERSION "4.7.3" +#define MONO_SHA "d24a8017371c7e8224a1778bb43a113ed7ed9720efd9d0cda175d42db6106d3a" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c4876fe..eda380a 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.7.1"; + static const char* mono_version = "4.7.3"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0