wine-commits

wine-commits@winehq.org

1 participants
185806 discussions

Zhiyi Zhang : rometadata: Add initial dll.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: cbf1310f87f24238f37d57ebc48f07dbd992b4a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbf1310f87f24238f37d57ebc48f07… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 24 12:16:18 2024 +0800 rometadata: Add initial dll. --- configure | 3 + configure.ac | 2 + dlls/rometadata/Makefile.in | 6 ++ dlls/rometadata/main.c | 194 +++++++++++++++++++++++++++++++++++++ dlls/rometadata/rometadata.spec | 1 + dlls/rometadata/tests/Makefile.in | 5 + dlls/rometadata/tests/rometadata.c | 70 +++++++++++++ include/Makefile.in | 1 + include/rometadata.h | 24 +++++ 9 files changed, 306 insertions(+)

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put MaxRecords.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: c483e5d45606b497812e16d26b1e146cd8c6cb16 URL: https://gitlab.winehq.org/wine/wine/-/commit/c483e5d45606b497812e16d26b1e14… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 18:59:50 2024 +1000 msado15: Implement _Recordset get/put MaxRecords. --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 17 ++++++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1b1c033320a..b288f4c547c 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -51,6 +51,7 @@ struct recordset IRowset *row_set; EditModeEnum editmode; LONG cache_size; + ADO_LONGPTR max_records; VARIANT filter; DBTYPE *columntypes; @@ -1532,14 +1533,20 @@ static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lo static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, ADO_LONGPTR *max_records ) { - FIXME( "%p, %p\n", iface, max_records ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, max_records ); + + *max_records = recordset->max_records; + return S_OK; } static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, ADO_LONGPTR max_records ) { - FIXME( "%p, %Id\n", iface, max_records ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %Id\n", iface, max_records ); + + recordset->max_records = max_records; + return S_OK; } static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, ADO_LONGPTR *count ) @@ -2800,6 +2807,7 @@ HRESULT Recordset_create( void **obj ) recordset->row_set = NULL; recordset->editmode = adEditNone; recordset->cache_size = 1; + recordset->max_records = 0; VariantInit( &recordset->filter ); recordset->columntypes = NULL; recordset->haccessors = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 45dbf2c2239..b6c1c391e71 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -53,7 +53,7 @@ static void test_Recordset(void) Properties *props; Property *prop; LONG count, state; - ADO_LONGPTR rec_count; + ADO_LONGPTR rec_count, max_records; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -127,6 +127,21 @@ static void test_Recordset(void) hr = _Recordset_put_CacheSize( recordset, 1 ); ok( hr == S_OK, "got %08lx\n", hr ); + max_records = 0; + hr = _Recordset_get_MaxRecords( recordset, &max_records ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( max_records == 0, "got %Id\n", max_records ); + + hr = _Recordset_put_MaxRecords( recordset, 5 ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = _Recordset_get_MaxRecords( recordset, &max_records ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( max_records == 5, "got %Id\n", max_records ); + + hr = _Recordset_put_MaxRecords( recordset, 0 ); + ok( hr == S_OK, "got %08lx\n", hr ); + editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr );

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put CacheSize.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 794e1f188494b7d4ff034d2e52731c66f19980ee URL: https://gitlab.winehq.org/wine/wine/-/commit/794e1f188494b7d4ff034d2e52731c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 18:45:17 2024 +1000 msado15: Implement _Recordset get/put CacheSize. --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 36938db88cc..1b1c033320a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -50,6 +50,7 @@ struct recordset CursorTypeEnum cursor_type; IRowset *row_set; EditModeEnum editmode; + LONG cache_size; VARIANT filter; DBTYPE *columntypes; @@ -1449,14 +1450,20 @@ static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmar static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, size ); + + *size = recordset->cache_size; + return S_OK; } static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) { - FIXME( "%p, %ld\n", iface, size ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %ld\n", iface, size ); + + recordset->cache_size = size; + return S_OK; } static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) @@ -2792,6 +2799,7 @@ HRESULT Recordset_create( void **obj ) recordset->cursor_type = adOpenForwardOnly; recordset->row_set = NULL; recordset->editmode = adEditNone; + recordset->cache_size = 1; VariantInit( &recordset->filter ); recordset->columntypes = NULL; recordset->haccessors = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9c9afbc120f..45dbf2c2239 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static void test_Recordset(void) HRESULT hr; VARIANT bookmark, filter, active; EditModeEnum editmode; + LONG cache_size; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -111,6 +112,21 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08lx\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + cache_size = 0; + hr = _Recordset_get_CacheSize( recordset, &cache_size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cache_size == 1, "got %ld\n", cache_size ); + + hr = _Recordset_put_CacheSize( recordset, 5 ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = _Recordset_get_CacheSize( recordset, &cache_size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cache_size == 5, "got %ld\n", cache_size ); + + hr = _Recordset_put_CacheSize( recordset, 1 ); + ok( hr == S_OK, "got %08lx\n", hr ); + editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr );

