Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [IMM32] Rewrite ImmGetCompositionWindow (#3820)
by Katayama Hirofumi MZ 13 Jul '21

13 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=192981a1feb30e6f7e9dc… commit 192981a1feb30e6f7e9dcde7a8b55e8e544e0cf7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 13 21:13:39 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 13 21:13:39 2021 +0900 [IMM32] Rewrite ImmGetCompositionWindow (#3820) Rewrite ImmGetCompositionWindow function. CORE-11700 --- dll/win32/imm32/imm.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 5030f593461..e68f59c35a1 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1849,15 +1849,23 @@ LONG WINAPI ImmGetCompositionStringW( */ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { - InputContextData *data = get_imc_data(hIMC); + LPINPUTCONTEXT pIC; + BOOL ret = FALSE; - TRACE("(%p, %p)\n", hIMC, lpCompForm); + TRACE("ImmGetCompositionWindow(%p, %p)\n", hIMC, lpCompForm); - if (!data) + pIC = ImmLockIMC(hIMC); + if (!pIC) return FALSE; - *lpCompForm = data->IMC.cfCompForm; - return TRUE; + if (pIC->fdwInit & INIT_COMPFORM) + { + *lpCompForm = pIC->cfCompForm; + ret = TRUE; + } + + ImmUnlockIMC(hIMC); + return ret; } /***********************************************************************

1 0

[reactos] 01/01: [IMM32] Rewrite ImmGetCompositionFontA/W (#3813)
by Katayama Hirofumi MZ 13 Jul '21

13 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1558e6d0b3b19446394d1… commit 1558e6d0b3b19446394d18b3cdfd6cdc0869def6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 13 20:51:28 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 13 20:51:28 2021 +0900 [IMM32] Rewrite ImmGetCompositionFontA/W (#3813) - Rewrite ImmGetCompositionFontA and ImmGetCompositionFontW functions. - Add INIT_* macro definitions in <ddk/imm.h>. CORE-11700 --- dll/win32/imm32/imm.c | 88 ++++++++++++++++++++++++++++++++------ sdk/include/reactos/wine/ddk/imm.h | 8 ++++ 2 files changed, 82 insertions(+), 14 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 224f616866b..5030f593461 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1457,24 +1457,64 @@ BOOL WINAPI ImmGetCandidateWindow( return TRUE; } +static VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW) +{ + size_t cch; + RtlCopyMemory(plfW, plfA, offsetof(LOGFONTA, lfFaceName)); + StringCchLengthA(plfA->lfFaceName, _countof(plfA->lfFaceName), &cch); + cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, plfA->lfFaceName, (INT)cch, + plfW->lfFaceName, _countof(plfW->lfFaceName)); + if (cch > _countof(plfW->lfFaceName) - 1) + cch = _countof(plfW->lfFaceName) - 1; + plfW->lfFaceName[cch] = 0; +} + +static VOID APIENTRY LogFontWideToAnsi(const LOGFONTW *plfW, LPLOGFONTA plfA) +{ + size_t cch; + RtlCopyMemory(plfA, plfW, offsetof(LOGFONTW, lfFaceName)); + StringCchLengthW(plfW->lfFaceName, _countof(plfW->lfFaceName), &cch); + cch = WideCharToMultiByte(CP_ACP, 0, plfW->lfFaceName, (INT)cch, + plfA->lfFaceName, _countof(plfA->lfFaceName), NULL, NULL); + if (cch > _countof(plfA->lfFaceName) - 1) + cch = _countof(plfA->lfFaceName) - 1; + plfA->lfFaceName[cch] = 0; +} + /*********************************************************************** * ImmGetCompositionFontA (IMM32.@) */ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - LOGFONTW lfW; - BOOL rc; + PCLIENTIMC pClientImc; + BOOL ret = FALSE, bWide; + LPINPUTCONTEXT pIC; - TRACE("(%p, %p):\n", hIMC, lplf); + TRACE("ImmGetCompositionFontA(%p, %p)\n", hIMC, lplf); - rc = ImmGetCompositionFontW(hIMC,&lfW); - if (!rc || !lplf) + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) return FALSE; - memcpy(lplf,&lfW,sizeof(LOGFONTA)); - WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, - LF_FACESIZE, NULL, NULL); - return TRUE; + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + if (pIC->fdwInit & INIT_LOGFONT) + { + if (bWide) + LogFontWideToAnsi(&pIC->lfFont.W, lplf); + else + *lplf = pIC->lfFont.A; + + ret = TRUE; + } + + ImmUnlockIMC(hIMC); + return ret; } /*********************************************************************** @@ -1482,16 +1522,36 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - InputContextData *data = get_imc_data(hIMC); + PCLIENTIMC pClientImc; + BOOL bWide; + LPINPUTCONTEXT pIC; + BOOL ret = FALSE; - TRACE("(%p, %p):\n", hIMC, lplf); + TRACE("ImmGetCompositionFontW(%p, %p)\n", hIMC, lplf); - if (!data || !lplf) + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) return FALSE; - *lplf = data->IMC.lfFont.W; + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); - return TRUE; + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + if (pIC->fdwInit & INIT_LOGFONT) + { + if (bWide) + *lplf = pIC->lfFont.W; + else + LogFontAnsiToWide(&pIC->lfFont.A, lplf); + + ret = TRUE; + } + + ImmUnlockIMC(hIMC); + return ret; } diff --git a/sdk/include/reactos/wine/ddk/imm.h b/sdk/include/reactos/wine/ddk/imm.h index 583dbd63cc1..106d9603119 100644 --- a/sdk/include/reactos/wine/ddk/imm.h +++ b/sdk/include/reactos/wine/ddk/imm.h @@ -87,6 +87,14 @@ C_ASSERT(offsetof(INPUTCONTEXT, dwReserve) == 0x134); C_ASSERT(sizeof(INPUTCONTEXT) == 0x140); #endif +// bits of fdwInit of INPUTCONTEXT +#define INIT_STATUSWNDPOS 0x00000001 +#define INIT_CONVERSION 0x00000002 +#define INIT_SENTENCE 0x00000004 +#define INIT_LOGFONT 0x00000008 +#define INIT_COMPFORM 0x00000010 +#define INIT_SOFTKBDPOS 0x00000020 + LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); #endif /* _WINE_IMM_H_ */

1 0

[reactos] 01/01: [IMM32] Rewrite ImmGetCandidateListCountA/W (#3812)
by Katayama Hirofumi MZ 13 Jul '21

13 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee3b5b44c152a74e84b46… commit ee3b5b44c152a74e84b463d528dd9fb27542dbaf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 13 20:17:17 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 13 20:17:17 2021 +0900 [IMM32] Rewrite ImmGetCandidateListCountA/W (#3812) Implement ImmGetCandidateListCountA and ImmGetCandidateListCountW functions by using newly defined ImmGetCandidateListCountAW function. CORE-11700 --- dll/win32/imm32/imm.c | 148 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 54 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e7ad9746680..224f616866b 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1309,6 +1309,92 @@ Quit: return ret; } +DWORD APIENTRY ImmGetCandidateListCountAW(HIMC hIMC, LPDWORD lpdwListCount, BOOL bAnsi) +{ + DWORD ret = 0, cbGot, dwIndex; + PCLIENTIMC pClientImc; + LPINPUTCONTEXT pIC; + const CANDIDATEINFO *pCI; + const BYTE *pb; + const CANDIDATELIST *pCL; + const DWORD *pdwOffsets; + + if (lpdwListCount == NULL) + return 0; + + *lpdwListCount = 0; + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) + return 0; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + { + ImmUnlockClientImc(pClientImc); + return 0; + } + + pCI = ImmLockIMCC(pIC->hCandInfo); + if (pCI == NULL) + { + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return 0; + } + + if (pCI->dwSize < sizeof(CANDIDATEINFO)) + goto Quit; + + *lpdwListCount = pCI->dwCount; /* the number of candidate lists */ + + /* calculate total size of candidate lists */ + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + ret = ROUNDUP4(pCI->dwPrivateSize); + pdwOffsets = pCI->dwOffset; + for (dwIndex = 0; dwIndex < pCI->dwCount; ++dwIndex) + { + pb = (const BYTE *)pCI + pdwOffsets[dwIndex]; + pCL = (const CANDIDATELIST *)pb; + cbGot = CandidateListWideToAnsi(pCL, NULL, 0, CP_ACP); + ret += cbGot; + } + } + else + { + ret = pCI->dwSize; + } + } + else + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + ret = pCI->dwSize; + } + else + { + ret = ROUNDUP4(pCI->dwPrivateSize); + pdwOffsets = pCI->dwOffset; + for (dwIndex = 0; dwIndex < pCI->dwCount; ++dwIndex) + { + pb = (const BYTE *)pCI + pdwOffsets[dwIndex]; + pCL = (const CANDIDATELIST *)pb; + cbGot = CandidateListAnsiToWide(pCL, NULL, 0, CP_ACP); + ret += cbGot; + } + } + } + +Quit: + ImmUnlockIMCC(pIC->hCandInfo); + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return ret; +} + /*********************************************************************** * ImmGetCandidateListA (IMM32.@) */ @@ -1325,30 +1411,7 @@ DWORD WINAPI ImmGetCandidateListA( DWORD WINAPI ImmGetCandidateListCountA( HIMC hIMC, LPDWORD lpdwListCount) { - InputContextData *data = get_imc_data(hIMC); - LPCANDIDATEINFO candinfo; - DWORD ret, count; - - TRACE("%p, %p\n", hIMC, lpdwListCount); - - if (!data || !lpdwListCount || !data->IMC.hCandInfo) - return 0; - - candinfo = ImmLockIMCC(data->IMC.hCandInfo); - - *lpdwListCount = count = candinfo->dwCount; - - if ( !is_himc_ime_unicode(data) ) - ret = candinfo->dwSize; - else - { - ret = sizeof(CANDIDATEINFO); - while ( count-- ) - ret += ImmGetCandidateListA(hIMC, count, NULL, 0); - } - - ImmUnlockIMCC(data->IMC.hCandInfo); - return ret; + return ImmGetCandidateListCountAW(hIMC, lpdwListCount, TRUE); } /*********************************************************************** @@ -1357,30 +1420,7 @@ DWORD WINAPI ImmGetCandidateListCountA( DWORD WINAPI ImmGetCandidateListCountW( HIMC hIMC, LPDWORD lpdwListCount) { - InputContextData *data = get_imc_data(hIMC); - LPCANDIDATEINFO candinfo; - DWORD ret, count; - - TRACE("%p, %p\n", hIMC, lpdwListCount); - - if (!data || !lpdwListCount || !data->IMC.hCandInfo) - return 0; - - candinfo = ImmLockIMCC(data->IMC.hCandInfo); - - *lpdwListCount = count = candinfo->dwCount; - - if ( is_himc_ime_unicode(data) ) - ret = candinfo->dwSize; - else - { - ret = sizeof(CANDIDATEINFO); - while ( count-- ) - ret += ImmGetCandidateListW(hIMC, count, NULL, 0); - } - - ImmUnlockIMCC(data->IMC.hCandInfo); - return ret; + return ImmGetCandidateListCountAW(hIMC, lpdwListCount, FALSE); } /*********************************************************************** @@ -3156,19 +3196,19 @@ LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC hIMC) */ BOOL WINAPI ImmUnlockIMC(HIMC hIMC) { - PCLIENTIMC pClientIMC; + PCLIENTIMC pClientImc; HIMC hClientImc; - pClientIMC = ImmLockClientImc(hIMC); - if (pClientIMC == NULL) + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) return FALSE; - hClientImc = pClientIMC->hImc; + hClientImc = pClientImc->hImc; if (hClientImc) LocalUnlock(hClientImc); - InterlockedDecrement(&pClientIMC->cLockObj); - ImmUnlockClientImc(pClientIMC); + InterlockedDecrement(&pClientImc->cLockObj); + ImmUnlockClientImc(pClientImc); return TRUE; }

1 0

[reactos] 01/01: [COMCTL32] Listview: Only apply horizontal offset when setting header position CORE-17674
by Joachim Henze 13 Jul '21

13 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5365194f4b7f85ab0b3e… commit a5365194f4b7f85ab0b3e086ad2e25a9e9b29694 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Jul 13 07:38:45 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Jul 13 07:38:45 2021 +0200 [COMCTL32] Listview: Only apply horizontal offset when setting header position CORE-17674 This imports Wine commit https://github.com/wine-mirror/wine/commit/d92906249fd4abd75d5d2ee2fba96685… Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Thanks to Doug Lyons who picked the fix for us from Wine 6.0 It fixes for us CORE-17674 "Corruption of the listview header" which regressed by 0.4.14-dev-150-g 00f14ee1f22a1c285462459f859fa17c90ccc19f when we synced to Wine Staging 4.18 Testbot results of the patch: KVM https://reactos.org/testman/compare.php?ids=78225,78270 LGTM VBox https://reactos.org/testman/compare.php?ids=78226,78271 LGTM I intend to port this back into 0.4.14RC94 also, so no official reactos release will ever be affected by it. --- dll/win32/comctl32/listview.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 4119c27a90a..2052b66e6a9 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -11253,7 +11253,6 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) rect = infoPtr->rcList; rect.left += origin.x; - rect.top += origin.y; hl.prc = &rect; hl.pwpos = &wp;

1 0

[reactos] 01/01: [DESK] Only try to restart graphic device after installation
by Hervé Poussineau 12 Jul '21

12 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6005299c685bb7669ad7… commit a6005299c685bb7669ad7ecb1d9c765bcc494c08 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Jul 12 23:50:42 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Jul 12 23:51:39 2021 +0200 [DESK] Only try to restart graphic device after installation If it fails, require a reboot. CORE-17675 --- dll/cpl/desk/classinst.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dll/cpl/desk/classinst.c b/dll/cpl/desk/classinst.c index c178d162d5b..2c73aced777 100644 --- a/dll/cpl/desk/classinst.c +++ b/dll/cpl/desk/classinst.c @@ -247,16 +247,34 @@ DisplayClassInstaller( /* FIXME: install OpenGLSoftwareSettings section */ /* Start the device */ - if (!SetupDiRestartDevices(DeviceInfoSet, DeviceInfoData)) + if (SetupDiRestartDevices(DeviceInfoSet, DeviceInfoData)) { - rc = GetLastError(); - DPRINT1("SetupDiRestartDevices() failed with error 0x%lx\n", rc); - goto cleanup; + /* Reenumerate display devices ; this will rescan for potential new devices */ + DisplayDevice.cb = sizeof(DISPLAY_DEVICE); + EnumDisplayDevices(NULL, 0, &DisplayDevice, 0); } + else + { + rc = GetLastError(); + DPRINT("SetupDiRestartDevices() failed with error 0x%lx. Will reboot later.\n", rc); - /* Reenumerate display devices ; this will rescan for potential new devices */ - DisplayDevice.cb = sizeof(DISPLAY_DEVICE); - EnumDisplayDevices(NULL, 0, &DisplayDevice, 0); + /* Mark device as needing a restart */ + InstallParams.cbSize = sizeof(InstallParams); + if (!SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams)) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + InstallParams.Flags |= DI_NEEDRESTART; + result = SetupDiSetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + } rc = ERROR_SUCCESS;

1 0

[reactos] 04/04: [GITHUB] Add MSVC Release builder
by Timo Kreuzer 11 Jul '21

11 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9a22aeffeb195ae02c4e… commit a9a22aeffeb195ae02c4ea9461b19ddf3fa63696 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 10 13:27:55 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 11 21:45:29 2021 +0200 [GITHUB] Add MSVC Release builder --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27f7f3835f9..fbf6e3964f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,6 +78,7 @@ jobs: strategy: matrix: arch: [i386, amd64] + buildtype: [Debug,Release] toolset: ['14.2', '14.1'] # VS 2019, 2017 include: - arch: i386 # Not compiling on amd64 prompt @@ -111,7 +112,7 @@ jobs: with: path: src - name: Configure - run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} - name: Build run: cmake --build build -- -k0 - name: Generate ISOs

1 0

[reactos] 03/04: [CRT] Add some missing #pragma function
by Timo Kreuzer 11 Jul '21

11 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aea4cfba5581354861354… commit aea4cfba5581354861354dcf1abfe86ae5c9dd04 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 10 13:24:42 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 11 21:45:29 2021 +0200 [CRT] Add some missing #pragma function --- sdk/lib/crt/math/_hypotf.c | 4 ++++ sdk/lib/crt/math/acosf.c | 4 ++++ sdk/lib/crt/math/asinf.c | 4 ++++ sdk/lib/crt/math/atan2f.c | 4 ++++ sdk/lib/crt/math/atanf.c | 4 ++++ sdk/lib/crt/math/ceilf.c | 4 ++++ sdk/lib/crt/math/cosf.c | 4 +--- sdk/lib/crt/math/coshf.c | 4 ++++ sdk/lib/crt/math/div.c | 4 ++++ sdk/lib/crt/math/expf.c | 4 ++++ sdk/lib/crt/math/floorf.c | 4 ++++ sdk/lib/crt/math/fmodf.c | 4 ++++ sdk/lib/crt/math/hypot.c | 4 ++++ sdk/lib/crt/math/ldiv.c | 4 ++++ sdk/lib/crt/math/log10f.c | 4 ++++ sdk/lib/crt/math/logf.c | 3 --- sdk/lib/crt/math/sinf.c | 4 +--- sdk/lib/crt/math/sinhf.c | 4 ++++ sdk/lib/crt/math/sqrtf.c | 4 ++++ sdk/lib/crt/math/tanf.c | 4 ++++ sdk/lib/crt/math/tanhf.c | 4 ++++ sdk/lib/crt/mem/memchr.c | 2 +- sdk/lib/crt/mem/memmove.c | 4 ++++ 23 files changed, 79 insertions(+), 10 deletions(-) diff --git a/sdk/lib/crt/math/_hypotf.c b/sdk/lib/crt/math/_hypotf.c index 34c0009cab9..bb63daef7c7 100644 --- a/sdk/lib/crt/math/_hypotf.c +++ b/sdk/lib/crt/math/_hypotf.c @@ -1,6 +1,10 @@ #include <math.h> +#if (_MSC_VER >= 1920) +#pragma function(_hypotf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/acosf.c b/sdk/lib/crt/math/acosf.c index 6df35b77f81..1d50952d7ba 100644 --- a/sdk/lib/crt/math/acosf.c +++ b/sdk/lib/crt/math/acosf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(acosf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/asinf.c b/sdk/lib/crt/math/asinf.c index 278ce4dcbd3..d2b8a90d1fb 100644 --- a/sdk/lib/crt/math/asinf.c +++ b/sdk/lib/crt/math/asinf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(asinf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/atan2f.c b/sdk/lib/crt/math/atan2f.c index c16a281679a..a63e44af539 100644 --- a/sdk/lib/crt/math/atan2f.c +++ b/sdk/lib/crt/math/atan2f.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(atan2f) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/atanf.c b/sdk/lib/crt/math/atanf.c index 16cd3a66e10..27851171c22 100644 --- a/sdk/lib/crt/math/atanf.c +++ b/sdk/lib/crt/math/atanf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(atanf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/ceilf.c b/sdk/lib/crt/math/ceilf.c index e27333a09ef..95621af24cf 100644 --- a/sdk/lib/crt/math/ceilf.c +++ b/sdk/lib/crt/math/ceilf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(ceilf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/cosf.c b/sdk/lib/crt/math/cosf.c index d00e6ef3aae..815b4780974 100644 --- a/sdk/lib/crt/math/cosf.c +++ b/sdk/lib/crt/math/cosf.c @@ -3,12 +3,10 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#define cosf _dummy_cosf + #include <math.h> -#undef cosf #if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64)) -#pragma warning(suppress:4164) /* intrinsic not declared */ #pragma function(cosf) #endif /* _MSC_VER */ diff --git a/sdk/lib/crt/math/coshf.c b/sdk/lib/crt/math/coshf.c index f4c2e1f0299..381700e070d 100644 --- a/sdk/lib/crt/math/coshf.c +++ b/sdk/lib/crt/math/coshf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(coshf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/div.c b/sdk/lib/crt/math/div.c index 041a80e6dcc..7b9c73200f7 100644 --- a/sdk/lib/crt/math/div.c +++ b/sdk/lib/crt/math/div.c @@ -1,6 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> +#if (_MSC_VER >= 1920) +#pragma function(div) +#endif + /* * @implemented */ diff --git a/sdk/lib/crt/math/expf.c b/sdk/lib/crt/math/expf.c index 850bd7ad201..bfd021ec9f2 100644 --- a/sdk/lib/crt/math/expf.c +++ b/sdk/lib/crt/math/expf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(expf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/floorf.c b/sdk/lib/crt/math/floorf.c index 10ad8709b51..4c7b63cd4c4 100644 --- a/sdk/lib/crt/math/floorf.c +++ b/sdk/lib/crt/math/floorf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(floorf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/fmodf.c b/sdk/lib/crt/math/fmodf.c index 0050e02c54c..8a2d898832f 100644 --- a/sdk/lib/crt/math/fmodf.c +++ b/sdk/lib/crt/math/fmodf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(fmodf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/hypot.c b/sdk/lib/crt/math/hypot.c index 7004d8a5645..8f689c07bd6 100644 --- a/sdk/lib/crt/math/hypot.c +++ b/sdk/lib/crt/math/hypot.c @@ -17,6 +17,10 @@ */ #include <precomp.h> +#if (_MSC_VER >= 1920) +#pragma function(_hypot) +#endif + /* Approximate square roots of DBL_MAX and DBL_MIN. Numbers between these two shouldn't neither overflow nor underflow when squared. */ diff --git a/sdk/lib/crt/math/ldiv.c b/sdk/lib/crt/math/ldiv.c index d6afed53be4..1186c253c68 100644 --- a/sdk/lib/crt/math/ldiv.c +++ b/sdk/lib/crt/math/ldiv.c @@ -1,6 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> +#if (_MSC_VER >= 1920) +#pragma function(ldiv) +#endif + /* * @implemented */ diff --git a/sdk/lib/crt/math/log10f.c b/sdk/lib/crt/math/log10f.c index 42a62764a24..b7fa2e5c0ff 100644 --- a/sdk/lib/crt/math/log10f.c +++ b/sdk/lib/crt/math/log10f.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(log10f) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/logf.c b/sdk/lib/crt/math/logf.c index c87e9c06bd0..73184b3dee6 100644 --- a/sdk/lib/crt/math/logf.c +++ b/sdk/lib/crt/math/logf.c @@ -3,12 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#define logf _dummy_logf #include <math.h> -#undef logf #if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64)) -#pragma warning(suppress:4164) /* intrinsic not declared */ #pragma function(logf) #endif /* _MSC_VER */ diff --git a/sdk/lib/crt/math/sinf.c b/sdk/lib/crt/math/sinf.c index 2183fc7940e..3516e98f4af 100644 --- a/sdk/lib/crt/math/sinf.c +++ b/sdk/lib/crt/math/sinf.c @@ -3,12 +3,10 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#define sinf _dummy_sinf + #include <math.h> -#undef sinf #if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64)) -#pragma warning(suppress:4164) /* intrinsic not declared */ #pragma function(sinf) #endif /* _MSC_VER */ diff --git a/sdk/lib/crt/math/sinhf.c b/sdk/lib/crt/math/sinhf.c index f26fa6319e2..93743dc818d 100644 --- a/sdk/lib/crt/math/sinhf.c +++ b/sdk/lib/crt/math/sinhf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(sinhf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/sqrtf.c b/sdk/lib/crt/math/sqrtf.c index 922cbf2f744..9954cd60fe4 100644 --- a/sdk/lib/crt/math/sqrtf.c +++ b/sdk/lib/crt/math/sqrtf.c @@ -5,6 +5,10 @@ */ #include <math.h> +#ifdef _MSC_VER +#pragma function(sqrtf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/tanf.c b/sdk/lib/crt/math/tanf.c index 200a17fcb2d..0dabf74671d 100644 --- a/sdk/lib/crt/math/tanf.c +++ b/sdk/lib/crt/math/tanf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(tanf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/math/tanhf.c b/sdk/lib/crt/math/tanhf.c index c48b195c9d9..d179d25c095 100644 --- a/sdk/lib/crt/math/tanhf.c +++ b/sdk/lib/crt/math/tanhf.c @@ -1,6 +1,10 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(tanhf) +#endif + _Check_return_ float __cdecl diff --git a/sdk/lib/crt/mem/memchr.c b/sdk/lib/crt/mem/memchr.c index 9d0a1386760..11682251567 100644 --- a/sdk/lib/crt/mem/memchr.c +++ b/sdk/lib/crt/mem/memchr.c @@ -1,7 +1,7 @@ #include <string.h> -#if defined(_MSC_VER) && defined(_M_ARM) +#if defined(_MSC_VER) #pragma function(memchr) #endif /* _MSC_VER */ diff --git a/sdk/lib/crt/mem/memmove.c b/sdk/lib/crt/mem/memmove.c index d9536db9073..6d0dd8bf4d2 100644 --- a/sdk/lib/crt/mem/memmove.c +++ b/sdk/lib/crt/mem/memmove.c @@ -1,5 +1,9 @@ #include <string.h> +#if defined(_MSC_VER) +#pragma function(memmove) +#endif /* _MSC_VER */ + /* NOTE: This code is duplicated in memcpy function */ void * __cdecl memmove(void *dest,const void *src,size_t count) {

1 0

[reactos] 02/04: [CRT] Fix handling of intrinsics and inline functions
by Timo Kreuzer 11 Jul '21

11 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db4178795143f07b8f894… commit db4178795143f07b8f894e70f368f2ac99324c0e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 10 13:07:18 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 11 21:45:29 2021 +0200 [CRT] Fix handling of intrinsics and inline functions --- sdk/include/crt/math.h | 85 ++++++++++++++++++++++++++++++------------------ sdk/include/crt/stdlib.h | 4 +++ 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/sdk/include/crt/math.h b/sdk/include/crt/math.h index f565491ad6a..d4d2de29ee4 100644 --- a/sdk/include/crt/math.h +++ b/sdk/include/crt/math.h @@ -99,6 +99,15 @@ _Check_return_ _CRT_JIT_INTRINSIC double __cdecl sqrt(_In_ double x); _Check_return_ double __cdecl tan(_In_ double x); _Check_return_ double __cdecl tanh(_In_ double x); +#ifdef _MSC_VER +/* Prevent the compiler from generating calls to _CIatan2 */ +#pragma function(atan2) +#ifdef _M_AMD64 +/* Prevent the compiler from generating calls to __vdecl_xxx */ +#pragma function(cos,pow,sin,tan) +#endif +#endif + #ifndef _CRT_MATHERR_DEFINED #define _CRT_MATHERR_DEFINED int __CRTDECL _matherr(_Inout_ struct _exception *exception); @@ -139,6 +148,10 @@ _Check_return_ _CRTIMP int __cdecl _set_SSE2_enable(_In_ int flag); _Check_return_ _CRTIMP float __cdecl _nextafterf(_In_ float x, _In_ float y); _Check_return_ _CRTIMP int __cdecl _isnanf(_In_ float x); _Check_return_ _CRTIMP int __cdecl _fpclassf(_In_ float x); +#ifdef _MSC_VER +/* Prevent the compiler from generating calls to __vdecl_floor2 */ +#pragma function(floor) +#endif #endif #if defined(__x86_64) || defined(_M_AMD64) || \ @@ -164,39 +177,40 @@ _Check_return_ _CRT_JIT_INTRINSIC _CRTIMP float __cdecl fabsf(_In_ float x); _Check_return_ __CRT_INLINE float __CRTDECL fabsf(_In_ float x) { return ((float)fabs((double)x)); } #endif /* _M_IA64 || _M_ARM || _M_ARM64 */ -#if defined(_CRTBLD) || \ - defined(__x86_64) || defined(_M_AMD64) || \ - defined(__ia64__) || defined(_M_IA64) || \ - defined(__arm__) || defined(_M_ARM) || \ - defined(__arm64__) || defined(_M_ARM64) -_Check_return_ _CRTIMP float __cdecl _chgsignf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl _copysignf(_In_ float x, _In_ float y); -_Check_return_ _CRTIMP float __cdecl _hypotf(_In_ float x, _In_ float y); -_Check_return_ _CRTIMP float __cdecl acosf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl asinf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl atanf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl atan2f(_In_ float x, _In_ float y); -_Check_return_ _CRTIMP float __cdecl ceilf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl cosf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl coshf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl expf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl floorf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl fmodf(_In_ float x, _In_ float y); -_Check_return_ _CRTIMP float __cdecl logf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl log10f(_In_ float x); -_Check_return_ _CRTIMP float __cdecl modff(_In_ float x, _Out_ float *y); -_Check_return_ _CRTIMP float __cdecl powf(_In_ float b, _In_ float e); -_Check_return_ _CRTIMP float __cdecl sinf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl sinhf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl sqrtf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl tanf(_In_ float x); -_Check_return_ _CRTIMP float __cdecl tanhf(_In_ float x); -#else -#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_ARM)) +_Check_return_ float __cdecl _chgsignf(_In_ float x); +_Check_return_ float __cdecl _copysignf(_In_ float x, _In_ float y); +_Check_return_ float __cdecl _hypotf(_In_ float x, _In_ float y); +_Check_return_ float __cdecl acosf(_In_ float x); +_Check_return_ float __cdecl asinf(_In_ float x); +_Check_return_ float __cdecl atanf(_In_ float x); +_Check_return_ float __cdecl atan2f(_In_ float x, _In_ float y); +_Check_return_ float __cdecl ceilf(_In_ float x); +_Check_return_ float __cdecl cosf(_In_ float x); +_Check_return_ float __cdecl coshf(_In_ float x); +_Check_return_ float __cdecl expf(_In_ float x); +_Check_return_ float __cdecl floorf(_In_ float x); +_Check_return_ float __cdecl fmodf(_In_ float x, _In_ float y); +_Check_return_ float __cdecl logf(_In_ float x); +_Check_return_ float __cdecl log10f(_In_ float x); +_Check_return_ float __cdecl modff(_In_ float x, _Out_ float *y); +_Check_return_ float __cdecl powf(_In_ float b, _In_ float e); +_Check_return_ float __cdecl sinf(_In_ float x); +_Check_return_ float __cdecl sinhf(_In_ float x); +_Check_return_ float __cdecl sqrtf(_In_ float x); +_Check_return_ float __cdecl tanf(_In_ float x); +_Check_return_ float __cdecl tanhf(_In_ float x); + +#if defined(_MSC_VER) /* Make sure intrinsics don't get in our way */ -#pragma warning(suppress:4164) /* intrinsic not declared */ -#pragma function(acosf,asinf,atanf,atan2f,ceilf,cosf,coshf,expf,floorf,fmodf,logf,log10f,log10f,powf,sinf,sinhf,sqrtf,tanf,tanhf) +#if defined(_M_AMD64) || defined(_M_ARM) +#pragma function(acosf,asinf,atanf,atan2f,ceilf,cosf,coshf,expf,floorf,fmodf,logf,log10f,powf,sinf,sinhf,sqrtf,tanf,tanhf) +#endif /* defined(_M_AMD64) || defined(_M_ARM) */ +#if (_MSC_VER >= 1920) +#pragma function(_hypotf) +#endif #endif /* _MSC_VER */ + +#if !defined(_CRTBLD) _Check_return_ __CRT_INLINE float _chgsignf(_In_ float x) { return (float)_chgsign((double)x); } _Check_return_ __CRT_INLINE float _copysignf(_In_ float x, _In_ float y) { return (float)_copysign((double)x, (double)y); } _Check_return_ __CRT_INLINE float _hypotf(_In_ float x, _In_ float y) { return (float)_hypot((double)x, (double)y); } @@ -219,7 +233,8 @@ _Check_return_ __CRT_INLINE float sinhf(_In_ float x) { return (float)sinh((doub _Check_return_ __CRT_INLINE float sqrtf(_In_ float x) { return (float)sqrt((double)x); } _Check_return_ __CRT_INLINE float tanf(_In_ float x) { return (float)tan((double)x); } _Check_return_ __CRT_INLINE float tanhf(_In_ float x) { return (float)tanh((double)x); } -#endif +#endif /* !defined(_CRTBLD) */ + _Check_return_ __CRT_INLINE double hypot(_In_ double x, _In_ double y) { return _hypot(x, y); } _Check_return_ __CRT_INLINE float hypotf(_In_ float x, _In_ float y) { return _hypotf(x, y); } _Check_return_ __CRT_INLINE float frexpf(_In_ float x, _Out_ int *y) { return ((float)frexp((double)x,y)); } @@ -252,6 +267,12 @@ _Check_return_ __CRT_INLINE long double ldexpl(_In_ long double x, _In_ int y) { _Check_return_ __CRT_INLINE long double modfl(_In_ long double x, _Out_ long double *y) { return (long double)modf((double)x, (double *)y); } /* Support for some functions, not exported in MSVCRT */ +#if (_MSC_VER >= 1929) +_Check_return_ long lrint(_In_ double x); +_Check_return_ long lrintf(_In_ float x); +_Check_return_ long lrintl(_In_ long double x); +#pragma function(lrint, lrintf, lrintl) +#endif _Check_return_ __CRT_INLINE double round(_In_ double x) { return (x < 0) ? ceil(x - 0.5f) : floor(x + 0.5); } _Check_return_ __CRT_INLINE float roundf(_In_ float x) { return (x < 0) ? ceilf(x - 0.5f) : floorf(x + 0.5); } _Check_return_ __CRT_INLINE long double roundl(_In_ long double x) { return (x < 0) ? ceill(x - 0.5f) : floorl(x + 0.5); } diff --git a/sdk/include/crt/stdlib.h b/sdk/include/crt/stdlib.h index 2d0af78e3a3..298b7ffad54 100644 --- a/sdk/include/crt/stdlib.h +++ b/sdk/include/crt/stdlib.h @@ -1440,6 +1440,10 @@ extern "C" { __MINGW_EXTENSION _Check_return_ lldiv_t __cdecl lldiv(_In_ long long, _In_ long long); +#if defined(_MSC_VER) + _Check_return_ long long __cdecl llabs(_In_ long long _j); + #pragma function(llabs) +#endif __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(_In_ long long _j) { return (_j >= 0 ? _j : -_j); } __MINGW_EXTENSION long long __cdecl strtoll(const char* __restrict__, char** __restrict, int);

1 0

[reactos] 01/04: [CMAKE] Don't turn C4101 (unreferenced local variable) into an error on release builds
by Timo Kreuzer 11 Jul '21

11 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4de12e9f4c388a977b71… commit f4de12e9f4c388a977b716e8298a2e5f1dc64433 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 10 12:45:04 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 11 21:45:29 2021 +0200 [CMAKE] Don't turn C4101 (unreferenced local variable) into an error on release builds --- sdk/cmake/msvc.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index b647f839d85..e6b533a5bb4 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -97,7 +97,6 @@ add_compile_options(/wd4018) # - TODO: C4090: different 'modifier' qualifiers (for C programs only; # for C++ programs, the compiler error C2440 is issued) # - C4098: void function returning a value -# - C4101: unreferenced local variable # - C4113: parameter lists differ # - C4129: unrecognized escape sequence # - C4133: incompatible types - from '<x> *' to '<y> *' @@ -111,12 +110,13 @@ add_compile_options(/wd4018) # - C4700: uninitialized variable usage # - C4715: 'function': not all control paths return a value # - C4716: function must return a value -add_compile_options(/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4101 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716) +add_compile_options(/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716) +# - C4101: unreferenced local variable # - C4189: local variable initialized but not referenced # Not in Release mode, msbuild generator doesn't like CMAKE_BUILD_TYPE if(MSVC_IDE OR CMAKE_BUILD_TYPE STREQUAL "Debug") - add_compile_options(/we4189) + add_compile_options(/we4101 /we4189) endif() # Enable warnings above the default level, but don't treat them as errors:

1 0

[reactos] 01/01: [NTOS:MM] Fix MiSetSystemCodeProtection
by Timo Kreuzer 11 Jul '21

11 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47372e2ac9d6e6263940b… commit 47372e2ac9d6e6263940b2e37e5c08e5503f8965 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jul 6 13:48:52 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 11 21:43:07 2021 +0200 [NTOS:MM] Fix MiSetSystemCodeProtection CORE-16387 CORE-17638 Windows only makes the header RO for session space mapped drivers (win32k, dx and display drivers) --- ntoskrnl/mm/ARM3/sysldr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index d3d9669ab52..31181b69fc9 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2486,13 +2486,13 @@ MiWriteProtectSystemImage( /* Get the base address of the first section */ SectionBase = Add2Ptr(ImageBase, SectionHeaders[0].VirtualAddress); - /* Start protecting the image header as R/O */ + /* Start protecting the image header as R/W */ FirstPte = MiAddressToPte(ImageBase); LastPte = MiAddressToPte(SectionBase) - 1; - Protection = IMAGE_SCN_MEM_READ; + Protection = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; if (LastPte >= FirstPte) { - MiSetSystemCodeProtection(FirstPte, LastPte, IMAGE_SCN_MEM_READ); + MiSetSystemCodeProtection(FirstPte, LastPte, Protection); } /* Loop the sections */

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