December 2021 - Wine-Devel - list.winehq.org

[PATCH 1/8] winegstreamer: Use a 64-bit handle type for struct wg_parser.
by Zebediah Figura Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 22 ++++++------- dlls/winegstreamer/main.c | 50 +++++++++++++++++++++--------- dlls/winegstreamer/media_source.c | 4 +-- dlls/winegstreamer/quartz_parser.c | 10 +++--- dlls/winegstreamer/unixlib.h | 34 ++++++++++++++++---- dlls/winegstreamer/wg_parser.c | 38 +++++++++++++++++------ dlls/winegstreamer/wm_reader.c | 6 ++-- 7 files changed, 112 insertions(+), 52 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9e1d67417d4..340712eefe1 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -64,20 +64,20 @@ static inline const char *debugstr_time(REFERENCE_TIME time) #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; -void wg_parser_destroy(struct wg_parser *parser) DECLSPEC_HIDDEN; +wg_parser_t wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; +void wg_parser_destroy(wg_parser_t parser) DECLSPEC_HIDDEN; -HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) DECLSPEC_HIDDEN; -void wg_parser_disconnect(struct wg_parser *parser) DECLSPEC_HIDDEN; +HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size) DECLSPEC_HIDDEN; +void wg_parser_disconnect(wg_parser_t parser) DECLSPEC_HIDDEN; -void wg_parser_begin_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; -void wg_parser_end_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; +void wg_parser_begin_flush(wg_parser_t parser) DECLSPEC_HIDDEN; +void wg_parser_end_flush(wg_parser_t parser) DECLSPEC_HIDDEN; -bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size) DECLSPEC_HIDDEN; -void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) DECLSPEC_HIDDEN; +bool wg_parser_get_next_read_offset(wg_parser_t parser, uint64_t *offset, uint32_t *size) DECLSPEC_HIDDEN; +void wg_parser_push_data(wg_parser_t parser, const void *data, uint32_t size) DECLSPEC_HIDDEN; -uint32_t wg_parser_get_stream_count(struct wg_parser *parser) DECLSPEC_HIDDEN; -struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index) DECLSPEC_HIDDEN; +uint32_t wg_parser_get_stream_count(wg_parser_t parser) DECLSPEC_HIDDEN; +struct wg_parser_stream *wg_parser_get_stream(wg_parser_t parser, uint32_t index) DECLSPEC_HIDDEN; void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) DECLSPEC_HIDDEN; void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) DECLSPEC_HIDDEN; @@ -152,7 +152,7 @@ struct wm_reader HANDLE file; HANDLE read_thread; bool read_thread_shutdown; - struct wg_parser *wg_parser; + wg_parser_t wg_parser; struct wm_stream *streams; WORD stream_count; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index ac9a3201792..23c11d883c9 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -60,7 +60,7 @@ bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) return TRUE; } -struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) +wg_parser_t wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) { struct wg_parser_create_params params = { @@ -69,16 +69,21 @@ struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buff }; if (__wine_unix_call(unix_handle, unix_wg_parser_create, &params)) - return NULL; + return 0; return params.parser; } -void wg_parser_destroy(struct wg_parser *parser) +void wg_parser_destroy(wg_parser_t parser) { - __wine_unix_call(unix_handle, unix_wg_parser_destroy, parser); + struct wg_parser_destroy_params params = + { + .parser = parser, + }; + + __wine_unix_call(unix_handle, unix_wg_parser_destroy, &params); } -HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) +HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size) { struct wg_parser_connect_params params = { @@ -89,22 +94,37 @@ HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) return __wine_unix_call(unix_handle, unix_wg_parser_connect, &params); } -void wg_parser_disconnect(struct wg_parser *parser) +void wg_parser_disconnect(wg_parser_t parser) { - __wine_unix_call(unix_handle, unix_wg_parser_disconnect, parser); + struct wg_parser_disconnect_params params = + { + .parser = parser, + }; + + __wine_unix_call(unix_handle, unix_wg_parser_disconnect, &params); } -void wg_parser_begin_flush(struct wg_parser *parser) +void wg_parser_begin_flush(wg_parser_t parser) { - __wine_unix_call(unix_handle, unix_wg_parser_begin_flush, parser); + struct wg_parser_begin_flush_params params = + { + .parser = parser, + }; + + __wine_unix_call(unix_handle, unix_wg_parser_begin_flush, &params); } -void wg_parser_end_flush(struct wg_parser *parser) +void wg_parser_end_flush(wg_parser_t parser) { - __wine_unix_call(unix_handle, unix_wg_parser_end_flush, parser); + struct wg_parser_end_flush_params params = + { + .parser = parser, + }; + + __wine_unix_call(unix_handle, unix_wg_parser_end_flush, &params); } -bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size) +bool wg_parser_get_next_read_offset(wg_parser_t parser, uint64_t *offset, uint32_t *size) { struct wg_parser_get_next_read_offset_params params = { @@ -118,7 +138,7 @@ bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, return true; } -void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) +void wg_parser_push_data(wg_parser_t parser, const void *data, uint32_t size) { struct wg_parser_push_data_params params = { @@ -130,7 +150,7 @@ void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t si __wine_unix_call(unix_handle, unix_wg_parser_push_data, &params); } -uint32_t wg_parser_get_stream_count(struct wg_parser *parser) +uint32_t wg_parser_get_stream_count(wg_parser_t parser) { struct wg_parser_get_stream_count_params params = { @@ -141,7 +161,7 @@ uint32_t wg_parser_get_stream_count(struct wg_parser *parser) return params.count; } -struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index) +struct wg_parser_stream *wg_parser_get_stream(wg_parser_t parser, uint32_t index) { struct wg_parser_get_stream_params params = { diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 6ecd345cb73..c31c573b381 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -92,7 +92,7 @@ struct media_source IMFMediaEventQueue *event_queue; IMFByteStream *byte_stream; - struct wg_parser *wg_parser; + wg_parser_t wg_parser; struct media_stream **streams; ULONG stream_count; @@ -1393,8 +1393,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ unsigned int stream_count = UINT_MAX; struct media_source *object; UINT64 total_pres_time = 0; - struct wg_parser *parser; DWORD bytestream_caps; + wg_parser_t parser; uint64_t file_size; unsigned int i; HRESULT hr; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index cf284cda668..29adece3a38 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -50,7 +50,7 @@ struct parser unsigned int source_count; BOOL enum_sink_first; - struct wg_parser *wg_parser; + wg_parser_t wg_parser; /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a @@ -1086,7 +1086,7 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_filter_init_gst(struct parser *filter) { - struct wg_parser *parser = filter->wg_parser; + wg_parser_t parser = filter->wg_parser; unsigned int i, stream_count; WCHAR source_name[20]; @@ -1659,7 +1659,7 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = static BOOL wave_parser_filter_init_gst(struct parser *filter) { - struct wg_parser *parser = filter->wg_parser; + wg_parser_t parser = filter->wg_parser; if (!create_pin(filter, wg_parser_get_stream(parser, 0), L"output")) return FALSE; @@ -1738,7 +1738,7 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_filter_init_gst(struct parser *filter) { - struct wg_parser *parser = filter->wg_parser; + wg_parser_t parser = filter->wg_parser; uint32_t i, stream_count; WCHAR source_name[20]; @@ -1829,7 +1829,7 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) { - struct wg_parser *parser = filter->wg_parser; + wg_parser_t parser = filter->wg_parser; if (!create_pin(filter, wg_parser_get_stream(parser, 0), L"Audio")) return FALSE; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 90101893541..b6fcfc26d6a 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -30,6 +30,8 @@ #include "wine/unixlib.h" +typedef UINT64 wg_parser_t; + struct wg_format { enum wg_major_type @@ -130,40 +132,60 @@ enum wg_parser_type struct wg_parser_create_params { - struct wg_parser *parser; + wg_parser_t parser; enum wg_parser_type type; bool unlimited_buffering; }; +struct wg_parser_destroy_params +{ + wg_parser_t parser; +}; + struct wg_parser_connect_params { - struct wg_parser *parser; + wg_parser_t parser; UINT64 file_size; }; +struct wg_parser_disconnect_params +{ + wg_parser_t parser; +}; + +struct wg_parser_begin_flush_params +{ + wg_parser_t parser; +}; + +struct wg_parser_end_flush_params +{ + wg_parser_t parser; +}; + struct wg_parser_get_next_read_offset_params { - struct wg_parser *parser; + wg_parser_t parser; UINT32 size; UINT64 offset; }; struct wg_parser_push_data_params { - struct wg_parser *parser; + wg_parser_t parser; const void *data; UINT32 size; }; struct wg_parser_get_stream_count_params { - struct wg_parser *parser; + wg_parser_t parser; UINT32 count; }; struct wg_parser_get_stream_params { - struct wg_parser *parser; + wg_parser_t parser; UINT32 index; struct wg_parser_stream *stream; }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index c3c9051a174..9c0bfd0a8d2 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -54,6 +54,8 @@ typedef enum GST_DEBUG_CATEGORY_STATIC(wine); #define GST_CAT_DEFAULT wine +struct wg_parser; + typedef BOOL (*init_gst_cb)(struct wg_parser *parser); struct wg_parser @@ -111,6 +113,16 @@ struct wg_parser_stream uint64_t duration; }; +static struct wg_parser *get_wg_parser(wg_parser_t handle) +{ + return (struct wg_parser *)(uintptr_t)handle; +} + +static wg_parser_t wg_parser_get_handle(struct wg_parser *parser) +{ + return (uintptr_t)parser; +} + static enum wg_audio_format wg_audio_format_from_gst(GstAudioFormat format) { switch (format) @@ -507,22 +519,25 @@ static bool wg_format_compare(const struct wg_format *a, const struct wg_format static NTSTATUS wg_parser_get_stream_count(void *args) { struct wg_parser_get_stream_count_params *params = args; + struct wg_parser *parser = get_wg_parser(params->parser); - params->count = params->parser->stream_count; + params->count = parser->stream_count; return S_OK; } static NTSTATUS wg_parser_get_stream(void *args) { struct wg_parser_get_stream_params *params = args; + struct wg_parser *parser = get_wg_parser(params->parser); - params->stream = params->parser->streams[params->index]; + params->stream = parser->streams[params->index]; return S_OK; } static NTSTATUS wg_parser_begin_flush(void *args) { - struct wg_parser *parser = args; + const struct wg_parser_begin_flush_params *params = args; + struct wg_parser *parser = get_wg_parser(params->parser); unsigned int i; pthread_mutex_lock(&parser->mutex); @@ -540,7 +555,8 @@ static NTSTATUS wg_parser_begin_flush(void *args) static NTSTATUS wg_parser_end_flush(void *args) { - struct wg_parser *parser = args; + const struct wg_parser_end_flush_params *params = args; + struct wg_parser *parser = get_wg_parser(params->parser); pthread_mutex_lock(&parser->mutex); parser->flushing = false; @@ -552,7 +568,7 @@ static NTSTATUS wg_parser_end_flush(void *args) static NTSTATUS wg_parser_get_next_read_offset(void *args) { struct wg_parser_get_next_read_offset_params *params = args; - struct wg_parser *parser = params->parser; + struct wg_parser *parser = get_wg_parser(params->parser); pthread_mutex_lock(&parser->mutex); @@ -575,7 +591,7 @@ static NTSTATUS wg_parser_get_next_read_offset(void *args) static NTSTATUS wg_parser_push_data(void *args) { const struct wg_parser_push_data_params *params = args; - struct wg_parser *parser = params->parser; + struct wg_parser *parser = get_wg_parser(params->parser); const void *data = params->data; uint32_t size = params->size; @@ -1598,7 +1614,7 @@ static NTSTATUS wg_parser_connect(void *args) GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); const struct wg_parser_connect_params *params = args; - struct wg_parser *parser = params->parser; + struct wg_parser *parser = get_wg_parser(params->parser); unsigned int i; int ret; @@ -1754,7 +1770,8 @@ out: static NTSTATUS wg_parser_disconnect(void *args) { - struct wg_parser *parser = args; + const struct wg_parser_disconnect_params *params = args; + struct wg_parser *parser = get_wg_parser(params->parser); unsigned int i; /* Unblock all of our streams. */ @@ -1978,13 +1995,14 @@ static NTSTATUS wg_parser_create(void *args) parser->unlimited_buffering = params->unlimited_buffering; GST_DEBUG("Created winegstreamer parser %p.\n", parser); - params->parser = parser; + params->parser = wg_parser_get_handle(parser); return S_OK; } static NTSTATUS wg_parser_destroy(void *args) { - struct wg_parser *parser = args; + const struct wg_parser_destroy_params *params = args; + struct wg_parser *parser = get_wg_parser(params->parser); if (parser->bus) { diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..d5649f4ba9a 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1451,7 +1451,7 @@ static const IWMReaderTimecodeVtbl timecode_vtbl = static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) { - struct wg_parser *wg_parser; + wg_parser_t wg_parser; HRESULT hr; WORD i; @@ -1529,7 +1529,7 @@ out_shutdown_thread: out_destroy_parser: wg_parser_destroy(reader->wg_parser); - reader->wg_parser = NULL; + reader->wg_parser = 0; return hr; } @@ -1611,7 +1611,7 @@ HRESULT wm_reader_close(struct wm_reader *reader) reader->callback_advanced = NULL; wg_parser_destroy(reader->wg_parser); - reader->wg_parser = NULL; + reader->wg_parser = 0; if (reader->source_stream) IStream_Release(reader->source_stream); -- 2.34.1

