Ros-diffs

ros-diffs@reactos.org

14 participants
80811 discussions

[reactos] 01/01: [FREELDR/x64] Add Multiboot header

by Daniel Victor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b524c18a3ea5a308dd1cb… commit b524c18a3ea5a308dd1cbd11b66040d20065548e Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Mon Oct 7 15:33:37 2024 -0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 19 17:54:39 2024 +0300 [FREELDR/x64] Add Multiboot header --- boot/freeldr/freeldr/arch/amd64/entry.S | 5 +- boot/freeldr/freeldr/arch/i386/multiboot.S | 101 +++++++++++++++-------------- boot/freeldr/freeldr/pcat.cmake | 3 + sdk/include/asm/asm.inc | 17 ++++- 4 files changed, 74 insertions(+), 52 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index f05d144ce55..7a6537f21c9 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -5,7 +5,7 @@ #include <arch/pc/pcbios.h> EXTERN BootMain:PROC -// EXTERN cmdline:DWORD +EXTERN cmdline:DWORD EXTERN DiskStopFloppyMotor:PROC @@ -71,8 +71,7 @@ FrldrStartup: rep stosq /* Pass the command line to BootMain */ - // mov rcx, offset cmdline - xor rcx, rcx + mov rcx, offset cmdline /* GO! */ call BootMain diff --git a/boot/freeldr/freeldr/arch/i386/multiboot.S b/boot/freeldr/freeldr/arch/i386/multiboot.S index e176a64d54c..556bc630838 100644 --- a/boot/freeldr/freeldr/arch/i386/multiboot.S +++ b/boot/freeldr/freeldr/arch/i386/multiboot.S @@ -1,27 +1,16 @@ /* - * FreeLoader - * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Support for the Multiboot v1 specification. + * COPYRIGHT: Copyright 1998-2002 Brian Palmer <brianp(a)sginet.com> + * Copyright 2024 Daniel Victor <ilauncherdeveloper(a)gmail.com> */ #include <asm.inc> #include <arch/pc/x86common.h> #include <multiboot.h> -/* Multiboot support +/* Multiboot v1 support * * Allows freeldr to be loaded as a "multiboot kernel" by * other boot loaders like GRUB. @@ -47,6 +36,16 @@ #define INITIAL_BASE HEX(200000) +#ifdef _M_IX86 +#define rax eax +#define rbx ebx +#define rcx ecx +#define rdi edi +#define rdx edx +#define rsi esi +#endif + + #ifdef _USE_ML EXTERN __bss_start__:DWORD EXTERN __bss_end__:DWORD @@ -54,8 +53,7 @@ EXTERN __bss_end__:DWORD #ifdef _USE_ML -.MBDATA SEGMENT PUBLIC 'DATA' -//ASSUME nothing +.MBDATA SEGMENT 'DATA' #endif /* Align to 32 bits boundary */ @@ -85,8 +83,12 @@ MultibootHeader: #endif +#ifdef _M_IX86 .code32 ASSUME ES:NOTHING, FS:NOTHING, GS:NOTHING +#else +.code64 +#endif MultibootEntry: cld @@ -98,36 +100,35 @@ MultibootEntry: /* Save multiboot info structure */ mov esi, ebx mov edi, offset MultibootInfo + INITIAL_BASE - FREELDR_BASE - mov ecx, (MB_INFO_SIZE / 4) - rep movsd - mov dword ptr ds:[MultibootInfo + INITIAL_BASE - FREELDR_BASE + MB_INFO_MMAP_ADDR_OFFSET], 0 - mov dword ptr ds:[_MultibootInfoPtr + INITIAL_BASE - FREELDR_BASE], offset MultibootInfo + mov ecx, MB_INFO_SIZE + rep movsb + mov dword ptr [MultibootInfo + INITIAL_BASE - FREELDR_BASE + MB_INFO_MMAP_ADDR_OFFSET], 0 + mov dword ptr [_MultibootInfoPtr + INITIAL_BASE - FREELDR_BASE], offset MultibootInfo /* See if the memory map was passed in */ - test dword ptr ds:[ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_MEMORY_MAP + test dword ptr [rbx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_MEMORY_MAP jz mbchk_command_line /* Check memory map length */ - mov ecx, dword ptr ds:[ebx + MB_INFO_MMAP_LEN_OFFSET] + mov rcx, [rbx + MB_INFO_MMAP_LEN_OFFSET] test ecx, ecx jz mbchk_command_line cmp ecx, MB_MMAP_SIZE jg mbchk_command_line /* Check memory map address */ - mov esi, dword ptr ds:[ebx + MB_INFO_MMAP_ADDR_OFFSET] + mov rsi, [rbx + MB_INFO_MMAP_ADDR_OFFSET] test esi, esi jz mbchk_command_line /* Save memory map structure */ mov edi, offset MultibootMemoryMap + INITIAL_BASE - FREELDR_BASE - shr ecx, 2 - rep movsd + rep movsb /* Relocate memory map address */ - mov dword ptr ds:[MultibootInfo + INITIAL_BASE - FREELDR_BASE + MB_INFO_MMAP_ADDR_OFFSET], offset MultibootMemoryMap + mov dword ptr [MultibootInfo + INITIAL_BASE - FREELDR_BASE + MB_INFO_MMAP_ADDR_OFFSET], offset MultibootMemoryMap mbchk_command_line: /* Save command line */ - test dword ptr ds:[ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE + test dword ptr [rbx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE jz mb2 - mov esi, dword ptr ds:[ebx + MB_INFO_COMMAND_LINE_OFFSET] + mov rsi, [rbx + MB_INFO_COMMAND_LINE_OFFSET] mov edi, offset cmdline + INITIAL_BASE - FREELDR_BASE mov ecx, CMDLINE_SIZE - 1 mb1: @@ -140,15 +141,18 @@ mb1: mb2: /* See if the boot device was passed in */ - test dword ptr ds:[ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_BOOT_DEVICE + test dword ptr [rbx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_BOOT_DEVICE /* If no boot device known, assume first partition of first harddisk */ mov dx, HEX(0180) jz mb3 /* Load boot drive into DL, boot partition into DH */ - mov edx, dword ptr ds:[ebx + MB_INFO_BOOT_DEVICE_OFFSET] + mov rdx, [rbx + MB_INFO_BOOT_DEVICE_OFFSET] bswap edx + + cmp dh, HEX(FF) + jz mb3 inc dh mb3: @@ -156,15 +160,14 @@ mb3: mov esi, INITIAL_BASE mov edi, FREELDR_BASE mov ecx, offset __bss_start__ - FREELDR_BASE - shr ecx, 2 - rep movsd + rep movsb /* Load segment registers for real-address mode */ -#ifdef _USE_ML - lgdt fword ptr ds:[gdtptr] -#else - lgdt ds:[gdtptr] -#endif + mov edi, offset gdtptr + lgdt lXdtPrefix [rdi] + mov edi, offset idtptr + lidt lXdtPrefix [rdi] + mov ax, HEX(10) mov ds, ax mov es, ax @@ -180,16 +183,14 @@ mbfail: mbstop: jmp short mbstop /* We should never get here */ -.code16 mb4: /* Disable protected mode */ - mov eax, cr0 - and eax, CR0_PE_CLR - mov cr0, eax + mov rax, cr0 + data32 and eax, CR0_PE_CLR + mov cr0, rax /* Jump to real entry point */ ljmp16 0, FREELDR_BASE -.endcode16 /* Force 8-byte alignment */ @@ -201,8 +202,14 @@ gdt: /* GDT table pointer */ gdtptr: - .word HEX(17) /* Limit */ - .long gdt /* Base Address */ + .word HEX(17) /* Limit */ + .long gdt /* Base Address */ + + /* Force 8-byte alignment */ + .align 8 +idtptr: + .word HEX(3FF) /* Limit */ + .long HEX(0) /* Base Address */ PUBLIC _MultibootInfoPtr _MultibootInfoPtr: diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake index ac18b0e00ec..020ae7e018a 100644 --- a/boot/freeldr/freeldr/pcat.cmake +++ b/boot/freeldr/freeldr/pcat.cmake @@ -110,6 +110,9 @@ if(ARCH STREQUAL "i386") endif() elseif(ARCH STREQUAL "amd64") + list(APPEND PCATLDR_BASE_ASM_SOURCE + arch/i386/multiboot.S) + list(APPEND PCATLDR_COMMON_ASM_SOURCE arch/amd64/entry.S arch/amd64/int386.S diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index 7b3df60e6b1..b1a29b8802e 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -172,6 +172,8 @@ ENDM .skip size, fill ENDM +#define lXdtPrefix fword ptr + ljmp MACRO segment, offset DB 0EAh DD offset @@ -320,12 +322,23 @@ ENDM #define REPEAT .rept #define ENDR .endr +#define lXdtPrefix + .macro ljmp segment, offset - jmp far ptr \segment:\offset + .byte 0xEA + .long offset + .word segment .endm .macro ljmp16 segment, offset - jmp far ptr \segment:\offset + .byte 0xEA + .word offset + .word segment +.endm + +.macro data32 opcode:vararg + .byte 0x66 + opcode .endm .macro retf

