August 2019 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Set display mode to a suitable adapter format.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: d08c25cfc2ea3b437c4b890d560e2c18c03a354d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08c25cfc2ea3b437c4b890d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:12 2019 +0100 wined3d: Set display mode to a suitable adapter format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46792 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9fc282d682cfef466a3ee341b901f7081c0959e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/swapchain.c | 16 ++++++++++++++-- dlls/wined3d/utils.c | 1 - 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f7fc05f..724ea16 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -762,6 +762,16 @@ void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const swapchain->max_frame_latency = device->max_frame_latency >= 2 ? device->max_frame_latency - 1 : 1; } +static enum wined3d_format_id adapter_format_from_backbuffer_format(struct wined3d_swapchain *swapchain, + enum wined3d_format_id format_id) +{ + const struct wined3d_adapter *adapter = swapchain->device->adapter; + const struct wined3d_format *backbuffer_format; + + backbuffer_format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); + return pixelformat_for_depth(backbuffer_format->byte_count * CHAR_BIT); +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -881,7 +891,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 /* Change the display settings */ swapchain->d3d_mode.width = desc->backbuffer_width; swapchain->d3d_mode.height = desc->backbuffer_height; - swapchain->d3d_mode.format_id = desc->backbuffer_format; + swapchain->d3d_mode.format_id = adapter_format_from_backbuffer_format(swapchain, + desc->backbuffer_format); swapchain->d3d_mode.refresh_rate = desc->refresh_rate; swapchain->d3d_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; @@ -1414,7 +1425,8 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha actual_mode.width = swapchain_desc->backbuffer_width; actual_mode.height = swapchain_desc->backbuffer_height; actual_mode.refresh_rate = swapchain_desc->refresh_rate; - actual_mode.format_id = swapchain_desc->backbuffer_format; + actual_mode.format_id = adapter_format_from_backbuffer_format(swapchain, + swapchain_desc->backbuffer_format); actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } else diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd70d3f..b80d776 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5672,7 +5672,6 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, } } -/* DirectDraw stuff */ enum wined3d_format_id pixelformat_for_depth(DWORD depth) { switch (depth)

1 0

Matteo Bruni : d3d8: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: bab36ab3b624ff7e7af937d8932870508915349e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab36ab3b624ff7e7af937d8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:09 2019 +0100 d3d8: Release system memory wined3d buffer only after the draw buffer is destroyed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46371 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 873178c03a56eca4d818369386b0be6ba01b08c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 3b98000..cdf6877 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -56,9 +56,10 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) { IDirect3DDevice8_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -78,9 +79,10 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -266,6 +268,9 @@ static const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = static void STDMETHODCALLTYPE d3d8_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d8_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d8_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -377,9 +382,10 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface) { IDirect3DDevice8_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -399,9 +405,10 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -586,6 +593,9 @@ static const IDirect3DIndexBuffer8Vtbl d3d8_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d8_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d8_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d8_resource_cleanup(&buffer->resource); heap_free(buffer); }

1 0