1 7

[PATCH v2 1/3] win32u/tests: Add tests for NtUserEnumDisplayDevices return value.
by Torge Matthies Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/win32u/tests/win32u.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index a7c2e5ef029..f225a7893d2 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -16,12 +16,47 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include "wine/test.h" #include "winbase.h" #include "ntuser.h" +static void test_NtUserEnumDisplayDevices(void) +{ + NTSTATUS ret; + DISPLAY_DEVICEW info = { sizeof(DISPLAY_DEVICEW) }; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( !ret && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + info.cb = 0; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); +} + static void test_NtUserCloseWindowStation(void) { BOOL ret; @@ -67,6 +102,7 @@ START_TEST(win32u) /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ GetDesktopWindow(); + test_NtUserEnumDisplayDevices(); /* Must run before test_NtUserCloseWindowStation. */ test_NtUserCloseWindowStation(); test_window_props(); } -- 2.34.1

2 5

[PATCH v2] ntdll/tests: Fix the spelling of a comment.
by Francois Gouget Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index 09b9bcc8497..f381f64dbfe 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -99,7 +99,7 @@ static void test_dbg_hidden_thread_creation(void) NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED ); ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); - /* NtCreateUserProcess() may return STATUS_INVALID_PARAMATER with some unitialized data in create_info. */ + /* NtCreateUserProcess() may return STATUS_INVALID_PARAMETER with some uninitialized data in create_info. */ memset( &create_info, 0, sizeof(create_info) ); create_info.Size = sizeof(create_info); -- 2.30.2

