October 2021 - Wine-commits

Rémi Bernon : winebus.sys: Implement PID effect control for UDEV lnxev devices.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: a41c5e057cd12f3ab218e0ee3526850c1815b117 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a41c5e057cd12f3ab218e0ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 09:51:34 2021 +0200 winebus.sys: Implement PID effect control for UDEV lnxev devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 48 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 5eca64e8317..3db261b2404 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -812,6 +812,27 @@ static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, DWORD dura return STATUS_SUCCESS; } +static NTSTATUS lnxev_device_physical_effect_run(struct lnxev_device *impl, BYTE index, + int iterations) +{ + struct input_event ie = + { + .type = EV_FF, + .value = iterations, + }; + + if (impl->effect_ids[index] < 0) return STATUS_UNSUCCESSFUL; + ie.code = impl->effect_ids[index]; + + if (write(impl->base.device_fd, &ie, sizeof(ie)) == -1) + { + WARN("couldn't stop effect, write failed %d %s\n", errno, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; +} + static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, USAGE control) { struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); @@ -846,8 +867,12 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, return STATUS_SUCCESS; } case PID_USAGE_DC_STOP_ALL_EFFECTS: - FIXME("stop all not implemented!\n"); - return STATUS_NOT_IMPLEMENTED; + for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) + { + if (impl->effect_ids[i] < 0) continue; + lnxev_device_physical_effect_run(impl, i, 0); + } + return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_RESET: for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) { @@ -871,9 +896,24 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, static NTSTATUS lnxev_device_physical_effect_control(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations) { - FIXME("iface %p, index %u, control %04x, iterations %u stub!\n", iface, index, control, iterations); + struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); + NTSTATUS status; - return STATUS_NOT_IMPLEMENTED; + TRACE("iface %p, index %u, control %04x, iterations %u.\n", iface, index, control, iterations); + + switch (control) + { + case PID_USAGE_OP_EFFECT_START_SOLO: + if ((status = lnxev_device_physical_device_control(iface, PID_USAGE_DC_STOP_ALL_EFFECTS))) + return status; + /* fallthrough */ + case PID_USAGE_OP_EFFECT_START: + return lnxev_device_physical_effect_run(impl, index, iterations); + case PID_USAGE_OP_EFFECT_STOP: + return lnxev_device_physical_effect_run(impl, index, 0); + } + + return STATUS_SUCCESS; } static const struct hid_device_vtbl lnxev_device_vtbl =

1 0

Zebediah Figura : winegstreamer: Use a single wg_parser_create() entry point.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: eab189810d9c40c698bd049d9af647e195cd5993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab189810d9c40c698bd049d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 1 17:18:09 2021 -0500 winegstreamer: Use a single wg_parser_create() entry point. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 13 ++++++--- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/quartz_parser.c | 8 +++--- dlls/winegstreamer/wg_parser.c | 56 ++++++++++---------------------------- 4 files changed, 28 insertions(+), 51 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 923bba25d38..9e5de174984 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -149,12 +149,17 @@ struct wg_parser_event }; C_ASSERT(sizeof(struct wg_parser_event) == 40); +enum wg_parser_type +{ + WG_PARSER_DECODEBIN, + WG_PARSER_AVIDEMUX, + WG_PARSER_MPEGAUDIOPARSE, + WG_PARSER_WAVPARSE, +}; + struct unix_funcs { - struct wg_parser *(CDECL *wg_decodebin_parser_create)(void); - struct wg_parser *(CDECL *wg_avi_parser_create)(void); - struct wg_parser *(CDECL *wg_mpeg_audio_parser_create)(void); - struct wg_parser *(CDECL *wg_wave_parser_create)(void); + struct wg_parser *(CDECL *wg_parser_create)(enum wg_parser_type type); void (CDECL *wg_parser_destroy)(struct wg_parser *parser); HRESULT (CDECL *wg_parser_connect)(struct wg_parser *parser, uint64_t file_size); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 12ca14ca139..e1e6cdbceb1 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1421,7 +1421,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; - if (!(parser = unix_funcs->wg_decodebin_parser_create())) + if (!(parser = unix_funcs->wg_parser_create(WG_PARSER_DECODEBIN))) { hr = E_OUTOFMEMORY; goto fail; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index a8e7e3d979f..f532b8969de 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1115,7 +1115,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_decodebin_parser_create())) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_DECODEBIN))) { free(object); return E_OUTOFMEMORY; @@ -1646,7 +1646,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_wave_parser_create())) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_WAVPARSE))) { free(object); return E_OUTOFMEMORY; @@ -1732,7 +1732,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_avi_parser_create())) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_AVIDEMUX))) { free(object); return E_OUTOFMEMORY; @@ -1839,7 +1839,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_mpeg_audio_parser_create())) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_MPEGAUDIOPARSE))) { free(object); return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index dde137ef186..e1127b9a059 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -49,9 +49,11 @@ typedef enum GST_DEBUG_CATEGORY_STATIC(wine); #define GST_CAT_DEFAULT wine +typedef BOOL (*init_gst_cb)(struct wg_parser *parser); + struct wg_parser { - BOOL (*init_gst)(struct wg_parser *parser); + init_gst_cb init_gst; struct wg_parser_stream **streams; unsigned int stream_count; @@ -1844,8 +1846,16 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) return TRUE; } -static struct wg_parser *wg_parser_create(void) +static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type) { + static const init_gst_cb init_funcs[] = + { + [WG_PARSER_DECODEBIN] = decodebin_parser_init_gst, + [WG_PARSER_AVIDEMUX] = avi_parser_init_gst, + [WG_PARSER_MPEGAUDIOPARSE] = mpeg_audio_parser_init_gst, + [WG_PARSER_WAVPARSE] = wave_parser_init_gst, + }; + struct wg_parser *parser; if (!(parser = calloc(1, sizeof(*parser)))) @@ -1856,47 +1866,12 @@ static struct wg_parser *wg_parser_create(void) pthread_cond_init(&parser->read_cond, NULL); pthread_cond_init(&parser->read_done_cond, NULL); parser->flushing = true; + parser->init_gst = init_funcs[type]; GST_DEBUG("Created winegstreamer parser %p.\n", parser); return parser; } -static struct wg_parser * CDECL wg_decodebin_parser_create(void) -{ - struct wg_parser *parser; - - if ((parser = wg_parser_create())) - parser->init_gst = decodebin_parser_init_gst; - return parser; -} - -static struct wg_parser * CDECL wg_avi_parser_create(void) -{ - struct wg_parser *parser; - - if ((parser = wg_parser_create())) - parser->init_gst = avi_parser_init_gst; - return parser; -} - -static struct wg_parser * CDECL wg_mpeg_audio_parser_create(void) -{ - struct wg_parser *parser; - - if ((parser = wg_parser_create())) - parser->init_gst = mpeg_audio_parser_init_gst; - return parser; -} - -static struct wg_parser * CDECL wg_wave_parser_create(void) -{ - struct wg_parser *parser; - - if ((parser = wg_parser_create())) - parser->init_gst = wave_parser_init_gst; - return parser; -} - static void CDECL wg_parser_destroy(struct wg_parser *parser) { if (parser->bus) @@ -1915,10 +1890,7 @@ static void CDECL wg_parser_destroy(struct wg_parser *parser) static const struct unix_funcs funcs = { - wg_decodebin_parser_create, - wg_avi_parser_create, - wg_mpeg_audio_parser_create, - wg_wave_parser_create, + wg_parser_create, wg_parser_destroy, wg_parser_connect,

1 0

Zebediah Figura : winegstreamer: Initialize GStreamer in wg_parser_create().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 3643f73ab61f05ddc9a637f8613c933dda0dd232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3643f73ab61f05ddc9a637f8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 1 17:18:10 2021 -0500 winegstreamer: Initialize GStreamer in wg_parser_create(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51086 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 47 +++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e1127b9a059..f27ad84df17 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1846,6 +1846,28 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) return TRUE; } +static void init_gstreamer_once(void) +{ + char arg0[] = "wine"; + char arg1[] = "--gst-disable-registry-fork"; + char *args[] = {arg0, arg1, NULL}; + int argc = ARRAY_SIZE(args) - 1; + char **argv = args; + GError *err; + + if (!gst_init_check(&argc, &argv, &err)) + { + fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", debugstr_a(err->message)); + g_error_free(err); + return; + } + + GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); + + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); +} + static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type) { static const init_gst_cb init_funcs[] = @@ -1856,8 +1878,12 @@ static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type) [WG_PARSER_WAVPARSE] = wave_parser_init_gst, }; + static pthread_once_t once = PTHREAD_ONCE_INIT; struct wg_parser *parser; + if (pthread_once(&once, init_gstreamer_once)) + return NULL; + if (!(parser = calloc(1, sizeof(*parser)))) return NULL; @@ -1923,27 +1949,6 @@ static const struct unix_funcs funcs = NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { if (reason == DLL_PROCESS_ATTACH) - { - char arg0[] = "wine"; - char arg1[] = "--gst-disable-registry-fork"; - char *args[] = {arg0, arg1, NULL}; - int argc = ARRAY_SIZE(args) - 1; - char **argv = args; - GError *err; - - if (!gst_init_check(&argc, &argv, &err)) - { - fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", debugstr_a(err->message)); - g_error_free(err); - return STATUS_UNSUCCESSFUL; - } - - GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", - gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); - *(const struct unix_funcs **)ptr_out = &funcs; - } return STATUS_SUCCESS; }

