8000 [CRT] Sync wcs.c to wine-1.5.26 by tkreuzer · Pull Request #7955 · reactos/reactos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[CRT] Sync wcs.c to wine-1.5.26 #7955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open

[CRT] Sync wcs.c to wine-1.5.26 #7955

wants to merge 84 commits into from
+1,531 −170

Conversation

tkreuzer
Copy link
Contributor
@tkreuzer tkreuzer commented May 2, 2025 •
edited
Loading

Purpose

Sync wcs.c to wine-1.5.26. This is the revision that locale.c is at, so from there on they should be synced together.
This temporarily adds some unused code, a good portion of it will be removed (outsourced to a different file in wine) during the sync. I plan to sqash-merge to avoid adding this extra code to the repository.
It still adds some unused code, but a good part of it will be useful for NT6, or can replace some of our manually picked code pieces elsewhere (which were usually just extracted from some random wine version and never maintained). My plan is to sync everything up to wine 10 (wcs.c, locale.c and the other wine shared crt code) and then enable the code pieces that we need for NT6.
In the long term we might be able to replace some code with UCRT code, but is a PITA, because there are so many differences that are hard to fix. So there is no quick solution for that and for now we will have 2 CRTs, with some parts that are shared. Blame MS for creating a "universal CRT" that isn't really universal.

Proposed changes

  • Move the MSVCRT_ prefix hacks to the start of the file
  • Add some missing definitions to msvcrt.h
  • Temporarily bring back old printf code
  • sync it up to 1.5.26

Testbot runs (Filled in by Devs)

Regression tests

  • ✅ 6841502 [WINESYNC] msvcrt: Added swprintf_s implementation.
  • ✅ fbfae66 [WINESYNC] msvcrt: Added wctob implementation
  • 7efae65 [WINESYNC] msvcrt: Added vscwprintf_{l,p_l} functions implementation.

@tkreuzer tkreuzer added the 3rd party sync Updating 3rd party components, such as Wine and others label May 2, 2025
@tkreuzer tkreuzer self-assigned this May 2, 2025
SergeGautherie
SergeGautherie reviewed May 2, 2025
View reviewed changes
sdk/tools/winesync/wcs.cfg
files:
dlls/msvcrt/wcs.c: sdk/lib/crt/string/wcs.c
tags:
wine: wine-1.5.26
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update

reactos/media/doc/WINESYNC.txt

Line 313 in e98bba2

sdk/lib/crt/string/wcs.c # Synced at 20080611

too.

@HBelusca
Copy link
Contributor
HBelusca commented May 2, 2025

Temporarily bring back old printf code

For reviewers: this code has been #ifndef __REACTOS__'d out.

@HBelusca
Copy link
Contributor
HBelusca commented May 2, 2025

The compilers complain about such sort of errors:

D:\a\reactos\reactos\src\sdk\lib\crt\string\wcs.c(156,23): error: conflicting types for '_wcsnset'
MSVCRT_wchar_t* CDECL MSVCRT__wcsnset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c, MSVCRT_size_t n )
                      ^
D:\a\reactos\reactos\src\sdk\lib\crt\string\wcs.c(61,25): note: expanded from macro 'MSVCRT__wcsnset'
#define MSVCRT__wcsnset _wcsnset
                        ^
