May 2024 - Wine-Commits - list.winehq.org

Elizabeth Figura : qdvd: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 90a97b2dcf948cf2a1030b0ba78a28510e6ce1a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/90a97b2dcf948cf2a1030b0ba78a28… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:48:22 2024 -0500 qdvd: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/qdvd/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index 03989faf53c..e9a145d7f26 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,5 +1,5 @@ MODULE = qdvd.dll -IMPORTS = strmbase strmiids uuid ole32 +IMPORTS = strmbase strmiids uuid ole32 msvcrt EXTRADLLFLAGS = -Wb,--prefer-native

1 0

Elizabeth Figura : qasf: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 45015f3ad14b6e9306746bf951d2768e744866ef URL: https://gitlab.winehq.org/wine/wine/-/commit/45015f3ad14b6e9306746bf951d276… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:48:13 2024 -0500 qasf: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/qasf/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index e37a03c4e60..7b3767d7b0c 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,5 +1,5 @@ MODULE = qasf.dll -IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 wmvcore +IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 wmvcore msvcrt SOURCES = \ asfreader.c \

1 0

Elizabeth Figura : qcap: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 5f431b03114662aa6fa2a1e9ee1ece66839dd408 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f431b03114662aa6fa2a1e9ee1ece… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:48:18 2024 -0500 qcap: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/qcap/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 10e543137f5..0f53e63f022 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,6 +1,6 @@ MODULE = qcap.dll UNIXLIB = qcap.so -IMPORTS = strmbase strmiids uuid ole32 oleaut32 winmm +IMPORTS = strmbase strmiids uuid ole32 oleaut32 winmm msvcrt DELAYIMPORTS = msvfw32 SOURCES = \

1 0

Elizabeth Figura : evr: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 6017bdde53d75c3fd09d57aa36fe3ca9d87a76c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6017bdde53d75c3fd09d57aa36fe3c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:48:07 2024 -0500 evr: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/evr/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 45e9c62fb17..1ed369136c7 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,6 +1,6 @@ MODULE = evr.dll IMPORTLIB = evr -IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 +IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 msvcrt DELAYIMPORTS = mfplat EXTRADLLFLAGS = -Wb,--prefer-native

1 0

Elizabeth Figura : amstream: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: cee5224bf47af663fd5c0491774b8fbea352016b URL: https://gitlab.winehq.org/wine/wine/-/commit/cee5224bf47af663fd5c0491774b8f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:47:58 2024 -0500 amstream: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/amstream/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index cd4bd0a7862..8e2967243bf 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -1,5 +1,5 @@ MODULE = amstream.dll -IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw +IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw msvcrt SOURCES = \ amstream_classes.idl \

1 0

Hans Leidekker : odbc32/tests: Add tests.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: b314aaeab8d31ad064ce23a9129e0b888dc8e4e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b314aaeab8d31ad064ce23a9129e0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 19:04:55 2024 +0200 odbc32/tests: Add tests. --- configure | 1 + configure.ac | 1 + dlls/odbc32/tests/Makefile.in | 5 + dlls/odbc32/tests/odbc32.c | 312 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 319 insertions(+)

1 0

Paul Gofman : ntdll: Allocate crit section debug info by default for Windows versions before 8.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 3c0e318582f1b3058ab3fc8f858f6a0edacc59ad URL: https://gitlab.winehq.org/wine/wine/-/commit/3c0e318582f1b3058ab3fc8f858f6a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 13 12:46:40 2024 -0600 ntdll: Allocate crit section debug info by default for Windows versions before 8. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56661 --- dlls/ntdll/sync.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index efc820624bb..274e29d1852 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -187,12 +187,19 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) } } +static ULONG crit_sect_default_flags(void) +{ + if (NtCurrentTeb()->Peb->OSMajorVersion > 6 || + (NtCurrentTeb()->Peb->OSMajorVersion == 6 && NtCurrentTeb()->Peb->OSMinorVersion >= 2)) return 0; + return RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO; +} + /****************************************************************************** * RtlInitializeCriticalSection (NTDLL.@) */ NTSTATUS WINAPI RtlInitializeCriticalSection( RTL_CRITICAL_SECTION *crit ) { - return RtlInitializeCriticalSectionEx( crit, 0, 0 ); + return RtlInitializeCriticalSectionEx( crit, 0, crit_sect_default_flags() ); } @@ -201,7 +208,7 @@ NTSTATUS WINAPI RtlInitializeCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION *crit, ULONG spincount ) { - return RtlInitializeCriticalSectionEx( crit, spincount, 0 ); + return RtlInitializeCriticalSectionEx( crit, spincount, crit_sect_default_flags() ); }

1 0

Hans Leidekker : odbc32: Don't load libodbc.so dynamically.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: af3a8fa27bab3cdaad3adc81ac0782bf558a580f URL: https://gitlab.winehq.org/wine/wine/-/commit/af3a8fa27bab3cdaad3adc81ac0782… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 10 11:26:53 2024 +0200 odbc32: Don't load libodbc.so dynamically. Implementations are guarded by native function pointer checks but all functions have been present in libodbc for a very long time, so it doesn't appear to be needed anymore. The loading code checks the LIB_ODBC_DRIVER_MANAGER environment variable to allow the user to override the system version of the library. This can be achieved by other means, if it's still needed. --- configure | 158 +++++--- configure.ac | 14 +- dlls/odbc32/Makefile.in | 1 + dlls/odbc32/proxyodbc.c | 1 - dlls/odbc32/unixlib.c | 995 ++++++++++++------------------------------------ dlls/odbc32/unixlib.h | 1 - include/config.h.in | 3 - 7 files changed, 360 insertions(+), 813 deletions(-)

1 0

Hans Leidekker : odbc32: Move replication of ODBC settings to the Unix lib.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 713bd7928d009028931249255e7afa8a6575abcb URL: https://gitlab.winehq.org/wine/wine/-/commit/713bd7928d009028931249255e7afa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 18:50:14 2024 +0200 odbc32: Move replication of ODBC settings to the Unix lib. --- dlls/odbc32/proxyodbc.c | 295 +----------------------------------------------- dlls/odbc32/unixlib.c | 284 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/odbc32/unixlib.h | 2 + 3 files changed, 288 insertions(+), 293 deletions(-)

1 0

Hans Leidekker : odbc32: Add Wow64 thunks.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 46f47bd53ae62034285f37e0a2cdd1c5ac4b0e38 URL: https://gitlab.winehq.org/wine/wine/-/commit/46f47bd53ae62034285f37e0a2cdd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 18:53:06 2024 +0200 odbc32: Add Wow64 thunks. --- dlls/odbc32/unixlib.c | 2405 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2405 insertions(+)

1 0