1 0

Torge Matthies : winegstreamer: Handle Gstreamer pipeline flushes gracefully in the media source.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 9dd9c455d345835a9a5454546b8489245b81f3ed URL: https://gitlab.winehq.org/wine/wine/-/commit/9dd9c455d345835a9a5454546b8489… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Jun 14 03:11:44 2024 +0200 winegstreamer: Handle Gstreamer pipeline flushes gracefully in the media source. If a GST_EVENT_FLUSH_START event is received between the calls from PE code to wg_parser_stream_get_buffer and wg_parser_stream_copy_buffer, the latter function will return an error, resulting in the sample request being dropped without having delivered a sample. If wg_parser_stream_copy_buffer returns an error, retry the whole wait_on_sample procedure. Flushes can be triggered by seek operations. --- dlls/winegstreamer/media_source.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 474bc42ae15..030d0c1b9a2 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -728,6 +728,7 @@ static HRESULT media_stream_send_sample(struct media_stream *stream, const struc if (!wg_parser_stream_copy_buffer(stream->wg_stream, data, 0, wg_buffer->size)) { + hr = S_FALSE; wg_parser_stream_release_buffer(stream->wg_stream); IMFMediaBuffer_Unlock(buffer); goto out; @@ -789,8 +790,12 @@ static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token) TRACE("%p, %p\n", stream, token); - if (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer)) - return media_stream_send_sample(stream, &buffer, token); + while (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer)) + { + HRESULT hr = media_stream_send_sample(stream, &buffer, token); + if (hr != S_FALSE) + return hr; + } return media_stream_send_eos(source, stream); }

1 0

Torge Matthies : winegstreamer: Ignore an assert in wg_parser.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 62d8d3415cefc95b34afba7a52d32d730d3b7585 URL: https://gitlab.winehq.org/wine/wine/-/commit/62d8d3415cefc95b34afba7a52d32d… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Tue Mar 19 04:06:37 2024 +0100 winegstreamer: Ignore an assert in wg_parser. This gets hit when a wg_parser receives GST_EVENT_FLUSH_START between the wg_parser_stream_get_buffer function return and the wg_parser_stream_release_buffer call. In this case the NULL buffer can be ignored, it does no harm and there is no memory leak from this. --- dlls/winegstreamer/wg_parser.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index b942273d02b..7253013b6a3 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -412,11 +412,12 @@ static NTSTATUS wg_parser_stream_release_buffer(void *args) pthread_mutex_lock(&parser->mutex); - assert(stream->buffer); - - gst_buffer_unmap(stream->buffer, &stream->map_info); - gst_buffer_unref(stream->buffer); - stream->buffer = NULL; + if (stream->buffer) + { + gst_buffer_unmap(stream->buffer, &stream->map_info); + gst_buffer_unref(stream->buffer); + stream->buffer = NULL; + } pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&stream->event_empty_cond);

1 0

Torge Matthies : winegstreamer: Don't only accept segment events when streams are enabled.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 215478fc4627792b1df8d42cf04e016d460c2106 URL: https://gitlab.winehq.org/wine/wine/-/commit/215478fc4627792b1df8d42cf04e01… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Tue Apr 23 19:30:17 2024 +0200 winegstreamer: Don't only accept segment events when streams are enabled. I don't know why this was done previously but this just creates a race condition, with no to me apparent benefit. --- dlls/winegstreamer/wg_parser.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 021aa66ae12..b942273d02b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -576,24 +576,20 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) switch (event->type) { case GST_EVENT_SEGMENT: - pthread_mutex_lock(&parser->mutex); - if (stream->enabled) - { - const GstSegment *segment; - - gst_event_parse_segment(event, &segment); - - if (segment->format != GST_FORMAT_TIME) - { - pthread_mutex_unlock(&parser->mutex); - GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); - break; - } + { + const GstSegment *segment; - gst_segment_copy_into(segment, &stream->segment); + gst_event_parse_segment(event, &segment); + if (segment->format != GST_FORMAT_TIME) + { + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); + break; } + pthread_mutex_lock(&parser->mutex); + gst_segment_copy_into(segment, &stream->segment); pthread_mutex_unlock(&parser->mutex); break; + } case GST_EVENT_EOS: pthread_mutex_lock(&parser->mutex);

