[PATCH v3 0/1] MR3425: msvcp140_codecvt_ids: Add DLL.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55344 It looks like the exports are just variables. -- v3: msvcp140_codecvt_ids: Add DLL. https://gitlab.winehq.org/wine/wine/-/merge_requests/3425
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55344 --- configure.ac | 1 + dlls/msvcp140_codecvt_ids/Makefile.in | 4 +++ dlls/msvcp140_codecvt_ids/main.c | 32 +++++++++++++++++++ .../msvcp140_codecvt_ids.spec | 4 +++ 4 files changed, 41 insertions(+) create mode 100644 dlls/msvcp140_codecvt_ids/Makefile.in create mode 100644 dlls/msvcp140_codecvt_ids/main.c create mode 100644 dlls/msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec diff --git a/configure.ac b/configure.ac index 758f6250eec..5bfdb7fbdc8 100644 --- a/configure.ac +++ b/configure.ac @@ -2830,6 +2830,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_2) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_codecvt_ids) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_codecvt_ids/Makefile.in b/dlls/msvcp140_codecvt_ids/Makefile.in new file mode 100644 index 00000000000..14e820b01fe --- /dev/null +++ b/dlls/msvcp140_codecvt_ids/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msvcp140_codecvt_ids.dll + +C_SRCS = \ + main.c diff --git a/dlls/msvcp140_codecvt_ids/main.c b/dlls/msvcp140_codecvt_ids/main.c new file mode 100644 index 00000000000..d71263a3e5d --- /dev/null +++ b/dlls/msvcp140_codecvt_ids/main.c @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +typedef struct { + size_t id; +} locale_id; + +/* ?id@?$codecvt(a)_SDU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char16_id = {0}; +/* ?id@?$codecvt(a)_S_QU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char16_char8_id = {0}; +/* ?id@?$codecvt(a)_UDU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char32_id = {0}; +/* ?id@?$codecvt(a)_U_QU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char32_char8_id = {0}; diff --git a/dlls/msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec b/dlls/msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec new file mode 100644 index 00000000000..4fd4b65e32a --- /dev/null +++ b/dlls/msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec @@ -0,0 +1,4 @@ +@ extern ?id@?$codecvt(a)_SDU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char16_id +@ extern ?id@?$codecvt(a)_S_QU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char16_char8_id +@ extern ?id@?$codecvt(a)_UDU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char32_id +@ extern ?id@?$codecvt(a)_U_QU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char32_char8_id -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3425
On Fri Jul 28 18:15:35 2023 +0000, Piotr Caban wrote:
It looks good for me but please merge the patches together. First patch is not correct on its own. Sure, done. Thanks for the review.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3425#note_40656
This merge request was approved by Piotr Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3425
participants (3)
-
Mohamad Al-Jaf -
Mohamad Al-Jaf (@maljaf) -
Piotr Caban (@piotr)