Sebastian Lackner : server: Improve handling of cursor position clipping for empty rectangle.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: f516b269166774670dbc7f587e2e01c72baba25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f516b269166774670dbc7f58… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Feb 18 08:26:11 2019 -0600 server: Improve handling of cursor position clipping for empty rectangle. Based on a patch by Kevin Buhr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38791 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ff6a116972089f8e112dd4234d57689a60ab4dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/input.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 8 +++--- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ffdd4b7..835dfb1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1269,6 +1269,19 @@ static LRESULT CALLBACK hook_proc2( int code, WPARAM wparam, LPARAM lparam ) return CallNextHookEx( 0, code, wparam, lparam ); } +static LRESULT CALLBACK hook_proc3( int code, WPARAM wparam, LPARAM lparam ) +{ + POINT pt; + + if (code == HC_ACTION) + { + /* MSLLHOOKSTRUCT does not seem to be reliable and contains different data on each run. */ + GetCursorPos(&pt); + ok(pt.x == pt_old.x && pt.y == pt_old.y, "GetCursorPos: (%d,%d)\n", pt.x, pt.y); + } + return CallNextHookEx( 0, code, wparam, lparam ); +} + static void test_mouse_ll_hook(void) { HWND hwnd; @@ -1342,6 +1355,62 @@ static void test_mouse_ll_hook(void) ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); UnhookWindowsHookEx(hook2); + hook1 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc3, GetModuleHandleA(0), 0); + + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + clipped = TRUE; + + SetCursorPos(140, 140); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + SetCursorPos(160, 160); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, -STEP, -STEP, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, +STEP, +STEP, 0, 0); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + + clipped = FALSE; + ClipCursor(NULL); + + SetCursorPos(140, 140); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + SetCursorPos(160, 160); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + SetCursorPos(150, 150); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + UnhookWindowsHookEx(hook1); + done: DestroyWindow(hwnd); SetCursorPos(pt_org.x, pt_org.y); diff --git a/server/queue.c b/server/queue.c index 545991b..2eec422 100644 --- a/server/queue.c +++ b/server/queue.c @@ -411,8 +411,8 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 ); /* warp the mouse to be inside the clip rect */ - x = min( max( desktop->cursor.x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); - y = min( max( desktop->cursor.y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + x = max( min( desktop->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + y = max( min( desktop->cursor.y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); } @@ -1500,8 +1500,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg { if (msg->msg == WM_MOUSEMOVE) { - int x = min( max( msg->x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); - int y = min( max( msg->y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + int x = max( min( msg->x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + int y = max( min( msg->y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); if (desktop->cursor.x != x || desktop->cursor.y != y) always_queue = 1; desktop->cursor.x = x; desktop->cursor.y = y;

1 0

Dmitry Timoshkov : wininet: Return proper cache path from GetUrlCacheConfigInfo.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: a8aafa4c274aebc06530f090c6ff77ea8e2e3ed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8aafa4c274aebc06530f090… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 23 14:51:26 2019 +0800 wininet: Return proper cache path from GetUrlCacheConfigInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0cdca521e9bdf9838cd789cf3ef225a95cdaf6d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/urlcache.c | 2 - dlls/wininet/urlcache.c | 89 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index acd4ff2..c5e72ae 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1184,10 +1184,8 @@ static void test_GetUrlCacheConfigInfo(void) SetLastError(0xdeadbeef); ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); -todo_wine ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); if (!ret) -todo_wine ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); else { diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f26fa34..4d422c9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,6 +23,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ws2tcpip.h" @@ -3764,21 +3765,93 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, /*********************************************************************** * GetUrlCacheConfigInfoW (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; /* FIXME */ + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + + return TRUE; } /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + INTERNET_CACHE_CONFIG_INFOW infoW; + + TRACE("(%p, %p, %x)\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + infoW.dwStructSize = sizeof(infoW); + if (!GetUrlCacheConfigInfoW(&infoW, size, flags)) + return FALSE; + + info->dwContainer = infoW.dwContainer; + info->dwQuota = infoW.dwQuota; + info->dwReserved4 = infoW.dwReserved4; + info->fPerUser = infoW.fPerUser; + info->dwSyncMode = infoW.dwSyncMode; + info->dwNumCachePaths = infoW.dwNumCachePaths; + info->dwNormalUsage = infoW.dwNormalUsage; + info->dwExemptUsage = infoW.dwExemptUsage; + + info->u.s.dwCacheSize = infoW.u.s.dwCacheSize; + WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + + return TRUE; } BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes,

1 0

Gijs Vermeulen : wmvcore: Upgrade to IWMProfileManager2.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 47d9d439740236ef7ee850943c1453c4e2156d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47d9d439740236ef7ee85094… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 10 14:04:48 2019 +0100 wmvcore: Upgrade to IWMProfileManager2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28847 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3106cef4007473f2a8844cd7d219566b5eb41cc4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/wmvcore_main.c | 73 ++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 14014ee..b56b5ff 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -2123,25 +2123,28 @@ HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader * } typedef struct { - IWMProfileManager IWMProfileManager_iface; + IWMProfileManager2 IWMProfileManager2_iface; LONG ref; } WMProfileManager; -static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +static inline WMProfileManager *impl_from_IWMProfileManager2(IWMProfileManager2 *iface) { - return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); + return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager2_iface); } -static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager2 *iface, REFIID riid, void **ppv) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; + }else if(IsEqualGUID(&IID_IWMProfileManager2, riid)) { + TRACE("(%p)->(IID_IWMProfileManager2 %p)\n", This, ppv); + *ppv = &This->IWMProfileManager2_iface; }else { FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -2152,9 +2155,9 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, return S_OK; } -static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2162,9 +2165,9 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) return ref; } -static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2175,49 +2178,63 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) return ref; } -static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager2 *iface, WMT_VERSION version, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%x %p)\n", This, version, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager2 *iface, REFGUID guid, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager2 *iface, const WCHAR *profile, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager2 *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 *iface, DWORD *ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p)\n", This, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%d %p)\n", This, index, ret); return E_NOTIMPL; } -static const IWMProfileManagerVtbl WMProfileManagerVtbl = { +static HRESULT WINAPI WMProfileManager2_GetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION *version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%p)\n", This, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager2_SetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%x)\n", This, version); + return E_NOTIMPL; +} + +static const IWMProfileManager2Vtbl WMProfileManager2Vtbl = { WMProfileManager_QueryInterface, WMProfileManager_AddRef, WMProfileManager_Release, @@ -2226,7 +2243,9 @@ static const IWMProfileManagerVtbl WMProfileManagerVtbl = { WMProfileManager_LoadProfileByData, WMProfileManager_SaveProfile, WMProfileManager_GetSystemProfileCount, - WMProfileManager_LoadSystemProfile + WMProfileManager_LoadSystemProfile, + WMProfileManager2_GetSystemProfileVersion, + WMProfileManager2_SetSystemProfileVersion }; HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) @@ -2239,9 +2258,9 @@ HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) if(!profile_mgr) return E_OUTOFMEMORY; - profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; + profile_mgr->IWMProfileManager2_iface.lpVtbl = &WMProfileManager2Vtbl; profile_mgr->ref = 1; - *ret = &profile_mgr->IWMProfileManager_iface; + *ret = (IWMProfileManager *)&profile_mgr->IWMProfileManager2_iface; return S_OK; }