1 0

Torge Matthies : winegstreamer: Fix race between wg_parser_stream_en/disable and GST_EVENT_FLUSH_START/STOP.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 490d8ed6635665a73c339fe9e906cdfa2726b4b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/490d8ed6635665a73c339fe9e906cd… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Jun 3 11:05:38 2024 +0200 winegstreamer: Fix race between wg_parser_stream_en/disable and GST_EVENT_FLUSH_START/STOP. --- dlls/winegstreamer/wg_parser.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f9b76b12f8f..021aa66ae12 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -608,17 +608,14 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_FLUSH_START: pthread_mutex_lock(&parser->mutex); - if (stream->enabled) - { - stream->flushing = true; - pthread_cond_signal(&stream->event_empty_cond); + stream->flushing = true; + pthread_cond_signal(&stream->event_empty_cond); - if (stream->buffer) - { - gst_buffer_unmap(stream->buffer, &stream->map_info); - gst_buffer_unref(stream->buffer); - stream->buffer = NULL; - } + if (stream->buffer) + { + gst_buffer_unmap(stream->buffer, &stream->map_info); + gst_buffer_unref(stream->buffer); + stream->buffer = NULL; } pthread_mutex_unlock(&parser->mutex); @@ -636,8 +633,7 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) pthread_mutex_lock(&parser->mutex); stream->eos = false; - if (stream->enabled) - stream->flushing = false; + stream->flushing = false; pthread_mutex_unlock(&parser->mutex); break;

1 0

