Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[hbelusca] 66137: [CDMAKE]: Code cleanup (remove useless comments and that setjmp thingie).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 1 12:39:37 2015 New Revision: 66137 URL: http://svn.reactos.org/svn/reactos?rev=66137&view=rev Log: [CDMAKE]: Code cleanup (remove useless comments and that setjmp thingie). Modified: trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.h Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sun Feb 1 12:39:37 2015 @@ -64,7 +64,6 @@ # define FALSE 0 #endif // _WIN32 #include <ctype.h> -#include <setjmp.h> #include <time.h> #include "config.h" #include "dirhash.h" @@ -131,7 +130,6 @@ WORD path_table_index; /* directory record only */ } DIR_RECORD, *PDIR_RECORD; - typedef enum directory_record_type { DOT_RECORD, @@ -147,7 +145,6 @@ static char DIRECTORY_TIMESTAMP[] = "~Y$'KOR$.3K&"; -static jmp_buf error; static struct cd_image cd; char volume_label[32]; @@ -570,13 +567,13 @@ return c; } +/*----------------------------------------------------------------------------- +This function checks to see if there's a cdname conflict. +-----------------------------------------------------------------------------*/ + #if defined(_WIN32) && !defined(strcasecmp) #define strcasecmp stricmp #endif//_WIN32 - -/*----------------------------------------------------------------------------- -This function checks to see if there's a cdname conflict. ------------------------------------------------------------------------------*/ int cdname_exists(PDIR_RECORD d) { @@ -722,11 +719,6 @@ PDIR_RECORD parent) { PDIR_RECORD d; - /* - char *s; - char *t; - char *n; - */ d = calloc(1, sizeof(*d)); if (d == NULL) @@ -1117,8 +1109,8 @@ new_d->next_in_directory = d->first_record; d->first_record = new_d; new_d->next_in_memory = root.next_in_memory; + root.next_in_memory = new_d; new_d->date_and_time = d->date_and_time; - root.next_in_memory = new_d; if (directory) { new_d->flags |= DIRECTORY_FLAG; @@ -1730,9 +1722,6 @@ return 1; } - if (setjmp(error)) - return 1; - // initialize root directory cd.buffer = malloc(BUFFER_SIZE); @@ -1775,7 +1764,7 @@ error_exit("Missing size limit parameter"); } while (isdigit(*t)) - size_limit = size_limit * 10 + *t++ - '0'; + size_limit = size_limit * 10 + *t++ - '0'; if (size_limit < 1 || size_limit > 800) error_exit("Invalid size limit"); size_limit <<= 9; // convert megabyte to sector count @@ -1838,6 +1827,7 @@ { char *trimmedline, *targetname, *srcname, *eq; char lineread[1024]; + FILE *f = fopen(source+1, "r"); if (!f) { Modified: trunk/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.h?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] Sun Feb 1 12:39:37 2015 @@ -1,5 +1,5 @@ -#ifndef _REACTOS_TOOLS_CDMAKE_DIRHASH_H_ -#define _REACTOS_TOOLS_CDMAKE_DIRHASH_H_ +#ifndef _DIRHASH_H_ +#define _DIRHASH_H_ #define NUM_DIR_HASH_BUCKETS 1024 @@ -35,4 +35,4 @@ dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm); void dir_hash_destroy(struct target_dir_hash *dh); -#endif //_REACTOS_TOOLS_CDMAKE_DIRHASH_H_ +#endif // _DIRHASH_H_

9 years, 7 months

[ekohl] 66136: [NTOSKRNL] Set invalid atributes for the mutant object type. This fixes a kmtest:ObTypes bug.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 1 12:24:03 2015 New Revision: 66136 URL: http://svn.reactos.org/svn/reactos?rev=66136&view=rev Log: [NTOSKRNL] Set invalid atributes for the mutant object type. This fixes a kmtest:ObTypes bug. Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Sun Feb 1 12:24:03 2015 @@ -69,6 +69,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteMutant; ObjectTypeInitializer.ValidAccessMask = MUTANT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); if (!NT_SUCCESS(Status)) return FALSE; return TRUE;

9 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015