May 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Use user_callbacks for alertable NtWaitForMultipleObjects calls.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: 7625e6ba20c70d59d61a73e5c2b2b5243e0e0143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7625e6ba20c70d59d61a73e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 02:36:03 2022 +0200 win32u: Use user_callbacks for alertable NtWaitForMultipleObjects calls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53020 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 1 + dlls/win32u/driver.c | 7 +++++-- dlls/win32u/ntuser_private.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 9cd9bd60146..e470d2ad688 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -162,6 +162,7 @@ static const struct user_callbacks user_funcs = EndMenu, ImmProcessKey, ImmTranslateMessage, + NtWaitForMultipleObjects, free_win_ptr, MENU_GetSysMenu, MENU_IsMenuActive, diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index b4cea3d42c8..1f538d100ed 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -813,8 +813,11 @@ static NTSTATUS nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE * { if (!count && timeout && !timeout->QuadPart) return WAIT_TIMEOUT; - return NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), - !!(flags & MWMO_ALERTABLE), timeout ); + if (!user_callbacks) + return NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), + !!(flags & MWMO_ALERTABLE), timeout ); + return user_callbacks->pNtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), + !!(flags & MWMO_ALERTABLE), timeout ); } static void nulldrv_ReleaseDC( HWND hwnd, HDC hdc ) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 931c87a6e1c..e39e3f54169 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -35,6 +35,7 @@ struct user_callbacks BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); + NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); void (CDECL *free_win_ptr)( struct tagWND *win ); HMENU (CDECL *get_sys_menu)( HWND hwnd, HMENU popup ); HWND (CDECL *is_menu_active)(void);

1 0

Jacek Caban : win32u: Introduce NtUserClipboardWindowProc.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: 806d85529f34da0ebcf05fe6b7631849372834d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=806d85529f34da0ebcf05fe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 30 21:43:17 2022 +0200 win32u: Introduce NtUserClipboardWindowProc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/driver.c | 7 +++++++ dlls/win32u/message.c | 2 ++ include/ntuser.h | 5 +++-- include/wine/gdi_driver.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 4dac0760464..b4cea3d42c8 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1099,6 +1099,11 @@ static BOOL loaderdrv_ClipCursor( const RECT *clip ) return load_driver()->pClipCursor( clip ); } +static LRESULT nulldrv_ClipboardWindowProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + return 0; +} + static void loaderdrv_UpdateClipboard(void) { load_driver()->pUpdateClipboard(); @@ -1172,6 +1177,7 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ + nulldrv_ClipboardWindowProc, loaderdrv_UpdateClipboard, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, @@ -1247,6 +1253,7 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(GetCursorPos); SET_USER_FUNC(SetCursorPos); SET_USER_FUNC(ClipCursor); + SET_USER_FUNC(ClipboardWindowProc); SET_USER_FUNC(UpdateClipboard); SET_USER_FUNC(ChangeDisplaySettingsEx); SET_USER_FUNC(EnumDisplaySettingsEx); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6bb9aa455f5..bc6db20d164 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2911,6 +2911,8 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa return send_notify_message( hwnd, msg, wparam, lparam, ansi ); case NtUserSendMessageCallback: return send_message_callback( hwnd, msg, wparam, lparam, (void *)result_info, ansi ); + case NtUserClipboardWindowProc: + return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam ); case NtUserSpyEnter: spy_enter_message( ansi, hwnd, msg, wparam, lparam ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 29de027a334..091d34c3a5f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -189,8 +189,9 @@ enum NtUserSendNotifyMessage = 0x02b7, NtUserSendMessageCallback = 0x02b8, /* Wine-specific exports */ - NtUserSpyEnter = 0x0300, - NtUserSpyExit = 0x0301, + NtUserClipboardWindowProc = 0x0300, + NtUserSpyEnter = 0x0301, + NtUserSpyExit = 0x0302, }; /* NtUserThunkedMenuItemInfo codes */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 21fff4d4aa2..52fd6fe49d3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -291,6 +291,7 @@ struct user_driver_funcs BOOL (*pSetCursorPos)(INT,INT); BOOL (*pClipCursor)(LPCRECT); /* clipboard functions */ + LRESULT (*pClipboardWindowProc)(HWND,UINT,WPARAM,LPARAM); void (*pUpdateClipboard)(void); /* display modes */ LONG (*pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);

