Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[fireball] 35082: - [Stupid] warning fixes. - Bugfix: CNV_THIS_PART was not returning any value, when in reality it should have returned a pointer to the converted string.
by fireball＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: fireball Date: Sun Aug 3 14:09:43 2008 New Revision: 35082 URL: http://svn.reactos.org/svn/reactos?rev=35082&view=rev Log: - [Stupid] warning fixes. - Bugfix: CNV_THIS_PART was not returning any value, when in reality it should have returned a pointer to the converted string. Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/fat.c trunk/reactos/lib/fslib/vfatlib/check/file.c trunk/reactos/lib/fslib/vfatlib/check/file.h trunk/reactos/lib/fslib/vfatlib/check/lfn.c Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/bo… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] Sun Aug 3 14:09:43 2008 @@ -65,7 +65,7 @@ printf("Boot sector contents:\n"); if (!atari_format) { char id[9]; - strncpy(id,b->system_id,8); + strncpy(id,(char*)b->system_id,8); id[8] = 0; printf("System ID \"%s\"\n",id); } Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Sun Aug 3 14:09:43 2008 @@ -111,14 +111,14 @@ } memset(de,0,sizeof(DIR_ENT)); while (1) { - sprintf(de->name,pattern,curr_num); + sprintf((char*)de->name,pattern,curr_num); clu_num = fs->root_cluster; i = 0; offset2 = cluster_start(fs,clu_num); while (clu_num > 0 && clu_num != -1) { fs_read(offset2,sizeof(DIR_ENT),&d2); if (offset2 != offset && - !strncmp(d2.name,de->name,MSDOS_NAME)) + !strncmp((char*)d2.name,(char*)de->name,MSDOS_NAME)) break; i += sizeof(DIR_ENT); offset2 += sizeof(DIR_ENT); @@ -151,10 +151,10 @@ offset = fs->root_start+next_free*sizeof(DIR_ENT); memset(de,0,sizeof(DIR_ENT)); while (1) { - sprintf(de->name,pattern,curr_num); + sprintf((char*)de->name,pattern,curr_num); for (scan = 0; scan < (int)fs->root_entries; scan++) if (scan != next_free && - !strncmp(root[scan].name,de->name,MSDOS_NAME)) + !strncmp((char*)root[scan].name,(char*)de->name,MSDOS_NAME)) break; if (scan == (int)fs->root_entries) break; if (++curr_num >= 10000) die("Unable to create unique name"); @@ -226,8 +226,8 @@ /* Do not complain about (and auto-correct) the extended attribute files * of OS/2. */ - if (strncmp(name,"EA DATA SF",11) == 0 || - strncmp(name,"WP ROOT SF",11) == 0) return 0; + if (strncmp((char*)name,"EA DATA SF",11) == 0 || + strncmp((char*)name,"WP ROOT SF",11) == 0) return 0; for (i = 0; i < 8; i++) { if (name[i] < ' ' || name[i] == 0x7f) return 1; @@ -313,10 +313,10 @@ first = file->parent ? file->parent->first : root; number = 0; while (1) { - sprintf(file->dir_ent.name,"FSCK%04d",number); - strncpy(file->dir_ent.ext,"REN",3); + sprintf((char*)file->dir_ent.name,"FSCK%04d",number); + strncpy((char*)file->dir_ent.ext,"REN",3); for (walk = first; walk; walk = walk->next) - if (walk != file && !strncmp(walk->dir_ent.name,file->dir_ent. + if (walk != file && !strncmp((char*)walk->dir_ent.name,(char*)file->dir_ent. name,MSDOS_NAME)) break; if (!walk) { fs_write(file->offset,MSDOS_NAME,file->dir_ent.name); @@ -340,9 +340,9 @@ while (1) { printf("New name: "); fflush(stdout); - if (fgets(name,45,stdin)) { - if ((here = strchr(name,'\n'))) *here = 0; - for (walk = strrchr(name,0); walk >= name && (*walk == ' ' || + if (fgets((char*)name,45,stdin)) { + if ((here = (unsigned char*)strchr((char*)name,'\n'))) *here = 0; + for (walk = (unsigned char*)strrchr((char*)name,0); walk >= name && (*walk == ' ' || *walk == '\t'); walk--); walk[1] = 0; for (walk = name; *walk == ' ' || *walk == '\t'; walk++); @@ -359,7 +359,7 @@ { char *name; - name = strncmp(file->dir_ent.name,MSDOS_DOT,MSDOS_NAME) ? ".." : "."; + name = strncmp((char*)file->dir_ent.name,MSDOS_DOT,MSDOS_NAME) ? ".." : "."; if (!(file->dir_ent.attr & ATTR_DIR)) { printf("%s\n Is a non-directory.\n",path_name(file)); if (interactive) @@ -404,7 +404,7 @@ path_name(file)); MODIFY(file,size,CT_LE_L(0)); } - if (file->parent && !strncmp(file->dir_ent.name,MSDOS_DOT,MSDOS_NAME)) { + if (file->parent && !strncmp((char*)file->dir_ent.name,MSDOS_DOT,MSDOS_NAME)) { expect = FSTART(file->parent,fs); if (FSTART(file,fs) != expect) { printf("%s\n Start (%ld) does not point to parent (%ld)\n", @@ -413,7 +413,7 @@ } return 0; } - if (file->parent && !strncmp(file->dir_ent.name,MSDOS_DOTDOT, + if (file->parent && !strncmp((char*)file->dir_ent.name,MSDOS_DOTDOT, MSDOS_NAME)) { expect = file->parent->parent ? FSTART(file->parent->parent,fs):0; if (fs->root_cluster && expect == fs->root_cluster) @@ -569,13 +569,13 @@ dot = dotdot = redo = 0; walk = root; while (*walk) { - if (!strncmp((*walk)->dir_ent.name,MSDOS_DOT,MSDOS_NAME) || - !strncmp((*walk)->dir_ent.name,MSDOS_DOTDOT,MSDOS_NAME)) { + if (!strncmp((char*)(*walk)->dir_ent.name,MSDOS_DOT,MSDOS_NAME) || + !strncmp((char*)(*walk)->dir_ent.name,MSDOS_DOTDOT,MSDOS_NAME)) { if (handle_dot(fs,*walk,dots)) { *walk = (*walk)->next; continue; } - if (!strncmp((*walk)->dir_ent.name,MSDOS_DOT,MSDOS_NAME)) dot++; + if (!strncmp((char*)(*walk)->dir_ent.name,MSDOS_DOT,MSDOS_NAME)) dot++; else dotdot++; } if (!((*walk)->dir_ent.attr & ATTR_VOLUME) && @@ -609,7 +609,7 @@ skip = 0; while (*scan && !skip) { if (!((*scan)->dir_ent.attr & ATTR_VOLUME) && - !strncmp((*walk)->dir_ent.name,(*scan)->dir_ent.name,MSDOS_NAME)) { + !strncmp((char*)(*walk)->dir_ent.name,(char*)(*scan)->dir_ent.name,MSDOS_NAME)) { printf("%s\n Duplicate directory entry.\n First %s\n", path_name(*walk),file_stat(*walk)); printf(" Second %s\n",file_stat(*scan)); @@ -763,7 +763,7 @@ de.start = CT_LE_W(fs->root_cluster & 0xffff); de.starthi = CT_LE_W((fs->root_cluster >> 16) & 0xffff); } - if ((type = file_type(cp,de.name)) != fdt_none) { + if ((type = file_type(cp,(char*)de.name)) != fdt_none) { if (type == fdt_undelete && (de.attr & ATTR_DIR)) die("Can't undelete directories."); file_modify(cp,de.name); @@ -793,8 +793,8 @@ printf("\n"); } if (offset && - strncmp(de.name,MSDOS_DOT,MSDOS_NAME) != 0 && - strncmp(de.name,MSDOS_DOTDOT,MSDOS_NAME) != 0) + strncmp((char*)de.name,MSDOS_DOT,MSDOS_NAME) != 0 && + strncmp((char*)de.name,MSDOS_DOTDOT,MSDOS_NAME) != 0) ++n_files; test_file(fs,new,test); } @@ -834,9 +834,9 @@ for (walk = parent ? parent->first : root; walk; walk = walk->next) if (walk->dir_ent.attr & ATTR_DIR) - if (strncmp(walk->dir_ent.name,MSDOS_DOT,MSDOS_NAME) && - strncmp(walk->dir_ent.name,MSDOS_DOTDOT,MSDOS_NAME)) - if (scan_dir(fs,walk,file_cd(cp,walk->dir_ent.name))) return 1; + if (strncmp((char*)walk->dir_ent.name,MSDOS_DOT,MSDOS_NAME) && + strncmp((char*)walk->dir_ent.name,MSDOS_DOTDOT,MSDOS_NAME)) + if (scan_dir(fs,walk,file_cd(cp,(char*)walk->dir_ent.name))) return 1; return 0; } Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] Sun Aug 3 14:09:43 2008 @@ -17,7 +17,7 @@ #include "check.h" #include "fat.h" -#pragma warning(disable: 4018) +//#pragma warning(disable: 4018) static void get_fat(FAT_ENTRY *entry,void *fat,unsigned long cluster,DOS_FS *fs) { Modified: trunk/reactos/lib/fslib/vfatlib/check/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] Sun Aug 3 14:09:43 2008 @@ -57,7 +57,7 @@ while (j++ < i) *p++ = ' '; put_char(&p,fixed[i]); } - if (strncmp(fixed+8," ",3)) { + if (strncmp((char*)fixed+8," ",3)) { *p++ = '.'; for (i = j = 0; i < 3; i++) if (fixed[i+8] != ' ') { @@ -138,7 +138,7 @@ path++; while (1) { if ((here = strchr(path,'/'))) *here = 0; - if (!file_cvt(path,name)) exit(2); + if (!file_cvt((unsigned char*)path,(unsigned char *)name)) exit(2); for (walk = *current; walk; walk = walk->next) if (!here && (!strncmp(name,walk->name,MSDOS_NAME) || (type == fdt_undelete && !strncmp(name+1,walk->name+1,MSDOS_NAME-1)))) @@ -201,16 +201,16 @@ } -void file_modify(FDSC **curr,char *fixed) +void file_modify(FDSC **curr,unsigned char *fixed) { FDSC **this,*next; - if (!(this = file_find(curr,fixed))) + if (!(this = file_find(curr,(char *)fixed))) die("Internal error: file_find failed"); switch ((*this)->type) { case fdt_drop: printf("Dropping %s\n",file_name(fixed)); - *(unsigned char *) fixed = DELETED_FLAG; + *fixed = DELETED_FLAG; break; case fdt_undelete: *fixed = *(*this)->name; @@ -234,7 +234,7 @@ if (this->first) report_unused(this->first); else if (this->type != fdt_none) printf("Warning: did not %s file %s\n",this->type == fdt_drop ? - "drop" : "undelete",file_name(this->name)); + "drop" : "undelete",file_name((unsigned char*)this->name)); free(this); this = next; } Modified: trunk/reactos/lib/fslib/vfatlib/check/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/file.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/file.h [iso-8859-1] Sun Aug 3 14:09:43 2008 @@ -44,7 +44,7 @@ /* Returns the attribute of the file FIXED in directory CURR or FDT_NONE if no such file exists or if CURR is NULL. */ -void file_modify(FDSC **curr,char *fixed); +void file_modify(FDSC **curr,unsigned char *fixed); /* Performs the necessary operation on the entry of CURR that is named FIXED. */ Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Sun Aug 3 14:09:43 2008 @@ -62,7 +62,7 @@ { \ char __part_uni[CHARS_PER_LFN*2]; copy_lfn_part( __part_uni, lfn ); - cnv_unicode( __part_uni, CHARS_PER_LFN, 0 ); + return cnv_unicode( (unsigned char*)__part_uni, CHARS_PER_LFN, 0 ); } /* Convert name parts collected so far (from previous slots) from unicode to @@ -105,7 +105,7 @@ } *cp = 0; - return( out ); + return (char *)out; } @@ -322,7 +322,7 @@ if (lfn_slot != -1) { lfn_slot--; offset = lfn_slot * CHARS_PER_LFN*2; - copy_lfn_part( lfn_unicode+offset, lfn ); + copy_lfn_part( (char*)lfn_unicode+offset, lfn ); if (lfn->id & LFN_ID_START) lfn_unicode[offset+26] = lfn_unicode[offset+27] = 0; lfn_offsets[lfn_parts++] = dir_offset;

1 0

[fireball] 35081: - Copy most of the dosfsck source code into vfatlib. Currently excluded from the build process.
by fireball＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: fireball Date: Sun Aug 3 13:50:46 2008 New Revision: 35081 URL: http://svn.reactos.org/svn/reactos?rev=35081&view=rev Log: - Copy most of the dosfsck source code into vfatlib. Currently excluded from the build process. Added: trunk/reactos/lib/fslib/vfatlib/check/ (with props) trunk/reactos/lib/fslib/vfatlib/check/boot.c (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/boot.c trunk/reactos/lib/fslib/vfatlib/check/boot.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/boot.h trunk/reactos/lib/fslib/vfatlib/check/byteorder.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/byteorder.h trunk/reactos/lib/fslib/vfatlib/check/byteswap.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/byteswap.h trunk/reactos/lib/fslib/vfatlib/check/byteswap1.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/byteswap1.h trunk/reactos/lib/fslib/vfatlib/check/check.c (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/check.c trunk/reactos/lib/fslib/vfatlib/check/check.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/check.h trunk/reactos/lib/fslib/vfatlib/check/common.c (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/common.c trunk/reactos/lib/fslib/vfatlib/check/common.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/common.h trunk/reactos/lib/fslib/vfatlib/check/compiler.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/compiler.h trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h (props changed) - copied unchanged from r35067, trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h trunk/reactos/lib/fslib/vfatlib/check/fat.c (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/fat.c trunk/reactos/lib/fslib/vfatlib/check/fat.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/fat.h trunk/reactos/lib/fslib/vfatlib/check/file.c (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/file.c trunk/reactos/lib/fslib/vfatlib/check/file.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/file.h trunk/reactos/lib/fslib/vfatlib/check/io.c (props changed) - copied unchanged from r35068, trunk/rosapps/applications/sysutils/dosfsck/io.c trunk/reactos/lib/fslib/vfatlib/check/io.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/io.h trunk/reactos/lib/fslib/vfatlib/check/lfn.c (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/lfn.c trunk/reactos/lib/fslib/vfatlib/check/lfn.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/lfn.h trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/msdos_fs.h trunk/reactos/lib/fslib/vfatlib/check/swab.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/swab.h trunk/reactos/lib/fslib/vfatlib/check/version.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/version.h trunk/reactos/lib/fslib/vfatlib/check/vfat.h (props changed) - copied unchanged from r35064, trunk/rosapps/applications/sysutils/dosfsck/vfat.h Propchange: trunk/reactos/lib/fslib/vfatlib/check/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 3 13:50:46 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/fslib/vfatlib/check/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/fslib/vfatlib/check/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/fslib/vfatlib/check/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/lib/fslib/vfatlib/check/boot.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/boot.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/boot.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/boot.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/byteorder.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/byteorder.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/byteswap.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/byteswap.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/byteswap1.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/byteswap1.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/check.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/check.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/check.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/check.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/common.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/common.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/common.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/common.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/compiler.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/compiler.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/fat.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/fat.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/fat.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/fat.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/file.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/file.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/file.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/file.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/io.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/io.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/io.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/io.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/lfn.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/lfn.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/lfn.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/lfn.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/swab.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/swab.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/version.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/version.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/lib/fslib/vfatlib/check/vfat.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/fslib/vfatlib/check/vfat.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/reactos/lib/fslib/vfatlib/check/vfat.h ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[cgutman] 35080: - Fix 2 more memory leaks
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 13:49:30 2008 New Revision: 35080 URL: http://svn.reactos.org/svn/reactos?rev=35080&view=rev Log: - Fix 2 more memory leaks Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/read.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Aug 3 13:49:30 2008 @@ -131,11 +131,12 @@ PLIST_ENTRY PendingIrp = RemoveHeadList( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ); PLIST_ENTRY PendingConn = FCB->PendingConnections.Flink; + Qelt = CONTAINING_RECORD( PendingConn, AFD_TDI_OBJECT_QELT, ListEntry ); SatisfyPreAccept ( CONTAINING_RECORD( PendingIrp, IRP, Tail.Overlay.ListEntry ), - CONTAINING_RECORD( PendingConn, AFD_TDI_OBJECT_QELT, - ListEntry ) ); + Qelt ); + ExFreePool( Qelt ); } FCB->NeedsNewListen = TRUE; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 3 13:49:30 2008 @@ -513,6 +513,8 @@ AFD_DbgPrint(MID_TRACE,("Completing\n")); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } + + ExFreePool( DatagramRecv ); } if( !IsListEmpty( &FCB->DatagramList ) ) {

