Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[cwittich] 19762: fix some problems in patch from brezenbak

by cwittich＠svn.reactos.com

fix some problems in patch from brezenbak Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 00:01:25 UTC (rev 19761) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 00:10:54 UTC (rev 19762) @@ -147,6 +147,7 @@ cfgs.push_back ( "Debug" ); cfgs.push_back ( "Release" ); + cfgs.push_back ( "Speed" ); if (!no_cpp) { @@ -198,7 +199,7 @@ string path = Path::RelativeFromDirectory ( ProjectNode.name, module.GetBasePath() ); path.erase(path.find(ProjectNode.name, 0), ProjectNode.name.size() + 1); - fprintf ( OUT, "\t\t\tRelativePath=\"%s/gccasm.rules\"/>\r\n", path.c_str() ); + fprintf ( OUT, "\t\t\tRelativePath=\"%sgccasm.rules\"/>\r\n", path.c_str() ); fprintf ( OUT, "\t</ToolFiles>\r\n" ); int n = 0; @@ -329,16 +330,7 @@ } else if ( exe ) { - if( module.non_if_data.compilationUnits.size () > 0 ) /* native apps */ - { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /SECTION:INIT,D /ALIGN:4096 /FORCE:MULTIPLE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - } - else /* non native apps */ - { - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); - } - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress.c_str ()); } else if ( dll) @@ -397,29 +389,32 @@ fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - source_file.erase(0,2); - source_file = _replace_str(source_file, "\\", "-"); - string src_string = source_file.substr(0, source_file.find(".")); - for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) - { - std::string& config = cfgs[iconfig]; - fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); - fprintf ( OUT, "\t\t\t\t\tName=\"" ); - fprintf ( OUT, config.c_str() ); - fprintf ( OUT, "|Win32\">\r\n" ); - fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); - if (source_file.at(source_file.size() - 1) == 'c' || source_file.find(".cpp") != string::npos) + if (configuration.VSProjectVersion < "8.00") { + for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) { - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tObjectFile=\"$(OutDir)\\%s.obj\"/>\r\n", src_string.c_str()); + std::string& config = cfgs[iconfig]; + + if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's'))) + { + fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); + fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, config.c_str() ); + fprintf ( OUT, "|Win32\">\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + if (source_file.find(".idl") != string::npos) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\(InputName).obj\"/>\r\n" ); + } + else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\(InputName).obj"\"\r\n",include_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\(InputName).obj\"/>\r\n" ); + } + fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); + } } - else if (configuration.VSProjectVersion < "8.00" && (source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) - { - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\%s.obj"\"\r\n",include_string.c_str(), src_string.c_str() ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\%s.obj\"/>\r\n",src_string.c_str() ); - } - fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); } fprintf ( OUT, "\t\t\t</File>\r\n" ); }

18 years, 9 months

[mf] 19761: struct FileHolder to encapsulate _tfopen/_tfopen_s()

by mf＠svn.reactos.com

struct FileHolder to encapsulate _tfopen/_tfopen_s() Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-11-29 22:39:33 UTC (rev 19760) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-11-30 00:01:25 UTC (rev 19761) @@ -269,14 +269,37 @@ typedef std::filebuf STDIO_FILEBUF; #endif + +struct FileHolder +{ + FileHolder(LPCTSTR path, LPCTSTR mode) + { +#ifdef __STDC_WANT_SECURE_LIB__ // VS2005 + if (_tfopen_s(&_pfile, path, mode) != 0) + _pfile = NULL; +#else + _pfile = _tfopen(path, mode); +#endif + } + + ~FileHolder() + { + if (_pfile) + fclose(_pfile); + } + +protected: + FILE* _pfile; +}; + /// input file stream with ANSI/UNICODE file names -struct tifstream : public std::istream +struct tifstream : public std::istream, FileHolder { typedef std::istream super; tifstream(LPCTSTR path) : super(&_buf), - _pfile(_tfopen(path, TEXT("r"))), + FileHolder(path, TEXT("r")), #ifdef __GNUC__ _buf(_pfile, ios::in) #else @@ -285,25 +308,18 @@ { } - ~tifstream() - { - if (_pfile) - fclose(_pfile); - } - protected: - FILE* _pfile; STDIO_FILEBUF _buf; }; /// output file stream with ANSI/UNICODE file names -struct tofstream : public std::ostream +struct tofstream : public std::ostream, FileHolder { typedef std::ostream super; tofstream(LPCTSTR path) : super(&_buf), - _pfile(_tfopen(path, TEXT("w"))), + FileHolder(path, TEXT("w")), #ifdef __GNUC__ _buf(_pfile, ios::out) #else @@ -315,13 +331,9 @@ ~tofstream() { flush(); - - if (_pfile) - fclose(_pfile); } protected: - FILE* _pfile; STDIO_FILEBUF _buf; };