1 0

Zebediah Figura : winegstreamer: Set unlimited buffering using a flag for wg_parser_create().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 45690320f933d68f613f95f0330098426fc5a08f URL: https://source.winehq.org/git/wine.git/?a=commit;h=45690320f933d68f613f95f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 1 17:18:11 2021 -0500 winegstreamer: Set unlimited buffering using a flag for wg_parser_create(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 4 +--- dlls/winegstreamer/media_source.c | 16 +++++++--------- dlls/winegstreamer/quartz_parser.c | 8 ++++---- dlls/winegstreamer/wg_parser.c | 21 +++++++++++---------- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9e5de174984..3b477ba254a 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -159,7 +159,7 @@ enum wg_parser_type struct unix_funcs { - struct wg_parser *(CDECL *wg_parser_create)(enum wg_parser_type type); + struct wg_parser *(CDECL *wg_parser_create)(enum wg_parser_type type, bool unlimited_buffering); void (CDECL *wg_parser_destroy)(struct wg_parser *parser); HRESULT (CDECL *wg_parser_connect)(struct wg_parser *parser, uint64_t file_size); @@ -173,8 +173,6 @@ struct unix_funcs void (CDECL *wg_parser_push_data)(struct wg_parser *parser, const void *data, uint32_t size); - void (CDECL *wg_parser_set_unlimited_buffering)(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/media_source.c b/dlls/winegstreamer/media_source.c index e1e6cdbceb1..18bffca1362 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1421,7 +1421,13 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; - if (!(parser = unix_funcs->wg_parser_create(WG_PARSER_DECODEBIN))) + /* In Media Foundation, sources may read from any media source stream + * without fear of blocking due to buffering limits on another. Trailmakers, + * a Unity3D Engine game, only reads one sample from the audio stream (and + * never deselects it). Remove buffering limits from decodebin in order to + * account for this. Note that this does leak memory, but the same memory + * leak occurs with native. */ + if (!(parser = unix_funcs->wg_parser_create(WG_PARSER_DECODEBIN, true))) { hr = E_OUTOFMEMORY; goto fail; @@ -1435,14 +1441,6 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = unix_funcs->wg_parser_connect(parser, file_size))) goto fail; - /* In Media Foundation, sources may read from any media source stream - * without fear of blocking due to buffering limits on another. Trailmakers, - * a Unity3D Engine game, only reads one sample from the audio stream (and - * never deselects it). Remove buffering limits from decodebin in order to - * account for this. Note that this does leak memory, but the same memory - * leak occurs with native. */ - unix_funcs->wg_parser_set_unlimited_buffering(parser); - stream_count = unix_funcs->wg_parser_get_stream_count(parser); if (!(object->streams = calloc(stream_count, sizeof(*object->streams)))) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index f532b8969de..a1fa7daec6f 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1115,7 +1115,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_DECODEBIN))) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_DECODEBIN, false))) { free(object); return E_OUTOFMEMORY; @@ -1646,7 +1646,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_WAVPARSE))) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_WAVPARSE, false))) { free(object); return E_OUTOFMEMORY; @@ -1732,7 +1732,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_AVIDEMUX))) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_AVIDEMUX, false))) { free(object); return E_OUTOFMEMORY; @@ -1839,7 +1839,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_MPEGAUDIOPARSE))) + if (!(object->wg_parser = unix_funcs->wg_parser_create(WG_PARSER_MPEGAUDIOPARSE, false))) { free(object); return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f27ad84df17..21278682318 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -83,6 +83,8 @@ struct wg_parser } read_request; bool flushing, sink_connected; + + bool unlimited_buffering; }; struct wg_parser_stream @@ -561,13 +563,6 @@ static void CDECL wg_parser_push_data(struct wg_parser *parser, pthread_cond_signal(&parser->read_done_cond); } -static void CDECL wg_parser_set_unlimited_buffering(struct wg_parser *parser) -{ - g_object_set(parser->decodebin, "max-size-buffers", G_MAXUINT, NULL); - g_object_set(parser->decodebin, "max-size-time", G_MAXUINT64, NULL); - g_object_set(parser->decodebin, "max-size-bytes", G_MAXUINT, NULL); -} - static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) { *format = stream->preferred_format; @@ -1728,6 +1723,13 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); parser->decodebin = element; + if (parser->unlimited_buffering) + { + g_object_set(parser->decodebin, "max-size-buffers", G_MAXUINT, NULL); + g_object_set(parser->decodebin, "max-size-time", G_MAXUINT64, NULL); + g_object_set(parser->decodebin, "max-size-bytes", G_MAXUINT, NULL); + } + g_signal_connect(element, "pad-added", G_CALLBACK(pad_added_cb), parser); g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_select_cb), parser); @@ -1868,7 +1870,7 @@ static void init_gstreamer_once(void) gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } -static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type) +static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) { static const init_gst_cb init_funcs[] = { @@ -1893,6 +1895,7 @@ static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type) pthread_cond_init(&parser->read_done_cond, NULL); parser->flushing = true; parser->init_gst = init_funcs[type]; + parser->unlimited_buffering = unlimited_buffering; GST_DEBUG("Created winegstreamer parser %p.\n", parser); return parser; @@ -1928,8 +1931,6 @@ static const struct unix_funcs funcs = wg_parser_get_next_read_offset, wg_parser_push_data, - wg_parser_set_unlimited_buffering, - wg_parser_get_stream_count, wg_parser_get_stream,

