Ros-diffs August 2021

ros-diffs@reactos.org

16 participants
93 discussions

[reactos] 09/10: [PSDK] Add some missing ARM definitions

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8043628d977b6f436cb43… commit 8043628d977b6f436cb43f2c1344a33bed996b75 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 2 14:12:43 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [PSDK] Add some missing ARM definitions --- sdk/include/xdk/winnt_old.h | 54 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index ab28be40902..9eaef1dcf10 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -2095,7 +2095,59 @@ typedef struct _CONTEXT DWORD Wcr[ARM_MAX_WATCHPOINTS]; DWORD Padding2[2]; -} CONTEXT; +} CONTEXT, *PCONTEXT; + +typedef struct _IMAGE_ARM_RUNTIME_FUNCTION_ENTRY +{ + DWORD BeginAddress; + union + { + DWORD UnwindData; + struct + { + DWORD Flag : 2; + DWORD FunctionLength : 11; + DWORD Ret : 2; + DWORD H : 1; + DWORD Reg : 3; + DWORD R : 1; + DWORD L : 1; + DWORD C : 1; + DWORD StackAdjust : 10; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} IMAGE_ARM_RUNTIME_FUNCTION_ENTRY, *PIMAGE_ARM_RUNTIME_FUNCTION_ENTRY; +typedef IMAGE_ARM_RUNTIME_FUNCTION_ENTRY RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; + +typedef struct _SCOPE_TABLE_ARM +{ + DWORD Count; + struct + { + DWORD BeginAddress; + DWORD EndAddress; + DWORD HandlerAddress; + DWORD JumpTarget; + } ScopeRecord[1]; +} SCOPE_TABLE_ARM, *PSCOPE_TABLE_ARM; +typedef SCOPE_TABLE_ARM SCOPE_TABLE, *PSCOPE_TABLE; + +typedef struct _DISPATCHER_CONTEXT +{ + DWORD ControlPc; + DWORD ImageBase; + PRUNTIME_FUNCTION FunctionEntry; + DWORD EstablisherFrame; + DWORD TargetPc; + PCONTEXT ContextRecord; + PEXCEPTION_ROUTINE LanguageHandler; + PVOID HandlerData; + struct _UNWIND_HISTORY_TABLE *HistoryTable; + DWORD ScopeIndex; + BOOLEAN ControlPcIsUnwound; + PBYTE NonVolatileRegisters; + DWORD Reserved; +} DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; #else #error "undefined processor type"

3 years, 4 months

[reactos] 08/10: [CRT] Implement crt_process_init()

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e91f201be2bd2feeb1939… commit e91f201be2bd2feeb193915f71ac7b2b717e02e5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jul 29 09:38:42 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT] Implement crt_process_init() --- dll/win32/crtdll/dllmain.c | 42 +++---------------------------- dll/win32/msvcrt/dllmain.c | 43 ++++---------------------------- sdk/lib/crt/misc/crt_init.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ sdk/lib/crt/misc/misc.cmake | 1 + sdk/lib/crt/startup/crtexe.c | 7 ++++++ 5 files changed, 76 insertions(+), 76 deletions(-) diff --git a/dll/win32/crtdll/dllmain.c b/dll/win32/crtdll/dllmain.c index 8d6af8c69b2..c6324f2032f 100644 --- a/dll/win32/crtdll/dllmain.c +++ b/dll/win32/crtdll/dllmain.c @@ -29,14 +29,10 @@ extern void __getmainargs( int *argc, char ***argv, char ***envp, /* EXTERNAL PROTOTYPES ********************************************************/ -extern int BlockEnvToEnvironA(void); -extern int BlockEnvToEnvironW(void); +BOOL crt_process_init(void); + extern void FreeEnvironment(char **environment); -extern unsigned int _osver; -extern unsigned int _winminor; -extern unsigned int _winmajor; -extern unsigned int _winver; unsigned int CRTDLL__basemajor_dll = 0; unsigned int CRTDLL__baseminor_dll = 0; @@ -48,8 +44,6 @@ unsigned int CRTDLL__osmode_dll = 0; unsigned int CRTDLL__osversion_dll = 0; int _fileinfo_dll; -extern char* _acmdln; /* pointer to ascii command line */ -extern wchar_t* _wcmdln; /* pointer to wide character command line */ #undef _environ extern char** _environ; /* pointer to environment block */ extern char** __initenv; /* pointer to initial environment block */ @@ -112,40 +106,12 @@ DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved) CRTDLL__osmode_dll = 1; /* FIXME */ CRTDLL__osversion_dll = (version & 0xFFFF); - _winmajor = (_osver >> 8) & 0xFF; - _winminor = _osver & 0xFF; - _winver = (_winmajor << 8) + _winminor; - _osver = (_osver >> 16) & 0xFFFF; - - /* create tls stuff */ - if (!msvcrt_init_tls()) - return FALSE; - - if (BlockEnvToEnvironA() < 0) - return FALSE; - - if (BlockEnvToEnvironW() < 0) + if (!crt_process_init()) { - FreeEnvironment(_environ); + ERR("crt_init() failed!\n"); return FALSE; } - _acmdln = _strdup(GetCommandLineA()); - _wcmdln = _wcsdup(GetCommandLineW()); - - /* Initialization of the WINE code */ - msvcrt_init_mt_locks(); - //if(!msvcrt_init_locale()) { - //msvcrt_free_mt_locks(); - // msvcrt_free_tls_mem(); - //return FALSE; - //} - //msvcrt_init_math(); - msvcrt_init_io(); - //msvcrt_init_console(); - //msvcrt_init_args(); - //msvcrt_init_signals(); - _setmbcp(_MB_CP_LOCALE); TRACE("Attach done\n"); break; case DLL_THREAD_ATTACH: diff --git a/dll/win32/msvcrt/dllmain.c b/dll/win32/msvcrt/dllmain.c index d48d0d31e49..d47430db39e 100644 --- a/dll/win32/msvcrt/dllmain.c +++ b/dll/win32/msvcrt/dllmain.c @@ -21,18 +21,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* EXTERNAL PROTOTYPES ********************************************************/ -extern int BlockEnvToEnvironA(void); -extern int BlockEnvToEnvironW(void); -extern void FreeEnvironment(char **environment); +BOOL crt_process_init(void); -extern unsigned int _osplatform; -extern unsigned int _osver; -extern unsigned int _winminor; -extern unsigned int _winmajor; -extern unsigned int _winver; +extern void FreeEnvironment(char **environment); -extern char* _acmdln; /* pointer to ascii command line */ -extern wchar_t* _wcmdln; /* pointer to wide character command line */ #undef _environ extern char** _environ; /* pointer to environment block */ extern char** __initenv; /* pointer to initial environment block */ @@ -45,43 +37,18 @@ BOOL WINAPI DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved) { - OSVERSIONINFOW osvi; switch (dwReason) { case DLL_PROCESS_ATTACH: - /* initialize version info */ - TRACE("Process Attach\n"); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - GetVersionExW( &osvi ); - _winver = (osvi.dwMajorVersion << 8) | osvi.dwMinorVersion; - _winmajor = osvi.dwMajorVersion; - _winminor = osvi.dwMinorVersion; - _osplatform = osvi.dwPlatformId; - _osver = osvi.dwBuildNumber; - - /* create tls stuff */ - if (!msvcrt_init_tls()) - return FALSE; - if (BlockEnvToEnvironA() < 0) - return FALSE; + TRACE("Process Attach\n"); - if (BlockEnvToEnvironW() < 0) + if (!crt_process_init()) { - FreeEnvironment(_environ); + ERR("crt_init() failed!\n"); return FALSE; } - _acmdln = _strdup(GetCommandLineA()); - _wcmdln = _wcsdup(GetCommandLineW()); - - /* Initialization of the WINE code */ - msvcrt_init_mt_locks(); - //msvcrt_init_math(); - msvcrt_init_io(); - //msvcrt_init_console(); - //msvcrt_init_args(); - //msvcrt_init_signals(); TRACE("Attach done\n"); break; diff --git a/sdk/lib/crt/misc/crt_init.c b/sdk/lib/crt/misc/crt_init.c new file mode 100644 index 00000000000..6818144a8ac --- /dev/null +++ b/sdk/lib/crt/misc/crt_init.c @@ -0,0 +1,59 @@ + +#include <precomp.h> + +extern int BlockEnvToEnvironA(void); +extern int BlockEnvToEnvironW(void); +extern void FreeEnvironment(char **environment); + +extern void msvcrt_init_mt_locks(void); +extern void msvcrt_init_io(void); + +extern char* _acmdln; /* pointer to ascii command line */ +extern wchar_t* _wcmdln; /* pointer to wide character command line */ +#undef _environ +extern char** _environ; /* pointer to environment block */ +extern char** __initenv; /* pointer to initial environment block */ +extern wchar_t** _wenviron; /* pointer to environment block */ +extern wchar_t** __winitenv; /* pointer to initial environment block */ + +BOOL +crt_process_init(void) +{ + OSVERSIONINFOW osvi; + + /* initialize version info */ + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&osvi); + _winver = (osvi.dwMajorVersion << 8) | osvi.dwMinorVersion; + _winmajor = osvi.dwMajorVersion; + _winminor = osvi.dwMinorVersion; + _osplatform = osvi.dwPlatformId; + _osver = osvi.dwBuildNumber; + + /* create tls stuff */ + if (!msvcrt_init_tls()) + return FALSE; + + if (BlockEnvToEnvironA() < 0) + return FALSE; + + if (BlockEnvToEnvironW() < 0) + { + FreeEnvironment(_environ); + return FALSE; + } + + _acmdln = _strdup(GetCommandLineA()); + _wcmdln = _wcsdup(GetCommandLineW()); + + /* Initialization of the WINE code */ + msvcrt_init_mt_locks(); + + //msvcrt_init_math(); + msvcrt_init_io(); + //msvcrt_init_console(); + //msvcrt_init_args(); + //msvcrt_init_signals(); + + return TRUE; +} diff --git a/sdk/lib/crt/misc/misc.cmake b/sdk/lib/crt/misc/misc.cmake index 18abea274c1..d5cea9dd5cc 100644 --- a/sdk/lib/crt/misc/misc.cmake +++ b/sdk/lib/crt/misc/misc.cmake @@ -14,6 +14,7 @@ list(APPEND CRT_MISC_SOURCE misc/__crt_MessageBoxA.c misc/amsg.c misc/assert.c + misc/crt_init.c misc/environ.c misc/getargs.c misc/i10output.c diff --git a/sdk/lib/crt/startup/crtexe.c b/sdk/lib/crt/startup/crtexe.c index 3897242197b..afe23416b8d 100644 --- a/sdk/lib/crt/startup/crtexe.c +++ b/sdk/lib/crt/startup/crtexe.c @@ -163,6 +163,7 @@ int __cdecl WinMainCRTStartup (void) } int __cdecl mainCRTStartup (void); +BOOL crt_process_init(void); #ifdef _WIN64 int __mingw_init_ehandler (void); @@ -171,6 +172,12 @@ int __mingw_init_ehandler (void); int __cdecl mainCRTStartup (void) { int ret = 255; +#ifndef _DLL + if (!crt_process_init()) + { + return -1; + } +#endif #ifdef __SEH__ asm ("\t.l_start:\n" "\t.seh_handler __C_specific_handler, @except\n"

3 years, 4 months

[reactos] 07/10: [CRT] Improve CMake files

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8043b76e85cc94aeff0a2… commit 8043b76e85cc94aeff0a23f4fa3b009334304319 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jul 28 10:18:12 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT] Improve CMake files --- sdk/lib/crt/math/math.cmake | 2 +- sdk/lib/crt/msvcrtex.cmake | 42 +-------------------------------------- sdk/lib/crt/startup/startup.cmake | 14 +++++++++++++ 3 files changed, 16 insertions(+), 42 deletions(-) diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index 9bb584d4bc7..7e04dcc503b 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -73,6 +73,7 @@ elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_MATH_SOURCE math/cos.c + math/floorf.c math/sin.c math/sqrt.c math/arm/__rt_sdiv.c @@ -128,7 +129,6 @@ if(NOT ARCH STREQUAL "i386") math/cos.c math/coshf.c math/expf.c - math/floorf.c math/fmodf.c math/log10f.c math/modff.c diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 5f9cad1b48f..0ba3ee2aa7e 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -2,32 +2,7 @@ include_directories(include/internal/mingw-w64) list(APPEND MSVCRTEX_SOURCE - startup/_matherr.c - startup/crtexe.c - startup/wcrtexe.c - startup/crt_handler.c - startup/crtdll.c - startup/_newmode.c - startup/wildcard.c - startup/tlssup.c - startup/mingw_helpers.c - startup/natstart.c - startup/charmax.c - startup/atonexit.c - startup/dllmain.c - startup/pesect.c - startup/tlsmcrt.c - startup/tlsthrd.c - startup/tlsmthread.c - startup/cinitexe.c - startup/gs_support.c - startup/dll_argv.c - startup/dllargv.c - startup/wdllargv.c - startup/crt0_c.c - startup/crt0_w.c - startup/dllentry.c - startup/reactos.c + ${CRT_STARTUP_SOURCE} misc/dbgrpt.cpp misc/fltused.c misc/isblank.c @@ -35,15 +10,6 @@ list(APPEND MSVCRTEX_SOURCE misc/ofmt_stub.c stdio/acrt_iob_func.c) -if(MSVC) - list(APPEND MSVCRTEX_SOURCE - startup/threadSafeInit.c) -else() - list(APPEND MSVCRTEX_SOURCE - startup/pseudo-reloc.c - startup/pseudo-reloc-list.c) -endif() - if(CMAKE_C_COMPILER_ID STREQUAL "Clang") # Clang performs some optimizations requiring those funtions list(APPEND MSVCRTEX_SOURCE @@ -95,12 +61,6 @@ elseif(ARCH STREQUAL "arm") ) endif() -if(MSVC) - list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) -else() - list(APPEND MSVCRTEX_SOURCE startup/gccmain.c) -endif() - set_source_files_properties(${MSVCRTEX_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_DLL;_MSVCRTEX_") add_asm_files(msvcrtex_asm ${MSVCRTEX_ASM_SOURCE}) diff --git a/sdk/lib/crt/startup/startup.cmake b/sdk/lib/crt/startup/startup.cmake index 37577e0e70d..79b1f6f6e76 100644 --- a/sdk/lib/crt/startup/startup.cmake +++ b/sdk/lib/crt/startup/startup.cmake @@ -12,6 +12,7 @@ list(APPEND CRT_STARTUP_SOURCE startup/natstart.c startup/charmax.c startup/atonexit.c + startup/dllmain.c startup/pesect.c startup/tlsmcrt.c startup/tlsthrd.c @@ -26,3 +27,16 @@ list(APPEND CRT_STARTUP_SOURCE startup/dllentry.c startup/reactos.c ) + +if(MSVC) + list(APPEND CRT_STARTUP_SOURCE + startup/mscmain.c + startup/threadSafeInit.c + ) +else() + list(APPEND CRT_STARTUP_SOURCE + startup/gccmain.c + startup/pseudo-reloc.c + startup/pseudo-reloc-list.c + ) +endif()

3 years, 4 months

[reactos] 06/10: [CRT] Fix _fmode

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=950e81437776242be39fe… commit 950e81437776242be39fef4a8b0d0a17cf5882b7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 24 16:27:43 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT] Fix _fmode Remove mingw-w64 version of _fmode. _fmode should not be linked directly into the executable. Instead, the export from msvcrt should be used. On Windows 10 it's defined to *__p__fmode(), which is exported from ucrtbase.dll Also _fmode in msvcrt.dll is initialized with 0. --- sdk/lib/crt/msvcrtex.cmake | 1 - sdk/lib/crt/startup/startup.cmake | 1 - sdk/lib/crt/startup/txtmode.c | 13 ------------- sdk/lib/crt/stdio/fmode.c | 2 +- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 32d1afc6046..5f9cad1b48f 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -15,7 +15,6 @@ list(APPEND MSVCRTEX_SOURCE startup/charmax.c startup/atonexit.c startup/dllmain.c - startup/txtmode.c startup/pesect.c startup/tlsmcrt.c startup/tlsthrd.c diff --git a/sdk/lib/crt/startup/startup.cmake b/sdk/lib/crt/startup/startup.cmake index 1574d29e97b..37577e0e70d 100644 --- a/sdk/lib/crt/startup/startup.cmake +++ b/sdk/lib/crt/startup/startup.cmake @@ -12,7 +12,6 @@ list(APPEND CRT_STARTUP_SOURCE startup/natstart.c startup/charmax.c startup/atonexit.c - #startup/txtmode.c startup/pesect.c startup/tlsmcrt.c startup/tlsthrd.c diff --git a/sdk/lib/crt/startup/txtmode.c b/sdk/lib/crt/startup/txtmode.c deleted file mode 100644 index 1f50d168b89..00000000000 --- a/sdk/lib/crt/startup/txtmode.c +++ /dev/null @@ -1,13 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include <fcntl.h> - -/* Set default file mode to text */ - -/* Is this correct? Default value of _fmode in msvcrt.dll is 0. */ - -int _fmode = _O_TEXT; diff --git a/sdk/lib/crt/stdio/fmode.c b/sdk/lib/crt/stdio/fmode.c index 0469904c3e6..220a92d32c9 100644 --- a/sdk/lib/crt/stdio/fmode.c +++ b/sdk/lib/crt/stdio/fmode.c @@ -1,7 +1,7 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> -int _fmode = _O_TEXT; +int _fmode = 0; /* * @implemented

3 years, 4 months

[reactos] 05/10: [CRT] Fix some data exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=296e07b94d79b9e6fec3b… commit 296e07b94d79b9e6fec3b05de26c4afad3b1f4e1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 25 15:15:04 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT] Fix some data exports * Fix initialization of _commode. In msvcrt it is allocated from .bss, i.e. initialized with 0. * _fileinfo is initialized with -1 * _aexit_rtn is a pointer, not a function * Fix _sys_nerr --- dll/win32/msvcrt/stubs.c | 2 +- sdk/lib/crt/misc/amsg.c | 7 ++----- sdk/lib/crt/misc/environ.c | 2 +- sdk/lib/crt/string/strerror.c | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dll/win32/msvcrt/stubs.c b/dll/win32/msvcrt/stubs.c index 72b32222091..389bc11f3ed 100644 --- a/dll/win32/msvcrt/stubs.c +++ b/dll/win32/msvcrt/stubs.c @@ -10,7 +10,7 @@ int __get_app_type() return 0; } -int _fileinfo = 0; +int _fileinfo = -1; void * __p__fileinfo() diff --git a/sdk/lib/crt/misc/amsg.c b/sdk/lib/crt/misc/amsg.c index 9c53ee118ec..2a1337f8cec 100644 --- a/sdk/lib/crt/misc/amsg.c +++ b/sdk/lib/crt/misc/amsg.c @@ -35,11 +35,8 @@ static char *__rt_err_msg[] = /* * @implemented */ -int _aexit_rtn(int exitcode) -{ - _exit(exitcode); - return 0; -} +typedef void (*aexit_t)(int); +aexit_t _aexit_rtn = _exit; /* * @implemented diff --git a/sdk/lib/crt/misc/environ.c b/sdk/lib/crt/misc/environ.c index 975ab521f43..8248570ad1f 100644 --- a/sdk/lib/crt/misc/environ.c +++ b/sdk/lib/crt/misc/environ.c @@ -28,7 +28,7 @@ char *_pgmptr = NULL; /* pointer to program name */ #undef _wpgmptr wchar_t *_wpgmptr = NULL; /* pointer to program name */ int __app_type = _UNKNOWN_APP; /* application type */ -int _commode = _IOCOMMIT; +int _commode; int BlockEnvToEnvironA(void) diff --git a/sdk/lib/crt/string/strerror.c b/sdk/lib/crt/string/strerror.c index a583c22c7bd..10bda6c746f 100644 --- a/sdk/lib/crt/string/strerror.c +++ b/sdk/lib/crt/string/strerror.c @@ -76,7 +76,7 @@ __syserr35, __syserr36, __syserr37, __syserr38, __syserr39, __syserr40, __syserr41, __syserr42 }; -int _sys_nerr = sizeof(_sys_errlist) / sizeof(_sys_errlist[0]) - 1; +int _sys_nerr = sizeof(_sys_errlist) / sizeof(_sys_errlist[0]); /********************************************************************* * strerror (MSVCRT.@)

