Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[cfinck] 28628: Ok, we don't disable the creation of the regedit shortcut, but move it to the system32 directory. This way it can be started.
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 23:47:00 2007 New Revision: 28628 URL: http://svn.reactos.org/svn/reactos?rev=28628&view=rev Log: Ok, we don't disable the creation of the regedit shortcut, but move it to the system32 directory. This way it can be started. Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bo… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff (original) +++ branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff Tue Aug 28 23:47:00 2007 @@ -54,7 +54,7 @@ base\applications\network\tracert\tracert.exe 1 base\applications\network\whois\whois.exe 1 base\applications\notepad\notepad.exe 1 -base\applications\regedit\regedit.exe 4 +base\applications\regedit\regedit.exe 1 base\applications\regedit\clb\clb.dll 1 base\applications\sc\sc.exe 1 base\applications\screensavers\cylfrac\cylfrac.scr 1 Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Tue Aug 28 23:47:00 2007 @@ -606,7 +606,7 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, FALSE); - //CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\system32\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); }

1 0

[cfinck] 28627: Don't create the "ReactOS Explorer" and "Regedit" shortcuts. In my opinion, this is better than trying to fix the Regedit shortcut by moving the file to the "system32" directory.
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 23:08:09 2007 New Revision: 28627 URL: http://svn.reactos.org/svn/reactos?rev=28627&view=rev Log: Don't create the "ReactOS Explorer" and "Regedit" shortcuts. In my opinion, this is better than trying to fix the Regedit shortcut by moving the file to the "system32" directory. Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Tue Aug 28 23:08:09 2007 @@ -593,7 +593,7 @@ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); /* Create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE); + //CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE); CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create administrative tools startmenu shortcuts */ @@ -606,7 +606,7 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); + //CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); }

1 0

[janderwald] 28626: - update documentation - implement wait for linux
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 23:06:02 2007 New Revision: 28626 URL: http://svn.reactos.org/svn/reactos?rev=28626&view=rev Log: - update documentation - implement wait for linux Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Tue Aug 28 23:06:02 2007 @@ -93,7 +93,7 @@ } #else /********************************************************************************************************************/ - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool wait) { ProcessID pid; @@ -107,7 +107,14 @@ execv(procname, procargs); return 0; } - + else + { + /* parent process */ + if (wait) + { + waitpid(pid, NULL, WNOHANG); + } + } return pid; } Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Tue Aug 28 23:06:02 2007 @@ -16,6 +16,7 @@ #include <unistd.h> #include <sys/types.h> #include <signal.h> +#include <sys/wait.h> #endif #include "user_types.h" Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Tue Aug 28 23:06:02 2007 @@ -17,7 +17,8 @@ ; ROS_HDD_IMAGE ; ; The hdd image to use for running the emulator. If this variable is not -; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It will search +; set, SysReg will create a HDD with name "ros.hd" in the ROS_OUTPUT +; directory using the qemu-img tool. It will search ; this tool in the directory of emulator and abort if the tool cannot be found ROS_HDD_IMAGE=~/reactos/qemu/ReactOS.hd ;ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd

1 0

[cfinck] 28625: Merge 28537 and 28575 (fireball's freeldr changes)
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 23:01:54 2007 New Revision: 28625 URL: http://svn.reactos.org/svn/reactos?rev=28625&view=rev Log: Merge 28537 and 28575 (fireball's freeldr changes) Modified: branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bo… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c Tue Aug 28 23:01:54 2007 @@ -599,7 +599,7 @@ if (LoaderBlock.MmapLength) { ULONG i; - + LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c Tue Aug 28 23:01:54 2007 @@ -142,7 +142,7 @@ { /* Check if it's not the SYSTEM hive that we already initialized */ if ((MdBlock->BasePage) != - ((ULONG_PTR)KeLoaderBlock->RegistryBase >> PAGE_SHIFT)) + (((ULONG_PTR)KeLoaderBlock->RegistryBase &~ KSEG0_BASE) >> PAGE_SHIFT)) { /* Hardware hive break out */ break; @@ -156,7 +156,7 @@ /* We need a hardware hive */ ASSERT(MdBlock); *Length = MdBlock->PageCount << PAGE_SHIFT; - return (PVOID)(MdBlock->BasePage << PAGE_SHIFT); + return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); } VOID Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c Tue Aug 28 23:01:54 2007 @@ -23,6 +23,12 @@ /* FreeLDR Loader Data */ PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; BOOLEAN AcpiTableDetected; +ADDRESS_RANGE KeMemoryMap[64]; +ULONG KeMemoryMapRangeCount; + +/* NT Loader Module/Descriptor Count */ +ULONG BldrCurrentMd; +ULONG BldrCurrentMod; /* NT Loader Data. Eats up about 80KB! */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; // 0x0000 @@ -44,6 +50,15 @@ // 0x1443C /* FUNCTIONS *****************************************************************/ + +PMEMORY_ALLOCATION_DESCRIPTOR +NTAPI +KiRosGetMdFromArray(VOID) +{ + /* Return the next MD from the list, but make sure we don't overflow */ + if (BldrCurrentMd > 64) KEBUGCHECK(0); + return &BldrMemoryDescriptors[BldrCurrentMd++]; +} VOID NTAPI @@ -69,6 +84,7 @@ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; MmFreeLdrMemHigher = RosLoaderBlock->MemHigher; MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; + if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ *NtLoaderBlock = LoaderBlock = &BldrLoaderBlock; @@ -88,6 +104,64 @@ InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); InitializeListHead(&LoaderBlock->BootDriverListHead); InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); + + /* Create one large blob of free memory */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFree; + MdEntry->BasePage = 0; + MdEntry->PageCount = MmFreeLdrMemHigher / 4; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* + * FIXME: Instead of just "inserting" MDs into the list, + * we need to make then be "consumed" from the Free Descriptor. + * This will happen soon (and also ensure a sorted list). + */ + + /* Loop the BIOS Memory Map */ + for (j = 0; j < KeMemoryMapRangeCount; j++) + { + /* Check if this is a reserved entry */ + if (KeMemoryMap[j].Type == 2) + { + /* It is, build an entry for it */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderSpecialMemory; + MdEntry->BasePage = KeMemoryMap[j].BaseAddrLow >> PAGE_SHIFT; + MdEntry->PageCount = (KeMemoryMap[j].LengthLow + PAGE_SIZE - 1) >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + } + } + + /* Page 0 is reserved: build an entry for it */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFirmwarePermanent; + MdEntry->BasePage = 0; + MdEntry->PageCount = 1; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Build an entry for the KPCR (which we put in page 1) */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderMemoryData; + MdEntry->BasePage = 1; + MdEntry->PageCount = 1; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Build an entry for the PDE */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderMemoryData; + MdEntry->BasePage = (ULONG_PTR)MmGetPageDirectory() >> PAGE_SHIFT; + MdEntry->PageCount = (MmFreeLdrPageDirectoryEnd - + (ULONG_PTR)MmGetPageDirectory()) / PAGE_SIZE; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Mark Video ROM as reserved */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFirmwarePermanent; + MdEntry->BasePage = 0xA0000 >> PAGE_SHIFT; + MdEntry->PageCount = (0xE8000 - 0xA0000) / PAGE_SIZE; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); /* Loop boot driver list */ for (i = 0; i < RosLoaderBlock->ModsCount; i++) @@ -106,9 +180,9 @@ LoaderBlock->NlsData->AnsiCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1)>> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -121,9 +195,9 @@ LoaderBlock->NlsData->OemCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -136,9 +210,9 @@ LoaderBlock->NlsData->UnicodeCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -158,9 +232,9 @@ LoaderBlock->SetupLdrBlock = NULL; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderRegistryData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -173,9 +247,9 @@ { /* Create an MD for it */ ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderRegistryData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -186,9 +260,9 @@ if (!(_stricmp(DriverName, "ntoskrnl.exe"))) { /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderSystemCode; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -196,9 +270,9 @@ else if (!(_stricmp(DriverName, "hal.dll"))) { /* Create an MD for the HAL */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderHalCode; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -206,9 +280,9 @@ else { /* Create an MD for any driver */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderBootDriver; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -351,6 +425,7 @@ IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { PLOADER_PARAMETER_BLOCK NtLoaderBlock; + ULONG size, i; #if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; @@ -383,6 +458,39 @@ MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - KSEG0_BASE + 0x200000; + KeMemoryMapRangeCount = 0; + if (LoaderBlock->Flags & MB_FLAGS_MMAP_INFO) + { + /* We have a memory map from the nice BIOS */ + size = *((PULONG)(LoaderBlock->MmapAddr - sizeof(ULONG))); + i = 0; + + /* Map it until we run out of size */ + while (i < LoaderBlock->MmapLength) + { + /* Copy into the Kernel Memory Map */ + memcpy (&KeMemoryMap[KeMemoryMapRangeCount], + (PVOID)(LoaderBlock->MmapAddr + i), + sizeof(ADDRESS_RANGE)); + + /* Increase Memory Map Count */ + KeMemoryMapRangeCount++; + + /* Increase Size */ + i += size; + } + + /* Save data */ + LoaderBlock->MmapLength = KeMemoryMapRangeCount * sizeof(ADDRESS_RANGE); + LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + } + else + { + /* Nothing from BIOS */ + LoaderBlock->MmapLength = 0; + LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + } + #if defined(_M_IX86) /* Set up the VDM Data */ NtEarlyInitVdm(); Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c Tue Aug 28 23:01:54 2007 @@ -17,6 +17,10 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; + +/* BIOS Memory Map. Not NTLDR-compliant yet */ +extern ULONG KeMemoryMapRangeCount; +extern ADDRESS_RANGE KeMemoryMap[64]; /* FUNCTIONS *****************************************************************/ @@ -536,8 +540,8 @@ MmInit1(MmFreeLdrFirstKrnlPhysAddr, MmFreeLdrLastKrnlPhysAddr, MmFreeLdrLastKernelAddress, - NULL, - 0, + KeMemoryMap, + KeMemoryMapRangeCount, 4096); /* Set basic CPU Features that user mode can read */ Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c Tue Aug 28 23:01:54 2007 @@ -296,6 +296,34 @@ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } +PCHAR +MemType[] = { + "ExceptionBlock ", // ? + "SystemBlock ", // ? + "Free ", + "Bad ", // used + "LoadedProgram ", // == Free + "FirmwareTemporary ", // == Free + "FirmwarePermanent ", // == Bad + "OsloaderHeap ", // used + "OsloaderStack ", // == Free + "SystemCode ", + "HalCode ", + "BootDriver ", // not used + "ConsoleInDriver ", // ? + "ConsoleOutDriver ", // ? + "StartupDpcStack ", // ? + "StartupKernelStack", // ? + "StartupPanicStack ", // ? + "StartupPcrPage ", // ? + "StartupPdrPage ", // ? + "RegistryData ", // used + "MemoryData ", // not used + "NlsData ", // used + "SpecialMemory ", // == Bad + "BBTMemory " // == Bad +}; + VOID INIT_FUNCTION NTAPI @@ -319,6 +347,25 @@ LastKrnlPhysAddr, LastKernelAddress); + /* Dump memory descriptors */ + { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG TotalPages = 0; + + DPRINT1("Base\t\tLength\t\tType\n"); + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + DPRINT1("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); + TotalPages += Md->PageCount; + } + + DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); + } + /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory();

1 0

[janderwald] 28624: - silence a few debug messages - implement creating of disk images with qemu-img for windows
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 22:41:08 2007 New Revision: 28624 URL: http://svn.reactos.org/svn/reactos?rev=28624&view=rev Log: - silence a few debug messages - implement creating of disk images with qemu-img for windows Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Tue Aug 28 22:41:08 2007 @@ -84,7 +84,7 @@ ConfigMap::iterator it = m_Map.find (ConfVariable); if (it == m_Map.end ()) { - cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; + //cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; return false; } Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Tue Aug 28 22:41:08 2007 @@ -25,36 +25,66 @@ return ret; } - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool wait) { STARTUPINFO siStartInfo; PROCESS_INFORMATION piProcInfo; OsSupport::ProcessID pid; - - UNREFERENCED_PARAMETER(procargsnum); - UNREFERENCED_PARAMETER(procargs); - + DWORD length = 0; + TCHAR * szBuffer; + TCHAR * cmd; ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); siStartInfo.cb = sizeof(STARTUPINFO); siStartInfo.wShowWindow = SW_SHOWNORMAL; siStartInfo.dwFlags = STARTF_USESHOWWINDOW; + + if (procargsnum) + { + for (int i = 0; i < procargsnum; i++) + { + length += _tcslen(procargs[i]); + } - LPTSTR command = _tcsdup(procname); + length += procargsnum; + szBuffer = (TCHAR*)malloc(length * sizeof(TCHAR)); + length = 0; + for (int i = 0; i < procargsnum; i++) + { + _tcscpy(&szBuffer[length], procargs[i]); + length += _tcslen(procargs[i]); + szBuffer[length] = _T(' '); + length++; + } + length = _tcslen(procname) + _tcslen(szBuffer) + 2; + cmd = (TCHAR*)malloc(length * sizeof(TCHAR)); + _tcscpy(cmd, procname); + _tcscat(cmd, _T(" ")); + _tcscat(cmd, szBuffer); + free(szBuffer); + } + else + { + cmd = _tcsdup(procname); - if (!CreateProcess(NULL, procname, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) + } + if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) { - cerr << "Error: CreateProcess failed " << command <<endl; + cerr << "Error: CreateProcess failed " << cmd << endl; pid = 0; } else { pid = piProcInfo.dwProcessId; + if (wait) + { + WaitForSingleObject(piProcInfo.hThread, INFINITE); + } CloseHandle(piProcInfo.hProcess); CloseHandle(piProcInfo.hThread); } - free(command); + free(cmd); return pid; } void OsSupport::sleep(long value) Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Tue Aug 28 22:41:08 2007 @@ -62,7 +62,7 @@ /// /// - static ProcessID createProcess(TCHAR * procname, int procargsnum, TCHAR ** procargs); + static ProcessID createProcess(TCHAR * procname, int procargsnum, TCHAR ** procargs, bool wait); //--------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Aug 28 22:41:08 2007 @@ -15,6 +15,7 @@ //#include "sym_file.h" #include "file_reader.h" #include "os_support.h" +#include "env_var.h" #include <iostream> #include <vector> @@ -36,6 +37,7 @@ /* using System_::SymbolFile; */ using System_::FileReader; using System_::OsSupport; + using System_::EnvironmentVariable; #ifdef UNICODE using std::wofstream; @@ -74,7 +76,7 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::executeBootCmd() { - m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL); + m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL, false); if (!m_Pid) { cerr << "Error: failed to launch boot cmd" << m_BootCmd << endl; @@ -140,15 +142,34 @@ string qemuimgdir = qemupath; m_HDDImage = _T("ros.img"); #ifdef __LINUX___ - qemuimgdir += _T("qemu-img"); + qemuimgdir += _T("\\qemu-img"); #else - qemuimgdir += _T("qemu-img.exe"); + qemuimgdir += _T("\\qemu-img.exe"); #endif /// /// FIXME /// call qemu-img to create the tool /// - cerr << "Creating HDD Image ..." << qemuimgdir << endl; + TCHAR * options[] = { + _T("create"), + NULL, + _T("100M"), + NULL + }; + string output = "output-i386"; + EnvironmentVariable::getValue(_T("ROS_OUTPUT"), output); + output += _T("\\ros.hd"); + options[1] = (TCHAR*)output.c_str(); + + cerr << "Creating HDD Image ..." << output << endl; + if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 3, options, true)) + { + m_HDDImage = output; + } + else + { + return false; + } } if (!bootcmdprovided) @@ -170,11 +191,11 @@ if (bootfromcd) { - m_BootCmd = m_EmuPath + _T(" -serial ") + pipe + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage; + m_BootCmd = m_EmuPath + _T(" -serial ") + pipe + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage + _T(" -L ") + qemupath; } else { - m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial ") + pipe; + m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial ") + pipe + _T(" -hda ") + m_HDDImage; } if (m_KillEmulator == _T("yes"))

1 0

[janderwald] 28623: - include unattend.inf from boot/bootdata/bootcdregtest
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 21:32:30 2007 New Revision: 28623 URL: http://svn.reactos.org/svn/reactos?rev=28623&view=rev Log: - include unattend.inf from boot/bootdata/bootcdregtest Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Aug 28 21:32:30 2007 @@ -3306,6 +3306,10 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; + string srcunattend = NormalizeFilename("boot/bootdata/bootcdregtest/unattend.inf"); + string tarunattend = NormalizeFilename("$(OUTPUT)/cd/reactos/unattend.inf"); + + vector<string> vCdFiles; string bootcd = PassThruCacheDirectory ( NormalizeFilename ( bootcdDirectory + sSep ), backend->outputDirectory ); @@ -3313,8 +3317,9 @@ string bootloader; string IsoName; - if (module.name == "bootcdregtest") - { + if (module.type == IsoRegTest) + { + vCdFiles.push_back (srcunattend.c_str ()); bootloader = "isobtrt.o"; IsoName = "ReactOS-RegTest.iso"; } @@ -3338,7 +3343,6 @@ backend->outputDirectory ); string reactosDff = NormalizeFilename ( "boot" + sSep + "bootdata" + sSep + "packages" + sSep + "reactos.dff" ); string cdDirectories = GetCdDirectories ( bootcdDirectory ); - vector<string> vCdFiles; GetCdFiles ( vCdFiles ); string cdFiles = v2s ( vCdFiles, 5 ); @@ -3366,6 +3370,16 @@ reactosInf.c_str () ); OutputBootstrapfileCopyCommands ( bootcdDirectory ); OutputCdfileCopyCommands ( bootcdDirectory ); + if (module.type == IsoRegTest) + { + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s 1>$(NUL)\n", + srcunattend.c_str (), + tarunattend.c_str () ); + } + fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n",

1 0

[janderwald] 28622: - add unattend.inf for bootcdregtest
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 21:32:05 2007 New Revision: 28622 URL: http://svn.reactos.org/svn/reactos?rev=28622&view=rev Log: - add unattend.inf for bootcdregtest Added: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf (with props) Added: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf (added) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Tue Aug 28 21:32:05 2007 @@ -1,0 +1,54 @@ +; In order to get unattended setup working: +; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed +; 2. Uncomment the line in bootdata.rbuild to include it into bootcd + +[Unattend] +Signature = "$ReactOS$" + +; yes - unattend setup enabled +; no - unattend setup disabled +UnattendSetupEnabled = yes + +; Install to \Device\Harddisk0\Partition1\ReactOS +DestinationDiskNumber = 0 +DestinationPartitionNumber = 1 +InstallationDirectory=ReactOS + +; MBRInstallType=0 skips MBR installation +; MBRInstallType=1 install MBR on floppy +; MBRInstallType=2 install MBR on hdd +MBRInstallType=2 + +FullName="MyName" +;OrgName="MyOrg" +ComputerName="MYCOMPUTERNAME"; +AdminPassword="MyPassword" + +; TimeZone is set GMT as default +TimeZoneIndex=85 + +; enable this setting to disable daylight saving changes +; DisableAutoDaylightTimeSet = 1 + +; enable this setting to format the selected partition +; 1 - format enabled +; 0 - format disabled +FormatPartition=1 + +; enable this setting to automatically create a partition +; during installation +; 1 - enabled +; 0 - disabled +AutoPartition = 1 + +; enable this setting to disable vmware driver install +; yes - disabled +; no - enabled +DisableVmwInst = yes + +; enable this section to automatically launch programs +; after 3rd boot +; +; [GuiRunOnce] +; %SystemRoot%\system32\cmd.exe + Propchange: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 28621: Uncomment german translation again, this change accidentally got into my previous commit
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 20:01:59 2007 New Revision: 28621 URL: http://svn.reactos.org/svn/reactos?rev=28621&view=rev Log: Uncomment german translation again, this change accidentally got into my previous commit Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Tue Aug 28 20:01:59 2007 @@ -1,5 +1,5 @@ #include <windows.h> #include "resource.h" -//#include "lang/de-DE.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc"

1 0

[cfinck] 28620: - Remove most of the Usage text from the german translation. It was just copied from the Windows "more" utility and our tool does not support any of the extended options yet. I changed the text, so it only includes the features we currently support. - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL in the german translation - Add an English (US) translation - Use a consistent indentation in "more.c" - Exit the tool if reading IDS_CONTINUE fails instead of falling back to a hardcoded st
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 19:54:19 2007 New Revision: 28620 URL: http://svn.reactos.org/svn/reactos?rev=28620&view=rev Log: - Remove most of the Usage text from the german translation. It was just copied from the Windows "more" utility and our tool does not support any of the extended options yet. I changed the text, so it only includes the features we currently support. - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL in the german translation - Add an English (US) translation - Use a consistent indentation in "more.c" - Exit the tool if reading IDS_CONTINUE fails instead of falling back to a hardcoded string Added: trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/more/more.c trunk/reactos/base/applications/cmdutils/more/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc Tue Aug 28 19:54:19 2007 @@ -1,34 +1,15 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_USAGE, "Zeigt Daten seitenweise auf dem Bildschirm an.\n\n\ - MORE [/E [/C] [/P] [/S] [/Tn] [+n]] < [Laufwerk:][Pfad]Dateiname\n\ - Befehl | MORE [/E [/C] [/P] [/S] [/Tn] [+n]] \n\ - MORE /E [/C] [/P] [/S] [/Tn] [+n] [Dateien]\n\n\ - [Laufwerk:][Pfad]Dateiname Ein Datei, deren Inhalt angezeigt\n\ -\t\t\t werden soll.\n\n\ - Befehl\t\t Ein Befehl, dessen Ausgabe angezeigt\n\ -\t\t\t werden soll.\n\n\ - /E\tAktiviert die erweiterten Möglichkeiten.\n\ - /C\tLöscht den Bildschirm, bevor eine Seite angezeigt wird.\n\ - /P\tFührt Seitenvorschubzeichen aus.\n\ - /S\tFasst mehrere leere Zeilen zu einer Zeile zusammen.\n\ - /Tn\tErsetzt Tabulatorenzeichen durch n Leerzeichen (Standard 8).\n\n\ -\tDie Optionen können in der Umgebungsvariablen MORE angegeben\n\ -\twerden.\n\n\ - +n\tBeginnt mit der Anzeige der ersten Datei in Zeile n.\n\n\ - Dateien Gibt eine Liste mit anzuzeigenden Dateien an.\n\ -\t Trennen sie die Dateinamen durch ein Leerzeichen.\n\n\ - Wenn die erweiterten Möglichkeiten aktiviert sind, können die folgenden\n\ - Befehle an der Eingabeforderung \"--Fortsetzung--\" eingegeben werden:\n\n\ - P n\t Zeigt die nächsten n Zeilen an.\n\ - S n\t Überspringt die nächsten n Zeilen.\n\ - Q\tBeendet die Ausgabe.\n\ - =\tZeigt die Zeilennummer an.\n\ - ?\tZeigt die Hilfezeile an.\n\ - <LEERTASTE> Zeigt die nächste Zeile an.\n\ - <EINGABETASTE> Zeigt die nächste Zeile an.\n" + MORE < [Laufwerk:][Pfad]Dateiname\n\ + Befehl | MORE \n\ + MORE [Laufwerk:][Pfad]Dateiname\n\n\ + [Laufwerk:][Pfad]Dateiname Eine Datei, deren Inhalt angezeigt werden soll.\n\ + Befehl\t\t Ein Befehl, dessen Ausgabe angezeigt werden soll.\n\n\ + An der Eingabeaufforderung ""-- Fortsetzung --"" kann eine beliebige\n\ + Taste gedrückt werden, um die nächste Seite anzuzeigen.\n" IDS_CONTINUE, " -- Fortsetzung (100%) -- " IDS_FILE_ACCESS, "Auf die Datei %s kann nicht zugegriffen werden." Added: trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc Tue Aug 28 19:54:19 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +{ + IDS_USAGE, "Displays data page-by-page on the screen.\n\n\ + MORE < [Drive:][Path]File name\n\ + Command | MORE \n\ + MORE [Drive:][Path]File name\n\n\ + [Drive:][Path]File name A file, whose content shall be displayed.\n\ + Command\t\t A command, whose output shall be displayed.\n\n\ + At the prompt ""-- Continue --"" you can press any key to show the next page.\n" + + IDS_CONTINUE, " -- Continue (100%) -- " + IDS_FILE_ACCESS, "Cannot access the file %s." +} Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c Tue Aug 28 19:54:19 2007 @@ -30,11 +30,11 @@ static VOID GetScreenSize (PSHORT maxx, PSHORT maxy) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (hStdOut, &csbi); - *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; - *maxy = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (hStdOut, &csbi); + *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; + *maxy = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; } @@ -42,40 +42,40 @@ static VOID ConOutPuts (LPTSTR szText) { - DWORD dwWritten; - - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL); + DWORD dwWritten; + + WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); + WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL); } static VOID ConInKey (VOID) { - INPUT_RECORD ir; - DWORD dwRead; - - do - { - ReadConsoleInput (hKeyboard, &ir, 1, &dwRead); - if ((ir.EventType == KEY_EVENT) && - (ir.Event.KeyEvent.bKeyDown == TRUE)) - return; - } - while (TRUE); + INPUT_RECORD ir; + DWORD dwRead; + + do + { + ReadConsoleInput (hKeyboard, &ir, 1, &dwRead); + if ((ir.EventType == KEY_EVENT) && + (ir.Event.KeyEvent.bKeyDown == TRUE)) + return; + } + while (TRUE); } static VOID WaitForKey (VOID) { - DWORD dwWritten; + DWORD dwWritten; WriteFile (hStdErr, szCont , szContLength, &dwWritten, NULL); - ConInKey(); - - WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL); + ConInKey(); + + WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL); // FlushConsoleInputBuffer (hConsoleIn); } @@ -84,125 +84,125 @@ //INT CommandMore (LPTSTR cmd, LPTSTR param) int main (int argc, char **argv) { - SHORT maxx,maxy; - SHORT line_count=0,ch_count=0; - DWORD i, last; - HANDLE hFile = INVALID_HANDLE_VALUE; - TCHAR szFullPath[MAX_PATH]; + SHORT maxx,maxy; + SHORT line_count=0,ch_count=0; + DWORD i, last; + HANDLE hFile = INVALID_HANDLE_VALUE; + TCHAR szFullPath[MAX_PATH]; TCHAR szMsg[1024]; - /*reading/writing buffer*/ - TCHAR *buff; - - /*bytes written by WriteFile and ReadFile*/ - DWORD dwRead,dwWritten; - - /*ReadFile() return value*/ - BOOL bRet; - - - hStdIn = GetStdHandle(STD_INPUT_HANDLE); - hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); - hStdErr = GetStdHandle(STD_ERROR_HANDLE); + /*reading/writing buffer*/ + TCHAR *buff; + + /*bytes written by WriteFile and ReadFile*/ + DWORD dwRead,dwWritten; + + /*ReadFile() return value*/ + BOOL bRet; + + + hStdIn = GetStdHandle(STD_INPUT_HANDLE); + hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + hStdErr = GetStdHandle(STD_ERROR_HANDLE); hApp = GetModuleHandle(NULL); - buff=malloc(4096); - if (!buff) - { - ConOutPuts(_T("Error: no memory")); - return 0; - } - - if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) - { - if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) - { - CharToOem(buff, buff); - ConOutPuts(buff); - } - - free(buff); - return 0; - } - - hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ, - 0,NULL,OPEN_ALWAYS,0,0); - - GetScreenSize(&maxx,&maxy); - - - - FlushConsoleInputBuffer (hKeyboard); - - if(argc > 1) - { - GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL); - hFile = CreateFile (szFullPath, + buff=malloc(4096); + if (!buff) + { + ConOutPuts(_T("Error: no memory")); + return 1; + } + + if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) + { + if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) + { + CharToOem(buff, buff); + ConOutPuts(buff); + } + + free(buff); + return 0; + } + + hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ, + 0,NULL,OPEN_ALWAYS,0,0); + + GetScreenSize(&maxx,&maxy); + + + + FlushConsoleInputBuffer (hKeyboard); + + if(argc > 1) + { + GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL); + hFile = CreateFile (szFullPath, GENERIC_READ, - 0, + 0, NULL, OPEN_EXISTING, 0, 0); - if (hFile == INVALID_HANDLE_VALUE) - { - if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) - { - _stprintf(buff, szMsg, szFullPath); - CharToOem(buff, buff); - ConOutPuts(buff); - } - - free(buff); - return 0; - } - } - else - { - hFile = hStdIn; - } + if (hFile == INVALID_HANDLE_VALUE) + { + if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) + { + _stprintf(buff, szMsg, szFullPath); + CharToOem(buff, buff); + ConOutPuts(buff); + } + + free(buff); + return 0; + } + } + else + { + hFile = hStdIn; + } if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR))) { - /* fail back to english */ - _tcscpy(szCont, _T("--- continue ---")); + /* Shouldn't happen, so exit */ + return 1; } szContLength = _tcslen(szCont); - do - { - bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); - - for(last=i=0;i<dwRead && bRet;i++) - { - ch_count++; - if(buff[i] == _T('\n') || ch_count == maxx) - { - ch_count=0; - line_count++; - if (line_count == maxy) - { - line_count = 0; - WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL); - last=i+1; - FlushFileBuffers (hStdOut); - WaitForKey (); - } - } - } - if (last<dwRead && bRet) - WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL); - - } - while(dwRead>0 && bRet); - - free (buff); - CloseHandle (hKeyboard); - if (hFile != hStdIn) - CloseHandle (hFile); - - return 0; + do + { + bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); + + for(last=i=0;i<dwRead && bRet;i++) + { + ch_count++; + if(buff[i] == _T('\n') || ch_count == maxx) + { + ch_count=0; + line_count++; + if (line_count == maxy) + { + line_count = 0; + WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL); + last=i+1; + FlushFileBuffers (hStdOut); + WaitForKey (); + } + } + } + if (last<dwRead && bRet) + WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL); + + } + while(dwRead>0 && bRet); + + free (buff); + CloseHandle (hKeyboard); + if (hFile != hStdIn) + CloseHandle (hFile); + + return 0; } /* EOF */ Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Tue Aug 28 19:54:19 2007 @@ -1,5 +1,5 @@ #include <windows.h> #include "resource.h" -#include "lang/de-DE.rc" - +//#include "lang/de-DE.rc" +#include "lang/en-US.rc"

1 0

[tkreuzer] 28619: - rename ASSERT1 to ASSERT - link to w32kdll instead of implementing all syscalls as stubs. I will remove the rest of the syscall code as soon as our syscall db is more complete - more TEST -> RTEST - update w32kdll_ros.def - add tests for NtGdiEngCreatePalette, NtGdiEnumFontOpen - Add some gdi handle table code to w32knapi - header cleanup
by tkreuzer＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: tkreuzer Date: Tue Aug 28 19:06:36 2007 New Revision: 28619 URL: http://svn.reactos.org/svn/reactos?rev=28619&view=rev Log: - rename ASSERT1 to ASSERT - link to w32kdll instead of implementing all syscalls as stubs. I will remove the rest of the syscall code as soon as our syscall db is more complete - more TEST -> RTEST - update w32kdll_ros.def - add tests for NtGdiEngCreatePalette, NtGdiEnumFontOpen - Add some gdi handle table code to w32knapi - header cleanup Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Modified: trunk/rostests/apitests/apitest.h trunk/rostests/apitests/gdi32api/testlist.c trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/user32api/tests/ScrollDC.c trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/apitests/w32knapi/w32knapi.h trunk/rostests/apitests/w32knapi/w32knapi.rbuild Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=28… ============================================================================== --- trunk/rostests/apitests/apitest.h (original) +++ trunk/rostests/apitests/apitest.h Tue Aug 28 19:06:36 2007 @@ -1,7 +1,5 @@ #ifndef _APITEST_H #define _APITEST_H - -#define WINVER 0x501 #include <stdlib.h> #include <stdarg.h> @@ -84,8 +82,8 @@ } \ } - -#define ASSERT1(x) \ +#undef ASSERT +#define ASSERT(x) \ if (!(x)) \ { \ printf("Assertion failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c (original) +++ trunk/rostests/apitests/gdi32api/testlist.c Tue Aug 28 19:06:36 2007 @@ -26,12 +26,12 @@ { L"CreateRectRgn", Test_CreateRectRgn }, { L"ExtCreatePen", Test_ExtCreatePen }, { L"GetClipRgn", Test_GetClipRgn }, + { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, { L"SetSysColors", Test_SetSysColors }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, // { L"SetWorldTransform", Test_SetWorldTransform }, - { L"GetObject", Test_GetObject } }; /* The function that gives us the number of tests */ Modified: trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c Tue Aug 28 19:06:36 2007 @@ -3,9 +3,24 @@ INT Test_GetClipRgn(PTESTINFO pti) { -// HRGN hRgn; + HWND hWnd; + HDC hDC; + HRGN hrgn;//, hrgn2; -// hRgn = CreateRectRgn( + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, g_hInstance, 0); + + hDC = GetDC(hWnd); + hrgn = CreateRectRgn(0,0,0,0); + + SetLastError(ERROR_SUCCESS); +// TEST(GetClipRgn(hDC) + + ReleaseDC(hWnd, hDC); + DestroyWindow(hWnd); + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c Tue Aug 28 19:06:36 2007 @@ -178,21 +178,21 @@ TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BRUSH, 0, NULL) == sizeof(LOGBRUSH)); TEST(GetObject(hBrush, sizeof(WORD), NULL) == sizeof(LOGBRUSH)); TEST(GetObject(hBrush, 0, NULL) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, 5, NULL) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, -5, NULL) == sizeof(LOGBRUSH)); - - TEST(GetObject(hBrush, 0, &logbrush) == 0); - TEST(logbrush.lbStyle == 0x77777777); - TEST(GetObject(hBrush, 5, &logbrush) == sizeof(LOGBRUSH)); - TEST(logbrush.lbStyle == 0); - TEST(logbrush.lbColor == 0x77777701); - - TEST(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, sizeof(LOGBRUSH)+2, &logbrush) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, -1, &logbrush) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, 5, NULL) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, -5, NULL) == sizeof(LOGBRUSH)); + + RTEST(GetObject(hBrush, 0, &logbrush) == 0); + RTEST(logbrush.lbStyle == 0x77777777); + RTEST(GetObject(hBrush, 5, &logbrush) == sizeof(LOGBRUSH)); + RTEST(logbrush.lbStyle == 0); + RTEST(logbrush.lbColor == 0x77777701); + + RTEST(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, sizeof(LOGBRUSH)+2, &logbrush) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, -1, &logbrush) == sizeof(LOGBRUSH)); // TODO: test all members - TEST(GetLastError() == ERROR_SUCCESS); + RTEST(GetLastError() == ERROR_SUCCESS); DeleteObject(hBrush); return TRUE; } @@ -207,21 +207,21 @@ hPen = CreatePen(PS_SOLID, 3, RGB(4,5,6)); if (!hPen) return FALSE; SetLastError(ERROR_SUCCESS); - TEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); - TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, sizeof(BITMAP), NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, 0, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, 5, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, -5, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, sizeof(LOGPEN), &logpen) == sizeof(LOGPEN)); - TEST(GetObject(hPen, sizeof(LOGPEN)-1, &logpen) == 0); - TEST(GetObject(hPen, sizeof(LOGPEN)+2, &logpen) == sizeof(LOGPEN)); - TEST(GetObject(hPen, 0, &logpen) == 0); - TEST(GetObject(hPen, -5, &logpen) == sizeof(LOGPEN)); - TEST(GetLastError() == ERROR_SUCCESS); + RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); + RTEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, sizeof(BITMAP), NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, 0, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, 5, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, -5, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, sizeof(LOGPEN), &logpen) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, sizeof(LOGPEN)-1, &logpen) == 0); + RTEST(GetObject(hPen, sizeof(LOGPEN)+2, &logpen) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, 0, &logpen) == 0); + RTEST(GetObject(hPen, -5, &logpen) == sizeof(LOGPEN)); + RTEST(GetLastError() == ERROR_SUCCESS); /* test if the fields are filled correctly */ - TEST(logpen.lopnStyle == PS_SOLID); + RTEST(logpen.lopnStyle == PS_SOLID); DeleteObject(hPen); @@ -242,8 +242,8 @@ } elpUserStyle; SetLastError(ERROR_SUCCESS); - TEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); - TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); + RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); + RTEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); TEST(GetLastError() == ERROR_INVALID_PARAMETER); FillMemory(&extlogpen, sizeof(EXTLOGPEN), 0x77); @@ -252,12 +252,12 @@ logbrush.lbHatch = 22; hPen = ExtCreatePen(PS_GEOMETRIC | PS_DASH, 5, &logbrush, 0, NULL); - TEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN); - TEST(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); - TEST(GetObject(hPen, sizeof(EXTLOGPEN), NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject((HANDLE)GDI_HANDLE_GET_INDEX(hPen), 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, 5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN); + RTEST(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); + RTEST(GetObject(hPen, sizeof(EXTLOGPEN), NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject((HANDLE)GDI_HANDLE_GET_INDEX(hPen), 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, 5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); RTEST(GetObject(hPen, -5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); RTEST(GetObject(hPen, 0, &extlogpen) == 0); RTEST(GetObject(hPen, 4, &extlogpen) == 0); Modified: trunk/rostests/apitests/user32api/tests/ScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/ScrollDC.c (original) +++ trunk/rostests/apitests/user32api/tests/ScrollDC.c Tue Aug 28 19:06:36 2007 @@ -17,7 +17,7 @@ /* Assert that no update region is there */ hrgn = CreateRectRgn(0,0,0,0); - ASSERT1(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); + ASSERT(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); /* Test normal scrolling */ TEST(ScrollDC(hDC, 0, 0, NULL, NULL, hrgn, NULL) == TRUE); Modified: trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c (original) +++ trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c Tue Aug 28 19:06:36 2007 @@ -15,7 +15,7 @@ /* Assert that no update region is there */ hrgn = CreateRectRgn(0,0,0,0); - ASSERT1(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); + ASSERT(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, NULL, 0); TEST(Result == SIMPLEREGION); Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Tue Aug 28 19:06:36 2007 @@ -10,48 +10,48 @@ EXPORTS NtGdiAbortDoc@4 NtGdiAbortPath@4 -;NtGdiAddFontResourceW@24 -;NtGdiAddRemoteFontToDC@16 -;NtGdiAddFontMemResourceEx@20 -;NtGdiRemoveMergeFont@8 -;NtGdiAddRemoteMMInstanceToDC@12 +NtGdiAddFontResourceW@24 +NtGdiAddRemoteFontToDC@16 +NtGdiAddFontMemResourceEx@20 +NtGdiRemoveMergeFont@8 +NtGdiAddRemoteMMInstanceToDC@12 NtGdiAlphaBlend@48 NtGdiAngleArc@24 -;NtGdiAnyLinkedFonts@0 -;NtGdiFontIsLinked@4 +NtGdiAnyLinkedFonts@0 +NtGdiFontIsLinked@4 NtGdiArcInternal@40 NtGdiBeginPath@4 NtGdiBitBlt@44 NtGdiCancelDC@4 -;NtGdiCheckBitmapBits@32 +NtGdiCheckBitmapBits@32 NtGdiCloseFigure@4 -;NtGdiClearBitmapAttributes@8 -;NtGdiClearBrushAttributes@8 -;NtGdiColorCorrectPalette@24 +NtGdiClearBitmapAttributes@8 +NtGdiClearBrushAttributes@8 +NtGdiColorCorrectPalette@24 NtGdiCombineRgn@16 NtGdiCombineTransform@12 -;NtGdiComputeXformCoefficients@4 -;NtGdiConsoleTextOut@16 -;NtGdiConvertMetafileRect@8 +NtGdiComputeXformCoefficients@4 +NtGdiConsoleTextOut@16 +NtGdiConvertMetafileRect@8 NtGdiCreateBitmap@20 NtGdiCreateClientObj@4 NtGdiCreateColorSpace@4 -;NtGdiCreateColorTransform@32 +NtGdiCreateColorTransform@32 NtGdiCreateCompatibleBitmap@12 NtGdiCreateCompatibleDC@4 NtGdiCreateDIBBrush@24 -;NtGdiCreateDIBitmapInternal@44 +NtGdiCreateDIBitmapInternal@44 NtGdiCreateDIBSection@36 NtGdiCreateEllipticRgn@16 NtGdiCreateHalftonePalette@4 NtGdiCreateHatchBrushInternal@12 -;NtGdiCreateMetafileDC@4 -;NtGdiCreatePaletteInternal@8 +NtGdiCreateMetafileDC@4 +NtGdiCreatePaletteInternal@8 NtGdiCreatePatternBrushInternal@12 NtGdiCreatePen@16 NtGdiCreateRectRgn@16 NtGdiCreateRoundRectRgn@24 -;NtGdiCreateServerMetaFile@24 +NtGdiCreateServerMetaFile@24 NtGdiCreateSolidBrush@8 NtGdiD3dContextCreate@16 NtGdiD3dContextDestroy@4 @@ -109,44 +109,44 @@ NtGdiDdUnlockD3D@8 NtGdiDdUpdateOverlay@12 NtGdiDdWaitForVerticalBlank@8 -;NtGdiDvpCanCreateVideoPort@8 -;NtGdiDvpColorControl@8 -;NtGdiDvpCreateVideoPort@8 -;NtGdiDvpDestroyVideoPort@8 -;NtGdiDvpFlipVideoPort@16 -;NtGdiDvpGetVideoPortBandwidth@8 -;NtGdiDvpGetVideoPortField@8 -;NtGdiDvpGetVideoPortFlipStatus@8 -;NtGdiDvpGetVideoPortInputFormats@8 -;NtGdiDvpGetVideoPortLine@8 -;NtGdiDvpGetVideoPortOutputFormats@8 -;NtGdiDvpGetVideoPortConnectInfo@8 -;NtGdiDvpGetVideoSignalStatus@8 -;NtGdiDvpUpdateVideoPort@16 -;NtGdiDvpWaitForVideoPortSync@8 -;NtGdiDvpAcquireNotification@12 -;NtGdiDvpReleaseNotification@8 -;NtGdiDxgGenericThunk@24 +NtGdiDvpCanCreateVideoPort@8 +NtGdiDvpColorControl@8 +NtGdiDvpCreateVideoPort@8 +NtGdiDvpDestroyVideoPort@8 +NtGdiDvpFlipVideoPort@16 +NtGdiDvpGetVideoPortBandwidth@8 +NtGdiDvpGetVideoPortField@8 +NtGdiDvpGetVideoPortFlipStatus@8 +NtGdiDvpGetVideoPortInputFormats@8 +NtGdiDvpGetVideoPortLine@8 +NtGdiDvpGetVideoPortOutputFormats@8 +NtGdiDvpGetVideoPortConnectInfo@8 +NtGdiDvpGetVideoSignalStatus@8 +NtGdiDvpUpdateVideoPort@16 +NtGdiDvpWaitForVideoPortSync@8 +NtGdiDvpAcquireNotification@12 +NtGdiDvpReleaseNotification@8 +NtGdiDxgGenericThunk@24 NtGdiDeleteClientObj@4 NtGdiDeleteColorSpace@4 -;NtGdiDeleteColorTransform@8 +NtGdiDeleteColorTransform@8 NtGdiDeleteObjectApp@4 NtGdiDescribePixelFormat@16 -;NtGdiGetPerBandInfo@8 -;NtGdiDoBanding@16 +NtGdiGetPerBandInfo@8 +NtGdiDoBanding@16 NtGdiDoPalette@24 NtGdiDrawEscape@16 NtGdiEllipse@20 -;NtGdiEnableEUDC@4 +NtGdiEnableEudc@4 NtGdiEndDoc@4 NtGdiEndPage@4 NtGdiEndPath@4 -;NtGdiEnumFontChunk@20 -;NtGdiEnumFontClose@4 -;NtGdiEnumFontOpen@28 +NtGdiEnumFontChunk@20 +NtGdiEnumFontClose@4 +NtGdiEnumFontOpen@28 NtGdiEnumObjects@16 NtGdiEqualRgn@8 -;NtGdiEudcLoadUnloadLink@28 +NtGdiEudcLoadUnloadLink@28 NtGdiExcludeClipRect@20 NtGdiExtCreatePen@44 NtGdiExtCreateRegion@12 @@ -154,37 +154,37 @@ NtGdiExtFloodFill@20 NtGdiExtGetObjectW@12 NtGdiExtSelectClipRgn@12 -;NtGdiExtTextOutW@36 +NtGdiExtTextOutW@36 NtGdiFillPath@4 NtGdiFillRgn@12 NtGdiFlattenPath@4 -;NtGdiFlushUserBatch@0 +NtGdiFlushUserBatch@0 NtGdiFlush@0 -;NtGdiForceUFIMapping@8 +NtGdiForceUFIMapping@8 NtGdiFrameRgn@20 -;NtGdiFullscreenControl@20 +NtGdiFullscreenControl@20 NtGdiGetAndSetDCDword@16 -;NtGdiGetAppClipBox@8 +NtGdiGetAppClipBox@8 NtGdiGetBitmapBits@12 NtGdiGetBitmapDimension@8 NtGdiGetBoundsRect@12 -;NtGdiGetCharABCWidthsW@24 -;NtGdiGetCharacterPlacementW@24 +NtGdiGetCharABCWidthsW@24 +NtGdiGetCharacterPlacementW@24 NtGdiGetCharSet@4 -;NtGdiGetCharWidthW@24 -;NtGdiGetCharWidthInfo@8 +NtGdiGetCharWidthW@24 +NtGdiGetCharWidthInfo@8 NtGdiGetColorAdjustment@8 -;NtGdiGetColorSpaceforBitmap@4 +NtGdiGetColorSpaceforBitmap@4 NtGdiGetDCDword@12 -;NtGdiGetDCforBitmap@4 -;NtGdiGetDCObject@8 +NtGdiGetDCforBitmap@4 +NtGdiGetDCObject@8 NtGdiGetDCPoint@12 NtGdiGetDeviceCaps@8 NtGdiGetDeviceGammaRamp@8 -;NtGdiGetDeviceCapsAll@8 -;NtGdiGetDIBitsInternal@36 -;NtGdiGetETM@8 -;NtGdiGetEudcTimeStampEx@12 +NtGdiGetDeviceCapsAll@8 +NtGdiGetDIBitsInternal@36 +NtGdiGetETM@8 +NtGdiGetEudcTimeStampEx@12 NtGdiGetFontData@20 NtGdiGetFontResourceInfoInternalW@28 ;NtGdiGetGlyphIndicesW@20 Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild Tue Aug 28 19:06:36 2007 @@ -1,4 +1,4 @@ -<module name="w32kdll_ros" type="win32dll" entrypoint="0" installname="w32kdll_ros.dll"> +<module name="w32kdll" type="win32dll" entrypoint="0" installname="w32kdll.dll"> <importlibrary definition="w32kdll_ros.def" /> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0502</define> Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Tue Aug 28 19:06:36 2007 @@ -1,22 +1,11 @@ #include "../w32knapi.h" - - -W32KAPI -HANDLE -APIENTRY -NtGdiDdCreateDirectDrawObject( - IN HDC hdc -) -{ - return (HANDLE)Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); -} INT Test_NtGdiDdCreateDirectDrawObject(PTESTINFO pti) { HANDLE hDirectDraw; HDC hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); - ASSERT1(hdc != NULL); + ASSERT(hdc != NULL); /* Test ReactX */ RTEST(NtGdiDdCreateDirectDrawObject(NULL) == NULL); Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Tue Aug 28 19:06:36 2007 @@ -15,12 +15,12 @@ { HANDLE hDirectDraw; HDC hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); - ASSERT1(hdc != NULL); + ASSERT(hdc != NULL); /* Test ReactX */ RTEST(NtGdiDdDeleteDirectDrawObject(NULL) == FALSE); RTEST((hDirectDraw=NtGdiDdCreateDirectDrawObject(hdc)) != NULL); - ASSERT1(hDirectDraw != NULL); + ASSERT(hDirectDraw != NULL); RTEST(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == TRUE); /* Cleanup ReactX setup */ Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Tue Aug 28 19:06:36 2007 @@ -64,10 +64,10 @@ EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); - ASSERT1(hdc != NULL); + ASSERT(hdc != NULL); hDirectDraw = (HANDLE) Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); - ASSERT1(hDirectDraw != NULL); + ASSERT(hDirectDraw != NULL); /* Test ReactX */ hDirectDraw = (HANDLE) Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); @@ -123,7 +123,7 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); @@ -131,7 +131,7 @@ (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) { RTEST(pHalInfo->dwSize != sizeof(DD_HALINFO)); - ASSERT1(pHalInfo->dwSize != sizeof(DD_HALINFO)); + ASSERT(pHalInfo->dwSize != sizeof(DD_HALINFO)); } if (pHalInfo->dwSize == sizeof(DD_HALINFO)) @@ -149,7 +149,7 @@ RTEST(pHalInfo->vmiData.lDisplayPitch == 0x1700; */ RTEST(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT) ); - ASSERT1(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT)); + ASSERT(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT)); /* Fail on 8bit screen deep */ RTEST(pHalInfo->vmiData.ddpfDisplay.dwFlags == DDPF_RGB); @@ -225,7 +225,7 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); @@ -266,7 +266,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -307,7 +307,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -351,7 +351,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -395,7 +395,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -453,7 +453,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c Tue Aug 28 19:06:36 2007 @@ -1,22 +1,3 @@ -#include "../w32knapi.h" - -BOOL -STDCALL -NtGdiArcInternal( - ARCTYPE arctype, - HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - return (BOOL)Syscall(L"NtGdiArcInternal", 10, &arctype); -} - INT Test_NtGdiArcInternal(PTESTINFO pti) { Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Tue Aug 28 19:06:36 2007 @@ -1,19 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -HBITMAP -APIENTRY -NtGdiCreateBitmap( - IN INT cx, - IN INT cy, - IN UINT cPlanes, - IN UINT cBPP, - IN OPTIONAL LPBYTE pjInit -) -{ - return (HBITMAP)Syscall(L"NtGdiCreateBitmap", 5, &cx); -} - INT Test_NtGdiCreateBitmap_Params(PTESTINFO pti) { @@ -66,7 +50,7 @@ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(1, 1, 0, 1, NULL)) != NULL); TEST(GetLastError() == ERROR_SUCCESS); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); TEST(bitmap.bmWidth == 1); TEST(bitmap.bmHeight == 1); @@ -88,7 +72,7 @@ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 0, NULL)) != NULL); TEST(GetLastError() == ERROR_SUCCESS); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); TEST(bitmap.bmWidth == 1); TEST(bitmap.bmHeight == 1); @@ -105,32 +89,32 @@ /* Test bad cBPP */ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 3, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 4); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 6, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 8); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 15, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 16); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 17, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 24); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 3, 7, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 24); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 25, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 32); DeleteObject(hBmp); @@ -154,7 +138,7 @@ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(5, 7, 2, 4, NULL)) != NULL); TEST(GetLastError() == ERROR_SUCCESS); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); TEST(bitmap.bmWidth == 5); TEST(bitmap.bmHeight == 7); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c Tue Aug 28 19:06:36 2007 @@ -1,16 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -HBITMAP -APIENTRY -NtGdiCreateCompatibleBitmap( - IN HDC hdc, - IN INT cx, - IN INT cy -) -{ - return (HBITMAP)Syscall(L"NtGdiCreateCompatibleBitmap", 3, &hdc); -} INT Test_NtGdiCreateCompatibleBitmap(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c Tue Aug 28 19:06:36 2007 @@ -1,20 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -LONG -APIENTRY -NtGdiDoPalette( - IN HPALETTE hpal, - IN WORD iStart, - IN WORD cEntries, - IN PALETTEENTRY *pPalEntries, - IN DWORD iFunc, - IN BOOL bInbound -) -{ - return (LONG)Syscall(L"NtGdiDoPalette", 6, &hpal); -} - HPALETTE CreateTestPalette() { Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c Tue Aug 28 19:06:36 2007 @@ -1,0 +1,33 @@ + +HPALETTE +APIENTRY +NtGdiEngCreatePalette( + IN ULONG iMode, + IN ULONG cColors, + IN ULONG *pulColors, + IN FLONG flRed, + IN FLONG flGreen, + IN FLONG flBlue) +{ + return (HPALETTE)Syscall(L"NtGdiEngCreatePalette", 6, &iMode); +} + +INT +Test_NtGdiEngCreatePalette(PTESTINFO pti) +{ + HPALETTE hPal; + ULONG Colors[3] = {1,2,3}; + PGDI_TABLE_ENTRY pEntry; + + hPal = NtGdiEngCreatePalette(PAL_RGB, 3, Colors, 0xff000000, 0x00ff0000, 0x0000ff00); + + TEST(hPal != 0); + TEST(GDI_HANDLE_GET_TYPE(hPal) == GDI_OBJECT_TYPE_PALETTE); + pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(hPal)]; + TEST(pEntry->KernelData != NULL); + TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId()); + TEST(pEntry->UserData == 0); + TEST(pEntry->Type == (((UINT)hPal >> 16) | GDI_OBJECT_TYPE_PALETTE)); + + return APISTATUS_NORMAL; +} Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Tue Aug 28 19:06:36 2007 @@ -1,0 +1,31 @@ +INT +Test_NtGdiEnumFontOpen(PTESTINFO pti) +{ + HDC hDC; + ULONG_PTR idEnum; + ULONG ulCount; + PGDI_TABLE_ENTRY pEntry; + + hDC = CreateDCW(L"DISPLAY",NULL,NULL,NULL); + + // FIXME: We should load the font first + + idEnum = NtGdiEnumFontOpen(hDC, 2, 0, 32, L"Courier", ANSI_CHARSET, &ulCount); + ASSERT(idEnum != 0); + + /* we should have a gdi handle here */ + TEST(GDI_HANDLE_GET_TYPE(idEnum) == GDI_OBJECT_TYPE_ENUMFONT); + pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(idEnum)]; + TEST(pEntry->KernelData != NULL); + TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId()); + TEST(pEntry->UserData == 0); + TEST(pEntry->Type == ((idEnum >> 16) | GDI_OBJECT_TYPE_ENUMFONT)); + + /* We should not be able to use DeleteObject() on the handle */ + TEST(DeleteObject((HGDIOBJ)idEnum) == FALSE); + + // FIXME: Close the enum handle + + return APISTATUS_NORMAL; +} + Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c Tue Aug 28 19:06:36 2007 @@ -1,15 +1,3 @@ -#include "../w32knapi.h" - -LONG STDCALL -NtGdiGetBitmapBits( - HBITMAP hBitmap, - DWORD Bytes, - IN PBYTE Bits) -{ - return (LONG)Syscall(L"NtGdiGetBitmapBits", 3, &hBitmap); -} - - INT Test_NtGdiGetBitmapBits(PTESTINFO pti) { Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c Tue Aug 28 19:06:36 2007 @@ -1,17 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -INT -APIENTRY -NtGdiGetRandomRgn( - IN HDC hdc, - IN HRGN hrgn, - IN INT iRgn) -{ - return (INT)Syscall(L"NtGdiGetRandomRgn", 3, &hdc); -} - - INT Test_NtGdiGetRandomRgn(PTESTINFO pti) { @@ -26,7 +12,7 @@ // UpdateWindow(hWnd); hDC = GetDC(hWnd); - ASSERT1(hDC != NULL); + ASSERT(hDC != NULL); hrgn = CreateRectRgn(0,0,0,0); hrgn2 = CreateRectRgn(3,3,10,10); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c Tue Aug 28 19:06:36 2007 @@ -1,14 +1,4 @@ #include "../w32knapi.h" - -LONG STDCALL -NtGdiSetBitmapBits( - HBITMAP hBitmap, - DWORD Bytes, - IN PBYTE Bits) -{ - return (LONG)Syscall(L"NtGdiSetBitmapBits", 3, &hBitmap); -} - INT Test_NtGdiSetBitmapBits(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Tue Aug 28 19:06:36 2007 @@ -1,4 +1,4 @@ -#include "../apitest.h" +#include "w32knapi.h" /* include the tests */ @@ -10,6 +10,9 @@ #include "ntgdi/NtGdiCreateBitmap.c" #include "ntgdi/NtGdiCreateCompatibleBitmap.c" #include "ntgdi/NtGdiDoPalette.c" +#include "ntgdi/NtGdiEngCreatePalette.c" +//#include "ntgdi/NtGdiEnumFontChunk.c" +#include "ntgdi/NtGdiEnumFontOpen.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSetBitmapBits.c" @@ -30,6 +33,9 @@ { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, + { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, +// { L"NtGdiEnumFontChunk", Test_NtGdiEnumFontChunk }, + { L"NtGdiEnumFontOpen", Test_NtGdiEnumFontOpen }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Tue Aug 28 19:06:36 2007 @@ -2,6 +2,7 @@ HINSTANCE g_hInstance; HMODULE g_hModule = NULL; +PGDI_TABLE_ENTRY GdiHandleTable; static DWORD STDCALL IntSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam) @@ -58,7 +59,8 @@ int nCmdShow) { g_hInstance = hInstance; - + GDIQUERYPROC GdiQueryHandleTable; + printf("Win32k native API test\n"); /* Convert to gui thread */ @@ -68,7 +70,18 @@ if (!g_hModule) { printf("w32kdll.dll not found!\n"); - return FALSE; + return -1; + } + + GdiQueryHandleTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandleW(L"GDI32.DLL"), "GdiQueryTable"); + if(!GdiQueryHandleTable) + { + return -1; + } + GdiHandleTable = GdiQueryHandleTable(); + if(!GdiHandleTable) + { + return -1; } printf("\n"); Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Tue Aug 28 19:06:36 2007 @@ -1,10 +1,16 @@ #ifndef _W32KNAPI_H #define _W32KNAPI_H -#include "../apitest.h" +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#define WINVER 0x501 -#include <ddk/winddi.h> -#include <ddk/ntddk.h> +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <ntddk.h> +#include <d3dnthal.h> +#include <prntfont.h> /* Public Win32K Headers */ #include <win32k/callback.h> @@ -12,11 +18,13 @@ #include <win32k/ntgdityp.h> #include <win32k/ntgdihdl.h> +#include <ntgdi.h> + +#include "../apitest.h" + #define OS_UNSUPPORTED 0 #define OS_REACTOS 1 #define OS_WINDOWS 2 - -#define W32KAPI typedef struct { @@ -25,11 +33,11 @@ INT nParams; } SYCALL_ENTRY, *PSYSCALL_ENTRY; +typedef PGDI_TABLE_ENTRY (CALLBACK * GDIQUERYPROC) (void); + extern HINSTANCE g_hInstance; -extern SYCALL_ENTRY SyscallTable_XP_2600[]; -extern SYCALL_ENTRY SyscallTable_2K_2195[]; extern HMODULE g_hModule; -extern INT g_nOsVer; +extern PGDI_TABLE_ENTRY GdiHandleTable; DWORD Syscall(LPWSTR lpszFunction, int cParams, void* pParams); BOOL InitOsVersion(); Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild Tue Aug 28 19:06:36 2007 @@ -7,6 +7,7 @@ <library>user32</library> <library>gdi32</library> <library>shell32</library> + <library>w32kdll</library> <file>w32knapi.c</file> <file>testlist.c</file> </module>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007