1 0

Zebediah Figura : winegstreamer: Remove the no longer used start_dispatch_thread() declaration.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: a87abdbe85779adf6a2a7897bd88984587880693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87abdbe85779adf6a2a7897… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 1 17:18:12 2021 -0500 winegstreamer: Remove the no longer used start_dispatch_thread() declaration. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 3b477ba254a..3470f7870fa 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -203,8 +203,6 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; BOOL init_gstreamer(void) DECLSPEC_HIDDEN; -void start_dispatch_thread(void) DECLSPEC_HIDDEN; - extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN;

1 0

Ivo Ivanov : hidparse.sys: Preserve the original report_count in parse_new_value_caps.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: d97426be026e16f8dddcc2a003bf19c477668183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97426be026e16f8dddcc2a0… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Oct 1 09:51:04 2021 +0200 hidparse.sys: Preserve the original report_count in parse_new_value_caps. We force state->items.report_count to 1 while building the alternate value array, but the item is global and should be preserved across caps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51822 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 9 ++++----- dlls/hidparse.sys/main.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index e83cc8a3f7b..aac0da88908 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1771,8 +1771,8 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status ); - buffer[6] = 2; - buffer[7] = 4; + buffer[13] = 2; + buffer[14] = 4; ok( !memcmp( buffer, report, caps.InputReportByteLength ), "unexpected report data\n" ); status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, @@ -2460,8 +2460,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) REPORT_COUNT(1, 8), REPORT_SIZE(1, 1), INPUT(1, Cnst|Var|Abs), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), + REPORT_SIZE(1, 8), INPUT(1, Cnst|Var|Abs), /* needs to be 8 bit aligned as next has Buff */ @@ -2682,7 +2681,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = report_id ? 25 : 26, + .InputReportByteLength = report_id ? 32 : 33, .OutputReportByteLength = report_id ? 2 : 3, .FeatureReportByteLength = report_id ? 21 : 22, .NumberLinkCollectionNodes = 10, diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index ca15a91c75a..18ee23974f0 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -360,6 +360,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY { struct hid_value_caps *values; USAGE usage_page = state->items.usage_page; + USHORT report_count = state->items.report_count; DWORD i, usages_size = max( 1, state->usages_size ); USHORT *byte_length = &state->byte_length[type]; ULONG start_bit, *bit_size = &state->bit_size[type][state->items.report_id]; @@ -408,6 +409,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY state->data_count[type] = state->items.data_index_max + 1; state->items.usage_page = usage_page; + state->items.report_count = report_count; reset_local_items( state ); return TRUE; }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 6ea113fa980e488b2e17722ce73f7668f48fc0a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea113fa980e488b2e17722c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Oct 1 15:38:03 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 222 +++++++++++++++++++-------------------------------------------- 1 file changed, 66 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ea113fa980e488b2e17…

1 0

Huw Davies : nsiproxy: Use a pthread_mutex to guard the interface list.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 7199f32c0b4014785f048bc318ea59dd695d2ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7199f32c0b4014785f048bc3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 1 15:07:03 2021 +0100 nsiproxy: Use a pthread_mutex to guard the interface list. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index bf237ea16db..1d0e69c593c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -66,6 +66,8 @@ #include <net/if_types.h> #endif +#include <pthread.h> + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -102,15 +104,7 @@ struct if_entry }; static struct list if_list = LIST_INIT( if_list ); - -static CRITICAL_SECTION if_list_cs; -static CRITICAL_SECTION_DEBUG if_list_cs_debug = -{ - 0, 0, &if_list_cs, - { &if_list_cs_debug.ProcessLocksList, &if_list_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": if_list_cs") } -}; -static CRITICAL_SECTION if_list_cs = { &if_list_cs_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t if_list_lock = PTHREAD_MUTEX_INITIALIZER; static struct if_entry *find_entry_from_index( DWORD index ) { @@ -468,7 +462,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -485,7 +479,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d num++; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; @@ -503,7 +497,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -514,7 +508,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -565,7 +559,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -583,7 +577,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par } } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -599,7 +593,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -609,7 +603,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD *(NET_LUID *)data = entry->if_luid; status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -618,7 +612,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -629,7 +623,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) ret = TRUE; break; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } @@ -639,7 +633,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -650,7 +644,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) ret = TRUE; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; }

1 0