3 weeks

[reactos] 01/01: [ATL] CComCriticalSection destructor should not be virtual

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=398486f5f6eb7bd15a9dc… commit 398486f5f6eb7bd15a9dc80b12eb6693274f6297 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 13:00:52 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 19 16:16:51 2024 +0300 [ATL] CComCriticalSection destructor should not be virtual Fixes GCC 13 build of shdocvw --- sdk/lib/atl/atlcore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlcore.h b/sdk/lib/atl/atlcore.h index d1527493864..3e6234eb06c 100644 --- a/sdk/lib/atl/atlcore.h +++ b/sdk/lib/atl/atlcore.h @@ -55,7 +55,7 @@ public: memset(&m_sec, 0, sizeof(CRITICAL_SECTION)); } - virtual ~CComCriticalSection() + ~CComCriticalSection() { }

3 weeks

[reactos] 01/01: [CMAKE] Enable proper definition of __cplusplus macro on MSVC

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd265bd7ac5185dc297d4… commit fd265bd7ac5185dc297d404cc6c2d7b53e670053 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Oct 18 10:23:31 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 19 15:11:44 2024 +0300 [CMAKE] Enable proper definition of __cplusplus macro on MSVC MSVC defaults to always reporting 199711L to satisfy broken C++ code. You have to add a command line argument to make it work correctly. See https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msv… --- sdk/cmake/msvc.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 67c2e451d7b..bf804dd3bfd 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -32,6 +32,9 @@ endif() add_definitions(/D__STDC__=1) +# Enable correct values of __cplusplus macro for newer standards +add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>) + # Ignore any "standard" include paths, and do not use any default CRT library. if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") add_compile_options(/X /Zl)

3 weeks

[reactos] 01/01: [SHELL32] Fix broken delete file type verb (#7462)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5797340164543d77212b7… commit 5797340164543d77212b7651da863967e36bf767 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Oct 18 14:42:08 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 18 14:42:08 2024 +0200 [SHELL32] Fix broken delete file type verb (#7462) CORE-19809 --- dll/win32/shell32/dialogs/filetypes.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index c02de0eee10..6a958b5cc1c 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -1161,7 +1161,7 @@ EditTypeDlg_WriteClass(HWND hwndDlg, PEDITTYPE_DIALOG pEditType, BOOL OnlyExt = hr != S_OK; HKEY hClassKey; if (FAILED(hr) || RegCreateKeyExW(HKEY_CLASSES_ROOT, ClassKey, 0, NULL, 0, - KEY_QUERY_VALUE |KEY_WRITE, NULL, + KEY_QUERY_VALUE | KEY_WRITE, NULL, &hClassKey, NULL) != ERROR_SUCCESS) { return FALSE; @@ -1221,7 +1221,7 @@ EditTypeDlg_WriteClass(HWND hwndDlg, PEDITTYPE_DIALOG pEditType, } HKEY hShellKey; - if (RegCreateKeyExW(hClassKey, L"shell", 0, NULL, 0, KEY_WRITE, NULL, + if (RegCreateKeyExW(hClassKey, L"shell", 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hShellKey, NULL) != ERROR_SUCCESS) { RegCloseKey(hClassKey);

3 weeks, 1 day

[reactos] 05/05: [ADVAPI32] Add some missing Vista+ exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30952992e1a13b8f0c0bb… commit 30952992e1a13b8f0c0bb4cabfaffe4ef3451522 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 17 13:35:11 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [ADVAPI32] Add some missing Vista+ exports --- dll/win32/advapi32/advapi32.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 432a4652f73..b684b09c4e3 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -482,6 +482,8 @@ @ stub RegConnectRegistryExA @ stub RegConnectRegistryExW @ stdcall RegConnectRegistryW(wstr long ptr) +@ stdcall -version=0x600+ RegCopyTreeA(ptr str ptr) +@ stdcall -version=0x600+ RegCopyTreeW(ptr wstr ptr) @ stdcall RegCreateKeyA(long str ptr) @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @@ -490,6 +492,8 @@ @ stdcall RegDeleteKeyExA(long str long long) @ stdcall RegDeleteKeyExW(long wstr long long) @ stdcall RegDeleteKeyW(long wstr) +@ stdcall -version=0x600+ RegDeleteTreeA(long str) +@ stdcall -version=0x600+ RegDeleteTreeW(long wstr) @ stdcall RegDeleteValueA(long str) @ stdcall RegDeleteValueW(long wstr) @ stdcall RegDisablePredefinedCache() @@ -533,6 +537,8 @@ @ stdcall RegSaveKeyExW(long str ptr long) @ stdcall RegSaveKeyW(long ptr ptr) @ stdcall RegSetKeySecurity(long long ptr) +@ stdcall -version=0x600+ RegSetKeyValueA(long str str long ptr long) +@ stdcall -version=0x600+ RegSetKeyValueW(long wstr wstr long ptr long) @ stdcall RegSetValueA(long str long ptr long) @ stdcall RegSetValueExA(long str long long ptr long) @ stdcall RegSetValueExW(long wstr long long ptr long)

3 weeks, 2 days

[reactos] 04/05: [ADVAPI32][ETWTRACE] Add etwtrace library and link advapi32 to it on NT6+

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b27429b12610063c05f95… commit b27429b12610063c05f951db21ecdea38af50b5e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 14 17:35:15 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [ADVAPI32][ETWTRACE] Add etwtrace library and link advapi32 to it on NT6+ --- dll/ntdll/CMakeLists.txt | 10 +++++++--- dll/win32/advapi32/CMakeLists.txt | 3 +++ dll/win32/advapi32/advapi32.spec | 42 +++++++++++++++++++-------------------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index 065188705f6..fdd7c11262a 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -24,14 +24,18 @@ add_library(rtl_um OBJECT target_link_libraries(rtl_um apisets ${PSEH_LIB}) add_dependencies(rtl_um psdk) +# On NT6+ this is used by advapi32 +add_library(etwtrace etw/trace.c) +target_link_libraries(etwtrace ${PSEH_LIB}) +add_dependencies(etwtrace psdk) + list(APPEND SOURCE dbg/dbgui.c ldr/ldrapi.c ldr/ldrinit.c ldr/ldrpe.c ldr/ldrutils.c - ldr/verifier.c - etw/trace.c) + ldr/verifier.c) if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE dispatch/i386/dispatch.S) @@ -61,7 +65,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0) set_subsystem(ntdll console) ################# END HACK ################# -target_link_libraries(ntdll csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) +target_link_libraries(ntdll etwtrace csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) target_link_libraries(ntdll cryptlib) endif() diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index cb2e495b1da..d1833586bb0 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -62,6 +62,9 @@ add_library(advapi32 MODULE set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + target_link_libraries(advapi32 etwtrace) +endif() add_delay_importlibs(advapi32 secur32) add_importlibs(advapi32 advapi32_vista rpcrt4 kernel32 ntdll) add_pch(advapi32 advapi32.h "${PCH_SKIP_SOURCE}") diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index e79390f57ba..432a4652f73 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -70,9 +70,9 @@ @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) @ stdcall -version=0x502 ControlTraceA(double str ptr long) ntdll.EtwControlTraceA -@ stdcall -stub -version=0x600+ ControlTraceA(double str ptr long) +@ stdcall -version=0x600+ ControlTraceA(double str ptr long) EtwControlTraceA @ stdcall -version=0x502 ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW -@ stdcall -stub -version=0x600+ ControlTraceW(double wstr ptr long) +@ stdcall -version=0x600+ ControlTraceW(double wstr ptr long) EtwControlTraceW @ stub ConvertAccessToSecurityDescriptorA @ stub ConvertAccessToSecurityDescriptorW @ stub ConvertSDToStringSDRootDomainA @@ -207,7 +207,7 @@ @ stdcall ElfReportEventAndSourceW(long long ptr long long long ptr ptr long long ptr ptr long ptr ptr) @ stdcall ElfReportEventW(long long long long ptr long long ptr ptr long ptr ptr) @ stdcall -version=0x502 EnableTrace(long long long ptr double) ntdll.EtwEnableTrace -@ stdcall -stub -version=0x600+ EnableTrace(long long long ptr double) +@ stdcall -version=0x600+ EnableTrace(long long long ptr double) EtwEnableTrace @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) @ stub EncryptedFileKeyInfo @@ -220,7 +220,7 @@ @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW(long long long ptr long ptr ptr ptr) @ stdcall -version=0x502 EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids -@ stdcall -stub -version=0x600+ EnumerateTraceGuids(ptr long ptr) +@ stdcall -stub -version=0x600+ EnumerateTraceGuids(ptr long ptr) # EtwEnumerateTraceGuids @ stdcall EqualDomainSid(ptr ptr ptr) @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) @@ -228,9 +228,9 @@ @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) @ stdcall -version=0x502 FlushTraceA(double str ptr) ntdll.EtwFlushTraceA -@ stdcall -stub -version=0x600+ FlushTraceA(double str ptr) +@ stdcall -version=0x600+ FlushTraceA(double str ptr) EtwFlushTraceA @ stdcall -version=0x502 FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW -@ stdcall -stub -version=0x600+ FlushTraceW(double wstr ptr) +@ stdcall -version=0x600+ FlushTraceW(double wstr ptr) EtwFlushTraceW @ stub FreeEncryptedFileKeyInfo @ stdcall FreeEncryptionCertificateHashList(ptr) @ stdcall FreeInheritedFromArray(ptr long ptr) @@ -456,9 +456,9 @@ @ stub ProcessIdleTasks @ stdcall ProcessTrace(ptr long ptr ptr) @ stdcall -version=0x502 QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA -@ stdcall -stub -version=0x600+ QueryAllTracesA(ptr long ptr) +@ stdcall -version=0x600+ QueryAllTracesA(ptr long ptr) EtwQueryAllTracesA @ stdcall -version=0x502 QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW -@ stdcall -stub -version=0x600+ QueryAllTracesW(ptr long ptr) +@ stdcall -version=0x600+ QueryAllTracesW(ptr long ptr) EtwQueryAllTracesW @ stdcall QueryRecoveryAgentsOnEncryptedFile(wstr ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @@ -470,9 +470,9 @@ @ stdcall QueryServiceStatus(long ptr) @ stdcall QueryServiceStatusEx(long long ptr long ptr) @ stdcall -version=0x502 QueryTraceA(double str ptr) ntdll.EtwQueryTraceA -@ stdcall -stub -version=0x600+ QueryTraceA(double str ptr) +@ stdcall -version=0x600+ QueryTraceA(double str ptr) EtwQueryTraceA @ stdcall -version=0x502 QueryTraceW(double str ptr) ntdll.EtwQueryTraceW -@ stdcall -stub -version=0x600+ QueryTraceW(double str ptr) +@ stdcall -version=0x600+ QueryTraceW(double str ptr) EtwQueryTraceW @ stdcall QueryUsersOnEncryptedFile(wstr ptr) @ stdcall ReadEncryptedFileRaw(ptr ptr ptr) @ stdcall ReadEventLogA(long long long ptr long ptr ptr) @@ -608,13 +608,13 @@ @ stdcall StartServiceCtrlDispatcherW(ptr) @ stdcall StartServiceW(long long ptr) @ stdcall -version=0x502 StartTraceA(ptr str ptr) ntdll.EtwStartTraceA -@ stdcall -stub -version=0x600+ StartTraceA(ptr str ptr) +@ stdcall -version=0x600+ StartTraceA(ptr str ptr) EtwStartTraceA @ stdcall -version=0x502 StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW -@ stdcall -stub -version=0x600+ StartTraceW(ptr wstr ptr) +@ stdcall -version=0x600+ StartTraceW(ptr wstr ptr) EtwStartTraceW @ stdcall -version=0x502 StopTraceA(double str ptr) ntdll.EtwStopTraceA -@ stdcall -stub -version=0x600+ StopTraceA(double str ptr) +@ stdcall -version=0x600+ StopTraceA(double str ptr) EtwStopTraceA @ stdcall -version=0x502 StopTraceW(double wstr ptr) ntdll.EtwStopTraceW -@ stdcall -stub -version=0x600+ StopTraceW(double wstr ptr) +@ stdcall -version=0x600+ StopTraceW(double wstr ptr) EtwStopTraceW @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr) @@ -654,7 +654,7 @@ @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory @ stdcall -version=0x502 TraceEvent(double ptr) ntdll.EtwTraceEvent -@ stdcall -stub -version=0x600+ TraceEvent(double ptr) +@ stdcall -version=0x600+ TraceEvent(double ptr) EtwTraceEvent @ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance @ varargs TraceMessage() ntdll.EtwTraceMessage @ stdcall TraceMessageVa() ntdll.EtwTraceMessageVa @@ -667,9 +667,9 @@ @ stub UnregisterIdleTask @ stdcall UnregisterTraceGuids(double) ntdll.EtwUnregisterTraceGuids @ stdcall -version=0x502 UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA -@ stdcall -stub -version=0x600+ UpdateTraceA(double str ptr) +@ stdcall -version=0x600+ UpdateTraceA(double str ptr) EtwUpdateTraceA @ stdcall -version=0x502 UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW -@ stdcall -stub -version=0x600+ UpdateTraceW(double wstr ptr) +@ stdcall -version=0x600+ UpdateTraceW(double wstr ptr) EtwUpdateTraceW @ stub WdmWmiServiceMain @ stub WmiCloseBlock @ stub WmiCloseTraceWithCursor @@ -688,9 +688,9 @@ @ stub WmiMofEnumerateResourcesA @ stub WmiMofEnumerateResourcesW @ stdcall -version=0x502 WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA -@ stdcall -stub -version=0x600+ WmiNotificationRegistrationA(ptr long ptr long long) +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationA(ptr long ptr long long) # EtwNotificationRegistrationA @ stdcall -version=0x502 WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW -@ stdcall -stub -version=0x600+ WmiNotificationRegistrationW(ptr long ptr long long) +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationW(ptr long ptr long long) # EtwNotificationRegistrationW @ stub WmiOpenBlock @ stub WmiOpenTraceWithCursor @ stub WmiParseTraceEvent @@ -704,9 +704,9 @@ @ stub WmiQuerySingleInstanceMultipleW @ stub WmiQuerySingleInstanceW @ stdcall -version=0x502 WmiReceiveNotificationsA(long long long long) ntdll.EtwReceiveNotificationsA -@ stdcall -stub -version=0x600+ WmiReceiveNotificationsA(long long long long) +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsA(long long long long) # EtwReceiveNotificationsA @ stdcall -version=0x502 WmiReceiveNotificationsW(long long long long) ntdll.EtwReceiveNotificationsW -@ stdcall -stub -version=0x600+ WmiReceiveNotificationsW(long long long long) +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsW(long long long long) # EtwReceiveNotificationsW @ stub WmiSetSingleInstanceA @ stub WmiSetSingleInstanceW @ stub WmiSetSingleItemA

3 weeks, 2 days

[reactos] 03/05: [SOFTPUB] Replace some stubs with forwarders

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98e7e643911375193405d… commit 98e7e643911375193405d3d92d967e38cb8adcea Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 30 13:00:57 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [SOFTPUB] Replace some stubs with forwarders --- dll/win32/softpub/softpub.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/softpub/softpub.spec b/dll/win32/softpub/softpub.spec index 11952704e13..2c9f56e1e63 100644 --- a/dll/win32/softpub/softpub.spec +++ b/dll/win32/softpub/softpub.spec @@ -2,9 +2,9 @@ 2 stdcall GenericChainFinalProv(ptr) wintrust.GenericChainFinalProv 3 stdcall HTTPSCertificateTrust(ptr) wintrust.HTTPSCertificateTrust 4 stdcall SoftpubDefCertInit(ptr) wintrust.SoftpubDefCertInit -5 stub SoftpubFreeDefUsageCallData -6 stub SoftpubLoadDefUsageCallData -7 stub AddPersonalTrustDBPages +5 stdcall SoftpubFreeDefUsageCallData(long ptr) wintrust.SoftpubFreeDefUsageCallData +6 stdcall SoftpubLoadDefUsageCallData(long ptr) wintrust.SoftpubLoadDefUsageCallData +7 stdcall AddPersonalTrustDBPages() wintrust.AddPersonalTrustDBPages @ stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer @ stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer 10 stdcall DriverCleanupPolicy(ptr) wintrust.DriverCleanupPolicy

3 weeks, 2 days

[reactos] 02/05: [WINSPOOL.DRV] Improve some stubs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a8ce494761a083585d6… commit a2a8ce494761a083585d66e30db7374d4d384fbd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 1 11:52:07 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [WINSPOOL.DRV] Improve some stubs --- sdk/include/psdk/winspool.h | 2 +- win32ss/printing/base/winspool/devmode.c | 27 +++++++++++++++++++++++ win32ss/printing/base/winspool/printers.c | 33 ++++++++++++++++++++++++++++ win32ss/printing/base/winspool/winspool.spec | 10 ++++----- 4 files changed, 66 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/winspool.h b/sdk/include/psdk/winspool.h index 7d615730405..3750599e6a3 100644 --- a/sdk/include/psdk/winspool.h +++ b/sdk/include/psdk/winspool.h @@ -1011,7 +1011,7 @@ WINBOOL WINAPI EnumPrintersW(DWORD Flags,LPWSTR Name,DWORD Level,LPBYTE pPrinter LONG WINAPI DocumentPropertiesW(HWND hWnd,HANDLE hPrinter,LPWSTR pDeviceName,PDEVMODEW pDevModeOutput,PDEVMODEW pDevModeInput,DWORD fMode); LONG WINAPI AdvancedDocumentPropertiesA(HWND hWnd,HANDLE hPrinter,LPSTR pDeviceName,PDEVMODEA pDevModeOutput,PDEVMODEA pDevModeInput); LONG WINAPI AdvancedDocumentPropertiesW(HWND hWnd,HANDLE hPrinter,LPWSTR pDeviceName,PDEVMODEW pDevModeOutput,PDEVMODEW pDevModeInput); - LONG ExtDeviceMode(HWND hWnd,HANDLE hInst,LPDEVMODEA pDevModeOutput,LPSTR pDeviceName,LPSTR pPort,LPDEVMODEA pDevModeInput,LPSTR pProfile,DWORD fMode); + LONG WINAPI ExtDeviceMode(HWND hWnd,HANDLE hInst,LPDEVMODEA pDevModeOutput,LPSTR pDeviceName,LPSTR pPort,LPDEVMODEA pDevModeInput,LPSTR pProfile,DWORD fMode); DWORD WINAPI GetPrinterDataA(HANDLE hPrinter,LPSTR pValueName,LPDWORD pType,LPBYTE pData,DWORD nSize,LPDWORD pcbNeeded); DWORD WINAPI GetPrinterDataW(HANDLE hPrinter,LPWSTR pValueName,LPDWORD pType,LPBYTE pData,DWORD nSize,LPDWORD pcbNeeded); DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter,LPCSTR pKeyName,LPCSTR pValueName,LPDWORD pType,LPBYTE pData,DWORD nSize,LPDWORD pcbNeeded); diff --git a/win32ss/printing/base/winspool/devmode.c b/win32ss/printing/base/winspool/devmode.c index fd1a615e3f4..e1fb4cedd4a 100644 --- a/win32ss/printing/base/winspool/devmode.c +++ b/win32ss/printing/base/winspool/devmode.c @@ -364,3 +364,30 @@ void RosConvertUnicodeDevModeToAnsiDevmode(PDEVMODEW pDevModeInput, PDEVMODEA pD memcpy( pDevModeOutput, pTmp, pTmp->dmSize + pTmp->dmDriverExtra); // Copy into a Wide char (Larger) buffer. HeapFree(hProcessHeap, 0, pTmp); } + +VOID +WINAPI +DeviceMode( + PVOID param_1, + PVOID param_2, + PCHAR param_3, + PVOID param_4) +{ + UNIMPLEMENTED; +} + +LONG +WINAPI +ExtDeviceMode( + HWND hWnd, + HANDLE hInst, + LPDEVMODEA pDevModeOutput, + LPSTR pDeviceName, + LPSTR pPort, + LPDEVMODEA pDevModeInput, + LPSTR pProfile, + DWORD fMode) +{ + UNIMPLEMENTED; + return 0; +} diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 6011571d341..6f22ce57bc0 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -4059,3 +4059,36 @@ Cleanup: SetLastError(dwErrorCode); return (dwErrorCode == ERROR_SUCCESS); } + +HANDLE +WINAPI +CreatePrinterIC( + _In_ HANDLE hPrinter, + _In_opt_ LPDEVMODEW pDevMode) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +WINAPI +DeletePrinterIC( + _In_ HANDLE hPrinterIC) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +PlayGdiScriptOnPrinterIC( + _In_ HANDLE hPrinterIC, + _In_reads_bytes_(cIn) LPBYTE pIn, + _In_ DWORD cIn, + _Out_writes_bytes_(cOut) LPBYTE pOut, + _In_ DWORD cOut, + _In_ DWORD ul) +{ + UNIMPLEMENTED; + return FALSE; +} diff --git a/win32ss/printing/base/winspool/winspool.spec b/win32ss/printing/base/winspool/winspool.spec index dbd454ca0c5..750499f2f5b 100644 --- a/win32ss/printing/base/winspool/winspool.spec +++ b/win32ss/printing/base/winspool/winspool.spec @@ -40,7 +40,7 @@ 139 stub ConnectToPrinterDlg 140 stub ConvertAnsiDevModeToUnicodeDevmode 141 stub ConvertUnicodeDevModeToAnsiDevmode -142 stdcall -stub CreatePrinterIC(ptr ptr) +142 stdcall CreatePrinterIC(ptr ptr) 143 stdcall DEVICECAPABILITIES(str str long ptr ptr) DeviceCapabilitiesA 144 stdcall DEVICEMODE(ptr ptr str ptr) DeviceMode 145 stdcall DeleteFormA(ptr str) @@ -64,7 +64,7 @@ 163 stdcall DeletePrinterDriverExA(str str str long long) 164 stdcall DeletePrinterDriverExW(wstr wstr wstr long long) 165 stdcall DeletePrinterDriverW(wstr wstr wstr) -166 stdcall -stub DeletePrinterIC(ptr) +166 stdcall DeletePrinterIC(ptr) 167 stdcall DeletePrinterKeyA(ptr str) 168 stdcall DeletePrinterKeyW(ptr wstr) 169 stdcall DevQueryPrint(ptr ptr ptr) @@ -72,7 +72,7 @@ 171 stdcall DeviceCapabilities(str str long ptr ptr) DeviceCapabilitiesA 172 stdcall DeviceCapabilitiesA(str str long ptr ptr) 173 stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) -174 stdcall -stub DeviceMode(ptr ptr str ptr) +174 stdcall DeviceMode(ptr ptr str ptr) 175 stdcall DevicePropertySheets(ptr long) 176 stdcall DocumentEvent(ptr ptr long long ptr long ptr) 177 stdcall DocumentPropertiesA(ptr ptr str ptr ptr long) @@ -134,7 +134,7 @@ 233 stdcall EnumPrinterKeyW(ptr wstr wstr long ptr) 234 stdcall EnumPrintersA(long ptr long ptr long ptr ptr) 235 stdcall EnumPrintersW(long ptr long ptr long ptr ptr) -236 stdcall -stub ExtDeviceMode(ptr ptr ptr str str ptr str long) +236 stdcall ExtDeviceMode(ptr ptr ptr str str ptr str long) 237 stub FindClosePrinterChangeNotification 238 stub FindFirstPrinterChangeNotification 239 stub FindNextPrinterChangeNotification @@ -161,7 +161,7 @@ 260 stdcall IsValidDevmodeW(ptr long) 261 stdcall OpenPrinterA(str ptr ptr) 262 stdcall OpenPrinterW(wstr ptr ptr) -263 stdcall -stub PlayGdiScriptOnPrinterIC(ptr ptr long ptr long long) +263 stdcall PlayGdiScriptOnPrinterIC(ptr ptr long ptr long long) 264 stdcall PrinterMessageBoxA(ptr long ptr str str long) 265 stdcall PrinterMessageBoxW(ptr long ptr wstr wstr long) 266 stdcall PrinterProperties(ptr ptr)

3 weeks, 2 days

[reactos] 01/05: [MSVCRT] Properly export sprintf_s and _vcwprintf

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5ed1198134ad0bb2f66e… commit a5ed1198134ad0bb2f66ef3e0f5332897d06b91b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 27 11:37:41 2020 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [MSVCRT] Properly export sprintf_s and _vcwprintf --- dll/win32/msvcrt/msvcrt.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 605e783ccb7..9e66349fc80 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -1085,7 +1085,7 @@ @ stub -version=0x600+ _vcprintf_p_l @ stub -version=0x600+ _vcprintf_s @ stub -version=0x600+ _vcprintf_s_l -@ stub -version=0x600+ _vcwprintf +@ cdecl -version=0x600+ _vcwprintf(wstr ptr) @ stub -version=0x600+ _vcwprintf_l @ stub -version=0x600+ _vcwprintf_p @ stub -version=0x600+ _vcwprintf_p_l @@ -1452,7 +1452,7 @@ @ cdecl sinh(double) @ cdecl -arch=x86_64,arm sinhf(long) @ varargs sprintf(ptr str) -@ stub -version=0x600+ sprintf_s +@ varargs -version=0x600+ sprintf_s(ptr long str) @ cdecl sqrt(double) @ cdecl -arch=x86_64,arm sqrtf(long) @ cdecl srand(long)

3 weeks, 2 days

[reactos] 01/01: [FREELDR][NDK][X64] Remove KIP0PCRADDRESS definition and mapping

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bed8b2a0a6ebab75d678b… commit bed8b2a0a6ebab75d678be9a5e59c15b427f159a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed May 24 14:16:23 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:31:32 2024 +0300 [FREELDR][NDK][X64] Remove KIP0PCRADDRESS definition and mapping It is not used by either ReactOS or Windows. --- boot/freeldr/freeldr/include/arch/amd64/amd64.h | 4 ---- boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c | 27 +++++++++---------------- sdk/include/ndk/amd64/ketypes.h | 11 ---------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/boot/freeldr/freeldr/include/arch/amd64/amd64.h b/boot/freeldr/freeldr/include/arch/amd64/amd64.h index 17d6214c1a8..c3ffa40856b 100644 --- a/boot/freeldr/freeldr/include/arch/amd64/amd64.h +++ b/boot/freeldr/freeldr/include/arch/amd64/amd64.h @@ -22,10 +22,6 @@ #pragma once #endif -// This is needed because headers define wrong one for ReactOS -#undef KIP0PCRADDRESS -#define KIP0PCRADDRESS 0xFFFFF78000001000ULL /* FIXME!!! */ - #define VA_MASK 0x0000FFFFFFFFFFFFUL #define PtrToPfn(p) \ diff --git a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c index a5fc5a0fc53..174bacd62a9 100644 --- a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c @@ -24,7 +24,7 @@ PHARDWARE_PTE PxeBase; //PHARDWARE_PTE HalPageTable; PVOID GdtIdt; -ULONG_PTR PcrBasePage; +PFN_NUMBER SharedUserDataPfn; ULONG_PTR TssBasePage; /* FUNCTIONS **************************************************************/ @@ -246,15 +246,8 @@ WinLdrMapSpecialPages(VOID) { PHARDWARE_PTE PpeBase, PdeBase; - /* Map the PCR page */ - if (!MempMapSinglePage(KIP0PCRADDRESS, PcrBasePage * PAGE_SIZE)) - { - ERR("Could not map PCR @ %lx\n", PcrBasePage); - return FALSE; - } - /* Map KI_USER_SHARED_DATA */ - if (!MempMapSinglePage(KI_USER_SHARED_DATA, (PcrBasePage+1) * PAGE_SIZE)) + if (!MempMapSinglePage(KI_USER_SHARED_DATA, SharedUserDataPfn * PAGE_SIZE)) { ERR("Could not map KI_USER_SHARED_DATA\n"); return FALSE; @@ -380,22 +373,22 @@ WinLdrSetProcessorContext( void WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG_PTR Pcr = 0; + PVOID SharedUserDataAddress = NULL; ULONG_PTR Tss = 0; ULONG BlockSize, NumPages; LoaderBlock->u.I386.CommonDataArea = (PVOID)DbgPrint; // HACK LoaderBlock->u.I386.MachineType = MACHINE_TYPE_ISA; - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - PcrBasePage = Pcr >> MM_PAGE_SHIFT; - if (Pcr == 0) + /* Allocate 1 page for SharedUserData */ + SharedUserDataAddress = MmAllocateMemoryWithType(MM_PAGE_SIZE, LoaderStartupPcrPage); + SharedUserDataPfn = (ULONG_PTR)SharedUserDataAddress >> MM_PAGE_SHIFT; + if (SharedUserDataAddress == NULL) { - UiMessageBox("Can't allocate PCR."); + UiMessageBox("Can't allocate SharedUserData page."); return; } - RtlZeroMemory((PVOID)Pcr, 2 * MM_PAGE_SIZE); + RtlZeroMemory(SharedUserDataAddress, MM_PAGE_SIZE); /* Allocate TSS */ BlockSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); @@ -422,7 +415,7 @@ void WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock) // FIXME: bugcheck } - /* Map stuff like PCR, KI_USER_SHARED_DATA and Apic */ + /* Map KI_USER_SHARED_DATA, Apic and HAL space */ WinLdrMapSpecialPages(); } diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index 7cdc94fb32e..410e0b55cb0 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -80,17 +80,6 @@ Author: #define KF_FPU_LEAKAGE_BIT 41 // From ksamd64.inc (0x29 -> 0x20000000000) #define KF_CAT_BIT 44 // From ksamd64.inc (0x2C -> 0x100000000000) -// -// KPCR Access for non-IA64 builds -// -//#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) -//#define PCR ((volatile KPCR * const)K0IPCR) -#define PCR ((volatile KPCR * const)__readgsqword(FIELD_OFFSET(KPCR, Self))) -//#if defined(CONFIG_SMP) || defined(NT_BUILD) -//#undef KeGetPcr -//#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) -//#endif - // // Double fault stack size //

3 weeks, 2 days

← Newer
1
...
8
9
10
11
12
13
14
...
8082
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs