Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 32288: Fix return type
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 16:19:06 2008 New Revision: 32288 URL: http://svn.reactos.org/svn/reactos?rev=32288&view=rev Log: Fix return type Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Feb 11 16:19:06 2008 @@ -3050,7 +3050,7 @@ ); NTSYSAPI -VOID +BOOLEAN NTAPI RtlTimeToSecondsSince1970( PLARGE_INTEGER Time,

1 0

[hpoussin] 32287: Fix build
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 16:00:06 2008 New Revision: 32287 URL: http://svn.reactos.org/svn/reactos?rev=32287&view=rev Log: Fix build 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 Mon Feb 11 16:00:06 2008 @@ -1282,33 +1282,33 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlHeaderRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" +Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h $(source)\n", - "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h", - "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); -Rule widlServerRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(source)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h -s -S $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c $(source)\n", - "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h", - "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c", - "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); -Rule widlClientRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h -c -C $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c $(source)\n", - "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h", - "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c", - "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); -Rule widlProxyRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h -p -P $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c $(source)\n", - "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h", - "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c", - "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); -Rule widlTlbRule ( "$(OUTPUT)\\$(source_dir)\\$(module_name).tlb: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).tlb $(source)\n", - "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); void MingwModuleHandler::GenerateGccCommand (

1 0

[hpoussin] 32286: Forgot to add this file...
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 15:54:30 2008 New Revision: 32286 URL: http://svn.reactos.org/svn/reactos?rev=32286&view=rev Log: Forgot to add this file... Added: trunk/reactos/lib/fslib/ext2lib/ext2lib.rbuild (with props) Added: trunk/reactos/lib/fslib/ext2lib/ext2lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/ext2lib.… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/ext2lib.rbuild (added) +++ trunk/reactos/lib/fslib/ext2lib/ext2lib.rbuild Mon Feb 11 15:54:30 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ext2lib" type="staticlibrary"> + <include base="ext2lib">.</include> + <define name="_DISABLE_TIDENTS" /> + <file>Badblock.c</file> + <file>Bitmap.c</file> + <file>Disk.c</file> + <file>Group.c</file> + <file>Inode.c</file> + <file>Memory.c</file> + <file>Mke2fs.c</file> + <file>Super.c</file> + <file>Uuid.c</file> +</module> Propchange: trunk/reactos/lib/fslib/ext2lib/ext2lib.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 32285: Fix ext2lib compilation
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 15:49:51 2008 New Revision: 32285 URL: http://svn.reactos.org/svn/reactos?rev=32285&view=rev Log: Fix ext2lib compilation Modified: trunk/reactos/lib/fslib/directory.rbuild trunk/reactos/lib/fslib/ext2lib/Bitmap.c trunk/reactos/lib/fslib/ext2lib/Disk.c trunk/reactos/lib/fslib/ext2lib/Group.c trunk/reactos/lib/fslib/ext2lib/Inode.c trunk/reactos/lib/fslib/ext2lib/Memory.c trunk/reactos/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/lib/fslib/ext2lib/Mke2fs.h trunk/reactos/lib/fslib/ext2lib/Super.c Modified: trunk/reactos/lib/fslib/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/directory.rbuild… ============================================================================== --- trunk/reactos/lib/fslib/directory.rbuild (original) +++ trunk/reactos/lib/fslib/directory.rbuild Mon Feb 11 15:49:51 2008 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="ext2lib"> + <xi:include href="ext2lib/ext2lib.rbuild" /> + </directory> <directory name="vfatlib"> <xi:include href="vfatlib/vfatlib.rbuild" /> </directory> Modified: trunk/reactos/lib/fslib/ext2lib/Bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Bitmap.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Bitmap.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Bitmap.c Mon Feb 11 15:49:51 2008 @@ -8,6 +8,7 @@ /* INCLUDES **************************************************************/ #include "Mke2fs.h" +#include <debug.h> /* DEFINITIONS ***********************************************************/ @@ -102,11 +103,11 @@ PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; Ext2Sys->block_map = (PEXT2_BLOCK_BITMAP) - RtlAllocateHeap(GetProcessHeap(), 0, sizeof(EXT2_BLOCK_BITMAP)); + RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(EXT2_BLOCK_BITMAP)); if (!Ext2Sys->block_map) { - KdPrint(("Mke2fs: error allocating block bitmap...\n")); + DPRINT1("Mke2fs: error allocating block bitmap...\n"); return false; } @@ -120,13 +121,13 @@ size = (((Ext2Sys->block_map->real_end - Ext2Sys->block_map->start) / 8) + 1); Ext2Sys->block_map->bitmap = - (char *)RtlAllocateHeap(GetProcessHeap(), 0, size); + (char *)RtlAllocateHeap(RtlGetProcessHeap(), 0, size); if (!Ext2Sys->block_map->bitmap) { - RtlFreeHeap(GetProcessHeap(), 0, Ext2Sys->block_map); + RtlFreeHeap(RtlGetProcessHeap(), 0, Ext2Sys->block_map); Ext2Sys->block_map = NULL; - KdPrint(("Mke2fs: error allocating block bitmap...\n")); + DPRINT1("Mke2fs: error allocating block bitmap...\n"); return false; } @@ -143,11 +144,11 @@ PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; Ext2Sys->inode_map = (PEXT2_INODE_BITMAP) - RtlAllocateHeap(GetProcessHeap(), 0, sizeof(EXT2_INODE_BITMAP)); + RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(EXT2_INODE_BITMAP)); if (!Ext2Sys->inode_map) { - KdPrint(("Mke2fs: error allocating inode bitmap...\n")); + DPRINT1("Mke2fs: error allocating inode bitmap...\n"); return false; } @@ -161,13 +162,13 @@ size = (((Ext2Sys->inode_map->real_end - Ext2Sys->inode_map->start) / 8) + 1); Ext2Sys->inode_map->bitmap = - (char *)RtlAllocateHeap(GetProcessHeap(), 0, size); + (char *)RtlAllocateHeap(RtlGetProcessHeap(), 0, size); if (!Ext2Sys->inode_map->bitmap) { - RtlFreeHeap(GetProcessHeap(), 0, Ext2Sys->inode_map); + RtlFreeHeap(RtlGetProcessHeap(), 0, Ext2Sys->inode_map); Ext2Sys->inode_map = NULL; - KdPrint(("Mke2fs: error allocating block bitmap...\n")); + DPRINT1("Mke2fs: error allocating block bitmap...\n"); return false; } @@ -183,11 +184,11 @@ if (bitmap->bitmap) { - RtlFreeHeap(GetProcessHeap(), 0, bitmap->bitmap); + RtlFreeHeap(RtlGetProcessHeap(), 0, bitmap->bitmap); bitmap->bitmap = 0; } - RtlFreeHeap(GetProcessHeap(), 0, bitmap); + RtlFreeHeap(RtlGetProcessHeap(), 0, bitmap); } void ext2_free_inode_bitmap(PEXT2_FILESYS Ext2Sys) @@ -226,7 +227,7 @@ nbytes = (size_t) ((EXT2_INODES_PER_GROUP(fs->ext2_sb)+7) / 8); - bitmap_block = (char *)RtlAllocateHeap(GetProcessHeap(), 0, fs->blocksize); + bitmap_block = (char *)RtlAllocateHeap(RtlGetProcessHeap(), 0, fs->blocksize); if (!bitmap_block) return false; memset(bitmap_block, 0xff, fs->blocksize); @@ -253,7 +254,7 @@ if (!retval) { - RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + RtlFreeHeap(RtlGetProcessHeap(), 0, bitmap_block); return false; } } @@ -261,7 +262,7 @@ inode_bitmap += nbytes; } - RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + RtlFreeHeap(RtlGetProcessHeap(), 0, bitmap_block); return true; } @@ -282,7 +283,7 @@ nbytes = EXT2_BLOCKS_PER_GROUP(fs->ext2_sb) / 8; - bitmap_block = (char *)RtlAllocateHeap(GetProcessHeap(), 0, fs->blocksize); + bitmap_block = (char *)RtlAllocateHeap(RtlGetProcessHeap(), 0, fs->blocksize); if (!bitmap_block) return false; @@ -325,7 +326,7 @@ if (!retval) { - RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + RtlFreeHeap(RtlGetProcessHeap(), 0, bitmap_block); return false; } } @@ -333,7 +334,7 @@ block_bitmap += nbytes; } - RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + RtlFreeHeap(RtlGetProcessHeap(), 0, bitmap_block); return true; } @@ -465,13 +466,13 @@ if (do_block) { - RtlFreeHeap(GetProcessHeap(), 0, fs->block_map); + RtlFreeHeap(RtlGetProcessHeap(), 0, fs->block_map); fs->block_map = NULL; } if (do_inode) { - RtlFreeHeap(GetProcessHeap(), 0, fs->inode_map); + RtlFreeHeap(RtlGetProcessHeap(), 0, fs->inode_map); fs->inode_map = 0; } Modified: trunk/reactos/lib/fslib/ext2lib/Disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Disk.c?r… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Disk.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Disk.c Mon Feb 11 15:49:51 2008 @@ -8,6 +8,7 @@ /* INCLUDES **************************************************************/ #include "Mke2fs.h" +#include <debug.h> /* DEFINITIONS ***********************************************************/ @@ -15,7 +16,7 @@ /* FUNCTIONS *************************************************************/ -PUCHAR +PCCHAR Ext2StatusToString ( IN NTSTATUS Status ) { switch (Status) @@ -1001,7 +1002,7 @@ AlignedLength += ((ULONG)(Offset - Address.QuadPart) + SECTOR_SIZE - 1) & (~(SECTOR_SIZE - 1)); - NonPagedBuffer = RtlAllocateHeap(GetProcessHeap(), 0, AlignedLength); + NonPagedBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, AlignedLength); if (!NonPagedBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1031,7 +1032,7 @@ errorout: if (NonPagedBuffer) - RtlFreeHeap(GetProcessHeap(), 0, NonPagedBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, NonPagedBuffer); return Status; } @@ -1096,7 +1097,7 @@ AlignedLength += ((ULONG)(Offset - Address.QuadPart) + SECTOR_SIZE - 1) & (~(SECTOR_SIZE - 1)); - NonPagedBuffer = RtlAllocateHeap(GetProcessHeap(), 0, AlignedLength); + NonPagedBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, AlignedLength); if (!NonPagedBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1138,7 +1139,7 @@ errorout: if (NonPagedBuffer) - RtlFreeHeap(GetProcessHeap(), 0, NonPagedBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, NonPagedBuffer); return Status; } @@ -1221,8 +1222,8 @@ if (!NT_SUCCESS(Status)) { - KdPrint(("Mke2fs: Error when locking volume: Status = %lxh %s...\n", - Status, Ext2StatusToString(Status))); + DPRINT1("Mke2fs: Error when locking volume: Status = %lxh %s...\n", + Status, Ext2StatusToString(Status)); goto errorout; } @@ -1246,7 +1247,7 @@ if (!NT_SUCCESS(Status)) { - KdPrint(("Mke2fs: Error when unlocking volume ...\n")); + DPRINT1("Mke2fs: Error when unlocking volume ...\n"); goto errorout; } @@ -1269,7 +1270,7 @@ if (!NT_SUCCESS(Status)) { - KdPrint(("Mke2fs: Error when dismounting volume ...\n")); + DPRINT1("Mke2fs: Error when dismounting volume ...\n"); goto errorout; } @@ -1318,7 +1319,7 @@ // if( !NT_SUCCESS(Status) ) { - KdPrint(("Mke2fs: Create system service failed status = 0x%lx\n", Status)); + DPRINT1("Mke2fs: Create system service failed status = 0x%lx\n", Status); return Status; } @@ -1328,7 +1329,7 @@ // if(!NT_SUCCESS(Iosb.Status) ) { - KdPrint(("Mke2fs: Create failed with status = 0x%lx\n",Iosb.Status)); + DPRINT1("Mke2fs: Create failed with status = 0x%lx\n",Iosb.Status); return Status; } Modified: trunk/reactos/lib/fslib/ext2lib/Group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Group.c?… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Group.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Group.c Mon Feb 11 15:49:51 2008 @@ -47,7 +47,7 @@ size = Ext2Sys->desc_blocks * Ext2Sys->blocksize; Ext2Sys->group_desc = - (PEXT2_GROUP_DESC)RtlAllocateHeap(GetProcessHeap(), 0, size); + (PEXT2_GROUP_DESC)RtlAllocateHeap(RtlGetProcessHeap(), 0, size); if (Ext2Sys->group_desc) { @@ -62,7 +62,7 @@ { if (Ext2Sys->group_desc) { - RtlFreeHeap(GetProcessHeap(), 0, Ext2Sys->group_desc); + RtlFreeHeap(RtlGetProcessHeap(), 0, Ext2Sys->group_desc); Ext2Sys->group_desc = NULL; } } Modified: trunk/reactos/lib/fslib/ext2lib/Inode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Inode.c?… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Inode.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Inode.c Mon Feb 11 15:49:51 2008 @@ -8,6 +8,7 @@ /* INCLUDES **************************************************************/ #include "Mke2fs.h" +#include <debug.h> /* DEFINITIONS ***********************************************************/ @@ -23,8 +24,8 @@ if (no < 1 || no > pExt2Sb->s_inodes_count) { - KdPrint(("Mke2fs: Inode value %lu was out of range in load_inode.(1-%ld)\n", - no, pExt2Sb->s_inodes_count)); + DPRINT1("Mke2fs: Inode value %lu was out of range in load_inode.(1-%ld)\n", + no, pExt2Sb->s_inodes_count); *offset = 0; return false; } @@ -138,7 +139,7 @@ PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; - pData = (ULONG *)RtlAllocateHeap(GetProcessHeap(), 0, Ext2Sys->blocksize); + pData = (ULONG *)RtlAllocateHeap(RtlGetProcessHeap(), 0, Ext2Sys->blocksize); if (!pData) { @@ -186,7 +187,7 @@ if (!ext2_expand_block(Ext2Sys, Inode, dwBlk, j, layer - 1, bDirty, &dwNewBlk, &Offset)) { bRet = false; - KdPrint(("Mke2fs: ext2_expand_block: ... error recuise...\n")); + DPRINT1("Mke2fs: ext2_expand_block: ... error recuise...\n"); goto errorout; } } @@ -200,7 +201,7 @@ errorout: if (pData) - RtlFreeHeap(GetProcessHeap(), 0, pData); + RtlFreeHeap(RtlGetProcessHeap(), 0, pData); if (bRet && dwRet) *dwRet = dwNewBlk; @@ -233,7 +234,7 @@ if (Index >= dwTotal) { - KdPrint(("Mke2fs: ext2_expand_inode: beyond the maxinum size of an inode.\n")); + DPRINT1("Mke2fs: ext2_expand_inode: beyond the maxinum size of an inode.\n"); return false; } @@ -300,7 +301,7 @@ Offset = (LONGLONG) dwContent; Offset = Offset * Ext2Sys->blocksize; - pData = (ULONG *)RtlAllocateHeap(GetProcessHeap(), 0, Ext2Sys->blocksize); + pData = (ULONG *)RtlAllocateHeap(RtlGetProcessHeap(), 0, Ext2Sys->blocksize); if (!pData) { @@ -329,7 +330,7 @@ if (!ext2_get_block(Ext2Sys, pData[i], j, layer - 1, &dwBlk)) { bRet = false; - KdPrint(("Mke2fs: ext2_get_block: ... error recuise...\n")); + DPRINT1("Mke2fs: ext2_get_block: ... error recuise...\n"); goto errorout; } } @@ -337,7 +338,7 @@ errorout: if (pData) - RtlFreeHeap(GetProcessHeap(), 0, pData); + RtlFreeHeap(RtlGetProcessHeap(), 0, pData); if (bRet && dwRet) *dwRet = dwBlk; @@ -363,7 +364,7 @@ if (Index >= inode->i_blocks / (Ext2Sys->blocksize / SECTOR_SIZE)) { - KdPrint(("Mke2fs: ext2_block_map: beyond the size of the inode.\n")); + DPRINT1("Mke2fs: ext2_block_map: beyond the size of the inode.\n"); return false; } @@ -409,7 +410,7 @@ if (offset >= ext2_inode->i_size) { - KdPrint(("Mke2fs: ext2_build_bdl: beyond the file range.\n")); + DPRINT1("Mke2fs: ext2_build_bdl: beyond the file range.\n"); return 0; } @@ -428,7 +429,7 @@ if (nBlocks > 0) { ext2bdl = (PEXT2_BDL) - RtlAllocateHeap(GetProcessHeap(), 0, sizeof(EXT2_BDL) * nBlocks); + RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(EXT2_BDL) * nBlocks); if (ext2bdl) { @@ -486,7 +487,7 @@ fail: if (ext2bdl) - RtlFreeHeap(GetProcessHeap(), 0, ext2bdl); + RtlFreeHeap(RtlGetProcessHeap(), 0, ext2bdl); // Error return 0; @@ -534,7 +535,7 @@ *dwReturn = dwTotal; if (ext2_bdl) - RtlFreeHeap(GetProcessHeap(), 0, ext2_bdl); + RtlFreeHeap(RtlGetProcessHeap(), 0, ext2_bdl); return bRet; } @@ -612,7 +613,7 @@ errorout: if (ext2_bdl) - RtlFreeHeap(GetProcessHeap(), 0, ext2_bdl); + RtlFreeHeap(RtlGetProcessHeap(), 0, ext2_bdl); return bRet; } @@ -636,7 +637,7 @@ return false; } - buf = (char *)RtlAllocateHeap(GetProcessHeap(), 0, parent_inode.i_size); + buf = (char *)RtlAllocateHeap(RtlGetProcessHeap(), 0, parent_inode.i_size); if (!ext2_read_inode(Ext2Sys, parent, 0, buf, parent_inode.i_size, &dwRet)) { Modified: trunk/reactos/lib/fslib/ext2lib/Memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Memory.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Memory.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Memory.c Mon Feb 11 15:49:51 2008 @@ -8,6 +8,7 @@ /* INCLUDES **************************************************************/ #include "Mke2fs.h" +#include <debug.h> /* DEFINITIONS ***********************************************************/ @@ -232,9 +233,9 @@ retval = zero_blocks(fs, blk, num, &blk, &num); if (!retval) { - KdPrint(("\nMke2fs: Could not write %lu blocks " + DPRINT1("\nMke2fs: Could not write %lu blocks " "in inode table starting at %lu.\n", - num, blk)); + num, blk); zero_blocks(0, 0, 0, 0, 0); return false; @@ -296,7 +297,7 @@ ULONG block; char *buf = NULL; - buf = (char *)RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, fs->blocksize); + buf = (char *)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, fs->blocksize); if (!buf) return false; @@ -327,7 +328,7 @@ if (buf) { - RtlFreeHeap(GetProcessHeap(), 0, buf); + RtlFreeHeap(RtlGetProcessHeap(), 0, buf); } return true; @@ -336,7 +337,7 @@ if (buf) { - RtlFreeHeap(GetProcessHeap(), 0, buf); + RtlFreeHeap(RtlGetProcessHeap(), 0, buf); } return false; @@ -354,7 +355,7 @@ int rec_len; int filetype = 0; - buf = (char *)RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, fs->blocksize); + buf = (char *)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, fs->blocksize); if (!buf) return false; Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c Mon Feb 11 15:49:51 2008 @@ -8,7 +8,7 @@ /* INCLUDES **************************************************************/ #include "Mke2fs.h" -#include <fmifs.h> +#include <debug.h> /* GLOBALS ***************************************************************/ @@ -126,7 +126,7 @@ { if (buf) { - RtlFreeHeap(GetProcessHeap(), 0, buf); + RtlFreeHeap(RtlGetProcessHeap(), 0, buf); buf = 0; } return true; @@ -138,10 +138,10 @@ if (!buf) { buf = (unsigned char *) - RtlAllocateHeap(GetProcessHeap(), 0, fs->blocksize * STRIDE_LENGTH); + RtlAllocateHeap(RtlGetProcessHeap(), 0, fs->blocksize * STRIDE_LENGTH); if (!buf) { - KdPrint(("Mke2fs: while allocating zeroizing buffer")); + DPRINT1("Mke2fs: while allocating zeroizing buffer"); return false; } memset(buf, 0, fs->blocksize * STRIDE_LENGTH); @@ -188,11 +188,11 @@ ULONG *magic; buf = (unsigned char *) - RtlAllocateHeap(GetProcessHeap(), 0, SECTOR_SIZE*nsect); + RtlAllocateHeap(RtlGetProcessHeap(), 0, SECTOR_SIZE*nsect); if (!buf) { - KdPrint(("Mke2fs: Out of memory erasing sectors %d-%d\n", - sect, sect + nsect - 1)); + DPRINT1("Mke2fs: Out of memory erasing sectors %d-%d\n", + sect, sect + nsect - 1); return false; } @@ -223,7 +223,7 @@ clean_up: - RtlFreeHeap(GetProcessHeap(), 0, buf); + RtlFreeHeap(RtlGetProcessHeap(), 0, buf); return true; } @@ -352,7 +352,7 @@ if (block) { - RtlFreeHeap(GetProcessHeap(), 0, block); + RtlFreeHeap(RtlGetProcessHeap(), 0, block); block = NULL; } @@ -368,7 +368,7 @@ if (!retval) { - KdPrint(("Mke2fs: while creating root dir")); + DPRINT1("Mke2fs: while creating root dir"); return false; } @@ -379,7 +379,7 @@ retval = ext2_save_inode(fs, EXT2_ROOT_INO, &inode); if (!retval) { - KdPrint(("Mke2fs: while setting root inode ownership")); + DPRINT1("Mke2fs: while setting root inode ownership"); return false; } } @@ -401,7 +401,7 @@ char * buf; - buf = (char *)RtlAllocateHeap(GetProcessHeap(), 0, Ext2Sys->blocksize); + buf = (char *)RtlAllocateHeap(RtlGetProcessHeap(), 0, Ext2Sys->blocksize); if (!buf) { bExt = FALSE; @@ -419,7 +419,7 @@ if (!retval) { - KdPrint(("Mke2fs: while creating /lost+found.\n")); + DPRINT1("Mke2fs: while creating /lost+found.\n"); return false; } @@ -437,14 +437,14 @@ if (! retval) { - KdPrint(("Mke2fs: create_lost_and_found: error alloc block.\n")); + DPRINT1("Mke2fs: create_lost_and_found: error alloc block.\n"); break; } retval = ext2_expand_inode(Ext2Sys, &inode, dwBlk); if (!retval) { - KdPrint(("Mke2fs: errors when expanding /lost+found.\n")); + DPRINT1("Mke2fs: errors when expanding /lost+found.\n"); break; } @@ -471,7 +471,7 @@ if (buf) { - RtlFreeHeap(GetProcessHeap(), 0, buf); + RtlFreeHeap(RtlGetProcessHeap(), 0, buf); } return true; @@ -658,11 +658,11 @@ if (!retval) { - KdPrint(("Mke2fs: ext2_create_journal_dev: while initializing journal superblock.\n")); + DPRINT1("Mke2fs: ext2_create_journal_dev: while initializing journal superblock.\n"); return false; } - KdPrint(("Mke2fs: Zeroing journal device: \n")); + DPRINT("Mke2fs: Zeroing journal device: \n"); retval = zero_blocks(fs, 0, fs->ext2_sb->s_blocks_count, &blk, &count); @@ -671,8 +671,8 @@ if (!retval) { - KdPrint(("Mke2fs: create_journal_dev: while zeroing journal device (block %lu, count %lu).\n", - blk, count)); + DPRINT1("Mke2fs: create_journal_dev: while zeroing journal device (block %lu, count %lu).\n", + blk, count); return false; } @@ -683,7 +683,7 @@ if (!retval) { - KdPrint(("Mke2fs: create_journal_dev: while writing journal superblock.\n")); + DPRINT1("Mke2fs: create_journal_dev: while writing journal superblock.\n"); return false; } @@ -812,29 +812,29 @@ EXT2_FILESYS FileSys; ULONG Percent; - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; Callback(PROGRESS, 0, (PVOID)&Percent); - - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + + CHECKPOINT; RtlZeroMemory(&Ext2Sb, sizeof(EXT2_SUPER_BLOCK)); RtlZeroMemory(&FileSys, sizeof(EXT2_FILESYS)); FileSys.ext2_sb = &Ext2Sb; - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; if (!NT_SUCCESS(Ext2OpenDevice(&FileSys, DriveRoot))) { - KdPrint(("Mke2fs: Volume %wZ does not exist, ...\n", DriveRoot)); + DPRINT1("Mke2fs: Volume %wZ does not exist, ...\n", DriveRoot); goto clean_up; } - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; if (!NT_SUCCESS(Ext2GetMediaInfo(&FileSys))) { - KdPrint(("Mke2fs: Can't get media information\n")); + DPRINT1("Mke2fs: Can't get media information\n"); goto clean_up; } @@ -843,7 +843,7 @@ Ext2Sb.s_blocks_count = FileSys.PartInfo.PartitionLength.QuadPart / EXT2_BLOCK_SIZE(&Ext2Sb); - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; /* * Calculate number of inodes based on the inode ratio @@ -856,7 +856,7 @@ */ Ext2Sb.s_r_blocks_count = (Ext2Sb.s_blocks_count * 5) / 100; - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; Status = Ext2LockVolume(&FileSys); if (NT_SUCCESS(Status)) @@ -864,16 +864,16 @@ bLocked = TRUE; } - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; // Initialize if (!ext2_initialize_sb(&FileSys)) { - KdPrint(("Mke2fs: error...\n")); + DPRINT1("Mke2fs: error...\n"); goto clean_up; } - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; zap_sector(&FileSys, 2, 6); @@ -946,7 +946,7 @@ if (!bRet) { - KdPrint(("Mke2fs: zeroing block %lu at end of filesystem", ret_blk)); + DPRINT1("Mke2fs: zeroing block %lu at end of filesystem", ret_blk); goto clean_up; } @@ -959,21 +959,21 @@ create_bad_block_inode(&FileSys, NULL); - KdPrint(("Mke2fs: Writing superblocks and filesystem accounting information ... \n")); + DPRINT("Mke2fs: Writing superblocks and filesystem accounting information ... \n"); if (!QuickFormat) { - KdPrint(("Mke2fs: Slow format not supported yet\n")); + DPRINT1("Mke2fs: Slow format not supported yet\n"); } if (!ext2_flush(&FileSys)) { bRet = false; - KdPrint(("Mke2fs: Warning, had trouble writing out superblocks.\n")); + DPRINT1("Mke2fs: Warning, had trouble writing out superblocks.\n"); goto clean_up; } - KdPrint(("Mke2fs: Writing superblocks and filesystem accounting information done!\n")); + DPRINT("Mke2fs: Writing superblocks and filesystem accounting information done!\n"); bRet = true; Status = STATUS_SUCCESS; @@ -998,13 +998,13 @@ } } - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; Ext2CloseDevice(&FileSys); - KdPrint(("%s:%d\n", __FILE__, __LINE__)); - - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; + + CHECKPOINT; Callback(DONE, 0, (PVOID)&bRet); - KdPrint(("%s:%d\n", __FILE__, __LINE__)); + CHECKPOINT; return Status; } Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.h… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.h (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.h Mon Feb 11 15:49:51 2008 @@ -12,16 +12,12 @@ /* INCLUDES **************************************************************/ -#include <stdlib.h> -#include <stdio.h> -#include <ntddk.h> -#include <ntdddisk.h> - -#include <napi/teb.h> - -#include "time.h" -#include "stdio.h" -#include "stdlib.h" +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> + #include "string.h" #include "ctype.h" @@ -29,8 +25,6 @@ #include "ext2_fs.h" #include "getopt.h" - -#define NTSYSAPI /* DEFINITIONS ***********************************************************/ @@ -224,466 +218,6 @@ bool create_bad_block_inode(PEXT2_FILESYS fs, PEXT2_BADBLK_LIST bb_list); -// -// Definitions -// - -#define FSCTL_REQUEST_OPLOCK_LEVEL_1 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_REQUEST_OPLOCK_LEVEL_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_REQUEST_BATCH_OPLOCK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_OPBATCH_ACK_CLOSE_PENDING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_OPLOCK_BREAK_NOTIFY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 5, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_LOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_DISMOUNT_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) -// decommissioned fsctl value 9 -#define FSCTL_IS_VOLUME_MOUNTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 10, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_IS_PATHNAME_VALID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS) // PATHNAME_BUFFER, -#define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) -// decommissioned fsctl value 13 -#define FSCTL_QUERY_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_SET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) -// decommissioned fsctl value 17 -// decommissioned fsctl value 18 -#define FSCTL_MARK_AS_SYSTEM_HIVE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_OPLOCK_BREAK_ACK_NO_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_INVALIDATE_VOLUMES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 21, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_QUERY_FAT_BPB CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 22, METHOD_BUFFERED, FILE_ANY_ACCESS) // , FSCTL_QUERY_FAT_BPB_BUFFER -#define FSCTL_REQUEST_FILTER_OPLOCK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 23, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) // , FILESYSTEM_STATISTICS - - -// -// Disk I/O Routines -// - -NTSYSAPI -NTSTATUS -NTAPI -NtReadFile(HANDLE FileHandle, - HANDLE Event OPTIONAL, - PIO_APC_ROUTINE ApcRoutine OPTIONAL, - PVOID ApcContext OPTIONAL, - PIO_STATUS_BLOCK IoStatusBlock, - PVOID Buffer, - ULONG Length, - PLARGE_INTEGER ByteOffset OPTIONAL, - PULONG Key OPTIONAL); - -NTSYSAPI -NTSTATUS -NTAPI -NtWriteFile(HANDLE FileHandle, - HANDLE Event OPTIONAL, - PIO_APC_ROUTINE ApcRoutine OPTIONAL, - PVOID ApcContext OPTIONAL, - PIO_STATUS_BLOCK IoStatusBlock, - PVOID Buffer, - ULONG Length, - PLARGE_INTEGER ByteOffset OPTIONAL, - PULONG Key OPTIONAL); - -NTSYSAPI -NTSTATUS -NTAPI -NtClose(HANDLE Handle); - -NTSYSAPI -NTSTATUS -NTAPI -NtCreateFile(PHANDLE FileHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, - PLARGE_INTEGER AllocationSize OPTIONAL, - ULONG FileAttributes, - ULONG ShareAccess, - ULONG CreateDisposition, - ULONG CreateOptions, - PVOID EaBuffer OPTIONAL, - ULONG EaLength); - - -NTSYSAPI -NTSTATUS -NTAPI -NtDeviceIoControlFile( - IN HANDLE FileHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine, - IN PVOID ApcContext, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer, - OUT ULONG OutputBufferLength - ); - -NTSYSAPI -NTSTATUS -NTAPI -NtFsControlFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG FsControlCode, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength -); - - -NTSYSAPI -NTSTATUS -NTAPI -NtQueryInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FileInformation, - IN ULONG Length, - IN FILE_INFORMATION_CLASS FileInformationClass - ); - -// -// Bitmap Routines -// - - -// -// BitMap routines. The following structure, routines, and macros are -// for manipulating bitmaps. The user is responsible for allocating a bitmap -// structure (which is really a header) and a buffer (which must be longword -// aligned and multiple longwords in size). -// - -// -// The following routine initializes a new bitmap. It does not alter the -// data currently in the bitmap. This routine must be called before -// any other bitmap routine/macro. -// - -NTSYSAPI -VOID -NTAPI -RtlInitializeBitMap ( - PRTL_BITMAP BitMapHeader, - PULONG BitMapBuffer, - ULONG SizeOfBitMap - ); - -// -// The following two routines either clear or set all of the bits -// in a bitmap. -// - -NTSYSAPI -VOID -NTAPI -RtlClearAllBits ( - PRTL_BITMAP BitMapHeader - ); - -NTSYSAPI -VOID -NTAPI -RtlSetAllBits ( - PRTL_BITMAP BitMapHeader - ); - -// -// The following two routines locate a contiguous region of either -// clear or set bits within the bitmap. The region will be at least -// as large as the number specified, and the search of the bitmap will -// begin at the specified hint index (which is a bit index within the -// bitmap, zero based). The return value is the bit index of the located -// region (zero based) or -1 (i.e., 0xffffffff) if such a region cannot -// be located -// - -NTSYSAPI -ULONG -NTAPI -RtlFindClearBits ( - PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex - ); - -NTSYSAPI -ULONG -NTAPI -RtlFindSetBits ( - PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex - ); - -// -// The following two routines locate a contiguous region of either -// clear or set bits within the bitmap and either set or clear the bits -// within the located region. The region will be as large as the number -// specified, and the search for the region will begin at the specified -// hint index (which is a bit index within the bitmap, zero based). The -// return value is the bit index of the located region (zero based) or -// -1 (i.e., 0xffffffff) if such a region cannot be located. If a region -// cannot be located then the setting/clearing of the bitmap is not performed. -// - -NTSYSAPI -ULONG -NTAPI -RtlFindClearBitsAndSet ( - PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex - ); - -NTSYSAPI -ULONG -NTAPI -RtlFindSetBitsAndClear ( - PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex - ); - -// -// The following two routines clear or set bits within a specified region -// of the bitmap. The starting index is zero based. -// - -NTSYSAPI -VOID -NTAPI -RtlClearBits ( - PRTL_BITMAP BitMapHeader, - ULONG StartingIndex, - ULONG NumberToClear - ); - -NTSYSAPI -VOID -NTAPI -RtlSetBits ( - PRTL_BITMAP BitMapHeader, - ULONG StartingIndex, - ULONG NumberToSet - ); - -// -// The following routine locates a set of contiguous regions of clear -// bits within the bitmap. The caller specifies whether to return the -// longest runs or just the first found lcoated. The following structure is -// used to denote a contiguous run of bits. The two routines return an array -// of this structure, one for each run located. -// - -NTSYSAPI -ULONG -NTAPI -RtlFindClearRuns ( - PRTL_BITMAP BitMapHeader, - PRTL_BITMAP_RUN RunArray, - ULONG SizeOfRunArray, - BOOLEAN LocateLongestRuns - ); -// -// The following routine locates the longest contiguous region of -// clear bits within the bitmap. The returned starting index value -// denotes the first contiguous region located satisfying our requirements -// The return value is the length (in bits) of the longest region found. -// - -NTSYSAPI -ULONG -NTAPI -RtlFindLongestRunClear ( - PRTL_BITMAP BitMapHeader, - PULONG StartingIndex - ); - -// -// The following routine locates the first contiguous region of -// clear bits within the bitmap. The returned starting index value -// denotes the first contiguous region located satisfying our requirements -// The return value is the length (in bits) of the region found. -// - -NTSYSAPI -ULONG -NTAPI -RtlFindFirstRunClear ( - PRTL_BITMAP BitMapHeader, - PULONG StartingIndex - ); - -// -// The following macro returns the value of the bit stored within the -// bitmap at the specified location. If the bit is set a value of 1 is -// returned otherwise a value of 0 is returned. -// -// ULONG -// RtlCheckBit ( -// PRTL_BITMAP BitMapHeader, -// ULONG BitPosition -// ); -// -// -// To implement CheckBit the macro retrieves the longword containing the -// bit in question, shifts the longword to get the bit in question into the -// low order bit position and masks out all other bits. -// - -#define RtlCheckBit(BMH,BP) ((((BMH)->Buffer[(BP) / 32]) >> ((BP) % 32)) & 0x1) - -// -// The following two procedures return to the caller the total number of -// clear or set bits within the specified bitmap. -// - -NTSYSAPI -ULONG -NTAPI -RtlNumberOfClearBits ( - PRTL_BITMAP BitMapHeader - ); - -NTSYSAPI -ULONG -NTAPI -RtlNumberOfSetBits ( - PRTL_BITMAP BitMapHeader - ); - -// -// The following two procedures return to the caller a boolean value -// indicating if the specified range of bits are all clear or set. -// - -NTSYSAPI -BOOLEAN -NTAPI -RtlAreBitsClear ( - PRTL_BITMAP BitMapHeader, - ULONG StartingIndex, - ULONG Length - ); - -NTSYSAPI -BOOLEAN -NTAPI -RtlAreBitsSet ( - PRTL_BITMAP BitMapHeader, - ULONG StartingIndex, - ULONG Length - ); - -NTSYSAPI -ULONG -NTAPI -RtlFindNextForwardRunClear ( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - IN PULONG StartingRunIndex - ); - -NTSYSAPI -ULONG -NTAPI -RtlFindLastBackwardRunClear ( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - IN PULONG StartingRunIndex - ); - -// -// The following two procedures return to the caller a value indicating -// the position within a ULONGLONG of the most or least significant non-zero -// bit. A value of zero results in a return value of -1. -// - -NTSYSAPI -CCHAR -NTAPI -RtlFindLeastSignificantBit ( - IN ULONGLONG Set - ); - -NTSYSAPI -CCHAR -NTAPI -RtlFindMostSignificantBit ( - IN ULONGLONG Set - ); - - -// -// Random routines ... -// - -NTSYSAPI -ULONG -NTAPI -RtlRandom( - IN OUT PULONG Seed - ); - -// -// Time routines ... -// - -NTSYSAPI -CCHAR -NTAPI -NtQuerySystemTime( - OUT PLARGE_INTEGER CurrentTime - ); - - -NTSYSAPI -BOOLEAN -NTAPI -RtlTimeToSecondsSince1970( - IN PLARGE_INTEGER Time, - OUT PULONG ElapsedSeconds - ); - - -NTSYSAPI -VOID -NTAPI -RtlSecondsSince1970ToTime( - IN ULONG ElapsedSeconds, - OUT PLARGE_INTEGER Time - ); - -// -// Heap routines... -// - -#define GetProcessHeap() (NtCurrentTeb()->Peb->ProcessHeap) - -PVOID STDCALL -RtlAllocateHeap ( - HANDLE Heap, - ULONG Flags, - ULONG Size - ); - -BOOLEAN -STDCALL -RtlFreeHeap ( - HANDLE Heap, - ULONG Flags, - PVOID Address - ); - /* * Bitmap.c */ Modified: trunk/reactos/lib/fslib/ext2lib/Super.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Super.c?… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Super.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Super.c Mon Feb 11 15:49:51 2008 @@ -8,6 +8,7 @@ /* INCLUDES **************************************************************/ #include "Mke2fs.h" +#include <debug.h> /* DEFINITIONS ***********************************************************/ @@ -20,50 +21,49 @@ { int i; - KdPrint(("\nExt2 Super Block Details ...\n\n")); - KdPrint((" Inode Count: %lu\n", pExt2Sb->s_inodes_count)); - KdPrint((" Block Count: %lu\n", pExt2Sb->s_blocks_count)); - KdPrint((" Reserved Block Count: %lu\n", pExt2Sb->s_r_blocks_count)); - KdPrint((" Free Blocks: %lu\n", pExt2Sb->s_free_blocks_count)); - KdPrint((" Free Inodes: %lu\n", pExt2Sb->s_free_inodes_count)); - KdPrint((" First Data Block: %lu\n", pExt2Sb->s_first_data_block)); - KdPrint((" Log Block Size: %lu\n", pExt2Sb->s_log_block_size)); - KdPrint((" Log Frag Size: %ld\n", pExt2Sb->s_log_frag_size)); - KdPrint((" Blocks per Group: %lu\n", pExt2Sb->s_blocks_per_group)); - KdPrint((" Fragments per Group: %lu\n", pExt2Sb->s_frags_per_group)); - KdPrint((" Inodes per Group: %lu\n", pExt2Sb->s_inodes_per_group)); -// KdPrint((" Mount Time: %s", ctime((time_t *) & (pExt2Sb->s_mtime)))); -// KdPrint((" Write Time: %s", ctime((time_t *) & (pExt2Sb->s_wtime)))); - KdPrint((" Mount Count: %u\n", pExt2Sb->s_mnt_count)); - KdPrint((" Max Mount Count: %d\n", pExt2Sb->s_max_mnt_count)); - KdPrint((" Magic Number: %X (%s)\n", pExt2Sb->s_magic, - pExt2Sb->s_magic == EXT2_SUPER_MAGIC ? "OK" : "BAD")); - KdPrint((" File System State: %X\n", pExt2Sb->s_state)); - KdPrint((" Error Behaviour: %X\n", pExt2Sb->s_errors)); - KdPrint((" Minor rev: %u\n", pExt2Sb->s_minor_rev_level)); -// KdPrint((" Last Check: %s", ctime((time_t *) & (pExt2Sb->s_lastcheck)))); - KdPrint((" Check Interval: %lu\n", pExt2Sb->s_checkinterval)); - KdPrint((" Creator OS: %lu\n", pExt2Sb->s_creator_os)); - KdPrint((" Revision Level: %lu\n", pExt2Sb->s_rev_level)); - KdPrint((" Reserved Block Default UID: %u\n", pExt2Sb->s_def_resuid)); - KdPrint((" Reserved Block Default GID: %u\n", pExt2Sb->s_def_resgid)); - KdPrint((" uuid = ")); + DPRINT("\nExt2 Super Block Details ...\n\n"); + DPRINT(" Inode Count: %lu\n", pExt2Sb->s_inodes_count); + DPRINT(" Block Count: %lu\n", pExt2Sb->s_blocks_count); + DPRINT(" Reserved Block Count: %lu\n", pExt2Sb->s_r_blocks_count); + DPRINT(" Free Blocks: %lu\n", pExt2Sb->s_free_blocks_count); + DPRINT(" Free Inodes: %lu\n", pExt2Sb->s_free_inodes_count); + DPRINT(" First Data Block: %lu\n", pExt2Sb->s_first_data_block); + DPRINT(" Log Block Size: %lu\n", pExt2Sb->s_log_block_size); + DPRINT(" Log Frag Size: %ld\n", pExt2Sb->s_log_frag_size); + DPRINT(" Blocks per Group: %lu\n", pExt2Sb->s_blocks_per_group); + DPRINT(" Fragments per Group: %lu\n", pExt2Sb->s_frags_per_group); + DPRINT(" Inodes per Group: %lu\n", pExt2Sb->s_inodes_per_group); +// DPRINT(" Mount Time: %s", ctime((time_t *) & (pExt2Sb->s_mtime))); +// DPRINT(" Write Time: %s", ctime((time_t *) & (pExt2Sb->s_wtime))); + DPRINT(" Mount Count: %u\n", pExt2Sb->s_mnt_count); + DPRINT(" Max Mount Count: %d\n", pExt2Sb->s_max_mnt_count); + DPRINT(" Magic Number: %X (%s)\n", pExt2Sb->s_magic, + pExt2Sb->s_magic == EXT2_SUPER_MAGIC ? "OK" : "BAD"); + DPRINT(" File System State: %X\n", pExt2Sb->s_state); + DPRINT(" Error Behaviour: %X\n", pExt2Sb->s_errors); + DPRINT(" Minor rev: %u\n", pExt2Sb->s_minor_rev_level); +// DPRINT(" Last Check: %s", ctime((time_t *) & (pExt2Sb->s_lastcheck))); + DPRINT(" Check Interval: %lu\n", pExt2Sb->s_checkinterval); + DPRINT(" Creator OS: %lu\n", pExt2Sb->s_creator_os); + DPRINT(" Revision Level: %lu\n", pExt2Sb->s_rev_level); + DPRINT(" Reserved Block Default UID: %u\n", pExt2Sb->s_def_resuid); + DPRINT(" Reserved Block Default GID: %u\n", pExt2Sb->s_def_resgid); + DPRINT(" uuid = "); for (i=0; i < 16; i++) - KdPrint(("%x ", pExt2Sb->s_uuid[i])); - KdPrint(("\n")); - - KdPrint((" volume label name: ")); + DbgPrint("%x ", pExt2Sb->s_uuid[i]); + DbgPrint("\n"); + + DPRINT(" volume label name: "); for (i=0; i < 16; i++) { if (pExt2Sb->s_volume_name[i] == 0) break; - KdPrint(("%c", pExt2Sb->s_volume_name[i])); - } - KdPrint(("\n")); - - KdPrint(("\n\n")); + DbgPrint("%c", pExt2Sb->s_volume_name[i]); + } + DbgPrint("\n"); + + DPRINT("\n\n"); } - #define set_field(field, default) if (!pExt2Sb->field) pExt2Sb->field = (default);

1 0

[hpoussin] 32284: Add RtlTimeToSecondsSince1970() prototype
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 15:49:21 2008 New Revision: 32284 URL: http://svn.reactos.org/svn/reactos?rev=32284&view=rev Log: Add RtlTimeToSecondsSince1970() prototype Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Feb 11 15:49:21 2008 @@ -3052,6 +3052,14 @@ NTSYSAPI VOID NTAPI +RtlTimeToSecondsSince1970( + PLARGE_INTEGER Time, + OUT PULONG SecondsSince1970 +); + +NTSYSAPI +VOID +NTAPI RtlTimeToTimeFields( PLARGE_INTEGER Time, PTIME_FIELDS TimeFields

1 0

[hpoussin] 32283: Bring back ext2 code from branch It does not compile yet
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 15:10:35 2008 New Revision: 32283 URL: http://svn.reactos.org/svn/reactos?rev=32283&view=rev Log: Bring back ext2 code from branch It does not compile yet Added: trunk/reactos/drivers/filesystems/ext2/ - copied from r32282, branches/ext2/reactos/drivers/fs/ext2/ trunk/reactos/drivers/filesystems/fs_rec/ext2.c (props changed) - copied unchanged from r32282, branches/ext2/reactos/drivers/fs/fs_rec/ext2.c trunk/reactos/include/reactos/libs/fslib/ext2lib.h (props changed) - copied unchanged from r32282, branches/ext2/reactos/include/fslib/ext2lib.h trunk/reactos/lib/fslib/ext2lib/ - copied from r32282, branches/ext2/reactos/lib/fslib/ext2lib/ Removed: trunk/reactos/drivers/filesystems/ext2/makefile trunk/reactos/drivers/filesystems/ext2/src/.cvsignore trunk/reactos/lib/fslib/ext2lib/.cvsignore trunk/reactos/lib/fslib/ext2lib/Makefile Modified: trunk/reactos/drivers/filesystems/ext2/ext2fs.rc (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/errmsg.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/ext2_fs.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/ext2metadata.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/protos.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/resource.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/struct.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/cleanup.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/close.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/create.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/ext2.rc (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/ext2init.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/fastio.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/flush.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/io.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/metadata.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/misc.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/read.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/shutdown.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/volinfo.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/write.c (contents, props changed) trunk/reactos/drivers/filesystems/fs_rec/blockdev.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/cdfs.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/fat.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h (props changed) trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rc (props changed) trunk/reactos/drivers/filesystems/fs_rec/ntfs.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/udfs.c (props changed) trunk/reactos/lib/fslib/ext2lib/Badblock.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Bitmap.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Bitmap.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Disk.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Disk.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Group.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Inode.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Memory.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Mke2fs.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Mke2fs.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Super.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Uuid.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/ext2_fs.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/types.h (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/ext2/ext2fs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… Modified: trunk/reactos/drivers/filesystems/ext2/inc/errmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2metadata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/protos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Removed: trunk/reactos/drivers/filesystems/ext2/makefile URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/drivers/fs/ext2/ma… Removed: trunk/reactos/drivers/filesystems/ext2/src/.cvsignore URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/drivers/fs/ext2/sr… Modified: trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Removed: trunk/reactos/lib/fslib/ext2lib/.cvsignore URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/lib/fslib/ext2lib/… Modified: trunk/reactos/lib/fslib/ext2lib/Badblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Badblock… Modified: trunk/reactos/lib/fslib/ext2lib/Bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Bitmap.c… Modified: trunk/reactos/lib/fslib/ext2lib/Bitmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Bitmap.h… Modified: trunk/reactos/lib/fslib/ext2lib/Disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Disk.c?r… Modified: trunk/reactos/lib/fslib/ext2lib/Disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Disk.h?r… Modified: trunk/reactos/lib/fslib/ext2lib/Group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Group.c?… Modified: trunk/reactos/lib/fslib/ext2lib/Inode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Inode.c?… Removed: trunk/reactos/lib/fslib/ext2lib/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/lib/fslib/ext2lib/… Modified: trunk/reactos/lib/fslib/ext2lib/Memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Memory.c… Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.h… Modified: trunk/reactos/lib/fslib/ext2lib/Super.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Super.c?… Modified: trunk/reactos/lib/fslib/ext2lib/Uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Uuid.c?r… Modified: trunk/reactos/lib/fslib/ext2lib/ext2_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/ext2_fs.… Modified: trunk/reactos/lib/fslib/ext2lib/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/types.h?…

1 0

[pschweitzer] 32282: Deleted ext2 driver Another one will be merged
by pschweitzer＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: pschweitzer Date: Mon Feb 11 14:29:54 2008 New Revision: 32282 URL: http://svn.reactos.org/svn/reactos?rev=32282&view=rev Log: Deleted ext2 driver Another one will be merged Removed: trunk/rosapps/ext2/ Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=32282… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Mon Feb 11 14:29:54 2008 @@ -28,11 +28,7 @@ <directory name="downloader"> <xi:include href="downloader/downloader.rbuild" /> </directory> - + <directory name="fontview"> <xi:include href="fontview/fontview.rbuild" /> </directory>

1 0

[hpoussin] 32281: Use Rule class to generate instructions for .idl files
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 13:55:33 2008 New Revision: 32281 URL: http://svn.reactos.org/svn/reactos?rev=32281&view=rev Log: Use Rule class to generate instructions for .idl files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 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 Mon Feb 11 13:55:33 2008 @@ -1282,6 +1282,33 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule widlHeaderRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlServerRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h -s -S $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlClientRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h -c -C $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlProxyRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h -p -P $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlTlbRule ( "$(OUTPUT)\\$(source_dir)\\$(module_name).tlb: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).tlb $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); void MingwModuleHandler::GenerateGccCommand ( @@ -1324,12 +1351,6 @@ delete pchFilename; } -const std::string& -MingwModuleHandler::GetWidlFlags ( const CompilationUnit& compilationUnit ) -{ - return compilationUnit.GetSwitches (); -} - string MingwModuleHandler::GetPropertyValue ( const Module& module, const std::string& name ) { @@ -1350,44 +1371,6 @@ return new FileLocation ( IntermediateDirectory, base->relative_path, newname ); } -void -MingwModuleHandler::GenerateWidlCommandsServer ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeaderFilename ); - - FileLocation generatedServerFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + "_s.c" ); - CLEAN_FILE ( generatedServerFilename ); - - fprintf ( fMakefile, - "%s %s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName ( generatedServerFilename ).c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( generatedServerFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); - fprintf ( fMakefile, - "\t%s %s %s -h -H %s -s -S %s %s\n", - "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( compilationUnit ).c_str (), - widlflagsMacro.c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - backend->GetFullName ( generatedServerFilename ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeaderFilename; -} - /* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetRpcClientHeaderFilename ( const FileLocation *base ) const @@ -1418,165 +1401,6 @@ { string newname = GetBasename ( base->name ) + ".h"; return new FileLocation ( IntermediateDirectory, "include/reactos" , newname ); -} - -void -MingwModuleHandler::GenerateWidlCommandsEmbeddedTypeLib ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - FileLocation EmbeddedTypeLibFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + ".tlb" ); - - fprintf ( fMakefile, - "%s: %s $(WIDL_TARGET) | %s\n", - GetTargetMacro ( module ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( EmbeddedTypeLibFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); - fprintf ( fMakefile, - "\t%s %s %s -t -T %s %s\n", - "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( compilationUnit ).c_str (), - widlflagsMacro.c_str (), - backend->GetFullName ( EmbeddedTypeLibFilename ).c_str(), - backend->GetFullName ( sourceFile ).c_str () ); -} - -void -MingwModuleHandler::GenerateWidlCommandsClient ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeaderFilename = GetRpcClientHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeaderFilename ); - - FileLocation generatedClientFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + "_c.c" ); - CLEAN_FILE ( generatedClientFilename ); - - fprintf ( fMakefile, - "%s %s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName ( generatedClientFilename ).c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( generatedClientFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); - fprintf ( fMakefile, - "\t%s %s %s -h -H %s -c -C %s %s\n", - "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( compilationUnit ).c_str (), - widlflagsMacro.c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - backend->GetFullName ( generatedClientFilename ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeaderFilename; -} - -void -MingwModuleHandler::GenerateWidlCommandsProxy ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeaderFilename = GetRpcProxyHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeaderFilename ); - - FileLocation generatedProxyFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + "_p.c" ); - CLEAN_FILE ( generatedProxyFilename ); - - fprintf ( fMakefile, - "%s %s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName ( generatedProxyFilename ).c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( generatedProxyFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); - fprintf ( fMakefile, - "\t%s %s %s -h -H %s -p -P %s %s\n", - "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( compilationUnit ).c_str (), - widlflagsMacro.c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - backend->GetFullName ( generatedProxyFilename ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeaderFilename; -} - -void -MingwModuleHandler::GenerateWidlCommandsIdlHeader ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeader = GetIdlHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeader ); - - fprintf ( fMakefile, - "%s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName( *generatedHeader ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *generatedHeader ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); - fprintf ( fMakefile, - "\t%s %s %s -h -H %s %s\n", - "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( compilationUnit ).c_str (), - widlflagsMacro.c_str (), - backend->GetFullName ( *generatedHeader ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeader; -} - -void -MingwModuleHandler::GenerateWidlCommands ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - if ( module.type == RpcServer ) - GenerateWidlCommandsServer ( compilationUnit, - widlflagsMacro ); - else if ( module.type == RpcClient ) - GenerateWidlCommandsClient ( compilationUnit, - widlflagsMacro ); - else if ( module.type == RpcProxy ) - GenerateWidlCommandsProxy ( compilationUnit, - widlflagsMacro ); - else if ( module.type == EmbeddedTypeLib ) - GenerateWidlCommandsEmbeddedTypeLib ( compilationUnit, - widlflagsMacro ); - else // applies also for other module.types which include idl files - GenerateWidlCommandsIdlHeader ( compilationUnit, - widlflagsMacro ); } void @@ -1607,6 +1431,11 @@ { HostDontCare, TypeDontCare, ".rc", &windresRule }, { HostDontCare, TypeDontCare, ".mc", &wmcRule }, { HostDontCare, TypeDontCare, ".spec", &winebuildRule }, + { HostDontCare, RpcServer, ".idl", &widlServerRule }, + { HostDontCare, RpcClient, ".idl", &widlClientRule }, + { HostDontCare, RpcProxy, ".idl", &widlProxyRule }, + { HostDontCare, EmbeddedTypeLib, ".idl", &widlTlbRule }, + { HostDontCare, TypeDontCare, ".idl", &widlHeaderRule }, }; size_t i; Rule *customRule = NULL; @@ -1653,17 +1482,13 @@ cc, cflagsMacro ); } - else if ( extension == ".idl" ) - { - GenerateWidlCommands ( compilationUnit, - widlflagsMacro ); - if ( (module.type == RpcServer) || (module.type == RpcClient) || (module.type == RpcProxy) ) - { - GenerateGccCommand ( &sourceFile, + else if ( extension == ".idl" && + (module.type == RpcServer) || (module.type == RpcClient) || (module.type == RpcProxy) ) + { + GenerateGccCommand ( &sourceFile, GetExtraDependencies ( &sourceFile ), cc, cflagsMacro ); - } } else if ( !customRule ) { Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Feb 11 13:55:33 2008 @@ -155,24 +155,6 @@ const std::string& extraDependencies, const std::string& cc, const std::string& cflagsMacro ); - const std::string& GetWidlFlags ( const CompilationUnit& compilationUnit ); - void GenerateWidlCommandsServer ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsClient ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsProxy ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsIdlHeader ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsEmbeddedTypeLib ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommands ( const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); void GenerateCommands ( const CompilationUnit& compilationUnit, const std::string& extraDependencies, const std::string& cc,

1 0

[greatlrd] 32280: fix a typo
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Mon Feb 11 00:01:18 2008 New Revision: 32280 URL: http://svn.reactos.org/svn/reactos?rev=32280&view=rev Log: fix a typo Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Mon Feb 11 00:01:18 2008 @@ -562,7 +562,6 @@ VT_ILLEGALMASKED = 0xfff, VT_TYPEMASK = 0xfff }; - #endif #endif typedef struct _KSDEVICE KSDEVICE, *PKSDEVICE; typedef PVOID KSDEVICE_HEADER, KSOBJECT_HEADER;

1 0

[cwittich] 32279: translate some GreatLordish comments into something more similar to English
by cwittich＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: cwittich Date: Sun Feb 10 23:45:56 2008 New Revision: 32279 URL: http://svn.reactos.org/svn/reactos?rev=32279&view=rev Log: translate some GreatLordish comments into something more similar to English Modified: trunk/reactos/dll/directx/ddraw/cleanup.c trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c (original) +++ trunk/reactos/dll/directx/ddraw/cleanup.c Sun Feb 10 23:45:56 2008 @@ -35,7 +35,7 @@ DdDeleteDirectDrawObject(&ddgbl); /* - are it any more I forget to release ? + anything else to release? */ /* release the linked interface */ Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sun Feb 10 23:45:56 2008 @@ -77,8 +77,8 @@ * <FILLMEIN>. * * @param pUnkOuter -* Alwas set to NULL other wise will DirectDrawCreate fail it return -* errror code CLASS_E_NOAGGREGATION +* Always set to NULL otherwise DirectDrawCreate will fail and return +* error code CLASS_E_NOAGGREGATION * * @return <FILLMEIN>. * @@ -94,14 +94,14 @@ { HRESULT retVal = DDERR_GENERIC; /* - remove this when UML digram are in place - this api is finish and is working as it should + remove this when UML diagram is in place + this api is finished and is working as it should */ DX_WINDBG_trace(); _SEH_TRY { - /* check see if pUnkOuter is null or not */ + /* check if pUnkOuter is null or not */ if (pUnkOuter) { retVal = CLASS_E_NOAGGREGATION; @@ -131,8 +131,8 @@ * <FILLMEIN>. * * @param pUnkOuter -* Alwas set to NULL other wise will DirectDrawCreateEx fail it return -* errror code CLASS_E_NOAGGREGATION +* Always set to NULL otherwise DirectDrawCreateEx will fail and return +* error code CLASS_E_NOAGGREGATION * * @return <FILLMEIN>. * @@ -148,8 +148,8 @@ { HRESULT retVal = DDERR_GENERIC; /* - remove this when UML digram are in place - this api is finish and is working as it should + remove this when UML diagram is in place + this api is finished and is working as it should */ DX_WINDBG_trace(); @@ -249,17 +249,17 @@ RegCloseKey(hKey); } - /* Call the user supplyed callback function */ + /* Call the user supplied callback function */ rc = lpCallback(NULL, strMsg, "display", lpContext, NULL); - /* If the callback function returns DDENUMRET_CANCEL, we will stop enumerating devices now */ + /* If the callback function returns DDENUMRET_CANCEL, we will stop enumerating devices */ if(rc == DDENUMRET_CANCEL) { retVal = DD_OK; } else { - // not finish + // not finished retVal = DDERR_UNSUPPORTED; } } @@ -295,11 +295,10 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ Display_d/hh/Display_d/d3d_21ac30ea-9803-401e-b541-6b08af79653d.xml.asp - for more info about this command - - summuer the msdn - - The buffer start with D3DHAL_DP2COMMAND struct afer that it follow either one struct or no struct at at all + for more info about this command see msdn documentation + + The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or + no struct at at all example for command D3DDP2OP_VIEWPORTINFO then lpCmd will look like this @@ -311,9 +310,9 @@ | D3DHAL_DP2VIEWPORTINFO | 0x04 - xxxx | --------------------------------------- - to calc end of the lpCmd buffer in this exmaple + to calculate the end of the lpCmd buffer in this exmaple D3DHAL_DP2COMMAND->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO); - now you got number of bytes but we need add the size of D3DHAL_DP2COMMAND + now you got number of bytes but we need to add the size of D3DHAL_DP2COMMAND to get this right. the end should be sizeof(D3DHAL_DP2COMMAND) + ( D3DHAL_DP2COMMAND->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO)); to get the xxxx end positions. @@ -338,12 +337,12 @@ * } D3DHAL_DP2COMMAND, *LPD3DHAL_DP2COMMAND; * * lpCmd->bCommand -* only accpect D3DDP2OP_VIEWPORTINFO, and undocument command 0x0D -* rest of the command will be return error code for. +* only accept D3DDP2OP_VIEWPORTINFO, and undocumented command 0x0D +* anything else will result in an error * Command 0x0D * dp2command->bReserved -* is how big struect we got in wStateCount or how many wStateCount we got +* is the size of the struct we got in wStateCount or how many wStateCount we got * do not known more about it, no info in msdn about it either. * * Command D3DDP2OP_VIEWPORTINFO @@ -378,7 +377,7 @@ switch (dp2command->bCommand) { - /* check for vaild command, only 3 command is vaild */ + /* check for vaild command, only 3 commands are vaild */ case D3DDP2OP_VIEWPORTINFO: *(PBYTE)lpRetCmd += ((dp2command->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO)) + sizeof(D3DHAL_DP2COMMAND)); break;

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