Alexandre Julliard : makefiles: Generate rules to build makedep.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 7c0aa6fd8c5ede0867b3b388d4695c7f016aac9f URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0aa6fd8c5ede0867b3b388d4695c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 17:12:52 2024 +0200 makefiles: Generate rules to build makedep. --- configure | 16 ++-------------- configure.ac | 16 ++-------------- tools/Makefile.in | 5 +++++ 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 64afddd6a51..a91ee8891e0 100755 --- a/configure +++ b/configure @@ -23100,7 +23100,6 @@ test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine" if test "x$enable_tools" != xno then - as_fn_append CONFIGURE_TARGETS " tools/makedep$ac_exeext" ac_config_commands="$ac_config_commands tools/makedep" fi @@ -23142,18 +23141,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$@" fi -if test "x$enable_tools" != xno -then - as_fn_append wine_rules " -tools/makedep$ac_exeext: ${wine_srcdir}tools/makedep.c include/config.h config.status - @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext" -else - as_fn_append wine_rules " -\$(MAKEDEP): - @echo \"You need to run make in $toolsdir first\" && false" -fi - if test -n "$with_wine64" then @@ -23905,7 +23892,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 wine_fn_output_makedep () { as_dir=tools; as_fn_mkdir_p - $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS + $CC -c -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep.o ${wine_srcdir}tools/makedep.c + $CC -o tools/makedep$ac_exeext tools/makedep.o $LDFLAGS } wine_fn_output_makefile () { diff --git a/configure.ac b/configure.ac index 8c2f0f3e09b..2ff2e062973 100644 --- a/configure.ac +++ b/configure.ac @@ -3586,12 +3586,12 @@ test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine) if test "x$enable_tools" != xno then - WINE_IGNORE_FILE(tools/makedep$ac_exeext) AC_CONFIG_COMMANDS([tools/makedep],[wine_fn_output_makedep || AS_EXIT], [wine_fn_output_makedep () { AS_MKDIR_P(tools) - $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS + $CC -c -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep.o ${wine_srcdir}tools/makedep.c + $CC -o tools/makedep$ac_exeext tools/makedep.o $LDFLAGS }]) fi @@ -3655,18 +3655,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$[@]]) fi -if test "x$enable_tools" != xno -then - WINE_APPEND_RULE( -[tools/makedep$ac_exeext: ${wine_srcdir}tools/makedep.c include/config.h config.status - @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext]) -else - WINE_APPEND_RULE( -[\$(MAKEDEP): - @echo \"You need to run make in $toolsdir first\" && false]) -fi - dnl Rules for wineloader if test -n "$with_wine64" diff --git a/tools/Makefile.in b/tools/Makefile.in index cd643e7e90b..71bd896b8a0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,6 +1,11 @@ PROGRAMS = \ + makedep \ make_xftmpl SOURCES = \ + makedep.c \ make_xftmpl.c \ wineapploader.in + +makedep_OBJS = makedep.o +make_xftmpl_OBJS = make_xftmpl.o

1 0

Alexandre Julliard : makefiles: Hardcode the dll directory.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 0fb9e616bcfb4ba25f29f96dfbfd9f88d90ddeb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb9e616bcfb4ba25f29f96dfbfd9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 13:57:34 2024 +0200 makefiles: Hardcode the dll directory. It's Wine-specific anyway. --- configure | 6 +----- configure.ac | 3 +-- dlls/ntdll/Makefile.in | 2 +- loader/Makefile.in | 2 +- tools/makedep.c | 10 +++++----- tools/widl/Makefile.in | 4 ++-- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 460701f00ed..64afddd6a51 100755 --- a/configure +++ b/configure @@ -868,7 +868,6 @@ CFLAGS CC SET_MAKE srcdir -dlldir host_os host_vendor host_cpu @@ -4674,8 +4673,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -dlldir=\${libdir}/wine - @@ -6470,7 +6467,7 @@ MAKEDEP=$wine_makedep RUNTESTFLAGS="-q -P wine" -SED_CMD="LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@dlldir@,\${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'" +SED_CMD="LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'" if test -n "$host_alias" -a "$host_alias" != "$build_alias" @@ -23975,7 +23972,6 @@ host = $host host_cpu = $host_cpu host_vendor = $host_vendor host_os = $host_os -dlldir = $dlldir srcdir = $srcdir SET_MAKE = $SET_MAKE CC = $CC diff --git a/configure.ac b/configure.ac index 745f703709f..8c2f0f3e09b 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,6 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i AC_CANONICAL_HOST -AC_SUBST(dlldir,[\${libdir}/wine]) AC_SUBST(srcdir) dnl **** Check for some programs **** @@ -196,7 +195,7 @@ fi AC_SUBST(toolsdir,[$wine_cv_toolsdir]) AC_SUBST(MAKEDEP,[$wine_makedep]) AC_SUBST(RUNTESTFLAGS,["-q -P wine"]) -AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@dlldir@,\${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"]) +AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"]) if test -n "$host_alias" -a "$host_alias" != "$build_alias" then diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index b519bcd655f..e17e3f72b92 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -76,5 +76,5 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ -DSYSTEMDLLPATH=\"${system_dllpath}\" \ - -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ + -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${libdir}/wine ${bindir}`\" \ -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" diff --git a/loader/Makefile.in b/loader/Makefile.in index 30413fc8677..5a9fdabfd97 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -16,7 +16,7 @@ UNIX_CFLAGS = -fPIE preloader_EXTRADEFS = -fno-builtin -main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" +main_EXTRADEFS = -DDLLDIR=\"${libdir}/wine\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}/wine`\" wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS) diff --git a/tools/makedep.c b/tools/makedep.c index 2b24c9584a3..cf22bc7bf07 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(datadir)" }; struct strarray uninstall_dirs; unsigned int i, j; @@ -3383,7 +3383,7 @@ static void output_fake_module( struct makefile *make, const char *spec_file ) if (make->disabled[arch]) return; strarray_add( &make->all_targets[arch], name ); - add_install_rule( make, make->module, arch, name, strmake( "d$(dlldir)/%s", name )); + add_install_rule( make, make->module, arch, name, strmake( "d$(libdir)/wine/%s", name )); output( "%s:", obj_dir_path( make, name )); if (spec_file) output_filename( spec_file ); @@ -3460,7 +3460,7 @@ static void output_module( struct makefile *make, unsigned int arch ) strarray_add( &make->all_targets[link_arch], module_name ); if (make->data_only) add_install_rule( make, make->module, link_arch, module_name, - strmake( "d$(dlldir)/%s%s", arch_pe_dirs[arch], make->module )); + strmake( "d$(libdir)/wine/%s%s", arch_pe_dirs[arch], make->module )); else add_install_rule( make, make->module, link_arch, module_name, strmake( "%c%s%s%s", '0' + arch, arch_install_dirs[arch], make->module, @@ -4554,7 +4554,7 @@ int main( int argc, char *argv[] ) arch_dirs[0] = ""; arch_pe_dirs[0] = strmake( "%s-windows/", archs.str[0] ); - arch_install_dirs[0] = unix_lib_supported ? strmake( "$(dlldir)/%s-unix/", archs.str[0] ) : "$(dlldir)/"; + arch_install_dirs[0] = unix_lib_supported ? strmake( "$(libdir)/wine/%s-unix/", archs.str[0] ) : "$(libdir)/wine/"; strip_progs[0] = "\"$(STRIP)\""; for (arch = 1; arch < archs.count; arch++) @@ -4564,7 +4564,7 @@ int main( int argc, char *argv[] ) strarray_add( &target_flags[arch], target ); arch_dirs[arch] = strmake( "%s-windows/", archs.str[arch] ); arch_pe_dirs[arch] = arch_dirs[arch]; - arch_install_dirs[arch] = strmake( "$(dlldir)/%s", arch_dirs[arch] ); + arch_install_dirs[arch] = strmake( "$(libdir)/wine/%s", arch_dirs[arch] ); strip_progs[arch] = strmake( "%s-strip", target ); dll_ext[arch] = ""; } diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index da6d843b2a8..fee965d49db 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -26,8 +26,8 @@ SOURCES = \ widl_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ - -DDLLDIR="\"${dlldir}\"" \ + -DDLLDIR="\"${libdir}/wine\"" \ -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" \ - -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" + -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}/wine`\" INSTALL_DEV = $(PROGRAMS)

1 0

Alexandre Julliard : makefiles: Hardcode the nls directory.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: f0ee51026b723d74b36626074f1860e80f54ad68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0ee51026b723d74b36626074f1860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 13:47:08 2024 +0200 makefiles: Hardcode the nls directory. It's Wine-specific anyway. --- configure | 4 ---- configure.ac | 1 - server/Makefile.in | 2 +- tools/makedep.c | 4 ++-- tools/wmc/Makefile.in | 4 ++-- tools/wrc/Makefile.in | 4 ++-- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 26b537c2088..460701f00ed 100755 --- a/configure +++ b/configure @@ -868,7 +868,6 @@ CFLAGS CC SET_MAKE srcdir -nlsdir dlldir host_os host_vendor @@ -4677,8 +4676,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac dlldir=\${libdir}/wine -nlsdir=\${datadir}/wine/nls - @@ -23979,7 +23976,6 @@ host_cpu = $host_cpu host_vendor = $host_vendor host_os = $host_os dlldir = $dlldir -nlsdir = $nlsdir srcdir = $srcdir SET_MAKE = $SET_MAKE CC = $CC diff --git a/configure.ac b/configure.ac index ac0f3ea051d..745f703709f 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,6 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i AC_CANONICAL_HOST AC_SUBST(dlldir,[\${libdir}/wine]) -AC_SUBST(nlsdir,[\${datadir}/wine/nls]) AC_SUBST(srcdir) dnl **** Check for some programs **** diff --git a/server/Makefile.in b/server/Makefile.in index 7b46b924c46..8ba6baf0c30 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,4 +49,4 @@ SOURCES = \ UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS) -unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" +unicode_EXTRADEFS = -DNLSDIR="\"${datadir}/wine/nls\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" diff --git a/tools/makedep.c b/tools/makedep.c index 61e30ed89a6..2b24c9584a3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(datadir)", "$(dlldir)" }; struct strarray uninstall_dirs; unsigned int i, j; @@ -3042,7 +3042,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj ) { add_install_rule( make, source->name, 0, source->name, - strmake( "D$(nlsdir)/%s", source->name )); + strmake( "D$(datadir)/wine/nls/%s", source->name )); output_srcdir_symlink( make, strmake( "%s.nls", obj )); } diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 022315c8ce1..1c2c72360b7 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -12,7 +12,7 @@ SOURCES = \ write.c wmc_EXTRADEFS = \ - -DNLSDIR="\"${nlsdir}\"" \ - -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" + -DNLSDIR="\"${datadir}/wine/nls\"" \ + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 06547d2b851..54cde2e98fd 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,9 +15,9 @@ SOURCES = \ wrc.man.in wrc_EXTRADEFS = \ - -DNLSDIR="\"${nlsdir}\"" \ + -DNLSDIR="\"${datadir}/wine/nls\"" \ -DINCLUDEDIR="\"${includedir}\"" \ - -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" \ + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" \ -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" INSTALL_DEV = $(PROGRAMS)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits