Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[tkreuzer] 70427: [CRT_APITEST] - disable GCC builtins - Add simple tests for strlen, showing that a NULL pointer will cause an access violation, which is broken in our asm implementation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 26 19:20:54 2015 New Revision: 70427 URL: http://svn.reactos.org/svn/reactos?rev=70427&view=rev Log: [CRT_APITEST] - disable GCC builtins - Add simple tests for strlen, showing that a NULL pointer will cause an access violation, which is broken in our asm implementation Added: trunk/rostests/apitests/crt/strlen.c (with props) Modified: trunk/rostests/apitests/crt/CMakeLists.txt trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Modified: trunk/rostests/apitests/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] Sat Dec 26 19:20:54 2015 @@ -1,3 +1,7 @@ + +if(GCC) + add_compile_flags("-fno-builtin") +endif() include(ntdll_crt_apitest.cmake) include(msvcrt_crt_apitest.cmake) Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Sat Dec 26 19:20:54 2015 @@ -466,7 +466,7 @@ # strcspn.c # strerror.c # strftime.c -# strlen.c + strlen.c # strncat.c # strncmp.c # strncpy.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Dec 26 19:20:54 2015 @@ -1173,7 +1173,7 @@ # strerror.c # strerror_s.c # strftime.c -# strlen.c + strlen.c # strncat.c # strncat_s # strncmp.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Sat Dec 26 19:20:54 2015 @@ -88,7 +88,7 @@ # strcmp.c strcpy.c # strcspn.c -# strlen.c + strlen.c # strncat.c # strncmp.c # strncpy.c Added: trunk/rostests/apitests/crt/strlen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strlen.c?rev… ============================================================================== --- trunk/rostests/apitests/crt/strlen.c (added) +++ trunk/rostests/apitests/crt/strlen.c [iso-8859-1] Sat Dec 26 19:20:54 2015 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for strlen + * PROGRAMMER: Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <apitest.h> + +#include <stdio.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ntstatus.h> +typedef _Return_type_success_(return >= 0) long NTSTATUS, *PNTSTATUS; + +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wnonnull" + +size_t +GCC_builtin_strlen(const char *str) +{ + return __builtin_strlen(str); +} +#endif + +typedef size_t (*PFN_STRLEN)(const char *); + +void +Test_strlen(PFN_STRLEN pstrlen) +{ + size_t len; + + /* basic parameter tests */ + StartSeh() + len = pstrlen(NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + (void)len; + + ok_int((int)pstrlen("test"), 4); +} + +START_TEST(strlen) +{ + Test_strlen(strlen); +#ifdef __GNUC__ + Test_strlen(GCC_builtin_strlen); +#endif // __GNUC__ +} Propchange: trunk/rostests/apitests/crt/strlen.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sat Dec 26 19:20:54 2015 @@ -15,6 +15,7 @@ extern void func_mbstowcs(void); extern void func_sprintf(void); extern void func_strcpy(void); +extern void func_strlen(void); extern void func_wcstombs(void); extern void func_static_construct(void); @@ -27,6 +28,7 @@ { "mbstowcs", func_mbstowcs }, { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, + { "strlen", func_strlen }, { "wcstombs", func_wcstombs }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ...

8 years, 8 months

