Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[jimtabor] 16889: Show SetMenuItemInfoA&W implemented.

by jimtabor＠svn.reactos.com

Show SetMenuItemInfoA&W implemented. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-29 23:04:48 UTC (rev 16888) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-29 23:15:01 UTC (rev 16889) @@ -3275,9 +3275,13 @@ case WM_SYSKEYDOWN: switch (Msg.wParam) { + DbgPrint("Menu.c WM_SYSKEYDOWN wPram %d\n",Msg.wParam); case VK_MENU: fEndMenu = TRUE; break; + case VK_LMENU: + fEndMenu = TRUE; + break; } break; /* WM_SYSKEYDOWN */ @@ -4571,7 +4575,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -4614,7 +4618,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL

19 years, 6 months

[weiden] 16888: make the telProcessNetwork() thread function STDCALL!

by weiden＠svn.reactos.com

make the telProcessNetwork() thread function STDCALL! Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/ttelhndl.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/ttelhndl.h _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp --- trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp 2005-07-29 23:03:42 UTC (rev 16887) +++ trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp 2005-07-29 23:04:48 UTC (rev 16888) @@ -206,7 +206,7 @@ SetConsoleCtrlHandler(ControlEventHandler, TRUE); hThread = CreateThread(0, 0, - (LPTHREAD_START_ROUTINE) telProcessNetwork, + telProcessNetwork, (LPVOID)&ThreadParams, 0, &idThread); // This helps the display thread a little (Paul Brannan 8/3/98) SetThreadPriority(hThread, THREAD_PRIORITY_ABOVE_NORMAL); _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ttelhndl.cpp --- trunk/reactos/apps/utils/net/telnet/src/ttelhndl.cpp 2005-07-29 23:03:42 UTC (rev 16887) +++ trunk/reactos/apps/utils/net/telnet/src/ttelhndl.cpp 2005-07-29 23:04:48 UTC (rev 16888) @@ -478,8 +478,8 @@ // telProcessNetwork calls the member function TTelnetHandler::Go, since // TTelnetHandler::Go is not a static function, and cannot be called with // CreateThread(). (Paul Brannan 6/15/98) -DWORD telProcessNetwork(LPVOID pvParams) { - TelThreadParams *pParams = (TelThreadParams *)pvParams; +DWORD WINAPI telProcessNetwork(LPVOID lpParameter) { + TelThreadParams *pParams = (TelThreadParams *)lpParameter; return pParams->TelHandler.Go(&pParams->p); } _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ttelhndl.h --- trunk/reactos/apps/utils/net/telnet/src/ttelhndl.h 2005-07-29 23:03:42 UTC (rev 16887) +++ trunk/reactos/apps/utils/net/telnet/src/ttelhndl.h 2005-07-29 23:04:48 UTC (rev 16888) @@ -4,7 +4,7 @@ #include "tparser.h" #include "tnetwork.h" -DWORD telProcessNetwork(LPVOID pvParams); +DWORD WINAPI telProcessNetwork(LPVOID lpParameter); class TTelnetHandler { private:

19 years, 6 months

[sedwards] 16887: dos line endings

by sedwards＠svn.reactos.com

