Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[cgutman] 48700: [USETUP] - Remove code that was corrupting disk data and causing setup to fail in rare cases - Write the MBR in all cases (Windows setup behavior too) - We can overwrite GRUB and L...
by cgutman＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: cgutman Date: Sat Sep 4 20:56:19 2010 New Revision: 48700 URL: http://svn.reactos.org/svn/reactos?rev=48700&view=rev Log: [USETUP] - Remove code that was corrupting disk data and causing setup to fail in rare cases - Write the MBR in all cases (Windows setup behavior too) - We can overwrite GRUB and LILO now but we still can't boot because we have trouble reading the partition table if it was made in Linux Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Sep 4 20:56:19 2010 @@ -2450,29 +2450,6 @@ CheckActiveBootPartition(PartitionList); } - /* Install MBR if necessary */ - if (DiskEntry->NoMbr && - DiskEntry->BiosDiskNumber == 0) - { - wcscpy(PathBuffer, SourceRootPath.Buffer); - wcscat(PathBuffer, L"\\loader\\dosmbr.bin"); - - DPRINT("Install MBR bootcode: %S ==> %S\n", - PathBuffer, DestinationRootPath.Buffer); - - /* Install MBR bootcode */ - Status = InstallMbrBootCodeToDisk(PathBuffer, - DestinationRootPath.Buffer); - if (!NT_SUCCESS (Status)) - { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); - return FALSE; - } - - DiskEntry->NoMbr = FALSE; - } - if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) { /* FIXME: Install boot code. This is a hack! */ @@ -3621,7 +3598,10 @@ { UCHAR PartitionType; NTSTATUS Status; - + WCHAR DestinationDevicePathBuffer[MAX_PATH]; + WCHAR SourceMbrPathBuffer[MAX_PATH]; + + /* Step 1: Write the VBR */ PartitionType = PartitionList->ActiveBootPartition-> PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; if ((PartitionType == PARTITION_FAT_12) || @@ -3640,8 +3620,6 @@ MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } - - return SUCCESS_PAGE; } else { @@ -3649,7 +3627,28 @@ return QUIT_PAGE; } - return BOOT_LOADER_HARDDISK_PAGE; + /* Step 2: Write the MBR */ + swprintf(DestinationDevicePathBuffer, + L"\\Device\\Harddisk%d\\Partition0", + PartitionList->ActiveBootDisk->DiskNumber); + + wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); + wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); + + DPRINT("Install MBR bootcode: %S ==> %S\n", + SourceMbrPathBuffer, DestinationDevicePathBuffer); + + Status = InstallMbrBootCodeToDisk(SourceMbrPathBuffer, + DestinationDevicePathBuffer); + if (!NT_SUCCESS (Status)) + { + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", + Status); + MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + return SUCCESS_PAGE; }

1 0

[akhaldi] 48699: [CMAKE] - Mark nci_output and nci_folders as lists.
by akhaldi＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: akhaldi Date: Sat Sep 4 16:59:33 2010 New Revision: 48699 URL: http://svn.reactos.org/svn/reactos?rev=48699&view=rev Log: [CMAKE] - Mark nci_output and nci_folders as lists. Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Sep 4 16:59:33 2010 @@ -112,7 +112,7 @@ # nci generated intermediate files -set(nci_output +list(APPEND nci_output ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S @@ -120,7 +120,7 @@ ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) -set(nci_folders +list(APPEND nci_folders ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys

1 0

[akhaldi] 48698: [CMAKE] - Mark nci output as generated.
by akhaldi＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: akhaldi Date: Sat Sep 4 16:12:21 2010 New Revision: 48698 URL: http://svn.reactos.org/svn/reactos?rev=48698&view=rev Log: [CMAKE] - Mark nci output as generated. Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Sep 4 16:12:21 2010 @@ -135,6 +135,8 @@ COMMAND native-nci -arch ${ARCH} ${REACTOS_SOURCE_DIR}/ntoskrnl/sysfuncs.lst ${REACTOS_SOURCE_DIR}/subsystems/win32/win32k/w32ksvc.db ${nci_output} DEPENDS native-nci ${nci_folders}) +set_source_files_properties(${nci_output} PROPERTIES GENERATED TRUE) + add_custom_target(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) add_custom_target(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) add_custom_target(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec)

1 0

[akhaldi] 48697: [CMAKE] - Add floppy to build.
by akhaldi＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: akhaldi Date: Sat Sep 4 14:14:45 2010 New Revision: 48697 URL: http://svn.reactos.org/svn/reactos?rev=48697&view=rev Log: [CMAKE] - Add floppy to build. Added: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/storage/CMakeLists.txt Modified: branches/cmake-bringup/drivers/storage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/C… ============================================================================== --- branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] Sat Sep 4 14:14:45 2010 @@ -1,5 +1,6 @@ add_subdirectory(class) +add_subdirectory(floppy) add_subdirectory(ide) add_subdirectory(port) add_subdirectory(scsiport) Added: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/f… ============================================================================== --- branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Sat Sep 4 14:14:45 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(floppy SHARED + csqrtns.c + floppy.c + hardware.c + ioctl.c + readwrite.c + floppy.rc) + +set_target_properties(floppy PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(floppy + csq + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(floppy psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48696: [CMAKE] - Add fastfat and isapnp to build.
by akhaldi＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: akhaldi Date: Sat Sep 4 13:43:01 2010 New Revision: 48696 URL: http://svn.reactos.org/svn/reactos?rev=48696&view=rev Log: [CMAKE] - Add fastfat and isapnp to build. Added: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt (with props) branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/bus/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/CMakeLists.txt Modified: branches/cmake-bringup/drivers/bus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/CMake… ============================================================================== --- branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:43:01 2010 @@ -1,3 +1,3 @@ add_subdirectory(acpi) - +add_subdirectory(isapnp) Added: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapn… ============================================================================== --- branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:43:01 2010 @@ -1,0 +1,17 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(isapnp SHARED + isapnp.c + pdo.c + fdo.c + hardware.c + isapnp.rc) + +set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(isapnp + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(isapnp psdk bugcodes) Propchange: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:43:01 2010 @@ -1,2 +1,3 @@ add_subdirectory(cdfs) +add_subdirectory(fastfat) Added: branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:43:01 2010 @@ -1,0 +1,36 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +list(APPEND SOURCE + blockdev.c + cleanup.c + close.c + create.c + dir.c + direntry.c + dirwr.c + ea.c + fat.c + fastio.c + fcb.c + finfo.c + flush.c + fsctl.c + iface.c + misc.c + rw.c + shutdown.c + string.c + volume.c + vfatfs.rc) + +add_library(fastfat SHARED ${CMAKE_CURRENT_BINARY_DIR}/fastfat_vfat.h.gch ${SOURCE}) + +set_target_properties(fastfat PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(fastfat + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE}) +add_dependencies(fastfat psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48695: [CMAKE] - Add cdrom, class2, disk and ramdisk to build.
by akhaldi＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: akhaldi Date: Sat Sep 4 13:36:49 2010 New Revision: 48695 URL: http://svn.reactos.org/svn/reactos?rev=48695&view=rev Log: [CMAKE] - Add cdrom, class2, disk and ramdisk to build. Added: branches/cmake-bringup/drivers/storage/class/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/class/class2/libclass2.a (with props) branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt branches/cmake-bringup/drivers/storage/CMakeLists.txt Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b… ============================================================================== --- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:36:49 2010 @@ -2,8 +2,6 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") add_definitions(-D_BATTERYCLASS_) - -spec2def(battc ${CMAKE_CURRENT_SOURCE_DIR}/battc.spec ${CMAKE_CURRENT_BINARY_DIR}/battc.def) add_library(battc SHARED battc.c battc.rc) Modified: branches/cmake-bringup/drivers/storage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/C… ============================================================================== --- branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:36:49 2010 @@ -1,4 +1,5 @@ +add_subdirectory(class) add_subdirectory(ide) add_subdirectory(port) add_subdirectory(scsiport) Added: branches/cmake-bringup/drivers/storage/class/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/class/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:36:49 2010 @@ -1,0 +1,5 @@ + +add_subdirectory(cdrom) +add_subdirectory(class2) +add_subdirectory(disk) +add_subdirectory(ramdisk) Propchange: branches/cmake-bringup/drivers/storage/class/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:36:49 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(..) + +add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc) + +set_target_properties(cdrom PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(cdrom + ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a + ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(cdrom psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:36:49 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(..) + +spec2def(class2 ${CMAKE_CURRENT_SOURCE_DIR}/class2.spec ${CMAKE_CURRENT_BINARY_DIR}/class2.def) + +add_library(class2 SHARED class2.c class2.rc) + +set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(class2 + ${CMAKE_CURRENT_BINARY_DIR}/class2.def + ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(class2 class2_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/class/class2/libclass2.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/drivers/storage/class/class2/libclass2.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:36:49 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(..) + +add_library(disk SHARED disk.c disk.rc) + +set_target_properties(disk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(disk + ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a + ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(disk psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:36:49 2010 @@ -1,0 +1,14 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(..) + +add_library(ramdisk SHARED ramdisk.c ramdisk.rc) + +set_target_properties(ramdisk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(ramdisk + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(ramdisk psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48694: [CMAKE] - Add buslogic to build. - Fix a typo.
by akhaldi＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: akhaldi Date: Sat Sep 4 13:16:29 2010 New Revision: 48694 URL: http://svn.reactos.org/svn/reactos?rev=48694&view=rev Log: [CMAKE] - Add buslogic to build. - Fix a typo. Added: branches/cmake-bringup/drivers/storage/port/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/scsiport/libscsiport.a (with props) Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt branches/cmake-bringup/drivers/storage/CMakeLists.txt Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:16:29 2010 @@ -124,8 +124,6 @@ set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") -spec2def(acpi ${CMAKE_CURRENT_SOURCE_DIR}/acpi.spec ${CMAKE_CURRENT_BINARY_DIR}/acpi.def) - add_library(acpi SHARED busmgr/bus.c busmgr/button.c Modified: branches/cmake-bringup/drivers/storage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/C… ============================================================================== --- branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:16:29 2010 @@ -1,3 +1,4 @@ add_subdirectory(ide) +add_subdirectory(port) add_subdirectory(scsiport) Added: branches/cmake-bringup/drivers/storage/port/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/p… ============================================================================== --- branches/cmake-bringup/drivers/storage/port/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/port/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:16:29 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(buslogic) Propchange: branches/cmake-bringup/drivers/storage/port/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/p… ============================================================================== --- branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] Sat Sep 4 13:16:29 2010 @@ -1,0 +1,12 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(buslogic SHARED BusLogic958.c BusLogic958.rc) + +set_target_properties(buslogic PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(buslogic + ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a + libcntpr) + +add_dependencies(buslogic psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/scsiport/libscsiport.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/drivers/storage/scsiport/libscsiport.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 48693: [CMAKE] - Add atapi, blue, cdfs and uniata to build.
by akhaldi＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: akhaldi Date: Sat Sep 4 12:57:01 2010 New Revision: 48693 URL: http://svn.reactos.org/svn/reactos?rev=48693&view=rev Log: [CMAKE] - Add atapi, blue, cdfs and uniata to build. Added: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt (with props) branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt (with props) branches/cmake-bringup/drivers/setup/CMakeLists.txt (with props) branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt branches/cmake-bringup/drivers/storage/CMakeLists.txt Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -2,6 +2,8 @@ add_subdirectory(base) add_subdirectory(battery) add_subdirectory(bus) +add_subdirectory(filesystems) add_subdirectory(input) +add_subdirectory(setup) add_subdirectory(storage) add_subdirectory(video) Added: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(cdfs) Propchange: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,0 +1,30 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +list(APPEND SOURCE + cdfs.c + cleanup.c + close.c + common.c + create.c + dirctl.c + fcb.c + finfo.c + fsctl.c + misc.c + rw.c + volinfo.c + cdfs.rc) + +add_library(cdfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/cdfs_cdfs.h.gch ${SOURCE}) + +set_target_properties(cdfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(cdfs + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE}) +add_dependencies(cdfs psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/CMa… ============================================================================== --- branches/cmake-bringup/drivers/setup/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/setup/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(blue) Propchange: branches/cmake-bringup/drivers/setup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blu… ============================================================================== --- branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,0 +1,14 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +add_library(blue SHARED blue.c font.c blue.rc) + +set_target_properties(blue PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(blue + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(blue psdk bugcodes) Propchange: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/storage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/C… ============================================================================== --- branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,2 +1,3 @@ +add_subdirectory(ide) add_subdirectory(scsiport) Added: branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,0 +1,3 @@ + +add_subdirectory(atapi) +add_subdirectory(uniata) Propchange: branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,0 +1,12 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(atapi SHARED atapi.c atapi.rc) + +set_target_properties(atapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(atapi + -lscsiport + libcntpr) + +add_dependencies(atapi psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sat Sep 4 12:57:01 2010 @@ -1,0 +1,25 @@ + +set(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(inc) + +add_library(uniata SHARED + id_ata.cpp + id_badblock.cpp + id_dma.cpp + id_init.cpp + id_probe.cpp + id_queue.cpp + id_sata.cpp + idedma.rc + ros_glue/ros_glue.cpp) + +set_target_properties(uniata PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(uniata + ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a + -lgcc) + +add_dependencies(uniata psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sir_richard] 48692: [NTOS]: Remove useless variables in kernel code that were set, but never actually used (dead code, tests, copy/pasters). If a variable was set but not used because of missing/#...
by sir_richard＠svn.reactos.org 04 Sep '10