[pschweitzer] 70426: [BOOTSECT] fatx.S isn't for the FATX filesystem, it's just a generic naming, so pick up the next variable

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Dec 26 17:44:07 2015 New Revision: 70426 URL: http://svn.reactos.org/svn/reactos?rev=70426&view=rev Log: [BOOTSECT] fatx.S isn't for the FATX filesystem, it's just a generic naming, so pick up the next variable Added: trunk/reactos/boot/freeldr/bootsect/faty.S - copied unchanged from r70425, trunk/reactos/boot/freeldr/bootsect/fatx.S Removed: trunk/reactos/boot/freeldr/bootsect/fatx.S Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Sat Dec 26 17:44:07 2015 @@ -7,15 +7,15 @@ CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) - ## New versions using FATX.S (experimental) + ## New versions using FATY.S (experimental) # add_definitions(-DFAT12) - # CreateBootSectorTarget(fat_new ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat_new.bin 7c00) + # CreateBootSectorTarget(fat_new ${CMAKE_CURRENT_SOURCE_DIR}/faty.S ${CMAKE_CURRENT_BINARY_DIR}/fat_new.bin 7c00) # remove_definitions(-DFAT12) # add_definitions(-DFAT16) - # CreateBootSectorTarget(fat16_new ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat16_new.bin 7c00) + # CreateBootSectorTarget(fat16_new ${CMAKE_CURRENT_SOURCE_DIR}/faty.S ${CMAKE_CURRENT_BINARY_DIR}/fat16_new.bin 7c00) # remove_definitions(-DFAT16) # add_definitions(-DFAT32) - # CreateBootSectorTarget(fat32_new ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat32_new.bin 7c00) + # CreateBootSectorTarget(fat32_new ${CMAKE_CURRENT_SOURCE_DIR}/faty.S ${CMAKE_CURRENT_BINARY_DIR}/fat32_new.bin 7c00) # remove_definitions(-DFAT32) CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) Removed: trunk/reactos/boot/freeldr/bootsect/fatx.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fatx… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fatx.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fatx.S (removed) @@ -1,589 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Bootsector - * FILE: boot/freeldr/bootsect/fatx.S - * PURPOSE: Combined FAT16 and FAT32 boot sector - * PROGRAMMERS: Brian Palmer - * Timo Kreuzer - */ - -#define DISKREADBUFFER HEX(8E000) - -/* - * Layout of a FAT volume: - * - * |--------------------------------------------------------- - * | * BootSector | - * | * FS Information Sector (FAT32 only) | ReservedSectors - * | * ... more reserved sectors ... | - * |-------------------------------------------------------- - * | * FAT 1 | NumberOfFats - * | * FAT 2 | * - * | * [more FATs] | SectorsPerFat - * |--------------------------------------------------------- - * | * Root Directory (FAT12/FAT16 only) | MaxRootEntries / 16 - * |--------------------------------------------------------- - * | * File data | - * | .... | - * |---------------------------------------- - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <freeldr/include/arch/pc/x86common.h> - -#define ADDRESS_FOR_DIRENTRIES HEX(10000) - -SizeOfDataArea = 32 - -/* Put the stack below the data area */ -BootSectorStackTop = (HEX(7c00) - SizeOfDataArea) - -/* Data area offsets for uninitialized data */ -DataAreaStart = BootSectorStackTop + 0 /* dword */ -#ifndef FAT32 -RootDirStartSector = BootSectorStackTop + 4 /* dword */ -#endif -BiosCHSDriveSize = BootSectorStackTop + 8 /* dword */ -LBASectorsRead = BootSectorStackTop + 12 /* dword */ -ReadSectorsOffset = BootSectorStackTop + 16 /* word */ -ReadClusterOffset = BootSectorStackTop + 18 /* word */ -PutCharsOffset = BootSectorStackTop + 20 /* word */ - -/* Macro for bp relative memory access to reduce code size */ -#define BP_REL(x) ss:[bp + x - BootSectorStackTop] - -/* The code starts at 0x7c00 */ -// org 7c00h - -.code16 - -/****************************************************************************** - * BIOS Parameter Block (BPB) * - ******************************************************************************/ -/* We have 3 bytes at the entry point to jump over the data area */ -start: - jmp short main // FIXME: When compiling FAT32, assembler will complain - // that the label is too far... Need investigation! - nop - -/* Here starts the BIOS Parameter Block (BPB) data. - The real data will be copied during install */ -OEMName: - .ascii "FrLdr1.0" -BytesPerSector: - .word 512 -SectorsPerCluster: - .byte 0 -ReservedSectors: - .word 32 -NumberOfFats: - .byte 2 -MaxRootEntries: - .word 0 // Always zero for FAT32 volumes -TotalSectors: - .word 0 // Always zero for FAT32 volumes -MediaDescriptor: - .byte HEX(0f8) -SectorsPerFat: - .word 0 // Always zero for FAT32 volumes -SectorsPerTrack: - .word 0 -NumberOfHeads: - .word 0 -HiddenSectors: - .long 0 -TotalSectorsBig: - .long 0 - -/* Extra data for FAT32 volumes */ -#ifdef FAT32 -SectorsPerFatBig: - .long 0 -ExtendedFlags: - .word 0 -FSVersion: - .word 0 -RootDirStartCluster: - .long 0 -FSInfoSector: - .word 0 -BackupBootSector: - .word 6 -Reserved1: - .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -#endif // FAT32 - -BootDrive: - .byte 0 -Reserved: - .byte 0 -ExtendSig: - .byte HEX(29) -SerialNumber: - .long 0 -VolumeLabel: - .ascii "NO NAME " -FileSystem: - .ascii "FATxx " - - -/****************************************************************************** - * String data * - ******************************************************************************/ - -filename: - .ascii "FREELDR SYS" - -msgBootFailure: - .ascii "Load failed!", CR, LF, NUL - -msgAnyKey: - .ascii "Press any key to reboot...", NUL - - -/****************************************************************************** - * Main code entry * - * Input: DL = Boot drive * - ******************************************************************************/ -main: - /* First setup the segment registers */ - xor ax, ax - mov ds, ax - mov ss, ax - - /* Load the stack pointer */ - mov sp, BootSectorStackTop - - /* Load bp for relative memory access, which saves us some bytes of code - size, when used with 32 bit instructions */ - mov bp, sp - - /* Load the boot drive from the BPB into al */ - mov al, byte ptr ds:[BootDrive] - - /* Check if it's valid */ - cmp al, HEX(0ff) - je .SaveBootDrive - - /* Copy it into dl */ - mov dl, al - -.SaveBootDrive: - /* Save the bootdrive in the BPB */ - mov byte ptr ds:[BootDrive], dl - - -/****************************************************************************** - * Get drive parameters * - ******************************************************************************/ - - /* Call INT 13 to get the drive parameters: - AH = 08h - DL = drive (bit 7 set for hard disk) - ES:DI = 0000h:0000h to guard against BIOS bugs */ - xor di, di - mov ah, 8 - int HEX(13) - - /* Return from INT 13h/08h: - CF set on error -> AH = status (07h) - CF clear if successful -> AH = 00h - AL = 00h on at least some BIOSes - BL = drive type (AT/PS2 floppies only) - CH = low eight bits of maximum cylinder number - CL = bits 0:5 maximum sector number, bits 7:8 high two bits of maximum cylinder number - DH = maximum head number - DL = number of drives - ES:DI -> drive parameter table (floppies only) */ - - /* Check for failure */ - jc BootFailure - - -/****************************************************************************** - * Calculate drive size * - ******************************************************************************/ - - movzx ebx, ch // Put the low 8-bits of the cylinder count into EBX - mov bh, cl // Put the high 2-bits in BH - shr bh, 6 // Shift them into position, now BX contains the cylinder count - - and cl, HEX(3f) // Mask off cylinder bits from sector count - movzx ecx, cl // Move the sectors per track into ECX - - movzx eax, dh // Move the heads into EAX - - inc eax // Make it one based because the bios returns it zero based - inc ebx // Make the cylinder count one based also - mul ecx // Multiply heads with the sectors per track, result in edx:eax - mul ebx // Multiply the cylinders with (heads * sectors) [stored in edx:eax already] - - // We now have the total number of sectors as reported - // by the bios in eax, so store it in our variable - mov dword ptr BP_REL(BiosCHSDriveSize), eax - - -/****************************************************************************** - * Load the FAT * - ******************************************************************************/ - - /* Load the number of first sector of the FAT into eax */ - movzx eax, word ptr BP_REL(ReservedSectors) - add eax, dword ptr BP_REL(HiddenSectors) - - /* Load sector count into ecx */ -#ifdef FAT32 - mov ecx, dword ptr BP_REL(SectorsPerFatBig) -#else - movzx ecx, word ptr BP_REL(SectorsPerFat) -#endif - - /* Save FAT sector and size for later use */ - pushad - - /* Point ES:DI to the memory that is later the disk read buffer for freeldr. - This way we cannot overwrite our FAT with freeldr data */ - mov bx, DISKREADBUFFER / 16 - mov es,bx - xor di, di - - /* Read the sectors */ - call ReadSectors - - /* Restore FAT sector and size */ - popad - - -/****************************************************************************** - * Get root directory / data area start * - ******************************************************************************/ - - /* Copy reserved + hidden sectors to EBX */ - mov ebx, eax - - /* Calculate (NumberOfFats * SectorsPerFat) */ - movzx eax, byte ptr BP_REL(NumberOfFats) - mul ecx - - /* Add reserved sectors and hidden sectors */ - add eax, ebx - -#ifndef FAT32 - /* Save the starting sector of the root directory */ - mov dword ptr BP_REL(RootDirStartSector), eax - - /* Calculate number of sectors for the root dir: - sectors = MaxRootEntries * 32 / 512 (rounded up!) */ - movzx ebx, word ptr BP_REL(MaxRootEntries) - add ebx, 15 - shr ebx, 4 - - /* Add the root dir start sector and save it as DataAreaStart */ - add ebx, eax - mov dword ptr BP_REL(DataAreaStart), ebx -#else - mov dword ptr BP_REL(DataAreaStart), eax - - /* On FAT32 volumes the root dir start cluster is stored in the BPB */ - mov eax, dword ptr BP_REL(RootDirStartCluster) -#endif - - -/****************************************************************************** - * Search the root directory for freeldr * - ******************************************************************************/ -.SearchForFreeldr: - - /* Load ES with the segment where we put the dir entries */ - mov bx, ADDRESS_FOR_DIRENTRIES / 16 - mov es, bx - - /* Set the address offset to 0 */ - xor di, di - -#ifdef FAT32 - /* Read the dir cluster. This loads the next cluster into EAX */ - call ReadCluster - - /* Calculate the numer of dir entries in this cluster: - dx = SectorsPerCluster * 512 / 32 */ - movzx dx, byte ptr ds:[SectorsPerCluster] - shl dx, 4 -#else - /* Set the number of sectors to read to 1 */ - xor cx, cx - inc cx - - /* Read the sector, but preserve ES */ - push es - call ReadSectors - pop es - - /* Set entry count to entries per sector */ - mov dx, (512 / 32) -#endif - - /* Load the start offset of the dir entries into ebx */ - xor bx, bx - -.CheckDirEntry: - /* Load the address of the name into di */ - mov di, bx - - /* If the first byte of the entry is 0 then we have reached the end */ - cmp byte ptr es:[di], ch - jz BootFailure - - /* Compare with freeldr file name */ - mov si, offset filename - mov cx, 11 - repe cmpsb - - /* Check if we found the file */ - jz .FoundFreeLoader - - /* File didn't match, go to next entry */ - add bx, 32 - - /* Decrement entry count and check if we reached the end */ - dec dx - jnz .CheckDirEntry - -#ifdef FAT32 - /* Check to see if this was the last cluster in the chain */ - cmp eax, HEX(0ffffff8) - jnb BootFailure -#endif - - /* Repeat the search process with the next sector / cluster. - eax is already incremented in ReadSectors / ReadCluster */ - jmp .SearchForFreeldr - - -/****************************************************************************** - * Load freeldr * - ******************************************************************************/ -.FoundFreeLoader: - - /* Load the cluster number of freeldr into eax */ -#ifdef FAT32 -#error unsupported -#else - movzx eax, word ptr es:[bx + HEX(1A)] -#endif - - /* Load es:di with the freeldr start address */ - mov dx, FREELDR_BASE / 16 - mov es, dx - xor di, di - -.LoadNextCluster: - /* Load the cluster to the current address. EAX is adjusted to the next - cluster and ES is adjusted for the next read */ - call ReadCluster - - /* Check if this is the last cluster in the chain */ -#if defined(FAT32) - cmp eax, HEX(0ffffff8) -#elif defined(FAT12) - cmp ax, HEX(0ff8) -#else - cmp ax, HEX(0fff8) -#endif - jb .LoadNextCluster - - /* Load boot drive into DL, boot partition into DH */ - mov dl, byte ptr ds:[BootDrive] - mov dh, byte ptr ds:[BootPartition] - - /* Now the complete freeldr imag is loaded. - Jump to the realmode entry point. */ - ljmp16 0, FREELDR_BASE - - - -BootFailure: - mov si, offset msgBootFailure - call PutChars - - -Reboot: - /* Output "Press any key to reboot" message */ - mov si, offset msgAnyKey - call PutChars - - /* Wait for a keypress */ - xor ax, ax - int HEX(16) - - /* Reboot */ - int HEX(19) - - -/****************************************************************************** - * PROCEDURE ReadCluster * - * Input: EAX = Cluster number, ES:DI = Target * - * Modifies: EAX (next cluster number), BX, DX (undefined) * - ******************************************************************************/ -ReadCluster: - - pushad - - // StartSector = ((Cluster - 2) * SectorsPerCluster) + SectorsForFat + ReservedSectors + HiddenSectors - // StartSector = ((Cluster - 2) * SectorsPerCluster) + DataAreaStart - - /* Substract 2 */ - dec eax - dec eax - - /* Multiply with SectorsPerCluster */ - movzx ecx, byte ptr BP_REL(SectorsPerCluster) - mul ecx - - /* Add DataAreaStart */ - add eax, dword ptr BP_REL(DataAreaStart) - - /* Call ReadSectors. EAX = SectorNumber, ECX = SectorsPerCluster */ - call ReadSectors - - /* Restore the cluster number */ - popad - - /* Save ES */ - push es - -#if defined(FAT32) -#error FAT32 not implemented -#elif defined(FAT12) -#error FAT12 not implemented -#else - /* DX:AX = AX * 2 (since FAT16 entries are 2 bytes) */ - mov bx, 2 - mul bx - - /* Shift DX, so that it is the segment offset: DX = DX * (64K / 16) */ - shl dx, 12 - - /* Put segment address of FAT into ES */ - add dx, DISKREADBUFFER / 16 - mov es, dx - - /* Put the FAT entry offset into EBX for indirect mov */ - mov bx, ax - - /* Put the content of the FAT entry into AX */ - mov ax, es:[bx] -#endif - - /* Restore ES and return */ - pop es - ret - - -/****************************************************************************** - * PROCEDURE ReadSectors * - * Input: EAX = Sector start number, ECX = number of sectors, ES:DI = Target * - * Modifies: EAX (incremented by sector count), CX = 0, ES (incremented), * - * EBX undefined * - ******************************************************************************/ -ReadSectors: - /* We could possibly also implement CHS, but it's currently unimplemented */ -//jmp $ -ReadSectorsLBA: - - /* Copy number of sectors to ebx */ - movzx ebx, cx - - /* Since the LBA calls only support 0x7F sectors at a time, - we will limit ourselves to 64 */ - cmp bx, 64 - jbe .ReadSectorsLBA2 - mov bx, 64 - -.ReadSectorsLBA2: - - /* Save logical sector number & sector count */ - pushad - - /* Setup the disk address packet on the stack */ - .byte HEX(66) // size overwrite prefix for next push - push 0 // Put 64-bit logical block address (high part) on stack - push eax // Put 64-bit logical block address (low part) on stack - push es // Put transfer segment on stack - push di // Put transfer offset on stack - push bx // Set transfer count (for this round) - push 16 // Set size of packet to 16 - - /* Point si to the disk address packet on stack */ - mov si, sp - - /* Set the drive number */ - mov dl, byte ptr ds:[BootDrive] -//jmp $ - /* Call INT 13h, AH = 42h - Extended Read - Input: ... - Modifies: ... */ - mov ah, HEX(42) - int HEX(13) -//jmp $ - /* Check for failure */ - jc BootFailure - - /* Remove disk address packet from stack */ - add sp, 16 - - /* Adjust ES to point to the next sector */ - shl bx, 5 - mov ax, es - add ax, bx - mov es, ax - - /* Restore sector count & logical sector number */ - popad - - /* Adjust the sector number to the next sector we need to read - by adding the number of sectors that we read */ - add eax, ebx - - /* Adjust remaining sectors */ - sub cx, bx - jnz ReadSectorsLBA - - /* return */ - ret - - - -/****************************************************************************** - * PROCEDURE PutChars * - * Input: ESI = Points to string to be printed * - * Modifies: AL, AH, SI * - ******************************************************************************/ -PutChars2: - mov ah, HEX(0e) - mov bx, 7 - int HEX(10) -PutChars: - lodsb - or al, al - jnz short PutChars2 - ret - - -/****************************************************************************** - * Padding and boot sector signature * - ******************************************************************************/ - /* Pad to 509 bytes */ - .org 509 - -BootPartition: - .byte 0 - -BootSignature: - .word HEX(0aa55) // BootSector signature - -.endcode16 - -END

8 years, 8 months

[tkreuzer] 70425: [CRT] Add abs and labs to CRT lib [MSVCRT] Explicitly pull in _vsnprintf, bsearch and strcspn from CRT, to prevent the MS linker from exporting stubs from libntdll instead. See CO...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 26 17:13:08 2015 New Revision: 70425 URL: http://svn.reactos.org/svn/reactos?rev=70425&view=rev Log: [CRT] Add abs and labs to CRT lib [MSVCRT] Explicitly pull in _vsnprintf, bsearch and strcspn from CRT, to prevent the MS linker from exporting stubs from libntdll instead. See CORE-10753 Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c trunk/reactos/lib/sdk/crt/crt.cmake Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/dllmain.c [iso-8859-1] Sat Dec 26 17:13:08 2015 @@ -125,4 +125,18 @@ return TRUE; } +/* FIXME: This hack is required to prevent the VC linker from linking these + exports to the functions from libntdll. See CORE-10753 */ +#ifdef _MSC_VER +#ifdef _M_IX86 +#pragma comment(linker, "/include:__vsnprintf") +#pragma comment(linker, "/include:_bsearch") +#pragma comment(linker, "/include:_strcspn") +#else +#pragma comment(linker, "/include:_vsnprintf") +#pragma comment(linker, "/include:bsearch") +#pragma comment(linker, "/include:strcspn") +#endif // _M_IX86 +#endif // _MSC_VER + /* EOF */ Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sat Dec 26 17:13:08 2015 @@ -34,6 +34,7 @@ float/nafter.c float/scalb.c locale/locale.c + math/abs.c math/acos.c math/adjust.c math/asin.c @@ -51,6 +52,7 @@ math/j0_y0.c math/j1_y1.c math/jn_yn.c + math/labs.c math/ldiv.c math/logf.c math/modf.c