D:\a\reactos\reactos\src\sdk\include\crt\string.h(909,3): note: previous declaration is here
  _wcsnset(

tkreuzer and others added 16 commits May 3, 2025 00:23
@tkreuzer
[CRT] Add some missing definitions to msvcrt.h
b881a65
@tkreuzer
[CRT] wcs.c: centralize MSVCRT_ prefix hacks
099f3e3 
wcs.c is now almost prestine wine-1.0
@tkreuzer
[WINESYNC] msvcrt: Implemented vswprintf_s.
a6f8be5 
wine commit id 6a77a36b242500966a6fdea1c087aafc01c492e1 by Eric Pouech <eric.pouech@orange.fr>
@tkreuzer
[WINESYNC] msvcrt: Fix formatting of pointers in printf.
6f271db 8000 
wine commit id 34f2487163790cb21b54f4eda0d9c9a71503f412 by Alexandre Julliard <julliard@winehq.org>
@tkreuzer
[WINESYNC] msvcrt: Convert all the printf functions to use MS ABI var…
1d6b95e 
…args.

wine commit id 07ca8f4f8fb410737cdb958fe67053cb3143e2f7 by Alexandre Julliard <julliard@winehq.org>
@tkreuzer
[WINESYNC] msvcrt: Avoid size_t in printf format.
ce9bc52 
wine commit id a494b13abefbe39ae05b685a68fbd6de3f6fcba9 by Alexandre Julliard <julliard@winehq.org>
@tkreuzer
[WINESYNC] msvcrt: Implement _vscprintf and _vscwprintf.
0bfaa11 
wine commit id 0803575fd310cb16a146f8723aaad5f0131271a9 by Hans Leidekker <hans@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Implement and test _wcsupr_s.
6aefec1 
wine commit id 1eb077567099197f39de13f8e2a3937bfc917051 by Andrew Nguyen <arethusa26@gmail.com>
@tkreuzer
[WINESYNC] msvcrt: Remove unnecessary NULL check (Coverity).
9e5ea0b 
wine commit id 4da51e087d922431651c9bdec7151336d8471c05 by Marcus Meissner <marcus@jet.franken.de>
@tkreuzer
[WINESYNC] msvcrt: Add support for vsprintf_s.
69ae115 
wine commit id a2d4e5cb5da8d6ecef4427b860fcde1b8f47efad by Jason Edmeades <jason.edmeades@googlemail.com>
@tkreuzer
[WINESYNC] msvcrt: Add support for sprintf_s.
aafdc6e 
wine commit id 97194ec07094957241a36cb15e97e6dfc3e38d84 by Jason Edmeades <jason.edmeades@googlemail.com>
@tkreuzer
[WINESYNC] msvcrt: Rename functions conflicting with mingw headers.
10000
cee1abd 
wine commit id b90320652d94f31d0e4d8722568ca2826cf929c9 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added _iswalpha_l implementation.
9caaa2f 
wine commit id 903c524d43893c004764cef4fa84f2072de22529 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Format strings according to specified locale in pf…
b0f178d 
…_vsnprintf.

wine commit id 419f902546bf741d30bce47548550a96bfa54de0 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Add parameters to mimic *_s function behaviour in …
5c02bb2 
…pf_vsnprintf.

wine commit id 09a32152d557ed17797fe174a64aed8a1fb8b5dd by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added _vsnprintf* implementation.
ea3c45b 
wine commit id 85fa2ee53c781563bcc1199fb38501497734d7a4 by Piotr Caban <piotr@codeweavers.com>
winesync and others added 29 commits May 6, 2025 01:38
@tkreuzer
[WINESYNC] msvcrt: Use callback based printf in sprintf functions fam…
a2d69a7 
…ily.

wine commit id bfc2f5f2a538f3d6eff7e23c129571392705c560 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Removed pf_vnsprintf internal function.
62b0a97 
wine commit id c09f9ef498c189394e358292540277a30e0a266a by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added sprintf_p_l implementation.
4148947 
wine commit id 00182ca6d914dd716f9fd76201a7bc857091bae0 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added wcsrtombs implementation.
ddefe48 
wine commit id 168909283c371f42a3b5074b96f1fe3e91c9a956 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added _set_printf_count_output and _get_printf_cou…
cf5abb7 
…nt_output implementation.

wine commit id 6ecabf7cae3145931889eed5466b51740eddd1c7 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Make printf_arg arg_clbk_positional() and MSVCRT_w…
f4ad822 
…csrtombs_s_l() static.

wine commit id ca268b199a76525742b7f5acbc1edf056a30e64f by Francois Gouget <fgouget@free.fr>
@tkreuzer
[WINESYNC] msvcrt: Don't pass NULL as __ms_va_list in printf implemen…
81e34cd 
…tation.

wine commit id 64cf208040f14f46d65b288272c8fabd93418af8 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added _towupper_l and _towlower_l implementation.
f9616d9 
wine commit id 69ea5768a680590bba0b768d7608c72742ccdc51 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Fix return values in wcstombs and wcsrtombs functi…
16d28ac 
…ons.

wine commit id ddad22d037c23271a59e3a977e786136be852b5f by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Fix mingw compilation issues.
9d15a46 
wine commit id f9de4eef75ecfc074f726f39e54a77211eca2e7b by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Fix uninitialized memory access in wcsrtombs_l imp…
28967b3 
…lementation (valgrind).

wine commit id a8c6fda50170b4557a9dd66331b0e0ead344c56b by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Fixed vswprintf* exports.
a844ee2 
wine commit id 62a55402596bc40119920935f434f38202f55bbc by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added vscwprintf_{l,p_l} functions implementation.
7efae65 
wine commit id 0c14dc53302eb0bd661547525598ff782aaf09b1 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcr90: Fix _vswprintf_p implementation.
7d642ac 
wine commit id af6fd252ef8d630be82b9dba3199d5990c80e2b3 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Fix wcsncpy_s implementation.
12a1626 
wine commit id 8df606fea4c12f9e48626fd9bd5aef1e19be666a by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added _iswdigit_l implementation.
e397640 
wine commit id 45b4b4205a2b1967726685242e3244c55cef5fc9 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Fix wctob in C locale.
2c048e7 
wine commit id 13aff6dc56278cd5323af0d7bee53b0ebc5a643e by Akihiro Sagawa <sagawa.aki@gmail.com>
@tkreuzer
[WINESYNC] msvcrt: Add _snwprintf_l.
2db9f14 
wine commit id 08aa6ae52df861bfe790c27e838da0018f02d699 by Daniel Lehman <dlehman@esri.com>
@tkreuzer
[WINESYNC] msvcrt: Added support for _TRUNCATE flag in wcsncpy_s.
8e4883a 
wine commit id a80aec4c56bfc9b845e89bf55af4e638f153b4cd by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Rework wcsncpy_s to work on overlapping pointers.
a70e77b 
wine commit id dc830aa640f114bb6596d8bf23405be5d14df98b by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Make sure that errno is always set when calling th…
61f7e01 
…e invalid parameter handler.

wine commit id 06989a04834bfd8dc8bbf33bfd34485c2d8e8542 by Alexandre Julliard <julliard@winehq.org>
@tkreuzer
[WINESYNC] msvcrt: Aoid TRUE:FALSE conditional expressions.
dfaea74 
wine commit id 0409b9895ce48496e4391878a6e2ba7b594822e7 by Michael Stefaniuc <mstefani@redhat.de>
@tkreuzer
[WINESYNC] msvcrt: Improved _wcstod_l precision.
c3e0b5d 
wine commit id 505e5a162fb94e5a3789191121e5b5fd32687d11 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added wcrtomb implementation.
b1c489f 
wine commit id c0ce611ebd3684dcc59fb4803dbd0fa2af87bf73 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Added _wtoi_l implementation.
07fc779 
wine commit id 3acb238f1584256468bf592843bb55206d656a56 by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Indentation fix.
a3f383f 
wine commit id 4c191378e9b43920a7786f736ea6d63b2bfd9a6b by Andrew Talbot <andrew.talbot@talbotville.com>
@tkreuzer
[WINESYNC] msvcrt: Use CompareString in wcscoll functions.
b4944d6 
wine commit id 1f784a100125a4511729b3dae110f3893c638c6f by Piotr Caban <piotr@codeweavers.com>
@tkreuzer
[WINESYNC] msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l.
7110072 
wine commit id 0010ee021a6c79eb766b805f5fa1485f13bb51f2 by Akihiro Sagawa <sagawa.aki@gmail.com>
@tkreuzer
[WINESYNC]: wcs is now in sync with wine-staging wine-1.5.26
ad7f76b
@tkreuzer tkreuzer force-pushed the crt/sync-wcs-wine-1.5.26 branch from 8e6a9a4 to ad7f76b Compare May 5, 2025 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SergeGautherie SergeGautherie SergeGautherie left review comments

@HBelusca HBelusca HBelusca approved these changes

@Doug-Lyons Doug-Lyons Doug-Lyons approved these changes

@whindsaks whindsaks whindsaks approved these changes 731B

@binarymaster binarymaster Awaiting requested review from binarymaster

@learn-more learn-more Awaiting requested review from learn-more

@katahiromz katahiromz Awaiting requested review from katahiromz

@cbialorucki cbialorucki Awaiting requested review from cbialorucki

@DarkFire01 DarkFire01 Awaiting requested review from DarkFire01

Assignees

@tkreuzer tkreuzer

Labels
3rd party sync Updating 3rd party components, such as Wine and others
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tkreuzer @HBelusca @Doug-Lyons @SergeGautherie @whindsaks
0