1 0

[PATCH] quartz: Fix a race in IMediaFilter::Pause().
by Akihiro Sagawa Dec. 10, 2021

Dec. 10, 2021

Before finishing async run, graph->stream_start isn't stable. This will cause graph->current_pos to be out of playback duration. Since graph->current_pos is out of the range, the playback will be stopped. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52200 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] d2d1: Create feature level 10.0 device context state objects.
by Henri Verbeet Dec. 10, 2021

Dec. 10, 2021

Commit 8c9354926204242cde714a51e5283bc3aac55837 introduced a feature level 11.0 requirement for Direct2D, but that was unintentional. We want Direct2D to be usable with feature level 10.0 hardware, and don't actually require any feature level 11.0 features. This issue was pointed out by Matteo Bruni. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 2069eeda0fc..e6b6f9efbea 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -3863,7 +3863,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { 1.0f, -1.0f}, }; static const UINT16 indices[] = {0, 1, 2, 2, 1, 3}; - static const D3D_FEATURE_LEVEL feature_levels = D3D_FEATURE_LEVEL_11_0; + static const D3D_FEATURE_LEVEL feature_levels = D3D_FEATURE_LEVEL_10_0; render_target->ID2D1DeviceContext_iface.lpVtbl = &d2d_device_context_vtbl; render_target->ID2D1GdiInteropRenderTarget_iface.lpVtbl = &d2d_gdi_interop_render_target_vtbl; -- 2.30.2