1 0

Stefan Dösinger : wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: 32b4aa7b2970e64a19262fafda88d7549a4fba53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b4aa7b2970e64a19262faf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 27 18:25:20 2022 +0300 wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/texture.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 99cb7101aed..6b80fed0c1b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -815,7 +815,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, { struct wined3d_bo_address source, destination; struct wined3d_range range; - void *map_ptr; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; @@ -824,12 +823,21 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, range.size = texture->sub_resources[sub_resource_idx].size; if (current & WINED3D_LOCATION_CLEARED) { + static const struct wined3d_color black; + unsigned int level_idx = sub_resource_idx % texture->level_count; + struct wined3d_map_desc map; + struct wined3d_box box; + + wined3d_texture_get_pitch(texture, level_idx, &map.row_pitch, &map.slice_pitch); if (destination.buffer_object) - map_ptr = wined3d_context_map_bo_address(context, &destination, range.size, + map.data = wined3d_context_map_bo_address(context, &destination, range.size, WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD); else - map_ptr = destination.addr; - memset(map_ptr, 0, range.size); + map.data = destination.addr; + + wined3d_texture_get_level_box(texture, level_idx, &box); + wined3d_resource_memory_colour_fill(&texture->resource, &map, &black, &box, true); + if (destination.buffer_object) wined3d_context_unmap_bo_address(context, &destination, 1, &range); }

1 0

Nikolay Sivov : d2d1: Derive bitmap options from surface description in CreateSharedBitmap().
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: a3273a585aef1b2a8d56f865c0daecabced8f482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3273a585aef1b2a8d56f865… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 10:18:20 2022 +0300 d2d1: Derive bitmap options from surface description in CreateSharedBitmap(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 1 + dlls/d2d1/device.c | 5 ++++- dlls/d2d1/tests/d2d1.c | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 097d984e3ae..cebabbe4a61 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -616,6 +616,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, { memset(&d, 0, sizeof(d)); d.pixelFormat.format = surface_desc.Format; + d.bitmapOptions = d2d_get_bitmap_options_for_surface(surface); } else { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 64b573da974..b7faf33e266 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -405,7 +405,10 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1Devi if (desc) { memcpy(&bitmap_desc, desc, sizeof(*desc)); - bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + if (IsEqualIID(iid, &IID_IDXGISurface) || IsEqualIID(iid, &IID_IDXGISurface1)) + bitmap_desc.bitmapOptions = d2d_get_bitmap_options_for_surface(data); + else + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; bitmap_desc.colorContext = NULL; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 515c14e5adb..5185c07c29b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11772,7 +11772,6 @@ static void test_bitmap_map(BOOL d3d11) hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); options = ID2D1Bitmap1_GetOptions(bitmap); - todo_wine ok(options == (D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ), "Unexpected options %#x.\n", options);

1 0

Nikolay Sivov : d2d1: Validate bitmap options against surface description in CreateBitmapFromDxgiSurface().
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: ab70e9c4f4f43e4af5728286aa72ae88f539f57e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab70e9c4f4f43e4af5728286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 12:52:17 2022 +0300 d2d1: Validate bitmap options against surface description in CreateBitmapFromDxgiSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 56 +++++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 65 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index b7faf33e266..12aa2acc331 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1856,17 +1856,69 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromWicCol return E_NOTIMPL; } +static BOOL d2d_bitmap_check_options_with_surface(unsigned int options, unsigned int surface_options) +{ + switch (options) + { + case D2D1_BITMAP_OPTIONS_NONE: + case D2D1_BITMAP_OPTIONS_TARGET: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE: + case D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ: + case D2D1_BITMAP_OPTIONS_CANNOT_DRAW: + break; + default: + WARN("Invalid bitmap options %#x.\n", options); + return FALSE; + } + + if (options && (options & D2D1_BITMAP_OPTIONS_TARGET) != (surface_options & D2D1_BITMAP_OPTIONS_TARGET)) + return FALSE; + if (options & D2D1_BITMAP_OPTIONS_TARGET) + { + if (!(options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW) && (surface_options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + return FALSE; + if (options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE && !(surface_options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE)) + return FALSE; + return TRUE; + } + + if (options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW) + { + if (!(surface_options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + return FALSE; + + if (options & D2D1_BITMAP_OPTIONS_CPU_READ && !(surface_options & D2D1_BITMAP_OPTIONS_CPU_READ)) + return FALSE; + } + + return TRUE; +} + static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface(ID2D1DeviceContext *iface, IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); D2D1_BITMAP_PROPERTIES1 bitmap_desc; + unsigned int surface_options; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, surface %p, desc %p, bitmap %p.\n", iface, surface, desc, bitmap); - if (!desc) + surface_options = d2d_get_bitmap_options_for_surface(surface); + + if (desc) + { + if (!d2d_bitmap_check_options_with_surface(desc->bitmapOptions, surface_options)) + { + WARN("Incompatible bitmap options %#x, surface options %#x.\n", + desc->bitmapOptions, surface_options); + return E_INVALIDARG; + } + } + else { DXGI_SURFACE_DESC surface_desc; @@ -1879,7 +1931,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( memset(&bitmap_desc, 0, sizeof(bitmap_desc)); bitmap_desc.pixelFormat.format = surface_desc.Format; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; - bitmap_desc.bitmapOptions = d2d_get_bitmap_options_for_surface(surface); + bitmap_desc.bitmapOptions = surface_options; desc = &bitmap_desc; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5185c07c29b..c73039504d3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1213,6 +1213,24 @@ static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx, return TRUE; } +#define check_bitmap_options(b, o) check_bitmap_options_(__LINE__, b, o) +static void check_bitmap_options_(unsigned int line, ID2D1Bitmap *bitmap, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + ID2D1Bitmap1 *bitmap1; + HRESULT hr; + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + if (FAILED(hr)) + return; + + options = ID2D1Bitmap1_GetOptions(bitmap1); + ok_(__FILE__, line)(options == expected_options, "Got unexpected bitmap options %#x, expected %#lx.\n", + options, expected_options); + + ID2D1Bitmap1_Release(bitmap1); +} + #define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL has_surface, DWORD expected_options) { @@ -11605,6 +11623,7 @@ static void test_bitmap_map(BOOL d3d11) }; D2D1_BITMAP_PROPERTIES1 bitmap_desc; D3D11_TEXTURE2D_DESC texture_desc; + ID2D1Bitmap *bitmap2, *bitmap3; struct d2d1_test_context ctx; D2D1_MAPPED_RECT mapped_rect; ID3D11Device *d3d_device; @@ -11612,7 +11631,6 @@ static void test_bitmap_map(BOOL d3d11) unsigned int i, options; IDXGISurface *surface; ID2D1Bitmap1 *bitmap; - ID2D1Bitmap *bitmap2; D2D1_SIZE_U size; HRESULT hr; @@ -11768,14 +11786,13 @@ static void test_bitmap_map(BOOL d3d11) hr = ID2D1DeviceContext_CreateSharedBitmap(ctx.context, &IID_IDXGISurface, surface, (const D2D1_BITMAP_PROPERTIES *)&bitmap_desc, &bitmap2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_bitmap_options(bitmap2, D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ); - hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap); + hr = ID2D1DeviceContext_CreateSharedBitmap(ctx.context, &IID_ID2D1Bitmap, bitmap2, NULL, &bitmap3); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - options = ID2D1Bitmap1_GetOptions(bitmap); - ok(options == (D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ), - "Unexpected options %#x.\n", options); + check_bitmap_options(bitmap3, D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ); + ID2D1Bitmap_Release(bitmap3); - ID2D1Bitmap1_Release(bitmap); ID2D1Bitmap_Release(bitmap2); hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, NULL, &bitmap); @@ -11788,9 +11805,7 @@ static void test_bitmap_map(BOOL d3d11) /* Options incompatible with the surface. */ bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); todo_wine @@ -11798,9 +11813,7 @@ static void test_bitmap_map(BOOL d3d11) if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); /* Create without D2D1_BITMAP_OPTIONS_CPU_READ, surface supports CPU reads. */ bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW; @@ -11813,6 +11826,38 @@ static void test_bitmap_map(BOOL d3d11) ID3D11Texture2D_Release(texture); IDXGISurface_Release(surface); + /* Surface D2D1_BITMAP_OPTIONS_TARGET */ + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_TARGET; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = 0; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_bitmap_options((ID2D1Bitmap *)bitmap, 0); + ID2D1Bitmap1_Release(bitmap); + + ID3D11Texture2D_Release(texture); + IDXGISurface_Release(surface); + ID3D11Device_Release(d3d_device); release_test_context(&ctx);

1 0

Jinoh Kang : ntdll/tests: Add tests for __fastfail().
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: 7fbe8b8ebfa0d13dd318fd1d3beaf04872a47ed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fbe8b8ebfa0d13dd318fd1d… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Dec 8 03:14:06 2021 +0900 ntdll/tests: Add tests for __fastfail(). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/exception.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 14ffdb00d78..0086b18d678 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8417,6 +8417,91 @@ static void test_ripevent(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static void subtest_fastfail(unsigned int code) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + DEBUG_EVENT de; + DWORD continuestatus; + BOOL ret; + BOOL had_ff = FALSE, had_se = FALSE; + + sprintf(cmdline, "%s %s %s %u", my_argv[0], my_argv[1], "fastfail", code); + si.cb = sizeof(si); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "could not create child process error: %lu\n", GetLastError()); + if (!ret) + return; + + do + { + continuestatus = DBG_CONTINUE; + ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); + + if (de.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) + { + if (de.u.Exception.ExceptionRecord.ExceptionCode == STATUS_STACK_BUFFER_OVERRUN) + { + ok(!de.u.Exception.dwFirstChance, "must be a second chance exception\n"); + ok(de.u.Exception.ExceptionRecord.NumberParameters == 1, "expected exactly one parameter, got %lu\n", + de.u.Exception.ExceptionRecord.NumberParameters); + ok(de.u.Exception.ExceptionRecord.ExceptionInformation[0] == code, "expected %u for code, got %Iu\n", + code, de.u.Exception.ExceptionRecord.ExceptionInformation[0]); + had_ff = TRUE; + } + + if (de.u.Exception.dwFirstChance) + { + continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else + { + had_se = TRUE; + pNtTerminateProcess(pi.hProcess, 0); + } + } + + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); + + } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); + + todo_wine + ok(had_ff || broken(had_se) /* Win7 */, "fast fail did not occur\n"); + + wait_child_process( pi.hProcess ); + ret = CloseHandle(pi.hThread); + ok(ret, "error %lu\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "error %lu\n", GetLastError()); + + return; +} + +static void test_fastfail(void) +{ + unsigned int codes[] = { + FAST_FAIL_LEGACY_GS_VIOLATION, + FAST_FAIL_VTGUARD_CHECK_FAILURE, + FAST_FAIL_STACK_COOKIE_CHECK_FAILURE, + FAST_FAIL_CORRUPT_LIST_ENTRY, + FAST_FAIL_INCORRECT_STACK, + FAST_FAIL_INVALID_ARG, + FAST_FAIL_GS_COOKIE_INIT, + FAST_FAIL_FATAL_APP_EXIT, + FAST_FAIL_INVALID_FAST_FAIL_CODE, + 0xdeadbeefUL, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(codes); i++) + { + winetest_push_context("__fastfail(%#x)", codes[i]); + subtest_fastfail(codes[i]); + winetest_pop_context(); + } +} + static DWORD breakpoint_exceptions; static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -10664,6 +10749,13 @@ START_TEST(exception) if (my_argc >= 4) { void *addr; + + if (strcmp(my_argv[2], "fastfail") == 0) + { + __fastfail(strtoul(my_argv[3], NULL, 0)); + return; + } + sscanf( my_argv[3], "%p", &addr ); if (addr != &test_stage) @@ -10811,6 +10903,7 @@ START_TEST(exception) test_thread_context(); test_outputdebugstring(1, FALSE); test_ripevent(1); + test_fastfail(); test_breakpoint(1); test_closehandle(0, (HANDLE)0xdeadbeef); /* Call of Duty WWII writes to BeingDebugged then closes an invalid handle,

1 0

Jinoh Kang : include: Define fast fail codes and the __fastfail() intrinsic.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: 253a2e2edb618371d7ab63e7c406134f1342e2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=253a2e2edb618371d7ab63e7… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Dec 8 03:12:41 2021 +0900 include: Define fast fail codes and the __fastfail() intrinsic. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 7aafbcf0cfe..87c4b4da92d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -934,6 +934,78 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 @@ -6318,6 +6390,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedDecrement16) #pragma intrinsic(_InterlockedOr) #pragma intrinsic(_InterlockedXor) +#pragma intrinsic(__fastfail) BOOLEAN _BitScanForward(unsigned long*,unsigned long); BOOLEAN _BitScanReverse(unsigned long*,unsigned long); @@ -6332,6 +6405,7 @@ long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); long _InterlockedXor(long volatile *,long); +DECLSPEC_NORETURN void __fastfail(unsigned int); static FORCEINLINE long InterlockedAdd( long volatile *dest, long val ) { @@ -6514,6 +6588,19 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ +#if defined(__x86_64__) || defined(__i386__) + for (;;) __asm__ __volatile__( "int $0x29" :: "c" ((ULONG_PTR)code) : "memory" ); +#elif defined(__aarch64__) + register ULONG_PTR val __asm__("x0") = code; + for (;;) __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#elif defined(__arm__) + register ULONG_PTR val __asm__("r0") = code; + for (;;) __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#endif +} + #endif /* __GNUC__ */ #ifdef _WIN64

1 0

Rémi Bernon : ntdll: Merge common resize case in heap_realloc.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: 75b78517ceebaf33d09b03323bab87c2085ad09a URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b78517ceebaf33d09b0332… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 22:26:48 2022 +0200 ntdll: Merge common resize case in heap_realloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4050c00c265..0102ba3ea42 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1609,8 +1609,6 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size list_remove( &entry->entry ); old_block_size += block_get_size( next ); if (!subheap_commit( subheap, block, block_size )) return STATUS_NO_MEMORY; - valgrind_notify_resize( block + 1, old_size, size ); - shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); } else { @@ -1624,13 +1622,9 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size return STATUS_SUCCESS; } } - else - { - valgrind_notify_resize( block + 1, old_size, size ); - shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); - } - /* Clear the extra bytes if needed */ + valgrind_notify_resize( block + 1, old_size, size ); + shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); if (size <= old_size) mark_block_tail( (char *)(block + 1) + size, block->unused_bytes, flags ); else initialize_block( (char *)(block + 1) + old_size, size - old_size, block->unused_bytes, flags );

1 0

Alexandre Julliard : make_unicode: Get rid of the old collation table.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: 66fb3bf63134647f4ca4d326ea8b857da868e8f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66fb3bf63134647f4ca4d326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 22:41:06 2022 +0200 make_unicode: Get rid of the old collation table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 - dlls/kernelbase/collation.c | 1393 ------------------------------------------- tools/make_unicode | 105 ---- 3 files changed, 1499 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66fb3bf63134647f4ca4…

1 0

Alex Henrie : ntoskrnl: Add KfRaiseIrql stub.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: ddca4eb838f1564734dd9c1d2e42fc67e8e20c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddca4eb838f1564734dd9c1d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 30 17:13:59 2022 -0600 ntoskrnl: Add KfRaiseIrql stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53076 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0994af447f9..556b683e8f4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4455,6 +4455,15 @@ NTSTATUS WINAPI KdEnableDebugger(void) return STATUS_DEBUGGER_INACTIVE; } +#ifdef __x86_64__ + +void WINAPI KfRaiseIrql(KIRQL new, KIRQL *old) +{ + FIXME("new %u old %p: stub.\n", new, old); +} + +#endif + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4df6b1ae472..84f4a3feec3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -659,6 +659,7 @@ @ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) @ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) +@ stdcall -arch=x86_64 KfRaiseIrql(long ptr) @ stub KiBugCheckData @ stub KiCoprocessorError @ stub KiDeliverApc

1 0