Huw Davies : nsiproxy: Use an ascii version of str(n)casecmp() instead of _strnicmp().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 280999aee223d604d60bf9c8c845ab0557a6005e URL: https://source.winehq.org/git/wine.git/?a=commit;h=280999aee223d604d60bf9c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 1 15:07:04 2021 +0100 nsiproxy: Use an ascii version of str(n)casecmp() instead of _strnicmp(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 22 +++++++++++----------- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/nsiproxy_private.h | 21 +++++++++++++++++++++ dlls/nsiproxy.sys/tcp.c | 4 ++-- dlls/nsiproxy.sys/udp.c | 6 +++--- 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 12fae3f2f12..7308e4a687e 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -261,10 +261,10 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -427,13 +427,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si while (*value == ' ') value++; if ((ptr = strchr( value, '\n' ))) *ptr='\0'; - if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6InMsgs" )) { if (sscanf( value, "%d", &res )) dyn.in_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6InErrors" )) { if (sscanf( value, "%d", &res )) dyn.in_errors = res; continue; @@ -441,7 +441,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(in_list); i++) { - if (!_strnicmp( buf, in_list[i].name, -1 )) + if (!ascii_strcasecmp( buf, in_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.in_type_counts[in_list[i].pos] = res; @@ -449,13 +449,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si } } - if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6OutMsgs" )) { if (sscanf( value, "%d", &res )) dyn.out_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6OutErrors" )) { if (sscanf( value, "%d", &res )) dyn.out_errors = res; continue; @@ -463,7 +463,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(out_list); i++) { - if (!_strnicmp( buf, out_list[i].name, -1 )) + if (!ascii_strcasecmp( buf, out_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.out_type_counts[out_list[i].pos] = res; @@ -504,10 +504,10 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_recv, in_hdr_errs, fwd_dgrams, in_delivers, out_reqs; ptr += sizeof(hdr); @@ -643,7 +643,7 @@ static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + if (!ascii_strcasecmp( buf, ipstatlist[i].name )) { if (ipstatlist[i].size == sizeof(long)) *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 1d0e69c593c..b46b53b536c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -354,7 +354,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ while ((ptr = fgets( buf, sizeof(buf), fp ))) { while (*ptr && isspace( *ptr )) ptr++; - if (!_strnicmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') + if (!ascii_strncasecmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') { unsigned long long values[9]; ptr += name_len + 1; diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 7dd8748e3f7..acc60ce4806 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -135,3 +135,24 @@ extern const struct module ipv4_module DECLSPEC_HIDDEN; extern const struct module ipv6_module DECLSPEC_HIDDEN; extern const struct module tcp_module DECLSPEC_HIDDEN; extern const struct module udp_module DECLSPEC_HIDDEN; + +static inline int ascii_strncasecmp( const char *s1, const char *s2, size_t n ) +{ + int l1, l2; + + while (n--) + { + l1 = (unsigned char)((*s1 >= 'A' && *s1 <= 'Z') ? *s1 + ('a' - 'A') : *s1); + l2 = (unsigned char)((*s2 >= 'A' && *s2 <= 'Z') ? *s2 + ('a' - 'A') : *s2); + if (l1 != l2) return l1 - l2; + if (!l1) return 0; + s1++; + s2++; + } + return 0; +} + +static inline int ascii_strcasecmp( const char *s1, const char *s2 ) +{ + return ascii_strncasecmp( s1, s2, -1 ); +} diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index f9ddf1a2b23..6b431e93c8e 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -147,10 +147,10 @@ static NTSTATUS tcp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_segs, out_segs; ptr += sizeof(hdr); diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index a0ace071753..c2dcc2c38e8 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -123,10 +123,10 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1) ) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { unsigned int in_dgrams, out_dgrams; ptr += sizeof(hdr); @@ -176,7 +176,7 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v if ((ptr = strchr( value, '\n' ))) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) - if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + if (!ascii_strcasecmp( buf, udp_stat_list[i].name ) && sscanf( value, "%d", &res )) *udp_stat_list[i].elem = res; } dyn.in_dgrams = in_dgrams;

1 0