1 0

[fireball] 35079: - ExfInterlockedAddUlong is FASTCALL, not NTAPI (spotted by Herve).
by fireball＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: fireball Date: Sun Aug 3 13:39:50 2008 New Revision: 35079 URL: http://svn.reactos.org/svn/reactos?rev=35079&view=rev Log: - ExfInterlockedAddUlong is FASTCALL, not NTAPI (spotted by Herve). Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Sun Aug 3 13:39:50 2008 @@ -88,7 +88,7 @@ } ULONG -NTAPI +FASTCALL ExfInterlockedAddUlong(IN PULONG Addend, IN ULONG Increment, PKSPIN_LOCK Lock)

1 0

[jmorlan] 35078: - Add NULL checks to _atoi64, _wtol, and _wtoi64. - Since atoi, atol, and _wtoi should check for NULL (_tcstol doesn't) but should not check for overflow (_tcstol does), make them call _ttoi64 instead of _tcstol.
by jmorlan＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: jmorlan Date: Sun Aug 3 13:35:54 2008 New Revision: 35078 URL: http://svn.reactos.org/svn/reactos?rev=35078&view=rev Log: - Add NULL checks to _atoi64, _wtol, and _wtoi64. - Since atoi, atol, and _wtoi should check for NULL (_tcstol doesn't) but should not check for overflow (_tcstol does), make them call _ttoi64 instead of _tcstol. Modified: trunk/reactos/lib/sdk/crt/string/atoi.c trunk/reactos/lib/sdk/crt/string/atoi64.c trunk/reactos/lib/sdk/crt/string/atol.c trunk/reactos/lib/sdk/crt/string/wtoi64.c trunk/reactos/lib/sdk/crt/string/wtol.c Modified: trunk/reactos/lib/sdk/crt/string/atoi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atoi.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atoi.c [iso-8859-1] Sun Aug 3 13:35:54 2008 @@ -8,5 +8,5 @@ int _ttoi(const _TCHAR *str) { - return (int)_tcstol(str, 0, 10); + return (int)_ttoi64(str); } Modified: trunk/reactos/lib/sdk/crt/string/atoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi64.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atoi64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atoi64.c [iso-8859-1] Sun Aug 3 13:35:54 2008 @@ -20,6 +20,9 @@ __int64 acc = 0; int neg = 0; + if (nptr == NULL) + return 0; + while(isspace((int)*s)) s++; if (*s == '-') Modified: trunk/reactos/lib/sdk/crt/string/atol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atol.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] Sun Aug 3 13:35:54 2008 @@ -8,7 +8,7 @@ long _ttol(const _TCHAR *str) { - return _tcstol(str, 0, 10); + return (long)_ttoi64(str); } int _atoldbl(long double *value, const char *str) Modified: trunk/reactos/lib/sdk/crt/string/wtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wtoi64.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wtoi64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wtoi64.c [iso-8859-1] Sun Aug 3 13:35:54 2008 @@ -19,6 +19,9 @@ int c; __int64 value; int sign; + + if (nptr == NULL) + return 0; while (iswctype((int)*nptr, _SPACE)) ++nptr; Modified: trunk/reactos/lib/sdk/crt/string/wtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wtol.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wtol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wtol.c [iso-8859-1] Sun Aug 3 13:35:54 2008 @@ -12,6 +12,9 @@ { unsigned long RunningTotal = 0; char bMinus = 0; + + if (str == NULL) + return 0; while (iswctype(*str, _SPACE) ) { str++;

1 0

[mkupfer] 35077: Igor Koshpaev <tower AT reactos DOT org> - Russian translation of setup dialogs added.
by mkupfer＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: mkupfer Date: Sun Aug 3 13:32:29 2008 New Revision: 35077 URL: http://svn.reactos.org/svn/reactos?rev=35077&view=rev Log: Igor Koshpaev <tower AT reactos DOT org> - Russian translation of setup dialogs added. Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/rsrc.rc Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Sun Aug 3 13:32:29 2008 @@ -1,12 +1,128 @@ -/* $Id: En.rc 21257 2006-03-08 23:07:09Z audit $ */ +/* $Id: ru-RU.rc 34572 2008-07-18 09:07:54Z mkupfer $ towerr */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -/* String Tables */ -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "Óñòàíîâêà ReactOS" - IDS_TEXT "Âû íå ìîæåòå óñòàíîâèòü ReactOS ñ äèñêà â äàííûé ìîìåíò!\n\nÏîæàëóéñòà, çàãðóçèòå êîìïüþòåð ñ ýòîãî äèñêà äëÿ óñòàíîâêè ReactOS." + LTEXT "Âàñ ïðèâåòñòâóåò ïðîãðàììà óñòàíîâêè ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Óñòàíîâêó ReactOS íóæíî ïðîèçâîäèòü òîëüêî çàãðóçèâøèñü ñ ýòîãî äèñêà! "\ + "Ïîñëå ïåðåçàïóñêà Âàøåãî êîìïüþòåðà âûáåðèòå çàãðóçêó ñ CD è íà÷íèòå"\ + "óñòàíîâêó ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Íàæìèòå êëàâèøó Çàâåðøèòü äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "ßçûê ñèñòåìû:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Ðàñêëàäêà êëàâèàòóðû:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Äëÿ âûáîðà òèïà óñòàíîâêè íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Âèä óñòàíîâêè", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Èíñòàëÿöèÿ ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Âîññòàíîâèòü èëè ìîäèôèöèðîâàòü óñòàíîâëåííûé ðàíåå ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Îñíîâíûå óñòðîéñòâà", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Êîìïüòåð:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Ýêðàí:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Êëàâèàòóðà:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Ñîçäàòü", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Óäàëèòü", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Äîïîëíèòåëüíûå óñòàíîâêè...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Áàçîâûé êàòàëîã", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Óñòàíîâêà çàãðóç÷èêà", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Ïðîèçâîäèòñÿ óñòàíîâêà", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Êîïèðîâàíèå ôàéëîâ...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Îêîí÷àíèå óñòàíîâêè ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Îêîí÷àíèå ïåðâîãî ýòàïà óñòàíîâêè ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Ïåðâûé ýòàï óñòàíîâêè ReactOS çàêîí÷åí.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "Ïîñëå íàæàòèÿ êëàâèøè Çàêîí÷èòü Âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "Âû ìîæåòå óáðàòü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà "\ + "íàæìèòå êëàâèøó Çàêîí÷èòü.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Âûáîð ßçûêà" + IDS_LANGSUBTITLE "Âûáåðèòå ÿçûê ïî óìîë÷àíèþ â ñèñòåìå." + IDS_TYPETITLE "Âàñ ïðèâåòñòâóåò ïðîãðàììà óñòàíîâêè ReactOS" + IDS_TYPESUBTITLE "Âûáåðèòå âèä óñòàíîâêè." + IDS_DEVICETITLE "Óñòàíîâêà áàçîâûõ óñòðîéñòâ" + IDS_DEVICESUBTITLE "Íàñòðîéêà ïàðàìåòðîâ ýêðàíà è êëàâèàòóðû." + IDS_DRIVETITLE "Âûáîð ðàñïîëîæåíèÿ íà äèñêå è ñèñòåìíîãî êàòàëîãà" + IDS_DRIVESUBTITLE "Ïðèãîòîâèòü ðàçäåë äèñêà, ñèñòåìíûé êàòàëîã è çàãðóç÷èê." + IDS_PROCESSTITLE "Ïðèãîòîâèòü ðàçäåë äèñêà, êîïèðîâàòü ôàéëû è ñèñòåìó" + IDS_PROCESSSUBTITLE "Ñîçäàòü ðàçäåë íà äèñêå, êîïèðîâàòü ôàéëû, óñòàíîâèòü çàãðóç÷èê" + IDS_RESTARTTITLE "Ïåðâûé ýòàï óñòàíîâêè çàêîí÷åí" + IDS_RESTARTSUBTITLE "Ïåðâûé ýòàï çàêîí÷åí, äëÿ ïðîäîëæåíèÿ òðåáóåòñÿ ïåðåçàãðóçêà" + IDS_ABORTSETUP "Åùå íå ïîëíîñòüáþ óñòàíîâëåí ReactOS íà êîìïüþòåð. Åñëè Âû çàêðîåòå ïðîãðàììó óñòàíîâêè ñåé÷àñ, â äàëüíåéøåì âàì ïðèäåòñÿ ïîâòîðèòü óñòàíîâêó ReactOS ïîëíîñòüþ. Âû óâåðåíû â íåîáõîäèìîñòè çàêðûòèÿ?" + IDS_ABORTSETUP2 "Ïðåêðàòèòü óñòàíîâêó?" +END /* EOF */ Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Sun Aug 3 13:32:29 2008 @@ -18,10 +18,10 @@ #include "lang/no-NO.rc" #include "lang/nl-NL.rc"*/ #include "lang/pl-PL.rc" -/*#include "lang/pt-BR.rc" -#include "lang/ru-RU.rc"*/ -#include "lang/sk-SK.rc" -/*#include "lang/sv-SE.rc" +/*#include "lang/pt-BR.rc"*/ +#include "lang/ru-RU.rc" +/*#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc"*/

1 0

[cgutman] 35076: - Fail if we can't allocate memory - Fix a memory leak - Also resize the buffer on STATUS_BUFFER_OVERFLOW
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 13:02:10 2008 New Revision: 35076 URL: http://svn.reactos.org/svn/reactos?rev=35076&view=rev Log: - Fail if we can't allocate memory - Fix a memory leak - Also resize the buffer on STATUS_BUFFER_OVERFLOW Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Aug 3 13:02:10 2008 @@ -839,6 +839,8 @@ ExAllocatePool(NonPagedPool, sizeof(KEY_BASIC_INFORMATION)); ULONG KbioLength = sizeof(KEY_BASIC_INFORMATION), ResultLength; + if( !Kbio ) return STATUS_INSUFFICIENT_RESOURCES; + RtlInitUnicodeString (&EnumKeyName, CCS_ROOT L"\\Control\\Class\\" TCPIP_GUID); @@ -847,6 +849,7 @@ if( !NT_SUCCESS(Status) ) { TI_DbgPrint(DEBUG_DATALINK,("Couldn't open Enum key %wZ: %x\n", &EnumKeyName, Status)); + ExFreePool( Kbio ); return Status; } @@ -854,7 +857,7 @@ Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation, Kbio, KbioLength, &ResultLength ); - if( Status == STATUS_BUFFER_TOO_SMALL ) { + if( Status == STATUS_BUFFER_TOO_SMALL || Status == STATUS_BUFFER_OVERFLOW ) { ExFreePool( Kbio ); KbioLength = ResultLength; Kbio = ExAllocatePool( NonPagedPool, KbioLength ); @@ -864,6 +867,7 @@ if( !NT_SUCCESS(Status) ) { TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); + ExFreePool( Kbio ); return Status; } } @@ -877,6 +881,7 @@ ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc ); if( NT_SUCCESS(Status) ) { NtClose( EnumKey ); + ExFreePool( Kbio ); return Status; } else Status = STATUS_SUCCESS; } @@ -885,6 +890,7 @@ RtlInitUnicodeString( DeviceDesc, L"" ); AppendUnicodeString( DeviceDesc, &TargetKeyName, FALSE ); NtClose( EnumKey ); + ExFreePool( Kbio ); return STATUS_UNSUCCESSFUL; }

1 0

[pschweitzer] 35075: - FsRtlBalanceReads: call IofCallDriver - Updated some comments
by pschweitzer＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: pschweitzer Date: Sun Aug 3 12:48:16 2008 New Revision: 35075 URL: http://svn.reactos.org/svn/reactos?rev=35075&view=rev Log: - FsRtlBalanceReads: call IofCallDriver - Updated some comments Modified: branches/pierre-fsd/ntoskrnl/fsrtl/faulttol.c branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/faulttol.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/fault… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/faulttol.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/faulttol.c [iso-8859-1] Sun Aug 3 12:48:16 2008 @@ -17,7 +17,7 @@ /*++ * @name FsRtlBalanceReads - * @implemented NT 4.0 + * @implemented * * The FsRtlBalanceReads routine sends an IRP to an FTDISK Driver * requesting the driver to balance read requests across a mirror set. @@ -54,7 +54,7 @@ &IoStatusBlock); /* Send it */ - Status = IoCallDriver(TargetDevice, Irp); + Status = IofCallDriver(TargetDevice, Irp); /* Wait if needed */ if (Status == STATUS_PENDING) @@ -74,7 +74,7 @@ /*++ * @name FsRtlSyncVolumes - * @implemented NT 4.0 + * @implemented * * The FsRtlSyncVolumes routine is deprecated. * Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Aug 3 12:48:16 2008 @@ -19,21 +19,21 @@ * @name FsRtlAreNamesEqual * @implemented * - * FILLME + * Compare two strings to check if they match * * @param Name1 - * FILLME + * First unicode string to compare * * @param Name2 - * FILLME + * Second unicode string to compare * * @param IgnoreCase - * FILLME + * If TRUE, Case will be ignored when comparing strings * * @param UpcaseTable - * FILLME - * - * @return None + * Table for upcase letters. If NULL is given, system one will be used + * + * @return TRUE if the strings are equal * * @remarks From Bo Branten's ntifs.h v25. * @@ -188,7 +188,7 @@ * @name FsRtlDoesNameContainWildCards * @implemented * - * FILLME + * Checks if the given string contains WildCards * * @param Name * Pointer to a UNICODE_STRING containing Name to examine

1 0

[janderwald] 35074: - use translated verb for cplopen action
by janderwald＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: janderwald Date: Sun Aug 3 12:29:57 2008 New Revision: 35074 URL: http://svn.reactos.org/svn/reactos?rev=35074&view=rev Log: - use translated verb for cplopen action Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] Sun Aug 3 12:29:57 2008 @@ -554,6 +554,9 @@ idResource = IDS_PLAY_VERB; else if (!wcsicmp(curEntry->szVerb, L"preview")) idResource = IDS_PREVIEW_VERB; + else if (!wcsicmp(curEntry->szVerb, L"cplopen")) + idResource = IDS_OPEN_VERB; + else idResource = 0;

1 0

[cgutman] 35073: - Don't continue if OpenRegistryKey fails
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 12:27:16 2008 New Revision: 35073 URL: http://svn.reactos.org/svn/reactos?rev=35073&view=rev Log: - Don't continue if OpenRegistryKey fails Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Aug 3 12:27:16 2008 @@ -844,9 +844,11 @@ Status = OpenRegistryKey( &EnumKeyName, &EnumKey ); - if( !NT_SUCCESS(Status) ) + if( !NT_SUCCESS(Status) ) { TI_DbgPrint(DEBUG_DATALINK,("Couldn't open Enum key %wZ: %x\n", &EnumKeyName, Status)); + return Status; + } for( i = 0; NT_SUCCESS(Status); i++ ) { Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation,

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
86
Older →

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 August 2008