dos line endings Modified: trunk/rosapps/sysutils/dosfsck/boot.c Modified: trunk/rosapps/sysutils/dosfsck/boot.h Modified: trunk/rosapps/sysutils/dosfsck/byteorder.h Modified: trunk/rosapps/sysutils/dosfsck/byteswap.h Modified: trunk/rosapps/sysutils/dosfsck/byteswap1.h Modified: trunk/rosapps/sysutils/dosfsck/check.c Modified: trunk/rosapps/sysutils/dosfsck/check.h Modified: trunk/rosapps/sysutils/dosfsck/common.c Modified: trunk/rosapps/sysutils/dosfsck/common.h Modified: trunk/rosapps/sysutils/dosfsck/compiler.h Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.c Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.h Modified: trunk/rosapps/sysutils/dosfsck/fat.c Modified: trunk/rosapps/sysutils/dosfsck/fat.h Modified: trunk/rosapps/sysutils/dosfsck/file.c Modified: trunk/rosapps/sysutils/dosfsck/file.h Modified: trunk/rosapps/sysutils/dosfsck/getopt.c Modified: trunk/rosapps/sysutils/dosfsck/io.c Modified: trunk/rosapps/sysutils/dosfsck/io.h Modified: trunk/rosapps/sysutils/dosfsck/lfn.c Modified: trunk/rosapps/sysutils/dosfsck/lfn.h Modified: trunk/rosapps/sysutils/dosfsck/msdos_fs.h Modified: trunk/rosapps/sysutils/dosfsck/swab.h Modified: trunk/rosapps/sysutils/dosfsck/version.h Modified: trunk/rosapps/sysutils/dosfsck/vfat.h _____ Modified: trunk/rosapps/sysutils/dosfsck/boot.c --- trunk/rosapps/sysutils/dosfsck/boot.c 2005-07-29 23:03:12 UTC (rev 16886) +++ trunk/rosapps/sysutils/dosfsck/boot.c 2005-07-29 23:03:42 UTC (rev 16887) @@ -1,370 +1,370 @@ -/* boot.c - Read and analyze ia PC/MS-DOS boot sector */ - -/* Written 1993 by Werner Almesberger */ - -/* FAT32, VFAT, Atari format support, and various fixes additions May 1998 - * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ - -#include <stdio.h> -#include <string.h> -#include <sys/types.h> - -#include "common.h" -#include "dosfsck.h" -#include "io.h" -#include "boot.h" - - -#define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) - /* don't divide by zero */ - -static struct { - __u8 media; - char *descr; -} mediabytes[] = { - { 0xf0, "5.25\" or 3.5\" HD floppy" }, - { 0xf8, "hard disk" }, - { 0xf9, "3,5\" 720k floppy 2s/80tr/9sec or " - "5.25\" 1.2M floppy 2s/80tr/15sec" }, - { 0xfa, "5.25\" 320k floppy 1s/80tr/8sec" }, - { 0xfb, "3.5\" 640k floppy 2s/80tr/8sec" }, - { 0xfc, "5.25\" 180k floppy 1s/40tr/9sec" }, - { 0xfd, "5.25\" 360k floppy 2s/40tr/9sec" }, - { 0xfe, "5.25\" 160k floppy 1s/40tr/8sec" }, - { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" }, -}; - -#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ -/* Unaligned fields must first be copied byte-wise */ -#define GET_UNALIGNED_W(f) \ - ({ \ - unsigned short __v; \ - memcpy( &__v, &f, sizeof(__v) ); \ - CF_LE_W( *(unsigned short *)&f ); \ - }) -#else -#define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f ) -#endif - - -static char *get_media_descr( unsigned char media ) -{ - int i; - - for( i = 0; i < sizeof(mediabytes)/sizeof(*mediabytes); ++i ) { - if (mediabytes[i].media == media) - return( mediabytes[i].descr ); - } - return( "undefined" ); -} - -static void dump_boot(DOS_FS *fs,struct boot_sector *b,unsigned lss) -{ - unsigned short sectors; - - printf("Boot sector contents:\n"); - if (!atari_format) { - char id[9]; - strncpy(id,b->system_id,8); - id[8] = 0; - printf("System ID \"%s\"\n",id); - } - else { - /* On Atari, a 24 bit serial number is stored at offset 8 of the boot - * sector */ - printf("Serial number 0x%x\n", - b->system_id[5] | (b->system_id[6]<<8) | (b->system_id[7]<<16)); - } - printf("Media byte 0x%02x (%s)\n",b->media,get_media_descr(b->media)); - printf("%10d bytes per logical sector\n",GET_UNALIGNED_W(b->sector_size)); - printf("%10d bytes per cluster\n",fs->cluster_size); - printf("%10d reserved sector%s\n",CF_LE_W(b->reserved), - CF_LE_W(b->reserved) == 1 ? "" : "s"); - printf("First FAT starts at byte %llu (sector %llu)\n", - (__u64)fs->fat_start, - (__u64)fs->fat_start/lss); - printf("%10d FATs, %d bit entries\n",b->fats,fs->fat_bits); - printf("%10d bytes per FAT (= %u sectors)\n",fs->fat_size, - fs->fat_size/lss); - if (!fs->root_cluster) { - printf("Root directory starts at byte %llu (sector %llu)\n", - (__u64)fs->root_start, - (__u64)fs->root_start/lss); - printf("%10d root directory entries\n",fs->root_entries); - } - else { - printf( "Root directory start at cluster %lu (arbitrary size)\n", - fs->root_cluster); - } - printf("Data area starts at byte %llu (sector %llu)\n", - (__u64)fs->data_start, - (__u64)fs->data_start/lss); - printf("%10lu data clusters (%llu bytes)\n",fs->clusters, - (__u64)fs->clusters*fs->cluster_size); - printf("%u sectors/track, %u heads\n",CF_LE_W(b->secs_track), - CF_LE_W(b->heads)); - printf("%10u hidden sectors\n", - atari_format ? - /* On Atari, the hidden field is only 16 bit wide and unused */ - (((unsigned char *)&b->hidden)[0] | - ((unsigned char *)&b->hidden)[1] << 8) : - CF_LE_L(b->hidden)); - sectors = GET_UNALIGNED_W( b->sectors ); - printf("%10u sectors total\n", sectors ? sectors : CF_LE_L(b->total_sect)); -} - -static void check_backup_boot(DOS_FS *fs, struct boot_sector *b, int lss) -{ - struct boot_sector b2; - - if (!fs->backupboot_start) { - printf( "There is no backup boot sector.\n" ); - if (CF_LE_W(b->reserved) < 3) { - printf( "And there is no space for creating one!\n" ); - return; - } - if (interactive) - printf( "1) Create one\n2) Do without a backup\n" ); - else printf( " Auto-creating backup boot block.\n" ); - if (!interactive || get_key("12","?") == '1') { - int bbs; - /* The usual place for the backup boot sector is sector 6. Choose - * that or the last reserved sector. */ - if (CF_LE_W(b->reserved) >= 7 && CF_LE_W(b->info_sector) != 6) - bbs = 6; - else { - bbs = CF_LE_W(b->reserved) - 1; - if (bbs == CF_LE_W(b->info_sector)) - --bbs; /* this is never 0, as we checked reserved >= 3! */ - } - fs->backupboot_start = bbs*lss; - b->backup_boot = CT_LE_W(bbs); - fs_write(fs->backupboot_start,sizeof(*b),b); - fs_write((off_t)offsetof(struct boot_sector,backup_boot), - sizeof(b->backup_boot),&b->backup_boot); - printf( "Created backup of boot sector in sector %d\n", bbs ); - return; - } - else return; - } - - fs_read(fs->backupboot_start,sizeof(b2),&b2); - if (memcmp(b,&b2,sizeof(b2)) != 0) { - /* there are any differences */ - __u8 *p, *q; - int i, pos, first = 1; - char buf[20]; - - printf( "There are differences between boot sector and its backup.\n" ); - printf( "Differences: (offset:original/backup)\n " ); - pos = 2; - for( p = (__u8 *)b, q = (__u8 *)&b2, i = 0; i < sizeof(b2); - ++p, ++q, ++i ) { - if (*p != *q) { - sprintf( buf, "%s%u:%02x/%02x", first ? "" : ", ", - (unsigned)(p-(__u8 *)b), *p, *q ); - if (pos + strlen(buf) > 78) printf( "\n " ), pos = 2; - printf( "%s", buf ); - pos += strlen(buf); - first = 0; - } - } - printf( "\n" ); - - if (interactive) - printf( "1) Copy original to backup\n" - "2) Copy backup to original\n" - "3) No action\n" ); - else printf( " Not automatically fixing this.\n" ); - switch (interactive ? get_key("123","?") : '3') { - case '1': - fs_write(fs->backupboot_start,sizeof(*b),b); - break; - case '2': - fs_write(0,sizeof(b2),&b2); - break; - default: - break; - } - } -} - -static void init_fsinfo(struct info_sector *i) -{ - i->magic = CT_LE_L(0x41615252); - i->signature = CT_LE_L(0x61417272); - i->free_clusters = CT_LE_L(-1); - i->next_cluster = CT_LE_L(2); - i->boot_sign = CT_LE_W(0xaa55); -} - -static void read_fsinfo(DOS_FS *fs, struct boot_sector *b,int lss) -{ - struct info_sector i; - - if (!b->info_sector) { - printf( "No FSINFO sector\n" ); - if (interactive) - printf( "1) Create one\n2) Do without FSINFO\n" ); - else printf( " Not automatically creating it.\n" ); - if (interactive && get_key("12","?") == '1') { - /* search for a free reserved sector (not boot sector and not - * backup boot sector) */ - __u32 s; - for( s = 1; s < CF_LE_W(b->reserved); ++s ) - if (s != CF_LE_W(b->backup_boot)) break; - if (s > 0 && s < CF_LE_W(b->reserved)) { - init_fsinfo(&i); - fs_write((off_t)s*lss,sizeof(i),&i); - b->info_sector = CT_LE_W(s); - fs_write((off_t)offsetof(struct boot_sector,info_sector), - sizeof(b->info_sector),&b->info_sector); - if (fs->backupboot_start) - fs_write(fs->backupboot_start+ - offsetof(struct boot_sector,info_sector), - sizeof(b->info_sector),&b->info_sector); - } - else { - printf( "No free reserved sector found -- " - "no space for FSINFO sector!\n" ); - return; - } - } - else return; - } - - fs->fsinfo_start = CF_LE_W(b->info_sector)*lss; - fs_read(fs->fsinfo_start,sizeof(i),&i); - - if (i.magic != CT_LE_L(0x41615252) || - i.signature != CT_LE_L(0x61417272) || - i.boot_sign != CT_LE_W(0xaa55)) { - printf( "FSINFO sector has bad magic number(s):\n" ); - if (i.magic != CT_LE_L(0x41615252)) - printf( " Offset %llu: 0x%08x != expected 0x%08x\n", - (__u64)offsetof(struct info_sector,magic), - CF_LE_L(i.magic),0x41615252); - if (i.signature != CT_LE_L(0x61417272)) - printf( " Offset %llu: 0x%08x != expected 0x%08x\n", - (__u64)offsetof(struct info_sector,signature), - CF_LE_L(i.signature),0x61417272); - if (i.boot_sign != CT_LE_W(0xaa55)) - printf( " Offset %llu: 0x%04x != expected 0x%04x\n", - (__u64)offsetof(struct info_sector,boot_sign), - CF_LE_W(i.boot_sign),0xaa55); - if (interactive) - printf( "1) Correct\n2) Don't correct (FSINFO invalid then)\n" ); - else printf( " Auto-correcting it.\n" ); - if (!interactive || get_key("12","?") == '1') { - init_fsinfo(&i); - fs_write(fs->fsinfo_start,sizeof(i),&i); - } - else fs->fsinfo_start = 0; - } - - if (fs->fsinfo_start) - fs->free_clusters = CF_LE_L(i.free_clusters); -} - -void read_boot(DOS_FS *fs) -{ - struct boot_sector b; - unsigned total_sectors; - unsigned short logical_sector_size, sectors; - unsigned fat_length; - loff_t data_size; - - fs_read(0,sizeof(b),&b); - logical_sector_size = GET_UNALIGNED_W(b.sector_size); - if (!logical_sector_size) die("Logical sector size is zero."); - fs->cluster_size = b.cluster_size*logical_sector_size; - if (!fs->cluster_size) die("Cluster size is zero."); - if (b.fats != 2 && b.fats != 1) - die("Currently, only 1 or 2 FATs are supported, not %d.\n",b.fats); - fs->nfats = b.fats; - sectors = GET_UNALIGNED_W(b.sectors); - total_sectors = sectors ? sectors : CF_LE_L(b.total_sect); - if (verbose) printf("Checking we can access the last sector of the filesystem\n"); - /* Can't access last odd sector anyway, so round down */ - fs_test((loff_t)((total_sectors & ~1)-1)*(loff_t)logical_sector_size, - logical_sector_size); - fat_length = CF_LE_W(b.fat_length) ? - CF_LE_W(b.fat_length) : CF_LE_L(b.fat32_length); - fs->fat_start = (off_t)CF_LE_W(b.reserved)*logical_sector_size; - fs->root_start = ((off_t)CF_LE_W(b.reserved)+b.fats*fat_length)* - logical_sector_size; - fs->root_entries = GET_UNALIGNED_W(b.dir_entries); - fs->data_start = fs->root_start+ROUND_TO_MULTIPLE(fs->root_entries << - MSDOS_DIR_BITS,logical_sector_size); - data_size = (loff_t)total_sectors*logical_sector_size-fs->data_start; - fs->clusters = data_size/fs->cluster_size; - fs->root_cluster = 0; /* indicates standard, pre-FAT32 root dir */ - fs->fsinfo_start = 0; /* no FSINFO structure */ - fs->free_clusters = -1; /* unknown */ - if (!b.fat_length && b.fat32_length) { - fs->fat_bits = 32; - fs->root_cluster = CF_LE_L(b.root_cluster); - if (!fs->root_cluster && fs->root_entries) - /* M$ hasn't specified this, but it looks reasonable: If - * root_cluster is 0 but there is a separate root dir - * (root_entries != 0), we handle the root dir the old way. Give a - * warning, but convertig to a root dir in a cluster chain seems - * to complex for now... */ - printf( "Warning: FAT32 root dir not in cluster chain! " - "Compability mode...\n" ); - else if (!fs->root_cluster && !fs->root_entries) - die("No root directory!"); - else if (fs->root_cluster && fs->root_entries) - printf( "Warning: FAT32 root dir is in a cluster chain, but " - "a separate root dir\n" - " area is defined. Cannot fix this easily.\n" ); - - fs->backupboot_start = CF_LE_W(b.backup_boot)*logical_sector_size; - check_backup_boot(fs,&b,logical_sector_size); - - read_fsinfo(fs,&b,logical_sector_size); - } - else if (!atari_format) { - /* On real MS-DOS, a 16 bit FAT is used whenever there would be too - * much clusers otherwise. */ - fs->fat_bits = (fs->clusters > MSDOS_FAT12) ? 16 : 12; - } - else { - /* On Atari, things are more difficult: GEMDOS always uses 12bit FATs - * on floppies, and always 16 bit on harddisks. */ - fs->fat_bits = 16; /* assume 16 bit FAT for now */ - /* If more clusters than fat entries in 16-bit fat, we assume - * it's a real MSDOS FS with 12-bit fat. */ - if (fs->clusters+2 > fat_length*logical_sector_size*8/16 || - /* if it's a floppy disk --> 12bit fat */ - device_no == 2 || - /* if it's a ramdisk or loopback device and has one of the usual - * floppy sizes -> 12bit FAT */ - ((device_no == 1 || device_no == 7) && - (total_sectors == 720 || total_sectors == 1440 || - total_sectors == 2880))) - fs->fat_bits = 12; - } - /* On FAT32, the high 4 bits of a FAT entry are reserved */ - fs->eff_fat_bits = (fs->fat_bits == 32) ? 28 : fs->fat_bits; - fs->fat_size = fat_length*logical_sector_size; - if (fs->clusters > ((__u64)fs->fat_size*8/fs->fat_bits)-2) - die("File system has %d clusters but only space for %d FAT entries.", - fs->clusters,((__u64)fs->fat_size*8/fs->fat_bits)-2); - if (!fs->root_entries && !fs->root_cluster) - die("Root directory has zero size."); - if (fs->root_entries & (MSDOS_DPS-1)) - die("Root directory (%d entries) doesn't span an integral number of " - "sectors.",fs->root_entries); - if (logical_sector_size & (SECTOR_SIZE-1)) - die("Logical sector size (%d bytes) is not a multiple of the physical " - "sector size.",logical_sector_size); - /* ++roman: On Atari, these two fields are often left uninitialized */ - if (!atari_format && (!b.secs_track || !b.heads)) - die("Invalid disk format in boot sector."); - if (verbose) dump_boot(fs,&b,logical_sector_size); -} - -/* Local Variables: */ -/* tab-width: 8 */ -/* End: */ +/* boot.c - Read and analyze ia PC/MS-DOS boot sector */ + +/* Written 1993 by Werner Almesberger */ + +/* FAT32, VFAT, Atari format support, and various fixes additions May 1998 + * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ + +#include <stdio.h> +#include <string.h> +#include <sys/types.h> + +#include "common.h" +#include "dosfsck.h" +#include "io.h" +#include "boot.h" + + +#define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) + /* don't divide by zero */ + +static struct { + __u8 media; + char *descr; +} mediabytes[] = { + { 0xf0, "5.25\" or 3.5\" HD floppy" }, + { 0xf8, "hard disk" }, + { 0xf9, "3,5\" 720k floppy 2s/80tr/9sec or " + "5.25\" 1.2M floppy 2s/80tr/15sec" }, + { 0xfa, "5.25\" 320k floppy 1s/80tr/8sec" }, + { 0xfb, "3.5\" 640k floppy 2s/80tr/8sec" }, + { 0xfc, "5.25\" 180k floppy 1s/40tr/9sec" }, + { 0xfd, "5.25\" 360k floppy 2s/40tr/9sec" }, + { 0xfe, "5.25\" 160k floppy 1s/40tr/8sec" }, + { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" }, +}; + +#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ +/* Unaligned fields must first be copied byte-wise */ +#define GET_UNALIGNED_W(f) \ + ({ \ + unsigned short __v; \ + memcpy( &__v, &f, sizeof(__v) ); \ + CF_LE_W( *(unsigned short *)&f ); \ + }) +#else +#define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f ) +#endif + + +static char *get_media_descr( unsigned char media ) +{ + int i; + + for( i = 0; i < sizeof(mediabytes)/sizeof(*mediabytes); ++i ) { + if (mediabytes[i].media == media) + return( mediabytes[i].descr ); + } + return( "undefined" ); +} + +static void dump_boot(DOS_FS *fs,struct boot_sector *b,unsigned lss) +{ + unsigned short sectors; + + printf("Boot sector contents:\n"); + if (!atari_format) { + char id[9]; + strncpy(id,b->system_id,8); + id[8] = 0; + printf("System ID \"%s\"\n",id); + } + else { + /* On Atari, a 24 bit serial number is stored at offset 8 of the boot + * sector */ + printf("Serial number 0x%x\n", + b->system_id[5] | (b->system_id[6]<<8) | (b->system_id[7]<<16)); + } + printf("Media byte 0x%02x (%s)\n",b->media,get_media_descr(b->media)); + printf("%10d bytes per logical sector\n",GET_UNALIGNED_W(b->sector_size)); + printf("%10d bytes per cluster\n",fs->cluster_size); + printf("%10d reserved sector%s\n",CF_LE_W(b->reserved), + CF_LE_W(b->reserved) == 1 ? "" : "s"); + printf("First FAT starts at byte %llu (sector %llu)\n", + (__u64)fs->fat_start, + (__u64)fs->fat_start/lss); + printf("%10d FATs, %d bit entries\n",b->fats,fs->fat_bits); + printf("%10d bytes per FAT (= %u sectors)\n",fs->fat_size, + fs->fat_size/lss); + if (!fs->root_cluster) { + printf("Root directory starts at byte %llu (sector %llu)\n", + (__u64)fs->root_start, + (__u64)fs->root_start/lss); + printf("%10d root directory entries\n",fs->root_entries); + } + else { + printf( "Root directory start at cluster %lu (arbitrary size)\n", + fs->root_cluster); + } + printf("Data area starts at byte %llu (sector %llu)\n", + (__u64)fs->data_start, + (__u64)fs->data_start/lss); + printf("%10lu data clusters (%llu bytes)\n",fs->clusters, + (__u64)fs->clusters*fs->cluster_size); + printf("%u sectors/track, %u heads\n",CF_LE_W(b->secs_track), + CF_LE_W(b->heads)); + printf("%10u hidden sectors\n", + atari_format ? + /* On Atari, the hidden field is only 16 bit wide and unused */ + (((unsigned char *)&b->hidden)[0] | + ((unsigned char *)&b->hidden)[1] << 8) : + CF_LE_L(b->hidden)); + sectors = GET_UNALIGNED_W( b->sectors ); + printf("%10u sectors total\n", sectors ? sectors : CF_LE_L(b->total_sect)); +} + +static void check_backup_boot(DOS_FS *fs, struct boot_sector *b, int lss) +{ + struct boot_sector b2; + + if (!fs->backupboot_start) { + printf( "There is no backup boot sector.\n" ); + if (CF_LE_W(b->reserved) < 3) { + printf( "And there is no space for creating one!\n" ); + return; + } + if (interactive) + printf( "1) Create one\n2) Do without a backup\n" ); + else printf( " Auto-creating backup boot block.\n" ); + if (!interactive || get_key("12","?") == '1') { + int bbs; + /* The usual place for the backup boot sector is sector 6. Choose + * that or the last reserved sector. */ + if (CF_LE_W(b->reserved) >= 7 && CF_LE_W(b->info_sector) != 6) + bbs = 6; + else { + bbs = CF_LE_W(b->reserved) - 1; + if (bbs == CF_LE_W(b->info_sector)) + --bbs; /* this is never 0, as we checked reserved >= 3! */ + } + fs->backupboot_start = bbs*lss; + b->backup_boot = CT_LE_W(bbs); + fs_write(fs->backupboot_start,sizeof(*b),b); + fs_write((off_t)offsetof(struct boot_sector,backup_boot), + sizeof(b->backup_boot),&b->backup_boot); + printf( "Created backup of boot sector in sector %d\n", bbs ); + return; + } + else return; + } + + fs_read(fs->backupboot_start,sizeof(b2),&b2); + if (memcmp(b,&b2,sizeof(b2)) != 0) { + /* there are any differences */ + __u8 *p, *q; + int i, pos, first = 1; + char buf[20]; + + printf( "There are differences between boot sector and its backup.\n" ); + printf( "Differences: (offset:original/backup)\n " ); + pos = 2; + for( p = (__u8 *)b, q = (__u8 *)&b2, i = 0; i < sizeof(b2); + ++p, ++q, ++i ) { + if (*p != *q) { + sprintf( buf, "%s%u:%02x/%02x", first ? "" : ", ", + (unsigned)(p-(__u8 *)b), *p, *q ); + if (pos + strlen(buf) > 78) printf( "\n " ), pos = 2; + printf( "%s", buf ); + pos += strlen(buf); + first = 0; + } + } + printf( "\n" ); + + if (interactive) + printf( "1) Copy original to backup\n" + "2) Copy backup to original\n" + "3) No action\n" ); + else printf( " Not automatically fixing this.\n" ); + switch (interactive ? get_key("123","?") : '3') { + case '1': + fs_write(fs->backupboot_start,sizeof(*b),b); + break; + case '2': + fs_write(0,sizeof(b2),&b2); + break; + default: + break; + } + } +} + +static void init_fsinfo(struct info_sector *i) +{ + i->magic = CT_LE_L(0x41615252); + i->signature = CT_LE_L(0x61417272); + i->free_clusters = CT_LE_L(-1); + i->next_cluster = CT_LE_L(2); + i->boot_sign = CT_LE_W(0xaa55); +} + +static void read_fsinfo(DOS_FS *fs, struct boot_sector *b,int lss) +{ + struct info_sector i; + + if (!b->info_sector) { + printf( "No FSINFO sector\n" ); + if (interactive) + printf( "1) Create one\n2) Do without FSINFO\n" ); + else printf( " Not automatically creating it.\n" ); + if (interactive && get_key("12","?") == '1') { + /* search for a free reserved sector (not boot sector and not + * backup boot sector) */ + __u32 s; + for( s = 1; s < CF_LE_W(b->reserved); ++s ) + if (s != CF_LE_W(b->backup_boot)) break; + if (s > 0 && s < CF_LE_W(b->reserved)) { + init_fsinfo(&i); + fs_write((off_t)s*lss,sizeof(i),&i); + b->info_sector = CT_LE_W(s); + fs_write((off_t)offsetof(struct boot_sector,info_sector), + sizeof(b->info_sector),&b->info_sector); + if (fs->backupboot_start) + fs_write(fs->backupboot_start+ + offsetof(struct boot_sector,info_sector), + sizeof(b->info_sector),&b->info_sector); + } + else { + printf( "No free reserved sector found -- " + "no space for FSINFO sector!\n" ); + return; + } + } + else return; + } + + fs->fsinfo_start = CF_LE_W(b->info_sector)*lss; + fs_read(fs->fsinfo_start,sizeof(i),&i); + + if (i.magic != CT_LE_L(0x41615252) || + i.signature != CT_LE_L(0x61417272) || + i.boot_sign != CT_LE_W(0xaa55)) { + printf( "FSINFO sector has bad magic number(s):\n" ); + if (i.magic != CT_LE_L(0x41615252)) + printf( " Offset %llu: 0x%08x != expected 0x%08x\n", + (__u64)offsetof(struct info_sector,magic), + CF_LE_L(i.magic),0x41615252); + if (i.signature != CT_LE_L(0x61417272)) + printf( " Offset %llu: 0x%08x != expected 0x%08x\n", + (__u64)offsetof(struct info_sector,signature), + CF_LE_L(i.signature),0x61417272); + if (i.boot_sign != CT_LE_W(0xaa55)) + printf( " Offset %llu: 0x%04x != expected 0x%04x\n", + (__u64)offsetof(struct info_sector,boot_sign), + CF_LE_W(i.boot_sign),0xaa55); + if (interactive) + printf( "1) Correct\n2) Don't correct (FSINFO invalid then)\n" ); + else printf( " Auto-correcting it.\n" ); + if (!interactive || get_key("12","?") == '1') { + init_fsinfo(&i); + fs_write(fs->fsinfo_start,sizeof(i),&i); + } + else fs->fsinfo_start = 0; + } + + if (fs->fsinfo_start) + fs->free_clusters = CF_LE_L(i.free_clusters); +} + +void read_boot(DOS_FS *fs) +{ + struct boot_sector b; + unsigned total_sectors; + unsigned short logical_sector_size, sectors; + unsigned fat_length; + loff_t data_size; + + fs_read(0,sizeof(b),&b); + logical_sector_size = GET_UNALIGNED_W(b.sector_size); + if (!logical_sector_size) die("Logical sector size is zero."); + fs->cluster_size = b.cluster_size*logical_sector_size; + if (!fs->cluster_size) die("Cluster size is zero."); + if (b.fats != 2 && b.fats != 1) + die("Currently, only 1 or 2 FATs are supported, not %d.\n",b.fats); + fs->nfats = b.fats; + sectors = GET_UNALIGNED_W(b.sectors); + total_sectors = sectors ? sectors : CF_LE_L(b.total_sect); + if (verbose) printf("Checking we can access the last sector of the filesystem\n"); + /* Can't access last odd sector anyway, so round down */ + fs_test((loff_t)((total_sectors & ~1)-1)*(loff_t)logical_sector_size, + logical_sector_size); + fat_length = CF_LE_W(b.fat_length) ? + CF_LE_W(b.fat_length) : CF_LE_L(b.fat32_length); + fs->fat_start = (off_t)CF_LE_W(b.reserved)*logical_sector_size; + fs->root_start = ((off_t)CF_LE_W(b.reserved)+b.fats*fat_length)* + logical_sector_size; + fs->root_entries = GET_UNALIGNED_W(b.dir_entries); + fs->data_start = fs->root_start+ROUND_TO_MULTIPLE(fs->root_entries << + MSDOS_DIR_BITS,logical_sector_size); + data_size = (loff_t)total_sectors*logical_sector_size-fs->data_start; + fs->clusters = data_size/fs->cluster_size; + fs->root_cluster = 0; /* indicates standard, pre-FAT32 root dir */ + fs->fsinfo_start = 0; /* no FSINFO structure */ + fs->free_clusters = -1; /* unknown */ + if (!b.fat_length && b.fat32_length) { + fs->fat_bits = 32; + fs->root_cluster = CF_LE_L(b.root_cluster); + if (!fs->root_cluster && fs->root_entries) + /* M$ hasn't specified this, but it looks reasonable: If + * root_cluster is 0 but there is a separate root dir + * (root_entries != 0), we handle the root dir the old way. Give a + * warning, but convertig to a root dir in a cluster chain seems + * to complex for now... */ + printf( "Warning: FAT32 root dir not in cluster chain! " + "Compability mode...\n" ); + else if (!fs->root_cluster && !fs->root_entries) + die("No root directory!"); + else if (fs->root_cluster && fs->root_entries) + printf( "Warning: FAT32 root dir is in a cluster chain, but " + "a separate root dir\n" + " area is defined. Cannot fix this easily.\n" ); + + fs->backupboot_start = CF_LE_W(b.backup_boot)*logical_sector_size; + check_backup_boot(fs,&b,logical_sector_size); + + read_fsinfo(fs,&b,logical_sector_size); + } + else if (!atari_format) { + /* On real MS-DOS, a 16 bit FAT is used whenever there would be too + * much clusers otherwise. */ + fs->fat_bits = (fs->clusters > MSDOS_FAT12) ? 16 : 12; + } + else { + /* On Atari, things are more difficult: GEMDOS always uses 12bit FATs + * on floppies, and always 16 bit on harddisks. */ + fs->fat_bits = 16; /* assume 16 bit FAT for now */ + /* If more clusters than fat entries in 16-bit fat, we assume + * it's a real MSDOS FS with 12-bit fat. */ + if (fs->clusters+2 > fat_length*logical_sector_size*8/16 || + /* if it's a floppy disk --> 12bit fat */ + device_no == 2 || + /* if it's a ramdisk or loopback device and has one of the usual + * floppy sizes -> 12bit FAT */ + ((device_no == 1 || device_no == 7) && + (total_sectors == 720 || total_sectors == 1440 || + total_sectors == 2880))) + fs->fat_bits = 12; + } + /* On FAT32, the high 4 bits of a FAT entry are reserved */ + fs->eff_fat_bits = (fs->fat_bits == 32) ? 28 : fs->fat_bits; + fs->fat_size = fat_length*logical_sector_size; + if (fs->clusters > ((__u64)fs->fat_size*8/fs->fat_bits)-2) + die("File system has %d clusters but only space for %d FAT entries.", + fs->clusters,((__u64)fs->fat_size*8/fs->fat_bits)-2); + if (!fs->root_entries && !fs->root_cluster) + die("Root directory has zero size."); + if (fs->root_entries & (MSDOS_DPS-1)) + die("Root directory (%d entries) doesn't span an integral number of " + "sectors.",fs->root_entries); + if (logical_sector_size & (SECTOR_SIZE-1)) + die("Logical sector size (%d bytes) is not a multiple of the physical " + "sector size.",logical_sector_size); + /* ++roman: On Atari, these two fields are often left uninitialized */ + if (!atari_format && (!b.secs_track || !b.heads)) + die("Invalid disk format in boot sector."); + if (verbose) dump_boot(fs,&b,logical_sector_size); +} + +/* Local Variables: */ +/* tab-width: 8 */ +/* End: */ _____ Modified: trunk/rosapps/sysutils/dosfsck/boot.h --- trunk/rosapps/sysutils/dosfsck/boot.h 2005-07-29 23:03:12 UTC (rev 16886) +++ trunk/rosapps/sysutils/dosfsck/boot.h 2005-07-29 23:03:42 UTC (rev 16887) @@ -1,13 +1,13 @@ -/* boot.h - Read and analyze ia PC/MS-DOS boot sector */ - -/* Written 1993 by Werner Almesberger */ - - -#ifndef _BOOT_H -#define _BOOT_H - -void read_boot(DOS_FS *fs); - -/* Reads the boot sector from the currently open device and initializes *FS */ - -#endif +/* boot.h - Read and analyze ia PC/MS-DOS boot sector */ + +/* Written 1993 by Werner Almesberger */ + + +#ifndef _BOOT_H +#define _BOOT_H + +void read_boot(DOS_FS *fs); + +/* Reads the boot sector from the currently open device and initializes *FS */ + +#endif _____ Modified: trunk/rosapps/sysutils/dosfsck/byteorder.h --- trunk/rosapps/sysutils/dosfsck/byteorder.h 2005-07-29 23:03:12 UTC (rev 16886) +++ trunk/rosapps/sysutils/dosfsck/byteorder.h 2005-07-29 23:03:42 UTC (rev 16887) @@ -1,59 +1,59 @@ -#ifndef _I386_BYTEORDER_H -#define _I386_BYTEORDER_H - -//#include "types.h" -#include "compiler.h" - -#ifdef __GNUC__ - -/* For avoiding bswap on i386 */ -//#ifdef __KERNEL__ -//#include <linux/config.h> -//#endif - -static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) -{ -#ifdef CONFIG_X86_BSWAP - __asm__("bswap %0" : "=r" (x) : "0" (x)); -#else - __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */ - "rorl $16,%0\n\t" /* swap words */ - "xchgb %b0,%h0" /* swap higher bytes */ - :"=q" (x) - : "0" (x)); -#endif - return x; -} - -static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val) -{ - union { - struct { __u32 a,b; } s; - __u64 u; - } v; - v.u = val; -#ifdef CONFIG_X86_BSWAP - asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" - : "=r" (v.s.a), "=r" (v.s.b) - : "0" (v.s.a), "1" (v.s.b)); -#else - v.s.a = ___arch__swab32(v.s.a); - v.s.b = ___arch__swab32(v.s.b); - asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); -#endif - return v.u; -} - -/* Do not define swab16. Gcc is smart enough to recognize "C" version and - convert it into rotation or exhange. */ - -#define __arch__swab64(x) ___arch__swab64(x) -#define __arch__swab32(x) ___arch__swab32(x) - -#define __BYTEORDER_HAS_U64__ - -#endif /* __GNUC__ */ - -//#include "little_endian.h" - -#endif /* _I386_BYTEORDER_H */ +#ifndef _I386_BYTEORDER_H +#define _I386_BYTEORDER_H + +//#include "types.h" +#include "compiler.h" + +#ifdef __GNUC__ + +/* For avoiding bswap on i386 */ +//#ifdef __KERNEL__ +//#include <linux/config.h> +//#endif + +static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) +{ +#ifdef CONFIG_X86_BSWAP + __asm__("bswap %0" : "=r" (x) : "0" (x)); +#else + __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */ + "rorl $16,%0\n\t" /* swap words */ + "xchgb %b0,%h0" /* swap higher bytes */ + :"=q" (x) + : "0" (x)); +#endif + return x; +} + +static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val) +{ + union { + struct { __u32 a,b; } s; + __u64 u; + } v; + v.u = val; +#ifdef CONFIG_X86_BSWAP + asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + : "=r" (v.s.a), "=r" (v.s.b) + : "0" (v.s.a), "1" (v.s.b)); +#else + v.s.a = ___arch__swab32(v.s.a); + v.s.b = ___arch__swab32(v.s.b); + asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); +#endif + return v.u; +} + +/* Do not define swab16. Gcc is smart enough to recognize "C" version and + convert it into rotation or exhange. */ + +#define __arch__swab64(x) ___arch__swab64(x) +#define __arch__swab32(x) ___arch__swab32(x) + +#define __BYTEORDER_HAS_U64__ + +#endif /* __GNUC__ */ + +//#include "little_endian.h" + +#endif /* _I386_BYTEORDER_H */ _____ Modified: trunk/rosapps/sysutils/dosfsck/byteswap.h --- trunk/rosapps/sysutils/dosfsck/byteswap.h 2005-07-29 23:03:12 UTC (rev 16886) +++ trunk/rosapps/sysutils/dosfsck/byteswap.h 2005-07-29 23:03:42 UTC (rev 16887) @@ -1,40 +1,40 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _BYTESWAP_H -#define _BYTESWAP_H 1 - -/* Get the machine specific, optimized definitions. */ -#include "byteswap1.h" - - -/* The following definitions must all be macros since otherwise some - of the possible optimizations are not possible. */ - -/* Return a value with all bytes in the 16 bit argument swapped. */ -#define bswap_16(x) __bswap_16 (x) - -/* Return a value with all bytes in the 32 bit argument swapped. */ -#define bswap_32(x) __bswap_32 (x) - -#if defined __GNUC__ && __GNUC__ >= 2 -/* Return a value with all bytes in the 64 bit argument swapped. */ -# define bswap_64(x) __bswap_64 (x) -#endif - -#endif /* byteswap.h */ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _BYTESWAP_H +#define _BYTESWAP_H 1 + +/* Get the machine specific, optimized definitions. */ +#include "byteswap1.h" + + +/* The following definitions must all be macros since otherwise some + of the possible optimizations are not possible. */ + +/* Return a value with all bytes in the 16 bit argument swapped. */ +#define bswap_16(x) __bswap_16 (x) + +/* Return a value with all bytes in the 32 bit argument swapped. */ +#define bswap_32(x) __bswap_32 (x) + +#if defined __GNUC__ && __GNUC__ >= 2 +/* Return a value with all bytes in the 64 bit argument swapped. */ +# define bswap_64(x) __bswap_64 (x) +#endif + +#endif /* byteswap.h */ _____ Modified: trunk/rosapps/sysutils/dosfsck/byteswap1.h --- trunk/rosapps/sysutils/dosfsck/byteswap1.h 2005-07-29 23:03:12 UTC (rev 16886) +++ trunk/rosapps/sysutils/dosfsck/byteswap1.h 2005-07-29 23:03:42 UTC (rev 16887) @@ -1,133 +1,133 @@ -/* Macros to swap the order of bytes in integer values. - Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of [truncated at 1000 lines; 8837 more skipped]

