September 2023 - Wine-Commits

Ziqing Hui : mf/tests: Call check_attributes in check_mft_get_output_current_type_.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: c22b9defe73833941526fc41849b8e6dc74e83b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c22b9defe73833941526fc41849b8e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Aug 26 14:56:45 2023 +0800 mf/tests: Call check_attributes in check_mft_get_output_current_type_. --- dlls/mf/tests/transform.c | 63 ++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 34 deletions(-)

1 0

Ziqing Hui : winegstreamer: Add codec data to h264 format.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 320383c594c4eef821ea380b52021d32c8073056 URL: https://gitlab.winehq.org/wine/wine/-/commit/320383c594c4eef821ea380b52021d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 16 10:57:38 2023 +0800 winegstreamer: Add codec data to h264 format. --- dlls/winegstreamer/mfplat.c | 17 ++++++++++++++++- dlls/winegstreamer/unixlib.h | 2 ++ dlls/winegstreamer/wg_format.c | 14 ++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 7a37f25fcb2..c7906a8bc1f 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -804,8 +804,9 @@ static void mf_media_type_to_wg_format_audio_wma(IMFMediaType *type, const GUID static void mf_media_type_to_wg_format_video_h264(IMFMediaType *type, struct wg_format *format) { + UINT32 profile, level, codec_data_len; UINT64 frame_rate, frame_size; - UINT32 profile, level; + BYTE *codec_data; memset(format, 0, sizeof(*format)); format->major_type = WG_MAJOR_TYPE_VIDEO_H264; @@ -832,6 +833,20 @@ static void mf_media_type_to_wg_format_video_h264(IMFMediaType *type, struct wg_ if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_MPEG2_LEVEL, &level))) format->u.video_h264.level = level; + + if (SUCCEEDED(IMFMediaType_GetAllocatedBlob(type, &MF_MT_MPEG_SEQUENCE_HEADER, &codec_data, &codec_data_len))) + { + if (codec_data_len <= sizeof(format->u.video_h264.codec_data)) + { + format->u.video_h264.codec_data_len = codec_data_len; + memcpy(format->u.video_h264.codec_data, codec_data, codec_data_len); + } + else + { + WARN("Codec data buffer too small, codec data size %u.\n", codec_data_len); + } + CoTaskMemFree(codec_data); + } } static void mf_media_type_to_wg_format_video_indeo(IMFMediaType *type, uint32_t version, struct wg_format *format) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 702bd7aa69b..15e0605fdde 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -148,6 +148,8 @@ struct wg_format uint32_t fps_n, fps_d; uint32_t profile; uint32_t level; + uint32_t codec_data_len; + unsigned char codec_data[64]; } video_h264; struct { diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index bd0ebf892c1..2353839bbc4 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -553,6 +553,7 @@ static GstCaps *wg_format_to_caps_audio_wma(const struct wg_format *format) static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format) { const char *profile, *level; + GstBuffer *buffer; GstCaps *caps; if (!(caps = gst_caps_new_empty_simple("video/x-h264"))) @@ -609,6 +610,19 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format) if (level) gst_caps_set_simple(caps, "level", G_TYPE_STRING, level, NULL); + if (format->u.video_h264.codec_data_len) + { + if (!(buffer = gst_buffer_new_and_alloc(format->u.video_h264.codec_data_len))) + { + gst_caps_unref(caps); + return NULL; + } + + gst_buffer_fill(buffer, 0, format->u.video_h264.codec_data, format->u.video_h264.codec_data_len); + gst_caps_set_simple(caps, "codec_data", GST_TYPE_BUFFER, buffer, NULL); + gst_buffer_unref(buffer); + } + return caps; }

1 0

