From: short <> Date: Sun, 28 Sep 2003 17:00:10 +0000 (+0000) Subject: update X-Git-Url: http://git.jankratochvil.net/?a=commitdiff_plain;h=10ccf39b8c6760fc6554c9d54a980c20f666f8ef;hp=1a388de21de28bbf64a07977ce653bfe30e542ba;p=www.jankratochvil.net.git update --- diff --git a/Makefile-head.am b/Makefile-head.am index 3b1dca6..40656bc 100644 --- a/Makefile-head.am +++ b/Makefile-head.am @@ -29,7 +29,7 @@ noinst_DATA= .DELETE_ON_ERROR: %.ppm: %.fig Makefile - fig2dev -L ppm -S4 -b10 $< $@ + fig2dev -L ppm -S4 -m1.75 -b10 $< | pnmgamma 0.4 >$@ %.gif: %.ppm ppmquant -quiet 256 $< | ppmtogif -quiet -sort >$@ diff --git a/autogen.pl b/autogen.pl index 365c861..1ee1a08 100755 --- a/autogen.pl +++ b/autogen.pl @@ -46,7 +46,9 @@ AutoGen->run( ./project/line9k/line9k.gif ./project/captive/doc/fig/*.png ./project/captive/doc/fig/*.gif + ./project/captive/doc/dia/*.dia~ ./project/captive/doc/dia/*.png ./project/captive/doc/dia/*.gif + ./project/captive/doc/*.gif )], ); diff --git a/project/captive/Index.html.pl b/project/captive/Index.html.pl index 610f209..b40ea3b 100755 --- a/project/captive/Index.html.pl +++ b/project/captive/Index.html.pl @@ -52,7 +52,7 @@ HERE my @stuff=( "A lot of people claim themselves as Windows Programmers.\n" ." Now I can finally join them - I also wrote my own Microsoft Windows.", - "Why do they need 5000 developers" + "Why do they need ".a_href('http://www.winsupersite.com/reviews/winserver2k3_gold2.asp','5000 developers') ." to write Microsoft Windows when it is just One Man Show task?", @@ -225,18 +225,18 @@ available Microsoft Windows drivers versions. Now you can execute:

-
lufs
+
@{[ a_href 'http://lufs.sourceforge.net/lufs/','lufs' ]}

'captive' version required: Although you may already have the original package installed you must replace it by the local 'captive'-marked version containing some 'captive'-essential fixes and extensions.

-
ntfsprogs
+
@{[ a_href 'http://linux-ntfs.sourceforge.net/','ntfsprogs' ]}

Original version >=200309071734 sufficient: The package downloadable here has no code patches - you can freely use the original version instead. Unfortunately the last public release is 1.7.1 while this project requires at least -snapshot version -200309071734 +@{[ a_href 'http://linux-ntfs.sourceforge.net/snapshots/','snapshot' ]} version +@{[ a_href 'http://linux-ntfs.sourceforge.net/snapshots/ntfsprogs-200309071734.tar.bz2','200309071734' ]} which is not packaged (.rpm/.deb) yet. Packaged versions are provided here for your convenience.

@@ -245,7 +245,7 @@ your convenience.

LUFS kernel driver module

-