19 years, 6 months

[weiden] 16886: - simplified BasepAnsiStringToHeapUnicodeString

by weiden＠svn.reactos.com

- simplified BasepAnsiStringToHeapUnicodeString - fixed linking (global variable Basep8BitStringToUnicodeString was missing) - fixed typo in the debug print in SetThreadUILanguage Modified: trunk/reactos/lib/kernel32/misc/utils.c Modified: trunk/reactos/lib/kernel32/thread/thread.c _____ Modified: trunk/reactos/lib/kernel32/misc/utils.c --- trunk/reactos/lib/kernel32/misc/utils.c 2005-07-29 23:01:16 UTC (rev 16885) +++ trunk/reactos/lib/kernel32/misc/utils.c 2005-07-29 23:03:12 UTC (rev 16886) @@ -13,6 +13,10 @@ #define NDEBUG #include "../include/debug.h" +/* GLOBALS ******************************************************************/ + +PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; + /* FUNCTIONS ****************************************************************/ /* @@ -73,8 +77,8 @@ return StaticString; } -NTSTATUS -STDCALL +NTSTATUS +STDCALL Basep8BitStringToHeapUnicodeString(OUT PUNICODE_STRING UnicodeString, IN LPCSTR String) { @@ -104,7 +108,7 @@ VOID STDCALL BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString, - IN LPWSTR* UnicodeString) + OUT LPWSTR* UnicodeString) { ANSI_STRING AnsiTemp; UNICODE_STRING UnicodeTemp; @@ -114,17 +118,16 @@ /* First create the ANSI_STRING */ RtlInitAnsiString(&AnsiTemp, AnsiString); - /* Now get the size needed */ - UnicodeTemp.MaximumLength = RtlAnsiStringToUnicodeSize(&AnsiTemp); - - /* Allocate space from the Heap for the string */ - *UnicodeString = RtlAllocateHeap(GetProcessHeap(), - 0, - UnicodeTemp.MaximumLength); - - /* Save the buffer and convert */ - UnicodeTemp.Buffer = *UnicodeString; - RtlAnsiStringToUnicodeString(&UnicodeTemp, &AnsiTemp, FALSE); + if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&UnicodeTemp, + &AnsiTemp, + TRUE))) + { + *UnicodeString = UnicodeTemp.Buffer; + } + else + { + *UnicodeString = NULL; + } } /* _____ Modified: trunk/reactos/lib/kernel32/thread/thread.c --- trunk/reactos/lib/kernel32/thread/thread.c 2005-07-29 23:01:16 UTC (rev 16885) +++ trunk/reactos/lib/kernel32/thread/thread.c 2005-07-29 23:03:12 UTC (rev 16886) @@ -739,7 +739,7 @@ LANGID STDCALL SetThreadUILanguage(WORD wReserved) { - DPRINT1("SetThreadUILanguage(0x%2x) unimplemented!\n", wReserved); + DPRINT1("SetThreadUILanguage(0x%4x) unimplemented!\n", wReserved); return 0; }

19 years, 6 months

[sedwards] 16885: turn on command options

by sedwards＠svn.reactos.com

turn on command options Modified: trunk/rosapps/sysutils/dosfsck/Makefile Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.c _____ Modified: trunk/rosapps/sysutils/dosfsck/Makefile --- trunk/rosapps/sysutils/dosfsck/Makefile 2005-07-29 22:53:33 UTC (rev 16884) +++ trunk/rosapps/sysutils/dosfsck/Makefile 2005-07-29 23:01:16 UTC (rev 16885) @@ -1,5 +1,5 @@ CC=mingw32-gcc -OBJECTS = boot.o check.o common.o dosfsck.o fat.o file.o io.o lfn.o +OBJECTS = getopt.o boot.o check.o common.o dosfsck.o fat.o file.o io.o lfn.o all: dosfsck.exe _____ Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.c --- trunk/rosapps/sysutils/dosfsck/dosfsck.c 2005-07-29 22:53:33 UTC (rev 16884) +++ trunk/rosapps/sysutils/dosfsck/dosfsck.c 2005-07-29 23:01:16 UTC (rev 16885) @@ -12,8 +12,8 @@ #include <stdlib.h> #include <string.h> #include <stdlib.h> -//#include <unistd.h> -//#include <getopt.h> +#include <unistd.h> +#include <getopt.h> #include "common.h" #include "dosfsck.h" @@ -81,8 +81,7 @@ int main(int argc,char **argv) -{ - int optind; +{ DOS_FS fs; int rw,salvage_files,verify,c; unsigned long free_clusters; @@ -90,12 +89,7 @@ rw = salvage_files = verify = 0; interactive = 1; check_atari(); - -#if 1 - optind = 1; - verbose = 1; - list = 1; -#else + while ((c = getopt(argc,argv,"Aad:flnrtu:vVwy")) != EOF) switch (c) { case 'A': /* toggle Atari format */ @@ -149,7 +143,6 @@ exit(2); } if (optind != argc-1) usage(argv[0]); -#endif printf( "dosfsck " VERSION ", " VERSION_DATE ", FAT32, LFN\n" ); fs_open(argv[optind],rw);

19 years, 6 months

[sedwards] 16884: imported mkdosfs, added getopt.c for use with dosfsck

by sedwards＠svn.reactos.com

