February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Move the EOS handling from read_buffer() to the Unix library.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 491945ee419542587a6990435849d12d7aa7306c URL: https://source.winehq.org/git/wine.git/?a=commit;h=491945ee419542587a699043… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 17:30:33 2021 -0600 winegstreamer: Move the EOS handling from read_buffer() to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 -------- dlls/winegstreamer/wg_parser.c | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a4164ab643b..53977ed52c4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -794,14 +794,6 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs TRACE("filter %p, offset %s, length %u, buffer %p.\n", This, wine_dbgstr_longlong(ofs), len, buffer); - if (ofs >= This->file_size) - { - WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len); - return GST_FLOW_EOS; - } - if (len + ofs > This->file_size) - len = This->file_size - ofs; - gst_buffer_map(buffer, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); gst_buffer_unmap(buffer, &info); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f2f878ffabc..9fb3c4383fc 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -992,6 +992,10 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 if (offset == GST_BUFFER_OFFSET_NONE) offset = parser->next_pull_offset; parser->next_pull_offset = offset + size; + if (offset >= parser->file_size) + return GST_FLOW_EOS; + if (offset + size >= parser->file_size) + size = parser->file_size - offset; if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size);

1 0

Zebediah Figura : winegstreamer: Map the read buffer in the Unix library.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 9a6aa56cd83b6948bfe12e6446132a7d20fa5a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6aa56cd83b6948bfe12e64… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 17:30:34 2021 -0600 winegstreamer: Map the read buffer in the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 8 ++++---- dlls/winegstreamer/gstdemux.c | 29 +++++------------------------ dlls/winegstreamer/wg_parser.c | 27 ++++++++++++++++----------- 3 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 2ac10ee37d3..31fca81ce6c 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -157,11 +157,11 @@ struct wg_parser pthread_cond_t read_cond, read_done_cond; struct { - GstBuffer *buffer; + void *data; uint64_t offset; uint32_t size; bool done; - GstFlowReturn ret; + bool ret; } read_request; bool flushing, sink_connected; @@ -228,8 +228,8 @@ struct unix_funcs void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); bool (CDECL *wg_parser_get_read_request)(struct wg_parser *parser, - GstBuffer **buffer, uint64_t *offset, uint32_t *size); - void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, GstFlowReturn ret); + void **data, uint64_t *offset, uint32_t *size); + void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, bool ret); uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 53977ed52c4..ab901a34843 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -787,25 +787,6 @@ static DWORD CALLBACK stream_thread(void *arg) return 0; } -static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, GstBuffer *buffer) -{ - HRESULT hr; - GstMapInfo info; - - TRACE("filter %p, offset %s, length %u, buffer %p.\n", This, wine_dbgstr_longlong(ofs), len, buffer); - - gst_buffer_map(buffer, &info, GST_MAP_WRITE); - hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); - gst_buffer_unmap(buffer, &info); - if (FAILED(hr)) - { - ERR("Failed to read data, hr %#x.\n", hr); - return GST_FLOW_ERROR; - } - - return GST_FLOW_OK; -} - static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; @@ -814,15 +795,15 @@ static DWORD CALLBACK read_thread(void *arg) while (filter->sink_connected) { - GstBuffer *buffer; uint64_t offset; uint32_t size; + HRESULT hr; + void *data; - if (!unix_funcs->wg_parser_get_read_request(filter->wg_parser, &buffer, &offset, &size)) + if (!unix_funcs->wg_parser_get_read_request(filter->wg_parser, &data, &offset, &size)) continue; - - unix_funcs->wg_parser_complete_read_request(filter->wg_parser, - read_buffer(filter, offset, size, buffer)); + hr = IAsyncReader_SyncRead(filter->reader, offset, size, data); + unix_funcs->wg_parser_complete_read_request(filter->wg_parser, SUCCEEDED(hr)); } TRACE("Streaming stopped; exiting.\n"); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 9fb3c4383fc..ccd60853007 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -350,11 +350,11 @@ static void CDECL wg_parser_end_flush(struct wg_parser *parser) } static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, - GstBuffer **buffer, uint64_t *offset, uint32_t *size) + void **data, uint64_t *offset, uint32_t *size) { pthread_mutex_lock(&parser->mutex); - while (parser->sink_connected && !parser->read_request.buffer) + while (parser->sink_connected && !parser->read_request.data) pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) @@ -363,7 +363,7 @@ static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, return false; } - *buffer = parser->read_request.buffer; + *data = parser->read_request.data; *offset = parser->read_request.offset; *size = parser->read_request.size; @@ -371,12 +371,12 @@ static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, return true; } -static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, GstFlowReturn ret) +static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, bool ret) { pthread_mutex_lock(&parser->mutex); parser->read_request.done = true; parser->read_request.ret = ret; - parser->read_request.buffer = NULL; + parser->read_request.data = NULL; pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_done_cond); } @@ -985,7 +985,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 { struct wg_parser *parser = gst_pad_get_element_private(pad); GstBuffer *new_buffer = NULL; - GstFlowReturn ret; + GstMapInfo map_info; + bool ret; GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); @@ -1000,10 +1001,12 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); + gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); + pthread_mutex_lock(&parser->mutex); - assert(!parser->read_request.buffer); - parser->read_request.buffer = *buffer; + assert(!parser->read_request.data); + parser->read_request.data = map_info.data; parser->read_request.offset = offset; parser->read_request.size = size; parser->read_request.done = false; @@ -1020,12 +1023,14 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 pthread_mutex_unlock(&parser->mutex); - GST_LOG("Request returned %s.", gst_flow_get_name(ret)); + gst_buffer_unmap(*buffer, &map_info); - if (ret != GST_FLOW_OK && new_buffer) + GST_LOG("Request returned %d.", ret); + + if (!ret && new_buffer) gst_buffer_unref(new_buffer); - return ret; + return ret ? GST_FLOW_OK : GST_FLOW_ERROR; } static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query)

