Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbirr] 13173: Fixed the range which must be zeroed if the write starts after the end of the file.
by hbirr＠svn.reactos.com 20 Jan '05

20 Jan '05

Fixed the range which must be zeroed if the write starts after the end of the file. Modified: branches/ext2/reactos/drivers/fs/ext2/src/write.c _____ Modified: branches/ext2/reactos/drivers/fs/ext2/src/write.c --- branches/ext2/reactos/drivers/fs/ext2/src/write.c 2005-01-20 23:21:14 UTC (rev 13172) +++ branches/ext2/reactos/drivers/fs/ext2/src/write.c 2005-01-20 23:24:51 UTC (rev 13173) @@ -544,7 +544,7 @@ LogicalBlockSize = EXT2_MIN_BLOCK_SIZE << PtrVCB->LogBlockSize; - if ( ByteOffset.QuadPart + WriteLength >= PtrReqdFCB->CommonFCBHeader.FileSize.QuadPart ) + if ( ByteOffset.QuadPart + WriteLength > PtrReqdFCB->CommonFCBHeader.FileSize.QuadPart ) { if( PagingIo ) { @@ -621,7 +621,7 @@ // Start offset is the New File size StartOffsetForZeroing.QuadPart = - PtrReqdFCB->CommonFCBHeader.FileSize.QuadPart + WriteLength; + ByteOffset.QuadPart + WriteLength; // End offset is the New Allocation size EndOffsetForZeroing.QuadPart = PtrReqdFCB->CommonFCBHeader.AllocationSize.QuadPart; }

2 1

[gdalsnes] 13174: forgot a letter...
by gdalsnes＠svn.reactos.com 20 Jan '05

20 Jan '05

forgot a letter... Modified: trunk/reactos/lib/rtl/readme.txt _____ Modified: trunk/reactos/lib/rtl/readme.txt --- trunk/reactos/lib/rtl/readme.txt 2005-01-20 23:24:51 UTC (rev 13173) +++ trunk/reactos/lib/rtl/readme.txt 2005-01-20 23:25:05 UTC (rev 13174) @@ -2,4 +2,4 @@ ExAllocatePool (and friends) must be used exclusively. RtlAllocateHeap (and friends) must NOT be used! ExAllocatePool (and friends) translate to RtlAllocateHeap (and friends) in ntdll\rtl\libsupp.c. -RtlEnterCriticalSection (and friends) must be used exclusively. ExAcquireFastMutex (and friends) must NOT be used! RtlEnterCriticalSection (and friends) translate to ExAcquireFastMutex (and friends) in ntoskrnl\rtl\libsupp. This means that RtlEnterCriticalSection (and friends) can NOT be used recursively in RTL. The reason for choosing RtlEnterCriticalSection (and friends) over ExAcquireFastMutex (and friends) is that the FAST_MUTEX struct is smaller than the RTL_CRITICAL_SECTION struct. \ No newline at end of file +RtlEnterCriticalSection (and friends) must be used exclusively. ExAcquireFastMutex (and friends) must NOT be used! RtlEnterCriticalSection (and friends) translate to ExAcquireFastMutex (and friends) in ntoskrnl\rtl\libsupp.c. This means that RtlEnterCriticalSection (and friends) can NOT be used recursively in RTL. The reason for choosing RtlEnterCriticalSection (and friends) over ExAcquireFastMutex (and friends) is that the FAST_MUTEX struct is smaller than the RTL_CRITICAL_SECTION struct. \ No newline at end of file

1 0

[gdalsnes] 13172: add readme with rtl restrictions info
by gdalsnes＠svn.reactos.com 20 Jan '05

20 Jan '05

add readme with rtl restrictions info Added: trunk/reactos/lib/rtl/readme.txt _____ Added: trunk/reactos/lib/rtl/readme.txt --- trunk/reactos/lib/rtl/readme.txt 2005-01-20 23:05:36 UTC (rev 13171) +++ trunk/reactos/lib/rtl/readme.txt 2005-01-20 23:21:14 UTC (rev 13172) @@ -0,0 +1,5 @@ +RTL restrictions: + +ExAllocatePool (and friends) must be used exclusively. RtlAllocateHeap (and friends) must NOT be used! ExAllocatePool (and friends) translate to RtlAllocateHeap (and friends) in ntdll\rtl\libsupp.c. + +RtlEnterCriticalSection (and friends) must be used exclusively. ExAcquireFastMutex (and friends) must NOT be used! RtlEnterCriticalSection (and friends) translate to ExAcquireFastMutex (and friends) in ntoskrnl\rtl\libsupp. This means that RtlEnterCriticalSection (and friends) can NOT be used recursively in RTL. The reason for choosing RtlEnterCriticalSection (and friends) over ExAcquireFastMutex (and friends) is that the FAST_MUTEX struct is smaller than the RTL_CRITICAL_SECTION struct. \ No newline at end of file

1 0

[chorns] 13171: Modules are built in the intermediate directory.
by chorns＠svn.reactos.com 20 Jan '05

20 Jan '05

Modules are built in the intermediate directory. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-20 22:45:22 UTC (rev 13170) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-20 23:05:36 UTC (rev 13171) @@ -221,7 +221,7 @@ module.node.location, module.type ); h->Process ( module ); - h->GenerateDirectoryTargets (); + h->GenerateDirectoryTargets (); } string _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-20 22:45:22 UTC (rev 13170) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-20 23:05:36 UTC (rev 13171) @@ -946,7 +946,7 @@ module.name.c_str () ); fprintf ( fMakefile, "%s: %s\n\n", module.name.c_str (), - module.GetPath ().c_str () ); + FixupTargetFilename ( module.GetPath () ).c_str () ); // future references to the macros will be to get their values cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ());

