Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52278: [VFATLIB] - Determine the correct FAT type based on the size and offset of the partition if the current type is not a FAT type (another FS type or unformatted) - Formatting a flopp...
by cgutman＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: cgutman Date: Thu Jun 16 14:32:49 2011 New Revision: 52278 URL: http://svn.reactos.org/svn/reactos?rev=52278&view=rev Log: [VFATLIB] - Determine the correct FAT type based on the size and offset of the partition if the current type is not a FAT type (another FS type or unformatted) - Formatting a floppy, blank partition, or other non-FAT formatted partition from within ROS no longer fails Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Thu Jun 16 14:32:49 2011 @@ -127,6 +127,58 @@ PartitionInfo.RewritePartition = FALSE; PartitionInfo.RecognizedPartition = FALSE; } + + /* If it already has a FAT FS, we'll use that type. + * If it doesn't, we will determine the FAT type based on size and offset */ + if (PartitionInfo.PartitionType != PARTITION_FAT_12 && + PartitionInfo.PartitionType != PARTITION_FAT_16 && + PartitionInfo.PartitionType != PARTITION_HUGE && + PartitionInfo.PartitionType != PARTITION_XINT13 && + PartitionInfo.PartitionType != PARTITION_FAT32 && + PartitionInfo.PartitionType != PARTITION_FAT32_XINT13) + { + /* Determine the correct type based upon size and offset (copied from usetup) */ + if (PartitionInfo.PartitionLength.QuadPart < (4200LL * 1024LL)) + { + /* FAT12 CHS partition (disk is smaller than 4.1MB) */ + PartitionInfo.PartitionType = PARTITION_FAT_12; + } + else if (PartitionInfo.StartingOffset.QuadPart < (1024LL * 255LL * 63LL * 512LL)) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + + if (PartitionInfo.PartitionLength.QuadPart < (32LL * 1024LL * 1024LL)) + { + /* FAT16 CHS partition (partiton size < 32MB) */ + PartitionInfo.PartitionType = PARTITION_FAT_16; + } + else if (PartitionInfo.PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) + { + /* FAT16 CHS partition (partition size < 512MB) */ + PartitionInfo.PartitionType = PARTITION_HUGE; + } + else + { + /* FAT32 CHS partition (partition size >= 512MB) */ + PartitionInfo.PartitionType = PARTITION_FAT32; + } + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + + if (PartitionInfo.PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) + { + /* FAT16 LBA partition (partition size < 512MB) */ + PartitionInfo.PartitionType = PARTITION_XINT13; + } + else + { + /* FAT32 LBA partition (partition size >= 512MB) */ + PartitionInfo.PartitionType = PARTITION_FAT32_XINT13; + } + } + } DPRINT("PartitionType 0x%x\n", PartitionInfo.PartitionType); DPRINT("StartingOffset %I64d\n", PartitionInfo.StartingOffset.QuadPart);

1 0

[cgutman] 52277: [NTOSKRNL] - Use the IopParseDevice hack for floppies too (needed for format and chkdsk to work)
by cgutman＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: cgutman Date: Thu Jun 16 13:31:12 2011 New Revision: 52277 URL: http://svn.reactos.org/svn/reactos?rev=52277&view=rev Log: [NTOSKRNL] - Use the IopParseDevice hack for floppies too (needed for format and chkdsk to work) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Thu Jun 16 13:31:12 2011 @@ -408,7 +408,8 @@ if (!(DirectOpen) && !(RemainingName->Length) && !(OpenPacket->RelatedFileObject) && - ((wcsstr(CompleteName->Buffer, L"Harddisk"))) && + ((wcsstr(CompleteName->Buffer, L"Harddisk")) || + (wcsstr(CompleteName->Buffer, L"Floppy"))) && !(UseDummyFile)) { DPRINT1("Using IopParseDevice() hack. Requested invalid attributes: %lx\n",

1 0

[cgutman] 52276: - Fix copy paste typo
by cgutman＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: cgutman Date: Thu Jun 16 13:09:20 2011 New Revision: 52276 URL: http://svn.reactos.org/svn/reactos?rev=52276&view=rev Log: - Fix copy paste typo Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Thu Jun 16 13:09:20 2011 @@ -289,7 +289,7 @@ /* Calculate cluster size */ if (ClusterSize == 0) { - if (DiskGeometry.MediaType == FixedMedia) + if (DiskGeometry->MediaType == FixedMedia) { /* 4KB Cluster (Harddisk only) */ ClusterSize = 4096;

1 0

[cgutman] 52275: [VFATLIB] - Fix default cluster size for floppy disks
by cgutman＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: cgutman Date: Thu Jun 16 13:07:08 2011 New Revision: 52275 URL: http://svn.reactos.org/svn/reactos?rev=52275&view=rev Log: [VFATLIB] - Fix default cluster size for floppy disks Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Thu Jun 16 13:07:08 2011 @@ -289,8 +289,16 @@ /* Calculate cluster size */ if (ClusterSize == 0) { - /* 4KB Cluster (Harddisk only) */ - ClusterSize = 4096; + if (DiskGeometry.MediaType == FixedMedia) + { + /* 4KB Cluster (Harddisk only) */ + ClusterSize = 4096; + } + else + { + /* 512 byte cluster (floppy) */ + ClusterSize = 512; + } } SectorCount = PartitionInfo->PartitionLength.QuadPart >>

1 0

[gadamopoulos] 52274: [user32] - Merge part of r50590 - Fix resource include path
by gadamopoulos＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: gadamopoulos Date: Thu Jun 16 10:53:29 2011 New Revision: 52274 URL: http://svn.reactos.org/svn/reactos?rev=52274&view=rev Log: [user32] - Merge part of r50590 - Fix resource include path Modified: trunk/reactos/dll/win32/user32/user32.rc Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rc [iso-8859-1] Thu Jun 16 10:53:29 2011 @@ -1,7 +1,7 @@ /* $Id$ */ #include <windows.h> -#include "resource.h" +#include "include/resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Client Dll\0"

1 0

[gadamopoulos] 52273: [user32] - Fix double definition of GetClipCursor, ClipCursor, SetCursor and HiliteMenuItem - Fixes compilation with msvc
by gadamopoulos＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: gadamopoulos Date: Thu Jun 16 10:28:54 2011 New Revision: 52273 URL: http://svn.reactos.org/svn/reactos?rev=52273&view=rev Log: [user32] - Fix double definition of GetClipCursor, ClipCursor, SetCursor and HiliteMenuItem - Fixes compilation with msvc Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Thu Jun 16 10:28:54 2011 @@ -235,27 +235,9 @@ } EXTINLINE BOOL WINAPI -GetClipCursor(LPRECT lpRect) -{ - return NtUserGetClipCursor(lpRect); -} - -EXTINLINE BOOL WINAPI GetCursorInfo(PCURSORINFO pci) { return NtUserGetCursorInfo(pci); -} - -EXTINLINE BOOL WINAPI -ClipCursor(CONST RECT *lpRect) -{ - return NtUserClipCursor((RECT *)lpRect); -} - -EXTINLINE HCURSOR WINAPI -SetCursor(HCURSOR hCursor) -{ - return NtUserSetCursor(hCursor); } EXTINLINE HDC WINAPI @@ -469,12 +451,6 @@ } EXTINLINE BOOL WINAPI -HiliteMenuItem(HWND hwnd, HMENU hmenu, UINT uItemHilite, UINT uHilite) -{ - return NtUserHiliteMenuItem(hwnd, hmenu, uItemHilite, uHilite); -} - -EXTINLINE BOOL WINAPI RemoveMenu(HMENU hMenu, UINT uPosition, UINT uFlags) { return NtUserRemoveMenu(hMenu, uPosition, uFlags);

1 0

[tkreuzer] 52272: [FREELDR] Fix build with MSVC
by tkreuzer＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: tkreuzer Date: Thu Jun 16 09:37:52 2011 New Revision: 52272 URL: http://svn.reactos.org/svn/reactos?rev=52272&view=rev Log: [FREELDR] Fix build with MSVC Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] Thu Jun 16 09:37:52 2011 @@ -72,7 +72,6 @@ return STATUS_NOT_IMPLEMENTED; } -#ifndef _MSC_VER NTHALAPI VOID NTAPI @@ -120,4 +119,3 @@ #error unimplemented #endif } -#endif

1 0

[tkreuzer] 52271: [EXT2] Don't add ext2 bootsector on MSVC builds
by tkreuzer＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: tkreuzer Date: Thu Jun 16 09:16:56 2011 New Revision: 52271 URL: http://svn.reactos.org/svn/reactos?rev=52271&view=rev Log: [EXT2] Don't add ext2 bootsector on MSVC builds Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Thu Jun 16 09:16:56 2011 @@ -8,16 +8,16 @@ CreateBootSectorTarget2(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) -if(NOT MSVC) -CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) -endif() - add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all) -add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all) add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR all) add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all) add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all) add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all) +if(NOT MSVC) + CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) + add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all) endif() +endif() +

1 0

[tkreuzer] 52270: [GDIPLUS] Mark wincodecs_i.c as generated and add macro to generate the file
by tkreuzer＠svn.reactos.org 16 Jun '11

16 Jun '11

Author: tkreuzer Date: Thu Jun 16 09:07:48 2011 New Revision: 52270 URL: http://svn.reactos.org/svn/reactos?rev=52270&view=rev Log: [GDIPLUS] Mark wincodecs_i.c as generated and add macro to generate the file Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Thu Jun 16 09:07:48 2011 @@ -26,10 +26,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) -if(MSVC) +#if(MSVC) + set_source_files_properties(${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c PROPERTIES GENERATED TRUE) list(APPEND SOURCE ${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c) -endif() +#endif() add_library(gdiplus SHARED ${SOURCE}) Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Thu Jun 16 09:07:48 2011 @@ -113,3 +113,5 @@ add_typelib(stdole2 stdole2.idl) add_iid_library(wuguid wuapi.idl) + +generate_idl_iids(wincodec.idl)

1 0

[akhaldi] 52269: [NETEVENT] * Set correct entry point. * Fix msvc build.
by akhaldi＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: akhaldi Date: Wed Jun 15 23:38:10 2011 New Revision: 52269 URL: http://svn.reactos.org/svn/reactos?rev=52269&view=rev Log: [NETEVENT] * Set correct entry point. * Fix msvc build. Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] Wed Jun 15 23:38:10 2011 @@ -1,13 +1,8 @@ set_unicode() - include_directories(${REACTOS_BINARY_DIR}/include/reactos) - add_library(netevent SHARED netevt.rc) - -set_module_type(netevent win32dll) - -add_importlibs(netevent msvcrt kernel32) - +set_entrypoint(netevent 0) +set_image_base(netevent ${baseaddress_netevent}) add_dependencies(netevent neteventmsg) add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs