February 2021 - Wine-Commits

JÃ©rÃ´me Gardou : msi: Remove read-only bit when copying the package file.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: e830975806df9ef283c89f7153b06b145dfb2cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e830975806df9ef283c89f71… Author: JÃ©rÃ´me Gardou <jerome.gardou(a)gmail.com> Date: Fri Feb 12 14:46:56 2021 +0100 msi: Remove read-only bit when copying the package file. CopyFileW also copies the file attributes, and the copy will be opened with write access later on. Signed-off-by: Jérôme Gardou <jerome.gardou(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 25e22f040a4..05f122fb545 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1371,6 +1371,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) r = get_local_package( db, localfile ); if (r != ERROR_SUCCESS || GetFileAttributesW( localfile ) == INVALID_FILE_ATTRIBUTES) { + DWORD localfile_attr; + r = msi_create_empty_local_file( localfile, L".msi" ); if (r != ERROR_SUCCESS) { @@ -1387,6 +1389,11 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) return r; } delete_on_close = TRUE; + + /* Remove read-only bit, we are opening it with write access in MSI_OpenDatabaseW below. */ + localfile_attr = GetFileAttributesW( localfile ); + if (localfile_attr & FILE_ATTRIBUTE_READONLY) + SetFileAttributesW( localfile, localfile_attr & ~FILE_ATTRIBUTE_READONLY); } else if (dwOptions & WINE_OPENPACKAGEFLAGS_RECACHE) {

1 0

Zebediah Figura : advapi32/tests: Rename test_sid() to test_ConvertStringSidToSid().
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 0c0a7b7be7a1a83edf8d5ffaa612eec1460f0745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0a7b7be7a1a83edf8d5ffa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:50 2021 -0600 advapi32/tests: Rename test_sid() to test_ConvertStringSidToSid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e6d2f565943..1cd5f576621 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -246,7 +246,7 @@ static void test_group_equal(HANDLE Handle, PSID expected, int line) HeapFree(GetProcessHeap(), 0, queriedSD); } -static void test_sid(void) +static void test_ConvertStringSidToSid(void) { struct sidRef refs[] = { { { {0x00,0x00,0x33,0x44,0x55,0x66} }, "S-1-860116326-1" }, @@ -7961,7 +7961,7 @@ START_TEST(security) return; } test_kernel_objects_security(); - test_sid(); + test_ConvertStringSidToSid(); test_trustee(); test_luid(); test_CreateWellKnownSid();

1 0

Zebediah Figura : winegstreamer: Set the stream's current format and connected state through Unix library functions.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 563ccc4df5bcf887e0cd277e9a54ec3888c9cbf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=563ccc4df5bcf887e0cd277e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:51 2021 -0600 winegstreamer: Set the stream's current format and connected state through Unix library functions. 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 | 9 ++++----- dlls/winegstreamer/wg_parser.c | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index d95f58dc607..15c62fa29c5 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -219,6 +219,8 @@ struct unix_funcs struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); + void (CDECL *wg_parser_stream_enable)(struct wg_parser_stream *stream, const struct wg_format *format); + void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 95e55a55f22..1f80a8fec8c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1507,6 +1507,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, struct wg_parser_stream *stream = pin->wg_stream; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; + struct wg_format format; bool ret; if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_VideoInfo)) @@ -1526,11 +1527,10 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->nAvgBytesPerSec; } - ret = amt_to_wg_format(&pin->pin.pin.mt, &stream->current_format); + ret = amt_to_wg_format(&pin->pin.pin.mt, &format); assert(ret); - stream->enabled = true; + unix_funcs->wg_parser_stream_enable(pin->wg_stream, &format); - gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); /* We do need to drop any buffers that might have been sent with the old * caps, but this will be handled in parser_init_stream(). */ @@ -1543,9 +1543,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, static void source_disconnect(struct strmbase_source *iface) { struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); - struct wg_parser_stream *stream = pin->wg_stream; - stream->enabled = false; + unix_funcs->wg_parser_stream_disable(pin->wg_stream); } static void free_source_pin(struct parser_source *pin) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 208abc59a9b..107dfdd1a7f 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -332,6 +332,18 @@ static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *format = stream->preferred_format; } +static void CDECL wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) +{ + stream->current_format = *format; + stream->enabled = true; + gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); +} + +static void CDECL wg_parser_stream_disable(struct wg_parser_stream *stream) +{ + stream->enabled = false; +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1487,6 +1499,8 @@ static const struct unix_funcs funcs = wg_parser_get_stream, wg_parser_stream_get_preferred_format, + wg_parser_stream_enable, + wg_parser_stream_disable, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Retrieve the preferred format through a Unix library function.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 442c9d43c8c8a8ea6b3557bab2c49eacd1f42dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=442c9d43c8c8a8ea6b3557ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:50 2021 -0600 winegstreamer: Retrieve the preferred format 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 | 35 +++++++++++++++++++++-------------- dlls/winegstreamer/wg_parser.c | 7 +++++++ 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 0a37e10c840..d95f58dc607 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -217,6 +217,8 @@ struct unix_funcs 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); + + void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index be1c59453d5..95e55a55f22 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1064,8 +1064,7 @@ static HRESULT decodebin_parser_source_query_accept(struct parser_source *pin, c static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; - struct wg_format format = stream->preferred_format; + struct wg_format format; static const enum wg_video_format video_formats[] = { @@ -1086,6 +1085,8 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, WG_VIDEO_FORMAT_RGB15, }; + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); if (amt_from_wg_format(mt, &format)) @@ -1673,11 +1674,12 @@ static BOOL wave_parser_filter_init_gst(struct parser *filter) static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_wg_format(&pad_mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(&pad_mt, &format)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1687,11 +1689,12 @@ static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_wg_format(mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(mt, &format)) return E_OUTOFMEMORY; return S_OK; } @@ -1761,11 +1764,12 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_wg_format(&pad_mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(&pad_mt, &format)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1775,11 +1779,12 @@ static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_wg_format(mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(mt, &format)) return E_OUTOFMEMORY; return S_OK; } @@ -1847,11 +1852,12 @@ static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_wg_format(&pad_mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(&pad_mt, &format)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1861,11 +1867,12 @@ static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, cons static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_wg_format(mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(mt, &format)) return E_OUTOFMEMORY; return S_OK; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 1cbe123ca2f..208abc59a9b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -327,6 +327,11 @@ static struct wg_parser_stream * CDECL wg_parser_get_stream(struct wg_parser *pa return parser->streams[index]; } +static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) +{ + *format = stream->preferred_format; +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1480,6 +1485,8 @@ static const struct unix_funcs funcs = wg_parser_get_stream_count, wg_parser_get_stream, + + wg_parser_stream_get_preferred_format, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Move QoS notification to the Unix library.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 8547ee35135114e752292175237f43a7cf520ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8547ee35135114e752292175… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:54 2021 -0600 winegstreamer: Move QoS notification 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/gst_private.h | 2 ++ dlls/winegstreamer/gstdemux.c | 28 ++++++++++------------------ dlls/winegstreamer/wg_parser.c | 12 ++++++++++++ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index ee698bdf32f..3c6d1147477 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -226,6 +226,8 @@ struct unix_funcs void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); bool (CDECL *wg_parser_stream_get_event)(struct wg_parser_stream *stream, struct wg_parser_event *event); + void (CDECL *wg_parser_stream_notify_qos)(struct wg_parser_stream *stream, + bool underflow, double proportion, int64_t diff, uint64_t timestamp); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 63368febc5c..da294c31e01 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1350,11 +1350,8 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { struct parser_source *pin = impl_from_IQualityControl(iface); - struct wg_parser_stream *stream = pin->wg_stream; - GstQOSType type = GST_QOS_TYPE_OVERFLOW; - GstClockTime timestamp; - GstClockTimeDiff diff; - GstEvent *event; + uint64_t timestamp; + int64_t diff; TRACE("pin %p, sender %p, type %s, proportion %u, late %s, timestamp %s.\n", pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion, @@ -1362,20 +1359,14 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil mark_wine_thread(); - /* GST_QOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but - * DirectShow filters might use Famine, so check that there actually is an - * underrun. */ - if (q.Type == Famine && q.Proportion < 1000) - type = GST_QOS_TYPE_UNDERFLOW; - /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the * current time instead of the time of the last buffer). GstClockTime is * unsigned, so clamp it to 0. */ - timestamp = max(q.TimeStamp * 100, 0); + timestamp = max(q.TimeStamp, 0); /* The documentation specifies that timestamp + diff must be nonnegative. */ - diff = q.Late * 100; - if (diff < 0 && timestamp < (GstClockTime)-diff) + diff = q.Late; + if (diff < 0 && timestamp < (uint64_t)-diff) diff = -timestamp; /* DirectShow "Proportion" describes what percentage of buffers the upstream @@ -1395,10 +1386,11 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil return S_OK; } - if (!(event = gst_event_new_qos(type, 1000.0 / q.Proportion, diff, timestamp))) - ERR("Failed to create QOS event.\n"); - - gst_pad_push_event(stream->my_sink, event); + /* GST_QOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + unix_funcs->wg_parser_stream_notify_qos(pin->wg_stream, q.Type == Famine && q.Proportion < 1000, + 1000.0 / q.Proportion, diff, timestamp); return S_OK; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index bb1d6188a8b..79fa45eadca 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -391,6 +391,17 @@ static bool CDECL wg_parser_stream_get_event(struct wg_parser_stream *stream, st return true; } +static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, + bool underflow, double proportion, int64_t diff, uint64_t timestamp) +{ + GstEvent *event; + + if (!(event = gst_event_new_qos(underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, + 1000.0 / proportion, diff * 100, timestamp * 100))) + ERR("Failed to create QOS event.\n"); + gst_pad_push_event(stream->my_sink, event); +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1553,6 +1564,7 @@ static const struct unix_funcs funcs = wg_parser_stream_disable, wg_parser_stream_get_event, + wg_parser_stream_notify_qos, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Move wg_parser flushing to the Unix library.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 7a5224beb6be2a86131c51f4e308adadbfb1784b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5224beb6be2a86131c51f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:53 2021 -0600 winegstreamer: Move wg_parser flushing 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/gst_private.h | 3 +++ dlls/winegstreamer/gstdemux.c | 28 ++++------------------------ dlls/winegstreamer/wg_parser.c | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 08ff6ee21f0..ee698bdf32f 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -215,6 +215,9 @@ struct unix_funcs HRESULT (CDECL *wg_parser_connect)(struct wg_parser *parser, uint64_t file_size); void (CDECL *wg_parser_disconnect)(struct wg_parser *parser); + void (CDECL *wg_parser_begin_flush)(struct wg_parser *parser); + void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); + 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 d4614ca5a65..63368febc5c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -856,9 +856,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = true; - pthread_mutex_lock(&parser->mutex); - parser->flushing = false; - pthread_mutex_unlock(&parser->mutex); + unix_funcs->wg_parser_end_flush(filter->wg_parser); /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ @@ -899,17 +897,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = false; - pthread_mutex_lock(&parser->mutex); - parser->flushing = true; - pthread_mutex_unlock(&parser->mutex); - - for (i = 0; i < parser->stream_count; ++i) - { - struct wg_parser_stream *stream = parser->streams[i]; - - if (stream->enabled) - pthread_cond_signal(&stream->event_cond); - } + unix_funcs->wg_parser_begin_flush(filter->wg_parser); for (i = 0; i < filter->source_count; ++i) { @@ -1228,7 +1216,6 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, struct parser_source *pin = impl_from_IMediaSeeking(iface); struct wg_parser_stream *stream = pin->wg_stream; struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - struct wg_parser *parser = filter->wg_parser; GstSeekFlags flags = 0; HRESULT hr = S_OK; int i; @@ -1247,17 +1234,12 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&parser->mutex); - parser->flushing = true; - pthread_mutex_unlock(&parser->mutex); + unix_funcs->wg_parser_begin_flush(filter->wg_parser); for (i = 0; i < filter->source_count; ++i) { if (filter->sources[i]->pin.pin.peer) - { - pthread_cond_signal(&stream->event_cond); IPin_BeginFlush(filter->sources[i]->pin.pin.peer); - } } if (filter->reader) @@ -1296,9 +1278,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&parser->mutex); - parser->flushing = false; - pthread_mutex_unlock(&parser->mutex); + unix_funcs->wg_parser_end_flush(filter->wg_parser); for (i = 0; i < filter->source_count; ++i) { diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index b3f8eff43ad..bb1d6188a8b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -327,6 +327,28 @@ static struct wg_parser_stream * CDECL wg_parser_get_stream(struct wg_parser *pa return parser->streams[index]; } +static void CDECL wg_parser_begin_flush(struct wg_parser *parser) +{ + unsigned int i; + + pthread_mutex_lock(&parser->mutex); + parser->flushing = true; + pthread_mutex_unlock(&parser->mutex); + + for (i = 0; i < parser->stream_count; ++i) + { + if (parser->streams[i]->enabled) + pthread_cond_signal(&parser->streams[i]->event_cond); + } +} + +static void CDECL wg_parser_end_flush(struct wg_parser *parser) +{ + pthread_mutex_lock(&parser->mutex); + parser->flushing = false; + pthread_mutex_unlock(&parser->mutex); +} + static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) { *format = stream->preferred_format; @@ -1520,6 +1542,9 @@ static const struct unix_funcs funcs = wg_parser_connect, wg_parser_disconnect, + wg_parser_begin_flush, + wg_parser_end_flush, + wg_parser_get_stream_count, wg_parser_get_stream,

1 0

Alexandre Julliard : server: Avoid redefining the DuplicateHandle() constants.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 584427fc89f943d40fb6ee4d51e14ff46b0f9300 URL: https://source.winehq.org/git/wine.git/?a=commit;h=584427fc89f943d40fb6ee4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:27:18 2021 +0100 server: Avoid redefining the DuplicateHandle() constants. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/krnl386.exe16/vxd.c | 2 +- dlls/ntdll/heap.c | 2 +- dlls/wineandroid.drv/device.c | 4 ++-- include/wine/server_protocol.h | 3 --- include/winnt.h | 3 +++ server/handle.c | 12 ++++++------ server/protocol.def | 3 --- server/thread.c | 4 ++-- server/winstation.c | 4 ++-- 10 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 085fff1454e..756d1ef3f87 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -273,7 +273,7 @@ HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc) { HANDLE ret = INVALID_HANDLE_VALUE; DuplicateHandle( GetCurrentProcess(), hSrc, GetCurrentProcess(), &ret, 0, FALSE, - DUP_HANDLE_MAKE_GLOBAL | DUP_HANDLE_SAME_ACCESS | DUP_HANDLE_CLOSE_SOURCE ); + DUPLICATE_MAKE_GLOBAL | DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); return ret; } diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index ab9d916d834..c259cd60775 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -213,7 +213,7 @@ done: RtlLeaveCriticalSection( &vxd_section ); if (!DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle, 0, (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle), - DUP_HANDLE_SAME_ACCESS )) + DUPLICATE_SAME_ACCESS )) handle = 0; return handle; } diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 88db935746a..2d7b229174d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -975,7 +975,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); NtDuplicateObject( NtCurrentProcess(), sem, NtCurrentProcess(), &sem, 0, 0, - DUP_HANDLE_MAKE_GLOBAL | DUP_HANDLE_SAME_ACCESS | DUP_HANDLE_CLOSE_SOURCE ); + DUPLICATE_MAKE_GLOBAL | DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); heap->critSection.LockSemaphore = sem; RtlFreeHeap( processHeap, 0, heap->critSection.DebugInfo ); heap->critSection.DebugInfo = NULL; diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 5bebc5c7901..4a16e6836ed 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -332,7 +332,7 @@ static int duplicate_fd( HANDLE client, int fd ) if (!wine_server_fd_to_handle( dup(fd), GENERIC_READ | SYNCHRONIZE, 0, &handle )) DuplicateHandle( GetCurrentProcess(), handle, client, &ret, - DUPLICATE_SAME_ACCESS, FALSE, DUP_HANDLE_CLOSE_SOURCE ); + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); if (!ret) return -1; return HandleToLong( ret ); @@ -348,7 +348,7 @@ static int map_native_handle( union native_handle_buffer *dest, const native_han { HANDLE ret = 0; if (!DuplicateHandle( GetCurrentProcess(), mapping, client, &ret, - DUPLICATE_SAME_ACCESS, FALSE, DUP_HANDLE_CLOSE_SOURCE )) + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) return -ENOSPC; dest->handle.numFds = 0; dest->handle.numInts = 1; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 416f1af9212..ec34867caf1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1259,9 +1259,6 @@ struct dup_handle_reply int closed; char __pad_20[4]; }; -#define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE -#define DUP_HANDLE_SAME_ACCESS DUPLICATE_SAME_ACCESS -#define DUP_HANDLE_MAKE_GLOBAL 0x80000000 diff --git a/include/winnt.h b/include/winnt.h index 8feb2e53a4c..48f1715c3b6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5531,6 +5531,9 @@ typedef struct _QUOTA_LIMITS_EX { #define DUPLICATE_CLOSE_SOURCE 0x00000001 #define DUPLICATE_SAME_ACCESS 0x00000002 +#ifdef __WINESRC__ +#define DUPLICATE_MAKE_GLOBAL 0x80000000 /* Not a Windows flag */ +#endif /* File attribute flags */ #define FILE_SHARE_READ 0x00000001 diff --git a/server/handle.c b/server/handle.c index a6fcb871e2d..ef0f595bf08 100644 --- a/server/handle.c +++ b/server/handle.c @@ -566,7 +566,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str src_access = obj->ops->map_access( obj, GENERIC_ALL ); src_access &= ~RESERVED_ALL; - if (options & DUP_HANDLE_SAME_ACCESS) + if (options & DUPLICATE_SAME_ACCESS) access = src_access; else access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; @@ -581,16 +581,16 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str return 0; } - if (options & DUP_HANDLE_MAKE_GLOBAL) + if (options & DUPLICATE_MAKE_GLOBAL) res = alloc_global_handle( obj, access ); else res = alloc_handle_no_access_check( dst, obj, access, attr ); } else { - if (options & DUP_HANDLE_MAKE_GLOBAL) + if (options & DUPLICATE_MAKE_GLOBAL) res = alloc_global_handle_no_access_check( obj, access ); - else if ((options & DUP_HANDLE_CLOSE_SOURCE) && src == dst && + else if ((options & DUPLICATE_CLOSE_SOURCE) && src == dst && entry && !(entry->access & RESERVED_CLOSE_PROTECT)) { if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; @@ -665,7 +665,7 @@ DECL_HANDLER(dup_handle) reply->handle = 0; if ((src = get_process_from_handle( req->src_process, PROCESS_DUP_HANDLE ))) { - if (req->options & DUP_HANDLE_MAKE_GLOBAL) + if (req->options & DUPLICATE_MAKE_GLOBAL) { reply->handle = duplicate_handle( src, req->src_handle, NULL, req->access, req->attributes, req->options ); @@ -677,7 +677,7 @@ DECL_HANDLER(dup_handle) release_object( dst ); } /* close the handle no matter what happened */ - if ((req->options & DUP_HANDLE_CLOSE_SOURCE) && (src != dst || req->src_handle != reply->handle)) + if ((req->options & DUPLICATE_CLOSE_SOURCE) && (src != dst || req->src_handle != reply->handle)) reply->closed = !close_handle( src, req->src_handle ); reply->self = (src == current->process); release_object( src ); diff --git a/server/protocol.def b/server/protocol.def index b210a4cf7d1..fb3ee3a52de 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1122,9 +1122,6 @@ typedef struct int self; /* is the source the current process? */ int closed; /* whether the source handle has been closed */ @END -#define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE -#define DUP_HANDLE_SAME_ACCESS DUPLICATE_SAME_ACCESS -#define DUP_HANDLE_MAKE_GLOBAL 0x80000000 /* Not a Windows flag */ /* Make an object temporary */ diff --git a/server/thread.c b/server/thread.c index 38bc25ae5f5..3cee717e169 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1644,7 +1644,7 @@ DECL_HANDLER(select) if (apc->result.type == APC_CREATE_THREAD) /* transfer the handle to the caller process */ { obj_handle_t handle = duplicate_handle( current->process, apc->result.create_thread.handle, - apc->caller->process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + apc->caller->process, 0, 0, DUPLICATE_SAME_ACCESS ); close_handle( current->process, apc->result.create_thread.handle ); apc->result.create_thread.handle = handle; clear_error(); /* ignore errors from the above calls */ @@ -1740,7 +1740,7 @@ DECL_HANDLER(queue_apc) { /* duplicate the handle into the target process */ obj_handle_t handle = duplicate_handle( current->process, apc->call.map_view.handle, - process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + process, 0, 0, DUPLICATE_SAME_ACCESS ); if (handle) apc->call.map_view.handle = handle; else { diff --git a/server/winstation.c b/server/winstation.c index 0403825b575..1c7552f0687 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -376,7 +376,7 @@ void connect_process_winstation( struct process *process, struct thread *parent_ else if (parent_process->winstation) { handle = duplicate_handle( parent_process, parent_process->winstation, - process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + process, 0, 0, DUPLICATE_SAME_ACCESS ); winstation = (struct winstation *)get_handle_obj( process, handle, 0, &winstation_ops ); } if (!winstation) goto done; @@ -400,7 +400,7 @@ void connect_process_winstation( struct process *process, struct thread *parent_ if (!desktop || desktop->winstation != winstation) goto done; - handle = duplicate_handle( parent_process, handle, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + handle = duplicate_handle( parent_process, handle, process, 0, 0, DUPLICATE_SAME_ACCESS ); } if (handle) set_process_default_desktop( process, desktop, handle );

1 0

Alexandre Julliard : ntdll: Use the SECTION_IMAGE_INFORMATION bitfields where possible.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: c2c57e8dba92f54aba4e1e52d2f0a5ea4831dff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c57e8dba92f54aba4e1e52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:37:08 2021 +0100 ntdll: Use the SECTION_IMAGE_INFORMATION bitfields where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 ++++++++-------- dlls/ntdll/unix/loader.c | 2 +- include/winternl.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4eb6bb1144f..9403cdb89fd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1877,12 +1877,12 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, /* create the MODREF */ - if (!(wm = alloc_module( *module, nt_name, (image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin) ))) + if (!(wm = alloc_module( *module, nt_name, (image_info->u.s.WineBuiltin) ))) return STATUS_NO_MEMORY; if (id) wm->id = *id; if (image_info->LoaderFlags) wm->ldr.Flags |= LDR_COR_IMAGE; - if (image_info->u.ImageFlags & IMAGE_FLAGS_ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; + if (image_info->u.s.ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; set_security_cookie( *module, map_size ); @@ -1916,7 +1916,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, TRACE( "loaded %s %p %p\n", debugstr_us(nt_name), wm, *module ); - if (image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin) + if (image_info->u.s.WineBuiltin) { if (TRACE_ON(relay)) RELAY_SetupDLL( *module ); } @@ -1926,7 +1926,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, } TRACE_(loaddll)( "Loaded %s at %p: %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), *module, - (image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin) ? "builtin" : "native" ); + (image_info->u.s.WineBuiltin) ? "builtin" : "native" ); wm->ldr.LoadCount = 1; *pwm = wm; @@ -1946,7 +1946,7 @@ static NTSTATUS build_builtin_module( const WCHAR *load_path, const UNICODE_STRI NTSTATUS status; SECTION_IMAGE_INFORMATION image_info = { 0 }; - image_info.u.ImageFlags = IMAGE_FLAGS_WineBuiltin; + image_info.u.s.WineBuiltin = 1; status = build_module( load_path, nt_name, &module, &image_info, NULL, flags, pwm ); if (status && module) unix_funcs->unload_builtin_dll( module ); return status; @@ -2062,7 +2062,7 @@ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info if (info->Machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif if (!info->ImageContainsCode) return TRUE; - if (!(info->u.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady)) + if (!(info->u.s.ComPlusNativeReady)) { IMAGE_COR20_HEADER cor_header; if (!get_cor_header( file, info, &cor_header )) return FALSE; @@ -2673,7 +2673,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC break; case STATUS_SUCCESS: /* valid PE file */ - if (image_info.u.ImageFlags & IMAGE_FLAGS_WineBuiltin) + if (image_info.u.s.WineBuiltin) { switch (loadorder) { @@ -2691,7 +2691,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC } break; } - if (!(image_info.u.ImageFlags & IMAGE_FLAGS_WineFakeDll)) + if (!(image_info.u.s.WineFakeDll)) { switch (loadorder) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 92bf3b08620..9aa1eeda88b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1225,7 +1225,7 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, HANDLE NtQuerySection( *mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); /* ignore non-builtins */ - if (!(image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin)) + if (!(image_info->u.s.WineBuiltin)) { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_a(name) ); status = STATUS_DLL_NOT_FOUND; diff --git a/include/winternl.h b/include/winternl.h index a65d21b9e3e..61bcd0f1d92 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2490,7 +2490,12 @@ typedef struct _SECTION_IMAGE_INFORMATION { UCHAR ImageMappedFlat : 1; UCHAR BaseBelow4gb : 1; UCHAR ComPlusPrefer32bit : 1; +#ifdef __WINESRC__ /* Wine extensions */ + UCHAR WineBuiltin : 1; + UCHAR WineFakeDll : 1; +#else UCHAR Reserved : 2; +#endif } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; ULONG LoaderFlags;

1 0

Alexandre Julliard : ntdll: Don't use wine/server.h from the PE side.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 58eceff167ad13530f4841b2b606472d34bb392c URL: https://source.winehq.org/git/wine.git/?a=commit;h=58eceff167ad13530f4841b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:37:38 2021 +0100 ntdll: Don't use wine/server.h from the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 1 + dlls/ntdll/atom.c | 2 -- dlls/ntdll/directory.c | 1 - dlls/ntdll/exception.c | 1 - dlls/ntdll/heap.c | 1 - dlls/ntdll/loader.c | 1 + dlls/ntdll/nt.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/sync.c | 1 - dlls/ntdll/thread.c | 1 - dlls/ntdll/threadpool.c | 7 +++---- dlls/ntdll/unix/registry.c | 1 + dlls/ntdll/unix/security.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 1 - dlls/ntdll/virtual.c | 1 - 16 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5db464a383e..5032f1b0cc4 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c index ab8d7ee317f..adde3208e88 100644 --- a/dlls/ntdll/atom.c +++ b/dlls/ntdll/atom.c @@ -28,8 +28,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" - -#include "wine/server.h" #include "ntdll_misc.h" #include "wine/debug.h" diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cfb4595d457..fb2f25d35bc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -36,7 +36,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "ntdll_misc.h" -#include "wine/server.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/exception.h" diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 4594d12f8a0..d5b3042c491 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -32,7 +32,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/exception.h" -#include "wine/server.h" #include "wine/list.h" #include "wine/debug.h" #include "excpt.h" diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2d7b229174d..cae41cba0d9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -36,7 +36,6 @@ #include "ntdll_misc.h" #include "wine/list.h" #include "wine/debug.h" -#include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(heap); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9403cdb89fd..a67c326d875 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -21,6 +21,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index dc3eb73e976..3d7063caa1d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winternl.h" #include "ntdll_misc.h" -#include "wine/server.h" #include "ddk/wdm.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 60b8ffc46d6..67696f80db3 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -26,7 +26,6 @@ #include "winnt.h" #include "winternl.h" #include "unixlib.h" -#include "wine/server.h" #include "wine/asm.h" #define DECLARE_CRITICAL_SECTION(cs) \ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 8df7015df9f..f1263ae33fd 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -33,7 +33,6 @@ #define NONAMELESSUNION #include "windef.h" #include "winternl.h" -#include "wine/server.h" #include "wine/debug.h" #include "ntdll_misc.h" diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 425e8770294..25496609f08 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -27,7 +27,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" -#include "wine/server.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "ddk/wdm.h" diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index bdc1ebddd7d..1b51a191979 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1090,8 +1090,7 @@ static void CALLBACK timerqueue_thread_proc( void *param ) } } - timeout_lower = TIMEOUT_INFINITE; - timeout_upper = TIMEOUT_INFINITE; + timeout_lower = timeout_upper = MAXLONGLONG; /* Determine next timeout and use the window length to optimize wakeup times. */ LIST_FOR_EACH_ENTRY( other_timer, &timerqueue.pending_timers, @@ -1247,7 +1246,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) for (;;) { NtQuerySystemTime( &now ); - timeout.QuadPart = TIMEOUT_INFINITE; + timeout.QuadPart = MAXLONGLONG; num_handles = 0; LIST_FOR_EACH_ENTRY_SAFE( wait, next, &bucket->waiting, struct threadpool_object, @@ -2985,7 +2984,7 @@ VOID WINAPI TpSetTimer( TP_TIMER *timer, LARGE_INTEGER *timeout, LONG period, LO VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) { struct threadpool_object *this = impl_from_TP_WAIT( wait ); - ULONGLONG timestamp = TIMEOUT_INFINITE; + ULONGLONG timestamp = MAXLONGLONG; TRACE( "%p %p %p\n", wait, handle, timeout ); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index f94c8ff98ee..c0897033609 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -30,6 +30,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#include "winternl.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 8838ca13ee4..fc9cc9d4572 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -30,6 +30,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" +#include "winternl.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6ab96397412..1a864b6fb5d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -24,6 +24,7 @@ #include <pthread.h> #include <signal.h> #include "unixlib.h" +#include "wine/server.h" #include "wine/list.h" #ifdef __i386__ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 8dc42320f18..0439a5a937b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -21,7 +21,6 @@ #ifndef __NTDLL_UNIXLIB_H #define __NTDLL_UNIXLIB_H -#include "wine/server.h" #include "wine/debug.h" struct _DISPATCHER_CONTEXT; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e0435181e95..8e512c5d85a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -31,7 +31,6 @@ #define NONAMELESSUNION #include "windef.h" #include "winternl.h" -#include "wine/server.h" #include "wine/debug.h" #include "ntdll_misc.h"

1 0

Zebediah Figura : advapi32/tests: Rename test_acls() to test_InitializeAcl().
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 50cf8ee9c0385e492fc7a25ae585576ceba9fd2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50cf8ee9c0385e492fc7a25a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:52 2021 -0600 advapi32/tests: Rename test_acls() to test_InitializeAcl(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e86b8e5cbde..d9849f44c9a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4594,7 +4594,7 @@ static void test_PrivateObjectSecurity(void) #undef CHECK_RESULT_AND_FREE #undef CHECK_ONE_OF_AND_FREE -static void test_acls(void) +static void test_InitializeAcl(void) { char buffer[256]; PACL pAcl = (PACL)buffer; @@ -7976,7 +7976,7 @@ START_TEST(security) test_ConvertStringSecurityDescriptor(); test_ConvertSecurityDescriptorToString(); test_PrivateObjectSecurity(); - test_acls(); + test_InitializeAcl(); test_GetWindowsAccountDomainSid(); test_EqualDomainSid(); test_GetSecurityInfo();

1 0