1 0

Zebediah Figura : winegstreamer: Access the stream duration through a Unix library function.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 82d4fa9f969217229a0926ceb4c7b4ad62329539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82d4fa9f969217229a0926ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 17:30:35 2021 -0600 winegstreamer: Access the stream duration through a Unix library function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/gstdemux.c | 2 +- dlls/winegstreamer/wg_parser.c | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 31fca81ce6c..e90de8803e5 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -245,6 +245,8 @@ struct unix_funcs void (CDECL *wg_parser_stream_notify_qos)(struct wg_parser_stream *stream, bool underflow, double proportion, int64_t diff, uint64_t timestamp); + /* Returns the duration in 100-nanosecond units. */ + uint64_t (CDECL *wg_parser_stream_get_duration)(struct wg_parser_stream *stream); /* start_pos and stop_pos are in 100-nanosecond units. */ bool (CDECL *wg_parser_stream_seek)(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ab901a34843..3bea994521b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -977,7 +977,7 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons { struct parser_source *pin = filter->sources[i]; - pin->seek.llDuration = pin->seek.llStop = pin->wg_stream->duration; + pin->seek.llDuration = pin->seek.llStop = unix_funcs->wg_parser_stream_get_duration(pin->wg_stream); pin->seek.llCurrent = 0; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index ccd60853007..5d10ddf753c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -492,6 +492,11 @@ static void CDECL wg_parser_stream_release_buffer(struct wg_parser_stream *strea pthread_cond_signal(&stream->event_empty_cond); } +static uint64_t CDECL wg_parser_stream_get_duration(struct wg_parser_stream *stream) +{ + return stream->duration; +} + static bool CDECL wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) { @@ -1724,6 +1729,7 @@ static const struct unix_funcs funcs = wg_parser_stream_release_buffer, wg_parser_stream_notify_qos, + wg_parser_stream_get_duration, wg_parser_stream_seek, };

1 0

Zebediah Figura : winegstreamer: Avoid accessing "parser->container" from gstdemux.c.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 13ca10669336b1d137071283ef02d222d5aba3b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ca10669336b1d137071283… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 17:30:36 2021 -0600 winegstreamer: Avoid accessing "parser->container" from gstdemux.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3bea994521b..d85bb02160e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -864,12 +864,11 @@ static void parser_destroy(struct strmbase_filter *iface) static HRESULT parser_init_stream(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); - struct wg_parser *parser = filter->wg_parser; DWORD stop_flags = AM_SEEKING_NoPositioning; const SourceSeeking *seeking; unsigned int i; - if (!parser->container) + if (!filter->sink_connected) return S_OK; filter->streaming = true; @@ -903,10 +902,9 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); - struct wg_parser *parser = filter->wg_parser; unsigned int i; - if (!parser->container) + if (!filter->sink_connected) return S_OK; filter->streaming = false;