Huw Davies : nsiproxy: Switch memory allocations to malloc().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: f6917badf1924096b979fd38a4bebbf80d002568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6917badf1924096b979fd38… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 1 15:07:05 2021 +0100 nsiproxy: Switch memory allocations to malloc(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 13 ++++++------- dlls/nsiproxy.sys/ndis.c | 11 +++++------ dlls/nsiproxy.sys/tcp.c | 33 ++++++++++++++++----------------- dlls/nsiproxy.sys/udp.c | 9 ++++----- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 7308e4a687e..90ea7957204 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -94,7 +94,6 @@ #include "ifdef.h" #include "ipmib.h" #include "netiodef.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" @@ -933,12 +932,12 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -982,7 +981,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo } next += rtm->rtm_msglen; } - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -1122,12 +1121,12 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) < 0) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, 6, buf, &needed, NULL, 0 ) < 0) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -1225,7 +1224,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void } num++; } - HeapFree( GetProcessHeap (), 0, buf ); + free( buf ); } #else FIXME( "not implemented\n" ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index b46b53b536c..90112da31bb 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -84,7 +84,6 @@ #include "ddk/wdm.h" #include "wine/nsi.h" #include "wine/list.h" -#include "wine/heap.h" #include "wine/debug.h" #include "nsiproxy_private.h" @@ -253,7 +252,7 @@ static WCHAR *strdupAtoW( const char *str ) if (!str) return ret; len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); - ret = heap_alloc( len * sizeof(WCHAR) ); + ret = malloc( len * sizeof(WCHAR) ); if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); return ret; } @@ -264,7 +263,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) int name_len = strlen( name ); if (name_len >= IFNAMSIZ - 1) return NULL; - entry = heap_alloc( sizeof(*entry) ); + entry = malloc( sizeof(*entry) ); if (!entry) return NULL; entry->if_index = index; @@ -272,7 +271,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) entry->if_name = strdupAtoW( name ); if (!entry->if_name) { - heap_free( entry ); + free( entry ); return NULL; } @@ -385,7 +384,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ struct if_data ifdata; if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) goto done; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) goto done; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) goto done; for (end = buf + needed; buf < end; buf += ifm->ifm_msglen) @@ -408,7 +407,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ } } done: - heap_free( buf ); + free( buf ); } #endif } diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 6b431e93c8e..b60e53ea15e 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -97,7 +97,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "tcpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -269,7 +268,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { fclose( fp ); goto failed; @@ -301,7 +300,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { freeifaddrs( addrs ); goto failed; @@ -325,7 +324,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) return table; failed: - heap_free( table ); + free( table ); return NULL; } @@ -356,7 +355,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) NTSTATUS ret; char *buffer = NULL, *new_buffer; - if (!(buffer = heap_alloc( buffer_len ))) return NULL; + if (!(buffer = malloc( buffer_len ))) return NULL; for (;;) { @@ -371,17 +370,17 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) if (ret != STATUS_INFO_LENGTH_MISMATCH) break; - if (!(new_buffer = heap_realloc( buffer, buffer_len ))) + if (!(new_buffer = realloc( buffer, buffer_len ))) { - heap_free( buffer ); + free( buffer ); return NULL; } buffer = new_buffer; } - if (!(map = heap_alloc( process_count * sizeof(*map) ))) + if (!(map = malloc( process_count * sizeof(*map) ))) { - heap_free( buffer ); + free( buffer ); return NULL; } @@ -400,7 +399,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) pos += process->thread_count * sizeof(struct thread_info); } - heap_free( buffer ); + free( buffer ); *num_entries = process_count; return map; } @@ -495,7 +494,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); if (fd_len <= 0) continue; - fds = heap_alloc( fd_len ); + fds = malloc( fd_len ); if (!fds) continue; proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, fds, fd_len ); @@ -507,12 +506,12 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN proc_pidfdinfo( map[i].unix_pid, fds[j].proc_fd, PROC_PIDFDSOCKETINFO, &sock, sizeof(sock) ); if (sock.psi.soi_pcb == inode) { - heap_free( fds ); + free( fds ); return map[i].pid; } } - heap_free( fds ); + free( fds ); } return 0; #else @@ -638,7 +637,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -728,7 +727,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -738,8 +737,8 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index c2dcc2c38e8..f25aac98ba0 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -77,7 +77,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "udpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -309,7 +308,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -386,7 +385,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -396,8 +395,8 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; }

1 0