Ros-diffs September 2021

ros-diffs@reactos.org

25 participants
144 discussions

[reactos] 01/01: [IMM32] Use Imm32IsImmMode and Imm32IsCiceroMode macros (#3971)
by Katayama Hirofumi MZ 24 Sep '21

24 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca3fa7197d641e67e50e8… commit ca3fa7197d641e67e50e840b64fbf8cf731a7e45 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 24 22:06:29 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 24 22:06:29 2021 +0900 [IMM32] Use Imm32IsImmMode and Imm32IsCiceroMode macros (#3971) - Define Imm32IsImmMode, Imm32IsCiceroMode and Imm32Is16BitMode macros in "precomp.h". - Improve Imm32InquireIme and Imm32CleanupContext functions. - Add IME_SYSINFO_WINLOGON and IME_SYSINFO_WOW16 macros (from DDK) in psdk/imm.h. - Modify CtfImeInquireExW and CtfImeSelectEx prototype. CORE-11700 --- dll/win32/imm32/ime.c | 82 +++++++++++++++++----------------------------- dll/win32/imm32/imm.c | 22 ++++++------- dll/win32/imm32/precomp.h | 5 ++- sdk/include/psdk/imm.h | 4 +++ win32ss/include/imetable.h | 4 +-- 5 files changed, 50 insertions(+), 67 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index b06afb628da..1fd912b1a86 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -46,23 +46,26 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) { WCHAR szUIClass[64]; WNDCLASSW wcW; - DWORD dwSysInfoFlags = 0; // TODO: ??? + DWORD dwSysInfoFlags = 0; LPIMEINFO pImeInfo = &pImeDpi->ImeInfo; - // TODO: NtUserGetThreadState(16); + if (NtUserGetThreadState(16)) + dwSysInfoFlags |= IME_SYSINFO_WINLOGON; - if (!IS_IME_HKL(pImeDpi->hKL)) + if (IS_IME_HKL(pImeDpi->hKL)) { - if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED) && - pImeDpi->CtfImeInquireExW) - { - // TODO: + if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) return FALSE; - } } - - if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) + else if (Imm32IsCiceroMode() && pImeDpi->CtfImeInquireExW) + { + if (!pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL)) + return FALSE; + } + else + { return FALSE; + } szUIClass[_countof(szUIClass) - 1] = 0; @@ -257,18 +260,10 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL) { - PW32CLIENTINFO pInfo; PIMEDPI pImeDpi; - if (!IS_IME_HKL(hKL)) - { - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) - return NULL; - - pInfo = (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo); - if ((pInfo->W32ClientInfo[0] & 2)) - return NULL; - } + if (!IS_IME_HKL(hKL) && (!Imm32IsCiceroMode() || Imm32Is16BitMode())) + return NULL; pImeDpi = ImmLockImeDpi(hKL); if (pImeDpi == NULL) @@ -282,11 +277,9 @@ ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL) if (IS_IME_HKL(hKL)) return pImeDpi->ImeEscape(hIMC, uSubFunc, lpData); - if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) - { - if (pImeDpi->CtfImeEscapeEx) - return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL); - } + if (Imm32IsCiceroMode() && pImeDpi->CtfImeEscapeEx) + return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL); + return 0; } @@ -305,7 +298,7 @@ BOOL WINAPI ImmIsIME(HKL hKL) */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) + if (!Imm32IsImmMode()) return NULL; // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. @@ -367,7 +360,6 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch { BOOL bDisabled = FALSE; HKL hKL; - PTEB pTeb; switch (SearchType) { @@ -390,10 +382,9 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch if (!IS_IME_HKL(hKL)) { - if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + if (Imm32IsCiceroMode()) { - pTeb = NtCurrentTeb(); - if (((PW32CLIENTINFO)pTeb->Win32ClientInfo)->W32ClientInfo[0] & 2) + if (Imm32Is16BitMode()) return FALSE; if (!bDisabled) goto Quit; @@ -487,18 +478,10 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi) */ BOOL WINAPI ImmLoadIME(HKL hKL) { - PW32CLIENTINFO pInfo; PIMEDPI pImeDpi; - if (!IS_IME_HKL(hKL)) - { - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) - return FALSE; - - pInfo = (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo); - if ((pInfo->W32ClientInfo[0] & 2)) - return FALSE; - } + if (!IS_IME_HKL(hKL) && (!Imm32IsCiceroMode() || Imm32Is16BitMode())) + return FALSE; pImeDpi = Imm32FindImeDpi(hKL); if (pImeDpi == NULL) @@ -1319,20 +1302,14 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSent HKL hKL; LPINPUTCONTEXT pIC; DWORD dwOldConversion, dwOldSentence; - BOOL fConversionChange = FALSE, fSentenceChange = FALSE; + BOOL fConversionChange = FALSE, fSentenceChange = FALSE, fUseCicero = FALSE; HWND hWnd; TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence); hKL = GetKeyboardLayout(0); - if (!IS_IME_HKL(hKL)) - { - if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) - { - FIXME("Cicero\n"); - return FALSE; - } - } + if (!IS_IME_HKL(hKL) && Imm32IsCiceroMode() && !Imm32Is16BitMode()) + fUseCicero = TRUE; if (Imm32IsCrossThreadAccess(hIMC)) return FALSE; @@ -1358,14 +1335,15 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSent hWnd = pIC->hWnd; ImmUnlockIMC(hIMC); - if (fConversionChange) + if (fConversionChange || fUseCicero) { Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldConversion, IMC_SETCONVERSIONMODE, IMN_SETCONVERSIONMODE, 0); - NtUserNotifyIMEStatus(hWnd, hIMC, fdwConversion); + if (fConversionChange) + NtUserNotifyIMEStatus(hWnd, hIMC, fdwConversion); } - if (fSentenceChange) + if (fSentenceChange || fUseCicero) { Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldSentence, IMC_SETSENTENCEMODE, IMN_SETSENTENCEMODE, 0); diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 0351cdae680..3297fa085e9 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -62,9 +62,7 @@ HKL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) TRACE("(%p, %p)\n", hKL, pImeInfoEx); - if (IS_IME_HKL(hKL) || - !g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED) || - ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->W32ClientInfo[0] & 2) + if (IS_IME_HKL(hKL) || !Imm32IsCiceroMode() || Imm32Is16BitMode()) { UnicodeString.Buffer = szLayout; UnicodeString.MaximumLength = sizeof(szLayout); @@ -266,7 +264,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) TRACE("(%p, %p, 0x%lX)\n", hWnd, hIMC, dwFlags); - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) + if (!Imm32IsImmMode()) return FALSE; if (hIMC && !(dwFlags & IACE_DEFAULT) && Imm32IsCrossThreadAccess(hIMC)) @@ -311,7 +309,7 @@ HIMC WINAPI ImmCreateContext(void) TRACE("()\n"); - if (g_psi == NULL || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) + if (!Imm32IsImmMode()) return NULL; pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); @@ -350,7 +348,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) LPINPUTCONTEXT pIC; PCLIENTIMC pClientImc; - if (g_psi == NULL || !(g_psi->dwSRVIFlags & SRVINFO_IMM32) || hIMC == NULL) + if (!Imm32IsImmMode() || hIMC == NULL) return FALSE; FIXME("We have do something to do here\n"); @@ -385,9 +383,9 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) { pImeDpi->ImeSelect(hIMC, FALSE); } - else if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + else if (Imm32IsCiceroMode() && pImeDpi->CtfImeSelectEx) { - FIXME("We have do something to do here\n"); + pImeDpi->CtfImeSelectEx(hIMC, FALSE, hKL); } ImmUnlockImeDpi(pImeDpi); } @@ -422,7 +420,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) TRACE("(%p)\n", hIMC); - if (g_psi == NULL || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) + if (!Imm32IsImmMode()) return FALSE; if (Imm32IsCrossThreadAccess(hIMC)) @@ -508,7 +506,7 @@ static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags) PCLIENTIMC pClientImc; PWND pWnd; - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) + if (!Imm32IsImmMode()) return NULL; if (!hWnd) @@ -843,7 +841,7 @@ HIMC WINAPI ImmGetContext(HWND hWnd) */ BOOL WINAPI CtfImmIsCiceroEnabled(VOID) { - return (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)); + return Imm32IsCiceroMode(); } /*********************************************************************** @@ -1380,7 +1378,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) break; case DLL_THREAD_DETACH: - if (g_psi == NULL || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) + if (!Imm32IsImmMode()) return TRUE; pTeb = NtCurrentTeb(); diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 2c82e5b3746..b914f8f625a 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -93,7 +93,10 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd) (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess); } -#define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) +#define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) +#define Imm32IsImmMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_IMM32)) +#define Imm32IsCiceroMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) +#define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) DWORD APIENTRY CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen, diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 6232ee115ff..14458e26203 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -237,6 +237,10 @@ typedef struct tagCANDIDATEINFO { #define NI_SETCANDIDATE_PAGESIZE 0x0017 #define NI_IMEMENUSELECTED 0x0018 +/* dwSystemInfoFlags bits */ +#define IME_SYSINFO_WINLOGON 0x0001 +#define IME_SYSINFO_WOW16 0x0002 + BOOL WINAPI ImmUnlockIMC(HIMC); DWORD WINAPI ImmGetIMCLockCount(HIMC); HIMCC WINAPI ImmCreateIMCC(DWORD); diff --git a/win32ss/include/imetable.h b/win32ss/include/imetable.h index d9d0929757d..09580a4ac95 100644 --- a/win32ss/include/imetable.h +++ b/win32ss/include/imetable.h @@ -15,8 +15,8 @@ DEFINE_IME_ENTRY(UINT, ImeToAsciiEx, (UINT uVirKey, UINT uScanCode, CONST LPBYTE DEFINE_IME_ENTRY(BOOL, NotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSetCompositionString, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), FALSE) DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize), FALSE) -DEFINE_IME_ENTRY(DWORD, CtfImeInquireExW, (VOID /* FIXME: unknown */), TRUE) -DEFINE_IME_ENTRY(DWORD, CtfImeSelectEx, (VOID /* FIXME: unknown */), TRUE) +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)

1 0

[reactos] 01/01: [REACTOS] Remove PowerPC Open Firmware-related code
by Victor Perevertkin 24 Sep '21

24 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e372f2b19b6325ce2eaef… commit e372f2b19b6325ce2eaefb750ff375cfbc4fdaba Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Sep 24 04:13:08 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Sep 24 04:13:08 2021 +0300 [REACTOS] Remove PowerPC Open Firmware-related code Was forgotten during the overall PowerPC support removal. Addendum to 6ef6fabfc5271b9fb89cd9bdc2038588d55b3ea4 --- boot/freeldr/bootsect/ofwboot.s | 1245 ----------------------------- sdk/tools/ofw_interface/calls.ofw | 16 - sdk/tools/ofw_interface/ofw_interface.cpp | 316 -------- 3 files changed, 1577 deletions(-) diff --git a/boot/freeldr/bootsect/ofwboot.s b/boot/freeldr/bootsect/ofwboot.s deleted file mode 100644 index 312c1243e5b..00000000000 --- a/boot/freeldr/bootsect/ofwboot.s +++ /dev/null @@ -1,1245 +0,0 @@ - .section .text - .globl setup_bats - -_start: - .long 0xe00000 + 12 - .long 0 - .long 0 - -_begin: - sync - isync - - lis %r1,stack@ha - addi %r1,%r1,stack@l - addi %r1,%r1,16384 - 0x10 - - mfmsr %r8 - li %r0,0 - mtmsr %r0 - isync - - bl setup_bats - - li %r8,0x3030 - mtmsr %r8 - - /* Store ofw call addr */ - mr %r21,%r5 - lis %r10,0xe00000@ha - stw %r5,ofw_call_addr - _start@l(%r10) - - lis %r4,_binary_freeldr_tmp_end@ha - addi %r4,%r4,_binary_freeldr_tmp_end@l - lis %r3,_binary_freeldr_tmp_start@ha - addi %r3,%r3,_binary_freeldr_tmp_start@l - - lis %r5,0x8000@ha - addi %r5,%r5,0x8000@l - - bl copy_bits - - bl zero_registers - - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_banner - _start - - bl ofw_print_string - - bl ofw_print_eol - - bl setup_exc - - /* Zero CTR */ - mtcr %r31 - - lis %r3,0x8000@ha - addi %r3,%r3,0x8000@l - - mtlr %r3 - - lis %r3,call_ofw@ha - addi %r3,%r3,call_ofw - _start - - b call_freeldr - -/* - * lifted from ppc/boot/openfirmware/misc.S - * Copyright (C) Paul Mackerras 1997. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation ; either version - * 2 of the License, or (at your option) any later version. - */ - -/* - * Use the BAT2 & 3 registers to map the 1st 16MB of RAM to - * the address given as the 1st argument. - */ -setup_bats: - mfpvr 5 - rlwinm 5,5,16,16,31 /* r3 = 1 for 601, 4 for 604 */ - cmpwi 0,5,1 - li 0,0 - bne 4f - mtibatl 3,0 /* invalidate BAT first */ - ori 3,3,4 /* set up BAT registers for 601 */ - li 4,0x7f - mtibatu 2,3 - mtibatl 2,4 - oris 3,3,0x80 - oris 4,4,0x80 - mtibatu 3,3 - mtibatl 3,4 - b 5f -4: mtdbatu 3,0 /* invalidate BATs first */ - mtibatu 3,0 - ori 3,3,0xff /* set up BAT registers for 604 */ - li 4,2 - mtdbatl 2,4 - mtdbatu 2,3 - mtibatl 2,4 - mtibatu 2,3 - oris 3,3,0x80 - oris 4,4,0x80 - mtdbatl 3,4 - mtdbatu 3,3 - mtibatl 3,4 - mtibatu 3,3 -5: sync - isync - blr - - .align 4 -call_freeldr: - /* Get the address of the functions list -- - * Note: - * Because of little endian switch we must use an even number of - * instructions here.. Pad with a nop if needed. */ - mfmsr %r10 - ori %r10,%r10,1 - mtmsr %r10 - - nop - - /* Note that this is little-endian from here on */ - blr - nop - - .align 4 -call_ofw: - /* R3 has the function offset to call (n * 4) - * Other arg registers are unchanged. - * Note that these 4 instructions are in reverse order due to - * little-endian convention */ - andi. %r0,%r0,65534 - mfmsr %r0 - mtmsr %r0 - /* Now normal ordering resumes */ - subi %r1,%r1,0x100 - - stw %r8,4(%r1) - stw %r9,8(%r1) - stw %r10,12(%r1) - mflr %r8 - stw %r8,16(%r1) - - lis %r10,0xe00000@ha - add %r9,%r3,%r10 - lwz %r3,ofw_functions - _start@l(%r9) - mtctr %r3 - - mr %r3,%r4 - mr %r4,%r5 - mr %r5,%r6 - mr %r6,%r7 - mr %r7,%r8 - - /* Goto the swapped function */ - bctrl - - lwz %r8,16(%r1) - mtlr %r8 - - lwz %r8,4(%r1) - lwz %r9,8(%r1) - lwz %r10,12(%r1) - - addi %r1,%r1,0x100 - /* Ok, go back to little endian */ - mfmsr %r0 - ori %r0,%r0,1 - mtmsr %r0 - - /* Note that this is little-endian from here on */ - blr - nop - -zero_registers: - xor %r2,%r2,%r2 - mr %r0,%r2 - mr %r3,%r2 - - mr %r4,%r2 - mr %r5,%r2 - mr %r6,%r2 - mr %r7,%r2 - - mr %r8,%r2 - mr %r9,%r2 - mr %r10,%r2 - mr %r11,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r16,%r2 - mr %r17,%r2 - mr %r18,%r2 - mr %r19,%r2 - - mr %r20,%r2 - mr %r21,%r2 - mr %r22,%r2 - mr %r23,%r2 - - mr %r24,%r2 - mr %r25,%r2 - mr %r26,%r2 - mr %r27,%r2 - - mr %r28,%r2 - mr %r29,%r2 - mr %r30,%r2 - mr %r31,%r2 - - blr - -prim_strlen: - mr %r5,%r3 -prim_strlen_loop: - lbz %r4,0(%r3) - cmpi 0,0,%r4,0 - beq prim_strlen_done - addi %r3,%r3,1 - b prim_strlen_loop - -prim_strlen_done: - sub %r3,%r3,%r5 - blr - -copy_bits: - cmp 0,0,%r3,%r4 - beqlr - lwz %r6,0(%r3) - stw %r6,0(%r5) - addi %r3,%r3,4 - addi %r5,%r5,4 - b copy_bits - -ofw_print_string_hook: - bl ofw_print_number - bl ofw_exit - -ofw_print_string: - /* Reserve some stack space */ - subi %r1,%r1,32 - - /* Save args */ - stw %r3,0(%r1) - - /* Save the lr, a scratch register */ - stw %r8,8(%r1) - mflr %r8 - stw %r8,12(%r1) - - /* Load the package name */ - lis %r3,0xe00000@ha - addi %r3,%r3,ofw_chosen_name - _start - - /* Fire */ - bl ofw_finddevice - - /* Load up for getprop */ - stw %r3,16(%r1) - - lis %r4,0xe00000@ha - addi %r4,%r4,ofw_stdout_name - _start - - addi %r5,%r1,20 - - li %r6,4 - - bl ofw_getprop - - /* Measure the string and remember the length */ - lwz %r3,0(%r1) - bl prim_strlen - mr %r5,%r3 - - lwz %r3,20(%r1) - lwz %r4,0(%r1) - - /* Write the string */ - bl ofw_write - - /* Return */ - lwz %r8,12(%r1) - mtlr %r8 - lwz %r8,8(%r1) - - addi %r1,%r1,32 - blr - - /* Print 8 hex digits representing a number in r3 */ -ofw_print_number: - subi %r1,%r1,32 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - stw %r9,8(%r1) - - xor %r9,%r9,%r9 - stw %r9,12(%r1) - - /* Set up and, devide, shift */ - mr %r8,%r3 - lis %r6,0xf0000000@ha - lis %r7,0x10000000@ha - li %r9,8 - -ofw_number_loop: - nop - cmpi 0,0,%r9,0 - beq ofw_number_return - subi %r9,%r9,1 - - /* Body: isolate digit, divide, print */ - and %r5,%r6,%r8 - divwu %r4,%r5,%r7 - srwi %r6,%r6,4 - srwi %r7,%r7,4 - - nop - - cmpi 0,0,%r4,10 - bge ofw_number_letter - addi %r4,%r4,'0' - b ofw_number_digit_out - -ofw_number_letter: - addi %r4,%r4,'A' - 10 - -ofw_number_digit_out: - stb %r4,12(%r1) - addi %r3,%r1,12 - - stw %r6,16(%r1) - stw %r7,20(%r1) - stw %r8,24(%r1) - stw %r9,28(%r1) - - bl ofw_print_string - - lwz %r6,16(%r1) - lwz %r7,20(%r1) - lwz %r8,24(%r1) - lwz %r9,28(%r1) - - b ofw_number_loop - -ofw_number_return: - /* Return */ - lwz %r9,8(%r1) - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,32 - blr - -ofw_print_eol: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x0d0a - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_nothing: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_space: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x2000 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_regs: - /* Construct ofw exit call */ - subi %r1,%r1,0xa0 - - stw %r0,0(%r1) - stw %r1,4(%r1) - stw %r2,8(%r1) - stw %r3,12(%r1) - - stw %r4,16(%r1) - stw %r5,20(%r1) - stw %r6,24(%r1) - stw %r7,28(%r1) - - stw %r8,32(%r1) - stw %r9,36(%r1) - stw %r10,40(%r1) - stw %r11,44(%r1) - - stw %r12,48(%r1) - stw %r13,52(%r1) - stw %r14,56(%r1) - stw %r15,60(%r1) - - stw %r16,64(%r1) - stw %r17,68(%r1) - stw %r18,72(%r1) - stw %r19,76(%r1) - - stw %r20,80(%r1) - stw %r21,84(%r1) - stw %r22,88(%r1) - stw %r23,92(%r1) - - stw %r24,96(%r1) - stw %r25,100(%r1) - stw %r26,104(%r1) - stw %r27,108(%r1) - - stw %r28,112(%r1) - stw %r29,116(%r1) - stw %r30,120(%r1) - stw %r31,124(%r1) - - mflr %r0 - stw %r0,128(%r1) - mfcr %r0 - stw %r0,132(%r1) - mfctr %r0 - stw %r0,136(%r1) - mfmsr %r0 - stw %r0,140(%r1) - - /* Count at zero */ - xor %r0,%r0,%r0 - stw %r0,144(%r1) - mr %r3,%r1 - stw %r3,148(%r1) - - /* Body, print the regname, then the register */ -ofw_register_loop: - lwz %r3,144(%r1) - cmpi 0,0,%r3,32 - beq ofw_register_special - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_init - _start - bl ofw_print_string - lwz %r3,144(%r1) - bl ofw_print_number - bl ofw_print_space - lwz %r3,144(%r1) - mulli %r3,%r3,4 - add %r3,%r1,%r3 - lwz %r3,0(%r3) - stw %r3,152(%r1) - bl ofw_print_number - lwz %r3,144(%r1) - addi %r3,%r3,1 - stw %r3,144(%r1) - b done_dump - -dump_optional: - bl ofw_print_space - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,0(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,4(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,8(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,12(%r3) - bl ofw_print_number - bl ofw_print_space -done_dump: - bl ofw_print_eol - b ofw_register_loop - -ofw_register_special: - /* LR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_lr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,128(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_cr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,132(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CTR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_ctr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,136(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* MSR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_msr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,140(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* Return */ - lwz %r0,128(%r1) - mtlr %r0 - - lwz %r0,0(%r1) - lwz %r2,8(%r1) - lwz %r3,12(%r1) - - lwz %r4,16(%r1) - lwz %r5,20(%r1) - lwz %r6,24(%r1) - lwz %r7,28(%r1) - - addi %r1,%r1,0xa0 - - blr - -ofw_finddevice_hook: - subi %r1,%r1,32 - stw %r3,0(%r1) - mflr %r3 - stw %r3,4(%r1) - lwz %r3,0(%r1) - bl ofw_finddevice - stw %r3,0(%r1) - lwz %r3,4(%r1) - mtlr %r3 - lwz %r3,0(%r1) - addi %r1,%r1,32 - blr - -ofw_finddevice: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get finddevice name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_finddevice_name - _start - stw %r9,0(%r1) - - /* 1 Argument and 1 return */ - li %r9,1 - stw %r9,4(%r1) - stw %r9,8(%r1) - - stw %r3,12(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - -ofw_open: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get open name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_open_name - _start - stw %r9,0(%r1) - - /* 1 Argument and 1 return */ - li %r9,1 - stw %r9,4(%r1) - stw %r9,8(%r1) - - stw %r3,12(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - -ofw_getprop_hook: - /* Reserve stack space: - * 32 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - /* Store r8, r9, lr */ - stw %r8,32(%r1) - stw %r9,36(%r1) - mflr %r8 - stw %r8,40(%r1) - - /* Get getprop name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_getprop_name - _start - stw %r9,0(%r1) - - /* 4 Argument and 1 return */ - li %r9,4 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) /* Package */ - stw %r4,16(%r1) /* Property */ - stw %r5,20(%r1) /* Return buffer */ - stw %r6,24(%r1) /* Buffer size */ - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Workaround to a wierd crash ... not sure what causes it. - * XXX investigate me */ - bl ofw_print_nothing - - /* Return */ - lwz %r3,28(%r1) - - /* Restore registers */ - lwz %r8,40(%r1) - mtlr %r8 - lwz %r9,36(%r1) - lwz %r8,32(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_getprop: - /* Reserve stack space: - * 32 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - /* Store r8, r9, lr */ - stw %r8,32(%r1) - stw %r9,36(%r1) - mflr %r8 - stw %r8,40(%r1) - - /* Get getprop name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_getprop_name - _start - stw %r9,0(%r1) - - /* 4 Argument and 1 return */ - li %r9,4 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) /* Package */ - stw %r4,16(%r1) /* Property */ - stw %r5,20(%r1) /* Return buffer */ - stw %r6,24(%r1) /* Buffer size */ - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Return */ - lwz %r3,28(%r1) - - /* Restore registers */ - lwz %r8,40(%r1) - - mtlr %r8 - lwz %r9,36(%r1) - lwz %r8,32(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_write: - /* Reserve stack space: - * 28 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - nop - - /* Store r8, r9, lr */ - stw %r8,28(%r1) - stw %r9,32(%r1) - mflr %r8 - stw %r8,36(%r1) - - /* Get write name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_write_name - _start - stw %r9,0(%r1) - - /* 3 Arguments and 1 return */ - li %r9,3 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) - stw %r4,16(%r1) - stw %r5,20(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Return */ - lwz %r3,24(%r1) - - /* Restore registers */ - lwz %r8,36(%r1) - mtlr %r8 - lwz %r9,32(%r1) - lwz %r8,28(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_read: - /* Reserve stack space: - * 28 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - nop - - /* Store r8, r9, lr */ - stw %r8,28(%r1) - stw %r9,32(%r1) - mflr %r8 - stw %r8,36(%r1) - - /* Get read name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_read_name - _start - stw %r9,0(%r1) - - /* 3 Arguments and 1 return */ - li %r9,3 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) - stw %r4,16(%r1) - stw %r5,20(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Return */ - lwz %r3,24(%r1) - - /* Restore registers */ - lwz %r8,36(%r1) - mtlr %r8 - lwz %r9,32(%r1) - lwz %r8,28(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_exit: - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_halt - _start - - bl ofw_print_string -/* -ofw_exit_loop: - b ofw_exit_loop -*/ - /* Load the exit name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_exit_name - _start - stw %r9,0(%r1) - - /* Zero args, zero returns */ - xor %r9,%r9,%r9 - stw %r9,4(%r1) - stw %r9,8(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - mr %r3,%r1 - - /* Fire */ - blrl - /* No return from exit */ - -ofw_child: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get child name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_child_name - _start - stw %r9,0(%r1) - - /* 1 Argument and 1 return */ - li %r9,1 - stw %r9,4(%r1) - stw %r9,8(%r1) - - stw %r3,12(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - -ofw_peer: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get peer name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_peer_name - _start - stw %r9,0(%r1) - - /* 1 Argument and 1 return */ - li %r9,1 - stw %r9,4(%r1) - stw %r9,8(%r1) - - stw %r3,12(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - -ofw_seek: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get peer name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_seek_name - _start - stw %r9,0(%r1) - - /* 3 Arguments and 1 return */ - li %r9,3 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) - stw %r4,16(%r1) - stw %r5,20(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - - -setup_exc: - subi %r1,%r1,32 - - stw %r3,0(%r1) - mflr %r3 - stw %r3,4(%r1) - stw %r8,8(%r1) - stw %r9,12(%r1) - stw %r10,16(%r1) - stw %r12,20(%r1) - - lis %r8,0xe00000@ha - xor %r12,%r12,%r12 - addi %r12,%r12,0x300 - addi %r9,%r8,dsi_exc - _start - addi %r10,%r8,dsi_end - _start - -copy_loop: - cmp 0,0,%r9,%r10 - beq ret_setup_exc - - mr %r3,%r12 - bl ofw_print_number - bl ofw_print_space - - lwz %r3,0(%r9) - stw %r3,0(%r12) - - bl ofw_print_number - bl ofw_print_eol - - addi %r12,%r12,4 - addi %r9,%r9,4 - b copy_loop - -ret_setup_exc: - mfmsr %r12 - andi. %r12,%r12,0xffbf - mtmsr %r12 - - lwz %r12,20(%r1) - lwz %r10,16(%r1) - lwz %r9,12(%r1) - lwz %r8,8(%r1) - - lwz %r3,4(%r1) - mtlr %r3 - lwz %r3,0(%r1) - - blr - -dsi_exc: - subi %r1,%r1,16 - - stw %r0,0(%r1) - stw %r3,4(%r1) - - mfsrr0 %r3 - addi %r3,%r3,4 - mtsrr0 %r3 - - /* mfsrr1 %r3 */ - /* ori %r3,%r3,2 */ - /* mtsrr1 %r3 */ - - lwz %r3,4(%r1) - lwz %r0,0(%r1) - - addi %r1,%r1,16 - rfi -dsi_end: - - .org 0x1000 -freeldr_banner: - .ascii "ReactOS OpenFirmware Boot Program\r\n\0" - -freeldr_halt: - .ascii "ReactOS OpenFirmware Boot Program Halting\r\n\0" - -freeldr_reg_init: - .ascii "r\0" -freeldr_reg_lr: - .ascii "lr \0" -freeldr_reg_cr: - .ascii "cr \0" -freeldr_reg_ctr: - .ascii "ctr\0" -freeldr_reg_msr: - .ascii "msr\0" - -ofw_call_addr: - .long 0 - -ofw_memory_size: - .long 0 - .long 0 - .long 0 - .long 0 - -ofw_finddevice_name: - .ascii "finddevice\0" - -ofw_getprop_name: - .ascii "getprop\0" - -ofw_write_name: - .ascii "write\0" - -ofw_read_name: - .ascii "read\0" - -ofw_exit_name: - .ascii "exit\0" - -ofw_open_name: - .ascii "open\0" - -ofw_child_name: - .ascii "child\0" - -ofw_peer_name: - .ascii "peer\0" - -ofw_seek_name: - .ascii "seek\0" - -ofw_chosen_name: - .ascii "/chosen\0" - -ofw_stdout_name: - .ascii "stdout\0" - -ofw_memory_name: - .ascii "/memory@0\0" - -ofw_reg_name: - .ascii "reg\0" - -ofw_functions: - .long ofw_finddevice_hook - .long ofw_getprop_hook - .long ofw_write - .long ofw_read - .long ofw_exit - .long ofw_print_regs - .long ofw_print_string - .long ofw_print_number - .long ofw_open - .long ofw_child - .long ofw_peer - .long ofw_seek - - .org 0x2000 -stack: - .space 0x4000 - diff --git a/sdk/tools/ofw_interface/calls.ofw b/sdk/tools/ofw_interface/calls.ofw deleted file mode 100644 index f4c0d5a1e2b..00000000000 --- a/sdk/tools/ofw_interface/calls.ofw +++ /dev/null @@ -1,16 +0,0 @@ -# Function Args Returns Types -# Real OFW functions to proxy -finddevice 1 1 char* int -open 1 1 char* int -getprop 4 1 int char* char*:arg3 int int -nextprop 3 1 int char* char* int -getproplen 2 1 int char* int -write 3 1 int char*:arg2 int int -read 3 1 int char*:arg2 int int -exit 0 0 -child 1 1 int int -peer 1 1 int int -parent 1 1 int int -seek 3 1 int int int int -package-to-path 3 1 int char*:arg2 int int -claim 3 1 int int int int diff --git a/sdk/tools/ofw_interface/ofw_interface.cpp b/sdk/tools/ofw_interface/ofw_interface.cpp deleted file mode 100644 index bb64a427b67..00000000000 --- a/sdk/tools/ofw_interface/ofw_interface.cpp +++ /dev/null @@ -1,316 +0,0 @@ -#include <stdio.h> -#include <iostream> -#include <fstream> -#include <sstream> -#include <string> -#include <vector> - -class ofw_wrappers { -public: - int base, ctindex, method_ctindex; - std::string functions; - std::string names; - std::string calltable; - std::string le_stubs; - std::string of_call; -}; - -class vartype { -public: - vartype( const std::string &typestr ) { - size_t amp = typestr.find('&'); - size_t col = typestr.find(':'); - if( amp != std::string::npos ) { - if( col > amp && col != std::string::npos ) - lit_value = typestr.substr(amp+1,col-amp+1); - else lit_value = typestr.substr(amp+1); - } - if( col != std::string::npos ) { - if( amp > col && amp != std::string::npos ) - len = typestr.substr(col+1,amp-col+1); - else len = typestr.substr(col+1); - } - - if( amp != std::string::npos && amp < col ) col = amp; - if( col == std::string::npos ) col = typestr.size(); - c_type = typestr.substr(0,col); - } - - vartype( const vartype &other ) - : c_type(other.c_type), - len(other.len), - lit_value(other.lit_value) { - } - - vartype &operator = ( const vartype &other ) { - c_type = other.c_type; - len = other.len; - lit_value = other.lit_value; - return *this; - } - - std::string c_type; - std::string len; - std::string lit_value; -}; - -std::string uppercase( const std::string &toucase ) { - std::vector<char> ucase_work(toucase.size()); - for( size_t i = 0; i < toucase.size(); i++ ) { - ucase_work[i] = toupper(toucase[i]); - } - return std::string(&ucase_work[0], toucase.size()); -} - -std::string clip_eol( std::string in, const std::string &eol_marks ) { - size_t found; - for( size_t i = 0; i < eol_marks.size(); i++ ) { - found = in.find( eol_marks[i] ); - if( found != std::string::npos ) - in = in.substr( 0, found ); - } - return in; -} - -int round_up( int x, int factor ) { - return (x + (factor - 1)) & ~(factor - 1); -} - -void populate_definition( ofw_wrappers &wrapper, const std::string &line ) { - std::istringstream iss(line); - bool make_function = true, method_call = false, make_stub = true, comma; - std::string name, nametext, argtype, rettype; - std::vector<vartype> argtypes; - int args, rets, i, local_offset, total_stack, userarg_start = 0; - size_t f; - std::ostringstream function, ct_csource, le_stub, of_call; - - iss >> name >> args >> rets; - - if( !name.size() ) return; - - if( (f = name.find('!')) != std::string::npos ) { - nametext = name.substr(f+1); - name = name.substr(0,f); - } - if( name[0] == '-' ) { - name = name.substr(1); - make_function = false; - } - if( name[0] == '+' ) { - name = name.substr(1); - make_stub = false; - } - if( name[0] == '@' ) { - name = name.substr(1); - method_call = true; - make_function = false; - } - - if( !nametext.size() ) nametext = name; - - for( i = 1; i < (int)name.size(); i++ ) - if( name[i] == '-' ) name[i] = '_'; - - if( nametext == "call-method" ) - wrapper.method_ctindex = wrapper.ctindex; - - for( i = 0; i < args; i++ ) { - iss >> argtype; - argtypes.push_back(vartype(argtype)); - } - - if( method_call ) { - userarg_start = 1; - args += 2; - } - - iss >> rettype; - if( !rettype.size() ) rettype = "void"; - - local_offset = (3 + rets + args) * 4; - total_stack = round_up(12 + local_offset, 16); - - function << "asm_ofw_" << name << ":\n" - << "\t/* Reserve stack space */\n" - << "\tsubi %r1,%r1," << total_stack << "\n" - << "\t/* Store r8, r9, lr */\n" - << "\tstw %r8," << (local_offset + 0) << "(%r1)\n" - << "\tstw %r9," << (local_offset + 4) << "(%r1)\n" - << "\tmflr %r8\n" - << "\tstw %r8," << (local_offset + 8) << "(%r1)\n" - << "\t/* Get read name */\n" - << "\tlis %r8," << name << "_ofw_name@ha\n" - << "\taddi %r9,%r8," << name << "_ofw_name@l\n" - << "\tstw %r9,0(%r1)\n" - << "\t/* " << args << " arguments and " << rets << " return */\n" - << "\tli %r9," << args << "\n" - << "\tstw %r9,4(%r1)\n" - << "\tli %r9," << rets << "\n" - << "\tstw %r9,8(%r1)\n"; - - for( int i = 0; i < args; i++ ) - function << "\tstw %r" << (i+3) << "," << (4 * (i + 3)) << "(%r1)\n"; - - function << "\t/* Load up the call address */\n" - << "\tlis %r10,ofw_call_addr@ha\n" - << "\tlwz %r9,ofw_call_addr@l(%r10)\n" - << "\tmtlr %r9\n" - << "\t/* Set argument */\n" - << "\tmr %r3,%r1\n" - << "\t/* Fire */\n" - << "\tblrl\n" - << "\tlwz %r3," << (local_offset - 4) << "(%r1)\n" - << "\t/* Restore registers */\n" - << "\tlwz %r8," << (local_offset + 8) << "(%r1)\n" - << "\tmtlr %r8\n" - << "\tlwz %r9," << (local_offset + 4) << "(%r1)\n" - << "\tlwz %r8," << (local_offset + 0) << "(%r1)\n" - << "\t/* Return */\n" - << "\taddi %r1,%r1," << total_stack << "\n" - << "\tblr\n"; - - if( method_call ) { - argtypes.insert(argtypes.begin(),vartype("int")); - argtypes.insert(argtypes.begin(),vartype("char*")); - } - - le_stub << rettype << " ofw_" << name << "("; - - comma = false; - for( i = userarg_start; i < args; i++ ) { - if( !argtypes[i].lit_value.size() ) { - if( !comma ) comma = true; else le_stub << ","; - le_stub << argtypes[i].c_type << " arg" << i; - } - } - le_stub << ")"; - of_call << le_stub.str() << ";\n"; - - le_stub << " {\n"; - if( rettype != "void" ) - le_stub << "\t" << rettype << " ret;\n"; - - if( method_call ) { - le_stub << "\tchar arg0[" - << round_up(nametext.size()+1,8) - << "] = \"" << nametext << "\";\n"; - } - - for( i = 0; i < args; i++ ) { - if( argtypes[i].lit_value.size() ) { - le_stub << "\t" << argtypes[i].c_type << " arg" << i << " = " - << argtypes[i].lit_value << ";\n"; - } - } - - le_stub << "\t"; - if( rettype != "void" ) le_stub << "ret = (" << rettype << ")"; - - le_stub << "ofproxy(" << - (method_call ? (wrapper.method_ctindex * 4) : (wrapper.ctindex * 4)); - - for( i = 0; i < 6; i++ ) { - if( i < args ) le_stub << ",(void *)arg" << i; - else le_stub << ",NULL"; - } - - le_stub << ");\n"; - - if( rettype != "void" ) - le_stub << "\treturn ret;\n"; - - le_stub << "}\n"; - - if( make_function ) wrapper.functions += function.str(); - if( make_stub ) { - wrapper.le_stubs += le_stub.str(); - wrapper.of_call += of_call.str(); - } - if( !method_call ) { - wrapper.names += name + "_ofw_name:\n\t.asciz \"" + nametext + "\"\n"; - wrapper.calltable += std::string("\t.long asm_ofw_") + name + "\n"; - wrapper.ctindex++; - } -} - -int main( int argc, char **argv ) { - int status = 0; - std::ifstream in; - std::ofstream out, outcsource, outcheader; - std::string line; - const char *eol_marks = "#\r\n"; - ofw_wrappers wrappers; - - wrappers.base = 0xe00000; - wrappers.ctindex = 0; - - if( argc < 5 ) { - fprintf( stderr, "%s [interface.ofw] [ofw.s] [le_stub.c] [le_stub.h]\n", argv[0] ); - return 1; - } - - in.open( argv[1] ); - if( !in ) { - fprintf( stderr, "can't open %s\n", argv[1] ); - status = 1; - goto error; - } - - out.open( argv[2] ); - if( !out ) { - fprintf( stderr, "can't open %s\n", argv[2] ); - status = 1; - goto error; - } - - outcsource.open( argv[3] ); - if( !outcsource ) { - fprintf( stderr, "can't open %s\n", argv[3] ); - status = 1; - goto error; - } - - outcheader.open( argv[4] ); - if( !outcheader ) { - fprintf( stderr, "can't open %s\n", argv[4] ); - status = 1; - goto error; - } - - while( std::getline( in, line ) ) { - line = clip_eol( line, eol_marks ); - if( line.size() ) populate_definition( wrappers, line ); - } - - out << "/* AUTOMATICALLY GENERATED BY ofw_interface */\n" - << "\t.section .text\n" - << "\t.align 4\n" - << "\t.globl _start\n" - << "\t.globl ofw_functions\n" - << "\t.globl ofw_call_addr\n" - << "ofw_call_addr:\n" - << "\t.long 0\n" - << "\n/* Function Wrappers */\n\n" - << wrappers.functions - << "\n/* Function Names */\n\n" - << wrappers.names - << "\n/* Function Call Table for Freeldr */\n\n" - << "\t.align 4\n" - << "ofw_functions:\n" - << wrappers.calltable - << "\n/* End */\n"; - - outcsource << "/* AUTOMATICALLY GENERATED BY ofw_interface */\n" - << "#include \"of.h\"\n" - << wrappers.le_stubs; - - outcheader << "/* AUTOMATICALLY GENERATE BY ofw_interface */\n" - << "#ifndef _OFW_CALLS_H\n" - << "#define _OFW_CALLS_H\n" - << wrappers.of_call - << "#endif/*_OFW_CALLS_H*/\n"; - -error: - return status; -}

1 0

[reactos] 01/01: [IPHLPAPI] GetAdaptersInfo(): Update Wine registry key name (#3556)
by Serge Gautherie 24 Sep '21

24 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e894bc1c7f5bec0ad858… commit 6e894bc1c7f5bec0ad858074807d7a8b269520a2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Sep 24 02:49:05 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 24 03:49:05 2021 +0300 [IPHLPAPI] GetAdaptersInfo(): Update Wine registry key name (#3556) --- dll/win32/iphlpapi/iphlpapi_main.c | 5 ++--- dll/win32/iphlpapi/merge-notes.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 7e0b0c9cc86..7a4253ff65d 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -808,9 +808,8 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) IP_ADDRESS_STRING primaryWINS, secondaryWINS; memset(pAdapterInfo, 0, size); - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Wine\\Wine\\Config\\Network", 0, KEY_READ, - &hKey) == ERROR_SUCCESS) { + /* @@ Wine registry key: HKCU\Software\Wine\Network */ + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Network", &hKey) == ERROR_SUCCESS) { DWORD size = sizeof(primaryWINS.String); unsigned long addr; diff --git a/dll/win32/iphlpapi/merge-notes.txt b/dll/win32/iphlpapi/merge-notes.txt index 2b0c1bbb78c..b560edebba5 100644 --- a/dll/win32/iphlpapi/merge-notes.txt +++ b/dll/win32/iphlpapi/merge-notes.txt @@ -1,5 +1,5 @@ GetAdaptersInfo -- -Wine uses: Software\\Wine\\Wine\\Config\\Network +Wine uses: HKEY_CURRENT_USER, "Software\\Wine\\Network" -- Wins support is todo so this part isn't so important. -- Overall, workable Wine uses ansi functions

1 0

[reactos] 01/01: [PSDK] wincodec.idl: Add GUIDs which exist on WDK 7.1 (#3628)
by Serge Gautherie 24 Sep '21

24 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acbe74497f85976072708… commit acbe74497f85976072708d62d0005c0a01afe218 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Sep 24 02:24:05 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 24 03:24:05 2021 +0300 [PSDK] wincodec.idl: Add GUIDs which exist on WDK 7.1 (#3628) --- sdk/include/psdk/wincodec.idl | 67 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/sdk/include/psdk/wincodec.idl b/sdk/include/psdk/wincodec.idl index 7dcd22378e0..c35ef755746 100644 --- a/sdk/include/psdk/wincodec.idl +++ b/sdk/include/psdk/wincodec.idl @@ -210,6 +210,8 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x08);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0b);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppAlpha, 0xe6cd0116,0xeeba,0x4161,0xaa,0x85,0x27,0xdd,0x9f,0xb3,0xa8,0x95);") + cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGRA5551, 0x05ec7c2b,0xf1e6,0x4961,0xad,0x46,0xe1,0xcc,0x81,0x0a,0x87,0xd2);") @@ -224,14 +226,74 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPRGBA, 0x3cc4a650,0xa527,0x4d37,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppGrayFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x11);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppBGR, 0xe605a384,0xb468,0x46ce,0xbb,0x2e,0x36,0xf1,0x80,0xe6,0x43,0x13);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppBGRA, 0x1562ff7c,0xd352,0x46f9,0x97,0x9e,0x42,0x97,0x6b,0x79,0x22,0x46);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x17);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPBGRA, 0x8c518e8e,0xa4ec,0x468b,0xae,0x70,0xc9,0xa3,0x5a,0x9c,0x55,0x30);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppGrayFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x13);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR101010, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x14);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGBFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x12);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppBGRFixedPoint, 0x49ca140e,0xcab6,0x493b,0x9d,0xdf,0x60,0x18,0x7c,0x37,0x53,0x2a);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat96bppRGBFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x18);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppRGBAFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x19);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppPRGBAFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1a);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppRGBFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1b);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBAFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1d);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppBGRAFixedPoint, 0x356de33c,0x54d2,0x4a23,0xbb,0x4,0x9b,0x7b,0xf9,0xb1,0xd4,0x2d);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x40);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppRGBAFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1e);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppRGBFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x41);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBAHalf, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x3a);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBHalf, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x42);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGBHalf, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x3b);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGBE, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x3d);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppGrayHalf, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x3e);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppGrayFixedPoint, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x3f);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGBA1010102, 0x25238d72,0xfcf9,0x4522,0xb5,0x14,0x55,0x78,0xe5,0xad,0x55,0xe0);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGBA1010102XR, 0x00de6b9a,0xc101,0x434b,0xb5,0x02,0xd0,0x16,0x5e,0xe1,0x12,0x2c);") + cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1f);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bpp3Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x20);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bpp4Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x21);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat40bpp5Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x22);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bpp6Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x23);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat56bpp7Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x24);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bpp8Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x25);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bpp3Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x26);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bpp4Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x27);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat80bpp5Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x28);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat96bpp6Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x29);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat112bpp7Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x2a);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bpp8Channels, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x2b);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat40bppCMYKAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x2c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat80bppCMYKAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x2d);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bpp3ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x2e);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat40bpp4ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x2f);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bpp5ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x30);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat56bpp6ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x31);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bpp7ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x32);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat72bpp8ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x33);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bpp3ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x34);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat80bpp4ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x35);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat96bpp5ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x36);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat112bpp6ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x37);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bpp7ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x38);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat144bpp8ChannelsAlpha, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x39);") + typedef struct WICRect { INT X; INT Y; @@ -1045,6 +1107,9 @@ cpp_quote("DEFINE_GUID(CLSID_WICTiffEncoder, 0x0131be10,0x2001,0x4c5f,0xa9,0xb0, cpp_quote("DEFINE_GUID(CLSID_WICWmpEncoder, 0xac4ce3cb,0xe1c1,0x44cd,0x82,0x15,0x5a,0x16,0x65,0x50,0x9e,0xc2);") cpp_quote("DEFINE_GUID(CLSID_WICDefaultFormatConverter, 0x1a3f11dc,0xb514,0x4b17,0x8c,0x5f,0x21,0x54,0x51,0x38,0x52,0xf1);") +cpp_quote("DEFINE_GUID(CLSID_WICFormatConverterHighColor, 0xac75d454,0x9f37,0x48f8,0xb9,0x72,0x4e,0x19,0xbc,0x85,0x60,0x11);") +cpp_quote("DEFINE_GUID(CLSID_WICFormatConverterNChannel, 0xc17cabb2,0xd4a3,0x47d7,0xa5,0x57,0x33,0x9b,0x2e,0xfb,0xd4,0xf1);") +cpp_quote("DEFINE_GUID(CLSID_WICFormatConverterWMPhoto, 0x9cb5172b,0xd600,0x46ba,0xab,0x77,0x77,0xbb,0x7e,0x3a,0x00,0xd9);") cpp_quote("DEFINE_GUID(GUID_ContainerFormatBmp, 0x0af1d87e,0xfcfe,0x4188,0xbd,0xeb,0xa7,0x90,0x64,0x71,0xcb,0xe3);") cpp_quote("DEFINE_GUID(GUID_ContainerFormatPng, 0x1b7cfaf4,0x713f,0x473c,0xbb,0xcd,0x61,0x37,0x42,0x5f,0xae,0xaf);") @@ -1055,10 +1120,12 @@ cpp_quote("DEFINE_GUID(GUID_ContainerFormatGif, 0x1f8a5601,0x7d4d,0x4cbd,0x9c,0x cpp_quote("DEFINE_GUID(GUID_ContainerFormatWmp, 0x57a37caa,0x367a,0x4540,0x91,0x6b,0xf1,0x83,0xc5,0x09,0x3a,0x4b);") cpp_quote("DEFINE_GUID(GUID_VendorMicrosoft, 0xf0e749ca,0xedef,0x4589,0xa7,0x3a,0xee,0x0e,0x62,0x6a,0x2a,0x2b);") +cpp_quote("DEFINE_GUID(GUID_VendorMicrosoftBuiltIn, 0x257a30fd,0x6b6,0x462b,0xae,0xa4,0x63,0xf7,0xb,0x86,0xe5,0x33);") cpp_quote("DEFINE_GUID(CLSID_WICImagingCategories, 0xfae3d380,0xfea4,0x4623,0x8c,0x75,0xc6,0xb6,0x11,0x10,0xb6,0x81);") cpp_quote("DEFINE_GUID(CATID_WICBitmapDecoders, 0x7ed96837,0x96f0,0x4812,0xb2,0x11,0xf1,0x3c,0x24,0x11,0x7e,0xd3);") cpp_quote("DEFINE_GUID(CATID_WICBitmapEncoders, 0xac757296,0x3522,0x4e11,0x98,0x62,0xc1,0x7b,0xe5,0xa1,0x76,0x7e);") cpp_quote("DEFINE_GUID(CATID_WICFormatConverters, 0x7835eae8,0xbf14,0x49d1,0x93,0xce,0x53,0x3a,0x40,0x7b,0x22,0x48);") cpp_quote("DEFINE_GUID(CATID_WICMetadataReader, 0x05af94d8,0x7174,0x4cd2,0xbe,0x4a,0x41,0x24,0xb8,0x0e,0xe4,0xb8);") +cpp_quote("DEFINE_GUID(CATID_WICMetadataWriter, 0xabe3b9a4,0x257d,0x4b97,0xbd,0x1a,0x29,0x4a,0xf4,0x96,0x22,0x2e);") cpp_quote("DEFINE_GUID(CATID_WICPixelFormats, 0x2b46e70f,0xcda7,0x473e,0x89,0xf6,0xdc,0x96,0x30,0xa2,0x39,0x0b);")

1 0

[reactos] 02/02: [NTDLL_APITEST] Implement NtAdjustGroupsToken API tests
by George Bișoc 23 Sep '21

23 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32db51fcffb8096fe1ce2… commit 32db51fcffb8096fe1ce2c8cd509f2db1e1d53fa Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Sep 18 17:18:04 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Sep 23 17:38:42 2021 +0200 [NTDLL_APITEST] Implement NtAdjustGroupsToken API tests --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/NtAdjustGroupsToken.c | 77 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 80 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index c90cc46c567..403641119fb 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE load_notifications.c locale.c NtAcceptConnectPort.c + NtAdjustGroupsToken.c NtAdjustPrivilegesToken.c NtAllocateVirtualMemory.c NtApphelpCacheControl.c diff --git a/modules/rostests/apitests/ntdll/NtAdjustGroupsToken.c b/modules/rostests/apitests/ntdll/NtAdjustGroupsToken.c new file mode 100644 index 00000000000..0529243270b --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtAdjustGroupsToken.c @@ -0,0 +1,77 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtAdjustGroupsToken API + * COPYRIGHT: Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +static +HANDLE +GetProcessToken( + _In_ DWORD Access) +{ + BOOL Success; + HANDLE Token; + + Success = OpenProcessToken(GetCurrentProcess(), Access, &Token); + if (!Success) + { + skip("Failed to open the process' token (error code: %lu)!\n", GetLastError()); + return NULL; + } + + return Token; +} + +START_TEST(NtAdjustGroupsToken) +{ + HANDLE TokenHandle; + NTSTATUS Status; + + /* Get the token from current process but with incorrect rights */ + TokenHandle = GetProcessToken(TOKEN_DUPLICATE); + + /* We give an invalid handle */ + Status = NtAdjustGroupsToken(NULL, + TRUE, + NULL, + 0, + NULL, + NULL); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* We're trying to adjust the token's groups with wrong rights */ + Status = NtAdjustGroupsToken(TokenHandle, + TRUE, + NULL, + 0, + NULL, + NULL); + ok_hex(Status, STATUS_ACCESS_DENIED); + + /* Close our handle and open a new one with right access right */ + CloseHandle(TokenHandle); + TokenHandle = GetProcessToken(TOKEN_ADJUST_GROUPS); + + /* We don't give a list of groups to be adjusted in token */ + Status = NtAdjustGroupsToken(TokenHandle, + FALSE, + NULL, + 0, + NULL, + NULL); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + /* Reset the groups of an access token to default */ + Status = NtAdjustGroupsToken(TokenHandle, + TRUE, + NULL, + 0, + NULL, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + CloseHandle(TokenHandle); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 1a921a2f2b1..9642602fd77 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -6,6 +6,7 @@ extern void func_LdrEnumResources(void); extern void func_load_notifications(void); extern void func_NtAcceptConnectPort(void); +extern void func_NtAdjustGroupsToken(void); extern void func_NtAdjustPrivilegesToken(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtApphelpCacheControl(void); @@ -92,6 +93,7 @@ const struct test winetest_testlist[] = { "LdrEnumResources", func_LdrEnumResources }, { "load_notifications", func_load_notifications }, { "NtAcceptConnectPort", func_NtAcceptConnectPort }, + { "NtAdjustGroupsToken", func_NtAdjustGroupsToken }, { "NtAdjustPrivilegesToken", func_NtAdjustPrivilegesToken }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtApphelpCacheControl", func_NtApphelpCacheControl },

1 0

[reactos] 01/02: [NTOS:SE] Implement token groups adjusting
by George Bișoc 23 Sep '21

23 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e6fc7a5f560664c4aa10… commit 8e6fc7a5f560664c4aa102aea9060960c253cafc Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Sep 18 17:14:27 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Sep 23 17:38:31 2021 +0200 [NTOS:SE] Implement token groups adjusting --- ntoskrnl/se/token.c | 485 ++++++++++++++++++++++++++++++++++++++++++++-- sdk/include/ndk/sefuncs.h | 2 +- 2 files changed, 474 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index b8492238c05..9c8492edfcc 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -4273,18 +4273,262 @@ NtDuplicateToken( /** * @brief - * Changes the groups list of SIDs of a token. + * Private routine that iterates over the groups of an + * access token to be adjusted as per on request by the + * caller, where a group can be enabled or disabled. + * + * @param[in] Token + * Access token where its groups are to be enabled or disabled. + * + * @param[in] NewState + * A list of groups with new state attributes to be assigned to + * the token. + * + * @param[in] NewStateCount + * The captured count number of groups in the list. + * + * @param[in] ApplyChanges + * If set to FALSE, the function will only iterate over the token's + * groups without performing any kind of modification. If set to TRUE, + * the changes will be applied immediately when the function has done + * looping the groups. + * + * @param[in] ResetToDefaultStates + * The function will reset the groups in an access token to default + * states if set to TRUE. In such scenario the function ignores + * NewState outright. Otherwise if set to FALSE, the function will + * use NewState to assign the newly attributes to adjust the token's + * groups. SE_GROUP_ENABLED_BY_DEFAULT is a flag indicator that is used + * for such purpose. + * + * @param[out] ChangesMade + * Returns TRUE if changes to token's groups have been made, otherwise + * FALSE is returned. Bear in mind such changes aren't always deterministic. + * See remarks for further details. + * + * @param[out] PreviousGroupsState + * If requested by the caller, the function will return the previous state + * of groups in an access token prior taking action on adjusting the token. + * This is a UM (user mode) pointer and it's prone to raise exceptions + * if such pointer address is not valid. + * + * @param[out] ChangedGroups + * Returns the total number of changed groups in an access token. This + * argument could also indicate the number of groups to be changed if + * the calling thread hasn't chosen to apply the changes yet. A number + * of 0 indicates no groups have been or to be changed because the groups' + * attributes in a token are the same as the ones from NewState given by + * the caller. + * + * @return + * STATUS_SUCCESS is returned if the function has successfully completed + * the operation of adjusting groups in a token. STATUS_CANT_DISABLE_MANDATORY + * is returned if there was an attempt to disable a mandatory group which is + * not possible. STATUS_CANT_ENABLE_DENY_ONLY is returned if there was an attempt + * to enable a "use for Deny only" group which is not allowed, that is, a restricted + * group. STATUS_NOT_ALL_ASSIGNED is returned if not all the groups are actually + * assigned to the token. + * + * @remarks + * Token groups adjusting can be judged to be deterministic or not based on the + * NT status code value. That is, STATUS_SUCCESS indicates the function not only + * has iterated over the whole groups in a token, it also has applied the changes + * thoroughly without impediment and the results perfectly match with the request + * desired by the caller. In this situation the condition is deemed deterministic. + * In a different situation however, if the status code was STATUS_NOT_ALL_ASSIGNED, + * the function would still continue looping the groups in a token and apply the + * changes whenever possible where the respective groups actually exist in the + * token. This kind of situation is deemed as indeterministic. + * For STATUS_CANT_DISABLE_MANDATORY and STATUS_CANT_ENABLE_DENY_ONLY the scenario + * is even more indeterministic as the iteration of groups comes to a halt thus + * leaving all other possible groups to be adjusted. + */ +static +NTSTATUS +SepAdjustGroups( + _In_ PTOKEN Token, + _In_opt_ PSID_AND_ATTRIBUTES NewState, + _In_ ULONG NewStateCount, + _In_ BOOLEAN ApplyChanges, + _In_ BOOLEAN ResetToDefaultStates, + _Out_ PBOOLEAN ChangesMade, + _Out_opt_ PTOKEN_GROUPS PreviousGroupsState, + _Out_ PULONG ChangedGroups) +{ + ULONG GroupsInToken, GroupsInList; + ULONG ChangeCount, GroupsCount, NewAttributes; + + PAGED_CODE(); + + /* Ensure that the token we get is not plain garbage */ + ASSERT(Token); + + /* Initialize the counters and begin the work */ + *ChangesMade = FALSE; + GroupsCount = 0; + ChangeCount = 0; + + /* Begin looping all the groups in the token */ + for (GroupsInToken = 0; GroupsInToken < Token->UserAndGroupCount; GroupsInToken++) + { + /* Does the caller want to reset groups to default states? */ + if (ResetToDefaultStates) + { + /* + * SE_GROUP_ENABLED_BY_DEFAULT is a special indicator that informs us + * if a certain group has been enabled by default or not. In case + * a group is enabled by default but it is not currently enabled then + * at that point we must enable it back by default. For now just + * assign the respective SE_GROUP_ENABLED attribute as we'll do the + * eventual work later. + */ + if ((Token->UserAndGroups[GroupsInToken].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) && + (Token->UserAndGroups[GroupsInToken].Attributes & SE_GROUP_ENABLED) == 0) + { + NewAttributes = Token->UserAndGroups[GroupsInToken].Attributes |= SE_GROUP_ENABLED; + } + + /* + * Unlike the case above, a group that hasn't been enabled by + * default but it's currently enabled then we must disable + * it back. + */ + if ((Token->UserAndGroups[GroupsInToken].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) == 0 && + (Token->UserAndGroups[GroupsInToken].Attributes & SE_GROUP_ENABLED)) + { + NewAttributes = Token->UserAndGroups[GroupsInToken].Attributes & ~SE_GROUP_ENABLED; + } + } + else + { + /* Loop the provided groups in the list then */ + for (GroupsInList = 0; GroupsInList < NewStateCount; GroupsInList++) + { + /* Does this group exist in the token? */ + if (RtlEqualSid(&Token->UserAndGroups[GroupsInToken].Sid, + &NewState[GroupsInList].Sid)) + { + /* + * This is the group that we're looking for. + * However, it could be that the group is a + * mandatory group which we are not allowed + * and cannot disable it. + */ + if ((Token->UserAndGroups[GroupsInToken].Attributes & SE_GROUP_MANDATORY) && + (NewState[GroupsInList].Attributes & SE_GROUP_ENABLED) == 0) + { + /* It is mandatory, forget about this group */ + DPRINT1("SepAdjustGroups(): The SID group is mandatory!\n"); + return STATUS_CANT_DISABLE_MANDATORY; + } + + /* + * We've to ensure that apart the group mustn't be + * mandatory, it mustn't be a restricted group as + * well. That is, the group is marked with + * SE_GROUP_USE_FOR_DENY_ONLY flag and no one + * can enable it because it's for "deny" use only. + */ + if ((Token->UserAndGroups[GroupsInToken].Attributes & SE_GROUP_USE_FOR_DENY_ONLY) && + (NewState[GroupsInList].Attributes & SE_GROUP_ENABLED)) + { + /* This group is restricted, forget about it */ + DPRINT1("SepAdjustGroups(): The SID group is for use deny only!\n"); + return STATUS_CANT_ENABLE_DENY_ONLY; + } + + /* Copy the attributes and stop searching */ + NewAttributes = NewState[GroupsInList].Attributes; + NewAttributes &= SE_GROUP_ENABLED; + NewAttributes = Token->UserAndGroups[GroupsInToken].Attributes & ~SE_GROUP_ENABLED; + break; + } + + /* Did we find the specific group we wanted? */ + if (GroupsInList == NewStateCount) + { + /* We didn't, continue with the next token's group */ + continue; + } + } + + /* Count the group that we found it */ + GroupsCount++; + + /* Does the token have the same attributes as the caller requested them? */ + if (Token->UserAndGroups[GroupsInToken].Attributes != NewAttributes) + { + /* + * No, then it's time to make some adjustment to the + * token's groups. Does the caller want the previous states + * of groups? + */ + if (PreviousGroupsState != NULL) + { + PreviousGroupsState->Groups[ChangeCount] = Token->UserAndGroups[GroupsInToken]; + } + + /* Time to apply the changes now? */ + if (ApplyChanges) + { + /* The caller gave us consent, apply and report that we made changes! */ + Token->UserAndGroups[GroupsInToken].Attributes = NewAttributes; + *ChangesMade = TRUE; + } + + /* Increment the count change */ + ChangeCount++; + } + } + } + + /* Report the number of previous saved groups */ + if (PreviousGroupsState != NULL) + { + PreviousGroupsState->GroupCount = ChangeCount; + } + + /* Report the number of changed groups */ + *ChangedGroups = ChangeCount; + + /* Did we miss some groups? */ + if (!ResetToDefaultStates && (GroupsCount < NewStateCount)) + { + /* + * If we're at this stage then we are in a situation + * where the adjust changes done to token's groups is + * not deterministic as the caller might have wanted + * as per NewState parameter. + */ + DPRINT1("SepAdjustGroups(): The token hasn't all the groups assigned!\n"); + return STATUS_NOT_ALL_ASSIGNED; + } + + return STATUS_SUCCESS; +} + +/** + * @brief + * Changes the list of groups by enabling or disabling them + * in an access token. Unlike NtAdjustPrivilegesToken, + * this API routine does not remove groups. * * @param[in] TokenHandle - * Token handle where the list of groups SIDs are to be adjusted. + * Token handle where the list of groups SID are to be adjusted. + * The access token must have TOKEN_ADJUST_GROUPS access right + * in order to change the groups in a token. The token must also + * have TOKEN_QUERY access right if the caller requests the previous + * states of groups list, that is, PreviousState is not NULL. * * @param[in] ResetToDefault - * If set to TRUE, the function resets the list of groups SIDs to default. - * All the rest of parameters are ignored. + * If set to TRUE, the function resets the list of groups to default + * enabled and disabled states. NewState is ignored in this case. + * Otherwise if the parameter is set to FALSE, the function expects + * a new list of groups from NewState to be adjusted within the token. * * @param[in] NewState - * A new list of groups SIDs that the function will use it accordingly to - * modify the current list of groups SIDs of a token. + * A new list of groups SID that the function will use it accordingly to + * modify the current list of groups SID of a token. * * @param[in] BufferLength * The length size of the buffer that is pointed by the NewState parameter @@ -4292,14 +4536,20 @@ NtDuplicateToken( * * @param[out] PreviousState * If specified, the function will return to the caller the old list of groups - * SIDs. + * SID. If this parameter is NULL, ReturnLength must also be NULL. * * @param[out] ReturnLength * If specified, the function will return the total size length of the old list * of groups SIDs, in bytes. * * @return - * To be added... + * STATUS_SUCCESS is returned if the function has successfully adjusted the + * token's groups. STATUS_INVALID_PARAMETER is returned if the caller has + * submitted one or more invalid parameters, that is, the caller didn't want + * to reset the groups to default state but no NewState argument list has been + * provided. STATUS_BUFFER_TOO_SMALL is returned if the buffer length given + * by the caller is smaller than the required length size. A failure NTSTATUS + * code is returned otherwise. */ NTSTATUS NTAPI @@ -4308,11 +4558,222 @@ NtAdjustGroupsToken( _In_ BOOLEAN ResetToDefault, _In_ PTOKEN_GROUPS NewState, _In_ ULONG BufferLength, - _Out_opt_ PTOKEN_GROUPS PreviousState, - _Out_ PULONG ReturnLength) + _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) + PTOKEN_GROUPS PreviousState, + _When_(PreviousState != NULL, _Out_) PULONG ReturnLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PTOKEN Token; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + ULONG ChangeCount, RequiredLength; + ULONG CapturedCount = 0; + ULONG CapturedLength = 0; + ULONG NewStateSize = 0; + PSID_AND_ATTRIBUTES CapturedGroups = NULL; + BOOLEAN ChangesMade = FALSE; + BOOLEAN LockAndReferenceAcquired = FALSE; + + PAGED_CODE(); + + /* + * If the caller doesn't want to reset the groups of an + * access token to default states then at least we must + * expect a list of groups to be adjusted based on NewState + * parameter. Otherwise bail out because the caller has + * no idea what they're doing. + */ + if (!ResetToDefault && !NewState) + { + DPRINT1("NtAdjustGroupsToken(): The caller hasn't provided any list of groups to adjust!\n"); + return STATUS_INVALID_PARAMETER; + } + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* Probe NewState */ + if (!ResetToDefault) + { + /* Probe the header */ + ProbeForRead(NewState, sizeof(*NewState), sizeof(ULONG)); + + CapturedCount = NewState->GroupCount; + NewStateSize = FIELD_OFFSET(TOKEN_GROUPS, Groups[CapturedCount]); + + ProbeForRead(NewState, NewStateSize, sizeof(ULONG)); + } + + if (PreviousState != NULL) + { + ProbeForWrite(PreviousState, BufferLength, sizeof(ULONG)); + ProbeForWrite(ReturnLength, sizeof(*ReturnLength), sizeof(ULONG)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + /* + * We're calling directly from the kernel, just retrieve + * the number count of captured groups outright. + */ + if (!ResetToDefault) + { + CapturedCount = NewState->GroupCount; + } + } + + /* Time to capture the NewState list */ + if (!ResetToDefault) + { + _SEH2_TRY + { + Status = SeCaptureSidAndAttributesArray(NewState->Groups, + CapturedCount, + PreviousMode, + NULL, + 0, + PagedPool, + TRUE, + &CapturedGroups, + &CapturedLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtAdjustGroupsToken(): Failed to capture the NewState list of groups (Status 0x%lx)\n", Status); + return Status; + } + } + + /* Time to reference the token */ + Status = ObReferenceObjectByHandle(TokenHandle, + TOKEN_ADJUST_GROUPS | (PreviousState != NULL ? TOKEN_QUERY : 0), + SeTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); + if (!NT_SUCCESS(Status)) + { + /* We couldn't reference the access token, bail out */ + DPRINT1("NtAdjustGroupsToken(): Failed to reference the token (Status 0x%lx)\n", Status); + + if (CapturedGroups != NULL) + { + SeReleaseSidAndAttributesArray(CapturedGroups, + PreviousMode, + TRUE); + } + + goto Quit; + } + + /* Lock the token */ + SepAcquireTokenLockExclusive(Token); + LockAndReferenceAcquired = TRUE; + + /* Count the number of groups to be changed */ + Status = SepAdjustGroups(Token, + CapturedGroups, + CapturedCount, + FALSE, + ResetToDefault, + &ChangesMade, + NULL, + &ChangeCount); + + /* Does the caller want the previous state of groups? */ + if (PreviousState != NULL) + { + /* Calculate the required length */ + RequiredLength = FIELD_OFFSET(TOKEN_GROUPS, Groups[ChangeCount]); + + /* Return the required length to the caller */ + _SEH2_TRY + { + *ReturnLength = RequiredLength; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Bail out and return the exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Quit); + } + _SEH2_END; + + /* The buffer length provided is smaller than the required length, bail out */ + if (BufferLength < RequiredLength) + { + Status = STATUS_BUFFER_TOO_SMALL; + goto Quit; + } + } + + /* + * Now it's time to apply changes. Wrap the code + * in SEH as we are returning the old groups state + * list to the caller since PreviousState is a + * UM pointer. + */ + _SEH2_TRY + { + Status = SepAdjustGroups(Token, + CapturedGroups, + CapturedCount, + TRUE, + ResetToDefault, + &ChangesMade, + PreviousState, + &ChangeCount); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Bail out and return the exception code */ + Status = _SEH2_GetExceptionCode(); + + /* Force the write as we touched the token still */ + ChangesMade = TRUE; + _SEH2_YIELD(goto Quit); + } + _SEH2_END; + +Quit: + /* Allocate a new ID for the token as we made changes */ + if (ChangesMade) + { + ExAllocateLocallyUniqueId(&Token->ModifiedId); + } + + /* Have we successfully acquired the lock and referenced the token before? */ + if (LockAndReferenceAcquired) + { + /* Unlock and dereference the token */ + SepReleaseTokenLock(Token); + ObDereferenceObject(Token); + } + + /* Release the captured groups */ + if (CapturedGroups != NULL) + { + SeReleaseSidAndAttributesArray(CapturedGroups, + PreviousMode, + TRUE); + } + + return Status; } /** diff --git a/sdk/include/ndk/sefuncs.h b/sdk/include/ndk/sefuncs.h index 6fcc96e7fe6..d9a8e58ab83 100644 --- a/sdk/include/ndk/sefuncs.h +++ b/sdk/include/ndk/sefuncs.h @@ -150,7 +150,7 @@ NtAdjustGroupsToken( _In_opt_ PTOKEN_GROUPS NewState, _In_opt_ ULONG BufferLength, _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_GROUPS PreviousState, - _Out_ PULONG ReturnLength); + _When_(PreviousState != NULL, _Out_) PULONG ReturnLength); _Must_inspect_result_ __kernel_entry

1 0

[reactos] 01/01: [IMM32_APITEST] himc: Use ok rather than ok_int (#3970)
by Katayama Hirofumi MZ 22 Sep '21

22 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b622283ee5c7193dc69e… commit 7b622283ee5c7193dc69ebe289dce759efdbad4c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 22 19:07:07 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 22 19:07:07 2021 +0900 [IMM32_APITEST] himc: Use ok rather than ok_int (#3970) Use ok macro rather than ok_int macro. CORE-11700 --- modules/rostests/apitests/imm32/himc.c | 96 +++++++++++++++++----------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/modules/rostests/apitests/imm32/himc.c b/modules/rostests/apitests/imm32/himc.c index 8cf4bfd941f..6383c8865b2 100644 --- a/modules/rostests/apitests/imm32/himc.c +++ b/modules/rostests/apitests/imm32/himc.c @@ -16,96 +16,96 @@ START_TEST(himc) /* ImmCreateContext/ImmDestroyContext and ImmLockIMC/ImmUnlockIMC */ hNewIMC = ImmCreateContext(); - ok_int(hNewIMC != NULL, TRUE); + ok(hNewIMC != NULL, "\n"); pIC = ImmLockIMC(hNewIMC); - ok_int(pIC == NULL, TRUE); + ok(pIC == NULL, "\n"); ImmUnlockIMC(hNewIMC); - ok_int(ImmDestroyContext(hNewIMC), TRUE); + ok(ImmDestroyContext(hNewIMC), "\n"); /* ImmGetContext against NULL */ hIMC = ImmGetContext(NULL); - ok_int(hIMC == NULL, TRUE); + ok(hIMC == NULL, "\n"); /* Create EDIT control */ style = ES_MULTILINE | ES_LEFT; hwndEdit = CreateWindowW(L"EDIT", NULL, style, 0, 0, 100, 20, NULL, NULL, GetModuleHandleW(NULL), NULL); - ok_int(hwndEdit != NULL, TRUE); + ok(hwndEdit != NULL, "\n"); /* Create STATIC control */ style = SS_LEFT; hwndStatic = CreateWindowW(L"STATIC", NULL, style, 0, 30, 100, 20, NULL, NULL, GetModuleHandleW(NULL), NULL); - ok_int(hwndStatic != NULL, TRUE); + ok(hwndStatic != NULL, "\n"); /* ImmGetContext/ImmReleaseContext and ImmLockIMC/ImmUnlockIMC */ hIMC1 = hIMC = ImmGetContext(hwndEdit); - ok_int(hIMC != NULL, TRUE); + ok(hIMC != NULL, "\n"); pIC = ImmLockIMC(hIMC); - ok_int(pIC != NULL, TRUE); - ok_int(pIC->hWnd == NULL, TRUE); - ok_int(pIC->fOpen, FALSE); - ok_int(ImmGetIMCCSize(pIC->hCompStr) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hCandInfo) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hGuideLine) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hPrivate) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hMsgBuf) != 0, TRUE); + ok(pIC != NULL, "\n"); + ok(pIC->hWnd == NULL, "\n"); + ok(!pIC->fOpen, "\n"); + ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ImmUnlockIMC(hNewIMC); SetFocus(hwndEdit); pIC = ImmLockIMC(hIMC); - ok_int(pIC != NULL, TRUE); - ok_int(pIC->hWnd == hwndEdit, TRUE); - ok_int(pIC->fOpen, FALSE); + ok(pIC != NULL, "\n"); + ok(pIC->hWnd == hwndEdit, "\n"); + ok(!pIC->fOpen, "\n"); ImmUnlockIMC(hNewIMC); SetFocus(NULL); pIC = ImmLockIMC(hIMC); - ok_int(pIC != NULL, TRUE); - ok_int(pIC->hWnd == hwndEdit, TRUE); + ok(pIC != NULL, "\n"); + ok(pIC->hWnd == hwndEdit, "\n"); ImmUnlockIMC(hNewIMC); - ok_int(ImmSetOpenStatus(hIMC, TRUE), TRUE); + ok(ImmSetOpenStatus(hIMC, TRUE), "\n"); pIC = ImmLockIMC(hIMC); - ok_int(pIC != NULL, TRUE); - ok_int(pIC->fOpen, TRUE); + ok(pIC != NULL, "\n"); + ok(pIC->fOpen, "\n"); ImmUnlockIMC(hNewIMC); - ok_int(ImmReleaseContext(hwndEdit, hIMC), TRUE); + ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); hIMC2 = hIMC = ImmGetContext(hwndStatic); - ok_int(hIMC != NULL, TRUE); + ok(hIMC != NULL, "\n"); pIC = ImmLockIMC(hIMC); - ok_int(pIC != NULL, TRUE); - ok_int(pIC->hWnd == hwndEdit, TRUE); - ok_int(ImmGetIMCCSize(pIC->hCompStr) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hCandInfo) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hGuideLine) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hPrivate) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hMsgBuf) != 0, TRUE); + ok(pIC != NULL, "\n"); + ok(pIC->hWnd == hwndEdit, "\n"); + ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ImmUnlockIMC(hNewIMC); - ok_int(ImmReleaseContext(hwndEdit, hIMC), TRUE); + ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); - ok_int(hIMC1 == hIMC2, TRUE); + ok(hIMC1 == hIMC2, "\n"); /* ImmAssociateContext */ hNewIMC = ImmCreateContext(); - ok_int(hNewIMC != NULL, TRUE); + ok(hNewIMC != NULL, "\n"); pIC = ImmLockIMC(hNewIMC); - ok_int(pIC != NULL, TRUE); + ok(pIC != NULL, "\n"); ImmUnlockIMC(hNewIMC); hOldIMC = ImmAssociateContext(hwndEdit, hNewIMC); - ok_int(hNewIMC != hOldIMC, TRUE); + ok(hNewIMC != hOldIMC, "\n"); hIMC = ImmGetContext(hwndEdit); - ok_int(hIMC == hNewIMC, TRUE); - ok_int(hIMC != hOldIMC, TRUE); + ok(hIMC == hNewIMC, "\n"); + ok(hIMC != hOldIMC, "\n"); pIC = ImmLockIMC(hNewIMC); - ok_int(pIC != NULL, TRUE); - ok_int(pIC->hWnd == NULL, TRUE); - ok_int(ImmGetIMCCSize(pIC->hCompStr) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hCandInfo) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hGuideLine) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hPrivate) != 0, TRUE); - ok_int(ImmGetIMCCSize(pIC->hMsgBuf) != 0, TRUE); + ok(pIC != NULL, "\n"); + ok(pIC->hWnd == NULL, "\n"); + ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); + ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ImmUnlockIMC(hNewIMC); - ok_int(ImmReleaseContext(hwndEdit, hIMC), TRUE); - ok_int(ImmDestroyContext(hNewIMC), TRUE); + ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); + ok(ImmDestroyContext(hNewIMC), "\n"); DestroyWindow(hwndEdit); DestroyWindow(hwndStatic);

1 0

[reactos] 02/02: [FONTEXT] Restore folder icon
by Mark Jansen 21 Sep '21

21 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4acf1007df5833a84a869… commit 4acf1007df5833a84a869f44c35d1df63d5cf24a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 5 21:19:10 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 21 21:42:32 2021 +0200 [FONTEXT] Restore folder icon --- dll/shellext/fontext/fontext.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/shellext/fontext/fontext.cpp b/dll/shellext/fontext/fontext.cpp index 0b68e40a7cb..f56a8849830 100644 --- a/dll/shellext/fontext/fontext.cpp +++ b/dll/shellext/fontext/fontext.cpp @@ -54,7 +54,9 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) STDAPI DllRegisterServer() { WCHAR Path[MAX_PATH] = { 0 }; - static const char DesktopIniContents[] = "[.ShellClassInfo]\r\nCLSID={BD84B380-8CA2-1069-AB1D-08000948F534}\r\n"; + static const char DesktopIniContents[] = "[.ShellClassInfo]\r\n" + "CLSID={BD84B380-8CA2-1069-AB1D-08000948F534}\r\n" + "IconResource=%SystemRoot%\\system32\\shell32.dll,-39\r\n"; // IDI_SHELL_FONTS_FOLDER HANDLE hFile; HRESULT hr;

1 0

[reactos] 01/02: [SHELL32] CFSFolder: Add fallback for failing shell extension
by Mark Jansen 21 Sep '21

21 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9276b3f1bf1e34606eaa9… commit 9276b3f1bf1e34606eaa968efea705d6fc7fa452 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 5 21:07:30 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 21 21:42:25 2021 +0200 [SHELL32] CFSFolder: Add fallback for failing shell extension CORE-17673 --- dll/win32/shell32/folders/CFSFolder.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index efdd2386d4b..f44a71f6b33 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -883,10 +883,26 @@ HRESULT WINAPI CFSFolder::BindToObject( CLSID clsidFolder; if (_ILIsFolder(pidl)) { - clsidFolder = CLSID_ShellFSFolder; - if ((pData->uFileAttribs & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0) - SHELL32_GetCLSIDForDirectory(pfti.szTargetParsingName, L"CLSID", &clsidFolder); + { + hr = SHELL32_GetCLSIDForDirectory(pfti.szTargetParsingName, L"CLSID", &clsidFolder); + + if (SUCCEEDED(hr)) + { + /* We got a GUID from a desktop.ini, let's try it */ + hr = SHELL32_BindToSF(m_pidlRoot, &pfti, pidl, &clsidFolder, riid, ppvOut); + if (SUCCEEDED(hr)) + { + TRACE("-- returning (%p) %08x, (%s)\n", *ppvOut, hr, wine_dbgstr_guid(&clsidFolder)); + return hr; + } + + /* Something went wrong, re-try it with a normal ShellFSFolder */ + ERR("CFSFolder::BindToObject: %s failed to bind, using fallback (0x%08x)\n", wine_dbgstr_guid(&clsidFolder), hr); + } + } + /* No system folder or the custom class failed */ + clsidFolder = CLSID_ShellFSFolder; } else {

1 0

[reactos] 01/01: [RAPPS] Move the CConfigParser to a new file
by Mark Jansen 21 Sep '21

21 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad83af36dd3312bc2d36a… commit ad83af36dd3312bc2d36a60b8bfd80b7aee74f15 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Sep 21 19:00:21 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 21 19:00:21 2021 +0200 [RAPPS] Move the CConfigParser to a new file --- base/applications/rapps/CMakeLists.txt | 14 +-- base/applications/rapps/configparser.cpp | 120 +++++++++++++++++++++++++ base/applications/rapps/include/available.h | 1 + base/applications/rapps/include/configparser.h | 27 ++++++ base/applications/rapps/include/misc.h | 22 ----- base/applications/rapps/include/rapps.h | 1 + base/applications/rapps/misc.cpp | 117 ------------------------ 7 files changed, 157 insertions(+), 145 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 4da7397229f..8a260cfb2e3 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND SOURCE asyncinet.cpp available.cpp cabinet.cpp + configparser.cpp gui.cpp installed.cpp integrity.cpp @@ -16,23 +17,24 @@ list(APPEND SOURCE misc.cpp settings.cpp settingsdlg.cpp - winmain.cpp unattended.cpp - include/rapps.h + winmain.cpp include/appview.h include/asyncinet.h include/available.h + include/configparser.h + include/crichedit.h + include/defines.h include/dialogs.h include/gui.h include/installed.h - include/crichedit.h - include/defines.h include/misc.h - include/settings.h + include/rapps.h include/resource.h include/rosui.h - include/winmain.h + include/settings.h include/unattended.h + include/winmain.h ) add_definitions( diff --git a/base/applications/rapps/configparser.cpp b/base/applications/rapps/configparser.cpp new file mode 100644 index 00000000000..5e191da800b --- /dev/null +++ b/base/applications/rapps/configparser.cpp @@ -0,0 +1,120 @@ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Config parser + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + */ +#include "rapps.h" + +CConfigParser::CConfigParser(const ATL::CStringW& FileName) : szConfigPath(GetINIFullPath(FileName)) +{ + CacheINILocale(); +} + +ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) +{ + ATL::CStringW szDir; + ATL::CStringW szBuffer; + + GetStorageDirectory(szDir); + szBuffer.Format(L"%ls\\rapps\\%ls", szDir.GetString(), FileName.GetString()); + + return szBuffer; +} + +VOID CConfigParser::CacheINILocale() +{ + // TODO: Set default locale if call fails + // find out what is the current system lang code (e.g. "0a") and append it to SectionLocale + GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, + m_szLocaleID.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); + + m_szLocaleID.ReleaseBuffer(); + m_szCachedINISectionLocale = L"Section." + m_szLocaleID; + + // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part + if (m_szLocaleID.GetLength() >= 2) + m_szCachedINISectionLocaleNeutral = L"Section." + m_szLocaleID.Right(2); + else + m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale; +} + +BOOL CConfigParser::GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString) +{ + DWORD dwResult; + + LPWSTR ResultStringBuffer = ResultString.GetBuffer(MAX_PATH); + // 1st - find localized strings (e.g. "Section.0c0a") + dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocale + Suffix).GetString(), + KeyName.GetString(), + NULL, + ResultStringBuffer, + MAX_PATH, + szConfigPath.GetString()); + + if (!dwResult) + { + // 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") + dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocaleNeutral + Suffix).GetString(), + KeyName.GetString(), + NULL, + ResultStringBuffer, + MAX_PATH, + szConfigPath.GetString()); + if (!dwResult) + { + // 3rd - if they weren't present fallback to standard english strings (just "Section") + dwResult = GetPrivateProfileStringW((ATL::CStringW(L"Section") + Suffix).GetString(), + KeyName.GetString(), + NULL, + ResultStringBuffer, + MAX_PATH, + szConfigPath.GetString()); + } + } + + ResultString.ReleaseBuffer(); + return (dwResult != 0 ? TRUE : FALSE); +} + +BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +{ + /* First try */ + if (GetStringWorker(KeyName, L"." CurrentArchitecture, ResultString)) + { + return TRUE; + } + +#ifndef _M_IX86 + /* On non-x86 architecture we need the architecture specific URL */ + if (KeyName == L"URLDownload") + { + return FALSE; + } +#endif + + /* Fall back to default */ + return GetStringWorker(KeyName, L"", ResultString); +} + +BOOL CConfigParser::GetInt(const ATL::CStringW& KeyName, INT& iResult) +{ + ATL::CStringW Buffer; + + iResult = 0; + + // grab the text version of our entry + if (!GetString(KeyName, Buffer)) + return FALSE; + + if (Buffer.IsEmpty()) + return FALSE; + + // convert it to an actual integer + iResult = StrToIntW(Buffer.GetString()); + + // we only care about values > 0 + return (iResult > 0); +} diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index c478a898b82..92a846aa5e9 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -6,6 +6,7 @@ #include <atlcoll.h> #include "misc.h" +#include "configparser.h" #define MAX_SCRNSHOT_NUM 16 diff --git a/base/applications/rapps/include/configparser.h b/base/applications/rapps/include/configparser.h new file mode 100644 index 00000000000..5df9150269c --- /dev/null +++ b/base/applications/rapps/include/configparser.h @@ -0,0 +1,27 @@ +#pragma once + +#include <windef.h> +#include <atlstr.h> + +class CConfigParser +{ + // Locale names cache + const static INT m_cchLocaleSize = 5; + + ATL::CStringW m_szLocaleID; + ATL::CStringW m_szCachedINISectionLocale; + ATL::CStringW m_szCachedINISectionLocaleNeutral; + + const ATL::CStringW szConfigPath; + + ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); + VOID CacheINILocale(); + BOOL GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString); + +public: + CConfigParser(const ATL::CStringW& FileName); + + BOOL GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); + BOOL GetInt(const ATL::CStringW& KeyName, INT& iResult); +}; + diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 7bb6afcecb5..1a00feeb526 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -41,28 +41,6 @@ BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName, const ATL::CStringW& szCabDir, const ATL::CStringW& szOutputDir); -class CConfigParser -{ - // Locale names cache - const static INT m_cchLocaleSize = 5; - - ATL::CStringW m_szLocaleID; - ATL::CStringW m_szCachedINISectionLocale; - ATL::CStringW m_szCachedINISectionLocaleNeutral; - - const ATL::CStringW szConfigPath; - - ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); - VOID CacheINILocale(); - BOOL GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString); - -public: - CConfigParser(const ATL::CStringW& FileName = ""); - - BOOL GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); - BOOL GetInt(const ATL::CStringW& KeyName, INT& iResult); -}; - BOOL PathAppendNoDirEscapeW(LPWSTR pszPath, LPCWSTR pszMore); BOOL IsSystem64Bit(); diff --git a/base/applications/rapps/include/rapps.h b/base/applications/rapps/include/rapps.h index 43d8a5e8e0b..595cf24e76e 100644 --- a/base/applications/rapps/include/rapps.h +++ b/base/applications/rapps/include/rapps.h @@ -7,5 +7,6 @@ #include "installed.h" #include "available.h" #include "misc.h" +#include "configparser.h" #endif /* _RAPPS_H */ diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index e8418869a21..0380705f4e3 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -313,121 +313,6 @@ BOOL GetInstalledVersion(ATL::CStringW *pszVersion, const ATL::CStringW &szRegNa || GetInstalledVersion_WowUser(pszVersion, szRegName, FALSE, KEY_WOW64_64KEY))); } -// CConfigParser - -CConfigParser::CConfigParser(const ATL::CStringW& FileName) : szConfigPath(GetINIFullPath(FileName)) -{ - CacheINILocale(); -} - -ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) -{ - ATL::CStringW szDir; - ATL::CStringW szBuffer; - - GetStorageDirectory(szDir); - szBuffer.Format(L"%ls\\rapps\\%ls", szDir.GetString(), FileName.GetString()); - - return szBuffer; -} - -VOID CConfigParser::CacheINILocale() -{ - // TODO: Set default locale if call fails - // find out what is the current system lang code (e.g. "0a") and append it to SectionLocale - GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, - m_szLocaleID.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); - - m_szLocaleID.ReleaseBuffer(); - m_szCachedINISectionLocale = L"Section." + m_szLocaleID; - - // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part - if (m_szLocaleID.GetLength() >= 2) - m_szCachedINISectionLocaleNeutral = L"Section." + m_szLocaleID.Right(2); - else - m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale; -} - -BOOL CConfigParser::GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString) -{ - DWORD dwResult; - - LPWSTR ResultStringBuffer = ResultString.GetBuffer(MAX_PATH); - // 1st - find localized strings (e.g. "Section.0c0a") - dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocale + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); - - if (!dwResult) - { - // 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") - dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocaleNeutral + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); - if (!dwResult) - { - // 3rd - if they weren't present fallback to standard english strings (just "Section") - dwResult = GetPrivateProfileStringW((ATL::CStringW(L"Section") + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); - } - } - - ResultString.ReleaseBuffer(); - return (dwResult != 0 ? TRUE : FALSE); -} - -BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) -{ - /* First try */ - if (GetStringWorker(KeyName, L"." CurrentArchitecture, ResultString)) - { - return TRUE; - } - -#ifndef _M_IX86 - /* On non-x86 architecture we need the architecture specific URL */ - if (KeyName == L"URLDownload") - { - return FALSE; - } -#endif - - /* Fall back to default */ - return GetStringWorker(KeyName, L"", ResultString); -} - -BOOL CConfigParser::GetInt(const ATL::CStringW& KeyName, INT& iResult) -{ - ATL::CStringW Buffer; - - iResult = 0; - - // grab the text version of our entry - if (!GetString(KeyName, Buffer)) - return FALSE; - - if (Buffer.IsEmpty()) - return FALSE; - - // convert it to an actual integer - iResult = StrToIntW(Buffer.GetString()); - - // we only care about values > 0 - return (iResult > 0); -} -// CConfigParser - - BOOL PathAppendNoDirEscapeW(LPWSTR pszPath, LPCWSTR pszMore) { WCHAR pszPathBuffer[MAX_PATH]; // buffer to store result @@ -473,8 +358,6 @@ BOOL PathAppendNoDirEscapeW(LPWSTR pszPath, LPCWSTR pszMore) return TRUE; } - - BOOL IsSystem64Bit() { if (bIsSys64ResultCached)

1 0

← Newer
1
2
3
4
5
6
7
8
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2021