1 0

André Hentschel : ntdll: Add stub for RtlInstallFunctionTableCallback on ARM/ARM64.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 553368ff504ac93455b1f58a880f24bf47ce337a URL: https://source.winehq.org/git/wine.git/?a=commit;h=553368ff504ac93455b1f58a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 31 20:24:54 2019 +0200 ntdll: Add stub for RtlInstallFunctionTableCallback on ARM/ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e26aaa3ed80341b213508d7f2666e740bda90c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_arm64.c | 12 +++++++++++- include/winnt.h | 6 ++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 1c5744d..644e868 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c2e2fb1..7f59182 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -721,7 +721,7 @@ # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) @ stdcall RtlInt64ToUnicodeString(int64 long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 88914cd..4f505db 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/********************************************************************** + * RtlInstallFunctionTableCallback (NTDLL.@) + */ +BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD table, DWORD base, DWORD length, + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) +{ + FIXME( "%x %x %d %p %p %s: stub\n", table, base, length, callback, context, wine_dbgstr_w(dll) ); + return TRUE; +} + /************************************************************************* * RtlAddGrowableFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e195889..e15129b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -637,7 +637,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; ucontext_t *context = ucontext; - DWORD *orig_pc = PC_sig(context); + DWORD *orig_pc = (DWORD *)PC_sig(context); /* check for page fault inside the thread stack */ if (signal == SIGSEGV && @@ -977,6 +977,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P return TRUE; } +/********************************************************************** + * RtlInstallFunctionTableCallback (NTDLL.@) + */ +BOOLEAN CDECL RtlInstallFunctionTableCallback( ULONG_PTR table, ULONG_PTR base, DWORD length, + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) +{ + FIXME( "%lx %lx %d %p %p %s: stub\n", table, base, length, callback, context, wine_dbgstr_w(dll) ); + return TRUE; +} + /************************************************************************* * RtlAddGrowableFunctionTable (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 3a8295f..20e8a85 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1741,8 +1741,11 @@ typedef struct _CONTEXT ULONG Padding2[2]; /* 198 */ } CONTEXT; +typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD,PVOID); + BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +BOOLEAN CDECL RtlInstallFunctionTableCallback(DWORD,DWORD,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); #endif /* __arm__ */ @@ -1874,8 +1877,11 @@ typedef struct _CONTEXT DWORD64 Wvr[ARM64_MAX_WATCHPOINTS]; /* 380 */ } CONTEXT; +typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD64,PVOID); + BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,ULONG_PTR); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +BOOLEAN CDECL RtlInstallFunctionTableCallback(ULONG_PTR,ULONG_PTR,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); #endif /* __aarch64__ */

1 0

Nikolay Sivov : user32: Do not touch some of the values on 64-bit with SetWindowLong().
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 853731b3a853f132f863749a2336ee14ae576269 URL: https://source.winehq.org/git/wine.git/?a=commit;h=853731b3a853f132f863749a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 00:53:42 2019 +0300 user32: Do not touch some of the values on 64-bit with SetWindowLong(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d00ed8e7b94390f831873278b399b6862f3cc484) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/win.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 31 ++++++- 2 files changed, 258 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=853731b3a853f132f863…

1 0

André Hentschel : include: Fix vararg standard call types for ARM.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: ce799d6b154586a838f457df8971ac4edcced97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce799d6b154586a838f457df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 9 21:55:47 2019 +0200 include: Fix vararg standard call types for ARM. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 49abdbcda972f959949945f4cd8b16d645c93728) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/basetyps.h | 8 ++++---- include/winnt.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index d55005f..9487533 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -26,10 +26,10 @@ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#define STDMETHODCALLTYPE WINAPI +#define STDMETHODVCALLTYPE WINAPIV +#define STDAPICALLTYPE WINAPI +#define STDAPIVCALLTYPE WINAPIV #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(t) EXTERN_C t STDAPICALLTYPE #define STDMETHODIMP HRESULT STDMETHODCALLTYPE diff --git a/include/winnt.h b/include/winnt.h index 20e8a85..115cc29 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -412,10 +412,10 @@ extern "C++" { \ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#define STDMETHODCALLTYPE WINAPI +#define STDMETHODVCALLTYPE WINAPIV +#define STDAPICALLTYPE WINAPI +#define STDAPIVCALLTYPE WINAPIV #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(type) EXTERN_C type STDAPICALLTYPE

1 0

Nikolay Sivov : user32: Make GetWindowLong() fail for some values on 64-bit.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 0c76e18c369d8becaef96eef77d0ca1cc30b1411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c76e18c369d8becaef96eef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 00:53:43 2019 +0300 user32: Make GetWindowLong() fail for some values on 64-bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c2f4e2b338906918c77634631ff82f106570e02e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/win.c | 4 ---- dlls/user32/win.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 617fbe3..40427eb 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6301,7 +6301,6 @@ static void test_set_window_long_size(void) /* GWLP_WNDPROC */ SetLastError(0xdeadbeef); wnd_proc = (WNDPROC)(LONG_PTR)GetWindowLongA(hwnd, GWLP_WNDPROC); -todo_wine ok(!wnd_proc && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); wnd_proc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); @@ -6382,12 +6381,10 @@ todo_wine SetLastError(0xdeadbeef); ret = GetWindowLongA(hwnd, GWLP_HINSTANCE); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); SetLastError(0xdeadbeef); ret = GetWindowLongW(hwnd, GWLP_HINSTANCE); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); SetLastError(0xdeadbeef); @@ -6406,7 +6403,6 @@ todo_wine /* GWLP_HWNDPARENT */ SetLastError(0xdeadbeef); ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); SetLastError(0xdeadbeef); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d08b180..eb01242 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2693,7 +2693,19 @@ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) */ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) { - return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), FALSE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), FALSE ); + } } @@ -2702,7 +2714,19 @@ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) */ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) { - return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), TRUE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), TRUE ); + } }

1 0

André Hentschel : ntdll: Translate signal to trap when trap code is 0 on ARM.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: 89046193dc7e1f3fbd8fd100a271adf77ff53d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89046193dc7e1f3fbd8fd100… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 9 21:55:59 2019 +0200 ntdll: Translate signal to trap when trap code is 0 on ARM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46187 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4bfc2c32ffcf861fc1804c1e350152b9bef5b07c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_arm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 82f1fa8..1cabb32 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -142,10 +142,24 @@ struct UNWIND_INFO * * Get the trap code for a signal. */ -static inline enum arm_trap_code get_trap_code( const ucontext_t *sigcontext ) +static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *sigcontext ) { #ifdef TRAP_sig - return TRAP_sig(sigcontext); + enum arm_trap_code trap = TRAP_sig(sigcontext); + if (trap) + return trap; + /* trap is 0 on arm64 kernel */ + switch (signal) + { + case SIGILL: + return TRAP_ARM_PRIVINFLT; + case SIGSEGV: + return TRAP_ARM_PAGEFLT; + case SIGBUS: + return TRAP_ARM_ALIGNFLT; + default: + return trap; + } #else return TRAP_ARM_UNKNOWN; /* unknown trap code */ #endif @@ -718,7 +732,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) ucontext_t *context = ucontext; /* check for page fault inside the thread stack */ - if (get_trap_code(context) == TRAP_ARM_PAGEFLT && + if (get_trap_code(signal, context) == TRAP_ARM_PAGEFLT && (char *)info->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && (char *)info->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && virtual_handle_stack_fault( info->si_addr )) @@ -735,7 +749,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; - switch(get_trap_code(context)) + switch(get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; @@ -756,7 +770,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec->ExceptionInformation[1] = 0xffffffff; break; default: - ERR("Got unexpected trap %d\n", get_trap_code(context)); + ERR("Got unexpected trap %d\n", get_trap_code(signal, context)); rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; }

1 0