04 Sep '10

Author: sir_richard Date: Sat Sep 4 08:17:17 2010 New Revision: 48692 URL: http://svn.reactos.org/svn/reactos?rev=48692&view=rev Log: [NTOS]: Remove useless variables in kernel code that were set, but never actually used (dead code, tests, copy/pasters). If a variable was set but not used because of missing/#if'ed out code, a note was added instead. [NTOS]: In the process, fix bugs in the Event dispatcher code that used Win32 EVENT_TYPE instead of NT KOBJECTS enumeration. [NTOS]: Fix a bug in ObpInsertHandleCount, where the object access check was being done with the previous mode, instead of honoring the probe mode, which is defined by OBJ_FORCE_ACCESS_CHECK. [NTOS]: Fix a bug in a section function which was always returning STATUS_SUCCESS, now it returns the result of the previous Status = function assignment. If this isn't desired, then don't check for the Status anymore. [NTOS]: Note that MDL code does not support SkipBytes argument. If it is used, MDL could be invalid. [NTOS]: Add checks for VerifierAllocation and set it when needed (WIP). [NTOS]: Clarify what _WORKING_LINKER_ is, and the legal risks in continuing to use a linker that builds non-Microsoft drivers when used with headers whose EULA specify that they can only be used for Microsoft drivers. Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/cmvalche.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ex/xipdisp.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/ke/eventobj.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/ppool.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=486… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -311,9 +311,6 @@ current_entry = CacheSegmentLRUListHead.Flink; while (current_entry != &CacheSegmentLRUListHead && Target > 0) { - NTSTATUS Status; - - Status = STATUS_SUCCESS; current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, CacheSegmentLRUListEntry); current_entry = current_entry->Flink; @@ -332,7 +329,7 @@ { PFN_NUMBER Page; Page = (PFN_NUMBER)(MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT); - Status = MmPageOutPhysicalAddress(Page); + MmPageOutPhysicalAddress(Page); } KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); @@ -1022,7 +1019,6 @@ { PLIST_ENTRY current_entry; PCACHE_SEGMENT current; - NTSTATUS Status; LIST_ENTRY FreeList; KIRQL oldIrql; @@ -1077,7 +1073,7 @@ { current_entry = RemoveTailList(&FreeList); current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - Status = CcRosInternalFreeCacheSegment(current); + CcRosInternalFreeCacheSegment(current); } ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); KeAcquireGuardedMutex(&ViewLock); Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -999,13 +999,8 @@ OUT PULONG OuterStackArray, OUT PULONG *LockedKcbs) { - ULONG HashKeyCopy; - /* We don't lock anything for now */ *LockedKcbs = NULL; - - /* Make a copy of the hash key */ - HashKeyCopy = (*Kcb)->ConvKey; /* Calculate hash values */ *TotalRemainingSubkeys = 0xBAADF00D; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -1194,6 +1194,7 @@ if (CmHive->Hive.Cluster != ClusterSize) ASSERT(FALSE); /* Set the file size */ + DPRINT("FIXME: Should set file size: %lx\n", Length); //if (!CmpFileSetSize((PHHIVE)CmHive, HFILE_TYPE_PRIMARY, Length, Length)) { /* This shouldn't fail */ @@ -1232,7 +1233,7 @@ UNICODE_STRING TempName, FileName, RegName; HANDLE Thread; NTSTATUS Status; - ULONG FileStart, RegStart, i; + ULONG RegStart, i; PSECURITY_DESCRIPTOR SecurityDescriptor; PAGED_CODE(); @@ -1247,7 +1248,6 @@ CmpGetRegistryPath(ConfigPath); RtlInitUnicodeString(&TempName, ConfigPath); RtlAppendStringToString((PSTRING)&FileName, (PSTRING)&TempName); - FileStart = FileName.Length; /* And build the registry root path */ RtlInitUnicodeString(&TempName, L"\\REGISTRY\\"); Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -340,7 +340,6 @@ OUT PULONG ResultLength, OUT PNTSTATUS Status) { - PHHIVE Hive; PKEY_VALUE_INFORMATION Info = (PKEY_VALUE_INFORMATION)KeyValueInformation; PCELL_DATA CellData; USHORT NameSize; @@ -350,8 +349,7 @@ HCELL_INDEX CellToRelease = HCELL_NIL; VALUE_SEARCH_RETURN_TYPE Result = SearchSuccess; - /* Get the hive and cell data */ - Hive = Kcb->KeyHive; + /* Get the value data */ CellData = (PCELL_DATA)ValueKey; /* Check if the value is compressed */ Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -232,7 +232,7 @@ { UNICODE_STRING KeyName, ValueName, Data, SectionName; OBJECT_ATTRIBUTES ObjectAttributes; - ULONG HavePae, CacheSize, Length, TotalLength = 0, i, Disposition; + ULONG HavePae, Length, TotalLength = 0, i, Disposition; SIZE_T ViewSize; NTSTATUS Status; HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; @@ -451,9 +451,6 @@ } } - /* Get the cache size while we're still localized */ - CacheSize = ((PKIPCR)KeGetPcr())->SecondLevelCacheSize; - /* Go back to user affinity */ KeRevertToUserAffinityThread(); Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -494,7 +494,6 @@ { PSYSTEM_PROCESSOR_INFORMATION Spi = (PSYSTEM_PROCESSOR_INFORMATION) Buffer; - PKPRCB Prcb; *ReqSize = sizeof(SYSTEM_PROCESSOR_INFORMATION); @@ -503,7 +502,6 @@ { return STATUS_INFO_LENGTH_MISMATCH; } - Prcb = KeGetCurrentPrcb(); Spi->ProcessorArchitecture = KeProcessorArchitecture; Spi->ProcessorLevel = KeProcessorLevel; Spi->ProcessorRevision = KeProcessorRevision; @@ -931,7 +929,6 @@ LONG i; ULONG TotalTime; - LARGE_INTEGER CurrentTime; PKPRCB Prcb; *ReqSize = KeNumberProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); @@ -942,7 +939,6 @@ return STATUS_INFO_LENGTH_MISMATCH; } - CurrentTime.QuadPart = KeQueryInterruptTime(); for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB on this processor */ Modified: trunk/reactos/ntoskrnl/ex/xipdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/xipdisp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/xipdisp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/xipdisp.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -79,6 +79,7 @@ /* FIXME: TODO */ DPRINT1("ReactOS does not yet support eXecute In Place boot technology\n"); + DPRINT("%s MB requested (XIP = %s)\n", XipMegs, XipBoot); } /* EOF */ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -552,7 +552,7 @@ NTAPI DisplayBootBitmap(IN BOOLEAN SosMode) { - PVOID Header, Band, Bar, Text, Screen; + PVOID Header, Band, Text, Screen; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; UCHAR Buffer[64]; @@ -615,7 +615,7 @@ if (SharedUserData->NtProductType == NtProductWinNt) { /* Workstation product, display appropriate status bar color */ - Bar = InbvGetResourceAddress(IDB_BAR_PRO); + InbvGetResourceAddress(IDB_BAR_PRO); } else { @@ -637,7 +637,7 @@ } /* Server product, display appropriate status bar color */ - Bar = InbvGetResourceAddress(IDB_BAR_SERVER); + InbvGetResourceAddress(IDB_BAR_SERVER); } /* Make sure we had a logo */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -715,7 +715,6 @@ PLDR_DATA_TABLE_ENTRY *ModuleObject) { NTSTATUS Status; - PLDR_DATA_TABLE_ENTRY NewEntry; UNICODE_STRING BaseName, BaseDirectory; PLOAD_IMPORTS LoadedImports = (PVOID)-2; PCHAR MissingApiName, Buffer; @@ -762,8 +761,6 @@ BaseDirectory = *FileName; BaseDirectory.Length -= BaseName.Length; BaseDirectory.MaximumLength = BaseDirectory.Length; - - NewEntry = LdrEntry; /* Resolve imports */ MissingApiName = Buffer; Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -604,13 +604,11 @@ IN PIO_STACK_LOCATION IoStackLocation) { NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; - PULONG Length; PFILE_POSITION_INFORMATION Buffer; PDEVICE_OBJECT DeviceObject; PAGED_CODE(); /* Get information from the IRP */ - Length = &IoStackLocation->Parameters.QueryFile.Length; Buffer = Irp->AssociatedIrp.SystemBuffer; /* We only handle this request */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -799,10 +799,8 @@ IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; PDEVICE_CAPABILITIES DeviceCapabilities; - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; if (DeviceCapabilities->Version != 1) Modified: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/i386-di… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -3746,7 +3746,6 @@ int sizeflag; { bfd_signed_vma op; - bfd_signed_vma mask = -1; switch (bytemode) { @@ -3755,7 +3754,6 @@ op = *codep++; if ((op & 0x80) != 0) op -= 0x100; - mask = 0xffffffff; break; case v_mode: USED_REX (REX_MODE64); @@ -3764,11 +3762,9 @@ else if (sizeflag & DFLAG) { op = get32s (); - mask = 0xffffffff; } else { - mask = 0xffffffff; op = get16 (); if ((op & 0x8000) != 0) op -= 0x10000; @@ -3777,7 +3773,6 @@ break; case w_mode: op = get16 (); - mask = 0xffffffff; if ((op & 0x8000) != 0) op -= 0x10000; break; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -790,7 +790,6 @@ ULONG Argc, PCHAR Argv[]) { - ULONG Count; ULONG ul; ULONGLONG Result = 0; ULONG_PTR Frame = KdbCurrentTrapFrame->Tf.Ebp; @@ -806,7 +805,6 @@ ul = strtoul(Argv[Argc-1], NULL, 0); if (ul > 0) { - Count = ul; Argc -= 2; } } @@ -815,7 +813,6 @@ ul = strtoul(Argv[Argc-1] + 1, NULL, 0); if (ul > 0) { - Count = ul; Argc--; } } Modified: trunk/reactos/ntoskrnl/ke/eventobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/eventobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -161,7 +161,6 @@ { KIRQL OldIrql; LONG PreviousState; - PKWAIT_BLOCK WaitBlock; PKTHREAD Thread; ASSERT_EVENT(Event); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -170,7 +169,7 @@ * Check if this is an signaled notification event without an upcoming wait. * In this case, we can immediately return TRUE, without locking. */ - if ((Event->Header.Type == NotificationEvent) && + if ((Event->Header.Type == EventNotificationObject) && (Event->Header.SignalState == 1) && !(Wait)) { @@ -190,13 +189,8 @@ /* Check if the event just became signaled now, and it has waiters */ if (!(PreviousState) && !(IsListEmpty(&Event->Header.WaitListHead))) { - /* Get the Wait Block */ - WaitBlock = CONTAINING_RECORD(Event->Header.WaitListHead.Flink, - KWAIT_BLOCK, - WaitListEntry); - /* Check the type of event */ - if (Event->Header.Type == NotificationEvent) + if (Event->Header.Type == EventNotificationObject) { /* Unwait the thread */ KxUnwaitThread(&Event->Header, Increment); @@ -237,7 +231,7 @@ KIRQL OldIrql; PKWAIT_BLOCK WaitBlock; PKTHREAD Thread = KeGetCurrentThread(), WaitThread; - ASSERT(Event->Header.Type == SynchronizationEvent); + ASSERT(Event->Header.Type == EventSynchronizationObject); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Acquire Dispatcher Database Lock */ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -739,6 +739,7 @@ NpxSaveArea = KiGetThreadNpxArea(NpxThread); /* Save FPU state */ + DPRINT("FIXME: Save FPU state: %p\n", NpxSaveArea); //Ke386SaveFpuState(NpxSaveArea); /* Update NPX state */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -158,7 +158,6 @@ PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde, TempPte; PVOID NonPagedPoolExpansionVa; - ULONG OldCount; KIRQL OldIrql; /* Check for kernel stack size that's too big */ @@ -519,7 +518,6 @@ // We PDE-aligned the nonpaged system start VA, so haul some extra PTEs! // PointerPte = MiAddressToPte(MmNonPagedSystemStart); - OldCount = MmNumberOfSystemPtes; MmNumberOfSystemPtes = MiAddressToPte(MmNonPagedPoolExpansionStart) - PointerPte; MmNumberOfSystemPtes--; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -578,13 +578,11 @@ ULONG LockPages, TotalPages; NTSTATUS Status = STATUS_SUCCESS; PEPROCESS CurrentProcess; - PETHREAD Thread; PMMSUPPORT AddressSpace; NTSTATUS ProbeStatus; PMMPTE PointerPte, LastPte; PMMPDE PointerPde; PFN_NUMBER PageFrameIndex; - PMMPFN Pfn1; BOOLEAN UsePfnLock; KIRQL OldIrql; DPRINT("Probing MDL: %p\n", Mdl); @@ -616,9 +614,8 @@ ASSERT(LockPages != 0); // - // Get the thread and process - // - Thread = PsGetCurrentThread(); + // Get theprocess + // if (Address <= MM_HIGHEST_USER_ADDRESS) { // @@ -962,10 +959,6 @@ PageFrameIndex = PFN_FROM_PTE(PointerPte); if (PageFrameIndex <= MmHighestPhysicalPage) { - // - // Get the PFN entry - // - Pfn1 = MiGetPfnEntry(PageFrameIndex); ASSERT((CurrentProcess == NULL) || (UsePfnLock == FALSE)); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -686,6 +686,10 @@ ASSERT(Pfn1->u3.e1.StartOfAllocation == 0); Pfn1->u3.e1.StartOfAllocation = 1; + /* Mark it as special pool if needed */ + ASSERT(Pfn1->u4.VerifierAllocation == 0); + if (PoolType & 64) Pfn1->u4.VerifierAllocation = 1; + // // Check if the allocation is larger than one page // @@ -790,6 +794,10 @@ Pfn1 = MiGetPfnEntry(StartPte->u.Hard.PageFrameNumber); Pfn1->u3.e1.StartOfAllocation = 1; + /* Mark it as a verifier allocation if needed */ + ASSERT(Pfn1->u4.VerifierAllocation == 0); + if (PoolType & 64) Pfn1->u4.VerifierAllocation = 1; + // // Release the PFN and nonpaged pool lock // Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -389,7 +389,6 @@ { PKTHREAD Thread = KeGetCurrentThread(); PMMPTE LimitPte, NewLimitPte, LastPte; - PFN_NUMBER StackPages; KIRQL OldIrql; MMPTE TempPte, InvalidPte; PFN_NUMBER PageFrameIndex; @@ -430,7 +429,6 @@ // Calculate the number of new pages // LimitPte--; - StackPages = (LimitPte - NewLimitPte + 1); /* Setup the temporary invalid PTE */ MI_MAKE_SOFTWARE_PTE(&InvalidPte, MM_NOACCESS); Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -559,7 +559,20 @@ ULONG_PTR OldBaseTop, Delta; PLDR_DATA_TABLE_ENTRY LdrEntry; PLIST_ENTRY NextEntry; - ULONG ImportSize, i; + ULONG ImportSize; + // + // FIXME: MINGW-W64 must fix LD to generate drivers that Windows can load, + // since a real version of Windows would fail at this point, but they seem + // busy implementing features such as "HotPatch" support in GCC 4.6 instead, + // a feature which isn't even used by Windows. Priorities, priorities... + // Please note that Microsoft WDK EULA and license prohibits using + // the information contained within it for the generation of "non-Windows" + // drivers, which is precisely what LD will generate, since an LD driver + // will not load on Windows. + // +#ifdef _WORKING_LINKER_ + ULONG i; +#endif PULONG_PTR ImageThunk; PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; @@ -599,7 +612,6 @@ } #else /* Get the import table */ - i = ImportSize; ImportDescriptor = RtlImageDirectoryEntryToData(LdrEntry->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -81,6 +81,7 @@ MiDecrementShareCount(Pfn1, PageFrameIndex); /* Decrement the page table too */ + DPRINT("FIXME: ARM3 should decrement the PT refcount for: %p\n", Pfn2); #if 0 // ARM3: Dont't trust this yet MiDecrementShareCount(Pfn2, PageTableIndex); #endif Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -180,6 +180,9 @@ if (BYTE_OFFSET(SkipBytes.LowPart)) return NULL; SkipPages = (PFN_NUMBER)(SkipBytes.QuadPart >> PAGE_SHIFT); + /* This isn't supported at all */ + if (SkipPages) DPRINT1("WARNING: Caller requesting SkipBytes, MDL might be mismatched\n"); + // // Now compute the number of pages the MDL will cover // Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -653,8 +653,6 @@ ULONG oldPdeOffset, PdeOffset; PULONG Pt = NULL; ULONG Pte; - BOOLEAN NoExecute = FALSE; - DPRINT("MmCreateVirtualMappingUnsafe(%x, %x, %x, %x (%x), %d)\n", Process, Address, flProtect, Pages, *Pages, PageCount); @@ -689,10 +687,6 @@ } Attributes = ProtectToPTE(flProtect); - if (Attributes & 0x80000000) - { - NoExecute = TRUE; - } Attributes &= 0xfff; if (Address >= MmSystemRangeStart) { @@ -826,7 +820,6 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) { ULONG Attributes = 0; - BOOLEAN NoExecute = FALSE; PULONG Pt; DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", @@ -834,10 +827,6 @@ Attributes = ProtectToPTE(flProtect); - if (Attributes & 0x80000000) - { - NoExecute = TRUE; - } Attributes &= 0xfff; if (Address >= MmSystemRangeStart) { Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -719,10 +719,7 @@ { PR_USED NewBlock; PR_FREE BestBlock, - NextBlock, - PreviousBlock, - BestPreviousBlock, - CurrentBlock; + CurrentBlock; void* BestAlignedAddr; int que, queBytes = NumberOfBytes; @@ -785,8 +782,6 @@ */ BestBlock = NULL; Alignment = pool->Alignments[align]; - PreviousBlock = NULL; - BestPreviousBlock = NULL, CurrentBlock = pool->FirstFree; BestAlignedAddr = NULL; @@ -802,7 +797,6 @@ if ( Addr == AlignedAddr ) { BestAlignedAddr = AlignedAddr; - BestPreviousBlock = PreviousBlock; BestBlock = CurrentBlock; break; } @@ -820,12 +814,10 @@ || BestBlock->Size > CurrentBlock->Size ) { BestAlignedAddr = AlignedAddr; - BestPreviousBlock = PreviousBlock; BestBlock = CurrentBlock; } } - PreviousBlock = CurrentBlock; CurrentBlock = CurrentBlock->NextFree; } @@ -876,7 +868,6 @@ NewFreeBlock, NewFreeBlock->Size, BestBlock->Size, BestBlock->NextFree );*/ /* we want the following code to use our size-aligned block */ - BestPreviousBlock = BestBlock; BestBlock = NewFreeBlock; //VerifyPagedPool(); @@ -893,7 +884,7 @@ /* * Create the new free block. */ - NextBlock = RFreeSplit ( pool, BestBlock, BlockSize ); + RFreeSplit ( pool, BestBlock, BlockSize ); //ASSERT_SIZE ( NextBlock->Size ); } /* @@ -919,7 +910,9 @@ RPoolFree ( PR_POOL pool, void* Addr ) { PR_USED UsedBlock; +#ifndef R_RZ rulong UsedSize; +#endif PR_FREE FreeBlock; rulong UserSize; int que; @@ -936,11 +929,11 @@ R_ASSERT_PTR(pool,Addr); UsedBlock = RBodyToHdr(Addr); - UsedSize = UsedBlock->Size; FreeBlock = (PR_FREE)UsedBlock; #if R_RZ UserSize = UsedBlock->UserSize; #else + UsedSize = UsedBlock->Size; UserSize = UsedSize - sizeof(R_USED) - 2*R_RZ; #endif//R_RZ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -2963,7 +2963,6 @@ { ULONG i; ULONG LastSegment; - BOOLEAN Initialized; PMM_SECTION_SEGMENT EffectiveSegment; if (Flags & EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED) @@ -2972,7 +2971,6 @@ return TRUE; } - Initialized = FALSE; LastSegment = 0; EffectiveSegment = &ImageSectionObject->Segments[LastSegment]; @@ -3711,7 +3709,6 @@ PROS_SECTION_OBJECT Section; PEPROCESS Process; KPROCESSOR_MODE PreviousMode; - PMMSUPPORT AddressSpace; NTSTATUS Status; ULONG tmpProtect; ACCESS_MASK DesiredAccess; @@ -3787,8 +3784,6 @@ return(Status); } - AddressSpace = &Process->Vm; - /* Convert NT Protection Attr to Access Mask */ if (Protect == PAGE_READONLY) { @@ -4033,7 +4028,7 @@ } MmUnlockSectionSegment(Segment); ObDereferenceObject(Section); - return(STATUS_SUCCESS); + return(Status); } /* Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -462,6 +462,7 @@ /* Charge the quota */ ObjectHeader->QuotaBlockCharged = (PVOID)1; + DPRINT("FIXME: Should charge: %lx %lx\n", PagedPoolCharge, NonPagedPoolCharge); #if 0 PsChargeSharedPoolQuota(PsGetCurrentProcess(), PagedPoolCharge, @@ -898,7 +899,7 @@ if (!ObCheckObjectAccess(Object, AccessState, TRUE, - AccessMode, + ProbeMode, &Status)) { /* Access was denied, so fail */ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -107,6 +107,15 @@ /* Add the SD charge too */ if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2048; } + + /* Return the quota */ + DPRINT("FIXME: Should return quotas: %lx %lx\n", PagedPoolCharge, NonPagedPoolCharge); +#if 0 + PsReturnSharedPoolQuota(ObjectHeader->QuotaBlockCharged, + PagedPoolCharge, + NonPagedPoolCharge); +#endif + } } Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sat Sep 4 08:17:17 2010 @@ -370,7 +370,6 @@ PIO_STACK_LOCATION Stack; PIRP Irp; PREQUEST_POWER_ITEM RequestPowerItem; - NTSTATUS Status; if (MinorFunction != IRP_MN_QUERY_POWER && MinorFunction != IRP_MN_SET_POWER @@ -419,7 +418,7 @@ *pIrp = Irp; IoSetCompletionRoutine(Irp, PopRequestPowerIrpCompletion, RequestPowerItem, TRUE, TRUE, TRUE); - Status = IoCallDriver(TopDeviceObject, Irp); + IoCallDriver(TopDeviceObject, Irp); /* Always return STATUS_PENDING. The completion routine * will call CompletionFunction and complete the Irp.

1 0

[akhaldi] 48691: [CMAKE] - Add battc, acpica and acpi to build.
by akhaldi＠svn.reactos.org 03 Sep '10

03 Sep '10

Author: akhaldi Date: Fri Sep 3 14:33:39 2010 New Revision: 48691 URL: http://svn.reactos.org/svn/reactos?rev=48691&view=rev Log: [CMAKE] - Add battc, acpica and acpi to build. Added: branches/cmake-bringup/drivers/battery/CMakeLists.txt (with props) branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Fri Sep 3 14:33:39 2010 @@ -1,5 +1,7 @@ add_subdirectory(base) +add_subdirectory(battery) +add_subdirectory(bus) add_subdirectory(input) add_subdirectory(storage) add_subdirectory(video) Added: branches/cmake-bringup/drivers/battery/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/C… ============================================================================== --- branches/cmake-bringup/drivers/battery/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/battery/CMakeLists.txt [iso-8859-1] Fri Sep 3 14:33:39 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(battc) Propchange: branches/cmake-bringup/drivers/battery/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b… ============================================================================== --- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Fri Sep 3 14:33:39 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-D_BATTERYCLASS_) + +spec2def(battc ${CMAKE_CURRENT_SOURCE_DIR}/battc.spec ${CMAKE_CURRENT_BINARY_DIR}/battc.def) + +add_library(battc SHARED battc.c battc.rc) + +set_target_properties(battc PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(battc + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(battc psdk bugcodes) Propchange: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/bus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/CMake… ============================================================================== --- branches/cmake-bringup/drivers/bus/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] Fri Sep 3 14:33:39 2010 @@ -1,0 +1,3 @@ + +add_subdirectory(acpi) + Propchange: branches/cmake-bringup/drivers/bus/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Fri Sep 3 14:33:39 2010 @@ -1,0 +1,152 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(include) +include_directories(acpica/include) + +add_library(acpica + acpica/dispatcher/dsfield.c + acpica/dispatcher/dsinit.c + acpica/dispatcher/dsmethod.c + acpica/dispatcher/dsmthdat.c + acpica/dispatcher/dsobject.c + acpica/dispatcher/dsopcode.c + acpica/dispatcher/dsutils.c + acpica/dispatcher/dswexec.c + acpica/dispatcher/dswload.c + acpica/dispatcher/dswscope.c + acpica/dispatcher/dswstate.c + acpica/events/evevent.c + acpica/events/evgpe.c + acpica/events/evgpeblk.c + acpica/events/evmisc.c + acpica/events/evregion.c + acpica/events/evrgnini.c + acpica/events/evsci.c + acpica/events/evxface.c + acpica/events/evxfevnt.c + acpica/events/evxfregn.c + acpica/executer/exconfig.c + acpica/executer/exconvrt.c + acpica/executer/excreate.c + acpica/executer/exdump.c + acpica/executer/exfield.c + acpica/executer/exfldio.c + acpica/executer/exmisc.c + acpica/executer/exmutex.c + acpica/executer/exoparg1.c + acpica/executer/exoparg2.c + acpica/executer/exoparg3.c + acpica/executer/exoparg6.c + acpica/executer/exnames.c + acpica/executer/exprep.c + acpica/executer/exregion.c + acpica/executer/exresnte.c + acpica/executer/exresolv.c + acpica/executer/exresop.c + acpica/executer/exstore.c + acpica/executer/exstoren.c + acpica/executer/exstorob.c + acpica/executer/exsystem.c + acpica/executer/exutils.c + acpica/hardware/hwacpi.c + acpica/hardware/hwgpe.c + acpica/hardware/hwregs.c + acpica/hardware/hwsleep.c + acpica/hardware/hwtimer.c + acpica/hardware/hwvalid.c + acpica/hardware/hwxface.c + acpica/namespace/nsaccess.c + acpica/namespace/nsalloc.c + acpica/namespace/nsdump.c + acpica/namespace/nsdumpdv.c + acpica/namespace/nseval.c + acpica/namespace/nsinit.c + acpica/namespace/nsload.c + acpica/namespace/nsnames.c + acpica/namespace/nsobject.c + acpica/namespace/nsparse.c + acpica/namespace/nspredef.c + acpica/namespace/nsrepair.c + acpica/namespace/nsrepair2.c + acpica/namespace/nssearch.c + acpica/namespace/nsutils.c + acpica/namespace/nswalk.c + acpica/namespace/nsxfeval.c + acpica/namespace/nsxfname.c + acpica/namespace/nsxfobj.c + acpica/parser/psargs.c + acpica/parser/psloop.c + acpica/parser/psopcode.c + acpica/parser/psparse.c + acpica/parser/psscope.c + acpica/parser/pstree.c + acpica/parser/psutils.c + acpica/parser/pswalk.c + acpica/parser/psxface.c + acpica/resources/rsaddr.c + acpica/resources/rscalc.c + acpica/resources/rscreate.c + acpica/resources/rsdump.c + acpica/resources/rsinfo.c + acpica/resources/rsio.c + acpica/resources/rsirq.c + acpica/resources/rslist.c + acpica/resources/rsmemory.c + acpica/resources/rsmisc.c + acpica/resources/rsutils.c + acpica/resources/rsxface.c + acpica/tables/tbfadt.c + acpica/tables/tbfind.c + acpica/tables/tbinstal.c + acpica/tables/tbutils.c + acpica/tables/tbxface.c + acpica/tables/tbxfroot.c + acpica/utilities/utalloc.c + acpica/utilities/utcache.c + acpica/utilities/utclib.c + acpica/utilities/utcopy.c + acpica/utilities/utdebug.c + acpica/utilities/utdelete.c + acpica/utilities/uteval.c + acpica/utilities/utglobal.c + acpica/utilities/utids.c + acpica/utilities/utinit.c + acpica/utilities/utlock.c + acpica/utilities/utmath.c + acpica/utilities/utmisc.c + acpica/utilities/utmutex.c + acpica/utilities/utobject.c + acpica/utilities/utresrc.c + acpica/utilities/utstate.c + acpica/utilities/uttrack.c + acpica/utilities/utxface.c) + +set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") + +spec2def(acpi ${CMAKE_CURRENT_SOURCE_DIR}/acpi.spec ${CMAKE_CURRENT_BINARY_DIR}/acpi.def) + +add_library(acpi SHARED + busmgr/bus.c + busmgr/button.c + busmgr/power.c + busmgr/utils.c + busmgr/system.c + osl.c + acpienum.c + eval.c + interface.c + pnp.c + power.c + buspdo.c + main.c) + +set_target_properties(acpi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(acpi + wdmguid + acpica + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(acpi psdk bugcodes) Propchange: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010