1 0

Zebediah Figura : winegstreamer: Move the wg_parser and wg_parser_stream definitions to wg_parser.c.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 51f1ab47a72e698dfb4753620a7ce6463943601d URL: https://source.winehq.org/git/wine.git/?a=commit;h=51f1ab47a72e698dfb475362… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 17:30:37 2021 -0600 winegstreamer: Move the wg_parser and wg_parser_stream definitions to wg_parser.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 52 ---------------------------------------- dlls/winegstreamer/wg_parser.c | 52 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e90de8803e5..75025fdf7d5 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -133,40 +133,6 @@ struct wg_format } u; }; -struct wg_parser -{ - BOOL (*init_gst)(struct wg_parser *parser); - - struct wg_parser_stream **streams; - unsigned int stream_count; - - GstElement *container; - GstBus *bus; - GstPad *my_src, *their_sink; - - guint64 file_size, start_offset, next_offset, stop_offset; - guint64 next_pull_offset; - - pthread_t push_thread; - - pthread_mutex_t mutex; - - pthread_cond_t init_cond; - bool no_more_pads, has_duration, error; - - pthread_cond_t read_cond, read_done_cond; - struct - { - void *data; - uint64_t offset; - uint32_t size; - bool done; - bool ret; - } read_request; - - bool flushing, sink_connected; -}; - enum wg_parser_event_type { WG_PARSER_EVENT_NONE = 0, @@ -195,24 +161,6 @@ struct wg_parser_event } u; }; -struct wg_parser_stream -{ - struct wg_parser *parser; - - GstPad *their_src, *post_sink, *post_src, *my_sink; - GstElement *flip; - struct wg_format preferred_format, current_format; - - pthread_cond_t event_cond, event_empty_cond; - struct wg_parser_event event; - GstBuffer *buffer; - GstMapInfo map_info; - - bool flushing, eos, enabled, has_caps; - - uint64_t duration; -}; - struct unix_funcs { struct wg_parser *(CDECL *wg_decodebin_parser_create)(void); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5d10ddf753c..272029217a9 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -36,6 +36,58 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); GST_DEBUG_CATEGORY_STATIC(wine); #define GST_CAT_DEFAULT wine +struct wg_parser +{ + BOOL (*init_gst)(struct wg_parser *parser); + + struct wg_parser_stream **streams; + unsigned int stream_count; + + GstElement *container; + GstBus *bus; + GstPad *my_src, *their_sink; + + guint64 file_size, start_offset, next_offset, stop_offset; + guint64 next_pull_offset; + + pthread_t push_thread; + + pthread_mutex_t mutex; + + pthread_cond_t init_cond; + bool no_more_pads, has_duration, error; + + pthread_cond_t read_cond, read_done_cond; + struct + { + void *data; + uint64_t offset; + uint32_t size; + bool done; + bool ret; + } read_request; + + bool flushing, sink_connected; +}; + +struct wg_parser_stream +{ + struct wg_parser *parser; + + GstPad *their_src, *post_sink, *post_src, *my_sink; + GstElement *flip; + struct wg_format preferred_format, current_format; + + pthread_cond_t event_cond, event_empty_cond; + struct wg_parser_event event; + GstBuffer *buffer; + GstMapInfo map_info; + + bool flushing, eos, enabled, has_caps; + + uint64_t duration; +}; + static enum wg_audio_format wg_audio_format_from_gst(GstAudioFormat format) { switch (format)

1 0

Michael Müller : ntdll: Implement NtQuerySystemInformation(SystemExtendedHandleInformation).
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 835f5fff7150034139919801444b52a4c0186f44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=835f5fff7150034139919801… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 17 22:59:15 2021 -0600 ntdll: Implement NtQuerySystemInformation(SystemExtendedHandleInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 50 ++++++++++++++++++++++++++++++ include/winternl.h | 20 ++++++++++++ 3 files changed, 149 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c848248fae3..419d8582dd3 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -609,6 +609,84 @@ done: HeapFree( GetProcessHeap(), 0, shi); } +static void test_query_handle_ex(void) +{ + SYSTEM_HANDLE_INFORMATION_EX *info = malloc(sizeof(SYSTEM_HANDLE_INFORMATION_EX)); + ULONG size, expect_size; + NTSTATUS status; + unsigned int i; + HANDLE event; + BOOL found, ret; + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "failed to create event, error %u\n", GetLastError()); + ret = SetHandleInformation(event, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, + HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(ret, "got error %u\n", GetLastError()); + + size = 0; + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %u\n", size); + + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + info = realloc(info, size); + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + } + ok(!status, "got %#x\n", status); + expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); + ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); + + found = FALSE; + for (i = 0; i < info->NumberOfHandles; ++i) + { + if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() + && (HANDLE)info->Handles[i].HandleValue == event) + { + todo_wine ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), + "got flags %#x\n", info->Handles[i].HandleAttributes); + ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess); + found = TRUE; + } + ok(!info->Handles[i].CreatorBackTraceIndex, "got backtrace index %u\n", info->Handles[i].CreatorBackTraceIndex); + } + ok(found, "event handle not found\n"); + + ret = SetHandleInformation(event, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(ret, "got error %u\n", GetLastError()); + CloseHandle(event); + + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + info = realloc(info, size); + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + } + ok(!status, "got %#x\n", status); + expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); + ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); + + found = FALSE; + for (i = 0; i < info->NumberOfHandles; ++i) + { + if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() + && (HANDLE)info->Handles[i].HandleValue == event) + { + found = TRUE; + break; + } + } + ok(!found, "event handle found\n"); + + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, NULL, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + + free(info); +} + static void test_query_cache(void) { NTSTATUS status; @@ -2959,6 +3037,7 @@ START_TEST(info) test_query_procperf(); test_query_module(); test_query_handle(); + test_query_handle_ex(); test_query_cache(); test_query_interrupt(); test_time_adjustment(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a889b2e020c..e2482f91041 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2461,6 +2461,56 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemExtendedHandleInformation: + { + struct handle_info *handle_info; + DWORD i, num_handles; + + if (size < sizeof(SYSTEM_HANDLE_INFORMATION_EX)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (!info) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + + num_handles = (size - FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles )) + / sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX); + if (!(handle_info = malloc( sizeof(*handle_info) * num_handles ))) return STATUS_NO_MEMORY; + + SERVER_START_REQ( get_system_handles ) + { + wine_server_set_reply( req, handle_info, sizeof(*handle_info) * num_handles ); + if (!(ret = wine_server_call( req ))) + { + SYSTEM_HANDLE_INFORMATION_EX *shi = info; + shi->NumberOfHandles = wine_server_reply_size( req ) / sizeof(*handle_info); + len = FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles[shi->NumberOfHandles] ); + for (i = 0; i < shi->NumberOfHandles; i++) + { + memset( &shi->Handles[i], 0, sizeof(shi->Handles[i]) ); + shi->Handles[i].UniqueProcessId = handle_info[i].owner; + shi->Handles[i].HandleValue = handle_info[i].handle; + shi->Handles[i].GrantedAccess = handle_info[i].access; + /* FIXME: Fill out Object, HandleAttributes, ObjectTypeIndex */ + } + } + else if (ret == STATUS_BUFFER_TOO_SMALL) + { + len = FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles[reply->count] ); + ret = STATUS_INFO_LENGTH_MISMATCH; + } + } + SERVER_END_REQ; + + free( handle_info ); + break; + } + case SystemCacheInformation: { SYSTEM_CACHE_INFORMATION sci = { 0 }; diff --git a/include/winternl.h b/include/winternl.h index 61bcd0f1d92..76feca83596 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1898,6 +1898,25 @@ typedef struct _SYSTEM_HANDLE_INFORMATION { SYSTEM_HANDLE_ENTRY Handle[1]; } SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION; +typedef struct _SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX +{ + void *Object; + ULONG_PTR UniqueProcessId; + ULONG_PTR HandleValue; + ULONG GrantedAccess; + USHORT CreatorBackTraceIndex; + USHORT ObjectTypeIndex; + ULONG HandleAttributes; + ULONG Reserved; +} SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX; + +typedef struct _SYSTEM_HANDLE_INFORMATION_EX +{ + ULONG_PTR NumberOfHandles; + ULONG_PTR Reserved; + SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handles[1]; +} SYSTEM_HANDLE_INFORMATION_EX; + /* System Information Class 0x15 */ typedef struct _SYSTEM_CACHE_INFORMATION { @@ -2289,6 +2308,7 @@ typedef struct _RTL_ATOM_TABLE #define LOGONID_CURRENT ((ULONG)-1) +#define OBJ_PROTECT_CLOSE 0x00000001 #define OBJ_INHERIT 0x00000002 #define OBJ_PERMANENT 0x00000010 #define OBJ_EXCLUSIVE 0x00000020

1 0

Zebediah Figura : ntdll: Fill the handle attributes in System(Extended)HandleInformation.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 1f1d4da5f66e00cd01a71b062ee2d1111609e971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1d4da5f66e00cd01a71b06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 22:59:16 2021 -0600 ntdll: Fill the handle attributes in System(Extended)HandleInformation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 24 +++++++++++++++++++----- dlls/ntdll/unix/system.c | 12 +++++++----- include/wine/server_protocol.h | 3 ++- server/handle.c | 9 ++++++--- server/protocol.def | 1 + server/trace.c | 4 ++-- 6 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 419d8582dd3..85c523881ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -542,11 +542,14 @@ static void test_query_handle(void) ULONG SystemInformationLength = sizeof(SYSTEM_HANDLE_INFORMATION); SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); HANDLE EventHandle; - BOOL found; + BOOL found, ret; INT i; EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL); ok( EventHandle != NULL, "CreateEventA failed %u\n", GetLastError() ); + ret = SetHandleInformation(EventHandle, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, + HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(ret, "got error %u\n", GetLastError()); /* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */ ReturnLength = 0xdeadbeef; @@ -581,11 +584,22 @@ static void test_query_handle(void) goto done; } - for (i = 0, found = FALSE; i < shi->Count && !found; i++) - found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && - ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); + found = FALSE; + for (i = 0; i < shi->Count; i++) + { + if (shi->Handle[i].OwnerPid == GetCurrentProcessId() && + (HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle) + { + ok(shi->Handle[i].HandleFlags == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), + "got attributes %#x\n", shi->Handle[i].HandleFlags); + found = TRUE; + break; + } + } ok( found, "Expected to find event handle %p (pid %x) in handle list\n", EventHandle, GetCurrentProcessId() ); + ret = SetHandleInformation(EventHandle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(ret, "got error %u\n", GetLastError()); CloseHandle(EventHandle); ReturnLength = 0xdeadbeef; @@ -645,7 +659,7 @@ static void test_query_handle_ex(void) if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() && (HANDLE)info->Handles[i].HandleValue == event) { - todo_wine ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), + ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), "got flags %#x\n", info->Handles[i].HandleAttributes); ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess); found = TRUE; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index e2482f91041..f4a879d8748 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2446,7 +2446,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handle[i].OwnerPid = handle_info[i].owner; shi->Handle[i].HandleValue = handle_info[i].handle; shi->Handle[i].AccessMask = handle_info[i].access; - /* FIXME: Fill out ObjectType, HandleFlags, ObjectPointer */ + shi->Handle[i].HandleFlags = handle_info[i].attributes; + /* FIXME: Fill out ObjectType, ObjectPointer */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) @@ -2493,10 +2494,11 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, for (i = 0; i < shi->NumberOfHandles; i++) { memset( &shi->Handles[i], 0, sizeof(shi->Handles[i]) ); - shi->Handles[i].UniqueProcessId = handle_info[i].owner; - shi->Handles[i].HandleValue = handle_info[i].handle; - shi->Handles[i].GrantedAccess = handle_info[i].access; - /* FIXME: Fill out Object, HandleAttributes, ObjectTypeIndex */ + shi->Handles[i].UniqueProcessId = handle_info[i].owner; + shi->Handles[i].HandleValue = handle_info[i].handle; + shi->Handles[i].GrantedAccess = handle_info[i].access; + shi->Handles[i].HandleAttributes = handle_info[i].attributes; + /* FIXME: Fill out Object, ObjectTypeIndex */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 277b1a1c33a..5e463fd5c9e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4543,6 +4543,7 @@ struct handle_info process_id_t owner; obj_handle_t handle; unsigned int access; + unsigned int attributes; }; @@ -6226,7 +6227,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 682 +#define SERVER_PROTOCOL_VERSION 683 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index ef0f595bf08..4291761ec6c 100644 --- a/server/handle.c +++ b/server/handle.c @@ -830,9 +830,12 @@ static int enum_handles( struct process *process, void *user ) } assert( info->count ); handle = info->handle++; - handle->owner = process->id; - handle->handle = index_to_handle(i); - handle->access = entry->access & ~RESERVED_ALL; + handle->owner = process->id; + handle->handle = index_to_handle(i); + handle->access = entry->access & ~RESERVED_ALL; + handle->attributes = 0; + if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; + if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; info->count--; } diff --git a/server/protocol.def b/server/protocol.def index fa19bb41bb4..5126a9e37e5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3197,6 +3197,7 @@ struct handle_info process_id_t owner; obj_handle_t handle; unsigned int access; + unsigned int attributes; }; /* Return a list of all opened handles */ diff --git a/server/trace.c b/server/trace.c index 2737cb16499..9faa3d5a443 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1342,8 +1342,8 @@ static void dump_varargs_handle_infos( const char *prefix, data_size_t size ) while (size >= sizeof(*handle)) { handle = cur_data; - fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x}", - handle->owner, handle->handle, handle->access ); + fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x,attributes=%08x}", + handle->owner, handle->handle, handle->access, handle->attributes ); size -= sizeof(*handle); remove_data( sizeof(*handle) ); if (size) fputc( ',', stderr );

1 0

Zebediah Figura : ntdll: Fill the object type index in System(Extended)HandleInformation.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 33a80885ce72793476eaab1f3f5f16083b3ccaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33a80885ce72793476eaab1f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 22:59:17 2021 -0600 ntdll: Fill the object type index in System(Extended)HandleInformation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 6 ++++-- include/wine/server_protocol.h | 3 ++- server/handle.c | 1 + server/protocol.def | 1 + server/trace.c | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index f4a879d8748..6cf044d496f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2447,7 +2447,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handle[i].HandleValue = handle_info[i].handle; shi->Handle[i].AccessMask = handle_info[i].access; shi->Handle[i].HandleFlags = handle_info[i].attributes; - /* FIXME: Fill out ObjectType, ObjectPointer */ + shi->Handle[i].ObjectType = handle_info[i].type; + /* FIXME: Fill out ObjectPointer */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) @@ -2498,7 +2499,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handles[i].HandleValue = handle_info[i].handle; shi->Handles[i].GrantedAccess = handle_info[i].access; shi->Handles[i].HandleAttributes = handle_info[i].attributes; - /* FIXME: Fill out Object, ObjectTypeIndex */ + shi->Handles[i].ObjectTypeIndex = handle_info[i].type; + /* FIXME: Fill out Object */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5e463fd5c9e..18551a2d448 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4544,6 +4544,7 @@ struct handle_info obj_handle_t handle; unsigned int access; unsigned int attributes; + unsigned int type; }; @@ -6227,7 +6228,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 683 +#define SERVER_PROTOCOL_VERSION 684 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index 4291761ec6c..6e0848eedf0 100644 --- a/server/handle.c +++ b/server/handle.c @@ -833,6 +833,7 @@ static int enum_handles( struct process *process, void *user ) handle->owner = process->id; handle->handle = index_to_handle(i); handle->access = entry->access & ~RESERVED_ALL; + handle->type = entry->ptr->ops->type->index; handle->attributes = 0; if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; diff --git a/server/protocol.def b/server/protocol.def index 5126a9e37e5..7f3b785df51 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3198,6 +3198,7 @@ struct handle_info obj_handle_t handle; unsigned int access; unsigned int attributes; + unsigned int type; }; /* Return a list of all opened handles */ diff --git a/server/trace.c b/server/trace.c index 9faa3d5a443..b07935cc54b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1342,8 +1342,8 @@ static void dump_varargs_handle_infos( const char *prefix, data_size_t size ) while (size >= sizeof(*handle)) { handle = cur_data; - fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x,attributes=%08x}", - handle->owner, handle->handle, handle->access, handle->attributes ); + fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x,attributes=%08x,type=%u}", + handle->owner, handle->handle, handle->access, handle->attributes, handle->type ); size -= sizeof(*handle); remove_data( sizeof(*handle) ); if (size) fputc( ',', stderr );

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm hexadecimal literals.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: vkd3d Branch: master Commit: 11915f2431514eff680992d86adbc93511aaf76f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=11915f2431514eff680992d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 11:24:00 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm hexadecimal literals. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 8194363..30f7bc1 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -720,6 +720,12 @@ static void shader_print_uint_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%u%s", prefix, i, suffix); } +static void shader_print_hex_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, unsigned int i, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s0x%08x%s", prefix, i, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -1429,11 +1435,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(buffer, " {\n"); for (i = 0; i < ins->declaration.icb->vec4_count; ++i) { - shader_addline(buffer, " {0x%08x, 0x%08x, 0x%08x, 0x%08x},\n", - ins->declaration.icb->data[4 * i + 0], - ins->declaration.icb->data[4 * i + 1], - ins->declaration.icb->data[4 * i + 2], - ins->declaration.icb->data[4 * i + 3]); + shader_print_hex_literal(compiler, " {", ins->declaration.icb->data[4 * i + 0], ""); + shader_print_hex_literal(compiler, ", ", ins->declaration.icb->data[4 * i + 1], ""); + shader_print_hex_literal(compiler, ", ", ins->declaration.icb->data[4 * i + 2], ""); + shader_print_hex_literal(compiler, ", ", ins->declaration.icb->data[4 * i + 3], "},\n"); } shader_addline(buffer, "}"); break;

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm boolean literals.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: vkd3d Branch: master Commit: 54092b944cc7f5938909fa5ddd406d14028d5d7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=54092b944cc7f5938909fa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 11:24:01 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm boolean literals. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 30f7bc1..bb5c373 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -726,6 +726,12 @@ static void shader_print_hex_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s0x%08x%s", prefix, i, suffix); } +static void shader_print_bool_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, unsigned int b, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s", prefix, b ? "true" : "false", suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -1601,9 +1607,9 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEFB: - vkd3d_string_buffer_printf(buffer, " %sb%u%s = %s", compiler->colours.reg, - ins->dst[0].reg.idx[0].offset, compiler->colours.reset, - ins->src[0].reg.u.immconst_uint[0] ? "true" : "false"); + vkd3d_string_buffer_printf(buffer, " %sb%u%s", compiler->colours.reg, + ins->dst[0].reg.idx[0].offset, compiler->colours.reset); + shader_print_bool_literal(compiler, " = ", ins->src[0].reg.u.immconst_uint[0], ""); break; default:

1 0