2 1

[PATCH] d3dx10/tests: Remove crashing tests.
by Nikolay Sivov Dec. 10, 2021

Dec. 10, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51827 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This is crashing with d3dx10_34, it's easier to remove for now. dlls/d3dx10_43/tests/d3dx10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 55a4d057fdf..89a43355756 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2466,12 +2466,11 @@ todo_wine hr = ID3DX10Font_PreloadCharacters(font, 'a', 'z'); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Test multiple textures */ - hr = ID3DX10Font_PreloadGlyphs(font, 0, 1000); + /* Test glyphs that are not rendered */ + hr = ID3DX10Font_PreloadGlyphs(font, 0, 5); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Test glyphs that are not rendered */ for (glyph = 1; glyph < 4; ++glyph) { srv = (void *)0xdeadbeef; -- 2.33.0

2 1

[PATCH 1/2] d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER.
by Zebediah Figura Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 5 +++++ dlls/d3d11/tests/d3d11.c | 9 +++++++-- dlls/wined3d/directx.c | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8f70d823247..098dbd449b7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3747,6 +3747,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * flag_mapping[] = { {WINED3D_RTYPE_BUFFER, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER}, + {WINED3D_RTYPE_BUFFER, WINED3D_BIND_VERTEX_BUFFER, 0, D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, @@ -3794,7 +3795,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * wined3d_mutex_unlock(); if (feature_level < D3D_FEATURE_LEVEL_10_0) + { *format_support &= ~D3D11_FORMAT_SUPPORT_BUFFER; + if (format == DXGI_FORMAT_R8G8_UINT || format == DXGI_FORMAT_R16_FLOAT) + *format_support &= ~D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER; + } if (*format_support & (D3D11_FORMAT_SUPPORT_TEXTURE1D | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D)) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f59e9e99f1f..a9373b6c624 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20699,8 +20699,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - todo_wine ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", - format, feature_name, feature_level, format_support[format]); + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); continue; } @@ -34163,6 +34164,10 @@ START_TEST(d3d11) print_adapter_info(); + queue_for_each_feature_level(test_format_support); + run_queued_tests(); + return; + queue_test(test_create_device); queue_for_each_feature_level(test_device_interfaces); queue_test(test_immediate_context); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b2925eb97e9..334a520072d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1821,7 +1821,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, allowed_usage = WINED3DUSAGE_DYNAMIC; allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE - | WINED3D_BIND_UNORDERED_ACCESS; + | WINED3D_BIND_UNORDERED_ACCESS + | WINED3D_BIND_VERTEX_BUFFER; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; break; @@ -1853,6 +1854,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + format_flags |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; + if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) -- 2.34.1

2 6

[PATCH v2 1/5] winevulkan: Support prefixing function parameters.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: make remaining direct calls more similar to __wine_unix_call dlls/winevulkan/make_vulkan | 59 ++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 27 deletions(-)

7 26

[PATCH v3 4/4] winevulkan: Use __wine_unix_call interface for some Vulkan functions.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 4 ++-- dlls/winevulkan/make_vulkan | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-)

1 0

[PATCH v3 3/4] winevulkan: Make Vulkan direct Unix calls more similar to __wine_unix_call interface.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 10 ++--- dlls/winevulkan/make_vulkan | 59 +++++++++++++-------------- dlls/winevulkan/vulkan.c | 70 ++++++++++++++++----------------- dlls/winevulkan/vulkan_loader.h | 7 ++++ 4 files changed, 74 insertions(+), 72 deletions(-)

1 0