LUFS (Linux Userland File +

@{[ a_href 'http://lufs.sourceforge.net/lufs/','LUFS' ]} (Linux Userland File System) needs Linux kernel module driver (lufs.o) compatible with your running Linux kernel. Binary driver is supplied already precompiled for many Linux kernel versions in the binary packages above (.i386.rpm and @@ -304,7 +304,7 @@ other types Microsoft Windows drivers in the future.

machine running under GNU/Linux and share the read-write NTFS disk by using a network file sharing through a VMware virtual network card.

You need @{[ '$299' ]} for this product and you need to - give up your system security by running unsandboxed + give up your system security by running un@{[ a_href '#sandbox','sandbox' ]}ed closed-source program in your GNU/Linux.

@@ -312,8 +312,8 @@ other types Microsoft Windows drivers in the future.

Security

-

Re: 7.7 - Can't we write a wrapper for Windows' driver?

+

Re: @{[ a_href 'http://linux-ntfs.sourceforge.net/info/ntfs.html#7.7', + "7.7 Can't we write a wrapper for Windows' driver?" ]}

> It sounds like a great idea, to start with, but there are numerous problems.

@@ -352,7 +352,7 @@ local country laws.
the other kernel coders would not investigate any problems if someone had used the NTFS wrapper.
It does not apply to this project due to the implemented -filesystem separation.

+@{[ a_href '#sandbox','filesystem separation' ]}.

@{[ vskip "3ex" ]} diff --git a/project/captive/ListItem.pm b/project/captive/ListItem.pm index b2fbf6c..f490dbd 100755 --- a/project/captive/ListItem.pm +++ b/project/captive/ListItem.pm @@ -34,7 +34,7 @@ our @ListItem=( "summary"=>"MS-Windows NT kernel emulation", "license"=>"GPL", "maintenance"=>"active", - "language"=>"C, i386 asm, Perl", + "language"=>"i386 asm, C, Perl", "cvs-of main tree"=>"priv/captive", "cvs-of branched ".a_href('http://www.reactos.com/','reactos')." subdir"=>"priv/reactos:captive", "description"=><<"HERE", diff --git a/project/captive/Preview.html.pl b/project/captive/Preview.html.pl index 6eb2b27..6d416ae 100755 --- a/project/captive/Preview.html.pl +++ b/project/captive/Preview.html.pl @@ -38,7 +38,12 @@ My::Web->heading(); print "

Captive NTFS Technology Preview

\n"; print img("doc/dia/parent-connector","Parent connector"); - +print img("doc/dia/inheritance","Sandboxing/Inheritance"); +print img("doc/dia/cache-manager","NT Cache Manager"); +print img("doc/arch-W32","Microsoft Windows Subsystems Architecture"); +print img("doc/arch-captive","Captive Subsystems Architecture"); +print img("doc/ratio","Functions Reusal Ratio"); +print img("doc/fig/functype_patched_wrap_fromw32","Wrapping of Call from W32 Code"); My::Web->footer(); diff --git a/project/captive/Thanks.html.pl b/project/captive/Thanks.html.pl index 41a8b73..27221ae 100755 --- a/project/captive/Thanks.html.pl +++ b/project/captive/Thanks.html.pl @@ -64,7 +64,8 @@ print name a_href_cz('http://www.itpravo.cz/admin.shtml?x=45480','Jiri Cermak'), print name a_href('http://www.ucw.cz/~mj/','Martin "MJ" Mares'); print name "Lubomir Bulej"; print name "Tomas Bures"; -print name a_href('http://www-troja.fjfi.cvut.cz/~drab/','Martin Drab'),undef(),"betatesting"; +print name a_href('http://www-troja.fjfi.cvut.cz/~drab/','Martin Drab'),undef(), + "betatesting, ".a_href('http://lufs.sourceforge.net/lufs/','LUFS')." patches"; print name a_href_cz('http://www.klokan.cz/','Lukas "Klokan" Horalek'),undef(),"services hosting"; print name a_href("http://sys.xiloo.com/","Matt Wu"), a_href("http://sys.xiloo.com/projects/projects.htm#ext2fsd","Ext2fsd")." developer","W32 tips"; diff --git a/project/captive/doc/Makefile.am b/project/captive/doc/Makefile.am index 2cb8feb..3b62801 100644 --- a/project/captive/doc/Makefile.am +++ b/project/captive/doc/Makefile.am @@ -24,3 +24,6 @@ SUBDIRS= \ EXTRA_DIST+= \ Index.html.pl + +CLEANFILES+= \ + *.gif diff --git a/project/captive/doc/arch-W32.png b/project/captive/doc/arch-W32.png index 3326345..d93bda7 100644 Binary files a/project/captive/doc/arch-W32.png and b/project/captive/doc/arch-W32.png differ diff --git a/project/captive/doc/arch-W32.sxd b/project/captive/doc/arch-W32.sxd index a062e4e..5e1a261 100644 Binary files a/project/captive/doc/arch-W32.sxd and b/project/captive/doc/arch-W32.sxd differ diff --git a/project/captive/doc/arch-W32s.png b/project/captive/doc/arch-W32s.png deleted file mode 100644 index 12fc356..0000000 Binary files a/project/captive/doc/arch-W32s.png and /dev/null differ diff --git a/project/captive/doc/arch-captive.png b/project/captive/doc/arch-captive.png new file mode 100644 index 0000000..8642292 Binary files /dev/null and b/project/captive/doc/arch-captive.png differ diff --git a/project/captive/doc/arch-captive.sxd b/project/captive/doc/arch-captive.sxd index e5fd171..f7fddb1 100644 Binary files a/project/captive/doc/arch-captive.sxd and b/project/captive/doc/arch-captive.sxd differ diff --git a/project/captive/doc/dia/Makefile.am b/project/captive/doc/dia/Makefile.am index 7d449f5..9459f8c 100644 --- a/project/captive/doc/dia/Makefile.am +++ b/project/captive/doc/dia/Makefile.am @@ -19,8 +19,11 @@ include $(top_srcdir)/Makefile-head.am EXTRA_DIST+= \ + cache-manager.dia \ + inheritance.dia \ parent-connector.dia CLEANFILES+= \ + *.dia~ \ *.png \ *.gif diff --git a/project/captive/doc/dia/cache-manager.dia b/project/captive/doc/dia/cache-manager.dia new file mode 100644 index 0000000..b9a506e --- /dev/null +++ b/project/captive/doc/dia/cache-manager.dia @@ -0,0 +1,1399 @@ + + + + + + + + + + #A4# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #W32 FileObject# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #W32 FCB# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #SharedCacheMap# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #pages: +start .. end# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Map BCB# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Pin BCB# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #page: +start + x# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Pin BCB# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #page: +start + y# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #NT Cache Manager# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Pin BCB# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #ThreadId owned +page: +start + x# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Pin BCB# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #ThreadId owned +page: +start + x# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #page# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #clean +dirty +dirty: <LSNoldest .. LSNnewest># + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #opt. reference:# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #N:1 reference:# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #reference:# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/captive/doc/dia/inheritance.dia b/project/captive/doc/dia/inheritance.dia new file mode 100644 index 0000000..e6370ea --- /dev/null +++ b/project/captive/doc/dia/inheritance.dia @@ -0,0 +1,2594 @@ + + + + + + + + + + #A4# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Sandboxing/Inheritance# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Sandbox parent# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Sandboxed slave# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #GObject# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #GObject# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Vfs# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #ParentConnector# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #VfsParent# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Vfs stub# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #CORBA# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Vfs servant# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #CORBA# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #GObject# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #GObject# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Vfs# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #VfsSlave# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #W32 FileObject# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #W32 FCB# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #GTypeInterface# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #DirectoryParent# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Directory# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Directory stub# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #CORBA# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Directory servant# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #CORBA# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #DirectorySlave# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #Directory# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #opt. reference:# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #N:1 reference:# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #reference:# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #inheritance:# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/captive/doc/dia/parent-connector.dia b/project/captive/doc/dia/parent-connector.dia index 44f8d36..f31f866 100644 --- a/project/captive/doc/dia/parent-connector.dia +++ b/project/captive/doc/dia/parent-connector.dia @@ -56,24 +56,47 @@ - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -87,7 +110,7 @@ #disconnected# - + @@ -104,25 +127,22 @@ - + - + - + - + - + - - - @@ -138,7 +158,7 @@ #broken# - + @@ -155,18 +175,18 @@ - + - + - + - + - + @@ -190,7 +210,7 @@ clean# - + @@ -207,18 +227,18 @@ clean# - + - + - + - + - + @@ -242,7 +262,7 @@ clean# dirty # - + @@ -259,18 +279,18 @@ dirty # - + - + - + - + - + @@ -294,7 +314,7 @@ dirty # clean# - + @@ -311,18 +331,18 @@ clean# - + - + - + - + - + @@ -346,7 +366,7 @@ clean# dirty# - + @@ -363,7 +383,7 @@ dirty# - + @@ -377,19 +397,16 @@ dirty# - - - - + - + - + @@ -397,13 +414,13 @@ dirty# #no VFS# - + - + @@ -414,12 +431,12 @@ dirty# - + - + - + @@ -427,13 +444,13 @@ dirty# #VFS exists# - + - + @@ -444,23 +461,20 @@ dirty# - + - + - + - - + + - - - @@ -471,30 +485,30 @@ dirty# - - + + - + - + - + - #cease# + # cease# - + - + @@ -505,7 +519,7 @@ dirty# - + @@ -519,9 +533,6 @@ dirty# - - - @@ -532,12 +543,12 @@ dirty# - + - + @@ -546,7 +557,7 @@ dirty# abort # - + @@ -563,7 +574,7 @@ abort # - + @@ -577,9 +588,6 @@ abort # - - - @@ -590,20 +598,20 @@ abort # - + - + - #abort # + #abort # - + @@ -620,7 +628,7 @@ abort # - + @@ -634,9 +642,6 @@ abort # - - - @@ -647,20 +652,20 @@ abort # - + - + - #abort # + #abort # - + @@ -677,23 +682,20 @@ abort # - + - + - + - + - - - @@ -704,29 +706,29 @@ abort # - + - + - + - + - #abort # + #abort # - + - + @@ -737,23 +739,20 @@ abort # - + - + - + - - + + - - - @@ -764,24 +763,24 @@ abort # - - + + - + - + - #detach # + #detach # - + @@ -798,23 +797,20 @@ abort # - + - + - + - - + + - - - @@ -825,16 +821,16 @@ abort # - - + + - + - + @@ -842,7 +838,7 @@ abort # #detach# - + @@ -859,23 +855,20 @@ abort # - + - + - + - - + + - - - @@ -886,16 +879,16 @@ abort # - - + + - + - + @@ -903,7 +896,7 @@ abort # #write op.# - + @@ -920,23 +913,20 @@ abort # - + - + - + - - + + - - - @@ -947,16 +937,16 @@ abort # - - + + - + - + @@ -965,7 +955,7 @@ abort # write op.# - + @@ -982,23 +972,20 @@ write op.# - + - + - + - - + + - - - @@ -1009,16 +996,16 @@ write op.# - - + + - + - + @@ -1027,7 +1014,7 @@ write op.# write op.# - + @@ -1044,12 +1031,12 @@ write op.# - + - + - + @@ -1059,13 +1046,105 @@ shutdown: <detach> [crash] <abort> unsolicited: [crash] <abort> # - + - + + + + + + + + + + + + + + + + + + + + + + #ParentConnector interface +state machine# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #no HANDLE# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #HANDLE +exists# + + + + + + + + + diff --git a/project/captive/doc/ratio.png b/project/captive/doc/ratio.png index 63fd917..63fa8a6 100644 Binary files a/project/captive/doc/ratio.png and b/project/captive/doc/ratio.png differ