imported mkdosfs, added getopt.c for use with dosfsck Added: trunk/rosapps/sysutils/dosfsck/getopt.c Deleted: trunk/rosapps/sysutils/dosfsck/mkdosfs.c Added: trunk/rosapps/sysutils/mkdosfs/ Added: trunk/rosapps/sysutils/mkdosfs/.cvsignore Added: trunk/rosapps/sysutils/mkdosfs/ANNOUNCE Added: trunk/rosapps/sysutils/mkdosfs/COPYING Added: trunk/rosapps/sysutils/mkdosfs/ChangeLog Added: trunk/rosapps/sysutils/mkdosfs/Makefile Added: trunk/rosapps/sysutils/mkdosfs/README Added: trunk/rosapps/sysutils/mkdosfs/getopt.c Added: trunk/rosapps/sysutils/mkdosfs/mkdosfs-ygg-0.3b.lsm Added: trunk/rosapps/sysutils/mkdosfs/mkdosfs.8 Added: trunk/rosapps/sysutils/mkdosfs/mkdosfs.c Added: trunk/rosapps/sysutils/mkdosfs/mkdosfs.dsp Added: trunk/rosapps/sysutils/mkdosfs/mkdosfs.dsw Added: trunk/rosapps/sysutils/mkdosfs/mkdosfs.plg _____ Added: trunk/rosapps/sysutils/dosfsck/getopt.c --- trunk/rosapps/sysutils/dosfsck/getopt.c 2005-07-29 22:22:12 UTC (rev 16883) +++ trunk/rosapps/sysutils/dosfsck/getopt.c 2005-07-29 22:53:33 UTC (rev 16884) @@ -0,0 +1,63 @@ +/* + * $Id$ + * This is an unpublished work copyright (c) 1998 HELIOS Software GmbH + * 30827 Garbsen, Germany + */ + + +#include <stdio.h> +#include <string.h> +#ifdef HAS_UNISTD +# include <unistd.h> +#endif + +char *optarg; +int optind = 1; +int opterr = 1; +int optopt; +static int subopt; +static int suboptind = 1; + +int getopt(int argc, char *const argv[], const char * optstring) +{ + char *curopt; + char *p; + int cursubopt; + + if (suboptind == optind-1 && argv[suboptind][subopt] != '\0') { + curopt = (char *)argv[suboptind]; + } else { + curopt = (char *)argv[optind]; + if (curopt == NULL || curopt[0] != '-' || strcmp(curopt, "-") == 0) + return -1; + suboptind = optind; + subopt = 1; + optind++; + if (strcmp(curopt, "--") == 0) + return -1; + } + cursubopt = subopt++; + if ((p = strchr(optstring, curopt[cursubopt])) == NULL) { + optopt = curopt[cursubopt]; + if (opterr) + fprintf(stderr, "%s: illegal option -- %c\n", argv[0], optopt); + return '?'; + } + if (p[1] == ':') { + if (curopt[cursubopt+1] != '\0') { + optarg = curopt+cursubopt+1; + suboptind++; + return p[0]; + } + if (argv[optind] == NULL) { + optopt = p[0]; + if (opterr) + fprintf(stderr, "%s: option requires an argument -- %c\n", argv[0], optopt); + if (*optstring == ':') + return ':'; + return '?'; + } + optarg = argv[optind++]; + } + return p[0]; +} _____ Deleted: trunk/rosapps/sysutils/dosfsck/mkdosfs.c --- trunk/rosapps/sysutils/dosfsck/mkdosfs.c 2005-07-29 22:22:12 UTC (rev 16883) +++ trunk/rosapps/sysutils/dosfsck/mkdosfs.c 2005-07-29 22:53:33 UTC (rev 16884) @@ -1,2072 +0,0 @@ -/* - Filename: mkdosfs.c - Version: 0.3b (Yggdrasil) - Author: Dave Hudson - Started: 24th August 1994 - Last Updated: 7th May 1998 - Updated by: Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> - Target O/S: Linux (2.x) - - Description: Utility to allow an MS-DOS filesystem to be created - under Linux. A lot of the basic structure of this program has been - borrowed from Remy Card's "mke2fs" code. - - As far as possible the aim here is to make the "mkdosfs" command - look almost identical to the other Linux filesystem make utilties, - eg bad blocks are still specified as blocks, not sectors, but when - it comes down to it, DOS is tied to the idea of a sector (512 bytes - as a rule), and not the block. For example the boot block does not - occupy a full cluster. - - Fixes/additions May 1998 by Roman Hodek - <Roman.Hodek(a)informatik.uni-erlangen.de>: - - Atari format support - - New options -A, -S, -C - - Support for filesystems > 2GB - - FAT32 support - - Port to work under Windows NT/2K/XP Dec 2002 by - Jens-Uwe Mager <jum(a)anubis.han.de> - - Copying: Copyright 1993, 1994 David Hudson (dave(a)humbug.demon.co.uk) - - Portions copyright 1992, 1993 Remy Card (card(a)masi.ibp.fr) - and 1991 Linus Torvalds (torvalds(a)klaava.helsinki.fi) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -/* Include the header files */ - -//#include "../version.h" -#define VERSION "test" -#define VERSION_DATE __DATE__ - -#ifdef _WIN32 -#define _WIN32_WINNT 0x0400 -#include <windows.h> -#include <winioctl.h> -#define __LITTLE_ENDIAN 1234 -#define __BIG_ENDIAN 4321 -#define __BYTE_ORDER __LITTLE_ENDIAN -#define inline -#define __attribute__(x) -#define BLOCK_SIZE 512 -#else -#include <linux/hdreg.h> -#include <linux/fs.h> -#include <linux/fd.h> -#include <endian.h> -#include <mntent.h> -#include <signal.h> -#include <sys/ioctl.h> -#include <unistd.h> -#endif -#include <fcntl.h> -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <time.h> - -#if __BYTE_ORDER == __BIG_ENDIAN - -#include <asm/byteorder.h> -#ifdef __le16_to_cpu -/* ++roman: 2.1 kernel headers define these function, they're probably more - * efficient then coding the swaps machine-independently. */ -#define CF_LE_W __le16_to_cpu -#define CF_LE_L __le32_to_cpu -#define CT_LE_W __cpu_to_le16 -#define CT_LE_L __cpu_to_le32 -#else -#define CF_LE_W(v) ((((v) & 0xff) << 8) | (((v) >> 8) & 0xff)) -#define CF_LE_L(v) (((unsigned)(v)>>24) | (((unsigned)(v)>>8)&0xff00) | \ - (((unsigned)(v)<<8)&0xff0000) | ((unsigned)(v)<<24)) -#define CT_LE_W(v) CF_LE_W(v) -#define CT_LE_L(v) CF_LE_L(v) -#endif /* defined(__le16_to_cpu) */ - -#else - -#define CF_LE_W(v) (v) -#define CF_LE_L(v) (v) -#define CT_LE_W(v) (v) -#define CT_LE_L(v) (v) - -#endif /* __BIG_ENDIAN */ - -#ifdef _WIN32 - -typedef unsigned char __u8; -typedef unsigned short __u16; -typedef unsigned int __u32; -typedef unsigned __int64 __u64; -typedef __int64 loff_t; -typedef __int64 ll_t; - -extern char *optarg; -extern int optind; -extern int opterr; -extern int optopt; -int getopt(int argc, char *const argv[], const char * optstring); - -static int is_device = 0; - -#define open WIN32open -#define close WIN32close -#define read WIN32read -#define write WIN32write -#define llseek WIN32llseek - -#define O_SHORT_LIVED _O_SHORT_LIVED -#define O_ACCMODE 3 -#define O_NONE 3 -#define O_BACKUP 0x10000 -#define O_SHARED 0x20000 - -static int WIN32open(const char *path, int oflag, ...) -{ - HANDLE fh; - DWORD desiredAccess; - DWORD shareMode; - DWORD creationDisposition; - DWORD flagsAttributes = FILE_ATTRIBUTE_NORMAL; - SECURITY_ATTRIBUTES securityAttributes; - va_list ap; - int pmode; - int trunc = FALSE; - - securityAttributes.nLength = sizeof(securityAttributes); - securityAttributes.lpSecurityDescriptor = NULL; - securityAttributes.bInheritHandle = oflag & O_NOINHERIT ? FALSE : TRUE; - switch (oflag & O_ACCMODE) { - case O_RDONLY: - desiredAccess = GENERIC_READ; - shareMode = FILE_SHARE_READ; - break; - case O_WRONLY: - desiredAccess = GENERIC_WRITE; - shareMode = 0; - break; - case O_RDWR: - desiredAccess = GENERIC_READ|GENERIC_WRITE; - shareMode = 0; - break; - case O_NONE: - desiredAccess = 0; - shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE; - } - if (oflag & O_APPEND) { - desiredAccess |= FILE_APPEND_DATA|SYNCHRONIZE; - shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE; - } - if (oflag & O_SHARED) - shareMode |= FILE_SHARE_READ|FILE_SHARE_WRITE; - switch (oflag & (O_CREAT|O_EXCL|O_TRUNC)) { - case 0: - case O_EXCL: - creationDisposition = OPEN_EXISTING; - break; - case O_CREAT: - creationDisposition = OPEN_ALWAYS; - break; - case O_CREAT|O_EXCL: - case O_CREAT|O_TRUNC|O_EXCL: - creationDisposition = CREATE_NEW; - break; - case O_TRUNC: - case O_TRUNC|O_EXCL: - creationDisposition = TRUNCATE_EXISTING; - break; - case O_CREAT|O_TRUNC: - creationDisposition = OPEN_ALWAYS; - trunc = TRUE; - break; - } - if (oflag & O_CREAT) { - va_start(ap, oflag); - pmode = va_arg(ap, int); - va_end(ap); - if ((pmode & 0222) == 0) - flagsAttributes |= FILE_ATTRIBUTE_READONLY; - } - if (oflag & O_TEMPORARY) { - flagsAttributes |= FILE_FLAG_DELETE_ON_CLOSE; - desiredAccess |= DELETE; - } - if (oflag & O_SHORT_LIVED) - flagsAttributes |= FILE_ATTRIBUTE_TEMPORARY; - if (oflag & O_SEQUENTIAL) - flagsAttributes |= FILE_FLAG_SEQUENTIAL_SCAN; - else if (oflag & O_RANDOM) - flagsAttributes |= FILE_FLAG_RANDOM_ACCESS; - if (oflag & O_BACKUP) - flagsAttributes |= FILE_FLAG_BACKUP_SEMANTICS; - if ((fh = CreateFile(path, desiredAccess, shareMode, &securityAttributes, - creationDisposition, flagsAttributes, NULL)) == INVALID_HANDLE_VALUE) { - errno = GetLastError(); - return -1; - } - if (trunc) { - if (!SetEndOfFile(fh)) { - errno = GetLastError(); - CloseHandle(fh); - DeleteFile(path); - return -1; - } - } - return (int)fh; -} - -static int WIN32close(int fd) -{ - if (!CloseHandle((HANDLE)fd)) { - errno = GetLastError(); - return -1; - } - return 0; -} - -static int WIN32read(int fd, void *buf, unsigned int len) -{ - DWORD actualLen; - - if (!ReadFile((HANDLE)fd, buf, (DWORD)len, &actualLen, NULL)) { - errno = GetLastError(); - if (errno == ERROR_BROKEN_PIPE) - return 0; - else - return -1; - } - return (int)actualLen; -} - -static int WIN32write(int fd, void *buf, unsigned int len) -{ - DWORD actualLen; - - if (!WriteFile((HANDLE)fd, buf, (DWORD)len, &actualLen, NULL)) { - errno = GetLastError(); - return -1; - } - return (int)actualLen; -} - -static loff_t WIN32llseek(int fd, loff_t offset, int whence) -{ - long lo, hi; - DWORD err; - - lo = offset & 0xffffffff; - hi = offset >> 32; - lo = SetFilePointer((HANDLE)fd, lo, &hi, whence); - if (lo == 0xFFFFFFFF && (err = GetLastError()) != NO_ERROR) { - errno = err; - return -1; - } - return ((loff_t)hi << 32) | (off_t)lo; -} - -int fsctl(int fd, int code) -{ - DWORD ret; - if (!DeviceIoControl((HANDLE)fd, code, NULL, 0, NULL, 0, &ret, NULL)) { - errno = GetLastError(); - return -1; - } - return 0; -} - -#else - -#define O_NOINHERIT 0 -#define O_TEMPORARY 0 -#define O_SHORT_LIVED 0 -#define O_SEQUENTIAL 0 -#define O_RANDOM 0 -#define O_BACKUP 0 -#define O_SHARED 0 -#ifndef O_NONE -# define O_NONE 0 -#endif - -typedef long long ll_t; -/* Use the _llseek system call directly, because there (once?) was a bug in - * the glibc implementation of it. */ -#include <linux/unistd.h> -#if defined(__alpha) || defined(__ia64__) -/* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ -static loff_t llseek( int fd, loff_t offset, int whence ) -{ - return lseek(fd, offset, whence); -} -#else -# ifndef __NR__llseek -# error _llseek system call not present -# endif -static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo, - loff_t *, res, uint, wh ); -static loff_t llseek( int fd, loff_t offset, int whence ) -{ - loff_t actual; - - if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0) - return (loff_t)-1; - return actual; -} -#endif - -#endif - -/* Constant definitions */ - -#define TRUE 1 /* Boolean constants */ -#define FALSE 0 - -#define TEST_BUFFER_BLOCKS 16 -#define HARD_SECTOR_SIZE 512 -#define SECTORS_PER_BLOCK ( BLOCK_SIZE / HARD_SECTOR_SIZE ) - - -/* Macro definitions */ - -/* Report a failure message and return a failure error code */ - -#define die( str ) fatal_error( "%s: " str "\n" ) - - -/* Mark a cluster in the FAT as bad */ - -#define mark_sector_bad( sector ) mark_FAT_sector( sector, FAT_BAD ) - -/* Compute ceil(a/b) */ - -inline int -cdiv (int a, int b) -{ - return (a + b - 1) / b; -} - -/* MS-DOS filesystem structures -- I included them here instead of - including linux/msdos_fs.h since that doesn't include some fields we - need */ - -#define ATTR_RO 1 /* read-only */ -#define ATTR_HIDDEN 2 /* hidden */ -#define ATTR_SYS 4 /* system */ -#define ATTR_VOLUME 8 /* volume label */ -#define ATTR_DIR 16 /* directory */ -#define ATTR_ARCH 32 /* archived */ - -#define ATTR_NONE 0 /* no attribute bits */ -#define ATTR_UNUSED (ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN) - /* attribute bits that are copied "as is" */ - -/* FAT values */ -#define FAT_EOF (atari_format ? 0x0fffffff : 0x0ffffff8) -#define FAT_BAD 0x0ffffff7 - -#define MSDOS_EXT_SIGN 0x29 /* extended boot sector signature */ -#define MSDOS_FAT12_SIGN "FAT12 " /* FAT12 filesystem signature */ -#define MSDOS_FAT16_SIGN "FAT16 " /* FAT16 filesystem signature */ -#define MSDOS_FAT32_SIGN "FAT32 " /* FAT32 filesystem signature */ - -#define BOOT_SIGN 0xAA55 /* Boot sector magic number */ - -#define MAX_CLUST_12 ((1 << 12) - 16) -#define MAX_CLUST_16 ((1 << 16) - 16) -/* M$ says the high 4 bits of a FAT32 FAT entry are reserved and don't belong - * to the cluster number. So the max. cluster# is based on 2^28 */ -#define MAX_CLUST_32 ((1 << 28) - 16) - -#define FAT12_THRESHOLD 4078 - -#define OLDGEMDOS_MAX_SECTORS 32765 -#define GEMDOS_MAX_SECTORS 65531 -#define GEMDOS_MAX_SECTOR_SIZE (16*1024) - -#define BOOTCODE_SIZE 448 -#define BOOTCODE_FAT32_SIZE 420 - -/* __attribute__ ((packed)) is used on all structures to make gcc ignore any - * alignments */ - -#ifdef _WIN32 -#pragma pack(push, 1) -#endif -struct msdos_volume_info { - __u8 drive_number; /* BIOS drive number */ - __u8 RESERVED; /* Unused */ - __u8 ext_boot_sign; /* 0x29 if fields below exist (DOS 3.3+) */ - __u8 volume_id[4]; /* Volume ID number */ - __u8 volume_label[11];/* Volume label */ - __u8 fs_type[8]; /* Typically FAT12 or FAT16 */ -} __attribute__ ((packed)); - -struct msdos_boot_sector -{ - __u8 boot_jump[3]; /* Boot strap short or near jump */ - __u8 system_id[8]; /* Name - can be used to special case - partition manager volumes */ - __u8 sector_size[2]; /* bytes per logical sector */ - __u8 cluster_size; /* sectors/cluster */ - __u16 reserved; /* reserved sectors */ - __u8 fats; /* number of FATs */ - __u8 dir_entries[2]; /* root directory entries */ - __u8 sectors[2]; /* number of sectors */ - __u8 media; /* media code (unused) */ - __u16 fat_length; /* sectors/FAT */ - __u16 secs_track; /* sectors per track */ - __u16 heads; /* number of heads */ - __u32 hidden; /* hidden sectors (unused) */ - __u32 total_sect; /* number of sectors (if sectors == 0) */ - union { - struct { - struct msdos_volume_info vi; - __u8 boot_code[BOOTCODE_SIZE]; - } __attribute__ ((packed)) _oldfat; - struct { - __u32 fat32_length; /* sectors/FAT */ - __u16 flags; /* bit 8: fat mirroring, low 4: active fat */ - __u8 version[2]; /* major, minor filesystem version */ - __u32 root_cluster; /* first cluster in root directory */ - __u16 info_sector; /* filesystem info sector */ - __u16 backup_boot; /* backup boot sector */ - __u16 reserved2[6]; /* Unused */ - struct msdos_volume_info vi; - __u8 boot_code[BOOTCODE_FAT32_SIZE]; - } __attribute__ ((packed)) _fat32; - } __attribute__ ((packed)) fstype; - __u16 boot_sign; -} __attribute__ ((packed)); -#define fat32 fstype._fat32 -#define oldfat fstype._oldfat - -struct fat32_fsinfo { - __u32 reserved1; /* Nothing as far as I can tell */ - __u32 signature; /* 0x61417272L */ - __u32 free_clusters; /* Free cluster count. -1 if unknown */ - __u32 next_cluster; /* Most recently allocated cluster. - * Unused under Linux. */ - __u32 reserved2[4]; -}; - -struct msdos_dir_entry - { - char name[8], ext[3]; /* name and extension */ - __u8 attr; /* attribute bits */ - __u8 lcase; /* Case for base and extension */ - __u8 ctime_ms; /* Creation time, milliseconds */ - __u16 ctime; /* Creation time */ - __u16 cdate; /* Creation date */ - __u16 adate; /* Last access date */ - __u16 starthi; /* high 16 bits of first cl. (FAT32) */ - __u16 time, date, start; /* time, date and first cluster */ - __u32 size; /* file size (in bytes) */ - } __attribute__ ((packed)); - -#ifdef _WIN32 -#pragma pack(pop) -#endif - -/* The "boot code" we put into the filesystem... it writes a message and - tells the user to try again */ - -char dummy_boot_jump[3] = { 0xeb, 0x3c, 0x90 }; - -char dummy_boot_jump_m68k[2] = { 0x60, 0x1c }; - -char dummy_boot_code[BOOTCODE_SIZE] = - "\x0e" /* push cs */ - "\x1f" /* pop ds */ - "\xbe\x5b\x7c" /* mov si, offset message_txt */ - /* write_msg: */ - "\xac" /* lodsb */ - "\x22\xc0" /* and al, al */ - "\x74\x0b" /* jz key_press */ - "\x56" /* push si */ - "\xb4\x0e" /* mov ah, 0eh */ - "\xbb\x07\x00" /* mov bx, 0007h */ - "\xcd\x10" /* int 10h */ - "\x5e" /* pop si */ - "\xeb\xf0" /* jmp write_msg */ - /* key_press: */ - "\x32\xe4" /* xor ah, ah */ - "\xcd\x16" /* int 16h */ - "\xcd\x19" /* int 19h */ - "\xeb\xfe" /* foo: jmp foo */ - /* message_txt: */ - - "This is not a bootable disk. Please insert a bootable floppy and\r\n" - "press any key to try again ... \r\n"; - -#define MESSAGE_OFFSET 29 /* Offset of message in above code */ - -/* Global variables - the root of all evil :-) - see these and weep! */ - -static char *program_name = "mkdosfs"; /* Name of the program */ -static char *device_name = NULL; /* Name of the device on which to create the filesystem */ -static int atari_format = 0; /* Use Atari variation of MS-DOS FS format */ -static int check = FALSE; /* Default to no readablity checking */ -static int verbose = 0; /* Default to verbose mode off */ -static long volume_id; /* Volume ID number */ -static time_t create_time; /* Creation time */ -static char volume_name[] = " "; /* Volume name */ -static int blocks; /* Number of blocks in filesystem */ -static int sector_size = 512; /* Size of a logical sector */ -static int sector_size_set = 0; /* User selected sector size */ -static int backup_boot = 0; /* Sector# of backup boot sector */ -static int reserved_sectors = 0;/* Number of reserved sectors */ -static int badblocks = 0; /* Number of bad blocks in the filesystem */ -static int nr_fats = 2; /* Default number of FATs to produce */ -static int size_fat = 0; /* Size in bits of FAT entries */ -static int size_fat_by_user = 0; /* 1 if FAT size user selected */ -static int dev = -1; /* FS block device file handle */ -static int ignore_full_disk = 0; /* Ignore warning about 'full' disk devices */ -static unsigned int currently_testing = 0; /* Block currently being tested (if autodetect bad blocks) */ -static struct msdos_boot_sector bs; /* Boot sector data */ -static int start_data_sector; /* Sector number for the start of the data area */ -static int start_data_block; /* Block number for the start of the data area */ -static unsigned char *fat; /* File allocation table */ -static unsigned char *info_sector; /* FAT32 info sector */ -static struct msdos_dir_entry *root_dir; /* Root directory */ -static int size_root_dir; /* Size of the root directory in bytes */ -static int sectors_per_cluster = 0; /* Number of sectors per disk cluster */ -static int root_dir_entries = 0; /* Number of root directory entries */ -static char *blank_sector; /* Blank sector - all zeros */ - - -/* Function prototype definitions */ - -static void fatal_error (const char *fmt_string) __attribute__((noreturn)); -static void mark_FAT_cluster (int cluster, unsigned int value); -static void mark_FAT_sector (int sector, unsigned int value); -static long do_check (char *buffer, int try, unsigned int current_block); -static void alarm_intr (int alnum); -static void check_blocks (void); -static void get_list_blocks (char *filename); -static int valid_offset (int fd, loff_t offset); -static int count_blocks (char *filename); -static void check_mount (char *device_name); -#ifdef _WIN32 -static void establish_params (void); -#else -static void establish_params (int device_num, int size); -#endif -static void setup_tables (void); -static void write_tables (void); - - -/* The function implementations */ - -/* Handle the reporting of fatal errors. Volatile to let gcc know that this doesn't return */ - -static void -fatal_error (const char *fmt_string) -{ - fprintf (stderr, fmt_string, program_name, device_name); - exit (1); /* The error exit code is 1! */ -} - - -/* Mark the specified cluster as having a particular value */ - -static void -mark_FAT_cluster (int cluster, unsigned int value) -{ - switch( size_fat ) { - case 12: - value &= 0x0fff; - if (((cluster * 3) & 0x1) == 0) - { - fat[3 * cluster / 2] = (unsigned char) (value & 0x00ff); - fat[(3 * cluster / 2) + 1] = (unsigned char) ((fat[(3 * cluster / 2) + 1] & 0x00f0) - | ((value & 0x0f00) >> 8)); - } - else - { - fat[3 * cluster / 2] = (unsigned char) ((fat[3 * cluster / 2] & 0x000f) | ((value & 0x000f) << 4)); - fat[(3 * cluster / 2) + 1] = (unsigned char) ((value & 0x0ff0) >> 4); - } - break; - - case 16: - value &= 0xffff; - fat[2 * cluster] = (unsigned char) (value & 0x00ff); - fat[(2 * cluster) + 1] = (unsigned char) (value >> 8); - break; - - case 32: - value &= 0xfffffff; - fat[4 * cluster] = (unsigned char) (value & 0x000000ff); - fat[(4 * cluster) + 1] = (unsigned char) ((value & 0x0000ff00) >> 8); - fat[(4 * cluster) + 2] = (unsigned char) ((value & 0x00ff0000) >> 16); - fat[(4 * cluster) + 3] = (unsigned char) ((value & 0xff000000) >> 24); - break; - - default: - die("Bad FAT size (not 12, 16, or 32)"); - } -} - - -/* Mark a specified sector as having a particular value in it's FAT entry */ - -static void -mark_FAT_sector (int sector, unsigned int value) -{ - int cluster; - - cluster = (sector - start_data_sector) / (int) (bs.cluster_size) / - (sector_size/HARD_SECTOR_SIZE); - if (cluster < 0) - die ("Invalid cluster number in mark_FAT_sector: probably bug!"); - - mark_FAT_cluster (cluster, value); -} - - -/* Perform a test on a block. Return the number of blocks that could be read successfully */ - -static long -do_check (char *buffer, int try, unsigned int current_block) -{ - long got; - - if (llseek (dev, (loff_t)current_block * BLOCK_SIZE, SEEK_SET) /* Seek to the correct location */ - != (loff_t)current_block * BLOCK_SIZE) - die ("seek failed during testing for blocks"); - - got = read (dev, buffer, try * BLOCK_SIZE); /* Try reading! */ - if (got < 0) - got = 0; - - if (got & (BLOCK_SIZE - 1)) - printf ("Unexpected values in do_check: probably bugs\n"); - got /= BLOCK_SIZE; - - return got; -} - -#ifndef _WIN32 -/* Alarm clock handler - display the status of the quest for bad blocks! Then retrigger the alarm for five senconds - later (so we can come here again) */ - -static void -alarm_intr (int alnum) -{ - if (currently_testing >= blocks) - return; - - signal (SIGALRM, alarm_intr); - alarm (5); - if (!currently_testing) - return; - - printf ("%d... ", currently_testing); - fflush (stdout); -} -#endif - -static void -check_blocks (void) -{ - int try, got; - int i; - static char blkbuf[BLOCK_SIZE * TEST_BUFFER_BLOCKS]; - - if (verbose) - { - printf ("Searching for bad blocks "); - fflush (stdout); - } - currently_testing = 0; -#ifndef _WIN32 - if (verbose) - { - signal (SIGALRM, alarm_intr); - alarm (5); - } -#endif - try = TEST_BUFFER_BLOCKS; - while (currently_testing < blocks) - { - if (currently_testing + try > blocks) - try = blocks - currently_testing; - got = do_check (blkbuf, try, currently_testing); - currently_testing += got; - if (got == try) - { - try = TEST_BUFFER_BLOCKS; - continue; - } - else - try = 1; - if (currently_testing < start_data_block) - die ("bad blocks before data-area: cannot make fs"); - - for (i = 0; i < SECTORS_PER_BLOCK; i++) /* Mark all of the sectors in the block as bad */ - mark_sector_bad (currently_testing * SECTORS_PER_BLOCK + i); - badblocks++; - currently_testing++; - } - - if (verbose) - printf ("\n"); - - if (badblocks) - printf ("%d bad block%s\n", badblocks, - (badblocks > 1) ? "s" : ""); -} - - -static void -get_list_blocks (char *filename) -{ - int i; - FILE *listfile; - unsigned long blockno; - - listfile = fopen (filename, "r"); - if (listfile == (FILE *) NULL) - die ("Can't open file of bad blocks"); - - while (!feof (listfile)) - { - fscanf (listfile, "%ld\n", &blockno); - for (i = 0; i < SECTORS_PER_BLOCK; i++) /* Mark all of the sectors in the block as bad */ - mark_sector_bad (blockno * SECTORS_PER_BLOCK + i); - badblocks++; - } - fclose (listfile); - - if (badblocks) - printf ("%d bad block%s\n", badblocks, - (badblocks > 1) ? "s" : ""); -} - - -#ifndef _WIN32 -/* Given a file descriptor and an offset, check whether the offset is a valid offset for the file - return FALSE if it - isn't valid or TRUE if it is */ - -static int -valid_offset (int fd, loff_t offset) -{ - char ch; - - if (llseek (fd, offset, SEEK_SET) < 0) - return FALSE; - if (read (fd, &ch, 1) < 1) - return FALSE; - return TRUE; -} -#endif - - -/* Given a filename, look to see how many blocks of BLOCK_SIZE are present, returning the answer */ - -static int -count_blocks (char *filename) -{ -#ifdef _WIN32 - int fd; - DISK_GEOMETRY geom; - BY_HANDLE_FILE_INFORMATION hinfo; - DWORD ret; - loff_t len = 0; - - if ((fd = open(filename, O_RDONLY)) < 0) { - perror(filename); - exit(1); - } - /* - * This should probably use IOCTL_DISK_GET_LENGTH_INFO here, but - * this ioctl is only available in XP and up. - */ - if (is_device) { - if (!DeviceIoControl((HANDLE)fd, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &geom, sizeof(geom), &ret, NULL)) { - errno = GetLastError(); - die("unable to get length for '%s'"); - } - len = geom.Cylinders.QuadPart*geom.TracksPerCylinder*geom.SectorsPerTrack*BLOC K_SIZE; - } else { - if (!GetFileInformationByHandle((HANDLE)fd, &hinfo)) { - errno = GetLastError(); - die("unable to get length for '%s'"); - } - len = ((loff_t)hinfo.nFileSizeHigh << 32) | (loff_t)hinfo.nFileSizeLow; - } - close(fd); - return len/BLOCK_SIZE; -#else - loff_t high, low; - int fd; - - if ((fd = open (filename, O_RDONLY)) < 0) - { - perror (filename); - exit (1); - } - low = 0; - - for (high = 1; valid_offset (fd, high); high *= 2) - low = high; - while (low < high - 1) - { - const loff_t mid = (low + high) / 2; - - if (valid_offset (fd, mid)) - low = mid; - else - high = mid; - } - valid_offset (fd, 0); - close (fd); - - return (low + 1) / BLOCK_SIZE; -#endif -} - - -/* Check to see if the specified device is currently mounted - abort if it is */ - -static void -check_mount (char *device_name) -{ -#ifndef _WIN32 - FILE *f; - struct mntent *mnt; - - if ((f = setmntent (MOUNTED, "r")) == NULL) - return; - while ((mnt = getmntent (f)) != NULL) - if (strcmp (device_name, mnt->mnt_fsname) == 0) - die ("%s contains a mounted file system."); - endmntent (f); -#endif -} - - -/* Establish the geometry and media parameters for the device */ -#ifdef _WIN32 -static void -establish_params (void) -{ - DISK_GEOMETRY geometry; - DWORD ret; - - if (!is_device) { - bs.media = (char) 0xf8; /* Set up the media descriptor for a hard drive */ - bs.dir_entries[0] = (char) 0; - bs.dir_entries[1] = (char) 2; - /* For FAT32, use 4k clusters on sufficiently large file systems, - * otherwise 1 sector per cluster. This is also what M$'s format - * command does for FAT32. */ - bs.cluster_size = (char) - (size_fat == 32 ? - ((ll_t)blocks*SECTORS_PER_BLOCK >= 512*1024 ? 8 : 1) : - 4); /* FAT12 and FAT16: start at 4 sectors per cluster */ - return; - } - if (!DeviceIoControl((HANDLE)dev, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &geometry, sizeof(geometry), &ret, NULL)) { - errno = GetLastError(); - die ("unable to get geometry for '%s'"); - } - bs.secs_track = geometry.SectorsPerTrack; - bs.heads = geometry.TracksPerCylinder; - switch (geometry.MediaType) { - case F3_1Pt44_512: - bs.media = (char) 0xf9; - bs.cluster_size = (char) 2; - bs.dir_entries[0] = (char) 112; - bs.dir_entries[1] = (char) 0; - break; - case F3_2Pt88_512: - bs.media = (char) 0xf0; - bs.cluster_size = (char)(atari_format ? 2 : 1); - bs.dir_entries[0] = (char) 224; - bs.dir_entries[1] = (char) 0; - break; - case F3_720_512: - bs.media = (char) 0xfd; - bs.cluster_size = (char) 2; - bs.dir_entries[0] = (char) 112; - bs.dir_entries[1] = (char) 0; - break; - default: - bs.media = (char) 0xf8; /* Set up the media descriptor for a hard drive */ - bs.dir_entries[0] = (char) 0; - bs.dir_entries[1] = (char) 2; - /* For FAT32, use 4k clusters on sufficiently large file systems, - * otherwise 1 sector per cluster. This is also what M$'s format - * command does for FAT32. */ - bs.cluster_size = (char) - (size_fat == 32 ? - ((ll_t)blocks*SECTORS_PER_BLOCK >= 512*1024 ? 8 : 1) : - 4); /* FAT12 and FAT16: start at 4 sectors per cluster */ - } -} -#else -static void -establish_params (int device_num,int size) -{ [truncated at 1000 lines; 4230 more skipped]

19 years, 6 months

[sedwards] 16883: Major fixes for partitions larger than 4GB. Thanks to Tamlin again.

by sedwards＠svn.reactos.com

Major fixes for partitions larger than 4GB. Thanks to Tamlin again. Modified: trunk/rosapps/sysutils/dosfsck/boot.c Modified: trunk/rosapps/sysutils/dosfsck/io.c _____ Modified: trunk/rosapps/sysutils/dosfsck/boot.c --- trunk/rosapps/sysutils/dosfsck/boot.c 2005-07-29 21:59:06 UTC (rev 16882) +++ trunk/rosapps/sysutils/dosfsck/boot.c 2005-07-29 22:22:12 UTC (rev 16883) @@ -272,7 +272,7 @@ unsigned total_sectors; unsigned short logical_sector_size, sectors; unsigned fat_length; - off_t data_size; + loff_t data_size; fs_read(0,sizeof(b),&b); logical_sector_size = GET_UNALIGNED_W(b.sector_size); @@ -286,7 +286,7 @@ total_sectors = sectors ? sectors : CF_LE_L(b.total_sect); if (verbose) printf("Checking we can access the last sector of the filesystem\n"); /* Can't access last odd sector anyway, so round down */ - fs_test((off_t)((total_sectors & ~1)-1)*(off_t)logical_sector_size, + fs_test((loff_t)((total_sectors & ~1)-1)*(loff_t)logical_sector_size, logical_sector_size); fat_length = CF_LE_W(b.fat_length) ? CF_LE_W(b.fat_length) : CF_LE_L(b.fat32_length); @@ -296,7 +296,7 @@ fs->root_entries = GET_UNALIGNED_W(b.dir_entries); fs->data_start = fs->root_start+ROUND_TO_MULTIPLE(fs->root_entries << MSDOS_DIR_BITS,logical_sector_size); - data_size = (off_t)total_sectors*logical_sector_size-fs->data_start; + data_size = (loff_t)total_sectors*logical_sector_size-fs->data_start; fs->clusters = data_size/fs->cluster_size; fs->root_cluster = 0; /* indicates standard, pre-FAT32 root dir */ fs->fsinfo_start = 0; /* no FSINFO structure */ _____ Modified: trunk/rosapps/sysutils/dosfsck/io.c --- trunk/rosapps/sysutils/dosfsck/io.c 2005-07-29 21:59:06 UTC (rev 16882) +++ trunk/rosapps/sysutils/dosfsck/io.c 2005-07-29 22:22:12 UTC (rev 16883) @@ -101,17 +101,22 @@ { CHANGE *walk; int got; -#if 1 // TMN: - const size_t readsize_aligned = size + (512 - (size % 512)); // TMN: - const loff_t seekpos_aligned = pos - (pos % 512); // TMN: - const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: - const size_t readsize = (pos - seekpos_aligned) + readsize_aligned; // TMN: - char* tmpBuf = malloc(readsize); // TMN: - if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); - if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %lld",size,pos); +#if 1 // TMN + const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: + const loff_t seekpos_aligned = pos - (pos % 512); // TMN: + const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: + const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: + char* tmpBuf = malloc(readsize_aligned); // TMN: +#ifdef _MSC_VER + if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",pos); + if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64dd",size,pos); +#else + if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); + if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %lld",size,pos); +#endif assert(got >= size); - got = size; - assert(seek_delta + size < readsize); + got = size; + assert(seek_delta + size <= readsize); memcpy(data, tmpBuf+seek_delta, size); free(tmpBuf); #else // TMN: @@ -122,10 +127,10 @@ for (walk = changes; walk; walk = walk->next) { if (walk->pos < pos+size && walk->pos+walk->size > pos) { if (walk->pos < pos) - memcpy(data,(char *) walk->data+pos-walk->pos,min(size, - walk->size-pos+walk->pos)); - else memcpy((char *) data+walk->pos-pos,walk->data,min(walk->size, - size+pos-walk->pos)); + memcpy(data,(char *) walk->data+pos-walk->pos,min((size_t)size, + (size_t)(walk->size-pos+walk->pos))); + else memcpy((char *) data+walk->pos-pos,walk->data,min((size_t)walk->size, + (size_t)(size+pos-walk->pos))); } } } @@ -136,10 +141,21 @@ void *scratch; int okay; +#if 1 // TMN + const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: + const loff_t seekpos_aligned = pos - (pos % 512); // TMN: + const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: + const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: + scratch = alloc(readsize_aligned); + if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); + okay = read(fd,scratch,readsize_aligned) == (int)readsize_aligned; + free(scratch); +#else // TMN: if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); scratch = alloc(size); okay = read(fd,scratch,size) == size; free(scratch); +#endif // TMN: return okay; } @@ -218,7 +234,7 @@ #define O_SHORT_LIVED _O_SHORT_LIVED -#define O_ACCMODE 3 +//#define O_ACCMODE 3 #define O_NONE 3 #define O_BACKUP 0x10000 #define O_SHARED 0x20000 @@ -368,14 +384,14 @@ long lo, hi; DWORD err; - lo = offset & 0xffffffff; - hi = offset >> 32; + lo = (long)(offset & 0xffffffff); + hi = (long)(offset >> 32); lo = SetFilePointer((HANDLE)fd, lo, &hi, whence); if (lo == 0xFFFFFFFF && (err = GetLastError()) != NO_ERROR) { errno = err; return -1; } - return ((loff_t)hi << 32) | (off_t)lo; + return ((loff_t)hi << 32) | (__u32)lo; } int fsctl(int fd, int code)

19 years, 6 months

[hbirr] 16882: - Copy all data in FindFirstFileA.

by hbirr＠svn.reactos.com

- Copy all data in FindFirstFileA. - Changed back to the old code in FindFirstFileExW, because too many things are broken or useless. Modified: trunk/reactos/lib/kernel32/file/find.c _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2005-07-29 21:55:09 UTC (rev 16881) +++ trunk/reactos/lib/kernel32/file/find.c 2005-07-29 21:59:06 UTC (rev 16882) @@ -250,6 +250,8 @@ &FileNameU, FALSE); } + memcpy(lpFindFileData, &FindFileData, offsetof(WIN32_FIND_DATAA, cFileName)); + } @@ -347,20 +349,19 @@ DWORD dwAdditionalFlags ) { + OBJECT_ATTRIBUTES ObjectAttributes; PKERNEL32_FIND_FILE_DATA IData; IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING DosFilePath; - UNICODE_STRING NtName; - UNICODE_STRING FileNameU; - UNICODE_STRING NtFilePath; + UNICODE_STRING NtPathU; + UNICODE_STRING PatternStr; + NTSTATUS Status; PWSTR e1, e2; WCHAR CurrentDir[256]; PWCHAR SlashlessFileName; PWSTR SearchPath; PWCHAR SearchPattern; ULONG Length; + BOOLEAN bResult; /* ..... @@ -375,16 +376,17 @@ lpSearchFilter, dwAdditionalFlags); - RtlInitUnicodeString(&FileNameU, lpFileName); Length = wcslen(lpFileName); if (L'\\' == lpFileName[Length - 1]) { - SlashlessFileName = RtlAllocateHeap(hProcessHeap, 0, Length * sizeof(WCHAR)); + SlashlessFileName = RtlAllocateHeap(hProcessHeap, + 0, + Length * sizeof(WCHAR)); if (NULL == SlashlessFileName) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return (INVALID_HANDLE_VALUE); + return INVALID_HANDLE_VALUE; } memcpy(SlashlessFileName, lpFileName, (Length - 1) * sizeof(WCHAR)); SlashlessFileName[Length - 1] = L'\0'; @@ -402,167 +404,176 @@ if (NULL == SearchPattern) { - CHECKPOINT; - SearchPattern = (PWCHAR)lpFileName; - Length = GetCurrentDirectoryW(sizeof(CurrentDir) / sizeof(WCHAR), SearchPath); - if (0 == Length) - { - if (NULL != SlashlessFileName) { - RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); - } - return (INVALID_HANDLE_VALUE); + CHECKPOINT; + SearchPattern = (PWCHAR)lpFileName; + Length = GetCurrentDirectoryW(sizeof(CurrentDir) / sizeof(WCHAR), SearchPath); + if (0 == Length) + { + if (NULL != SlashlessFileName) + { + RtlFreeHeap(hProcessHeap, + 0, + SlashlessFileName); + } + return INVALID_HANDLE_VALUE; } if (Length > sizeof(CurrentDir) / sizeof(WCHAR)) { - SearchPath = RtlAllocateHeap(hProcessHeap, HEAP_ZERO_MEMORY, Length * sizeof(WCHAR)); - if (NULL == SearchPath) - { - if (NULL != SlashlessFileName) { - RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return (INVALID_HANDLE_VALUE); + SearchPath = RtlAllocateHeap(hProcessHeap, + HEAP_ZERO_MEMORY, + Length * sizeof(WCHAR)); + if (NULL == SearchPath) + { + if (NULL != SlashlessFileName) + { + RtlFreeHeap(hProcessHeap, + 0, + SlashlessFileName); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; } GetCurrentDirectoryW(Length, SearchPath); } } else { - CHECKPOINT; - SearchPattern++; - Length = SearchPattern - lpFileName; - if (Length + 1 > sizeof(CurrentDir) / sizeof(WCHAR)) - { - SearchPath = RtlAllocateHeap(hProcessHeap, HEAP_ZERO_MEMORY, (Length + 1) * sizeof(WCHAR)); - if (NULL == SearchPath) { - if (NULL != SlashlessFileName) { - RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return (INVALID_HANDLE_VALUE); - } - } - memcpy(SearchPath, lpFileName, Length * sizeof(WCHAR)); - SearchPath[Length] = 0; + CHECKPOINT; + SearchPattern++; + Length = SearchPattern - lpFileName; + if (Length + 1 > sizeof(CurrentDir) / sizeof(WCHAR)) + { + SearchPath = RtlAllocateHeap(hProcessHeap, + HEAP_ZERO_MEMORY, + (Length + 1) * sizeof(WCHAR)); + if (NULL == SearchPath) + { + if (NULL != SlashlessFileName) + { + RtlFreeHeap(hProcessHeap, + 0, + SlashlessFileName); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + } + memcpy(SearchPath, lpFileName, Length * sizeof(WCHAR)); + SearchPath[Length] = 0; } - if( FALSE == RtlDosPathNameToNtPathName_U( - (PWSTR)SearchPath, - &NtName, - &DosFilePath.Buffer, - (PCURDIR)&NtFilePath - ) ) + bResult = RtlDosPathNameToNtPathName_U ((LPWSTR)SearchPath, + &NtPathU, + NULL, + NULL); + if (SearchPath != CurrentDir) { - RtlFreeHeap(hProcessHeap, 0, SearchPath); - if (NULL != SlashlessFileName) { - RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); - } - SetLastError(ERROR_PATH_NOT_FOUND); - return (INVALID_HANDLE_VALUE); + RtlFreeHeap(hProcessHeap, + 0, + SearchPath); } - - - if (SearchPath != CurrentDir) { - RtlFreeHeap(hProcessHeap, 0, SearchPath); + if (FALSE == bResult) + { + if (NULL != SlashlessFileName) + { + RtlFreeHeap(hProcessHeap, + 0, + SlashlessFileName); + } + return INVALID_HANDLE_VALUE; } - DPRINT("NtName \'%S\'\n", NtName.Buffer); + DPRINT("NtPathU \'%S\'\n", NtPathU.Buffer); IData = RtlAllocateHeap (hProcessHeap, HEAP_ZERO_MEMORY, sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); if (NULL == IData) { - RtlFreeHeap (hProcessHeap, 0, NtName.Buffer); - if (NULL != SlashlessFileName) { - RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + RtlFreeHeap (hProcessHeap, + 0, + NtPathU.Buffer); + if (NULL != SlashlessFileName) + { + RtlFreeHeap(hProcessHeap, + 0, + SlashlessFileName); } SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return (INVALID_HANDLE_VALUE); + return INVALID_HANDLE_VALUE; } /* change pattern: "*.*" --> "*" */ - if (!wcscmp (SearchPattern, L"*.*")) { - RtlInitUnicodeString(&DosFilePath, L"*"); - } else { - RtlInitUnicodeString(&DosFilePath, SearchPattern); + if (!wcscmp (SearchPattern, L"*.*")) + { + RtlInitUnicodeString(&PatternStr, L"*"); } + else + { + RtlInitUnicodeString(&PatternStr, SearchPattern); + } - DPRINT("NtName \'%S\' DosFilePath \'%S\'\n", - NtName.Buffer, DosFilePath.Buffer); + DPRINT("NtPathU \'%S\' Pattern \'%S\'\n", + NtPathU.Buffer, PatternStr.Buffer); - InitializeObjectAttributes( &ObjectAttributes, - &NtName, - dwAdditionalFlags, - NtFilePath.Buffer, - NULL ); + InitializeObjectAttributes (&ObjectAttributes, + &NtPathU, + 0, + NULL, + NULL); - Status = - NtOpenFile( - &IData->DirectoryHandle, - SYNCHRONIZE | FILE_LIST_DIRECTORY, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT - ); + Status = NtOpenFile (&IData->DirectoryHandle, + SYNCHRONIZE|FILE_LIST_DIRECTORY, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT); - if( !NT_SUCCESS(Status) ) - { - DPRINT1("NtOpenFile() - failed (Status %lx)\n", Status); - SetLastError( Status ); - return (INVALID_HANDLE_VALUE); - } + RtlFreeHeap (hProcessHeap, + 0, + NtPathU.Buffer); - RtlFreeHeap(hProcessHeap, 0, NtName.Buffer); - if (!NT_SUCCESS(Status)) { - RtlFreeHeap (hProcessHeap, 0, IData); - if (NULL != SlashlessFileName) { - RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); - } - SetLastErrorByStatus (Status); - return (INVALID_HANDLE_VALUE); + RtlFreeHeap (hProcessHeap, 0, IData); + if (NULL != SlashlessFileName) + { + RtlFreeHeap(hProcessHeap, + 0, + SlashlessFileName); + } + SetLastErrorByStatus (Status); + return INVALID_HANDLE_VALUE; } - - if ( 0 == DosFilePath.Length ) { - DPRINT1("0 == DosFilePath.Length\n"); - NtClose(IData->DirectoryHandle); - SetLastError(ERROR_FILE_NOT_FOUND); - return INVALID_HANDLE_VALUE; - } + IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); - IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); IData->pFileInfo->FileIndex = 0; - - Status = - NtQueryDirectoryFile( - IData->DirectoryHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - (PVOID)IData->pFileInfo, - FIND_DATA_SIZE, - FileBothDirectoryInformation, - TRUE, - &DosFilePath, - FALSE - ); - if (NULL != SlashlessFileName) { - RtlFreeHeap(hProcessHeap, 0, SlashlessFileName); + Status = NtQueryDirectoryFile (IData->DirectoryHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + (PVOID)IData->pFileInfo, + FIND_DATA_SIZE, + FileBothDirectoryInformation, + TRUE, + &PatternStr, + TRUE); + if (NULL != SlashlessFileName) + { + RtlFreeHeap(hProcessHeap, + 0, + SlashlessFileName); } - - if( !NT_SUCCESS(Status) ) { - DPRINT1("NtQueryDirectoryFile() - failed (Status %lx)\n", Status); - RtlFreeHeap(hProcessHeap, 0, IData); - NtClose(IData->DirectoryHandle); - SetLastError(Status); - return (INVALID_HANDLE_VALUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("Status %lx\n", Status); + CloseHandle (IData->DirectoryHandle); + RtlFreeHeap (hProcessHeap, 0, IData); + SetLastErrorByStatus (Status); + return INVALID_HANDLE_VALUE; } - DPRINT("Found %.*S\n",IData->pFileInfo->FileNameLength/sizeof(WCHAR), IData->pFileInfo->FileName); /* copy data into WIN32_FIND_DATA structure */

19 years, 6 months

[hbirr] 16881: Fixed some bugs in CreateProcessA which was introduced by r16730.

by hbirr＠svn.reactos.com

Fixed some bugs in CreateProcessA which was introduced by r16730. Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/misc/utils.c Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-29 20:24:48 UTC (rev 16880) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-29 21:55:09 UTC (rev 16881) @@ -134,7 +134,7 @@ VOID STDCALL BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString, - IN PVOID UnicodeString); + OUT LPWSTR* UnicodeString); PUNICODE_STRING STDCALL @@ -145,11 +145,16 @@ Basep8BitStringToLiveUnicodeString(OUT PUNICODE_STRING UnicodeString, IN LPCSTR String); +NTSTATUS +STDCALL +Basep8BitStringToHeapUnicodeString(OUT PUNICODE_STRING UnicodeString, + IN LPCSTR String); + typedef NTSTATUS (STDCALL *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString, IN PANSI_STRING AnsiString, IN BOOLEAN AllocateMemory); -PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; +extern PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; NTSTATUS STDCALL _____ Modified: trunk/reactos/lib/kernel32/misc/utils.c --- trunk/reactos/lib/kernel32/misc/utils.c 2005-07-29 20:24:48 UTC (rev 16880) +++ trunk/reactos/lib/kernel32/misc/utils.c 2005-07-29 21:55:09 UTC (rev 16881) @@ -73,13 +73,38 @@ return StaticString; } +NTSTATUS +STDCALL +Basep8BitStringToHeapUnicodeString(OUT PUNICODE_STRING UnicodeString, + IN LPCSTR String) +{ + ANSI_STRING AnsiString; + NTSTATUS Status; + + DPRINT("Basep8BitStringToCachedUnicodeString\n"); + + /* Initialize an ANSI String */ + RtlInitAnsiString(&AnsiString, String); + + /* Convert it */ + Status = Basep8BitStringToUnicodeString(UnicodeString, &AnsiString, TRUE); + + /* Handle failure */ + /* Return Status */ + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + } + return Status; +} + /* * Allocates space from the Heap and converts an Ansi String into it */ VOID STDCALL BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString, - IN PVOID UnicodeString) + IN LPWSTR* UnicodeString) { ANSI_STRING AnsiTemp; UNICODE_STRING UnicodeTemp; @@ -93,12 +118,12 @@ UnicodeTemp.MaximumLength = RtlAnsiStringToUnicodeSize(&AnsiTemp); /* Allocate space from the Heap for the string */ - UnicodeString = RtlAllocateHeap(GetProcessHeap(), + *UnicodeString = RtlAllocateHeap(GetProcessHeap(), 0, UnicodeTemp.MaximumLength); /* Save the buffer and convert */ - UnicodeTemp.Buffer = UnicodeString; + UnicodeTemp.Buffer = *UnicodeString; RtlAnsiStringToUnicodeString(&UnicodeTemp, &AnsiTemp, FALSE); } _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-29 20:24:48 UTC (rev 16880) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-29 21:55:09 UTC (rev 16881) @@ -639,7 +639,7 @@ else { /* Use a dynamic version */ - Basep8BitStringToLiveUnicodeString(&LiveCommandLine, + Basep8BitStringToHeapUnicodeString(&LiveCommandLine, lpCommandLine); } } @@ -652,12 +652,12 @@ /* Convert the Name and Directory */ if (lpApplicationName) { - Basep8BitStringToLiveUnicodeString(&ApplicationName, + Basep8BitStringToHeapUnicodeString(&ApplicationName, lpApplicationName); } if (lpCurrentDirectory) { - Basep8BitStringToLiveUnicodeString(&CurrentDirectory, + Basep8BitStringToHeapUnicodeString(&CurrentDirectory, lpCurrentDirectory); } @@ -741,11 +741,11 @@ PWCHAR Extension; LPWSTR QuotedCmdLine = NULL; LPWSTR ScanString; - LPWSTR NullBuffer; + LPWSTR NullBuffer = NULL; LPWSTR NameBuffer = NULL; - WCHAR SaveChar; + WCHAR SaveChar = 0; ULONG RetVal; - UINT Error; + UINT Error = 0; BOOLEAN SearchDone = FALSE; CLIENT_ID ClientId; PPEB OurPeb = NtCurrentPeb();

19 years, 6 months

[navaraf] 16880: Change comment.

by navaraf＠svn.reactos.com

Change comment. Modified: branches/win32k rewrite attempt/win32k/main/dllmain.c _____ Modified: branches/win32k rewrite attempt/win32k/main/dllmain.c --- branches/win32k rewrite attempt/win32k/main/dllmain.c 2005-07-29 18:11:04 UTC (rev 16879) +++ branches/win32k rewrite attempt/win32k/main/dllmain.c 2005-07-29 20:24:48 UTC (rev 16880) @@ -181,8 +181,12 @@ &hWinSta, &hDesk); -/*---- this code i dont get ------*/ -/* imo, a thread REQUIRE a desktop!!! */ + /* + * NOTE: There CAN be threads without desktop and window station. A + * good example is the initial thread in WinLogon that creates the + * first window station and desktops. + */ + if(NT_SUCCESS(Status)) { if(hWinSta != NULL) @@ -218,7 +222,6 @@ } } } -/*---- this code i dont get ------*/ Win32Thread->IsExiting = FALSE; UserDestroyCaret(Win32Thread);

19 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005