8 years, 8 months

[hbelusca] 70424: [NTVDM]: Cast all the number-of-sectors computations to DWORD/ULONG to prevent potential overflows. Should fix a strange floppy read/write corruption I noticed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 26 17:08:13 2015 New Revision: 70424 URL: http://svn.reactos.org/svn/reactos?rev=70424&view=rev Log: [NTVDM]: Cast all the number-of-sectors computations to DWORD/ULONG to prevent potential overflows. Should fix a strange floppy read/write corruption I noticed. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] Sat Dec 26 17:08:13 2015 @@ -608,8 +608,8 @@ setAH(0x03); /* Number of 512-byte sectors in CX:DX */ - NumSectors = DiskImage->DiskInfo.Cylinders * DiskImage->DiskInfo.Heads - * DiskImage->DiskInfo.Sectors; + NumSectors = (ULONG)((ULONG)DiskImage->DiskInfo.Cylinders * DiskImage->DiskInfo.Heads) + * DiskImage->DiskInfo.Sectors; setCX(HIWORD(NumSectors)); setDX(LOWORD(NumSectors)); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sat Dec 26 17:08:13 2015 @@ -342,7 +342,7 @@ /* Set position */ // Compute the offset - FilePointer = ((Cylinder * DiskImage->DiskInfo.Heads + Head) + FilePointer = (DWORD)((DWORD)((DWORD)Cylinder * DiskImage->DiskInfo.Heads + Head) * DiskImage->DiskInfo.Sectors + (Sector - 1)) * DiskImage->DiskInfo.SectorSize; FilePointer = SetFilePointer(DiskImage->hDisk, FilePointer, NULL, FILE_BEGIN); @@ -373,7 +373,7 @@ if (Result != 0x00) return Result; - BytesToRead = NumSectors * DiskImage->DiskInfo.SectorSize; + BytesToRead = (DWORD)NumSectors * DiskImage->DiskInfo.SectorSize; // FIXME: Consider just looping around filling each time the buffer... @@ -434,7 +434,7 @@ if (Result != 0x00) return Result; - BytesToWrite = NumSectors * DiskImage->DiskInfo.SectorSize; + BytesToWrite = (DWORD)NumSectors * DiskImage->DiskInfo.SectorSize; // FIXME: Consider just looping around filling each time the buffer...

8 years, 8 months

[hbelusca] 70423: [BOOTSECTORS] - Use the old fat.S source for compiling the FAT12 boot sector, until FATX.S is completely implemented. - Fix an assembly error in FATX.S - In comments I added exper...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 26 16:57:41 2015 New Revision: 70423 URL: http://svn.reactos.org/svn/reactos?rev=70423&view=rev Log: [BOOTSECTORS] - Use the old fat.S source for compiling the FAT12 boot sector, until FATX.S is completely implemented. - Fix an assembly error in FATX.S - In comments I added experimental FAT12/16/32 targets based on Timo's FATX.S. Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt trunk/reactos/boot/freeldr/bootsect/fatx.S Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Sat Dec 26 16:57:41 2015 @@ -3,8 +3,21 @@ CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) - CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) + + CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) + + ## New versions using FATX.S (experimental) + # add_definitions(-DFAT12) + # CreateBootSectorTarget(fat_new ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat_new.bin 7c00) + # remove_definitions(-DFAT12) + # add_definitions(-DFAT16) + # CreateBootSectorTarget(fat16_new ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat16_new.bin 7c00) + # remove_definitions(-DFAT16) + # add_definitions(-DFAT32) + # CreateBootSectorTarget(fat32_new ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat32_new.bin 7c00) + # remove_definitions(-DFAT32) + CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) Modified: trunk/reactos/boot/freeldr/bootsect/fatx.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fatx… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fatx.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fatx.S [iso-8859-1] Sat Dec 26 16:57:41 2015 @@ -64,7 +64,8 @@ ******************************************************************************/ /* We have 3 bytes at the entry point to jump over the data area */ start: - jmp short main + jmp short main // FIXME: When compiling FAT32, assembler will complain + // that the label is too far... Need investigation! nop /* Here starts the BIOS Parameter Block (BPB) data. @@ -233,8 +234,8 @@ add eax, dword ptr BP_REL(HiddenSectors) /* Load sector count into ecx */ -#if FAT32 - mov ecx, BP_REL(SectorsPerFatBig) +#ifdef FAT32 + mov ecx, dword ptr BP_REL(SectorsPerFatBig) #else movzx ecx, word ptr BP_REL(SectorsPerFat) #endif @@ -350,7 +351,7 @@ dec dx jnz .CheckDirEntry -#if FAT32 +#ifdef FAT32 /* Check to see if this was the last cluster in the chain */ cmp eax, HEX(0ffffff8) jnb BootFailure @@ -367,7 +368,7 @@ .FoundFreeLoader: /* Load the cluster number of freeldr into eax */ -#if FAT32 +#ifdef FAT32 #error unsupported #else movzx eax, word ptr es:[bx + HEX(1A)] @@ -384,9 +385,9 @@ call ReadCluster /* Check if this is the last cluster in the chain */ -#if FAT32 +#if defined(FAT32) cmp eax, HEX(0ffffff8) -#elif FAT12 +#elif defined(FAT12) cmp ax, HEX(0ff8) #else cmp ax, HEX(0fff8) @@ -453,9 +454,9 @@ /* Save ES */ push es -#if FAT32 -#error FAT23 not implemented -#elif FAT12 +#if defined(FAT32) +#error FAT32 not implemented +#elif defined(FAT12) #error FAT12 not implemented #else /* DX:AX = AX * 2 (since FAT16 entries are 2 bytes) */

8 years, 8 months

[ekohl] 70422: [MKHIVE] Fix indentation. No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 26 01:34:49 2015 New Revision: 70422 URL: http://svn.reactos.org/svn/reactos?rev=70422&view=rev Log: [MKHIVE] Fix indentation. No code changes! Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=704… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Sat Dec 26 01:34:49 2015 @@ -150,7 +150,7 @@ CmiAddKeyToHashTable( IN PCMHIVE RegistryHive, IN OUT PCM_KEY_FAST_INDEX HashCell, - IN HCELL_INDEX HashCellIndex, + IN HCELL_INDEX HashCellIndex, IN PCM_KEY_NODE NewKeyCell, IN HCELL_INDEX NKBOffset) { @@ -181,7 +181,7 @@ HashCell->List[i].Cell = NKBOffset; HashCell->List[i].HashKey = HashKey; - HashCell->Count++; + HashCell->Count++; HvMarkCellDirty(&RegistryHive->Hive, HashCellIndex, FALSE); return STATUS_SUCCESS; }

8 years, 8 months

[ekohl] 70421: [BOOTDATA] Add missing service groups.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 26 01:23:10 2015 New Revision: 70421 URL: http://svn.reactos.org/svn/reactos?rev=70421&view=rev Log: [BOOTDATA] Add missing service groups. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Dec 26 01:23:10 2015 @@ -1234,8 +1234,31 @@ "Boot Bus Extender", \ "System Bus Extender", \ "SCSI Miniport", \ + "Port", \ "Primary Disk", \ "SCSI Class", \ + "SCSI CDROM Class", \ + "FSFilter Infrastructure", \ + "FSFilter System", \ + "FSFilter Bottom", \ + "FSFilter Copy Protection", \ + "FSFilter Security Enhancer", \ + "FSFilter Open File", \ + "FSFilter Physical Quota Management", \ + "FSFilter Encryption", \ + "FSFilter Compression", \ + "FSFilter HSM", \ + "FSFilter Cluster File System", \ + "FSFilter System Recovery", \ + "FSFilter Quota Management", \ + "FSFilter Content Screener", \ + "FSFilter Continuous Backup", \ + "FSFilter Replication", \ + "FSFilter Anti-Virus", \ + "FSFilter Undelete", \ + "FSFilter Activity Monitor", \ + "FSFilter Top", \ + "Filter", \ "Boot File System", \ "Base", \ "Pointer Port", \ @@ -1247,16 +1270,29 @@ "Video", \ "Video Save", \ "File System", \ - "Event log", \ + "Event Log", \ + "Streams Drivers", \ + "NDIS Wrapper", \ "COM Infrastructure", \ + "UIGroup", \ + "LocalValidation", \ + "PlugPlay", \ + "PNP_TDI", \ "NDIS", \ - "PNP_TDI", \ "TDI", \ - "PlugPlay", \ + "NetBIOSGroup", \ + "ShellSvcGroup", \ "SchedulerGroup", \ "SpoolerGroup", \ - "UIGroup", \ - "Extended Base" + "AudioGroup", \ + "SmartCardGroup", \ + "NetworkProvider" \ + "RemoteValidation", \ + "NetDDEGroup", \ + "Parallel arbitrator", \ + "Extended Base" \ + "PCI Configuration", \ + "MS Transactions ; Set the timeout for directx/ReactX graphic surface lock see _EDD_DIRECTDRAW_GLOBAL struct for more info HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI","Timeout",0x00010001,0x00000007 @@ -1409,7 +1445,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","DisplayName",0x00000000,"Event Logger" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000000,"Logs events or messages sent by the operating system in a database accessible via the event log viewer" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event log" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event Log" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000,"%SystemRoot%\system32\eventlog.exe" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Start",0x00010001,0x00000002

8 years, 8 months

[ekohl] 70420: [ADVAPI32] - Implement AbortSystemShutdownW by a call to BaseAbortSystemShutdown. - Implement InitiateSystemShutdownW by a call to BaseInitiateSystemShutdown. - Implement InitiateSys...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 26 01:14:18 2015 New Revision: 70420 URL: http://svn.reactos.org/svn/reactos?rev=70420&view=rev Log: [ADVAPI32] - Implement AbortSystemShutdownW by a call to BaseAbortSystemShutdown. - Implement InitiateSystemShutdownW by a call to BaseInitiateSystemShutdown. - Implement InitiateSystemShutdownExW by a call to BaseInitiateSystemShutdownEx. - Add RPC binding code for the winreg server (in winlogon.exe). Added: trunk/reactos/dll/win32/advapi32/service/winreg.c (with props) Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/misc/shutdown.c Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -14,7 +14,8 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl - ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl) + ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl + ${REACTOS_SOURCE_DIR}/include/reactos/idl/winreg.idl) list(APPEND SOURCE misc/dllmain.c @@ -37,6 +38,7 @@ service/rpc.c service/scm.c service/sctrl.c + service/winreg.c token/token.c wine/cred.c wine/crypt.c @@ -52,7 +54,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.c ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c - ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) + ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c + ${CMAKE_CURRENT_BINARY_DIR}/winreg_c.c) set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -35,6 +35,7 @@ #include <services/services.h> #include <svcctl_c.h> +#include <winreg_c.h> #include <wine/debug.h> #include <wine/unicode.h> Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -9,22 +9,7 @@ #include <advapi32.h> -#include <ndk/exfuncs.h> - WINE_DEFAULT_DEBUG_CHANNEL(advapi); - -/********************************************************************** - * AbortSystemShutdownW - * - * @unimplemented - */ -BOOL WINAPI -AbortSystemShutdownW(LPCWSTR lpMachineName) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /********************************************************************** * AbortSystemShutdownA @@ -53,28 +38,37 @@ return rv; } + /********************************************************************** - * InitiateSystemShutdownW + * AbortSystemShutdownW * * @implemented */ BOOL WINAPI -InitiateSystemShutdownW(LPWSTR lpMachineName, - LPWSTR lpMessage, - DWORD dwTimeout, - BOOL bForceAppsClosed, - BOOL bRebootAfterShutdown) -{ - return InitiateSystemShutdownExW(lpMachineName, - lpMessage, - dwTimeout, - bForceAppsClosed, - bRebootAfterShutdown, - SHTDN_REASON_MAJOR_OTHER | - SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED - /* SHTDN_REASON_MAJOR_LEGACY_API */); -} +AbortSystemShutdownW(LPCWSTR lpMachineName) +{ + DWORD dwError; + + RpcTryExcept + { + dwError = BaseAbortSystemShutdown((PREGISTRY_SERVER_NAME)lpMachineName); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RtlNtStatusToDosError(RpcExceptionCode()); + } + RpcEndExcept; + + if (dwError != ERROR_SUCCESS) + { + TRACE("BaseAbortSystemShutdown() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + /********************************************************************** * InitiateSystemShutdownA @@ -89,16 +83,167 @@ BOOL bForceAppsClosed, BOOL bRebootAfterShutdown) { - return InitiateSystemShutdownExA(lpMachineName, - lpMessage, - dwTimeout, - bForceAppsClosed, - bRebootAfterShutdown, - SHTDN_REASON_MAJOR_OTHER | - SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED - /* SHTDN_REASON_MAJOR_LEGACY_API */); -} + ANSI_STRING MachineNameA, MessageA; + UNICODE_STRING MachineNameW, MessageW; + NTSTATUS Status; + BOOL res; + + MachineNameW.Buffer = NULL; + MessageW.Buffer = NULL; + + if (lpMachineName) + { + RtlInitAnsiString(&MachineNameA, lpMachineName); + Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); + if (STATUS_SUCCESS != Status) + { + if(MachineNameW.Buffer) + RtlFreeUnicodeString(&MachineNameW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + if (lpMessage) + { + RtlInitAnsiString(&MessageA, lpMessage); + Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); + if (STATUS_SUCCESS != Status) + { + if (MessageW.Buffer) + RtlFreeUnicodeString(&MessageW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + res = InitiateSystemShutdownW(MachineNameW.Buffer, + MessageW.Buffer, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown); + + /* Clear the values of both strings */ + if (lpMachineName) + RtlFreeUnicodeString(&MachineNameW); + + if (lpMessage) + RtlFreeUnicodeString(&MessageW); + + return res; +} + + +/********************************************************************** + * InitiateSystemShutdownW + * + * @implemented + */ +BOOL WINAPI +InitiateSystemShutdownW(LPWSTR lpMachineName, + LPWSTR lpMessage, + DWORD dwTimeout, + BOOL bForceAppsClosed, + BOOL bRebootAfterShutdown) +{ + UNICODE_STRING Message; + DWORD dwError; + + RtlInitUnicodeString(&Message, lpMessage); + + RpcTryExcept + { + dwError = BaseInitiateSystemShutdown((PREGISTRY_SERVER_NAME)lpMachineName, + (PRPC_UNICODE_STRING)&Message, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RtlNtStatusToDosError(RpcExceptionCode()); + } + RpcEndExcept; + + if (dwError != ERROR_SUCCESS) + { + TRACE("BaseInitiateSystemShutdown() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + + +/****************************************************************************** + * InitiateSystemShutdownExA [ADVAPI32.@] + * + * see InitiateSystemShutdownExW + */ +BOOL WINAPI +InitiateSystemShutdownExA(LPSTR lpMachineName, + LPSTR lpMessage, + DWORD dwTimeout, + BOOL bForceAppsClosed, + BOOL bRebootAfterShutdown, + DWORD dwReason) +{ + ANSI_STRING MachineNameA, MessageA; + UNICODE_STRING MachineNameW, MessageW; + NTSTATUS Status; + BOOL res; + + MachineNameW.Buffer = NULL; + MessageW.Buffer = NULL; + + if (lpMachineName) + { + RtlInitAnsiString(&MachineNameA, lpMachineName); + Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); + if (STATUS_SUCCESS != Status) + { + if(MachineNameW.Buffer) + RtlFreeUnicodeString(&MachineNameW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + if (lpMessage) + { + RtlInitAnsiString(&MessageA, lpMessage); + Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); + if (STATUS_SUCCESS != Status) + { + if (MessageW.Buffer) + RtlFreeUnicodeString(&MessageW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + res = InitiateSystemShutdownExW(MachineNameW.Buffer, + MessageW.Buffer, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + dwReason); + + /* Clear the values of both strings */ + if (lpMachineName) + RtlFreeUnicodeString(&MachineNameW); + + if (lpMessage) + RtlFreeUnicodeString(&MessageW); + + return res; +} + /****************************************************************************** * InitiateSystemShutdownExW [ADVAPI32.@] @@ -113,109 +258,36 @@ BOOL bRebootAfterShutdown, DWORD dwReason) { - SHUTDOWN_ACTION action; - NTSTATUS Status; - ULONG Timeout_ms; - - DBG_UNREFERENCED_LOCAL_VARIABLE(Timeout_ms); - - /* Convert to milliseconds so we can use the value later on */ - Timeout_ms = dwTimeout * 1000; - - if (lpMachineName != NULL) - { - /* FIXME: Remote system shutdown not supported yet */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + UNICODE_STRING Message; + DWORD dwError; + + RtlInitUnicodeString(&Message, lpMessage); + + RpcTryExcept + { + dwError = BaseInitiateSystemShutdownEx((PREGISTRY_SERVER_NAME)lpMachineName, + (PRPC_UNICODE_STRING)&Message, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + dwReason); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + if (dwError != ERROR_SUCCESS) + { + TRACE("BaseInitiateSystemShutdownEx() failed (Error %lu)\n", dwError); + SetLastError(dwError); return FALSE; } - else /* The local system is being used */ - { - /* FIXME: Right now, only basic shutting down and rebooting - is supported */ - if(bRebootAfterShutdown == TRUE) - { - action = ShutdownReboot; - } - else - { - action = ShutdownNoReboot; - } - - Status = NtShutdownSystem(action); - } - - SetLastError(RtlNtStatusToDosError(Status)); - return (Status == STATUS_SUCCESS); -} - -/****************************************************************************** - * InitiateSystemShutdownExA [ADVAPI32.@] - * - * see InitiateSystemShutdownExW - */ -BOOL WINAPI -InitiateSystemShutdownExA(LPSTR lpMachineName, - LPSTR lpMessage, - DWORD dwTimeout, - BOOL bForceAppsClosed, - BOOL bRebootAfterShutdown, - DWORD dwReason) -{ - ANSI_STRING MachineNameA, MessageA; - UNICODE_STRING MachineNameW, MessageW; - NTSTATUS Status; - INT LastError; - BOOL rv; - - MachineNameW.Buffer = NULL; - MessageW.Buffer = NULL; - - if (lpMachineName) - { - RtlInitAnsiString(&MachineNameA, lpMachineName); - Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); - if (STATUS_SUCCESS != Status) - { - if(MachineNameW.Buffer) - RtlFreeUnicodeString(&MachineNameW); - - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - if (lpMessage) - { - RtlInitAnsiString(&MessageA, lpMessage); - Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); - if (STATUS_SUCCESS != Status) - { - if (MessageW.Buffer) - RtlFreeUnicodeString(&MessageW); - - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - rv = InitiateSystemShutdownExW(MachineNameW.Buffer, - MessageW.Buffer, - dwTimeout, - bForceAppsClosed, - bRebootAfterShutdown, - dwReason); - LastError = GetLastError(); - - /* Clear the values of both strings */ - if (lpMachineName) - RtlFreeUnicodeString(&MachineNameW); - - if (lpMessage) - RtlFreeUnicodeString(&MessageW); - - SetLastError(LastError); - return rv; -} + + return TRUE; +} + /****************************************************************************** * InitiateShutdownW [ADVAPI32.@] Added: trunk/reactos/dll/win32/advapi32/service/winreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/winreg.c (added) +++ trunk/reactos/dll/win32/advapi32/service/winreg.c [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -0,0 +1,72 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/advapi32/service/winreg.c + * PURPOSE: Remote registry functions + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include <advapi32.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + + +/* FUNCTIONS *****************************************************************/ + + +handle_t __RPC_USER +PREGISTRY_SERVER_NAME_bind(PREGISTRY_SERVER_NAME pszServerName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("PREGISTRY_SERVER_NAME_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszServerName, + L"\\pipe\\winreg", + NULL, + &pszStringBinding); + if (status != RPC_S_OK) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status != RPC_S_OK) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status != RPC_S_OK) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +PREGISTRY_SERVER_NAME_unbind(PREGISTRY_SERVER_NAME pszServerName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("PREGISTRY_SERVER_NAME_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status != RPC_S_OK) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/advapi32/service/winreg.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 8 months

[ekohl] 70419: [SHUTDOWN][WINLOGON] SHUTDOWN: Fix the hack be calling InitiateSystemShutdownExW instead of ExitWindowsEx. WINLOGON: Add a hack by calling ExitWindowsEx in BaseInitiateSystemShutdownEx.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 26 00:38:37 2015 New Revision: 70419 URL: http://svn.reactos.org/svn/reactos?rev=70419&view=rev Log: [SHUTDOWN][WINLOGON] SHUTDOWN: Fix the hack be calling InitiateSystemShutdownExW instead of ExitWindowsEx. WINLOGON: Add a hack by calling ExitWindowsEx in BaseInitiateSystemShutdownEx. Modified: trunk/reactos/base/applications/shutdown/shutdown.c trunk/reactos/base/system/winlogon/rpcserver.c Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] Sat Dec 26 00:38:37 2015 @@ -342,20 +342,13 @@ return EXIT_SUCCESS; } - /** - ** HACK: When InitiateSystemShutdownExW will become really implemented, - ** activate this line and delete the other... - ** - if(!InitiateSystemShutdownExW(opts.remote_system, - opts.message, - opts.shutdown_delay, - opts.force, - opts.restart, - opts.reason)) - ***/ - if (!ExitWindowsEx((opts.shutdown ? EWX_SHUTDOWN : EWX_REBOOT) | - (opts.force ? EWX_FORCE : 0), - opts.reason)) + /* Initiate the shutdown */ + if (!InitiateSystemShutdownExW(opts.remote_system, + opts.message, + opts.shutdown_delay, + opts.force, + opts.restart, + opts.reason)) { /* * If there is an error, give the proper output depending Modified: trunk/reactos/base/system/winlogon/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rpcse… ============================================================================== --- trunk/reactos/base/system/winlogon/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/rpcserver.c [iso-8859-1] Sat Dec 26 00:38:37 2015 @@ -21,7 +21,7 @@ { RPC_STATUS Status; - TRACE("ScmStartRpcServer() called\n"); + TRACE("StartRpcServer() called\n"); Status = RpcServerUseProtseqEpW(L"ncacn_np", 10, @@ -415,7 +415,12 @@ BOOLEAN bRebootAfterShutdown) { TRACE("BaseInitiateSystemShutdown()\n"); - return ERROR_SUCCESS; + return BaseInitiateSystemShutdownEx(ServerName, + lpMessage, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + 0); } @@ -425,7 +430,7 @@ BaseAbortSystemShutdown( PREGISTRY_SERVER_NAME ServerName) { - TRACE("\n"); + TRACE("BaseAbortSystemShutdown()\n"); return ERROR_SUCCESS; } @@ -492,8 +497,19 @@ BOOLEAN bRebootAfterShutdown, ULONG dwReason) { - TRACE("\n"); - return ERROR_SUCCESS; + TRACE("BaseInitiateSystemShutdownEx()\n"); + TRACE(" Message: %wZ\n", lpMessage); + TRACE(" Timeout: %lu\n", dwTimeout); + TRACE(" Force: %d\n", bForceAppsClosed); + TRACE(" Reboot: %d\n", bRebootAfterShutdown); + TRACE(" Reason: %lu\n", dwReason); + +// return ERROR_SUCCESS; + + /* FIXME */ + return ExitWindowsEx((bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | + (bForceAppsClosed ? EWX_FORCE : 0), + dwReason); }

8 years, 8 months

[hbelusca] 70418: [NTOS] Disable again the DR7 check until we correctly understand why bit 10 of DR7 (reserved) is almost always set (this lead to MSVC-built ReactOS crashing when being starting in...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 26 00:29:07 2015 New Revision: 70418 URL: http://svn.reactos.org/svn/reactos?rev=70418&view=rev Log: [NTOS] Disable again the DR7 check until we correctly understand why bit 10 of DR7 (reserved) is almost always set (this lead to MSVC-built ReactOS crashing when being starting in non-debugging mode). See also r69244. CORE-10165 #comment DR7 check again disabled in r70418. Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sat Dec 26 00:29:07 2015 @@ -177,7 +177,7 @@ CheckDr(1, Prcb->ProcessorState.SpecialRegisters.KernelDr1); CheckDr(2, Prcb->ProcessorState.SpecialRegisters.KernelDr2); CheckDr(3, Prcb->ProcessorState.SpecialRegisters.KernelDr3); - CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7); + // CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7); // Disabled, see CORE-10165 for more details. } #endif

8 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
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 December 2015