1 0

[gvg] 13170: Gedi <gedi@ntworld.com>
by gvg＠svn.reactos.com 20 Jan '05

20 Jan '05

Gedi <gedi(a)ntworld.com> Prevent possible use of uninitialized var warning Modified: trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c _____ Modified: trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c --- trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c 2005-01-20 22:24:30 UTC (rev 13169) +++ trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c 2005-01-20 22:45:22 UTC (rev 13170) @@ -472,7 +472,7 @@ mask &= ~DD_BACK_LEFT_BIT; #endif // DDRAW #else - DWORD dwColor; + DWORD dwColor = 0; WORD wColor; BYTE bColor; LPDWORD lpdw = (LPDWORD)Current->pbPixels; @@ -523,8 +523,6 @@ GetGValue(Current->clearpixel), GetBValue(Current->clearpixel)); } - else - dwColor = 0; if (nBypp != 3) {

1 0

[chorns] 13169: Fix copy/paste error.
by chorns＠svn.reactos.com 20 Jan '05

20 Jan '05

Fix copy/paste error. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-20 22:19:01 UTC (rev 13168) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-20 22:24:30 UTC (rev 13169) @@ -184,7 +184,7 @@ fprintf ( fMakefile, "mkdir = tools%crmkdir\n", CSEP ); fprintf ( fMakefile, "NUL=NUL\n" ); fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild\n" ); - fprintf ( fMakefile, "bin2res = tools" SSEP "winebuild" SSEP "bin2res\n" ); + fprintf ( fMakefile, "bin2res = tools" SSEP "bin2res" SSEP "bin2res\n" ); fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=",

1 0

[ros-diffs] [chorns] 13168: * Build bin2res, winmm, comctl32, aclui, acledit
by chorns＠svn.reactos.com 20 Jan '05

20 Jan '05

* Build bin2res, winmm, comctl32, aclui, acledit * Correct dependencies for build tool invocations * Normalize paths in the generated makefile Added: branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml Added: branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml Added: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_large.bmp Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_small.bmp Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_large.bmp Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_small.bmp Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_large.bmp Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_small.bmp Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_copy.cur Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divider.cur Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divideropen.cur Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_movebutton.cur Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_dragarrow.ico Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_error_sm.ico Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_info_sm.ico Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_warn_sm.ico Added: branches/xmlbuildsystem/reactos/lib/comctl32/idt_check.bmp Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml Added: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp Modified: branches/xmlbuildsystem/reactos/tools/tools.xml Property changes on: branches/xmlbuildsystem/reactos/drivers/video/displays/vga ___________________________________________________________________ Name: svn:ignore - vgaddi.coff *.sym *.o *.a *.dll *.map *.tmp .*.d + vgaddi.coff *.sym *.o *.a *.dll *.map *.tmp .*.d *.sys _____ Added: branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml --- branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml 2005-01-20 22:19:01 UTC (rev 13168) @@ -0,0 +1,14 @@ +<module name="acledit" type="win32dll"> + <importlibrary definition="acledit.def" /> + <include base="acledit">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <file>acledit.c</file> + <file>stubs.c</file> + <file>acledit.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml --- branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml 2005-01-20 22:19:01 UTC (rev 13168) @@ -0,0 +1,18 @@ +<module name="aclui" type="win32dll"> + <importlibrary definition="aclui.def" /> + <include base="aclui">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x0600</define> + <library>rosrtl</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>aclui.c</file> + <file>aclui.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c *.ico *.bmp *.cur + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml --- branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-01-20 22:19:01 UTC (rev 13168) @@ -0,0 +1,51 @@ +<module name="comctl32" type="win32dll"> + <dependency>bin2res</dependency> + <dependency>winebuild</dependency> + <importlibrary definition="comctl32.spec.def" /> + <include base="comctl32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>winmm</library> + <file>animate.c</file> + <file>comboex.c</file> + <file>comctl32undoc.c</file> + <file>commctrl.c</file> + <file>datetime.c</file> + <file>draglist.c</file> + <file>flatsb.c</file> + <file>header.c</file> + <file>hotkey.c</file> + <file>imagelist.c</file> + <file>ipaddress.c</file> + <file>listview.c</file> + <file>monthcal.c</file> + <file>nativefont.c</file> + <file>pager.c</file> + <file>progress.c</file> + <file>propsheet.c</file> + <file>rebar.c</file> + <file>smoothscroll.c</file> + <file>string.c</file> + <file>status.c</file> + <file>syslink.c</file> + <file>tab.c</file> + <file>toolbar.c</file> + <file>tooltips.c</file> + <file>trackbar.c</file> + <file>treeview.c</file> + <file>updown.c</file> + <file>rsrc.rc</file> + <file>comctl32.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_large.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_large.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_small.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_small.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_large.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_large.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_small.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_small.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_large.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_large.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_small.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_small.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_copy.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idc_copy.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divider.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divider.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divideropen.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divideropen.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idc_movebutton.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idc_movebutton.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_dragarrow.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idi_dragarrow.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_error_sm.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_error_sm.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_info_sm.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_info_sm.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_warn_sm.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_warn_sm.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comctl32/idt_check.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comctl32/idt_check.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-20 22:19:01 UTC (rev 13168) @@ -1,3 +1,9 @@ +<directory name="acledit"> + <xi:include href="acledit/acledit.xml" /> +</directory> +<directory name="aclui"> + <xi:include href="aclui/aclui.xml" /> +</directory> <directory name="adns"> <xi:include href="adns/adns.xml" /> </directory> @@ -4,6 +10,9 @@ <directory name="advapi32"> <xi:include href="advapi32/advapi32.xml" /> </directory> +<directory name="comctl32"> + <xi:include href="comctl32/comctl32.xml" /> +</directory> <directory name="dnsapi"> <xi:include href="dnsapi/dnsapi.xml" /> </directory> @@ -46,6 +55,9 @@ <directory name="user32"> <xi:include href="user32/user32.xml" /> </directory> +<directory name="winmm"> + <xi:include href="winmm/winmm.xml" /> +</directory> <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml --- branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-01-20 22:19:01 UTC (rev 13168) @@ -0,0 +1,29 @@ +<module name="winmm" type="win32dll"> + <dependency>bin2res</dependency> + <dependency>winebuild</dependency> + <importlibrary definition="winmm.spec.def" /> + <include base="winmm">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <file>driver.c</file> + <file>joystick.c</file> + <file>lolvldrv.c</file> + <file>mci.c</file> + <file>mmio.c</file> + <file>playsound.c</file> + <file>time.c</file> + <file>winmm.c</file> + <file>winmm_res.rc</file> + <file>winmm.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml 2005-01-20 22:19:01 UTC (rev 13168) @@ -0,0 +1,6 @@ +<module name="bin2res" type="buildtool"> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <file>bin2res.c</file> + <file>mkstemps.c</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-20 22:19:01 UTC (rev 13168) @@ -184,6 +184,7 @@ fprintf ( fMakefile, "mkdir = tools%crmkdir\n", CSEP ); fprintf ( fMakefile, "NUL=NUL\n" ); fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild\n" ); + fprintf ( fMakefile, "bin2res = tools" SSEP "winebuild" SSEP "bin2res\n" ); fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=", @@ -197,13 +198,12 @@ fprintf ( fMakefile, "\n" ); fprintf ( fMakefile, ".PHONY: clean\n\n" ); - //fprintf ( fMakefile, "clean:\n\t-@${rm} $(PROJECT_CLEAN)\n\n" ); } void MingwBackend::GenerateAllTarget () { - fprintf ( fMakefile, "all:" ); + fprintf ( fMakefile, "all:" ); for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; @@ -227,5 +227,5 @@ string FixupTargetFilename ( const string& targetFilename ) { - return string("$(ROS_INTERMEDIATE)") + targetFilename; + return string("$(ROS_INTERMEDIATE)") + NormalizeFilename ( targetFilename ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-20 22:19:01 UTC (rev 13168) @@ -136,6 +136,16 @@ ".a" ); } +bool +MingwModuleHandler::IsGeneratedFile ( const File& file ) const +{ + string extension = GetExtension ( file.name ); + if ( extension == ".spec" || extension == "SPEC" ) + return true; + else + return false; +} + string MingwModuleHandler::GetImportLibraryDependencies ( const Module& module ) const { @@ -191,13 +201,17 @@ } string -MingwModuleHandler::GetSourceFilenames ( const Module& module ) const +MingwModuleHandler::GetSourceFilenames ( const Module& module, + bool includeGeneratedFiles ) const { size_t i; string sourceFilenames ( "" ); for ( i = 0; i < module.files.size (); i++ ) - sourceFilenames += " " + GetActualSourceFilename ( module.files[i]->name ); + { + if ( includeGeneratedFiles || !IsGeneratedFile ( *module.files[i] ) ) + sourceFilenames += " " + GetActualSourceFilename ( module.files[i]->name ); + } vector<If*> ifs = module.ifs; for ( i = 0; i < ifs.size(); i++ ) { @@ -206,12 +220,29 @@ for ( j = 0; j < rIf.ifs.size(); j++ ) ifs.push_back ( rIf.ifs[j] ); for ( j = 0; j < rIf.files.size(); j++ ) - sourceFilenames += " " + GetActualSourceFilename ( rIf.files[j]->name ); + { + if ( includeGeneratedFiles || !IsGeneratedFile ( *rIf.files[j] ) ) + sourceFilenames += " " + GetActualSourceFilename ( rIf.files[j]->name ); + } } return sourceFilenames; } string +MingwModuleHandler::GetSourceFilenames ( const Module& module ) const +{ + return GetSourceFilenames ( module, + true ); +} + +string +MingwModuleHandler::GetSourceFilenamesWithoutGeneratedFiles ( const Module& module ) const +{ + return GetSourceFilenames ( module, + false ); +} + +string MingwModuleHandler::GetObjectFilename ( const string& sourceFilename ) const { string newExtension; @@ -1009,7 +1040,7 @@ parameters += invokeFile.switches; parameters += " "; } - parameters += invokeFile.name; + parameters += invokeFile.name ; } return parameters; @@ -1033,20 +1064,20 @@ string invokeTarget = module.GetInvocationTarget ( i ); fprintf ( fMakefile, - "%s: %s\n\n", - invoke.GetTargets ().c_str (), + ".PHONY: %s\n\n", invokeTarget.c_str () ); fprintf ( fMakefile, + "%s: %s\n\n", + invokeTarget.c_str (), + invoke.GetTargets ().c_str () ); + fprintf ( fMakefile, "%s: %s\n", - invokeTarget.c_str (), + invoke.GetTargets ().c_str (), FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str () ); fprintf ( fMakefile, "\t%s %s\n\n", FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str (), GetInvocationParameters ( invoke ).c_str () ); - fprintf ( fMakefile, - ".PNONY: %s\n\n", - invokeTarget.c_str () ); } } @@ -1061,7 +1092,7 @@ MingwModuleHandler::GeneratePreconditionDependencies ( const Module& module ) const { string preconditionDependenciesName = GetPreconditionDependenciesName ( module ); - string sourceFilenames = GetSourceFilenames ( module ); + string sourceFilenames = GetSourceFilenamesWithoutGeneratedFiles ( module ); string dependencies = GetModuleDependencies ( module ); string s = GetInvocationDependencies ( module ); if ( s.length () > 0 ) @@ -1330,10 +1361,10 @@ } else { + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); fprintf ( fMakefile, "%s:\n", target.c_str ()); - fprintf ( fMakefile, ".PHONY: %s\n\n", - target.c_str ()); } } @@ -1385,10 +1416,10 @@ } else { + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); fprintf ( fMakefile, "%s:\n", target.c_str () ); - fprintf ( fMakefile, ".PHONY: %s\n\n", - target.c_str ()); } } @@ -1447,10 +1478,10 @@ } else { + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); fprintf ( fMakefile, "%s:\n\n", target.c_str ()); - fprintf ( fMakefile, ".PHONY: %s\n\n", - target.c_str ()); } } @@ -1465,12 +1496,34 @@ void MingwWin32DLLModuleHandler::Process ( const Module& module ) { + GenerateExtractWineDLLResourcesTarget ( module ); GeneratePreconditionDependencies ( module ); GenerateWin32DLLModuleTarget ( module ); GenerateInvocations ( module ); } void +MingwWin32DLLModuleHandler::GenerateExtractWineDLLResourcesTarget ( const Module& module ) +{ + fprintf ( fMakefile, ".PHONY: %s_extractresources\n\n", + module.name.c_str () ); + fprintf ( fMakefile, "%s_extractresources: bin2res\n", + module.name.c_str () ); + for ( size_t i = 0; i < module.files.size (); i++ ) + { + File& file = *module.files[i]; + string extension = GetExtension ( file.name ); + if ( extension == ".rc" || extension == ".RC" ) + { + string resource = FixupTargetFilename ( file.name ); + fprintf ( fMakefile, "\t@echo ${bin2res} -f -x %s\n", + resource.c_str () ); + } + } + fprintf ( fMakefile, "\n"); +} + +void MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module ) { static string ros_junk ( "$(ROS_TEMPORARY)" ); @@ -1497,10 +1550,10 @@ } else { + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str () ); fprintf ( fMakefile, "%s:\n\n", - target.c_str ()); - fprintf ( fMakefile, ".PHONY: %s\n\n", - target.c_str ()); + target.c_str () ); } } @@ -1548,9 +1601,9 @@ } else { + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); fprintf ( fMakefile, "%s:\n\n", target.c_str ()); - fprintf ( fMakefile, ".PHONY: %s\n\n", - target.c_str ()); } } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-20 22:19:01 UTC (rev 13168) @@ -19,7 +19,7 @@ void GenerateDirectoryTargets () const; protected: - const std::string &PassThruCacheDirectory ( const std::string &f ) const; + const std::string &PassThruCacheDirectory ( const std::string &f ) const; std::string GetWorkingDirectory () const; std::string GetDirectory (const std::string& filename ) const; std::string GetExtension ( const std::string& filename ) const; @@ -28,10 +28,14 @@ const std::string& newExtension ) const; std::string GetActualSourceFilename ( const std::string& filename ) const; std::string GetModuleArchiveFilename ( const Module& module ) const; + bool IsGeneratedFile ( const File& file ) const; std::string GetImportLibraryDependencies ( const Module& module ) const; std::string GetModuleDependencies ( const Module& module ) const; std::string GetAllDependencies ( const Module& module ) const; + std::string GetSourceFilenames ( const Module& module, + bool includeGeneratedFiles ) const; std::string GetSourceFilenames ( const Module& module ) const; + std::string GetSourceFilenamesWithoutGeneratedFiles ( const Module& module ) const; std::string GetObjectFilename ( const std::string& sourceFilename ) const; std::string GetObjectFilenames ( const Module& module ) const; @@ -54,7 +58,7 @@ std::string GetDefinitionDependencies ( const Module& module ) const; std::string GetLinkingDependencies ( const Module& module ) const; static FILE* fMakefile; - static std::set<std::string> directory_set; + static std::set<std::string> directory_set; private: std::string ConcatenatePaths ( const std::string& path1, const std::string& path2 ) const; @@ -202,6 +206,7 @@ MingwWin32DLLModuleHandler (); virtual void Process ( const Module& module ); private: + void GenerateExtractWineDLLResourcesTarget ( const Module& module ); void GenerateWin32DLLModuleTarget ( const Module& module ); }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-20 22:19:01 UTC (rev 13168) @@ -30,6 +30,7 @@ TESTS = \ tests/definetest.o \ + tests/functiontest.o \ tests/iftest.o \ tests/includetest.o \ tests/invoketest.o \ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-20 22:19:01 UTC (rev 13168) @@ -21,6 +21,15 @@ return s2; } +string +NormalizeFilename ( const string& filename ) +{ + Path path; + string normalizedPath = path.Fixup ( filename, true ); + string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath ); + return FixSeparator ( relativeNormalizedPath ); +} + Module::Module ( const Project& project, const XMLElement& moduleNode, const string& modulePath ) @@ -449,7 +458,7 @@ InvokeFile& file = *output[i]; if ( targets.length () > 0 ) targets += " "; - targets += file.name; + targets += NormalizeFilename ( file.name ); } return targets; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-20 22:19:01 UTC (rev 13168) @@ -315,4 +315,7 @@ extern std::string FixSeparator ( const std::string& s ); +extern std::string +NormalizeFilename ( const std::string& filename ); + #endif /* __RBUILD_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-20 22:19:01 UTC (rev 13168) @@ -2,6 +2,7 @@ #define __TEST_H #include "rbuild.h" +#include "backend/mingw/mingw.h" class BaseTest { @@ -95,4 +96,10 @@ void Run(); }; +class FunctionTest : public BaseTest +{ +public: + void Run(); +}; + #endif /* __TEST_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-20 22:19:01 UTC (rev 13168) @@ -176,6 +176,7 @@ tests.push_back(new InvokeTest()); tests.push_back(new LinkerFlagTest()); tests.push_back(new IfTest()); + tests.push_back(new FunctionTest()); } }; _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-01-20 22:19:01 UTC (rev 13168) @@ -0,0 +1,9 @@ +#include "test.h" + +using std::string; + +void FunctionTest::Run () +{ + string fixedupFilename = FixupTargetFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" ); + ARE_EQUAL ( "$(ROS_INTERMEDIATE)dir1" SSEP "filename.txt", fixedupFilename ); +} _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.xml --- branches/xmlbuildsystem/reactos/tools/tools.xml 2005-01-20 21:03:35 UTC (rev 13167) +++ branches/xmlbuildsystem/reactos/tools/tools.xml 2005-01-20 22:19:01 UTC (rev 13168) @@ -1,3 +1,6 @@ +<directory name="bin2res"> + <xi:include href="bin2res/bin2res.xml" /> +</directory> <module name="buildno" type="buildtool"> <include base="buildno">.</include> <file>buildno.c</file>

1 0

[weiden] 13167: don't touch memory outside the area to be probed in ProbeForWrite() and minor address range check fixes in ProbeForRead/Write()
by weiden＠svn.reactos.com 20 Jan '05

20 Jan '05

don't touch memory outside the area to be probed in ProbeForWrite() and minor address range check fixes in ProbeForRead/Write() Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-20 13:31:49 UTC (rev 13166) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-20 21:03:35 UTC (rev 13167) @@ -795,7 +795,7 @@ IN ULONG Length, IN ULONG Alignment) { - ASSERT(Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8); + ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); if (Length == 0) return; @@ -804,8 +804,8 @@ { ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); } - else if ((ULONG_PTR)Address + Length < (ULONG_PTR)Address || - (ULONG_PTR)Address + Length > (ULONG_PTR)MmUserProbeAddress) + else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || + (ULONG_PTR)Address + Length - 1 > (ULONG_PTR)MmUserProbeAddress) { ExRaiseStatus (STATUS_ACCESS_VIOLATION); } @@ -820,10 +820,10 @@ IN ULONG Length, IN ULONG Alignment) { - volatile PCHAR Ptr; - ULONG i; + volatile CHAR *Current; + PCHAR Last; - ASSERT(Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8); + ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); if (Length == 0) return; @@ -832,18 +832,21 @@ { ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); } - else if ((ULONG_PTR)Address + Length < (ULONG_PTR)Address || - (ULONG_PTR)Address + Length > (ULONG_PTR)MmUserProbeAddress) + + Last = (PCHAR)((ULONG_PTR)Address + Length - 1); + if ((ULONG_PTR)Last < (ULONG_PTR)Address || + (ULONG_PTR)Last > (ULONG_PTR)MmUserProbeAddress) { ExRaiseStatus (STATUS_ACCESS_VIOLATION); } /* Check for accessible pages */ - for (i = 0; i < Length; i += PAGE_SIZE) + Current = (CHAR*)Address; + do { - Ptr = (PCHAR)(((ULONG_PTR)Address & ~(PAGE_SIZE - 1)) + i); - *Ptr = *Ptr; - } + *Current = *Current; + Current = (CHAR*)((ULONG_PTR)Current + PAGE_SIZE); + } while (Current <= Last); } /* EOF */

1 0

[ion] 13166: Fix FsRtl function prototypes
by ion＠svn.reactos.com 20 Jan '05

20 Jan '05

Fix FsRtl function prototypes Modified: trunk/reactos/include/ddk/fsfuncs.h Modified: trunk/reactos/include/ddk/fstypes.h Modified: trunk/reactos/ntoskrnl/fs/dbcsname.c Modified: trunk/reactos/ntoskrnl/fs/notify.c Modified: trunk/reactos/ntoskrnl/fs/util.c _____ Modified: trunk/reactos/include/ddk/fsfuncs.h --- trunk/reactos/include/ddk/fsfuncs.h 2005-01-20 13:17:57 UTC (rev 13165) +++ trunk/reactos/include/ddk/fsfuncs.h 2005-01-20 13:31:49 UTC (rev 13166) @@ -5,51 +5,14 @@ #include <ntos/fstypes.h> -/* Some comments on the Prototypes that aren't in the GNU IFS: +/* Some comments on the Prototypes that aren't in the IFS: -The following come from alternate sources, or guessed from documentation: -FsRtlNotifyFullChangeDirectory GOOGLE GROUPS -FsRtlIsPagingFile OSR DOCUMENTATION -FsRtlAcquireFileExclusive (GUESS: The function takes a single parameter. The function name is "AcquireFile". Logical assumption says this is a File Object. NTFSD ML Post confirms.) -FsRtlReleaseFile (GUESS: The function takes a single parameter. The function name is "AcquireFile". Logical assumption says this is a File Object. NTFSD ML Post confirms.) FsRtlMdlReadCompleteDev (FsRtlMdlReadComplete is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param) FsRtlMdlReadDev (FsRtlMdlReadDev is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param) FsRtlMdlWriteCompleteDev FsRtlMdlWriteCompleteDev is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param) FsRtlPrepareMdlWrite (Compared with CcMdlWrite, which is already documented) FsRtlPrepareMdlWriteDev (Same as above, and add a pointer to device object (Dev suffix) -FsRtlGetNextMcbEntry(FsRtlGetNextLargeMcbEntry is documented and uses LONGLONGs. Logical assumption that this one only uses LONGS and non-large MCB (Documented)) -Stream Context. Going along with public OSR documenttion: - -FsRtlInsertPerStreamContext: -"This call is used by the file system filter driver to associate a given context block -(allocated by the filter and initialized using FsRtlInitPerStreamContext) with the stream associated with the given file object." -Notice we are told "given context block...initialized using FsRtlInitPerStreamContext". This function description tells us: -" provide space for the FSRTL_PER_STREAM_CONTEXT block in the filter driver's context structure" -Therefore, one of the parameters is PFSRTL_PER_STREAM_CONTEXT. -"with the stream associated with the given file object." The OSR Documentations then mentions: -"Tracking per-file (or "per stream") context information in FSRTL_ADVANCED_FCB_HEADER" -So we are associating a FSRTL_PER_STREAM_CONTEXT block with the FSRTL_ADVANCED_FCB_HEADER associated with the file object. -FSRTL_ADVANCED_FCB_HEADER is documented by a search through Google. -FSRTL_PER_STREAM_CONTEXT is *NOT* documented anywhere else then in the IFS, so it has been removed. - -FsRtlLookupPerStreamContextInternal -"FsRtlLookupPerStreamContext - this call is used by the file system filter driver to locate a given context -block that is associated with the file object. Typically, a file system filter driver will identify its -own context block using unique OwnerId and InstanceId parameters when creating the context block and subsequently -when locating the associated information." -OSR tells us here that the last two parameters are OwnerId and InstanceId. It also says it will find a given context block, -so there's our Return Value. (Although, not being documented, we must put PVOID). It looks into a file object's stream, so we -probably need that FCB header again. - -FsRtlRemovePerStreamContext -OSR is vague, so all we know for sure is that we are sending an FCB Header. The return value isn't NTSTATUS, but seems to be a -pointer. We don't know what the two other parameters are, so they have been marked as unknown. - -FsRtlTeardownPerStreamContexts -OSR doens't tell a lot, but we only have one parameter. It must be the FCB Header. Furthermore, the CVS of Captive implements -this function as a stub, and confirms the theory. - */ #ifdef __NTOSKRNL__ @@ -144,10 +107,10 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL ); -DWORD +NTSTATUS STDCALL FsRtlBalanceReads ( - DWORD Unknown0 + PDEVICE_OBJECT TargetDevice ); BOOLEAN STDCALL @@ -371,19 +334,21 @@ BOOLEAN STDCALL FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name); + +BOOLEAN +STDCALL +FsRtlIsFatDbcsLegal(IN ANSI_STRING DbcsName, + IN BOOLEAN WildCardsPermissible, + IN BOOLEAN PathNamePermissible, + IN BOOLEAN LeadingBackslashPermissible); -BOOLEAN STDCALL -FsRtlIsFatDbcsLegal(IN ANSI_STRING Name, - IN BOOLEAN Unknown2, - IN BOOLEAN Unknown3, - IN BOOLEAN Unknown4); +BOOLEAN +STDCALL +FsRtlIsHpfsDbcsLegal(IN ANSI_STRING DbcsName, + IN BOOLEAN WildCardsPermissible, + IN BOOLEAN PathNamePermissible, + IN BOOLEAN LeadingBackslashPermissible); -BOOLEAN STDCALL -FsRtlIsHpfsDbcsLegal(IN ANSI_STRING Name, - IN BOOLEAN Unknown2, - IN BOOLEAN Unknown3, - IN BOOLEAN Unknown4); - BOOLEAN STDCALL FsRtlIsNameInExpression ( @@ -701,19 +666,15 @@ VOID STDCALL -FsRtlPostPagingFileStackOverflow ( - ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2 - ); +FsRtlPostPagingFileStackOverflow(IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) ; VOID STDCALL -FsRtlPostStackOverflow ( - ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2 - ); +FsRtlPostStackOverflow (IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) ; BOOLEAN STDCALL @@ -742,10 +703,8 @@ NTSTATUS STDCALL -FsRtlRegisterFileSystemFilterCallbacks ( - IN PVOID Unknown1, - IN PVOID Unknown2 - ); +FsRtlRegisterFileSystemFilterCallbacks(IN PDRIVER_OBJECT FilterDriverObject, + IN PFS_FILTER_CALLBACKS Callbacks); NTSTATUS STDCALL FsRtlRegisterUncProvider(IN OUT PHANDLE Handle, @@ -772,8 +731,8 @@ STDCALL FsRtlRemovePerStreamContext ( IN PFSRTL_ADVANCED_FCB_HEADER StreamContext, - IN PVOID Unknown1 OPTIONAL, - IN PVOID Unknown2 OPTIONAL + IN PVOID OwnerId OPTIONAL, + IN PVOID InstanceId OPTIONAL ); PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ _____ Modified: trunk/reactos/include/ddk/fstypes.h --- trunk/reactos/include/ddk/fstypes.h 2005-01-20 13:17:57 UTC (rev 13165) +++ trunk/reactos/include/ddk/fstypes.h 2005-01-20 13:31:49 UTC (rev 13166) @@ -30,6 +30,12 @@ IN PIRP Irp ); +typedef VOID (*PFSRTL_STACK_OVERFLOW_ROUTINE) ( + IN PVOID Context, + IN PKEVENT Event +); + + typedef VOID (*PUNLOCK_ROUTINE) ( IN PVOID Context, IN PFILE_LOCK_INFO FileLockInfo _____ Modified: trunk/reactos/ntoskrnl/fs/dbcsname.c --- trunk/reactos/ntoskrnl/fs/dbcsname.c 2005-01-20 13:17:57 UTC (rev 13165) +++ trunk/reactos/ntoskrnl/fs/dbcsname.c 2005-01-20 13:31:49 UTC (rev 13166) @@ -283,11 +283,12 @@ * * @unimplemented */ -BOOLEAN STDCALL -FsRtlIsFatDbcsLegal(IN ANSI_STRING Name, - IN BOOLEAN Unknown2, - IN BOOLEAN Unknown3, - IN BOOLEAN Unknown4) +BOOLEAN +STDCALL +FsRtlIsFatDbcsLegal(IN ANSI_STRING DbcsName, + IN BOOLEAN WildCardsPermissible, + IN BOOLEAN PathNamePermissible, + IN BOOLEAN LeadingBackslashPermissible) { return FALSE; } @@ -306,10 +307,10 @@ * @unimplemented */ BOOLEAN STDCALL -FsRtlIsHpfsDbcsLegal(IN ANSI_STRING Name, - IN BOOLEAN Unknown2, - IN BOOLEAN Unknown3, - IN BOOLEAN Unknown4) +FsRtlIsHpfsDbcsLegal(IN ANSI_STRING DbcsName, + IN BOOLEAN WildCardsPermissible, + IN BOOLEAN PathNamePermissible, + IN BOOLEAN LeadingBackslashPermissible) { return FALSE; } _____ Modified: trunk/reactos/ntoskrnl/fs/notify.c --- trunk/reactos/ntoskrnl/fs/notify.c 2005-01-20 13:17:57 UTC (rev 13165) +++ trunk/reactos/ntoskrnl/fs/notify.c 2005-01-20 13:31:49 UTC (rev 13166) @@ -313,10 +313,8 @@ */ NTSTATUS STDCALL -FsRtlRegisterFileSystemFilterCallbacks ( - IN PVOID Unknown1, - IN PVOID Unknown2 - ) +FsRtlRegisterFileSystemFilterCallbacks(IN PDRIVER_OBJECT FilterDriverObject, + IN PFS_FILTER_CALLBACKS Callbacks) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; _____ Modified: trunk/reactos/ntoskrnl/fs/util.c --- trunk/reactos/ntoskrnl/fs/util.c 2005-01-20 13:17:57 UTC (rev 13165) +++ trunk/reactos/ntoskrnl/fs/util.c 2005-01-20 13:31:49 UTC (rev 13166) @@ -157,7 +157,8 @@ STDCALL FsRtlAllocateResource (VOID) { - return 0; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -174,13 +175,12 @@ * * @unimplemented */ -DWORD +NTSTATUS STDCALL -FsRtlBalanceReads ( - DWORD Unknown0 - ) +FsRtlBalanceReads (PDEVICE_OBJECT TargetDevice) { - return 0; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -212,6 +212,7 @@ IN PDEVICE_OBJECT DeviceObject ) { + UNIMPLEMENTED; return FALSE; } @@ -244,6 +245,7 @@ IN PDEVICE_OBJECT DeviceObject ) { + UNIMPLEMENTED; return FALSE; } @@ -341,12 +343,11 @@ */ VOID STDCALL -FsRtlPostPagingFileStackOverflow ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 - ) +FsRtlPostPagingFileStackOverflow(IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) { + UNIMPLEMENTED; } @@ -364,12 +365,11 @@ */ VOID STDCALL -FsRtlPostStackOverflow ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 - ) +FsRtlPostStackOverflow (IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) { + UNIMPLEMENTED; }

1 0

[weiden] 13165: fixed uninitialized variables warning
by weiden＠svn.reactos.com 20 Jan '05

20 Jan '05

fixed uninitialized variables warning Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-20 13:13:16 UTC (rev 13164) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-20 13:17:57 UTC (rev 13165) @@ -1738,7 +1738,7 @@ } else { - HANDLE PortHandle; + HANDLE PortHandle = NULL; /* make a safe copy of the buffer on the stack */ _SEH_TRY @@ -1826,7 +1826,7 @@ } else { - HANDLE PortHandle; + HANDLE PortHandle = NULL; /* make a safe copy of the buffer on the stack */ _SEH_TRY @@ -1895,7 +1895,7 @@ } else { - HANDLE TokenHandle; + HANDLE TokenHandle = NULL; /* make a safe copy of the buffer on the stack */ _SEH_TRY

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs