Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 35087: - Update ros.diff
by sginsberg＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: sginsberg Date: Sun Aug 3 15:05:47 2008 New Revision: 35087 URL: http://svn.reactos.org/svn/reactos?rev=35087&view=rev Log: - Update ros.diff Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] Sun Aug 3 15:05:47 2008 @@ -48,3 +48,32 @@ * SymEnumSymbolsW (DBGHELP.@) * */ +Index: stabs.c +=================================================================== +--- stabs.c (revision 35085) ++++ stabs.c (working copy) +@@ -63,8 +63,6 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); + +-UINT64 _strtoui64( const char *nptr, char **endptr, int base ); +- + #ifndef N_UNDF + #define N_UNDF 0x00 + #endif +@@ -468,13 +466,13 @@ + break; + case '-': + prv->sign = -1; +- prv->val = _strtoui64(++ptd->ptr, &last, 10); ++ prv->val = strtoull(++ptd->ptr, &last, 10); + ptd->ptr = last; + break; + case '+': + default: + prv->sign = 1; +- prv->val = _strtoui64(ptd->ptr, &last, 10); ++ prv->val = strtoull(ptd->ptr, &last, 10); + ptd->ptr = last; + break; + }

1 0

[pschweitzer] 35086: Implemented ghost feature to TechBot
by pschweitzer＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: pschweitzer Date: Sun Aug 3 15:04:26 2008 New Revision: 35086 URL: http://svn.reactos.org/svn/reactos?rev=35086&view=rev Log: Implemented ghost feature to TechBot Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IRC.cs trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IRC.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/IRC… ============================================================================== --- trunk/irc/TechBot/TechBot.IRCLibrary/IRC.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.IRCLibrary/IRC.cs [iso-8859-1] Sun Aug 3 15:04:26 2008 @@ -17,6 +17,7 @@ public const string PRIVMSG = "PRIVMSG"; public const string USER = "USER"; public const string PASS = "PASS"; + public const string GHOST = "NS GHOST"; public const string RPL_NAMREPLY = "353"; public const string RPL_ENDOFNAMES = "366"; Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/Irc… ============================================================================== --- trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs [iso-8859-1] Sun Aug 3 15:04:26 2008 @@ -639,6 +639,8 @@ if (password != null) SubmitPassword(password); ChangeNick(nickname); + /* Before we send our nickname, just ghost it */ + SendMessage(new IrcMessage(IRC.GHOST, nickname)); /* OLD: USER <username> <hostname> <servername> <realname> */ /* NEW: USER <user> <mode> <unused> <realname> */ SendMessage(new IrcMessage(IRC.USER, String.Format("{0} 0 * :{1}",

1 0