Alexandre Julliard : makedep: Make the spec file optional for testdll resources.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: cfcf5ca2866adca4b65d5a7596dda349a410d7b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfcf5ca2866adca4b65d5a7596dda3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 12:40:29 2023 +0200 makedep: Make the spec file optional for testdll resources. --- dlls/dinput/tests/Makefile.in | 3 --- dlls/dinput/tests/driver_bus.spec | 1 - dlls/dinput/tests/driver_hid.spec | 1 - dlls/dinput/tests/driver_hid_poll.spec | 1 - dlls/ntoskrnl.exe/tests/Makefile.in | 5 ----- dlls/ntoskrnl.exe/tests/driver.spec | 1 - dlls/ntoskrnl.exe/tests/driver2.spec | 1 - dlls/ntoskrnl.exe/tests/driver3.spec | 1 - dlls/ntoskrnl.exe/tests/driver_netio.spec | 1 - dlls/ntoskrnl.exe/tests/driver_pnp.spec | 1 - tools/makedep.c | 5 +---- 11 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 0123f86cb04..608b817e0f4 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -12,11 +12,8 @@ SOURCES = \ device8.c \ dinput.c \ driver_bus.c \ - driver_bus.spec \ driver_hid.c \ - driver_hid.spec \ driver_hid_poll.c \ - driver_hid_poll.spec \ force_feedback.c \ hid.c \ hotplug.c \ diff --git a/dlls/dinput/tests/driver_bus.spec b/dlls/dinput/tests/driver_bus.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/dinput/tests/driver_bus.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/dinput/tests/driver_hid.spec b/dlls/dinput/tests/driver_hid.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/dinput/tests/driver_hid.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/dinput/tests/driver_hid_poll.spec b/dlls/dinput/tests/driver_hid_poll.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/dinput/tests/driver_hid_poll.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index ab1db85adbb..f610df6a947 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -14,13 +14,8 @@ driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ - driver.spec \ driver2.c \ - driver2.spec \ driver3.c \ - driver3.spec \ driver_netio.c \ - driver_netio.spec \ driver_pnp.c \ - driver_pnp.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.spec b/dlls/ntoskrnl.exe/tests/driver.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver2.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver3.spec b/dlls/ntoskrnl.exe/tests/driver3.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver3.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.spec b/dlls/ntoskrnl.exe/tests/driver_netio.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver_netio.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.spec b/dlls/ntoskrnl.exe/tests/driver_pnp.spec deleted file mode 100644 index ad33444716a..00000000000 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing here yet diff --git a/tools/makedep.c b/tools/makedep.c index 85b111941b5..5939e0e6798 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3077,7 +3077,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour struct strarray dll_flags = empty_strarray; struct strarray default_imports = empty_strarray; struct strarray all_libs, dep_libs; - const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext; + const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext = ".dll"; struct incl_file *spec_file = find_src_file( make, strmake( "%.spec", obj )); unsigned int arch; @@ -3085,10 +3085,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour strarray_addall( &dll_flags, make->extradllflags ); strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" )); if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); - if (strarray_exists( &dll_flags, "-mconsole" )) ext = ".exe"; - else if (!spec_file) fatal_error( "testdll source %s needs a .spec file\n", source->name ); - else ext = ".dll"; for (arch = 0; arch < archs.count; arch++) {

1 0

Ziqing Hui : winegstreamer: Add push_event wrapper.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 97555dff0e8b75480791949b61a19d1c955652a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/97555dff0e8b75480791949b61a19d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 16 10:55:46 2023 +0800 winegstreamer: Add push_event wrapper. --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.c | 14 ++++++++++++++ dlls/winegstreamer/wg_parser.c | 12 ++++++------ dlls/winegstreamer/wg_transform.c | 16 ++++++++-------- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index db6bf3ebb2e..8bef7b2b2bd 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -39,6 +39,7 @@ extern GstElement *find_element(GstElementFactoryListType type, GstCaps *src_cap extern bool append_element(GstElement *container, GstElement *element, GstElement **first, GstElement **last) DECLSPEC_HIDDEN; extern bool link_src_to_element(GstPad *src_pad, GstElement *element) DECLSPEC_HIDDEN; extern bool link_element_to_sink(GstElement *element, GstPad *sink_pad) DECLSPEC_HIDDEN; +extern bool push_event(GstPad *pad, GstEvent *event) DECLSPEC_HIDDEN; /* wg_format.c */ diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index 6ed38260536..7e5ef34c4d7 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -202,6 +202,20 @@ bool link_element_to_sink(GstElement *element, GstPad *sink_pad) return !ret; } +bool push_event(GstPad *pad, GstEvent *event) +{ + if (!gst_pad_push_event(pad, event)) + { + const gchar *type_name = gst_event_type_get_name(GST_EVENT_TYPE(event)); + gchar *pad_name = gst_pad_get_name(pad); + + GST_ERROR("Failed to push %s event %p to pad %s.", type_name, event, pad_name); + g_free(pad_name); + return false; + } + return true; +} + NTSTATUS wg_init_gstreamer(void *arg) { char arg0[] = "wine"; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 298c05c6b88..5556b52829c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -258,7 +258,7 @@ static NTSTATUS wg_parser_stream_enable(void *args) gst_util_set_object_arg(G_OBJECT(stream->flip), "method", flip ? "vertical-flip" : "none"); } - gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); + push_event(stream->my_sink, gst_event_new_reconfigure()); return S_OK; } @@ -450,7 +450,7 @@ static NTSTATUS wg_parser_stream_seek(void *args) if ((stop_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) stop_type = GST_SEEK_TYPE_NONE; - if (!gst_pad_push_event(get_stream(params->stream)->my_sink, gst_event_new_seek(params->rate, GST_FORMAT_TIME, + if (!push_event(get_stream(params->stream)->my_sink, gst_event_new_seek(params->rate, GST_FORMAT_TIME, flags, start_type, params->start_pos * 100, stop_type, params->stop_pos * 100))) GST_ERROR("Failed to seek.\n"); @@ -480,7 +480,7 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) if (!(event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, params->proportion, params->diff * 100, stream_time))) GST_ERROR("Failed to create QOS event.\n"); - gst_pad_push_event(stream->my_sink, event); + push_event(stream->my_sink, event); return S_OK; } @@ -1292,7 +1292,7 @@ static void *push_data(void *arg) gst_buffer_unref(buffer); - gst_pad_push_event(parser->my_src, gst_event_new_eos()); + push_event(parser->my_src, gst_event_new_eos()); GST_DEBUG("Stopping push thread."); @@ -1421,7 +1421,7 @@ static gboolean src_perform_seek(struct wg_parser *parser, GstEvent *event) { flush_event = gst_event_new_flush_start(); gst_event_set_seqnum(flush_event, seqnum); - gst_pad_push_event(parser->my_src, flush_event); + push_event(parser->my_src, flush_event); if (thread) gst_pad_set_active(parser->my_src, 1); } @@ -1433,7 +1433,7 @@ static gboolean src_perform_seek(struct wg_parser *parser, GstEvent *event) { flush_event = gst_event_new_flush_stop(TRUE); gst_event_set_seqnum(flush_event, seqnum); - gst_pad_push_event(parser->my_src, flush_event); + push_event(parser->my_src, flush_event); if (thread) gst_pad_set_active(parser->my_src, 1); } diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 25dfb62b08c..e2b14527a20 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -443,10 +443,10 @@ NTSTATUS wg_transform_create(void *args) goto out; if (!(event = gst_event_new_stream_start("stream")) - || !gst_pad_push_event(transform->my_src, event)) + || !push_event(transform->my_src, event)) goto out; if (!(event = gst_event_new_caps(src_caps)) - || !gst_pad_push_event(transform->my_src, event)) + || !push_event(transform->my_src, event)) goto out; /* We need to use GST_FORMAT_TIME here because it's the only format @@ -455,7 +455,7 @@ NTSTATUS wg_transform_create(void *args) transform->segment.start = 0; transform->segment.stop = -1; if (!(event = gst_event_new_segment(&transform->segment)) - || !gst_pad_push_event(transform->my_src, event)) + || !push_event(transform->my_src, event)) goto out; gst_caps_unref(src_caps); @@ -531,7 +531,7 @@ NTSTATUS wg_transform_set_output_format(void *args) value = "none"; gst_util_set_object_arg(G_OBJECT(transform->video_flip), "method", value); } - if (!gst_pad_push_event(transform->my_sink, gst_event_new_reconfigure())) + if (!push_event(transform->my_sink, gst_event_new_reconfigure())) { GST_ERROR("Failed to reconfigure transform %p.", transform); return STATUS_UNSUCCESSFUL; @@ -892,16 +892,16 @@ NTSTATUS wg_transform_drain(void *args) } if (!(event = gst_event_new_segment_done(GST_FORMAT_TIME, -1)) - || !gst_pad_push_event(transform->my_src, event)) + || !push_event(transform->my_src, event)) goto error; if (!(event = gst_event_new_eos()) - || !gst_pad_push_event(transform->my_src, event)) + || !push_event(transform->my_src, event)) goto error; if (!(event = gst_event_new_stream_start("stream")) - || !gst_pad_push_event(transform->my_src, event)) + || !push_event(transform->my_src, event)) goto error; if (!(event = gst_event_new_segment(&transform->segment)) - || !gst_pad_push_event(transform->my_src, event)) + || !push_event(transform->my_src, event)) goto error; return STATUS_SUCCESS;

1 0

Alexandre Julliard : makedep: Make the spec file optional for native modules.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: aa15f41d0409584d32128c98126debada5b9c995 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa15f41d0409584d32128c98126deb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 13:21:42 2023 +0200 makedep: Make the spec file optional for native modules. --- dlls/fltmgr.sys/Makefile.in | 3 ++- dlls/http.sys/http.sys.spec | 1 - dlls/ksecdd.sys/Makefile.in | 8 ++++---- dlls/mountmgr.sys/mountmgr.sys.spec | 1 - dlls/ndis.sys/Makefile.in | 5 +++-- dlls/netio.sys/Makefile.in | 5 +++-- dlls/nsiproxy.sys/nsiproxy.sys.spec | 1 - dlls/scsiport.sys/Makefile.in | 5 +++-- dlls/tdi.sys/Makefile.in | 5 +++-- dlls/usbd.sys/Makefile.in | 5 +++-- dlls/winebus.sys/winebus.sys.spec | 1 - dlls/winehid.sys/winehid.sys.spec | 1 - dlls/wineusb.sys/wineusb.sys.spec | 1 - dlls/winexinput.sys/winexinput.sys.spec | 1 - tools/make_makefiles | 4 +++- tools/makedep.c | 17 ++++++----------- 16 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in index ba106a43831..6ebd48d9412 100644 --- a/dlls/fltmgr.sys/Makefile.in +++ b/dlls/fltmgr.sys/Makefile.in @@ -1,5 +1,6 @@ MODULE = fltmgr.sys EXTRADLLFLAGS = -Wl,--subsystem,native -C_SRCS = \ +SOURCES = \ + fltmgr.sys.spec \ main.c diff --git a/dlls/http.sys/http.sys.spec b/dlls/http.sys/http.sys.spec deleted file mode 100644 index 76421d7e35b..00000000000 --- a/dlls/http.sys/http.sys.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing to export diff --git a/dlls/ksecdd.sys/Makefile.in b/dlls/ksecdd.sys/Makefile.in index 2405dc6047c..b503210a2b0 100644 --- a/dlls/ksecdd.sys/Makefile.in +++ b/dlls/ksecdd.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = ksecdd.sys EXTRADLLFLAGS = -Wl,--subsystem,native -C_SRCS = \ - main.c - -RC_SRCS = version.rc +SOURCES = \ + ksecdd.sys.spec \ + main.c \ + version.rc diff --git a/dlls/mountmgr.sys/mountmgr.sys.spec b/dlls/mountmgr.sys/mountmgr.sys.spec deleted file mode 100644 index 76421d7e35b..00000000000 --- a/dlls/mountmgr.sys/mountmgr.sys.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing to export diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index baeae05d5c4..ca5400b3c3c 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -3,5 +3,6 @@ IMPORTS = advapi32 ntoskrnl iphlpapi EXTRADLLFLAGS = -Wl,--subsystem,native -C_SRCS = \ - main.c +SOURCES = \ + main.c \ + ndis.sys.spec diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in index 1cbac91c037..d5230a52c96 100644 --- a/dlls/netio.sys/Makefile.in +++ b/dlls/netio.sys/Makefile.in @@ -4,5 +4,6 @@ IMPORTS = ntoskrnl ws2_32 EXTRADLLFLAGS = -Wl,--subsystem,native -C_SRCS = \ - netio.c +SOURCES = \ + netio.c \ + netio.sys.spec diff --git a/dlls/nsiproxy.sys/nsiproxy.sys.spec b/dlls/nsiproxy.sys/nsiproxy.sys.spec deleted file mode 100644 index 590a204a2b0..00000000000 --- a/dlls/nsiproxy.sys/nsiproxy.sys.spec +++ /dev/null @@ -1 +0,0 @@ -# no exported functions diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in index 2f438737cf0..7c6c3411c98 100644 --- a/dlls/scsiport.sys/Makefile.in +++ b/dlls/scsiport.sys/Makefile.in @@ -3,5 +3,6 @@ IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wl,--subsystem,native -C_SRCS = \ - scsiport.c +SOURCES = \ + scsiport.c \ + scsiport.sys.spec diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index 21478b9c922..c81dd0243a5 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -2,5 +2,6 @@ MODULE = tdi.sys EXTRADLLFLAGS = -Wl,--subsystem,native -C_SRCS = \ - main.c +SOURCES = \ + main.c \ + tdi.sys.spec diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index 6040071ddaf..c755df3dbbe 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -4,5 +4,6 @@ IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wl,--subsystem,native -C_SRCS = \ - usbd.c +SOURCES = \ + usbd.c \ + usbd.sys.spec diff --git a/dlls/winebus.sys/winebus.sys.spec b/dlls/winebus.sys/winebus.sys.spec deleted file mode 100644 index 76421d7e35b..00000000000 --- a/dlls/winebus.sys/winebus.sys.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing to export diff --git a/dlls/winehid.sys/winehid.sys.spec b/dlls/winehid.sys/winehid.sys.spec deleted file mode 100644 index 76421d7e35b..00000000000 --- a/dlls/winehid.sys/winehid.sys.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing to export diff --git a/dlls/wineusb.sys/wineusb.sys.spec b/dlls/wineusb.sys/wineusb.sys.spec deleted file mode 100644 index 76421d7e35b..00000000000 --- a/dlls/wineusb.sys/wineusb.sys.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing to export diff --git a/dlls/winexinput.sys/winexinput.sys.spec b/dlls/winexinput.sys/winexinput.sys.spec deleted file mode 100644 index 76421d7e35b..00000000000 --- a/dlls/winexinput.sys/winexinput.sys.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing to export diff --git a/tools/make_makefiles b/tools/make_makefiles index 7bb87559da7..3cb272c5c06 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -382,7 +382,9 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.spec$/) { my $dllflags = ${$make}{"EXTRADLLFLAGS"} || ""; - next unless defined ${$make}{"TESTDLL"} || ($dllflags =~ /-Wb,--data-only/); + next unless defined ${$make}{"TESTDLL"} || + ($dllflags =~ /-Wb,--data-only/) || + ($dllflags =~ /-Wl,--subsystem,native/); } elsif ($name =~ /\.nls$/) { diff --git a/tools/makedep.c b/tools/makedep.c index 1ac2749c022..7898fd04294 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3304,15 +3304,13 @@ static const struct /******************************************************************* * output_fake_module */ -static void output_fake_module( struct makefile *make ) +static void output_fake_module( struct makefile *make, const char *spec_file ) { unsigned int arch = 0; /* fake modules are always native */ - const char *spec_file = NULL, *name = strmake( "%s%s", arch_pe_dirs[arch], make->module ); + const char *name = strmake( "%s%s", arch_pe_dirs[arch], make->module ); if (make->disabled[arch]) return; - if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_add( &make->all_targets[arch], name ); add_install_rule( make, make->module, arch, name, strmake( "d$(dlldir)/%s", name )); @@ -3324,11 +3322,8 @@ static void output_fake_module( struct makefile *make ) output( "\n" ); output_winegcc_command( make, arch ); output_filename( "-Wb,--fake-module" ); - if (spec_file) - { - output_filename( "-shared" ); - output_filename( spec_file ); - } + if (!make->is_exe) output_filename( "-shared" ); + if (spec_file) output_filename( spec_file ); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->res_files[arch] ); output( "\n" ); @@ -3353,7 +3348,7 @@ static void output_module( struct makefile *make, unsigned int arch ) if (!make->is_exe) { - if (make->data_only) + if (make->data_only || strarray_exists( &make->extradllflags, "-Wl,--subsystem,native" )) { /* spec file is optional */ struct incl_file *spec = find_src_file( make, replace_extension( make->module, ".dll", ".spec" )); @@ -3415,7 +3410,7 @@ static void output_module( struct makefile *make, unsigned int arch ) output_filename( arch_make_variable( "LDFLAGS", arch )); output( "\n" ); - if (!make->data_only && !arch && unix_lib_supported) output_fake_module( make ); + if (!make->data_only && !arch && unix_lib_supported) output_fake_module( make, spec_file ); }

1 0

Alexandre Julliard : makedep: Make the spec file optional for data-only dlls.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: f1ff3179aaf3beffcfcfc556ba03a09f29e30c34 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1ff3179aaf3beffcfcfc556ba03a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 13:07:18 2023 +0200 makedep: Make the spec file optional for data-only dlls. --- dlls/activeds.tlb/activeds.tlb.spec | 1 - dlls/apisetschema/Makefile.in | 2 ++ dlls/icmp/Makefile.in | 2 ++ dlls/light.msstyles/light.msstyles.spec | 1 - dlls/lz32/Makefile.in | 4 +++- dlls/mferror/mferror.spec | 1 - dlls/mshtml.tlb/mshtml.tlb.spec | 1 - dlls/msimsg/msimsg.spec | 1 - dlls/normaliz/Makefile.in | 2 ++ dlls/security/Makefile.in | 2 ++ dlls/sfc/Makefile.in | 2 ++ dlls/shdoclc/shdoclc.spec | 1 - dlls/stdole2.tlb/stdole2.tlb.spec | 1 - dlls/stdole32.tlb/stdole32.tlb.spec | 1 - dlls/tzres/tzres.spec | 1 - dlls/usp10/Makefile.in | 2 ++ dlls/wmi/Makefile.in | 2 ++ tools/make_makefiles | 3 ++- tools/makedep.c | 18 ++++++++++++------ 19 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/activeds.tlb/activeds.tlb.spec b/dlls/activeds.tlb/activeds.tlb.spec deleted file mode 100644 index b427b2913c6..00000000000 --- a/dlls/activeds.tlb/activeds.tlb.spec +++ /dev/null @@ -1 +0,0 @@ -# no exported entry points diff --git a/dlls/apisetschema/Makefile.in b/dlls/apisetschema/Makefile.in index 5d0adf1f82d..3bc6935f940 100644 --- a/dlls/apisetschema/Makefile.in +++ b/dlls/apisetschema/Makefile.in @@ -1,3 +1,5 @@ MODULE = apisetschema.dll EXTRADLLFLAGS = -Wb,--data-only + +SOURCES = apisetschema.spec diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index 93213ab130b..86398388d4e 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -1,3 +1,5 @@ MODULE = icmp.dll EXTRADLLFLAGS = -Wb,--data-only + +SOURCES = icmp.spec diff --git a/dlls/light.msstyles/light.msstyles.spec b/dlls/light.msstyles/light.msstyles.spec deleted file mode 100644 index b427b2913c6..00000000000 --- a/dlls/light.msstyles/light.msstyles.spec +++ /dev/null @@ -1 +0,0 @@ -# no exported entry points diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in index d67f7d70fe8..69e1a94daf9 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lz32/Makefile.in @@ -3,4 +3,6 @@ IMPORTLIB = lz32 EXTRADLLFLAGS = -Wb,--data-only -RC_SRCS = version.rc +SOURCES = \ + lz32.spec \ + version.rc diff --git a/dlls/mferror/mferror.spec b/dlls/mferror/mferror.spec deleted file mode 100644 index 2792acf3607..00000000000 --- a/dlls/mferror/mferror.spec +++ /dev/null @@ -1 +0,0 @@ -# This is resource dll diff --git a/dlls/mshtml.tlb/mshtml.tlb.spec b/dlls/mshtml.tlb/mshtml.tlb.spec deleted file mode 100644 index b427b2913c6..00000000000 --- a/dlls/mshtml.tlb/mshtml.tlb.spec +++ /dev/null @@ -1 +0,0 @@ -# no exported entry points diff --git a/dlls/msimsg/msimsg.spec b/dlls/msimsg/msimsg.spec deleted file mode 100644 index 1bb8bf6d7fd..00000000000 --- a/dlls/msimsg/msimsg.spec +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/dlls/normaliz/Makefile.in b/dlls/normaliz/Makefile.in index a466e0ce7fc..4834502ee1d 100644 --- a/dlls/normaliz/Makefile.in +++ b/dlls/normaliz/Makefile.in @@ -2,3 +2,5 @@ MODULE = normaliz.dll IMPORTLIB = normaliz EXTRADLLFLAGS = -Wb,--data-only + +SOURCES = normaliz.spec diff --git a/dlls/security/Makefile.in b/dlls/security/Makefile.in index ff4a5a7363a..ce96f8e1c52 100644 --- a/dlls/security/Makefile.in +++ b/dlls/security/Makefile.in @@ -2,3 +2,5 @@ MODULE = security.dll IMPORTS = secur32 EXTRADLLFLAGS = -Wb,--data-only + +SOURCES = security.spec diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in index 1c8fe4f9b8c..14c2f34b0fa 100644 --- a/dlls/sfc/Makefile.in +++ b/dlls/sfc/Makefile.in @@ -2,3 +2,5 @@ MODULE = sfc.dll IMPORTLIB = sfc EXTRADLLFLAGS = -Wb,--data-only -Wb,--prefer-native + +SOURCES = sfc.spec diff --git a/dlls/shdoclc/shdoclc.spec b/dlls/shdoclc/shdoclc.spec deleted file mode 100644 index 590a204a2b0..00000000000 --- a/dlls/shdoclc/shdoclc.spec +++ /dev/null @@ -1 +0,0 @@ -# no exported functions diff --git a/dlls/stdole2.tlb/stdole2.tlb.spec b/dlls/stdole2.tlb/stdole2.tlb.spec deleted file mode 100644 index b427b2913c6..00000000000 --- a/dlls/stdole2.tlb/stdole2.tlb.spec +++ /dev/null @@ -1 +0,0 @@ -# no exported entry points diff --git a/dlls/stdole32.tlb/stdole32.tlb.spec b/dlls/stdole32.tlb/stdole32.tlb.spec deleted file mode 100644 index b427b2913c6..00000000000 --- a/dlls/stdole32.tlb/stdole32.tlb.spec +++ /dev/null @@ -1 +0,0 @@ -# no exported entry points diff --git a/dlls/tzres/tzres.spec b/dlls/tzres/tzres.spec deleted file mode 100644 index 1126204203d..00000000000 --- a/dlls/tzres/tzres.spec +++ /dev/null @@ -1 +0,0 @@ -# nothing exported diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 016891af651..0d8a865b9f0 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -2,3 +2,5 @@ MODULE = usp10.dll IMPORTLIB = usp10 EXTRADLLFLAGS = -Wb,--data-only + +SOURCES = usp10.spec diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in index de7719654ff..fde1177f9a5 100644 --- a/dlls/wmi/Makefile.in +++ b/dlls/wmi/Makefile.in @@ -2,3 +2,5 @@ MODULE = wmi.dll IMPORTS = advapi32 EXTRADLLFLAGS = -Wb,--data-only + +SOURCES = wmi.spec diff --git a/tools/make_makefiles b/tools/make_makefiles index 13252ef8232..7bb87559da7 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -381,7 +381,8 @@ sub assign_sources_to_makefiles(@) } elsif ($name =~ /\.spec$/) { - next unless defined ${$make}{"TESTDLL"}; + my $dllflags = ${$make}{"EXTRADLLFLAGS"} || ""; + next unless defined ${$make}{"TESTDLL"} || ($dllflags =~ /-Wb,--data-only/); } elsif ($name =~ /\.nls$/) { diff --git a/tools/makedep.c b/tools/makedep.c index 5939e0e6798..1ac2749c022 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3351,7 +3351,16 @@ static void output_module( struct makefile *make, unsigned int arch ) if (make->disabled[arch]) return; - if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + if (!make->is_exe) + { + if (make->data_only) + { + /* spec file is optional */ + struct incl_file *spec = find_src_file( make, replace_extension( make->module, ".dll", ".spec" )); + if (spec) spec_file = spec->filename; + } + else spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + } if (!make->data_only) { @@ -3394,11 +3403,8 @@ static void output_module( struct makefile *make, unsigned int arch ) output( "\n" ); output_winegcc_command( make, arch ); if (arch) output_filename( "-Wl,--wine-builtin" ); - if (spec_file) - { - output_filename( "-shared" ); - output_filename( spec_file ); - } + if (!make->is_exe) output_filename( "-shared" ); + if (spec_file) output_filename( spec_file ); output_filenames( make->extradllflags ); if (arch) output_filenames( get_expanded_arch_var_array( make, "EXTRADLLFLAGS", arch )); output_filenames_obj_dir( make, make->object_files[arch] );

1 0

Rémi Bernon : windows.applicationmodel/tests: Test executing a WinRT package application.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 9ac4f151c0931fff131e48e75c2c3d9348ee17bb URL: https://gitlab.winehq.org/wine/wine/-/commit/9ac4f151c0931fff131e48e75c2c3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 23 11:21:33 2023 +0200 windows.applicationmodel/tests: Test executing a WinRT package application. --- dlls/windows.applicationmodel/tests/application.c | 17 ++ dlls/windows.applicationmodel/tests/model.c | 52 +++++ dlls/windows.applicationmodel/tests/winrt_test.h | 245 ++++++++++++++++++++++ 3 files changed, 314 insertions(+)

1 0

Rémi Bernon : windows.applicationmodel/tests: Test IPackageManager_RegisterPackageAsync.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 8609fef5c822e32998725bad58582764d289c194 URL: https://gitlab.winehq.org/wine/wine/-/commit/8609fef5c822e32998725bad585827… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 23 11:21:33 2023 +0200 windows.applicationmodel/tests: Test IPackageManager_RegisterPackageAsync. --- dlls/windows.applicationmodel/tests/Makefile.in | 10 +- dlls/windows.applicationmodel/tests/application.c | 33 +++ .../tests/appxmanifest.xml | 26 ++ dlls/windows.applicationmodel/tests/model.c | 326 +++++++++++++++++++++ dlls/windows.applicationmodel/tests/resource.rc | 22 ++ 5 files changed, 414 insertions(+), 3 deletions(-)

1 0

Rémi Bernon : makedep: Support generating .exe TESTDLL resources.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 19c1cc1c3ed57a114474042dbe09fae4333f4d5a URL: https://gitlab.winehq.org/wine/wine/-/commit/19c1cc1c3ed57a114474042dbe09fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 16:44:37 2023 +0200 makedep: Support generating .exe TESTDLL resources. --- tools/makedep.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9d2f6317ece..85b111941b5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3077,7 +3077,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour struct strarray dll_flags = empty_strarray; struct strarray default_imports = empty_strarray; struct strarray all_libs, dep_libs; - const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file; + const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext; struct incl_file *spec_file = find_src_file( make, strmake( "%.spec", obj )); unsigned int arch; @@ -3086,7 +3086,9 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" )); if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); - if (!spec_file) fatal_error( "testdll source %s needs a .spec file\n", source->name ); + if (strarray_exists( &dll_flags, "-mconsole" )) ext = ".exe"; + else if (!spec_file) fatal_error( "testdll source %s needs a .spec file\n", source->name ); + else ext = ".dll"; for (arch = 0; arch < archs.count; arch++) { @@ -3095,7 +3097,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); if (!arch) strarray_addall( &all_libs, libs ); - dll_name = arch_module_name( strmake( "%s.dll", obj ), arch ); + dll_name = arch_module_name( strmake( "%s%s", obj, ext ), arch ); obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj )); output_file = obj_dir_path( make, dll_name ); output_rsrc = strmake( "%s.res", dll_name ); @@ -3109,11 +3111,11 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour output_filename( output_file ); output_filename( tools_path( make, "wrc" )); output( "\n" ); - output( "\t%secho \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), obj, output_file, + output( "\t%secho \"%s%s TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), obj, ext, output_file, tools_path( make, "wrc" )); output( "%s:", output_file ); - output_filename( spec_file->filename ); + if (spec_file) output_filename( spec_file->filename ); output_filename( obj_name ); if (res_name) output_filename( res_name ); output_filenames( dep_libs ); @@ -3124,8 +3126,8 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour output_filename( "-s" ); output_filenames( dll_flags ); if (arch) output_filenames( get_expanded_arch_var_array( make, "EXTRADLLFLAGS", arch )); - output_filename( "-shared" ); - output_filename( spec_file->filename ); + if (!strcmp( ext, ".dll" )) output_filename( "-shared" ); + if (spec_file) output_filename( spec_file->filename ); output_filename( obj_name ); if (res_name) output_filename( res_name ); if ((debug_file = get_debug_file( make, dll_name, arch )))

1 0

Rémi Bernon : makedep: Use #pragma makedep testdll for TESTDLL resources.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 81da9ff0f8dea4932a3afdc4c447c1c9242bb596 URL: https://gitlab.winehq.org/wine/wine/-/commit/81da9ff0f8dea4932a3afdc4c447c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 makedep: Use #pragma makedep testdll for TESTDLL resources. --- dlls/combase/tests/wine.combase.test.c | 4 ++++ dlls/dinput/tests/driver_bus.c | 4 ++++ dlls/dinput/tests/driver_hid.c | 4 ++++ dlls/dinput/tests/driver_hid_poll.c | 4 ++++ dlls/imagehlp/tests/testdll.c | 4 ++++ dlls/imm32/tests/ime_wrapper.c | 4 ++++ dlls/kernel32/tests/dummy.c | 22 ++++++++++++++++++++ dlls/msi/tests/custom.c | 4 ++++ dlls/msi/tests/selfreg.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver2.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver3.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver_netio.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver_pnp.c | 4 ++++ dlls/ole32/tests/testlib.c | 4 ++++ dlls/setupapi/tests/coinst.c | 4 ++++ dlls/setupapi/tests/selfreg.c | 4 ++++ dlls/ucrtbase/tests/threaddll.c | 4 ++++ tools/makedep.c | 38 ++++++++++++++++++++++++---------- 19 files changed, 117 insertions(+), 11 deletions(-)

1 0