18 years, 9 months

[weiden] 19760: preliminary comment out the self-modifying code for RtlPrefetchMemoryNonTemporal

by weiden＠svn.reactos.com

preliminary comment out the self-modifying code for RtlPrefetchMemoryNonTemporal Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 22:39:12 UTC (rev 19759) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 22:39:33 UTC (rev 19760) @@ -527,7 +527,7 @@ if(Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE) { /* Replace the ret by a nop */ - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; + /* FIXME - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; */ } /* Does the CPU Support Fast System Call? */

18 years, 9 months

[hbirr] 19759: Cleanup isn't necessary after calling the driver in NtQueryDirectoryFile.

by hbirr＠svn.reactos.com

Cleanup isn't necessary after calling the driver in NtQueryDirectoryFile. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-11-29 22:11:54 UTC (rev 19758) +++ trunk/reactos/ntoskrnl/io/file.c 2005-11-29 22:39:12 UTC (rev 19759) @@ -2618,11 +2618,8 @@ } } - /* don't dereference the event anymore! */ - Event = NULL; - /* don't free the search pattern string */ - SearchPattern = NULL; + return Status; Cleanup: if (FileObject != NULL)

18 years, 9 months

[frik85] 19758: RosCMS Update:

by frik85＠svn.reactos.com

RosCMS Update: admin_dyncontent_edit.php: "update bug" fixed generate_page.php: page generation by translations works now the correct way Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php 2005-11-29 22:07:10 UTC (rev 19757) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php 2005-11-29 22:11:54 UTC (rev 19758) @@ -451,11 +451,8 @@ `dyn_content_text1` = '". mysql_escape_string($content_text1) ."', `dyn_content_text2` = '". mysql_escape_string($content_text2) ."', `dyn_content_text3` = '". mysql_escape_string($content_text3) ."', - `dyn_content_text4` = '". addslashes($content_data) ."', - `dyn_content_date` = CURDATE( ) , - `dyn_content_time` = CURTIME( ) + `dyn_content_text4` = '". addslashes($content_data) ."' WHERE `dyn_id` = '$rpm_db_id' LIMIT 1 ;"; - //`dyn_content_usrname_id` = '". $roscms_intern_account_id ."' , $content_post_lista=mysql_query($content_posta); $query_content = mysql_query("SELECT dyn_content_text4, dyn_content_id, dyn_content_name _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php --- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-11-29 22:07:10 UTC (rev 19757) +++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-11-29 22:11:54 UTC (rev 19758) @@ -129,7 +129,7 @@ else if ($rpm_site != "" && $rpm_sec2=="genpage") { $sql_lang="SELECT * FROM languages - WHERE lang_level != '0' AND lang_id = '$rpm_lang' + WHERE lang_level != '0' ORDER BY 'lang_level' DESC"; } else { @@ -208,12 +208,22 @@ $gentimea = $gentimea[1] + $gentimea[0]; $pg_starta = $gentimea; + + // Content: + + // Known Bug: language names that begin with "a" will not work; reason -> ORDER BY `content_lang` DESC" <=> content_lang = 'all' $query_content = mysql_query("SELECT * FROM content WHERE content_visible != 0 AND content_active = '1' AND (content_lang = '$myrow_lang[0]' OR content_lang = '$w3cformat' OR content_lang = 'all') - ORDER BY 'content_id' ASC"); + ORDER BY `content_lang` DESC"); while($result_content = mysql_fetch_array($query_content)) { // Content + /*if ($result_content['content_lang'] == "") { + continue; + } + if ($result_content['content_lang'] != $myrow_lang[0] || $result_content['content_lang'] != $w3cformat) { + if ()continue; + }*/ $data_content=$result_content['content_text']; $data_page = str_replace("[#cont_".$result_content['content_name']."]",$data_content, $data_page);

18 years, 9 months

[weiden] 19757: fixed some more warnings

by weiden＠svn.reactos.com

fixed some more warnings Modified: trunk/reactos/ntoskrnl/kdbg/kdb_string.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_string.c --- trunk/reactos/ntoskrnl/kdbg/kdb_string.c 2005-11-29 22:03:55 UTC (rev 19756) +++ trunk/reactos/ntoskrnl/kdbg/kdb_string.c 2005-11-29 22:07:10 UTC (rev 19757) @@ -118,7 +118,7 @@ else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (char *)s - 1 : (char *)nptr; + *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c --- trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-29 22:03:55 UTC (rev 19756) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-29 22:07:10 UTC (rev 19757) @@ -110,7 +110,7 @@ STATIC VOID -KiFnsaveToFxsaveFormat(PFXSAVE_FORMAT FxSave, CONST PFNSAVE_FORMAT FnSave) +KiFnsaveToFxsaveFormat(PFXSAVE_FORMAT FxSave, PFNSAVE_FORMAT FnSave) { INT i; @@ -138,7 +138,7 @@ } STATIC VOID -KiFxsaveToFnsaveFormat(PFNSAVE_FORMAT FnSave, CONST PFXSAVE_FORMAT FxSave) +KiFxsaveToFnsaveFormat(PFNSAVE_FORMAT FnSave, PFXSAVE_FORMAT FxSave) { INT i; @@ -158,7 +158,7 @@ STATIC VOID -KiFloatingSaveAreaToFxSaveArea(PFX_SAVE_AREA FxSaveArea, CONST FLOATING_SAVE_AREA *FloatingSaveArea) +KiFloatingSaveAreaToFxSaveArea(PFX_SAVE_AREA FxSaveArea, FLOATING_SAVE_AREA *FloatingSaveArea) { if (FxsrSupport) {

18 years, 9 months

[weiden] 19756: remove obsolete shutdown tool from rosapps

by weiden＠svn.reactos.com

remove obsolete shutdown tool from rosapps Modified: trunk/rosapps/sysutils/sysutils.xml _____ Modified: trunk/rosapps/sysutils/sysutils.xml --- trunk/rosapps/sysutils/sysutils.xml 2005-11-29 22:03:43 UTC (rev 19755) +++ trunk/rosapps/sysutils/sysutils.xml 2005-11-29 22:03:55 UTC (rev 19756) @@ -31,10 +31,6 @@ <xi:include href="regexpl/regexpl.xml" /> </directory> -<directory name="shutdown"> - <xi:include href="shutdown/shutdown.xml" /> -</directory> - <directory name="tcat"> <xi:include href="tcat/cat.xml" /> </directory>

18 years, 9 months

[weiden] 19755: remove obsolete shutdown tool from rosapps

by weiden＠svn.reactos.com

remove obsolete shutdown tool from rosapps Deleted: trunk/rosapps/sysutils/shutdown/

18 years, 9 months

[gvg] 19754: Add command line shutdown utility to build

by gvg＠svn.reactos.com

Add command line shutdown utility to build Modified: trunk/reactos/apps/utils/directory.xml Modified: trunk/reactos/apps/utils/shutdown/shutdown.c Added: trunk/reactos/apps/utils/shutdown/shutdown.xml Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/apps/utils/directory.xml --- trunk/reactos/apps/utils/directory.xml 2005-11-29 21:49:41 UTC (rev 19753) +++ trunk/reactos/apps/utils/directory.xml 2005-11-29 21:57:19 UTC (rev 19754) @@ -2,10 +2,13 @@ <directory name="net"> <xi:include href="net/directory.xml" /> </directory> -<directory name="rosperf"> - <xi:include href="rosperf/rosperf.xml" /> +<directory name="shutdown"> + <xi:include href="shutdown/shutdown.xml" /> </directory> <directory name="ps"> <xi:include href="ps/ps.xml" /> </directory> +<directory name="rosperf"> + <xi:include href="rosperf/rosperf.xml" /> +</directory> </group> Property changes on: trunk/reactos/apps/utils/shutdown ___________________________________________________________________ Name: svn:ignore - *.o *.a *.d *.exe *.coff *.sym *.map + GNUmakefile _____ Modified: trunk/reactos/apps/utils/shutdown/shutdown.c --- trunk/reactos/apps/utils/shutdown/shutdown.c 2005-11-29 21:49:41 UTC (rev 19753) +++ trunk/reactos/apps/utils/shutdown/shutdown.c 2005-11-29 21:57:19 UTC (rev 19754) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS shutdown/logoff utility * FILE: apps/utils/shutdown/shutdown.c _____ Added: trunk/reactos/apps/utils/shutdown/shutdown.xml --- trunk/reactos/apps/utils/shutdown/shutdown.xml 2005-11-29 21:49:41 UTC (rev 19753) +++ trunk/reactos/apps/utils/shutdown/shutdown.xml 2005-11-29 21:57:19 UTC (rev 19754) @@ -0,0 +1,6 @@ +<module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe"> + <include base="shutdown">.</include> + <define name="__USE_W32API" /> + <define name="WINVER">0x0501</define> + <file>shutdown.c</file> +</module> Property changes on: trunk/reactos/apps/utils/shutdown/shutdown.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-29 21:49:41 UTC (rev 19753) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-29 21:57:19 UTC (rev 19754) @@ -224,6 +224,7 @@ apps\utils\net\whois\whois.exe 1 apps\utils\ps\ps.exe 1 apps\utils\rosperf\rosperf.exe 1 +apps\utils\shutdown\shutdown.exe 1 media\fonts\c0419bt_.ttf 3 media\fonts\c0582bt_.ttf 3 media\fonts\c0583bt_.ttf 3

18 years, 9 months

[weiden] 19753: properly capture the file name in NtQueryDirectoryFile

by weiden＠svn.reactos.com

properly capture the file name in NtQueryDirectoryFile Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-11-29 19:07:03 UTC (rev 19752) +++ trunk/reactos/ntoskrnl/io/file.c 2005-11-29 21:49:41 UTC (rev 19753) @@ -2458,7 +2458,7 @@ { PIRP Irp; PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; + PFILE_OBJECT FileObject = NULL; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; @@ -2482,21 +2482,21 @@ sizeof(ULONG)); if (FileName) { - ProbeForRead(FileName, - sizeof(UNICODE_STRING), + UNICODE_STRING CapturedFileName; + + CapturedFileName = ProbeForReadUnicodeString(FileName); + ProbeForRead(CapturedFileName.Buffer, + CapturedFileName.MaximumLength, 1); - ProbeForRead(FileName->Buffer, - FileName->MaximumLength, - 1); - SearchPattern = ExAllocatePool(NonPagedPool, FileName->Length + sizeof(WCHAR) + sizeof(UNICODE_STRING)); + SearchPattern = ExAllocatePool(NonPagedPool, CapturedFileName.Length + sizeof(WCHAR) + sizeof(UNICODE_STRING)); if (SearchPattern == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH_LEAVE; } SearchPattern->Buffer = (PWCHAR)((ULONG_PTR)SearchPattern + sizeof(UNICODE_STRING)); - SearchPattern->MaximumLength = FileName->Length + sizeof(WCHAR); - RtlCopyUnicodeString(SearchPattern, FileName); + SearchPattern->MaximumLength = CapturedFileName.Length + sizeof(WCHAR); + RtlCopyUnicodeString(SearchPattern, &CapturedFileName); } } _SEH_HANDLE @@ -2507,11 +2507,7 @@ if(!NT_SUCCESS(Status)) { - if (SearchPattern) - { - ExFreePool(SearchPattern); - } - return Status; + goto Cleanup; } } @@ -2524,11 +2520,7 @@ NULL); if (!NT_SUCCESS(Status)) { - if (SearchPattern) - { - ExFreePool(SearchPattern); - } - return Status; + goto Cleanup; } /* Get Event Object */ @@ -2540,15 +2532,11 @@ PreviousMode, (PVOID *)&Event, NULL); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { - ObDereferenceObject(FileObject); - if (SearchPattern) - { - ExFreePool(SearchPattern); - } - return(Status); + goto Cleanup; } + KeClearEvent(Event); } @@ -2576,16 +2564,8 @@ /* Allocate the IRP */ if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) { - ObDereferenceObject(FileObject); - if (PEvent) - { - ObDereferenceObject(Event); - } - if (SearchPattern) - { - ExFreePool(SearchPattern); - } - return STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; } /* Set up the IRP */ @@ -2638,6 +2618,26 @@ } } + /* don't dereference the event anymore! */ + Event = NULL; + + /* don't free the search pattern string */ + SearchPattern = NULL; + +Cleanup: + if (FileObject != NULL) + { + ObDereferenceObject(FileObject); + } + if (Event != NULL) + { + ObDereferenceObject(Event); + } + if (SearchPattern != NULL) + { + ExFreePool(SearchPattern); + } + /* Return the Status */ return Status; }

18 years, 9 months

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

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 November 2005