Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ARM] Fix some compilation errors for ARM
by Stanislav Motylkov 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f4c98a425fb42f346ec0… commit 3f4c98a425fb42f346ec01007860133e849330ca Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 9 18:56:32 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 9 19:40:20 2021 +0300 [ARM] Fix some compilation errors for ARM CORE-17634 CORE-17604 --- dll/ntdll/def/ntdll.spec | 10 +++++----- dll/win32/msvcrt/msvcrt.spec | 4 ++-- dll/win32/rpcrt4/CMakeLists.txt | 2 +- dll/win32/rpcrt4/msvc.S | 26 +++++++++++++++++++++++++- ntoskrnl/ntoskrnl.spec | 2 +- sdk/lib/crt/except/arm/chkstk_ms.s | 27 --------------------------- 6 files changed, 34 insertions(+), 37 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 63fd851dc8d..3db2bf08b82 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -611,7 +611,7 @@ @ stdcall -stub -version=0x600+ RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) -@ stdcall -arch=x86_64 RtlActivateActivationContextUnsafeFast(ptr ptr) +@ stdcall -arch=x86_64,arm RtlActivateActivationContextUnsafeFast(ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) @ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @@ -743,7 +743,7 @@ @ stub -version=0x600+ RtlDeCommitDebugInfo @ stdcall RtlDeNormalizeProcessParams(ptr) @ stdcall RtlDeactivateActivationContext(long long) -@ stdcall -arch=x86_64 RtlDeactivateActivationContextUnsafeFast(ptr) +@ stdcall -arch=x86_64,arm RtlDeactivateActivationContextUnsafeFast(ptr) @ stdcall -stub RtlDebugPrintTimes() @ stdcall RtlDecodePointer(ptr) @ stdcall RtlDecodeSystemPointer(ptr) @@ -1757,7 +1757,7 @@ @ cdecl -arch=i386 _CIsin() @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=x86_64 __chkstk() +@ cdecl -arch=x86_64,arm __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @@ -1791,8 +1791,8 @@ @ cdecl _ltow(long ptr long) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) -@ cdecl -arch=x86_64 _setjmp(ptr ptr) -@ cdecl -arch=x86_64 _setjmpex(ptr ptr) +@ cdecl -arch=x86_64,arm _setjmp(ptr ptr) +@ cdecl -arch=x86_64,arm _setjmpex(ptr ptr) @ varargs _snprintf(ptr long str) @ varargs _snwprintf(ptr long wstr) @ cdecl _splitpath(str ptr ptr ptr ptr) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 62295ac46a3..adff7f8bf98 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ ;@ cdecl -arch=arm __ExceptionPtrRethrow() ;@ cdecl -arch=arm __ExceptionPtrSwap() ;@ cdecl -arch=arm __ExceptionPtrToBool() -@ cdecl -arch=arm __uncaught_exception() +@ cdecl -arch=arm __uncaught_exception(ptr) MSVCRT___uncaught_exception @ cdecl -arch=arm ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) @ cdecl -arch=arm ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z() MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) @ cdecl -arch=arm ?_set_new_mode@@YAHH@Z() MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) @@ -947,7 +947,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) -@ cdecl -arch=x86_64 -norelay _setjmpex(ptr ptr) +@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt index 90c9225847a..d2a7e0f2702 100644 --- a/dll/win32/rpcrt4/CMakeLists.txt +++ b/dll/win32/rpcrt4/CMakeLists.txt @@ -41,7 +41,7 @@ list(APPEND SOURCE unix_func.c ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c) -if(MSVC AND NOT ARCH STREQUAL "arm") +if(MSVC) add_asm_files(rpcrt4_asm msvc.S) endif() diff --git a/dll/win32/rpcrt4/msvc.S b/dll/win32/rpcrt4/msvc.S index c45ccc68853..ca7d77430aa 100644 --- a/dll/win32/rpcrt4/msvc.S +++ b/dll/win32/rpcrt4/msvc.S @@ -1,5 +1,9 @@ +#if defined(_M_IX86) || defined(_M_AMD64) #include <asm.inc> +#elif defined(_M_ARM) +#include <kxarm.h> +#endif #ifdef _M_IX86 .code32 @@ -29,7 +33,8 @@ _call_stubless_func: mov ecx, [esp] /* return address */ add esp, edx jmp ecx -#else + +#elif _M_AMD64 .code64 EXTERN ndr_client_call:PROC @@ -141,6 +146,25 @@ FUNC NdrAsyncClientCall ret ENDFUNC +#elif _M_ARM +TEXTAREA + + LEAF_ENTRY call_stubless_func + + /* Unimplemented */ + __assertfail + bx lr + + LEAF_END call_stubless_func + + LEAF_ENTRY call_server_func + + /* Unimplemented */ + __assertfail + bx lr + + LEAF_END call_server_func + #endif END diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 8d2dc6f4b23..ced05f9a8bd 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -1559,7 +1559,7 @@ @ cdecl -arch=x86_64 _local_unwind() @ cdecl _purecall() @ cdecl -arch=x86_64,arm _setjmp(ptr ptr) -@ cdecl -arch=x86_64 _setjmpex(ptr ptr) +@ cdecl -arch=x86_64,arm _setjmpex(ptr ptr) @ cdecl _snprintf() @ cdecl _snwprintf() @ cdecl _stricmp() diff --git a/sdk/lib/crt/except/arm/chkstk_ms.s b/sdk/lib/crt/except/arm/chkstk_ms.s deleted file mode 100644 index dcad0ca87e1..00000000000 --- a/sdk/lib/crt/except/arm/chkstk_ms.s +++ /dev/null @@ -1,27 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT librariy - * PURPOSE: Implementation of _chkstk and _alloca_probe - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * Yuntian Zhang (yuntian.zh(a)gmail.com) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - TEXTAREA - - LEAF_ENTRY ___chkstk_ms - __assertfail - bx lr - LEAF_END __chkstk_ms - - LEAF_ENTRY __alloca_probe - __assertfail - bx lr - LEAF_END __alloca_probe - - END -/* EOF */

1 0