3 years, 4 months

[reactos] 04/10: [CRT_APITEST] Add tests for data exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f548654f4eab204ad531… commit 5f548654f4eab204ad531de75772160db74ea20e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 25 15:50:33 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT_APITEST] Add tests for data exports --- dll/win32/msvcrt/msvcrt.spec | 2 +- modules/rostests/apitests/crt/crtdata.c | 640 +++++++++++++++++++++ .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 1 + modules/rostests/apitests/crt/testlist.c | 2 + 4 files changed, 644 insertions(+), 1 deletion(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 848e2602e45..4ecdd97de49 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -1185,7 +1185,7 @@ @ cdecl -version=0x600+ _wctime64_s(ptr long ptr) @ stub -version=0x600+ _wctomb_l @ stub -version=0x600+ _wctomb_s_l -# stub _wctype +@ extern _wctype @ extern _wenviron @ varargs _wexecl(wstr wstr) @ varargs _wexecle(wstr wstr) diff --git a/modules/rostests/apitests/crt/crtdata.c b/modules/rostests/apitests/crt/crtdata.c new file mode 100644 index 00000000000..2022d43e81e --- /dev/null +++ b/modules/rostests/apitests/crt/crtdata.c @@ -0,0 +1,640 @@ +/* +* PROJECT: ReactOS CRT API tests +* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +* PURPOSE: Tests for crt data exports +* COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> +*/ + +#include <apitest.h> +#include <apitest_guard.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <time.h> +#include <locale.h> +#include <mbctype.h> + +static OSVERSIONINFOW s_osvi; +extern char __ImageBase; +static void* s_ImageEnd; + +int IsLocalSymbol(void* Address) +{ + return ((Address >= (void*)&__ImageBase) && (Address <= s_ImageEnd)); +} + +#ifndef TEST_STATIC +#define test_is_local_symbol(addr, is) ok_int(IsLocalSymbol(addr), (is)) +#else +#define test_is_local_symbol(addr, is) +#endif + +void Test___argc(void) +{ + void* p = &__argc; + test_is_local_symbol(p, FALSE); + + #undef __argc + ok_ptr(&__argc, p); +#ifdef _M_IX86 + ok_ptr(__p___argc(), p); +#endif +} + +void Test___argv(void) +{ + void* p = &__argv; + test_is_local_symbol(p, FALSE); + + #undef __argv + ok_ptr(&__argv, p); +#ifdef _M_IX86 + ok_ptr(__p___argv(), p); +#endif +} + +void Test___badioinfo(void) +{ + typedef struct _ioinfo ioinfo; + _CRTIMP extern ioinfo* __badioinfo[]; + ok(__badioinfo != NULL, "__badioinfo is NULL\n"); + ok(__badioinfo[0] != NULL, "__badioinfo is NULL\n"); +} + +void Test___initenv(void) +{ + _CRTIMP extern char** __initenv; + ok(__initenv != NULL, "__initenv is NULL\n"); + ok(*__initenv != NULL, "*__initenv is NULL\n"); +#ifdef _M_IX86 + _CRTIMP char*** __p___initenv(void); + ok_ptr(__p___initenv(), &__initenv); +#endif +} + +void Test___lc_codepage(void) +{ + _CRTIMP extern unsigned int __lc_codepage; + ok_int(__lc_codepage, 0); + ok_int(___lc_codepage_func(), 0); + __lc_codepage++; + todo_ros ok_int(___lc_codepage_func(), 0); + __lc_codepage--; +} + +void Test___lc_collate_cp(void) +{ + _CRTIMP extern int __lc_collate_cp; + test_is_local_symbol(&__lc_collate_cp, FALSE); + ok_int(__lc_collate_cp, 0); + ok_int(___lc_collate_cp_func(), 0); + __lc_collate_cp++; + ok_int(___lc_collate_cp_func(), 0); + __lc_collate_cp--; +} + +void Test___lc_handle(void) +{ + _CRTIMP int __lc_handle; + ok_int(__lc_handle, 0); + _CRTIMP int* ___lc_handle_func(); + ok_int(*___lc_handle_func(), 0); + __lc_handle++; + todo_ros ok_int(*___lc_handle_func(), 0); + __lc_handle--; +} + +void Test___mb_cur_max(void) +{ + void* p = &__mb_cur_max; + test_is_local_symbol(&__mb_cur_max, FALSE); + ok_int(__mb_cur_max, 1); + + #undef __mb_cur_max + _CRTIMP extern int __mb_cur_max; + ok_ptr(&__mb_cur_max, p); + + ok_int(___mb_cur_max_func(), 1); +#ifdef _M_IX86 + _CRTIMP int* __p___mb_cur_max(void); + ok_int(*__p___mb_cur_max(), 1); +#endif + __mb_cur_max++; + if (s_osvi.dwMajorVersion >= 6) + { + ok_int(___mb_cur_max_func(), 1); +#ifdef _M_IX86 + ok_int(*__p___mb_cur_max(), 1); +#endif + } + else + { + todo_ros ok_int(___mb_cur_max_func(), 2); +#ifdef _M_IX86 + todo_ros ok_ptr(__p___mb_cur_max(), p); // wine code handles it like on Vista+ + todo_ros ok_int(*__p___mb_cur_max(), 2); +#endif + } + + __mb_cur_max--; +} + +void Test___pioinfo(void) +{ + +} + +void Test___setlc_active(void) +{ + _CRTIMP extern unsigned int __setlc_active; + ok_int(__setlc_active, 0); + + _CRTIMP unsigned int ___setlc_active_func(void); + ok_int(___setlc_active_func(), __setlc_active); + __setlc_active++; + ok_int(___setlc_active_func(), __setlc_active); + __setlc_active--; +} + +void Test___unguarded_readlc_active(void) +{ + _CRTIMP extern unsigned int __unguarded_readlc_active; + void* p = &__unguarded_readlc_active; + ok_int(__unguarded_readlc_active, 0); + + _CRTIMP unsigned int* ___unguarded_readlc_active_add_func(void); + ok_ptr(___unguarded_readlc_active_add_func(), p); +} + +void Test___wargv(void) +{ + void* p = &__wargv; + test_is_local_symbol(p, FALSE); + + #undef __wargv + _CRTIMP extern wchar_t ** __wargv; + ok_ptr(&__wargv, p); +#ifdef _M_IX86 + ok_ptr(__p___wargv(), p); +#endif +} + +void Test___winitenv(void) +{ + _CRTIMP extern wchar_t** __winitenv; + todo_ros ok(__winitenv == NULL, "__winitenv is not NULL\n"); +#ifdef _M_IX86 + _CRTIMP wchar_t*** __p___winitenv(void); + ok_ptr(__p___winitenv(), &__winitenv); +#endif +} + +void Test__acmdln(void) +{ + _CRTIMP extern char* _acmdln; + ok(_acmdln != NULL, "__winitenv is NULL\n"); +#ifdef _M_IX86 + _CRTIMP char** __p__acmdln(void); + ok_ptr(__p__acmdln(), &_acmdln); +#endif +} + +#ifdef _M_IX86 +void Test__adjust_fdiv(void) +{ + _CRTIMP extern int _adjust_fdiv; + ok_int(_adjust_fdiv, 0); +} +#endif + +void Test__aexit_rtn(void) +{ + typedef void (*_exit_t)(int exitcode); + _CRTIMP extern _exit_t _aexit_rtn; + ok_ptr(_aexit_rtn, _exit); +} + +void Test__commode(void) +{ + void* p = &_commode; + test_is_local_symbol(&_commode, FALSE); + ok_int(_commode, 0); + + #undef _commode + _CRTIMP extern int _commode; + ok_ptr(&_commode, p); +#ifdef _M_IX86 + ok_ptr(__p__commode(), &_commode); +#endif +} + +void Test__ctype(void) +{ + _CRTIMP extern const unsigned short _ctype[]; + ok_int(_ctype[0], 0); + ok_int(_ctype[1], _CONTROL); + + #undef _pctype + _CRTIMP extern const unsigned short* _pctype; + ok(_pctype != &_ctype[0], "_pwctype should not match &_wctype[0]"); + if (s_osvi.dwMajorVersion >= 6) + { + ok(_pctype != &_ctype[1], "_pwctype should not match &_wctype[1]"); + } + else + { + ok(_pctype == &_ctype[1], "_pwctype should match &_wctype[1]"); + } + + ok(__pctype_func() != _ctype, "__pctype_func() should not match _ctype\n"); + ok_int(__pctype_func()[0], _CONTROL); + ok_int(__pctype_func()[1], _CONTROL); +#ifdef _M_IX86 + _CRTIMP const unsigned short** __cdecl __p__pctype(void); + ok_ptr(*__p__pctype(), __pctype_func()); +#endif +} + +void Test__wctype(void) +{ + ok_int(_wctype[0], 0); + ok_int(_wctype[1], _CONTROL); + + #undef _pwctype + _CRTIMP extern const unsigned short* _pwctype; + ok_ptr(_pwctype, &_wctype[1]); + + ok(__pwctype_func() != _wctype, "__pwctype_func() == _wctype\n"); + ok_int(__pctype_func()[0], _CONTROL); + ok_int(__pctype_func()[1], _CONTROL); +#ifdef _M_IX86 + _CRTIMP const unsigned short** __cdecl __p__pwctype(void); + ok_ptr(*__p__pwctype(), __pwctype_func()); +#endif +} + +void Test__daylight(void) +{ + void* p = &_daylight; + test_is_local_symbol(&_daylight, FALSE); + + #undef _daylight + _CRTIMP extern int _daylight; + ok_ptr(&_daylight, p); + +#ifdef _M_IX86 + _CRTIMP void* __p__daylight(void); + ok_ptr(__p__daylight(), &_daylight); +#endif +#if (WINVER >= 0x600) + _CRTIMP int* __cdecl __daylight(void); + ok_ptr(&__daylight, &_daylight); +#endif +} + +void Test__dstbias(void) +{ + void* p = &_dstbias; + test_is_local_symbol(&_dstbias, FALSE); + + #undef _dstbias + _CRTIMP extern long _dstbias; + ok_ptr(&_dstbias, p); +#ifdef _M_IX86 + _CRTIMP long* __cdecl __p__dstbias(void); + ok_ptr(__p__dstbias(), &_dstbias); +#endif +#if (WINVER >= 0x600) + _CRTIMP long* __cdecl __dstbias(void); + ok_ptr(&__dstbias, &_dstbias); +#endif +} + +void Test__environ(void) +{ + void* p = &_environ; + ok(_environ != NULL, "_environ == NULL\n"); + + #undef _environ + _CRTIMP extern char** _environ; + ok_ptr(&_environ, p); +#ifdef _M_IX86 + ok_ptr(__p__environ(), &_environ); +#endif +} + +void Test__fileinfo(void) +{ + _CRTIMP extern int _fileinfo; + ok_int(_fileinfo, -1); + +#ifdef _M_IX86 + _CRTIMP int* __p__fileinfo(); + ok_ptr(__p__fileinfo(), &_fileinfo); +#endif +} + +void Test__fmode(void) +{ + void* p = &_fmode; + test_is_local_symbol(&_fmode, FALSE); + ok_int(_fmode, 0); + + #undef _fmode + _CRTIMP extern int _fmode; + ok_ptr(&_fmode, p); + +#ifdef _M_IX86 + _CRTIMP int* __cdecl __p__fmode(); + ok_ptr(__p__fmode(), p); +#endif + +#if (_WIN32_WINNT >= 0x600) + _fmode = 1234; + _CRTIMP errno_t __cdecl _get_fmode(_Out_ int* _PMode); + int mode; + ok_int(_get_fmode(&mode), 0); + ok_int(mode, _fmode); + _fmode = 0; +#endif +} + +void Test__iob(void) +{ + void* p = &_iob; + test_is_local_symbol(&_iob, FALSE); + ok_ptr(&_iob[0], stdin); + ok_ptr(&_iob[1], stdout); + ok_ptr(&_iob[2], stderr); + + #undef _iob + _CRTIMP extern FILE _iob[]; + ok_ptr(&_iob, p); + + ok_ptr(__iob_func(), &_iob); + +#ifdef _M_IX86 + _CRTIMP int* __cdecl __p__iob(); + ok_ptr(__p__iob(), p); +#endif +} + +void Test__mbcasemap(void) +{ + void* p = &_mbcasemap; + ok_int(_mbcasemap[0], 0); + + #undef _mbcasemap + ok_ptr(_mbcasemap, p); + +#ifdef _M_IX86 + _CRTIMP unsigned char* __cdecl __p__mbcasemap(); + ok_ptr(__p__mbcasemap(), &_mbcasemap); +#endif +} + +void Test__mbctype(void) +{ + void* p = &_mbctype; + ok_int(_mbctype[0], 0); + + #undef _mbctype + ok_ptr(&_mbctype, p); + +#ifdef _M_IX86 + _CRTIMP unsigned char* __cdecl __p__mbctype(); + todo_ros ok_ptr(__p__mbctype(), &_mbctype); // wine implements thiss like on Vista +#endif +} + +void Test__osplatform(void) +{ + ok_int(_osplatform, s_osvi.dwPlatformId); +#if (WINVER >= 0x600) + _CRTIMP unsigned int __cdecl _get_osplatform(void); + ok_ptr(_get_osplatform(), _osplatform); +#endif +} + +void Test__osver(void) +{ + ok_int(_osver, s_osvi.dwBuildNumber); + +#ifdef _M_IX86 + _CRTIMP int* __cdecl __p__osver(); + ok_ptr(__p__osver(), &_osver); +#endif +} + +void Test__pgmptr(void) +{ + void* p = &_pgmptr; + ok(_pgmptr != NULL, "_pgmptr should not be NULL\n"); + + #undef _pgmptr + _CRTIMP extern char* _pgmptr; + ok_ptr(&_pgmptr, p); +#ifdef _M_IX86 + ok_ptr(__p__pgmptr(), &_pgmptr); +#endif +#if (WINVER >= 0x600) + _CRTIMP char* __cdecl _get_pgmptr(void); + ok_ptr(_get_pgmptr(), _pgmptr); +#endif +} + +void Test__sys_errlist(void) +{ + void* p = &_sys_errlist; + ok_int(strcmp(_sys_errlist[0], strerror(0)), 0); + ok_int(strcmp(_sys_errlist[42], strerror(42)), 0); + + #undef _sys_errlist + _CRTIMP extern char* _sys_errlist[]; + ok_ptr(&_sys_errlist, p); +} + +void Test__sys_nerr(void) +{ + void* p = &_sys_nerr; + ok_int(_sys_nerr, 43); + + #undef _sys_nerr + _CRTIMP extern int _sys_nerr; + ok_ptr(&_sys_nerr, p); +} + +void Test__timezone(void) +{ + void* p = &_timezone; + test_is_local_symbol(&_timezone, FALSE); + + #undef _timezone + _CRTIMP extern long _timezone; + ok_ptr(&_timezone, p); + +#ifdef _M_IX86 + _CRTIMP char** __p__timezone(); + ok_ptr(__p__timezone(), &_timezone); +#endif +} + +void Test__tzname(void) +{ + void* p = &_tzname; + test_is_local_symbol(&_tzname, FALSE); + ok(_tzname[0] != NULL, "_tzname[0] == NULL\n"); + ok(_tzname[0] != NULL, "_tzname[0] == NULL\n"); + + #undef _tzname + _CRTIMP extern char * _tzname[2]; + ok_ptr(_tzname, p); + +#ifdef _M_IX86 + _CRTIMP char** __p__tzname(); + ok_ptr(__p__tzname(), &_tzname); +#endif +#if (WINVER >= 0x600) + _CRTIMP char* __cdecl __tzname(void); + ok_ptr(__tzname(), _wenviron); +#endif +} + +void Test__wcmdln(void) +{ + _CRTIMP extern wchar_t* _wcmdln; +#ifdef _M_IX86 + _CRTIMP wchar_t** __p__wcmdln(void); + ok_ptr(__p__wcmdln(), &_wcmdln); +#endif +} + +void Test__wenviron(void) +{ + void* p = &_wenviron; + todo_ros ok(_wenviron == NULL, "_wenviron is not NULL\n"); + + #undef _wenviron + _CRTIMP extern wchar_t** _wenviron; + ok_ptr(&_wenviron, p); +#ifdef _M_IX86 + ok_ptr(__p__wenviron(), &_wenviron); +#endif +#if (WINVER >= 0x600) + _CRTIMP unsigned int __cdecl _get_wenviron(void); + ok_int(_get_wenviron(), _wenviron); +#endif +} + +void Test__winmajor(void) +{ + ok_int(_winmajor, s_osvi.dwMajorVersion); +#ifdef _M_IX86 + _CRTIMP unsigned int* __cdecl __p__winmajor(); + ok_ptr(__p__winmajor(), &_winmajor); +#endif +#if (WINVER >= 0x600) + _CRTIMP unsigned int __cdecl _get_winmajor(void); + ok_int(_get_winmajor(), _winmajor); +#endif +} + +void Test__winminor(void) +{ + ok_int(_winminor, s_osvi.dwMinorVersion); +#ifdef _M_IX86 + _CRTIMP unsigned int* __cdecl __p__winminor(); + ok_ptr(__p__winminor(), &_winminor); +#endif +#if (WINVER >= 0x600) + _CRTIMP unsigned int __cdecl _get_winminor(void); + ok_int(_get_winminor(), _winminor); +#endif +} + +void Test__winver(void) +{ + ok_int(_winver, (s_osvi.dwMajorVersion << 8) | s_osvi.dwMinorVersion); +#ifdef _M_IX86 + _CRTIMP unsigned int* __cdecl __p__winver(); + ok_ptr(__p__winver(), &_winver); +#endif +#if (WINVER >= 0x600) + _CRTIMP unsigned int __cdecl _get_winver(void); + ok_int(_get_winver(), _winver); +#endif +} + +void Test__wpgmptr(void) +{ + void* p = _wpgmptr; + ok_ptr(_wpgmptr, NULL); + + #undef _wpgmptr + ok_ptr(_wpgmptr, p); + +#ifdef _M_IX86 + _CRTIMP wchar_t ** __cdecl __p__wpgmptr(); + ok_ptr(__p__wpgmptr(), &_wpgmptr); +#endif +#if (WINVER >= 0x600) + _CRTIMP unsigned int __cdecl _get_wpgmptr(void); + ok_int(_get_wpgmptr(), _wpgmptr); +#endif +} + +START_TEST(crtdata) +{ + /* Initialize image size */ + PIMAGE_DOS_HEADER dosHeader = (PIMAGE_DOS_HEADER)&__ImageBase; + PIMAGE_NT_HEADERS ntHeaders = (PIMAGE_NT_HEADERS)((PUCHAR)dosHeader + dosHeader->e_lfanew); + s_ImageEnd = (PUCHAR)dosHeader + ntHeaders->OptionalHeader.SizeOfImage; + + /* initialize version info */ + s_osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&s_osvi); + + Test___argc(); + Test___argv(); + Test___badioinfo(); + Test___initenv(); + Test___lc_codepage(); + Test___lc_collate_cp(); + Test___lc_handle(); + Test___mb_cur_max(); + Test___pioinfo(); + Test___setlc_active(); + Test___unguarded_readlc_active(); + Test___wargv(); + Test___winitenv(); + Test__acmdln(); +#ifdef _M_IX86 + Test__adjust_fdiv(); +#endif + Test__aexit_rtn(); + Test__commode(); + Test__ctype(); + Test__daylight(); + Test__dstbias(); + Test__environ(); + Test__fileinfo(); + Test__fmode(); + Test__iob(); + Test__mbcasemap(); + Test__mbctype(); + Test__osplatform(); + Test__osver(); + Test__pgmptr(); + Test__sys_errlist(); + Test__sys_nerr(); + Test__timezone(); + Test__tzname(); + Test__wcmdln(); + Test__wctype(); + Test__wenviron(); + Test__winmajor(); + Test__winminor(); + Test__winver(); + Test__wpgmptr(); +} diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 5c5bb587fbb..dcef3b0d582 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1261,6 +1261,7 @@ list(APPEND SOURCE_MSVCRT # wprintf_s.c # wscanf.c # wscanf_s.c + crtdata.c static_construct.cpp static_init.c ) diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index 4c36c86eee4..dacd260e161 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -34,6 +34,7 @@ extern void func___getmainargs(void); extern void func_static_construct(void); extern void func_static_init(void); +extern void func_crtdata(void); const struct test winetest_testlist[] = { @@ -59,6 +60,7 @@ const struct test winetest_testlist[] = #if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) { "atexit", func_atexit }, + { "crtdata", func_crtdata }, #if defined(_M_IX86) { "__getmainargs", func___getmainargs }, #elif defined(_M_ARM)

3 years, 4 months

[reactos] 03/10: [CRT] Fix some _CRTIMP

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=379957424c80f7b616da5… commit 379957424c80f7b616da5b4445efce2907834f20 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 31 17:15:30 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT] Fix some _CRTIMP Get rid of the ugly __MINGW_IMP_SYMBOL hacks. --- sdk/include/crt/mbctype.h | 14 ++-------- sdk/lib/crt/include/internal/mingw-w64/internal.h | 33 +++++------------------ sdk/lib/crt/startup/charmax.c | 2 +- sdk/lib/crt/startup/crtexe.c | 19 ++----------- 4 files changed, 12 insertions(+), 56 deletions(-) diff --git a/sdk/include/crt/mbctype.h b/sdk/include/crt/mbctype.h index 7a7a709be85..53fc0f2c80a 100644 --- a/sdk/include/crt/mbctype.h +++ b/sdk/include/crt/mbctype.h @@ -22,20 +22,10 @@ extern "C" { #endif /* defined (_DLL) && defined (_M_IX86) */ #endif #ifndef _mbctype -#ifdef _MSVCRT_ - extern unsigned char _mbctype[257]; -#else -#define _mbctype (*_imp___mbctype) - extern unsigned char **_imp___mbctype; -#endif + _CRTIMP extern unsigned char _mbctype[257]; #endif #ifndef _mbcasemap -#ifdef _MSVCRT_ - extern unsigned char *_mbcasemap; -#else -#define _mbcasemap (*_imp___mbcasemap) - extern unsigned char **_imp___mbcasemap; -#endif + _CRTIMP extern unsigned char _mbcasemap[257]; #endif /* CRT stuff */ diff --git a/sdk/lib/crt/include/internal/mingw-w64/internal.h b/sdk/lib/crt/include/internal/mingw-w64/internal.h index aeac86701ef..9193ab9c5b4 100644 --- a/sdk/lib/crt/include/internal/mingw-w64/internal.h +++ b/sdk/lib/crt/include/internal/mingw-w64/internal.h @@ -21,7 +21,7 @@ extern "C" { #ifdef __REACTOS__ #include "malloc.h" struct _exception; -__declspec(dllimport) void __cdecl __setusermatherr(int (__cdecl *)(struct _exception *)); +_CRTIMP void __cdecl __setusermatherr(int (__cdecl *)(struct _exception *)); #define __mingw_fprintf fprintf #define __mingw_vfprintf vfprintf #endif @@ -82,13 +82,11 @@ __declspec(dllimport) void __cdecl __setusermatherr(int (__cdecl *)(struct _exce #define _tm_unicode_safe(i) (_pioinfo_safe(i)->unicode) #ifndef __badioinfo - extern ioinfo ** __MINGW_IMP_SYMBOL(__badioinfo)[]; -#define __badioinfo (* __MINGW_IMP_SYMBOL(__badioinfo)) +_CRTIMP extern ioinfo * __badioinfo[]; #endif #ifndef __pioinfo - extern ioinfo ** __MINGW_IMP_SYMBOL(__pioinfo)[]; -#define __pioinfo (* __MINGW_IMP_SYMBOL(__pioinfo)) +_CRTIMP extern ioinfo ** __pioinfo[]; #endif #define _NO_CONSOLE_FILENO (intptr_t)-2 @@ -119,27 +117,10 @@ __declspec(dllimport) void __cdecl __setusermatherr(int (__cdecl *)(struct _exce extern int _dowildcard; extern int _newmode; -#ifndef __winitenv -extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); -#define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv)) -#endif - -#ifndef __initenv -extern char *** __MINGW_IMP_SYMBOL(__initenv); -#define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) -#endif - -#ifndef _acmdln -extern char ** __MINGW_IMP_SYMBOL(_acmdln); -#define _acmdln (* __MINGW_IMP_SYMBOL(_acmdln)) -/* _CRTIMP extern char *_acmdln; */ -#endif - -#ifndef _wcmdln -extern char ** __MINGW_IMP_SYMBOL(_wcmdln); -#define _wcmdln (* __MINGW_IMP_SYMBOL(_wcmdln)) -/* __CRTIMP extern wchar_t *_wcmdln; */ -#endif +_CRTIMP extern wchar_t ** __winitenv; +_CRTIMP extern char ** __initenv; +_CRTIMP extern char * _acmdln; +_CRTIMP extern char * _wcmdln; _CRTIMP __declspec(noreturn) void __cdecl _amsg_exit(int); diff --git a/sdk/lib/crt/startup/charmax.c b/sdk/lib/crt/startup/charmax.c index 42debd4fe4b..c910c53c5d7 100644 --- a/sdk/lib/crt/startup/charmax.c +++ b/sdk/lib/crt/startup/charmax.c @@ -7,7 +7,7 @@ #include <sect_attribs.h> #include <internal.h> -__declspec(dllimport) int __cdecl __lconv_init (void); +_CRTIMP int __cdecl __lconv_init (void); int mingw_initcharmax = 0; diff --git a/sdk/lib/crt/startup/crtexe.c b/sdk/lib/crt/startup/crtexe.c index ea9b13aaf22..3897242197b 100644 --- a/sdk/lib/crt/startup/crtexe.c +++ b/sdk/lib/crt/startup/crtexe.c @@ -4,11 +4,6 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#undef CRTDLL -#ifndef _DLL -#define _DLL -#endif - #define SPECIAL_CRTEXE #include <oscalls.h> @@ -25,19 +20,9 @@ #endif /* Special handling for ARM & ARM64, __winitenv & __initenv aren't present there. */ - #if !defined(__arm__) && !defined(__aarch64__) - -#ifndef __winitenv -extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); -#define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv)) -#endif - -#ifndef __initenv -extern char *** __MINGW_IMP_SYMBOL(__initenv); -#define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) -#endif - +_CRTIMP extern wchar_t** __winitenv; +_CRTIMP extern char** __initenv; #endif /* Hack, for bug in ld. Will be removed soon. */

3 years, 4 months

[reactos] 02/10: [CRT] Fix CRT headers a bit

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b05cc3620875c3816e332… commit b05cc3620875c3816e332d065671ed1dac894fa1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jul 28 10:25:22 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT] Fix CRT headers a bit * Remove unused internal version of float.h * Define _STATIC_ASSERT in crtdefs.h * Add some missing declarations --- modules/rostests/apitests/crt/wctomb.c | 2 - sdk/include/crt/crtdbg.h | 5 - sdk/include/crt/crtdefs.h | 9 ++ sdk/include/crt/emmintrin.h | 2 +- sdk/include/crt/locale.h | 10 ++ sdk/include/crt/malloc.h | 4 - sdk/include/crt/stdio.h | 7 ++ sdk/lib/crt/include/float.h | 176 --------------------------------- sdk/lib/crt/locale/locale.c | 2 +- 9 files changed, 28 insertions(+), 189 deletions(-) diff --git a/modules/rostests/apitests/crt/wctomb.c b/modules/rostests/apitests/crt/wctomb.c index 7ccb713d1b7..8048f56df13 100644 --- a/modules/rostests/apitests/crt/wctomb.c +++ b/modules/rostests/apitests/crt/wctomb.c @@ -14,8 +14,6 @@ #include <errno.h> #include <locale.h> -unsigned int cdecl ___lc_codepage_func(void); - START_TEST(wctomb) { int Length; diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index 9b72b56a60c..3a20d5316fb 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -81,11 +81,6 @@ extern "C" { size_t lTotalCount; } _CrtMemState; -#ifndef _STATIC_ASSERT -#define _STATIC_ASSERT(expr) extern char (*static_assert(void)) [(expr) ? 1 : -1] -#endif - - // Debug reporting functions #ifdef _DEBUG diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/crt/crtdefs.h index d4ad5fd2178..582ae24edb2 100644 --- a/sdk/include/crt/crtdefs.h +++ b/sdk/include/crt/crtdefs.h @@ -182,6 +182,15 @@ #define __crt_typefix(ctype) +#ifndef _STATIC_ASSERT + #ifdef __cplusplus + #define _STATIC_ASSERT(expr) static_assert((expr), #expr) + #elif defined(__clang__) || defined(__GNUC__) + #define _STATIC_ASSERT(expr) _Static_assert((expr), #expr) + #else + #define _STATIC_ASSERT(expr) extern char (*__static_assert__(void)) [(expr) ? 1 : -1] + #endif +#endif /* _STATIC_ASSERT */ /** Deprecated ***************************************************************/ diff --git a/sdk/include/crt/emmintrin.h b/sdk/include/crt/emmintrin.h index 5f8ceb19338..87ae2058d86 100644 --- a/sdk/include/crt/emmintrin.h +++ b/sdk/include/crt/emmintrin.h @@ -22,7 +22,7 @@ typedef union _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128i unsigned __int32 m128i_u32[4]; unsigned __int64 m128i_u64[2]; } __m128i; -C_ASSERT(sizeof(__m128i) == 16); +_STATIC_ASSERT(sizeof(__m128i) == 16); typedef struct _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128d { diff --git a/sdk/include/crt/locale.h b/sdk/include/crt/locale.h index fff1376ce01..d24699d0463 100644 --- a/sdk/include/crt/locale.h +++ b/sdk/include/crt/locale.h @@ -113,6 +113,16 @@ extern "C" { __free_locale( _In_opt_ _locale_t _Locale); +_CRTIMP +unsigned int +__cdecl +___lc_collate_cp_func(void); + +_CRTIMP +unsigned int +__cdecl +___lc_codepage_func(void); + #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED _Check_return_opt_ diff --git a/sdk/include/crt/malloc.h b/sdk/include/crt/malloc.h index c0ebb2ec25b..553032edfb7 100644 --- a/sdk/include/crt/malloc.h +++ b/sdk/include/crt/malloc.h @@ -24,10 +24,6 @@ extern "C" { #define _HEAP_MAXREQ 0xFFFFFFE0 #endif -#ifndef _STATIC_ASSERT -#define _STATIC_ASSERT(expr) extern char (*static_assert(void)) [(expr) ? 1 : -1] -#endif - /* Return codes for _heapwalk() */ #define _HEAPEMPTY (-1) #define _HEAPOK (-2) diff --git a/sdk/include/crt/stdio.h b/sdk/include/crt/stdio.h index 9ac92d50672..6d181a541b2 100644 --- a/sdk/include/crt/stdio.h +++ b/sdk/include/crt/stdio.h @@ -114,6 +114,13 @@ extern "C" { #endif +#if defined(_M_IX86) // newer Windows versions always have it +_CRTIMP int* __cdecl __p__commode(void); +#endif + +/* On newer Windows windows versions, (*__p__commode()) is used */ +extern _CRTIMP int _commode; + #define _IOREAD 0x0001 #define _IOWRT 0x0002 diff --git a/sdk/lib/crt/include/float.h b/sdk/lib/crt/include/float.h deleted file mode 100644 index 48281188df5..00000000000 --- a/sdk/lib/crt/include/float.h +++ /dev/null @@ -1,176 +0,0 @@ -/* - * float.h - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Constants related to floating point arithmetic. - * - * Also included here are some non-ANSI bits for accessing the floating - * point controller. - * - * NOTE: GCC provides float.h, but it doesn't include the non-standard - * stuff for accessing the fp controller. We include_next the - * GCC-supplied header and just define the MS-specific extensions - * here. - * - */ -#ifdef __GNUC__ - #include_next <float.h> -#endif -#ifndef _MINGW_FLOAT_H_ -#define _MINGW_FLOAT_H_ - -/* All the headers include this file. */ -#ifdef __GNUC__ - #include <_mingw.h> -#endif -/* - * Functions and definitions for controlling the FPU. - */ -#ifndef __STRICT_ANSI__ - -/* TODO: These constants are only valid for x86 machines */ - -/* Control word masks for unMask */ -#define _MCW_EM 0x0008001F /* Error masks */ -#define _MCW_IC 0x00040000 /* Infinity */ -#define _MCW_RC 0x00000300 /* Rounding */ -#define _MCW_PC 0x00030000 /* Precision */ - -/* Control word values for unNew (use with related unMask above) */ -#define _EM_INVALID 0x00000010 -#define _EM_DENORMAL 0x00080000 -#define _EM_ZERODIVIDE 0x00000008 -#define _EM_OVERFLOW 0x00000004 -#define _EM_UNDERFLOW 0x00000002 -#define _EM_INEXACT 0x00000001 -#define _IC_AFFINE 0x00040000 -#define _IC_PROJECTIVE 0x00000000 -#define _RC_CHOP 0x00000300 -#define _RC_UP 0x00000200 -#define _RC_DOWN 0x00000100 -#define _RC_NEAR 0x00000000 -#define _PC_24 0x00020000 -#define _PC_53 0x00010000 -#define _PC_64 0x00000000 - -/* These are also defined in Mingw math.h, needed to work around - GCC build issues. */ -/* Return values for fpclass. */ -#ifndef __MINGW_FPCLASS_DEFINED -#define __MINGW_FPCLASS_DEFINED 1 -#define _FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ -#define _FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ -#define _FPCLASS_NINF 0x0004 /* Negative Infinity */ -#define _FPCLASS_NN 0x0008 /* Negative Normal */ -#define _FPCLASS_ND 0x0010 /* Negative Denormal */ -#define _FPCLASS_NZ 0x0020 /* Negative Zero */ -#define _FPCLASS_PZ 0x0040 /* Positive Zero */ -#define _FPCLASS_PD 0x0080 /* Positive Denormal */ -#define _FPCLASS_PN 0x0100 /* Positive Normal */ -#define _FPCLASS_PINF 0x0200 /* Positive Infinity */ -#endif /* __MINGW_FPCLASS_DEFINED */ - -/* _statusfp bit flags */ -#define _SW_INEXACT 0x00000001 /* inexact (precision) */ -#define _SW_UNDERFLOW 0x00000002 /* underflow */ -#define _SW_OVERFLOW 0x00000004 /* overflow */ -#define _SW_ZERODIVIDE 0x00000008 /* zero divide */ -#define _SW_INVALID 0x00000010 /* invalid */ -#define _SW_DENORMAL 0x00080000 /* denormal status bit */ - -#define _SW_UNEMULATED 0x00000040 /* unemulated instruction */ -#define _SW_SQRTNEG 0x00000080 /* square root of a neg number */ -#define _SW_STACKOVERFLOW 0x00000200 /* FP stack overflow */ -#define _SW_STACKUNDERFLOW 0x00000400 /* FP stack underflow */ - -/* Floating point error signals and return codes */ -#define _FPE_INVALID 0x81 -#define _FPE_DENORMAL 0x82 -#define _FPE_ZERODIVIDE 0x83 -#define _FPE_OVERFLOW 0x84 -#define _FPE_UNDERFLOW 0x85 -#define _FPE_INEXACT 0x86 -#define _FPE_UNEMULATED 0x87 -#define _FPE_SQRTNEG 0x88 -#define _FPE_STACKOVERFLOW 0x8a -#define _FPE_STACKUNDERFLOW 0x8b -#define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */ - -#ifndef DBL_MAX_10_EXP -#define DBL_MAX_10_EXP 308 -#endif -#ifndef UINT64_MAX -#define UINT64_MAX 0xffffffffffffffff -#endif - -#ifndef RC_INVOKED - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _CRTIMP -#ifdef _DLL -#define _CRTIMP __declspec(dllimport) -#else -#define _CRTIMP -#endif /* _DLL */ -#endif - -/* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), - * i.e. change the bits in unMask to have the values they have in unNew, - * leaving other bits unchanged. */ -_CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask); - - -_CRTIMP unsigned int __cdecl _clearfp (void); /* Clear the FPU status word */ -_CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */ -#define _clear87 _clearfp -#define _status87 _statusfp - - -/* - MSVCRT.dll _fpreset initializes the control register to 0x27f, - the status register to zero and the tag word to 0FFFFh. - This differs from asm instruction finit/fninit which set control - word to 0x37f (64 bit mantissa precison rather than 53 bit). - By default, the mingw version of _fpreset sets fp control as - per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when - building your application. -*/ -void __cdecl _fpreset (void); -void __cdecl fpreset (void); - -/* Global 'variable' for the current floating point error code. */ -_CRTIMP int * __cdecl __fpecode(void); -#define _fpecode (*(__fpecode())) - -/* - * IEEE recommended functions. MS puts them in float.h - * but they really belong in math.h. - */ - -_CRTIMP double __cdecl _chgsign (double); -_CRTIMP double __cdecl _copysign (double, double); -_CRTIMP double __cdecl _logb (double); -_CRTIMP double __cdecl _nextafter (double, double); -_CRTIMP double __cdecl _scalb (double, long); - -_CRTIMP int __cdecl _finite (double); -_CRTIMP int __cdecl _fpclass (double); -_CRTIMP int __cdecl _isnan (double); - -#ifdef __cplusplus -} -#endif - -#endif /* Not RC_INVOKED */ - -#endif /* Not __STRICT_ANSI__ */ - -#endif /* _FLOAT_H_ */ - - diff --git a/sdk/lib/crt/locale/locale.c b/sdk/lib/crt/locale/locale.c index 0f599a4135f..897aa2ec38d 100644 --- a/sdk/lib/crt/locale/locale.c +++ b/sdk/lib/crt/locale/locale.c @@ -632,7 +632,7 @@ unsigned int CDECL ___lc_codepage_func(void) /********************************************************************* * ___lc_collate_cp_func (MSVCRT.@) */ -int CDECL ___lc_collate_cp_func(void) +unsigned int CDECL ___lc_collate_cp_func(void) { return get_locinfo()->lc_collate_cp; }

3 years, 4 months

[reactos] 01/10: [CRT] Remove _fmode and _commode initialization

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f3d052af9b0d6d8bcb5d… commit 0f3d052af9b0d6d8bcb5d79c371cdaec99548890 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 24 16:27:20 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 4 02:03:07 2021 +0200 [CRT] Remove _fmode and _commode initialization This "initialization" copies the value of the local variable to the one exported from msvcrt, which is the same. Also there shouldn't be a local version of the variable in the first place. --- sdk/lib/crt/startup/crtexe.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sdk/lib/crt/startup/crtexe.c b/sdk/lib/crt/startup/crtexe.c index 4e6f1e4d1f6..ea9b13aaf22 100644 --- a/sdk/lib/crt/startup/crtexe.c +++ b/sdk/lib/crt/startup/crtexe.c @@ -52,13 +52,6 @@ extern void __cdecl _fpreset (void); #define SPACECHAR _T(' ') #define DQUOTECHAR _T('\"') -extern int * __MINGW_IMP_SYMBOL(_fmode); -extern int * __MINGW_IMP_SYMBOL(_commode); - -#undef _fmode -extern int _fmode; -extern int * __MINGW_IMP_SYMBOL(_commode); -#define _commode (* __MINGW_IMP_SYMBOL(_commode)) extern int _dowildcard; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); @@ -129,9 +122,6 @@ pre_c_init (void) __set_app_type (_CONSOLE_APP); __onexitbegin = __onexitend = (_PVFV *)(-1); - * __MINGW_IMP_SYMBOL(_fmode) = _fmode; - * __MINGW_IMP_SYMBOL(_commode) = _commode; - #ifdef WPRFLAG _wsetargv(); #else

3 years, 4 months

[reactos] 01/01: [IMM32] Rewrite ImmInstallIMEA (#3873)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7507a8f1922bcd87180a5… commit 7507a8f1922bcd87180a53eb0acb90af6a1249f7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 4 07:32:13 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 4 07:32:13 2021 +0900 [IMM32] Rewrite ImmInstallIMEA (#3873) Implementing Japanese input... CORE-11700 --- dll/win32/imm32/imm.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 9c7aa19ec4a..62f1569c354 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -2808,21 +2808,33 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) HKL WINAPI ImmInstallIMEA( LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) { - LPWSTR lpszwIMEFileName; - LPWSTR lpszwLayoutText; - HKL hkl; + INT cchFileName, cchLayoutText; + LPWSTR pszFileNameW, pszLayoutTextW; + HKL hKL; - TRACE ("(%s, %s)\n", debugstr_a(lpszIMEFileName), - debugstr_a(lpszLayoutText)); + TRACE("(%s, %s)\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)); - lpszwIMEFileName = strdupAtoW(lpszIMEFileName); - lpszwLayoutText = strdupAtoW(lpszLayoutText); + cchFileName = lstrlenA(lpszIMEFileName) + 1; + cchLayoutText = lstrlenA(lpszLayoutText) + 1; - hkl = ImmInstallIMEW(lpszwIMEFileName, lpszwLayoutText); + pszFileNameW = Imm32HeapAlloc(0, cchFileName * sizeof(WCHAR)); + if (pszFileNameW == NULL) + return NULL; - HeapFree(GetProcessHeap(),0,lpszwIMEFileName); - HeapFree(GetProcessHeap(),0,lpszwLayoutText); - return hkl; + pszLayoutTextW = Imm32HeapAlloc(0, cchLayoutText * sizeof(WCHAR)); + if (pszLayoutTextW == NULL) + { + HeapFree(g_hImm32Heap, 0, pszFileNameW); + return NULL; + } + + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, lpszIMEFileName, -1, pszFileNameW, cchFileName); + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, lpszLayoutText, -1, pszLayoutTextW, cchLayoutText); + + hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); + HeapFree(g_hImm32Heap, 0, pszFileNameW); + HeapFree(g_hImm32Heap, 0, pszLayoutTextW); + return hKL; } /***********************************************************************

3 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2021