[cfinck] 35085: - Set better/updated default values - Remove the non-existent "TechBot.Commands.RBuild" project, it breaks the auomatic conversion of the solution to MSVS 2008
by cfinck＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cfinck Date: Sun Aug 3 14:30:09 2008 New Revision: 35085 URL: http://svn.reactos.org/svn/reactos?rev=35085&view=rev Log: - Set better/updated default values - Remove the non-existent "TechBot.Commands.RBuild" project, it breaks the auomatic conversion of the solution to MSVS 2008 Modified: trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings trunk/irc/TechBot/TechBot.Commands.Common/app.config trunk/irc/TechBot/TechBot.IRCLibrary/app.config trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs trunk/irc/TechBot/TechBot.Library/Settings.settings trunk/irc/TechBot/TechBot.Library/app.config trunk/irc/TechBot/TechBot.sln trunk/irc/TechBot/TechBot/App.config Modified: trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -61,7 +61,7 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("svn://svn.reactos.org/trunk/reactos")] + [global::System.Configuration.DefaultSettingValueAttribute("svn://svn.reactos.org/reactos/trunk")] public string SVNRoot { get { return ((string)(this["SVNRoot"])); Modified: trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -15,7 +15,7 @@ <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\wm.xml</Value> </Setting> <Setting Name="SVNRoot" Type="System.String" Scope="Application"> - <Value Profile="(Default)">svn://svn.reactos.org/trunk/reactos</Value> + <Value Profile="(Default)">svn://svn.reactos.org/reactos/trunk</Value> </Setting> </Settings> </SettingsFile> Modified: trunk/irc/TechBot/TechBot.Commands.Common/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/app.config [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/app.config [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -20,7 +20,7 @@ <value>C:\Ros\current\irc\TechBot\Resources\wm.xml</value> </setting> <setting name="SVNRoot" serializeAs="String"> - <value>svn://svn.reactos.org/trunk/reactos</value> + <value>svn://svn.reactos.org/reactos/trunk</value> </setting> </TechBot.Commands.Common.Settings> </applicationSettings> Modified: trunk/irc/TechBot/TechBot.IRCLibrary/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/app… ============================================================================== --- trunk/irc/TechBot/TechBot.IRCLibrary/app.config [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.IRCLibrary/app.config [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -8,7 +8,7 @@ <userSettings> <TechBot.IRCLibrary.Settings> <setting name="CommandPrefix" serializeAs="String"> - <value>@</value> + <value>!</value> </setting> </TechBot.IRCLibrary.Settings> </userSettings> Modified: trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -61,7 +61,7 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("svn://svn.reactos.org/trunk/reactos")] + [global::System.Configuration.DefaultSettingValueAttribute("svn://svn.reactos.org/reactos/trunk")] public string SVNRoot { get { return ((string)(this["SVNRoot"])); @@ -70,7 +70,7 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("@")] + [global::System.Configuration.DefaultSettingValueAttribute("!")] public string CommandPrefix { get { return ((string)(this["CommandPrefix"])); Modified: trunk/irc/TechBot/TechBot.Library/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Settings.settings [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Settings.settings [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -15,10 +15,10 @@ <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\wm.xml</Value> </Setting> <Setting Name="SVNRoot" Type="System.String" Scope="Application"> - <Value Profile="(Default)">svn://svn.reactos.org/trunk/reactos</Value> + <Value Profile="(Default)">svn://svn.reactos.org/reactos/trunk</Value> </Setting> <Setting Name="CommandPrefix" Type="System.String" Scope="Application"> - <Value Profile="(Default)">@</Value> + <Value Profile="(Default)">!</Value> </Setting> </Settings> </SettingsFile> Modified: trunk/irc/TechBot/TechBot.Library/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/app.co… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/app.config [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/app.config [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -20,10 +20,10 @@ <value>C:\Ros\current\irc\TechBot\Resources\wm.xml</value> </setting> <setting name="SVNRoot" serializeAs="String"> - <value>svn://svn.reactos.org/trunk/reactos</value> + <value>svn://svn.reactos.org/reactos/trunk</value> </setting> <setting name="CommandPrefix" serializeAs="String"> - <value>@</value> + <value>!</value> </setting> </TechBot.Library.Settings> </applicationSettings> Modified: trunk/irc/TechBot/TechBot.sln URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.sln?rev=35085&… ============================================================================== --- trunk/irc/TechBot/TechBot.sln [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.sln [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -16,8 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Commands.Common", "TechBot.Commands.Common\TechBot.Commands.Common.csproj", "{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Commands.MSDN", "TechBot.Commands.MSDN\TechBot.Commands.MSDN.csproj", "{ADBF1ED6-A586-4707-BD59-4CD53448D0FE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Commands.RBuild", "TechBot.Commands.RBuild\TechBot.Commands.RBuild.csproj", "{D676FEDE-62DD-4B4D-94C6-308598E827F9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -57,10 +55,6 @@ {ADBF1ED6-A586-4707-BD59-4CD53448D0FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADBF1ED6-A586-4707-BD59-4CD53448D0FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADBF1ED6-A586-4707-BD59-4CD53448D0FE}.Release|Any CPU.Build.0 = Release|Any CPU - {D676FEDE-62DD-4B4D-94C6-308598E827F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D676FEDE-62DD-4B4D-94C6-308598E827F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D676FEDE-62DD-4B4D-94C6-308598E827F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D676FEDE-62DD-4B4D-94C6-308598E827F9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/irc/TechBot/TechBot/App.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/App.config?rev… ============================================================================== --- trunk/irc/TechBot/TechBot/App.config [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot/App.config [iso-8859-1] Sun Aug 3 14:30:09 2008 @@ -6,9 +6,9 @@ </sectionGroup> </configSections> <appSettings> - <add key="IRCServerHostName" value="irc.eu.freenode.net" /> + <add key="IRCServerHostName" value="irc.freenode.net" /> <add key="IRCServerHostPort" value="6667" /> - <add key="IRCChannelNames" value="channel1;channel2" /> + <add key="IRCChannelNames" value="reactos,reactos-dev,reactos-testers" /> <add key="IRCBotName" value="MyBot" /> <add key="IRCBotPassword" value="MyPassword" /> <add key="ChmPath" value="C:\IRC\TechBot\CHM" /> @@ -17,7 +17,7 @@ <add key="WinerrorXml" value="C:\IRC\TechBot\winerror.xml" /> <add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" /> <add key="WmXml" value="C:\IRC\TechBot\wm.xml" /> - <add key="SvnCommand" value="svn co svn://svn.reactos.org/trunk/reactos" /> + <add key="SvnCommand" value="svn co svn://svn.reactos.org/reactos/trunk" /> <add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" /> <add key="WineBugUrl" value="http://bugs.winehq.org/show_bug.cgi?id={0}" /> <add key="SambaBugUrl" value="https://bugzilla.samba.org/show_bug.cgi?id={0}" />

1 0

[ekohl] 35084: Fix NtQueryOpenSubKeys prototype.
by ekohl＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: ekohl Date: Sun Aug 3 14:24:09 2008 New Revision: 35084 URL: http://svn.reactos.org/svn/reactos?rev=35084&view=rev Log: Fix NtQueryOpenSubKeys prototype. Modified: trunk/reactos/include/ndk/cmfuncs.h trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] Sun Aug 3 14:24:09 2008 @@ -234,7 +234,7 @@ NTAPI NtQueryOpenSubKeys( IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG HandleCount + OUT PULONG HandleCount ); NTSTATUS Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun Aug 3 14:24:09 2008 @@ -930,7 +930,7 @@ NTSTATUS NTAPI NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG HandleCount) + OUT PULONG HandleCount) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

1 0

[sginsberg] 35083: - Reapply 29440 to dbghelp and use strtoui64 instead of non-existing strtoull. Now dbghelp loads again (broken 7 months ago in revision 31339).
by sginsberg＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: sginsberg Date: Sun Aug 3 14:14:44 2008 New Revision: 35083 URL: http://svn.reactos.org/svn/reactos?rev=35083&view=rev Log: - Reapply 29440 to dbghelp and use strtoui64 instead of non-existing strtoull. Now dbghelp loads again (broken 7 months ago in revision 31339). Modified: trunk/reactos/dll/win32/dbghelp/stabs.c Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] Sun Aug 3 14:14:44 2008 @@ -63,6 +63,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); +UINT64 _strtoui64( const char *nptr, char **endptr, int base ); + #ifndef N_UNDF #define N_UNDF 0x00 #endif @@ -466,13 +468,13 @@ break; case '-': prv->sign = -1; - prv->val = strtoull(++ptd->ptr, &last, 10); + prv->val = _strtoui64(++ptd->ptr, &last, 10); ptd->ptr = last; break; case '+': default: prv->sign = 1; - prv->val = strtoull(ptd->ptr, &last, 10); + prv->val = _strtoui64(ptd->ptr, &last, 10); ptd->ptr = last; break; }

1 0

[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

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