[reactos] 04/04: [IMM32] ValidateHwndNoErr(): Apply ReactOS-specific handle table array fixup. (#3937) CORE-17741
by Hermès Bélusca-Maïto 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0233bb72b30c12ed7ebb0… commit 0233bb72b30c12ed7ebb02c4a1a4f45164d309e8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 7 22:05:54 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 9 16:15:13 2021 +0200 [IMM32] ValidateHwndNoErr(): Apply ReactOS-specific handle table array fixup. (#3937) CORE-17741 This function (which should belong to the user32 helpers) depends on the internal format of the USER handles table, that is ReactOS-specific. Its pointer value is stored in the win32k/user32 shared info section, and thus cannot be converted to user-space and stored back into that section. Therefore it needs to be retrieved and manually converted when the function is called. --- dll/win32/imm32/imm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 9f32bcc5d5d..1dc41f8e362 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -66,6 +66,7 @@ static PWND FASTCALL ValidateHwndNoErr(HWND hwnd) PCLIENTINFO ClientInfo = GetWin32ClientInfo(); INT index; PUSER_HANDLE_TABLE ht; + PUSER_HANDLE_ENTRY he; WORD generation; /* See if the window is cached */ @@ -76,15 +77,20 @@ static PWND FASTCALL ValidateHwndNoErr(HWND hwnd) return NULL; ht = g_SharedInfo.aheList; /* handle table */ + ASSERT(ht); + /* ReactOS-Specific! */ + ASSERT(g_SharedInfo.ulSharedDelta != 0); + he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - g_SharedInfo.ulSharedDelta); + index = (LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1; - if (index < 0 || index >= ht->nb_handles || ht->handles[index].type != TYPE_WINDOW) + if (index < 0 || index >= ht->nb_handles || he[index].type != TYPE_WINDOW) return NULL; generation = HIWORD(hwnd); - if (generation != ht->handles[index].generation && generation && generation != 0xFFFF) + if (generation != he[index].generation && generation && generation != 0xFFFF) return NULL; - return (PWND)&ht->handles[index]; + return (PWND)&he[index]; } static BOOL APIENTRY Imm32InitInstance(HMODULE hMod)

1 0

[reactos] 03/04: [WIN32SS:NTUSER][USER32] NtUserProcessConnect() should return pointers in user client-space. (#3937)
by Hermès Bélusca-Maïto 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cbc61fd0264fb805fbd7… commit 4cbc61fd0264fb805fbd7c367c3136e9a95d70f5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 2 01:11:19 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 9 16:15:12 2021 +0200 [WIN32SS:NTUSER][USER32] NtUserProcessConnect() should return pointers in user client-space. (#3937) - Do the kernel/server --> user/client-space pointers conversion within NtUserProcessConnect(), instead of having the callers of this function doing this job. This makes the behaviour Windows-compatible. NOTE: the gHandleEntries pointer is ReactOS-specific! - Drop the g_ulSharedDelta global, just use instead gSharedInfo.ulSharedDelta. - Add extra documentation aspects for NtUserProcessConnect() that are not yet implemented in ReactOS. --- win32ss/user/ntuser/ntstubs.c | 45 +++++++++++++++++++++++++++++++---- win32ss/user/user32/include/user32p.h | 7 +++--- win32ss/user/user32/include/user_x.h | 4 ++-- win32ss/user/user32/misc/dllmain.c | 25 ++++++++++--------- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index c770f883e25..4de9ea36a58 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -531,8 +531,8 @@ NtUserProcessConnect( TRACE("NtUserProcessConnect\n"); - if ( pUserConnect == NULL || - Size != sizeof(*pUserConnect) ) + if (pUserConnect == NULL || + Size != sizeof(*pUserConnect)) { return STATUS_UNSUCCESSFUL; } @@ -553,14 +553,51 @@ NtUserProcessConnect( _SEH2_TRY { + UINT i; + // FIXME: Check that pUserConnect->ulVersion == USER_VERSION; + // FIXME: Check the value of pUserConnect->dwDispatchCount. ProbeForWrite(pUserConnect, sizeof(*pUserConnect), sizeof(PVOID)); - pUserConnect->siClient.psi = gpsi; - pUserConnect->siClient.aheList = gHandleTable; + + // FIXME: Instead of assuming that the mapping of the heap desktop + // also holds there, we **MUST** create and map instead the shared + // section! Its client base must be stored in W32Process->pClientBase. + // What is currently done (ReactOS-specific only), is that within the + // IntUserHeapCommitRoutine()/MapGlobalUserHeap() routines we assume + // it's going to be also called early, so that we manually add a very + // first memory mapping that corresponds to the "global user heap", + // and that we use instead of a actual win32 "shared USER section" + // (see slide 29 of https://paper.bobylive.com/Meeting_Papers/BlackHat/USA-2011/BH_US_11_Mandt_… ) + pUserConnect->siClient.ulSharedDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - (ULONG_PTR)W32Process->HeapMappings.UserMapping; + +#define SERVER_TO_CLIENT(ptr) \ + ((PVOID)((ULONG_PTR)ptr - pUserConnect->siClient.ulSharedDelta)) + + ASSERT(gpsi); + ASSERT(gHandleTable); + + pUserConnect->siClient.psi = SERVER_TO_CLIENT(gpsi); + pUserConnect->siClient.aheList = SERVER_TO_CLIENT(gHandleTable); + pUserConnect->siClient.pDispInfo = NULL; + + // NOTE: kernel server should also have a SHAREDINFO gSharedInfo; + // FIXME: These USER window-proc data should be used somehow! + + pUserConnect->siClient.DefWindowMsgs.maxMsgs = 0; + pUserConnect->siClient.DefWindowMsgs.abMsgs = NULL; + pUserConnect->siClient.DefWindowSpecMsgs.maxMsgs = 0; + pUserConnect->siClient.DefWindowSpecMsgs.abMsgs = NULL; + + for (i = 0; i < ARRAYSIZE(pUserConnect->siClient.awmControl); ++i) + { + pUserConnect->siClient.awmControl[i].maxMsgs = 0; + pUserConnect->siClient.awmControl[i].abMsgs = NULL; + } +#undef SERVER_TO_CLIENT } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/win32ss/user/user32/include/user32p.h b/win32ss/user/user32/include/user32p.h index f2616ff8f95..deb57148f78 100644 --- a/win32ss/user/user32/include/user32p.h +++ b/win32ss/user/user32/include/user32p.h @@ -39,13 +39,12 @@ typedef struct extern HINSTANCE User32Instance; #define user32_module User32Instance extern PPROCESSINFO g_ppi; -extern ULONG_PTR g_ulSharedDelta; -extern PSERVERINFO gpsi; extern SHAREDINFO gSharedInfo; -extern BOOLEAN gfLogonProcess; -extern BOOLEAN gfServerProcess; +extern PSERVERINFO gpsi; extern PUSER_HANDLE_TABLE gHandleTable; extern PUSER_HANDLE_ENTRY gHandleEntries; +extern BOOLEAN gfLogonProcess; +extern BOOLEAN gfServerProcess; extern CRITICAL_SECTION U32AccelCacheLock; extern HINSTANCE ghImm32; extern RTL_CRITICAL_SECTION gcsUserApiHook; diff --git a/win32ss/user/user32/include/user_x.h b/win32ss/user/user32/include/user_x.h index c040afefb9c..e7774e4e2f7 100644 --- a/win32ss/user/user32/include/user_x.h +++ b/win32ss/user/user32/include/user_x.h @@ -4,8 +4,8 @@ static __inline PVOID SharedPtrToUser(PVOID Ptr) { ASSERT(Ptr != NULL); - ASSERT(g_ulSharedDelta != 0); - return (PVOID)((ULONG_PTR)Ptr - g_ulSharedDelta); + ASSERT(gSharedInfo.ulSharedDelta != 0); + return (PVOID)((ULONG_PTR)Ptr - gSharedInfo.ulSharedDelta); } static __inline PVOID diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index b757ea22e9d..72f82aa1b43 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -27,11 +27,10 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; PPROCESSINFO g_ppi = NULL; +SHAREDINFO gSharedInfo = {0}; +PSERVERINFO gpsi = NULL; PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; -PSERVERINFO gpsi = NULL; -SHAREDINFO gSharedInfo = {0}; -ULONG_PTR g_ulSharedDelta; BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; BOOLEAN gfFirstThread = TRUE; @@ -271,6 +270,7 @@ ClientThreadSetupHelper(BOOL IsCallback) /* Minimal setup of the connect info structure */ UserCon.ulVersion = USER_VERSION; + // UserCon.dwDispatchCount; /* Connect to win32k */ Status = NtUserProcessConnect(NtCurrentProcess(), @@ -280,13 +280,13 @@ ClientThreadSetupHelper(BOOL IsCallback) /* Retrieve data */ g_ppi = ClientInfo->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); gSharedInfo = UserCon.siClient; + gpsi = gSharedInfo.psi; + gHandleTable = gSharedInfo.aheList; + /* ReactOS-Specific! */ gHandleEntries = SharedPtrToUser(gHandleTable->handles); - // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); + // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", + // gSharedInfo.psi, gSharedInfo.aheList, gSharedInfo.ulSharedDelta); } TRACE("Checkpoint (register PFN)\n"); @@ -418,6 +418,7 @@ Init(PUSERCONNECT UserCon /*PUSERSRV_API_CONNECTINFO*/) /* Minimal setup of the connect info structure */ UserCon->ulVersion = USER_VERSION; + // UserCon->dwDispatchCount; TRACE("HACK: Hackish NtUserProcessConnect call!!\n"); /* Connect to win32k */ @@ -433,12 +434,10 @@ Init(PUSERCONNECT UserCon /*PUSERSRV_API_CONNECTINFO*/) /* Retrieve data */ g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon->siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon->siClient.psi); - gHandleTable = SharedPtrToUser(UserCon->siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); gSharedInfo = UserCon->siClient; - gSharedInfo.psi = gpsi; + gpsi = gSharedInfo.psi; + gHandleTable = gSharedInfo.aheList; + /* ReactOS-Specific! */ gHandleEntries = SharedPtrToUser(gHandleTable->handles); } // FIXME: Yet another hack... This call should normally not be done here, but

1 0

[reactos] 02/04: [WIN32SS:NTUSER] Update the definition of SHAREDINFO and fix the definition of FNID_LAST. (#3937)
by Hermès Bélusca-Maïto 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a407cb8f109b6b47ff540… commit a407cb8f109b6b47ff5403108ca5c1d5738225af Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 2 01:05:46 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 9 16:15:11 2021 +0200 [WIN32SS:NTUSER] Update the definition of SHAREDINFO and fix the definition of FNID_LAST. (#3937) --- win32ss/include/ntuser.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index b94e9c8d3e3..2bef1a3d2e8 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -858,10 +858,11 @@ typedef LONG_PTR #define FNID_TOOLTIPS 0x02B6 #define FNID_SENDNOTIFYMESSAGE 0x02B7 #define FNID_SENDMESSAGECALLBACK 0x02B8 -#define FNID_LAST 0x02B9 -#define FNID_NUM FNID_LAST - FNID_FIRST + 1 -#define FNID_NUMSERVERPROC FNID_SWITCH - FNID_FIRST + 1 +#define FNID_LAST FNID_SENDMESSAGECALLBACK + +#define FNID_NUM (FNID_LAST - FNID_FIRST + 1) +#define FNID_NUMSERVERPROC (FNID_SWITCH - FNID_FIRST + 1) #define FNID_DDEML 0x2000 /* Registers DDEML */ #define FNID_DESTROY 0x4000 /* This is sent when WM_NCDESTROY or in the support routine. */ @@ -1084,11 +1085,11 @@ typedef struct _WNDMSG typedef struct _SHAREDINFO { - PSERVERINFO psi; /* global Server Info */ - PVOID aheList; /* Handle Entry List */ - PVOID pDispInfo; /* global PDISPLAYINFO pointer */ - ULONG_PTR ulSharedDelta; /* Heap delta */ - WNDMSG awmControl[FNID_LAST - FNID_FIRST]; + PSERVERINFO psi; /* Global Server Info */ + PVOID aheList; /* Handle Entry List */ + PVOID pDispInfo; /* Global PDISPLAYINFO pointer */ + ULONG_PTR ulSharedDelta; /* Shared USER mapped section delta */ + WNDMSG awmControl[FNID_NUM]; WNDMSG DefWindowMsgs; WNDMSG DefWindowSpecMsgs; } SHAREDINFO, *PSHAREDINFO;

1 0

[reactos] 01/04: [WIN32KNT_APITEST] Add more tests for NtUserProcessConnect() (#3937)
by Hermès Bélusca-Maïto 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=103c43861b239604341a7… commit 103c43861b239604341a7c213a0e39ea89b1ab50 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 4 19:53:09 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 9 16:15:05 2021 +0200 [WIN32KNT_APITEST] Add more tests for NtUserProcessConnect() (#3937) Show that NtUserProcessConnect() should return pointers in user client-space. --- .../apitests/win32nt/ntuser/NtUserProcessConnect.c | 40 ++++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c index e89a65b7073..9ff9e7d82f4 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c @@ -1,22 +1,29 @@ /* - * PROJECT: ReactOS api tests - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for NtUserProcessConnect - * PROGRAMMERS: + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for NtUserProcessConnect + * COPYRIGHT: Copyright 2008-2020 Timo Kreuzer + * Copyright 2021 Hermes Belusca-Maito */ #include <win32nt.h> +#define NTOS_MODE_USER +#include <ndk/exfuncs.h> + START_TEST(NtUserProcessConnect) { HANDLE hProcess; NTSTATUS Status; USERCONNECT UserConnect = {0}; + SYSTEM_BASIC_INFORMATION SystemInformation; + ULONG_PTR MaximumUserModeAddress; hProcess = GetCurrentProcess(); - UserConnect.ulVersion = MAKELONG(0, 5); - Status = NtUserProcessConnect(hProcess, &UserConnect, sizeof(USERCONNECT)); + UserConnect.ulVersion = MAKELONG(0, 5); // == USER_VERSION + // UserConnect.dwDispatchCount; + Status = NtUserProcessConnect(hProcess, &UserConnect, sizeof(UserConnect)); TEST(NT_SUCCESS(Status)); printf("UserConnect.ulVersion = 0x%lx\n", UserConnect.ulVersion); @@ -27,4 +34,25 @@ START_TEST(NtUserProcessConnect) printf("UserConnect.siClient.pDispInfo = 0x%p\n", UserConnect.siClient.pDispInfo); printf("UserConnect.siClient.ulSharedDelta = 0x%Ix\n", UserConnect.siClient.ulSharedDelta); + /* Verify the validity of some mandatory fields */ + TEST(UserConnect.ulVersion == MAKELONG(0, 5)); + TEST(UserConnect.ulCurrentVersion == 0); + TEST(UserConnect.siClient.ulSharedDelta != 0); + + /* Get the max um address */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &SystemInformation, + sizeof(SystemInformation), + NULL); + TEST(NT_SUCCESS(Status)); + + MaximumUserModeAddress = SystemInformation.MaximumUserModeAddress; + + /* Verify the validity of pointers -- They must be in client space */ + TEST(UserConnect.siClient.psi != NULL); + TEST(UserConnect.siClient.aheList != NULL); + // TEST(UserConnect.siClient.pDispInfo != NULL); + TEST((ULONG_PTR)UserConnect.siClient.psi < MaximumUserModeAddress); + TEST((ULONG_PTR)UserConnect.siClient.aheList < MaximumUserModeAddress); + // TEST((ULONG_PTR)UserConnect.siClient.pDispInfo < MaximumUserModeAddress); }

1 0

[reactos] 02/02: [CRT_APITEST] Add tests for __i64tod/u64tod/i64tos/u64tos on ARM (#3866)
by Stanislav Motylkov 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2e9dcf0a709982af739e… commit a2e9dcf0a709982af739e895b27623f70f77d56b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 9 01:14:44 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 9 16:02:11 2021 +0300 [CRT_APITEST] Add tests for __i64tod/u64tod/i64tos/u64tos on ARM (#3866) CORE-17713 CORE-17706 CORE-17604 --- modules/rostests/apitests/crt/__64tof.c | 130 +++++++++++++++++++++ .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 1 + .../rostests/apitests/crt/static_crt_apitest.cmake | 1 + modules/rostests/apitests/crt/testlist.c | 2 + 4 files changed, 134 insertions(+) diff --git a/modules/rostests/apitests/crt/__64tof.c b/modules/rostests/apitests/crt/__64tof.c new file mode 100644 index 00000000000..224df034699 --- /dev/null +++ b/modules/rostests/apitests/crt/__64tof.c @@ -0,0 +1,130 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for __i64tod/u64tod/i64tos/u64tos on ARM + * COPYRIGHT: Copyright 2021 Stanislav Motylkov <x86corez(a)gmail.com> + */ + +#include <apitest.h> + +typedef struct _I64TOD_TEST_DATA +{ + long long given; + union + { + double value; + unsigned long long raw; + } expected; +} I64TOD_TEST_DATA; + +typedef struct _U64TOD_TEST_DATA +{ + unsigned long long given; + union + { + double value; + unsigned long long raw; + } expected; +} U64TOD_TEST_DATA; + +typedef struct _I64TOS_TEST_DATA +{ + long long given; + union + { + float value; + unsigned int raw; + } expected; +} I64TOS_TEST_DATA; + +typedef struct _U64TOS_TEST_DATA +{ + unsigned long long given; + union + { + float value; + unsigned int raw; + } expected; +} U64TOS_TEST_DATA; + +START_TEST(__64tof) +{ + I64TOD_TEST_DATA i64tod[] = + { + { 1383034209LL, 1383034209.0 }, /* test 32bit number */ + { -1383034209LL, -1383034209.0 }, /* test negative 32bit number */ + { 354056757614LL, 354056757614.0 }, /* test 64bit int */ + { -354056757614LL, -354056757614.0 }, /* test negative 64bit int */ + { 18446744073709550000LL, -1616.0 }, /* test 20bit in float */ + { 0x8000000000000000LL, -9223372036854775800.0 }, /* test big 64bit int */ + { 0xFFFFFFFFFFFFFFFFLL, -1.0 }, /* test -1 */ + { 0LL, +0.0 }, /* test 0 */ + }; + U64TOD_TEST_DATA u64tod[] = + { + { 1383034209ULL, 1383034209.0 }, /* test 32bit number */ + { 354056757614ULL, 354056757614.0 }, /* test 64bit int */ + { 18445937028656326656ULL, 18445937028656326656.0 }, /* test unsigned 64bit */ + { 18446744073709550000ULL, 18446744073709550000.0 }, /* test 20bit in float */ + { 18446744073709551615ULL, 18446744073709552000.0 }, /* test big 64bit number */ + { 0ULL, +0.0 }, /* test 0 */ + }; + I64TOS_TEST_DATA i64tos[] = + { + { 1383034LL, 1383034.0f }, /* test 32bit number */ + { -1383034LL, -1383034.0f }, /* test negative 32bit number */ + { 354056765440LL, 354056765440.0f }, /* test 64bit int */ + { -354056765440LL, -354056765440.0f }, /* test negative 64bit int */ + { 18446744073709550000LL, -1616.0f }, /* test 20bit in float */ + { 0x8000000000000000LL, -9223372036854775800.0f }, /* test big 64bit int */ + { 0xFFFFFFFFFFFFFFFFLL, -1.0f }, /* test -1 */ + { 0LL, +0.0f }, /* test 0 */ + }; + U64TOS_TEST_DATA u64tos[] = + { + { 1383034ULL, 1383034.0f }, /* test 32bit number */ + { 354056765440ULL, 354056765440.0f }, /* test 64bit int */ + { 18445937032174764032ULL, 18445937032174764032.0f }, /* test unsigned 64bit */ + { 18446744073709550000ULL, 18446744073709550000.0f }, /* test 20bit in float */ + { 18446744073709551615ULL, 18446744073709552000.0f }, /* test big 64bit number */ + { 0ULL, +0.0f }, /* test 0 */ + }; + + unsigned int i; + + for (i = 0; i < _countof(i64tod); ++i) + { + double actual; + + actual = (double)i64tod[i].given; + ok(actual == i64tod[i].expected.value, "(i64tod) %d: Expected %lf, but %lld -> %lf\n", + i, i64tod[i].expected.value, i64tod[i].given, actual); + } + + for (i = 0; i < _countof(u64tod); ++i) + { + double actual; + + actual = (double)u64tod[i].given; + ok(actual == u64tod[i].expected.value, "(u64tod) %d: Expected %lf, but %llu -> %lf\n", + i, u64tod[i].expected.value, u64tod[i].given, actual); + } + + for (i = 0; i < _countof(i64tos); ++i) + { + float actual; + + actual = (float)i64tos[i].given; + ok(actual == i64tos[i].expected.value, "(i64tos) %d: Expected %f, but %lld -> %f\n", + i, i64tos[i].expected.value, i64tos[i].given, actual); + } + + for (i = 0; i < _countof(u64tos); ++i) + { + float actual; + + actual = (float)u64tos[i].given; + ok(actual == u64tos[i].expected.value, "(u64tos) %d: Expected %f, but %llu -> %f\n", + i, u64tos[i].expected.value, u64tos[i].given, actual); + } +} diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index dcef3b0d582..82283e5a3a6 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1376,6 +1376,7 @@ elseif(ARCH STREQUAL "arm") list(APPEND SOURCE_MSVCRT __rt_div.c __fto64.c + __64tof.c ) endif() diff --git a/modules/rostests/apitests/crt/static_crt_apitest.cmake b/modules/rostests/apitests/crt/static_crt_apitest.cmake index 17ff8f8d733..a3e35c412b3 100644 --- a/modules/rostests/apitests/crt/static_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/static_crt_apitest.cmake @@ -30,6 +30,7 @@ elseif(ARCH STREQUAL "arm") list(APPEND SOURCE_STATIC __rt_div.c __fto64.c + __64tof.c ) endif() diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index 1997603fbca..e8b4c7670fb 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -12,6 +12,7 @@ extern void func_atexit(void); #if defined(_M_ARM) extern void func___rt_div(void); extern void func___fto64(void); +extern void func___64tof(void); #endif #endif #if defined(TEST_NTDLL) @@ -62,6 +63,7 @@ const struct test winetest_testlist[] = #if defined(_M_ARM) { "__rt_div", func___rt_div }, { "__fto64", func___fto64 }, + { "__64tof", func___64tof }, #endif #endif #if defined(TEST_STATIC_CRT)

1 0

[reactos] 01/02: [CRT/ARM] Integer to float conversion implementation (#3866)
by Roman Masanin 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c4e3234ba34927c14ec1… commit 9c4e3234ba34927c14ec1fd8c75952c37ba0fa87 Author: Roman Masanin <36927roma(a)gmail.com> AuthorDate: Wed Jul 28 21:16:04 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 9 16:02:03 2021 +0300 [CRT/ARM] Integer to float conversion implementation (#3866) CORE-17713 CORE-17706 CORE-17604 --- sdk/lib/crt/math/arm/__64tof.h | 98 +++++++++++++++++++++++++++++++++++++++++ sdk/lib/crt/math/arm/__i64tod.c | 14 ++++++ sdk/lib/crt/math/arm/__i64tod.s | 24 ---------- sdk/lib/crt/math/arm/__i64tos.c | 13 ++++++ sdk/lib/crt/math/arm/__i64tos.s | 24 ---------- sdk/lib/crt/math/arm/__u64tod.c | 13 ++++++ sdk/lib/crt/math/arm/__u64tod.s | 24 ---------- sdk/lib/crt/math/arm/__u64tos.c | 12 +++++ sdk/lib/crt/math/arm/__u64tos.s | 24 ---------- sdk/lib/crt/math/math.cmake | 9 ++-- sdk/lib/crt/msvcrtex.cmake | 9 ++-- 11 files changed, 160 insertions(+), 104 deletions(-) diff --git a/sdk/lib/crt/math/arm/__64tof.h b/sdk/lib/crt/math/arm/__64tof.h new file mode 100644 index 00000000000..7aecb6f4e6e --- /dev/null +++ b/sdk/lib/crt/math/arm/__64tof.h @@ -0,0 +1,98 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Integer to float conversion (__i64tod/u64tod/i64tos/u64tos) + * COPYRIGHT: Copyright 2021 Roman Masanin <36927roma(a)gmail.com> + */ + +#ifdef _USE_64_BITS_ +typedef double FLOAT_TYPE; +typedef unsigned long long FINT_TYPE; +#define FRACTION_LEN 52 +#define EXPONENT_LEN 11 +#define SHIFT_OFFSET EXPONENT_LEN +#else +typedef float FLOAT_TYPE; +typedef unsigned int FINT_TYPE; +#define FRACTION_LEN 23 +#define EXPONENT_LEN 8 +#define SHIFT_OFFSET (EXPONENT_LEN + 32) +#endif + +#ifdef _USE_SIGNED_ +typedef long long INT64SU; +#else +typedef unsigned long long INT64SU; +#endif + +typedef union _FLOAT_RESULT +{ + FLOAT_TYPE value; + FINT_TYPE raw; +} FLOAT_RESULT; + +#define SIGN_MASK 0x8000000000000000ULL + +#define EXPONENT_ZERO ((1 << (EXPONENT_LEN - 1)) - 1) + +#define NEGATE(x) (~(x) + 1) + +FLOAT_TYPE +__64tof(INT64SU value) +{ + FLOAT_RESULT result; + FINT_TYPE exponent = EXPONENT_ZERO + FRACTION_LEN; + int count = 0; + unsigned long long mask = SIGN_MASK; + + if (value == 0) + return (FLOAT_TYPE)0; + +#ifdef _USE_SIGNED_ + if (value & SIGN_MASK) + { + value = NEGATE(value); + /* set Sign bit using exponent */ + exponent |= 1 << EXPONENT_LEN; + } +#endif + + for (; count < 64; count++) + { + if (value & mask) + break; + mask = mask >> 1; + } + + count -= SHIFT_OFFSET; + /* exponent is FRACTION_LEN - count */ + exponent -= count; + result.raw = exponent << FRACTION_LEN; + + mask--; + value = value & mask; + if (value == 0) + return result.value; + + if (count == 0) + { + result.raw |= value; + } + else if (count < 0) + { + count = NEGATE(count) - 1; + value = value >> count; + mask = value & 1; + result.raw |= value >> 1; + + /* round up if left most bit of lost data is 1 */ + if (mask) + result.raw++; + } + else + { + result.raw |= value << count; + } + + return result.value; +} diff --git a/sdk/lib/crt/math/arm/__i64tod.c b/sdk/lib/crt/math/arm/__i64tod.c new file mode 100644 index 00000000000..789c4ff30f2 --- /dev/null +++ b/sdk/lib/crt/math/arm/__i64tod.c @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __i64tod + * COPYRIGHT: Copyright 2021 Roman Masanin <36927roma(a)gmail.com> + */ + +#define __64tof __i64tod +#define _USE_64_BITS_ +#define _USE_SIGNED_ + +#include "__64tof.h" + +/* __i64tod is implemented in __64tof.h */ diff --git a/sdk/lib/crt/math/arm/__i64tod.s b/sdk/lib/crt/math/arm/__i64tod.s deleted file mode 100644 index 88b0b0574cd..00000000000 --- a/sdk/lib/crt/math/arm/__i64tod.s +++ /dev/null @@ -1,24 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __i64tod - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - - TEXTAREA - - LEAF_ENTRY __i64tod - - __assertfail - bx lr - - LEAF_END __i64tod - - END -/* EOF */ diff --git a/sdk/lib/crt/math/arm/__i64tos.c b/sdk/lib/crt/math/arm/__i64tos.c new file mode 100644 index 00000000000..58e8ba28d8b --- /dev/null +++ b/sdk/lib/crt/math/arm/__i64tos.c @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __i64tos + * COPYRIGHT: Copyright 2021 Roman Masanin <36927roma(a)gmail.com> + */ + +#define __64tof __i64tos +#define _USE_SIGNED_ + +#include "__64tof.h" + +/* __i64tos is implemented in __64tof.h */ diff --git a/sdk/lib/crt/math/arm/__i64tos.s b/sdk/lib/crt/math/arm/__i64tos.s deleted file mode 100644 index 6f6c730bd00..00000000000 --- a/sdk/lib/crt/math/arm/__i64tos.s +++ /dev/null @@ -1,24 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __i64tos - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - - TEXTAREA - - LEAF_ENTRY __i64tos - - __assertfail - bx lr - - LEAF_END __i64tos - - END -/* EOF */ diff --git a/sdk/lib/crt/math/arm/__u64tod.c b/sdk/lib/crt/math/arm/__u64tod.c new file mode 100644 index 00000000000..f9c7ad3db6a --- /dev/null +++ b/sdk/lib/crt/math/arm/__u64tod.c @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __u64tod + * COPYRIGHT: Copyright 2021 Roman Masanin <36927roma(a)gmail.com> + */ + +#define __64tof __u64tod +#define _USE_64_BITS_ + +#include "__64tof.h" + +/* __u64tod is implemented in __64tof.h */ diff --git a/sdk/lib/crt/math/arm/__u64tod.s b/sdk/lib/crt/math/arm/__u64tod.s deleted file mode 100644 index cf56f96fc80..00000000000 --- a/sdk/lib/crt/math/arm/__u64tod.s +++ /dev/null @@ -1,24 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __u64tod - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - - TEXTAREA - - LEAF_ENTRY __u64tod - - __assertfail - bx lr - - LEAF_END __u64tod - - END -/* EOF */ diff --git a/sdk/lib/crt/math/arm/__u64tos.c b/sdk/lib/crt/math/arm/__u64tos.c new file mode 100644 index 00000000000..c50fff1937a --- /dev/null +++ b/sdk/lib/crt/math/arm/__u64tos.c @@ -0,0 +1,12 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __u64tos + * COPYRIGHT: Copyright 2021 Roman Masanin <36927roma(a)gmail.com> + */ + +#define __64tof __u64tos + +#include "__64tof.h" + +/* __u64tos is implemented in __64tof.h */ diff --git a/sdk/lib/crt/math/arm/__u64tos.s b/sdk/lib/crt/math/arm/__u64tos.s deleted file mode 100644 index 828bc7fe55c..00000000000 --- a/sdk/lib/crt/math/arm/__u64tos.s +++ /dev/null @@ -1,24 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __u64tos - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - - TEXTAREA - - LEAF_ENTRY __u64tos - - __assertfail - bx lr - - LEAF_END __u64tos - - END -/* EOF */ diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index 7e04dcc503b..a534fc8832e 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -86,6 +86,11 @@ elseif(ARCH STREQUAL "arm") math/arm/__stoi64.c math/arm/__stou64.c math/arm/__fto64.h + math/arm/__i64tod.c + math/arm/__u64tod.c + math/arm/__i64tos.c + math/arm/__u64tos.c + math/arm/__64tof.h ) list(APPEND CRT_MATH_SOURCE math/fabsf.c @@ -103,10 +108,6 @@ elseif(ARCH STREQUAL "arm") math/arm/log10.s math/arm/pow.s math/arm/tan.s - math/arm/__i64tod.s - math/arm/__i64tos.s - math/arm/__u64tod.s - math/arm/__u64tos.s math/arm/__rt_sdiv64.s math/arm/__rt_srsh.s math/arm/__rt_udiv64.s diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 0ba3ee2aa7e..511473788e6 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -48,13 +48,14 @@ elseif(ARCH STREQUAL "arm") math/arm/__stoi64.c math/arm/__stou64.c math/arm/__fto64.h + math/arm/__i64tod.c + math/arm/__u64tod.c + math/arm/__i64tos.c + math/arm/__u64tos.c + math/arm/__64tof.h ) list(APPEND MSVCRTEX_ASM_SOURCE except/arm/chkstk_asm.s - math/arm/__i64tod.s - math/arm/__i64tos.s - math/arm/__u64tod.s - math/arm/__u64tos.s math/arm/__rt_sdiv64.s math/arm/__rt_srsh.s math/arm/__rt_udiv64.s

1 0

[reactos] 01/01: [CRT_APITEST] Fix __fto64 test according to MS CRT behavior on x86 and x64
by Stanislav Motylkov 08 Sep '21

08 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ec6233e9cae51ed78741… commit 6ec6233e9cae51ed7874176cf2545b2851eaa4cb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 9 00:56:03 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 9 00:56:03 2021 +0300 [CRT_APITEST] Fix __fto64 test according to MS CRT behavior on x86 and x64 Addendum to 99ba9846. CORE-17703 CORE-17604 --- modules/rostests/apitests/crt/__fto64.c | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/rostests/apitests/crt/__fto64.c b/modules/rostests/apitests/crt/__fto64.c index 9b958aff1d2..c6c8b1dcf05 100644 --- a/modules/rostests/apitests/crt/__fto64.c +++ b/modules/rostests/apitests/crt/__fto64.c @@ -79,13 +79,13 @@ START_TEST(__fto64) DTOU64_TEST_DATA dtou64[] = { { 1383034209.0, 1383034209ULL }, /* test 32bit number */ - { -1383034209.0, 18446744073709551615ULL }, /* test negative 32bit number */ + { -1383034209.0, 18446744072326517407ULL }, /* test negative 32bit number */ { 1383034209.1383034209, 1383034209ULL }, /* test rounding 32bit */ - { -1383034209.1383034209, 18446744073709551615ULL }, /* test negative rounding 32bit */ + { -1383034209.1383034209, 18446744072326517407ULL }, /* test negative rounding 32bit */ { 1383034209.83034209, 1383034209ULL }, /* test rounding up 32bit */ - { -1383034209.83034209, 18446744073709551615ULL }, /* test negative rounding up 32bit */ + { -1383034209.83034209, 18446744072326517407ULL }, /* test negative rounding up 32bit */ { 354056757614.0, 354056757614ULL }, /* test 64bit int */ - { -354056757614.0, 18446744073709551615ULL }, /* test negative 64bit int */ + { -354056757614.0, 18446743719652794002ULL }, /* test negative 64bit int */ { 354056757614.83034209, 354056757614ULL }, /* test 64bit rounding */ { 18445937028656326656.0, 18445937028656326656ULL }, /* test unsigned 64bit */ { 1.0000001, 1ULL }, @@ -96,12 +96,12 @@ START_TEST(__fto64) { -0.0, 0ULL }, /* test -0 */ { +0.0, 0ULL }, /* test +0 */ - { .given.raw = 0x7FF0000000000000ULL, 18446744073709551615ULL }, /* test +INFINITY */ - { .given.raw = 0xFFF0000000000000ULL, 18446744073709551615ULL }, /* test -INFINITY */ - { .given.raw = 0x7FF0000000000001ULL, 18446744073709551615ULL }, /* test NaN1 */ - { .given.raw = 0x7FF8000000000001ULL, 18446744073709551615ULL }, /* test NaN2 */ - { .given.raw = 0x7FFFFFFFFFFFFFFFULL, 18446744073709551615ULL }, /* test NaN3 */ - { .given.raw = 0x7FF80000000000F1ULL, 18446744073709551615ULL }, /* test NaN4 */ + { .given.raw = 0x7FF0000000000000ULL, 0x8000000000000000LL }, /* test +INFINITY */ + { .given.raw = 0xFFF0000000000000ULL, 0x8000000000000000LL }, /* test -INFINITY */ + { .given.raw = 0x7FF0000000000001ULL, 0x8000000000000000LL }, /* test NaN1 */ + { .given.raw = 0x7FF8000000000001ULL, 0x8000000000000000LL }, /* test NaN2 */ + { .given.raw = 0x7FFFFFFFFFFFFFFFULL, 0x8000000000000000LL }, /* test NaN3 */ + { .given.raw = 0x7FF80000000000F1ULL, 0x8000000000000000LL }, /* test NaN4 */ }; STOI64_TEST_DATA stoi64[] = { @@ -133,13 +133,13 @@ START_TEST(__fto64) STOU64_TEST_DATA stou64[] = { { 1383034.0f, 1383034ULL }, /* test 32bit number */ - { -1383034.0f, 18446744073709551615ULL }, /* test negative 32bit number */ + { -1383034.0f, 18446744073708168582ULL }, /* test negative 32bit number */ { 1383034.1383034209f, 1383034ULL }, /* test rounding 32bit */ - { -1383034.1383034209f, 18446744073709551615ULL }, /* test negative rounding 32bit */ + { -1383034.1383034209f, 18446744073708168582ULL }, /* test negative rounding 32bit */ { 1383034.83034209f, 1383034ULL }, /* test rounding up 32bit */ - { -1383034.83034209f, 18446744073709551615ULL }, /* test negative rounding up 32bit */ + { -1383034.83034209f, 18446744073708168582ULL }, /* test negative rounding up 32bit */ { 354056765440.0f, 354056765440ULL }, /* test 64bit int */ - { -354056765440.0f, 18446744073709551615ULL }, /* test negative 64bit int */ + { -354056765440.0f, 18446743719652786176ULL }, /* test negative 64bit int */ { 3000000.75f, 3000000ULL }, /* test 64bit rounding */ { 18445937032174764032.0f, 18445937032174764032ULL }, /* test unsigned 64bit */ { 1.0000001f, 1ULL }, @@ -150,12 +150,12 @@ START_TEST(__fto64) { -0.0f, 0LL }, /* test -0 */ { +0.0f, 0LL }, /* test +0 */ - {.given.raw = 0x7F800000U, 18446744073709551615ULL }, /* test +INFINITY */ - {.given.raw = 0xFF800000U, 18446744073709551615ULL }, /* test -INFINITY */ - {.given.raw = 0x7F800001U, 18446744073709551615ULL }, /* test NaN1 */ - {.given.raw = 0x7FC00001U, 18446744073709551615ULL }, /* test NaN2 */ - {.given.raw = 0x7F8FFFFFU, 18446744073709551615ULL }, /* test NaN3 */ - {.given.raw = 0x7F8000F1U, 18446744073709551615ULL }, /* test NaN4 */ + {.given.raw = 0x7F800000U, 0x8000000000000000LL }, /* test +INFINITY */ + {.given.raw = 0xFF800000U, 0x8000000000000000LL }, /* test -INFINITY */ + {.given.raw = 0x7F800001U, 0x8000000000000000LL }, /* test NaN1 */ + {.given.raw = 0x7FC00001U, 0x8000000000000000LL }, /* test NaN2 */ + {.given.raw = 0x7F8FFFFFU, 0x8000000000000000LL }, /* test NaN3 */ + {.given.raw = 0x7F8000F1U, 0x8000000000000000LL }, /* test NaN4 */ }; unsigned int i;

1 0

[reactos] 01/01: [CRT_APITEST] Add missing static CRT tests on ARM
by Stanislav Motylkov 08 Sep '21

08 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83318b2c430bb58787442… commit 83318b2c430bb58787442c489d214ec1fa609138 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Sep 8 20:10:11 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Sep 8 20:10:11 2021 +0300 [CRT_APITEST] Add missing static CRT tests on ARM Addendum to c23ce9df. CORE-17604 --- modules/rostests/apitests/crt/testlist.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index dacd260e161..1997603fbca 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -4,12 +4,16 @@ #include <apitest.h> #if defined(TEST_MSVCRT) -extern void func___rt_div(void); -extern void func___fto64(void); extern void func__vscprintf(void); extern void func__vscwprintf(void); extern void func_atexit(void); #endif +#if defined(TEST_STATIC_CRT) || defined(TEST_MSVCRT) +#if defined(_M_ARM) +extern void func___rt_div(void); +extern void func___fto64(void); +#endif +#endif #if defined(TEST_NTDLL) extern void func__vscwprintf(void); #endif @@ -55,7 +59,10 @@ const struct test winetest_testlist[] = // ... #endif #if defined(TEST_STATIC_CRT) || defined(TEST_MSVCRT) - // ... +#if defined(_M_ARM) + { "__rt_div", func___rt_div }, + { "__fto64", func___fto64 }, +#endif #endif #if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) @@ -63,9 +70,6 @@ const struct test winetest_testlist[] = { "crtdata", func_crtdata }, #if defined(_M_IX86) { "__getmainargs", func___getmainargs }, -#elif defined(_M_ARM) - { "__rt_div", func___rt_div }, - { "__fto64", func___fto64 }, #endif { "_vscprintf", func__vscprintf }, { "_vscwprintf", func__vscwprintf },

1 0

[reactos] 01/01: [MPR] Fix copy paste error when converting hex char to int.
by Robert Naumann 08 Sep '21

08 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f4158fc64e51b2db251f… commit 7f4158fc64e51b2db251fe5418a9670516886961 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Wed Sep 8 18:59:08 2021 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Wed Sep 8 18:59:08 2021 +0200 [MPR] Fix copy paste error when converting hex char to int. Wine Commit 63737942a06183f6b2e7fa8f95a07c918c9bf29b Original patch by Sergei Abramov. CORE-13863 --- dll/win32/mpr/pwcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/mpr/pwcache.c b/dll/win32/mpr/pwcache.c index aa09522a5f9..f330a2a000a 100644 --- a/dll/win32/mpr/pwcache.c +++ b/dll/win32/mpr/pwcache.c @@ -45,7 +45,7 @@ static inline signed char ctox( CHAR x ) return x - '0'; if( ( x >= 'A' ) && ( x <= 'F' ) ) return x - 'A' + 10; - if( ( x >= 'a' ) && ( x <= 'a' ) ) + if( ( x >= 'a' ) && ( x <= 'f' ) ) return x - 'a' + 10; return -1; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs