Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [KBSWITCH] Fix menu handle leak
by Katayama Hirofumi MZ 24 Aug '22

24 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f974f0288109581ff5d0d… commit f974f0288109581ff5d0dbf9f1e1c11092d0ebb3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 24 09:11:36 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Aug 24 09:11:36 2022 +0900 [KBSWITCH] Fix menu handle leak --- base/applications/kbswitch/kbswitch.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 5057fda8e42..5039e087b61 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -437,7 +437,8 @@ VOID DoUnregisterAltShiftHotKeys(HWND hwnd) LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { - static HMENU hRightPopupMenu; + static HMENU s_hMenu; + static HMENU s_hRightPopupMenu; static UINT s_uTaskbarRestart; switch (Message) @@ -446,7 +447,9 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { SetHooks(); AddTrayIcon(hwnd); - hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); + + s_hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)); + s_hRightPopupMenu = GetSubMenu(s_hMenu, 0); ActivateLayout(hwnd, ulCurrentLayoutNum); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); @@ -502,7 +505,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) } else { - TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + TrackPopupMenu(s_hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); } PostMessage(hwnd, WM_NULL, 0, 0); @@ -558,7 +561,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { DoUnregisterAltShiftHotKeys(hwnd); DeleteHooks(); - DestroyMenu(hRightPopupMenu); + DestroyMenu(s_hMenu); DelTrayIcon(hwnd); PostQuitMessage(0);

1 0

[reactos] 01/01: [KBSWITCH][NTUSER] Realize Shift+Alt language switch (#4622)
by Katayama Hirofumi MZ 23 Aug '22

23 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4f73f040f1c329b4fdc2… commit b4f73f040f1c329b4fdc2c46efd600c2f538a411 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 24 07:31:46 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 24 07:31:46 2022 +0900 [KBSWITCH][NTUSER] Realize Shift+Alt language switch (#4622) - Fix co_UserProcessHotKeys on modifiers-only hot-keys. - Add Alt+Shift hot-keys to kbswitch window. CORE-11737 --- base/applications/kbswitch/kbswitch.c | 37 ++++++++++++++++++++++++++++++++--- win32ss/user/ntuser/hotkey.c | 4 +++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 61fa5cc4cb8..5057fda8e42 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -4,6 +4,7 @@ * PURPOSE: Switching Keyboard Layouts * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) * Colin Finck (mail(a)colinfinck.de) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "kbswitch.h" @@ -13,7 +14,7 @@ PKBSWITCHSETHOOKS KbSwitchSetHooks = NULL; PKBSWITCHDELETEHOOKS KbSwitchDeleteHooks = NULL; UINT ShellHookMessage = 0; - +DWORD dwAltShiftHotKeyId = 0, dwShiftAltHotKeyId = 0; static BOOL GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength); @@ -414,6 +415,25 @@ UpdateLanguageDisplayCurrent(HWND hwnd, WPARAM wParam) return UpdateLanguageDisplay(hwnd, GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0))); } +VOID DoRegisterAltShiftHotKeys(HWND hwnd) +{ + dwAltShiftHotKeyId = GlobalAddAtom(TEXT("ReactOS Alt+Shift")); + dwShiftAltHotKeyId = GlobalAddAtom(TEXT("ReactOS Shift+Alt")); + + RegisterHotKey(hwnd, dwAltShiftHotKeyId, MOD_ALT | MOD_SHIFT, VK_SHIFT); + RegisterHotKey(hwnd, dwShiftAltHotKeyId, MOD_ALT | MOD_SHIFT, VK_MENU); +} + +VOID DoUnregisterAltShiftHotKeys(HWND hwnd) +{ + UnregisterHotKey(hwnd, dwAltShiftHotKeyId); + UnregisterHotKey(hwnd, dwShiftAltHotKeyId); + + GlobalDeleteAtom(dwAltShiftHotKeyId); + GlobalDeleteAtom(dwShiftAltHotKeyId); + dwAltShiftHotKeyId = dwShiftAltHotKeyId = 0; +} + LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -431,6 +451,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) ActivateLayout(hwnd, ulCurrentLayoutNum); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); + DoRegisterAltShiftHotKeys(hwnd); return 0; } @@ -439,10 +460,19 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) return UpdateLanguageDisplay(hwnd, (HKL)lParam); } - case WM_LOAD_LAYOUT: + case WM_HOTKEY: { - ActivateLayout(hwnd, GetNextLayout()); + if (wParam != dwAltShiftHotKeyId && wParam != dwShiftAltHotKeyId) + break; + /* FALL THROUGH */ + } + + case WM_LOAD_LAYOUT: + { + ULONG uNextNum = GetNextLayout(); + if (ulCurrentLayoutNum != uNextNum) + ActivateLayout(hwnd, uNextNum); return 0; } @@ -526,6 +556,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_DESTROY: { + DoUnregisterAltShiftHotKeys(hwnd); DeleteHooks(); DestroyMenu(hRightPopupMenu); DelTrayIcon(hwnd); diff --git a/win32ss/user/ntuser/hotkey.c b/win32ss/user/ntuser/hotkey.c index 02b504fe668..e9e11772a11 100644 --- a/win32ss/user/ntuser/hotkey.c +++ b/win32ss/user/ntuser/hotkey.c @@ -211,7 +211,9 @@ co_UserProcessHotKeys(WORD wVk, BOOL bIsDown) if (IsModifier) { /* Modifier key up -- modifier-only keys are triggered here */ - pHotKey = IsHotKey(gfsModOnlyCandidate, 0); + pHotKey = IsHotKey(gfsModOnlyCandidate, wVk); + if (!pHotKey) + pHotKey = IsHotKey(gfsModOnlyCandidate, 0); gfsModOnlyCandidate = 0; } else

1 0

[reactos] 01/01: [IMM32] Add CtfImmIsGuidMapEnable and CtfImmGetGuidAtom (#4621)
by Katayama Hirofumi MZ 23 Aug '22

23 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=372a445ad6de905ee5699… commit 372a445ad6de905ee56992b7b5dedb804c2776b1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 23 21:57:45 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 23 21:57:45 2022 +0900 [IMM32] Add CtfImmIsGuidMapEnable and CtfImmGetGuidAtom (#4621) - Add CtfImmIsGuidMapEnable and CtfImmGetGuidAtom functions. - Modify imetable.h and imm32.spec. CORE-11700 --- dll/win32/imm32/ctf.c | 75 +++++++++++++++++++++++++++++++++++++++++++++- dll/win32/imm32/imm32.spec | 2 ++ win32ss/include/imetable.h | 4 +-- 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 153d4c5e5fa..7c4c9dae4ac 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS IMM32 * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Implementing IMM32 Cicero (modern input method) + * PURPOSE: Implementing the IMM32 Cicero-aware Text Framework (CTF) * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -9,6 +9,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); +/* + * NOTE: Microsoft CTF protocol has vulnerability. + * If insecure, we don't follow the dangerous design. + * + * https://www.zdnet.com/article/vulnerability-in-microsoft-ctf-protocol-goes-… + * https://googleprojectzero.blogspot.com/2019/08/down-rabbit-hole.html + */ + // Win: LoadCtfIme HMODULE APIENTRY Imm32LoadCtfIme(VOID) { @@ -95,3 +103,68 @@ LRESULT WINAPI CtfImmDispatchDefImeMessage(HWND hWnd, UINT uMsg, WPARAM wParam, FIXME("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); return 0; } + +/*********************************************************************** + * CtfImmIsGuidMapEnable(IMM32.@) + */ +BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC) +{ + DWORD dwThreadId; + HKL hKL; + PIMEDPI pImeDpi; + BOOL ret = FALSE; + + TRACE("(%p)\n", hIMC); + + if (!Imm32IsCiceroMode() || Imm32Is16BitMode()) + return ret; + + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); + hKL = GetKeyboardLayout(dwThreadId); + + if (IS_IME_HKL(hKL)) + return ret; + + pImeDpi = Imm32FindOrLoadImeDpi(hKL); + if (!pImeDpi) + return ret; + + if (pImeDpi->CtfImeIsGuidMapEnable) + ret = pImeDpi->CtfImeIsGuidMapEnable(hIMC); + + ImmUnlockImeDpi(pImeDpi); + return ret; +} + +/*********************************************************************** + * CtfImmGetGuidAtom(IMM32.@) + */ +HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom) +{ + HRESULT hr = E_FAIL; + PIMEDPI pImeDpi; + DWORD dwThreadId; + HKL hKL; + + TRACE("(%p, 0xlX, %p)\n", hIMC, dwUnknown, pdwGuidAtom); + + *pdwGuidAtom = 0; + + if (!Imm32IsCiceroMode() || Imm32Is16BitMode()) + return hr; + + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); + hKL = GetKeyboardLayout(dwThreadId); + if (IS_IME_HKL(hKL)) + return S_OK; + + pImeDpi = Imm32FindOrLoadImeDpi(hKL); + if (!pImeDpi) + return hr; + + if (pImeDpi->CtfImeGetGuidAtom) + hr = pImeDpi->CtfImeGetGuidAtom(hIMC, dwUnknown, pdwGuidAtom); + + ImmUnlockImeDpi(pImeDpi); + return hr; +} diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 78316f2a447..77442f45829 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -4,6 +4,8 @@ @ stdcall CtfImmRestoreToolbarWnd(long) @ stdcall CtfImmHideToolbarWnd() @ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) +@ stdcall CtfImmIsGuidMapEnable(ptr) +@ stdcall CtfImmGetGuidAtom(ptr long ptr) @ stdcall ImmActivateLayout(ptr) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) diff --git a/win32ss/include/imetable.h b/win32ss/include/imetable.h index 70bc982a6dc..d41c5af653d 100644 --- a/win32ss/include/imetable.h +++ b/win32ss/include/imetable.h @@ -18,5 +18,5 @@ DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwT DEFINE_IME_ENTRY(BOOL, CtfImeInquireExW, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags, HKL hKL), TRUE) DEFINE_IME_ENTRY(BOOL, CtfImeSelectEx, (HIMC hIMC, BOOL fSelect, HKL hKL), TRUE) DEFINE_IME_ENTRY(LRESULT, CtfImeEscapeEx, (HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL), TRUE) -DEFINE_IME_ENTRY(DWORD, CtfImeGetGuidAtom, (VOID /* FIXME: unknown */), TRUE) -DEFINE_IME_ENTRY(DWORD, CtfImeIsGuidMapEnable, (VOID /* FIXME: unknown */), TRUE) +DEFINE_IME_ENTRY(HRESULT, CtfImeGetGuidAtom, (HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom), TRUE) +DEFINE_IME_ENTRY(BOOL, CtfImeIsGuidMapEnable, (HIMC hIMC), TRUE)

1 0

[reactos] 01/01: [NTUSER] Use assignment-lock against THREADINFO.KeyboardLayout (#4620)
by Katayama Hirofumi MZ 23 Aug '22

23 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f34b8460e33fd64afa9ac… commit f34b8460e33fd64afa9acc1fe3827dfedf00f2d9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 23 19:32:23 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 23 19:32:23 2022 +0900 [NTUSER] Use assignment-lock against THREADINFO.KeyboardLayout (#4620) - Assignment and locking are managed by UserAssignmentLock/UserAssignmentUnlock. - Synchronize ClientInfo->hKL to pti->KeyboardLayout->hkl. CORE-11700, CORE-18317 --- win32ss/user/ntuser/ime.c | 1 + win32ss/user/ntuser/kbdlayout.c | 22 +++++++++------------- win32ss/user/ntuser/keyboard.c | 15 ++++++++++++--- win32ss/user/ntuser/main.c | 16 ++++++++-------- 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 370854ad2e8..1cdabee6638 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -533,6 +533,7 @@ NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) pti->hklPrev = hOldKL; UserAssignmentLock((PVOID*)&pti->KeyboardLayout, pNewKL); + pti->pClientInfo->hKL = pNewKL->hkl; Quit: UserLeave(); diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index fde11969f9b..6a742b27377 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -583,16 +583,13 @@ co_UserActivateKbl(PTHREADINFO pti, PKL pKl, UINT Flags) PWND pWnd; pklPrev = pti->KeyboardLayout; - if (pklPrev) - UserDereferenceObject(pklPrev); - pti->KeyboardLayout = pKl; + UserAssignmentLock((PVOID*)&(pti->KeyboardLayout), pKl); pti->pClientInfo->hKL = pKl->hkl; - UserReferenceObject(pKl); if (Flags & KLF_SETFORPROCESS) { - // FIXME + FIXME("KLF_SETFORPROCESS\n"); } if (!(pWnd = pti->MessageQueue->spwndFocus)) @@ -631,7 +628,8 @@ IntImmActivateLayout( UserDerefObjectCo(pImeWnd); } - UserAssignmentLock((PVOID*)&pti->KeyboardLayout, pKL); + UserAssignmentLock((PVOID*)&(pti->KeyboardLayout), pKL); + pti->pClientInfo->hKL = pKL->hkl; } /* Win: xxxInternalActivateKeyboardLayout */ @@ -658,7 +656,7 @@ co_UserActivateKeyboardLayout( if (uFlags & KLF_RESET) { - /* FIXME */ + FIXME("KLF_RESET\n"); } if (!(uFlags & KLF_SETFORPROCESS) && pKL == pti->KeyboardLayout) @@ -673,10 +671,11 @@ co_UserActivateKeyboardLayout( { UserAssignmentLock((PVOID*)&pti->KeyboardLayout, pKL); ClientInfo->CodePage = pKL->CodePage; + ClientInfo->hKL = pKL->hkl; } else if (uFlags & KLF_SETFORPROCESS) { - /* FIXME */ + FIXME("KLF_SETFORPROCESS\n"); } else { @@ -685,11 +684,8 @@ co_UserActivateKeyboardLayout( else UserAssignmentLock((PVOID*)&pti->KeyboardLayout, pKL); - if (!(pti->TIF_flags & TIF_INCLEANUP)) - { - ClientInfo->CodePage = pKL->CodePage; - ClientInfo->hKL = pKL->hkl; - } + ClientInfo->CodePage = pKL->CodePage; + ClientInfo->hKL = pKL->hkl; } if (gptiForeground && (gptiForeground->ppi == pti->ppi)) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 3ecc03ff433..3d427d1cb0b 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -1174,9 +1174,18 @@ IntTranslateKbdMessage(LPMSG lpMsg, if (!pti->KeyboardLayout) { - pti->KeyboardLayout = W32kGetDefaultKeyLayout(); - pti->pClientInfo->hKL = pti->KeyboardLayout ? pti->KeyboardLayout->hkl : NULL; - pKbdTbl = pti->KeyboardLayout ? pti->KeyboardLayout->spkf->pKbdTbl : NULL; + PKL pDefKL = W32kGetDefaultKeyLayout(); + UserAssignmentLock((PVOID*)&(pti->KeyboardLayout), pDefKL); + if (pDefKL) + { + pti->pClientInfo->hKL = pDefKL->hkl; + pKbdTbl = pDefKL->spkf->pKbdTbl; + } + else + { + pti->pClientInfo->hKL = NULL; + pKbdTbl = NULL; + } } else pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 1010d7970ef..ea092317809 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -462,6 +462,7 @@ InitThreadCallback(PETHREAD Thread) NTSTATUS Status = STATUS_SUCCESS; PTEB pTeb; PRTL_USER_PROCESS_PARAMETERS ProcessParams; + PKL pDefKL; Process = Thread->ThreadsProcess; @@ -532,9 +533,8 @@ InitThreadCallback(PETHREAD Thread) goto error; } - ptiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); - if (ptiCurrent->KeyboardLayout) - UserReferenceObject(ptiCurrent->KeyboardLayout); + pDefKL = W32kGetDefaultKeyLayout(); + UserAssignmentLock((PVOID*)&(ptiCurrent->KeyboardLayout), pDefKL); ptiCurrent->TIF_flags &= ~TIF_INCLEANUP; @@ -550,10 +550,10 @@ InitThreadCallback(PETHREAD Thread) pci->ppi = ptiCurrent->ppi; pci->fsHooks = ptiCurrent->fsHooks; pci->dwTIFlags = ptiCurrent->TIF_flags; - if (ptiCurrent->KeyboardLayout) + if (pDefKL) { - pci->hKL = ptiCurrent->KeyboardLayout->hkl; - pci->CodePage = ptiCurrent->KeyboardLayout->CodePage; + pci->hKL = pDefKL->hkl; + pci->CodePage = pDefKL->CodePage; } /* Need to pass the user Startup Information to the current process. */ @@ -829,8 +829,8 @@ ExitThreadCallback(PETHREAD Thread) /* Remove it from the list */ *ppti = ptiCurrent->ptiSibling; - if (ptiCurrent->KeyboardLayout) - UserDereferenceObject(ptiCurrent->KeyboardLayout); + if (!UserAssignmentUnlock((PVOID*)&(ptiCurrent->KeyboardLayout))) + ptiCurrent->pClientInfo->hKL = NULL; if (gptiForeground == ptiCurrent) {

1 0

[reactos] 01/01: [BOOT][SDK:CMLIB] Compile a CMLIB for FreeLdr / NT bootloader with correct definitions. (#4619)
by Hermès Bélusca-Maïto 22 Aug '22

22 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cadc268ef4056b6ce082… commit 5cadc268ef4056b6ce08283b5d95604e37e02f27 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 21 21:17:05 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 22 22:08:02 2022 +0200 [BOOT][SDK:CMLIB] Compile a CMLIB for FreeLdr / NT bootloader with correct definitions. (#4619) This also allows using the CMLIB with any reduced functionality that could be required at boot-time. --- boot/environ/CMakeLists.txt | 4 ++-- boot/freeldr/freeldr/CMakeLists.txt | 2 +- sdk/lib/cmlib/CMakeLists.txt | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/boot/environ/CMakeLists.txt b/boot/environ/CMakeLists.txt index 3874ed3f031..5406e4f7f08 100644 --- a/boot/environ/CMakeLists.txt +++ b/boot/environ/CMakeLists.txt @@ -101,7 +101,7 @@ endif() set_entrypoint(bootmgfw EfiEntry) -target_link_libraries(bootmgfw bootlib cportlib cmlib blrtl libcntpr) +target_link_libraries(bootmgfw bootlib cportlib blcmlib blrtl libcntpr) # dynamic analysis switches if(STACK_PROTECTOR) @@ -149,7 +149,7 @@ else() set_entrypoint(rosload OslMain) endif() -target_link_libraries(rosload bootlib cportlib cmlib blrtl libcntpr) +target_link_libraries(rosload bootlib cportlib blcmlib blrtl libcntpr) # dynamic analysis switches if(STACK_PROTECTOR) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index c00416befbc..a295c481202 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -293,7 +293,7 @@ if(ARCH STREQUAL "i386") target_link_libraries(freeldr_pe mini_hal) endif() -target_link_libraries(freeldr_pe freeldr_common cportlib cmlib blrtl libcntpr) +target_link_libraries(freeldr_pe freeldr_common cportlib blcmlib blrtl libcntpr) # dynamic analysis switches if(STACK_PROTECTOR) diff --git a/sdk/lib/cmlib/CMakeLists.txt b/sdk/lib/cmlib/CMakeLists.txt index bcd2b6b5142..2ed0bc304b1 100644 --- a/sdk/lib/cmlib/CMakeLists.txt +++ b/sdk/lib/cmlib/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions( - -D_BLDR_ -D_NTSYSTEM_ -DNASSERT) @@ -19,10 +18,18 @@ list(APPEND SOURCE cmlib.h) if(CMAKE_CROSSCOMPILING) + # CMLIB for NT bootloader + add_library(blcmlib ${SOURCE}) + target_compile_definitions(blcmlib PRIVATE _BLDR_) + add_dependencies(blcmlib bugcodes xdk) + add_pch(blcmlib cmlib.h SOURCE) + + # CMLIB for NT kernel add_library(cmlib ${SOURCE}) add_dependencies(cmlib bugcodes xdk) add_pch(cmlib cmlib.h SOURCE) else() + # CMLIB for host-tools add_definitions( -D__NO_CTYPE_INLINES -DCMLIB_HOST)

1 0

[reactos] 01/01: [OSK] Fix text label height for Russian (ru-RU) translation
by Stanislav Motylkov 22 Aug '22

22 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95b3e7508e52a1a1cbce6… commit 95b3e7508e52a1a1cbce6018ef0e65194c8b26e0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Aug 22 16:50:17 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Aug 22 16:50:17 2022 +0300 [OSK] Fix text label height for Russian (ru-RU) translation Addendum to e59e6ba0. --- base/applications/osk/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index 99c48709633..7befd7e17de 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -54,7 +54,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 - LTEXT "Экранная клавиатура обеспечивает минимальный функционал для пользователей с ограниченными физическими возможностями. Пользователям с ограниченными физическими возможностями нужны более функциональные программы.", IDC_STATIC, 36, 7, 207, 33 + LTEXT "Экранная клавиатура обеспечивает минимальный функционал для пользователей с ограниченными физическими возможностями. Пользователям с ограниченными физическими возможностями нужны более функциональные программы.", IDC_STATIC, 36, 7, 207, 41 CONTROL "Не показывать это сообщение снова", IDC_SHOWWARNINGCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END

1 0

[reactos] 06/06: [NTOS] Remove useless functions
by Timo Kreuzer 22 Aug '22

22 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9a129c1e20c1f4eba227… commit e9a129c1e20c1f4eba227d762caa313cda9478ee Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 09:27:47 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Aug 22 11:22:08 2022 +0200 [NTOS] Remove useless functions --- ntoskrnl/include/internal/amd64/intrin_i.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/intrin_i.h b/ntoskrnl/include/internal/amd64/intrin_i.h index 97072c3fd94..c2563fb7e42 100644 --- a/ntoskrnl/include/internal/amd64/intrin_i.h +++ b/ntoskrnl/include/internal/amd64/intrin_i.h @@ -81,16 +81,6 @@ static __inline__ __attribute__((always_inline)) void __sldt(void *Destination) __asm__ __volatile__("sldt %0" : : "m"(*(short*)Destination) : "memory"); } -static __inline__ __attribute__((always_inline)) void __ldmxcsr(unsigned long *Source) -{ - __asm__ __volatile__("ldmxcsr %0" : : "m"(*Source)); -} - -static __inline__ __attribute__((always_inline)) void __stmxcsr(unsigned long *Destination) -{ - __asm__ __volatile__("stmxcsr %0" : : "m"(*Destination) : "memory"); -} - static __inline__ __attribute__((always_inline)) void __ltr(unsigned short Source) { __asm__ __volatile__("ltr %0" : : "rm"(Source));

1 0

[reactos] 05/06: [NTOS] Add MxCsr handling to trap handlers
by Timo Kreuzer 22 Aug '22

22 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=620f9ee71a7aa908db8a0… commit 620f9ee71a7aa908db8a0734fd310538309bbe93 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 13:31:48 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Aug 22 11:22:08 2022 +0200 [NTOS] Add MxCsr handling to trap handlers --- ntoskrnl/ke/amd64/trap.S | 7 +++++++ sdk/include/asm/ksamd64.template.h | 2 +- sdk/include/asm/trapamd64.inc | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 9d694518d0f..63dacf8166b 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -822,6 +822,10 @@ PUBLIC KiSystemCallEntry64 mov ds, ax mov es, ax + /* Save MCXSR and set kernel value */ + stmxcsr [rsp + MAX_SYSCALL_PARAM_SIZE + KTRAP_FRAME_MxCsr] + ldmxcsr gs:[PcMxCsr] + #if DBG /* Check IRQL */ mov rax, cr8 @@ -861,6 +865,9 @@ no_user_apc_pending: /* Disable interrupts for return */ cli + /* Restore MCXSR */ + ldmxcsr [rsp + MAX_SYSCALL_PARAM_SIZE + KTRAP_FRAME_MxCsr] + /* Restore old trap frame */ mov rcx, gs:[PcCurrentThread] mov rdx, [rsp + MAX_SYSCALL_PARAM_SIZE + KTRAP_FRAME_TrapFrame] diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 1072df28b34..6fcb43149ea 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -586,7 +586,7 @@ OFFSET(PcIrql, KPCR, Irql), OFFSET(PcStallScaleFactor, KPCR, StallScaleFactor), OFFSET(PcHalReserved, KPCR, HalReserved), //OFFSET(PcPrcb, KPCR, Prcb), -//OFFSET(PcMxCsr, KPCR, MxCsr), +OFFSET(PcMxCsr, KIPCR, Prcb.MxCsr), //OFFSET(PcNumber, KPCR, Number), //OFFSET(PcInterruptRequest, KPCR, InterruptRequest), //OFFSET(PcIdleHalt, KPCR, IdleHalt), diff --git a/sdk/include/asm/trapamd64.inc b/sdk/include/asm/trapamd64.inc index eeb804ec970..d5d51dc50a6 100644 --- a/sdk/include/asm/trapamd64.inc +++ b/sdk/include/asm/trapamd64.inc @@ -97,6 +97,9 @@ MACRO(EnterTrap, Flags) mov [rbp + KTRAP_FRAME_SegGs], gs endif + /* Save MCXSR */ + stmxcsr [rbp + KTRAP_FRAME_MxCsr] + #if DBG mov ecx, MSR_GS_BASE rdmsr @@ -116,6 +119,9 @@ MACRO(EnterTrap, Flags) mov es, ax swapgs + /* Load kernel MXCSR */ + ldmxcsr gs:[PcMxCsr] + #if DBG /* Check IRQL */ mov rax, cr8 @@ -255,6 +261,9 @@ kernel_mode_return: movdqa xmm5, [rbp + KTRAP_FRAME_Xmm5] endif + /* Restore MCXSR */ + ldmxcsr [rbp + KTRAP_FRAME_MxCsr] + /* Restore rbp */ mov rbp, [rbp + KTRAP_FRAME_Rbp]

1 0

[reactos] 04/06: [NTOSKRNL] Implement KiXmmExceptionHandler
by Timo Kreuzer 22 Aug '22

22 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92c798c657d5f0a315624… commit 92c798c657d5f0a315624b864e3d0b0c03715f6d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jul 13 20:26:42 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Aug 22 11:22:08 2022 +0200 [NTOSKRNL] Implement KiXmmExceptionHandler --- ntoskrnl/ke/amd64/except.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- ntoskrnl/ke/amd64/trap.S | 4 +++- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ke/amd64/except.c b/ntoskrnl/ke/amd64/except.c index de8e2b01697..8410fa4acc6 100644 --- a/ntoskrnl/ke/amd64/except.c +++ b/ntoskrnl/ke/amd64/except.c @@ -672,7 +672,49 @@ NTAPI KiXmmExceptionHandler( IN PKTRAP_FRAME TrapFrame) { - UNIMPLEMENTED; - KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); - return -1; + ULONG ExceptionCode; + + if ((TrapFrame->MxCsr & _MM_EXCEPT_INVALID) && + !(TrapFrame->MxCsr & _MM_MASK_INVALID)) + { + /* Invalid operation */ + ExceptionCode = STATUS_FLOAT_INVALID_OPERATION; + } + else if ((TrapFrame->MxCsr & _MM_EXCEPT_DENORM) && + !(TrapFrame->MxCsr & _MM_MASK_DENORM)) + { + /* Denormalized operand. Yes, this is what Windows returns. */ + ExceptionCode = STATUS_FLOAT_INVALID_OPERATION; + } + else if ((TrapFrame->MxCsr & _MM_EXCEPT_DIV_ZERO) && + !(TrapFrame->MxCsr & _MM_MASK_DIV_ZERO)) + { + /* Divide by zero */ + ExceptionCode = STATUS_FLOAT_DIVIDE_BY_ZERO; + } + else if ((TrapFrame->MxCsr & _MM_EXCEPT_OVERFLOW) && + !(TrapFrame->MxCsr & _MM_MASK_OVERFLOW)) + { + /* Overflow */ + ExceptionCode = STATUS_FLOAT_OVERFLOW; + } + else if ((TrapFrame->MxCsr & _MM_EXCEPT_UNDERFLOW) && + !(TrapFrame->MxCsr & _MM_MASK_UNDERFLOW)) + { + /* Underflow */ + ExceptionCode = STATUS_FLOAT_UNDERFLOW; + } + else if ((TrapFrame->MxCsr & _MM_EXCEPT_INEXACT) && + !(TrapFrame->MxCsr & _MM_MASK_INEXACT)) + { + /* Precision */ + ExceptionCode = STATUS_FLOAT_INEXACT_RESULT; + } + else + { + /* Should not happen */ + ASSERT(FALSE); + } + + return ExceptionCode; } diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 73470363a23..9d694518d0f 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -543,7 +543,9 @@ FUNC KiXmmException jge KiXmmExit /* Dispatch the exception */ - DispatchException eax, 3, 0, 0, 0 + DispatchException eax, 2, 0, [rbp+KTRAP_FRAME_MxCsr], 0 + + // FIXME: STATUS_FLOAT_MULTIPLE_TRAPS / STATUS_FLOAT_MULTIPLE_FAULTS KiXmmExit: /* Return */

1 0

[reactos] 03/06: [CRT] Fix amd64 floating point control functions
by Timo Kreuzer 22 Aug '22

22 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76086220fa4c0d8a7e7ac… commit 76086220fa4c0d8a7e7ac88cf1d01cdbeb445df5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jul 13 20:27:42 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Aug 22 11:22:08 2022 +0200 [CRT] Fix amd64 floating point control functions --- sdk/include/crt/float.h | 4 ++ sdk/lib/crt/float/amd64/_clearfp.c | 23 ++++++++ sdk/lib/crt/float/amd64/_control87.c | 39 ++++++++++++ sdk/lib/crt/float/amd64/_controlfp.c | 13 ++++ sdk/lib/crt/float/amd64/_fpreset.c | 14 +++++ sdk/lib/crt/float/amd64/_statusfp.c | 33 +++++++++++ sdk/lib/crt/float/amd64/clearfp.S | 15 ----- sdk/lib/crt/float/amd64/fpreset.S | 13 ---- sdk/lib/crt/float/amd64/machfpcw.c | 111 +++++++++++++++++++++++++++++++++++ sdk/lib/crt/float/float.cmake | 10 ++-- 10 files changed, 243 insertions(+), 32 deletions(-) diff --git a/sdk/include/crt/float.h b/sdk/include/crt/float.h index b5681293421..8c42b3f9d04 100644 --- a/sdk/include/crt/float.h +++ b/sdk/include/crt/float.h @@ -59,6 +59,10 @@ #define _PC_24 0x00020000 #define _PC_53 0x00010000 #define _PC_64 0x00000000 +#define _DN_SAVE 0x00000000 +#define _DN_FLUSH 0x01000000 +#define _DN_FLUSH_OPERANDS_SAVE_RESULTS 0x02000000 +#define _DN_SAVE_OPERANDS_FLUSH_RESULTS 0x03000000 /* These are also defined in Mingw math.h, needed to work around GCC build issues. */ diff --git a/sdk/lib/crt/float/amd64/_clearfp.c b/sdk/lib/crt/float/amd64/_clearfp.c new file mode 100644 index 00000000000..b03b3f10f79 --- /dev/null +++ b/sdk/lib/crt/float/amd64/_clearfp.c @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 implementation of _clearfp + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <float.h> +#include <xmmintrin.h> + +unsigned int __cdecl _clearfp(void) +{ + unsigned int retval; + + /* Get current status value */ + retval = _statusfp(); + + /* Clear the exception mask */ + _mm_setcsr(_mm_getcsr() & ~_MM_EXCEPT_MASK); + + /* Return the previous state */ + return retval; +} diff --git a/sdk/lib/crt/float/amd64/_control87.c b/sdk/lib/crt/float/amd64/_control87.c new file mode 100644 index 00000000000..a9f07cf0836 --- /dev/null +++ b/sdk/lib/crt/float/amd64/_control87.c @@ -0,0 +1,39 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of _control87 + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <xmmintrin.h> +#include <float.h> + +unsigned int _get_native_fpcw(void); +void _set_native_fpcw(unsigned int value); +unsigned int _fpcw_native_to_abstract(unsigned int native); +unsigned int _fpcw_abstract_to_native(unsigned int abstract); + +unsigned int __cdecl _control87(unsigned int newval, unsigned int mask) +{ + unsigned int native, oldval, updated; + + /* Sanatize the mask */ + mask &= _MCW_DN | _MCW_EM | _MCW_RC; + + /* Get native control word */ + native = _get_native_fpcw(); + + /* Convert to abstract */ + oldval = _fpcw_native_to_abstract(native); + + /* Update it according to the given parameters */ + updated = (oldval & ~mask) | (newval & mask); + + /* Convert back to native */ + native = _fpcw_abstract_to_native(updated); + + /* Set the native value */ + _set_native_fpcw(native); + + return updated; +} diff --git a/sdk/lib/crt/float/amd64/_controlfp.c b/sdk/lib/crt/float/amd64/_controlfp.c new file mode 100644 index 00000000000..f0ac11548ab --- /dev/null +++ b/sdk/lib/crt/float/amd64/_controlfp.c @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 implementation of _controlfp + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <float.h> + +unsigned int __cdecl _controlfp(unsigned int newval, unsigned int mask) +{ + return _control87(newval, mask & ~_EM_DENORMAL); +} diff --git a/sdk/lib/crt/float/amd64/_fpreset.c b/sdk/lib/crt/float/amd64/_fpreset.c new file mode 100644 index 00000000000..b03885527a9 --- /dev/null +++ b/sdk/lib/crt/float/amd64/_fpreset.c @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 implementation of _fpreset + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <xmmintrin.h> + +void __cdecl _fpreset(void) +{ + /* Mask everything */ + _mm_setcsr(_MM_MASK_MASK); +} diff --git a/sdk/lib/crt/float/amd64/_statusfp.c b/sdk/lib/crt/float/amd64/_statusfp.c new file mode 100644 index 00000000000..760e9bfe4be --- /dev/null +++ b/sdk/lib/crt/float/amd64/_statusfp.c @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 implementation of _statusfp + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <float.h> +#include <xmmintrin.h> + +unsigned int __cdecl _statusfp(void) +{ + unsigned int mxcsr, status = 0; + + /* Get MXCSR */ + mxcsr = _mm_getcsr(); + + /* Convert to abstract status flags */ + if (mxcsr & _MM_EXCEPT_INVALID) + status |= _SW_INVALID; + if (mxcsr & _MM_EXCEPT_DENORM) + status |= _SW_DENORMAL; + if (mxcsr & _MM_EXCEPT_DIV_ZERO) + status |= _SW_ZERODIVIDE; + if (mxcsr & _MM_EXCEPT_OVERFLOW) + status |= _SW_OVERFLOW; + if (mxcsr & _MM_EXCEPT_UNDERFLOW) + status |= _SW_UNDERFLOW; + if (mxcsr & _MM_EXCEPT_INEXACT) + status |= _SW_INEXACT; + + return status; +} diff --git a/sdk/lib/crt/float/amd64/clearfp.S b/sdk/lib/crt/float/amd64/clearfp.S deleted file mode 100644 index 2df94a9b383..00000000000 --- a/sdk/lib/crt/float/amd64/clearfp.S +++ /dev/null @@ -1,15 +0,0 @@ - - - -#include <asm.inc> - -.code64 - -PUBLIC _clearfp -FUNC _clearfp - .ENDPROLOG - fnclex - -ENDFUNC - -END diff --git a/sdk/lib/crt/float/amd64/fpreset.S b/sdk/lib/crt/float/amd64/fpreset.S deleted file mode 100644 index bae9ed4c856..00000000000 --- a/sdk/lib/crt/float/amd64/fpreset.S +++ /dev/null @@ -1,13 +0,0 @@ - -#include <asm.inc> - -.code64 - -PUBLIC _fpreset -FUNC _fpreset - .endprolog - fninit - ret -ENDFUNC - -END diff --git a/sdk/lib/crt/float/amd64/machfpcw.c b/sdk/lib/crt/float/amd64/machfpcw.c new file mode 100644 index 00000000000..f74c7c5e1d9 --- /dev/null +++ b/sdk/lib/crt/float/amd64/machfpcw.c @@ -0,0 +1,111 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of x64 floating point control word helper functions + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <float.h> +#include <xmmintrin.h> + +#define _MM_DENORMALS_ARE_ZERO 0x0040 + +unsigned int _get_native_fpcw(void) +{ + return _mm_getcsr(); +} + +void _set_native_fpcw(unsigned int value) +{ + _mm_setcsr(value); +} + +unsigned int _fpcw_native_to_abstract(unsigned int native) +{ + unsigned int rounding_mask, abstract = 0; + + /* Handle exception mask */ + if (native & _MM_MASK_INVALID) + abstract |= _EM_INVALID; + if (native & _MM_MASK_DENORM) + abstract |= _EM_DENORMAL; + if (native & _MM_MASK_DIV_ZERO) + abstract |= _EM_ZERODIVIDE; + if (native & _MM_MASK_OVERFLOW) + abstract |= _EM_OVERFLOW; + if (native & _MM_MASK_UNDERFLOW) + abstract |= _EM_UNDERFLOW; + if (native & _MM_MASK_INEXACT) + abstract |= _EM_INEXACT; + + /* Handle rounding mode */ + rounding_mask = (native & _MM_ROUND_MASK); + if (rounding_mask == _MM_ROUND_DOWN) + abstract |= _RC_DOWN; + else if(rounding_mask == _MM_ROUND_UP) + abstract |= _RC_UP; + else if (rounding_mask == _MM_ROUND_TOWARD_ZERO) + abstract |= _RC_CHOP; + + /* Handle denormal control */ + if (native & _MM_DENORMALS_ARE_ZERO) + { + if (native & _MM_FLUSH_ZERO_MASK) + abstract |= _DN_FLUSH; + else + abstract |= _DN_FLUSH_OPERANDS_SAVE_RESULTS; + } + else + { + if (native & _MM_FLUSH_ZERO_MASK) + abstract |= _DN_SAVE_OPERANDS_FLUSH_RESULTS; + else + abstract |= _DN_SAVE; + } + + return abstract; +} + +unsigned int _fpcw_abstract_to_native(unsigned int abstract) +{ + unsigned int rounding_mask, native = 0; + + /* Handle exception mask */ + if (abstract & _EM_INVALID) + native |= _MM_MASK_INVALID; + if (abstract & _EM_DENORMAL) + native |= _MM_MASK_DENORM; + if (abstract & _EM_ZERODIVIDE) + native |= _MM_MASK_DIV_ZERO; + if (abstract & _EM_OVERFLOW) + native |= _MM_MASK_OVERFLOW; + if (abstract & _EM_UNDERFLOW) + native |= _MM_MASK_UNDERFLOW; + if (abstract & _EM_INEXACT) + native |= _MM_MASK_INEXACT; + + /* Handle rounding mode */ + rounding_mask = (abstract & _MCW_RC); + if (rounding_mask == _RC_DOWN) + native |= _MM_ROUND_DOWN; + else if (rounding_mask == _RC_UP) + native |= _MM_ROUND_UP; + else if (rounding_mask == _RC_CHOP) + native |= _MM_ROUND_TOWARD_ZERO; + + /* Handle Denormal Control */ + if ((abstract & _MCW_DN) == _DN_FLUSH) + { + native |= _MM_DENORMALS_ARE_ZERO | _MM_FLUSH_ZERO_MASK; + } + else if ((abstract & _MCW_DN) == _DN_FLUSH_OPERANDS_SAVE_RESULTS) + { + native |= _MM_DENORMALS_ARE_ZERO; + } + else if ((abstract & _MCW_DN) == _DN_SAVE_OPERANDS_FLUSH_RESULTS) + { + native |= _MM_FLUSH_ZERO_MASK; + } + + return native; +} diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake index 8f16c995a09..e4189362f64 100644 --- a/sdk/lib/crt/float/float.cmake +++ b/sdk/lib/crt/float/float.cmake @@ -23,13 +23,15 @@ if(ARCH STREQUAL "i386") ) elseif(ARCH STREQUAL "amd64") list(APPEND CRT_FLOAT_SOURCE - float/i386/cntrlfp.c - float/i386/statfp.c + float/amd64/_clearfp.c + float/amd64/_control87.c + float/amd64/_controlfp.c + float/amd64/_fpreset.c + float/amd64/_statusfp.c + float/amd64/machfpcw.c ) list(APPEND CRT_FLOAT_ASM_SOURCE - float/amd64/clearfp.S float/amd64/getsetfpcw.S - float/amd64/fpreset.S float/amd64/logb.S ) elseif(ARCH STREQUAL "arm")

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