[project] Project is now officially forked as WinVBlock
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Mon, 31 Aug 2009 23:00:01 +0000 (19:00 -0400)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Mon, 31 Aug 2009 23:00:01 +0000 (19:00 -0400)
Information pertaining to WinAoE is still present in various places.

32 files changed:
Makefile
WinVBlock.dev [moved from WinAoE.dev with 80% similarity]
WinVBlock.layout [moved from WinAoE.layout with 52% similarity]
config.bat
makedist.bat
makedriver.bat
makeinf.bat
src/aoe.c
src/aoe.h
src/aoedisk.c
src/aoedisk.h
src/bus.c
src/bus.h
src/debug.c
src/debug.h
src/disk.h
src/driver.c
src/driver.h
src/loader.c
src/mdi.h
src/mount.c
src/mount.h
src/portable.h
src/probe.c
src/probe.h
src/protocol.c
src/protocol.h
src/ramdisk.h
src/registry.c
src/registry.h
src/resource.h [new file with mode: 0644]
src/winvblock.rc [new file with mode: 0644]

index 7f13bd2..e356b62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 INCLUDES := $(shell echo | cpp -v 2>&1 | sed -n '/\#include "..." search starts here:/,/End of search list./p' | grep "^ " | sed "s/^ \(.*\)$$/-I\1\/ddk/" | tr "\n" " " | sed "s/ $$//" | sed ":start;s/\/[^\/]*\/\.\.\//\//;t start")
 
 # Next line is duplicated in config.bat, edit both when adding files.
-c := driver.c registry.c bus.c aoedisk.c aoe.c protocol.c debug.c probe.c
+c := driver.c registry.c bus.c aoedisk.c aoe.c protocol.c debug.c probe.c winvblock.rc
 h := driver.h aoe.h protocol.h mount.h portable.h
 
 # This is also duplicated in config.bat.
@@ -9,7 +9,7 @@ h := driver.h aoe.h protocol.h mount.h portable.h
 PXESTYLE := asm
 #PXESTYLE := c
 
-all: bin/aoe.0 bin/loader32.exe bin/aoe32.sys bin/aoe.exe bin/aoe.inf bin/txtsetup.oem
+all: bin/aoe.0 bin/loader32.exe bin/wvblk32.sys bin/aoe.exe bin/winvblk.inf bin/txtsetup.oem
 
 clean:
        @rm -rf src/obj src/pxe.asm/obj src/pxe.c/obj bin
@@ -17,11 +17,11 @@ clean:
 dist:
        @sh -c "unset \`set | cut -f 1 -d \"=\" | egrep -v \"PATH|COMSPEC\"\` 2> /dev/null ; cmd /c makedist.bat"
 
-free: bin/aoe.inf bin/txtsetup.oem $(addprefix src/,$c $h) Makefile
+free: bin/winvblk.inf bin/txtsetup.oem $(addprefix src/,$c $h) Makefile
        @sh -c "unset \`set | cut -f 1 -d \"=\" | egrep -v \"PATH|COMSPEC\"\` 2> /dev/null ; cmd /c makefree.bat"
        @touch -r Makefile $(wildcard bin/*.sys)
        
-checked: bin/aoe.inf bin/txtsetup.oem $(addprefix src/,$c $h) Makefile
+checked: bin/winvblk.inf bin/txtsetup.oem $(addprefix src/,$c $h) Makefile
        @sh -c "unset \`set | cut -f 1 -d \"=\" | egrep -v \"PATH|COMSPEC\"\` 2> /dev/null ; cmd /c makechecked.bat"
        @touch -r Makefile $(wildcard bin/*.sys)
 
@@ -33,9 +33,9 @@ src/pxe.$(PXESTYLE)/aoe.0: $(wildcard src/pxe.$(PXESTYLE)/*.c) $(wildcard src/px
        rm -rf src/pxe.$(PXESTYLE)/aoe.0
        make -C src/pxe.$(PXESTYLE)
 
-bin/aoe.inf bin/txtsetup.oem: makeinf.bat Makefile
+bin/winvblk.inf bin/txtsetup.oem: makeinf.bat Makefile
        @sh -c "unset \`set | cut -f 1 -d \"=\" | egrep -v \"PATH|COMSPEC\"\` 2> /dev/null ; cmd /c makeinf.bat ; exit 0" >/dev/null 2>&1
-       touch bin/aoe.inf
+       touch bin/winvblk.inf
        touch bin/txtsetup.oem
 
 src/obj/loader32.o: src/loader.c src/portable.h Makefile
@@ -62,57 +62,57 @@ bin/aoe.exe: src/obj/mount.o Makefile
 
 src/obj/driver.o: src/driver.c src/portable.h src/driver.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/driver.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/driver.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/driver.c -o src/obj/driver.o
 
 src/obj/registry.o: src/registry.c src/portable.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/registry.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/registry.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/registry.c -o src/obj/registry.o
 
 src/obj/bus.o: src/bus.c src/portable.h src/driver.h src/aoe.h src/mount.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/bus.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/bus.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/bus.c -o src/obj/bus.o
 
 src/obj/aoedisk.o: src/aoedisk.c src/portable.h src/driver.h src/aoe.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/aoedisk.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/aoedisk.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/aoedisk.c -o src/obj/aoedisk.o
 
 src/obj/aoe.o: src/aoe.c src/portable.h src/driver.h src/aoe.h src/protocol.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/aoe.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/aoe.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/aoe.c -o src/obj/aoe.o
 
 src/obj/protocol.o: src/protocol.c src/portable.h src/driver.h src/aoe.h src/protocol.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/protocol.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/protocol.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/protocol.c -o src/obj/protocol.o
 
 src/obj/debug.o: src/debug.c src/portable.h src/driver.h src/mount.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/debug.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/debug.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/debug.c -o src/obj/debug.o
 
 src/obj/probe.o: src/probe.c src/portable.h src/driver.h src/mount.h Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/probe.o src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/probe.o src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        gcc $(INCLUDES) -c -Wall src/probe.c -o src/obj/probe.o
 
 src/obj/aoe.tmp: src/obj/driver.o src/obj/registry.o src/obj/bus.o src/obj/aoedisk.o src/obj/aoe.o src/obj/protocol.o src/obj/debug.o probe.o Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/aoe.tmp src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
+       @rm -rf src/obj/aoe.tmp src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
        @gcc -Wall src/obj/driver.o src/obj/registry.o src/obj/bus.o src/obj/aoedisk.o src/obj/aoe.o src/obj/protocol.o src/obj/debug.o src/obj/probe.o -Wl,--base-file,src/obj/aoe.tmp -Wl,--entry,_DriverEntry@8 -nostartfiles -nostdlib -lntoskrnl -lhal -lndis -o null
        @rm -rf null.exe
 
 src/obj/aoe.exp: src/obj/aoe.tmp Makefile
        @mkdir -p src/obj
-       @rm -rf src/obj/aoe.exp bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
-       @dlltool --dllname aoe32.sys --base-file src/obj/aoe.tmp --output-exp src/obj/aoe.exp
+       @rm -rf src/obj/aoe.exp bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
+       @dlltool --dllname wvblk32.sys --base-file src/obj/aoe.tmp --output-exp src/obj/aoe.exp
 
-bin/aoe32.sys: src/obj/driver.o src/obj/registry.o src/obj/bus.o src/obj/aoedisk.o src/obj/aoe.o src/obj/protocol.o src/obj/debug.o src/obj/probe.o src/obj/aoe.exp Makefile
+bin/wvblk32.sys: src/obj/driver.o src/obj/registry.o src/obj/bus.o src/obj/aoedisk.o src/obj/aoe.o src/obj/protocol.o src/obj/debug.o src/obj/probe.o src/obj/aoe.exp Makefile
        @mkdir -p bin
-       @rm -rf bin/aoe32.sys bin/aoe64.sys bin/aoe32.pdb bin/aoe64.pdb bin/loader64.exe
-       @gcc -Wall src/obj/driver.o src/obj/registry.o src/obj/bus.o src/obj/aoedisk.o src/obj/aoe.o src/obj/protocol.o src/obj/debug.o src/obj/probe.o -Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,src/obj/aoe.exp -mdll -nostartfiles -nostdlib -lntoskrnl -lhal -lndis -o bin/aoe32.sys
-#      strip bin/aoe32.sys
+       @rm -rf bin/wvblk32.sys bin/wvblk64.sys bin/wvblk32.pdb bin/wvblk64.pdb bin/loader64.exe
+       @gcc -Wall src/obj/driver.o src/obj/registry.o src/obj/bus.o src/obj/aoedisk.o src/obj/aoe.o src/obj/protocol.o src/obj/debug.o src/obj/probe.o -Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,src/obj/aoe.exp -mdll -nostartfiles -nostdlib -lntoskrnl -lhal -lndis -o bin/wvblk32.sys
+#      strip bin/wvblk32.sys
similarity index 80%
rename from WinAoE.dev
rename to WinVBlock.dev
index 039c3e7..d70f3f7 100644 (file)
@@ -1,7 +1,7 @@
 [Project]\r
-FileName=WinAoE.dev\r
-Name=WinAoE\r
-UnitCount=23\r
+FileName=WinVBlock.dev\r
+Name=WinVBlock\r
+UnitCount=24\r
 PchHead=-1\r
 PchSource=-1\r
 Ver=3\r
@@ -13,7 +13,7 @@ Folders=
 [Unit1]\r
 FileName=src\aoe.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -23,7 +23,7 @@ BuildCmd=
 [Unit2]\r
 FileName=src\aoe.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -33,7 +33,7 @@ BuildCmd=
 [Unit3]\r
 FileName=src\bus.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -43,7 +43,7 @@ BuildCmd=
 [Unit4]\r
 FileName=src\bus.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -53,7 +53,7 @@ BuildCmd=
 [Unit5]\r
 FileName=src\debug.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -63,7 +63,7 @@ BuildCmd=
 [Unit6]\r
 FileName=src\debug.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -73,7 +73,7 @@ BuildCmd=
 [Unit8]\r
 FileName=src\driver.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -83,7 +83,7 @@ BuildCmd=
 [Unit9]\r
 FileName=src\loader.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -93,7 +93,7 @@ BuildCmd=
 [Unit10]\r
 FileName=src\mdi.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -103,7 +103,7 @@ BuildCmd=
 [Unit11]\r
 FileName=src\mount.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -113,7 +113,7 @@ BuildCmd=
 [Unit12]\r
 FileName=src\mount.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -123,7 +123,7 @@ BuildCmd=
 [Unit13]\r
 FileName=src\portable.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -133,7 +133,7 @@ BuildCmd=
 [Unit14]\r
 FileName=src\protocol.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -143,7 +143,7 @@ BuildCmd=
 [Unit15]\r
 FileName=src\protocol.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -153,7 +153,7 @@ BuildCmd=
 [Unit16]\r
 FileName=src\registry.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -163,7 +163,7 @@ BuildCmd=
 [Unit17]\r
 FileName=src\registry.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -206,7 +206,7 @@ Icon=
 ExeOutput=Output\MingW\r
 ObjectOutput=Objects\MingW\r
 OverrideOutput=0\r
-OverrideOutputName=\r
+OverrideOutputName=WinVBlock.exe\r
 HostApplication=\r
 CommandLine=\r
 UseCustomMakefile=0\r
@@ -246,7 +246,7 @@ compilerType=1
 [Unit7]\r
 FileName=src\driver.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -256,7 +256,7 @@ BuildCmd=
 [Unit20]\r
 FileName=src\aoedisk.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -266,7 +266,7 @@ BuildCmd=
 [Unit21]\r
 FileName=src\aoedisk.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -296,7 +296,7 @@ BuildCmd=
 [Unit23]\r
 FileName=src\probe.h\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -306,10 +306,19 @@ BuildCmd=
 [Unit22]\r
 FileName=src\probe.c\r
 CompileCpp=1\r
-Folder=WinAoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
+[Unit24]\r
+FileName=src\winvblock.rc\r
+Folder=WinVBlock\r
+Compile=1\r
+Link=0\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
similarity index 52%
rename from WinAoE.layout
rename to WinVBlock.layout
index ad97bc8..5c9ce39 100644 (file)
@@ -1,7 +1,7 @@
 [Editor_0]\r
-CursorCol=1\r
-CursorRow=801\r
-TopLine=760\r
+CursorCol=21\r
+CursorRow=1320\r
+TopLine=1264\r
 LeftChar=1\r
 Open=1\r
 Top=0\r
@@ -11,154 +11,161 @@ Order=-1
 [Editor_1]\r
 Open=0\r
 Top=0\r
-CursorCol=1\r
-CursorRow=30\r
+CursorCol=4\r
+CursorRow=20\r
 TopLine=1\r
 LeftChar=1\r
 [Editor_2]\r
 Open=1\r
 Top=0\r
-CursorCol=33\r
-CursorRow=515\r
-TopLine=487\r
+CursorCol=3\r
+CursorRow=7\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_3]\r
-Open=1\r
+Open=0\r
 Top=0\r
 CursorCol=1\r
-CursorRow=82\r
-TopLine=26\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_4]\r
 Open=0\r
 Top=0\r
-CursorCol=26\r
-CursorRow=234\r
-TopLine=178\r
+CursorCol=1\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_5]\r
 Open=0\r
 Top=0\r
-CursorCol=9\r
-CursorRow=34\r
+CursorCol=14\r
+CursorRow=3\r
 TopLine=1\r
 LeftChar=1\r
 [Editor_6]\r
-Open=1\r
+Open=0\r
 Top=0\r
 CursorCol=1\r
-CursorRow=38\r
-TopLine=90\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_7]\r
-Open=1\r
+Open=0\r
 Top=0\r
 CursorCol=1\r
-CursorRow=79\r
-TopLine=23\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_8]\r
-Open=0\r
+Open=1\r
 Top=0\r
-CursorCol=40\r
-CursorRow=64\r
-TopLine=36\r
+CursorCol=20\r
+CursorRow=105\r
+TopLine=49\r
 LeftChar=1\r
 [Editor_9]\r
-Open=1\r
+Open=0\r
 Top=0\r
-CursorCol=4\r
-CursorRow=39\r
+CursorCol=36\r
+CursorRow=6\r
 TopLine=1\r
 LeftChar=1\r
 [Editor_10]\r
 Open=0\r
 Top=0\r
-CursorCol=17\r
-CursorRow=206\r
-TopLine=136\r
+CursorCol=1\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_11]\r
 Open=0\r
 Top=0\r
 CursorCol=1\r
-CursorRow=83\r
-TopLine=27\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_12]\r
-Open=1\r
+Open=0\r
 Top=0\r
-CursorCol=8\r
-CursorRow=37\r
+CursorCol=1\r
+CursorRow=21\r
 TopLine=1\r
 LeftChar=1\r
 [Editor_13]\r
-Open=0\r
+Open=1\r
 Top=0\r
-CursorCol=1\r
-CursorRow=188\r
-TopLine=133\r
+CursorCol=51\r
+CursorRow=162\r
+TopLine=106\r
 LeftChar=1\r
 [Editor_14]\r
 Open=0\r
 Top=0\r
 CursorCol=1\r
-CursorRow=48\r
-TopLine=20\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_15]\r
-Open=0\r
-Top=0\r
-CursorCol=12\r
-CursorRow=418\r
-TopLine=386\r
+Open=1\r
+Top=1\r
+CursorCol=24\r
+CursorRow=344\r
+TopLine=289\r
 LeftChar=1\r
 [Editor_16]\r
 Open=0\r
 Top=0\r
-CursorCol=6\r
-CursorRow=47\r
-TopLine=19\r
+CursorCol=1\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_17]\r
-Open=1\r
+Open=0\r
 Top=0\r
-CursorCol=22\r
-CursorRow=40\r
-TopLine=8\r
+CursorCol=1\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_18]\r
-Open=1\r
+Open=0\r
 Top=0\r
-CursorCol=16\r
-CursorRow=32\r
+CursorCol=1\r
+CursorRow=20\r
 TopLine=1\r
 LeftChar=1\r
 [Editor_19]\r
 Open=0\r
 Top=0\r
-CursorCol=19\r
-CursorRow=41\r
-TopLine=8\r
+CursorCol=1\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_20]\r
 Open=1\r
 Top=0\r
-CursorCol=33\r
-CursorRow=522\r
-TopLine=505\r
+CursorCol=40\r
+CursorRow=266\r
+TopLine=210\r
 LeftChar=1\r
 [Editor_21]\r
-Open=1\r
-Top=1\r
+Open=0\r
+Top=0\r
 CursorCol=1\r
-CursorRow=353\r
-TopLine=338\r
+CursorRow=21\r
+TopLine=1\r
 LeftChar=1\r
 [Editor_22]\r
 CursorCol=1\r
-CursorRow=34\r
+CursorRow=21\r
 TopLine=1\r
 LeftChar=1\r
-Open=1\r
+Open=0\r
+Top=0\r
+[Editor_23]\r
+Open=0\r
 Top=0\r
+CursorCol=1\r
+CursorRow=1\r
+TopLine=1\r
+LeftChar=1\r
index d1e130d..f214828 100644 (file)
@@ -2,5 +2,5 @@ rem This is the root directory of the ddk.
 set ddkdir=c:\winddk\6001.18001\r
 \r
 rem Next two lines are duplicated in Makefile, edit both when adding files or changing pxe style.\r
-set c=driver.c registry.c bus.c aoedisk.c aoe.c protocol.c debug.c probe.c\r
+set c=driver.c registry.c bus.c aoedisk.c aoe.c protocol.c debug.c probe.c winvblock.rc\r
 set pxestyle=asm\r
index 79798e4..de606ed 100644 (file)
@@ -11,6 +11,6 @@ cmd /c makedriver f 32
 cmd /c makedriver f 64\r
 del bin\loader32.exe\r
 del bin\loader64.exe\r
-del bin\aoe32.pdb\r
-del bin\aoe64.pdb\r
+del bin\wvblk32.pdb\r
+del bin\wvblk64.pdb\r
 copy src\pxe.%pxestyle%\aoe.0 bin\r
index 1b742a6..b02736a 100644 (file)
@@ -23,8 +23,8 @@ if "%2" == "32" set arg2=w2k
 if "%2" == "64" set arg2=wnet amd64\r
 if "%2" == "32" set arch=i386\r
 if "%2" == "64" set arch=amd64\r
-if "%2" == "32" set name=aoe32\r
-if "%2" == "64" set name=aoe64\r
+if "%2" == "32" set name=wvblk32\r
+if "%2" == "64" set name=wvblk64\r
 if "%2" == "32" set obj=%obj%_w2k_x86\r
 if "%2" == "64" set obj=%obj%_wnet_amd64\r
 goto run\r
@@ -34,8 +34,8 @@ if "%1" == "32" set arg2=w2k
 if "%1" == "64" set arg2=wnet amd64\r
 if "%1" == "32" set arch=i386\r
 if "%1" == "64" set arch=amd64\r
-if "%1" == "32" set name=aoe32\r
-if "%1" == "64" set name=aoe64\r
+if "%1" == "32" set name=wvblk32\r
+if "%1" == "64" set name=wvblk64\r
 if "%1" == "32" set obj=w2k_x86\r
 if "%1" == "64" set obj=wnet_amd64\r
 if "%2" == "f" goto next_2_ok\r
index 79db9f6..c459957 100644 (file)
@@ -1,85 +1,85 @@
 @echo off\r
 mkdir bin 2>nul\r
 \r
-echo [Version] > bin/aoe.inf\r
-echo Signature="$Windows NT$" >> bin/aoe.inf\r
-echo Class=SCSIAdapter >> bin/aoe.inf\r
-echo ClassGUID={4D36E97B-E325-11CE-BFC1-08002BE10318} >> bin/aoe.inf\r
-echo Provider=AoE >> bin/aoe.inf\r
-echo CatalogFile=aoe.cat >> bin/aoe.inf\r
-echo DriverVer=01/01/2006,1.0 >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [Manufacturer] >> bin/aoe.inf\r
-echo AoE=AoEDriver,,NTamd64 >> bin/aoe.inf\r
-echo.  >> bin/aoe.inf\r
-echo [AoEDriver] >> bin/aoe.inf\r
-echo "AoE Driver"=AoE,AoE >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [AoEDriver.NTamd64] >> bin/aoe.inf\r
-echo "AoE Driver"=AoE.NTamd64,AoE >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [SourceDisksNames] >> bin/aoe.inf\r
-echo 0="Install Disk" >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [SourceDisksFiles] >> bin/aoe.inf\r
-echo aoe.exe=0 >> bin/aoe.inf\r
-echo aoe32.sys=0 >> bin/aoe.inf\r
-echo aoe64.sys=0 >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [DestinationDirs] >> bin/aoe.inf\r
-echo Files.Driver=12 >> bin/aoe.inf\r
-echo Files.Driver.NTamd64=12 >> bin/aoe.inf\r
-echo Files.Tools=11 >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [Files.Driver] >> bin/aoe.inf\r
-echo aoe32.sys >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [Files.Driver.NTamd64] >> bin/aoe.inf\r
-echo aoe64.sys >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [Files.Tools] >> bin/aoe.inf\r
-echo aoe.exe >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [AoE] >> bin/aoe.inf\r
-echo CopyFiles=Files.Driver,Files.Tools >> bin/aoe.inf\r
-#echo DelReg=DelReg >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [AoE.NTamd64] >> bin/aoe.inf\r
-echo CopyFiles=Files.Driver.NTamd64,Files.Tools >> bin/aoe.inf\r
-#echo DelReg=DelReg >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [AoE.Services] >> bin/aoe.inf\r
-echo AddService=AoE,0x00000002,Service >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [AoE.NTamd64.Services] >> bin/aoe.inf\r
-echo AddService=AoE,0x00000002,Service.NTamd64 >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [Service] >> bin/aoe.inf\r
-echo ServiceType=0x00000001 >> bin/aoe.inf\r
-echo StartType=0x00000000 >> bin/aoe.inf\r
-echo ErrorControl=0x00000001 >> bin/aoe.inf\r
-echo ServiceBinary=%%12%%\aoe32.sys >> bin/aoe.inf\r
-#echo LoadOrderGroup=NDIS >> bin/aoe.inf\r
-echo. >> bin/aoe.inf\r
-echo [Service.NTamd64] >> bin/aoe.inf\r
-echo ServiceType=0x00000001 >> bin/aoe.inf\r
-echo StartType=0x00000000 >> bin/aoe.inf\r
-echo ErrorControl=0x00000001 >> bin/aoe.inf\r
-echo ServiceBinary=%%12%%\aoe64.sys >> bin/aoe.inf\r
-#echo LoadOrderGroup=NDIS >> bin/aoe.inf\r
-#echo. >> bin/aoe.inf\r
-#echo [DelReg] >> bin/aoe.inf\r
-#echo HKLM,SYSTEM\CurrentControlSet\Services\atapi,Group >> bin/aoe.inf\r
+echo [Version] > bin/winvblk.inf\r
+echo Signature="$Windows NT$" >> bin/winvblk.inf\r
+echo Class=SCSIAdapter >> bin/winvblk.inf\r
+echo ClassGUID={4D36E97B-E325-11CE-BFC1-08002BE10318} >> bin/winvblk.inf\r
+echo Provider=WinVBlock >> bin/winvblk.inf\r
+echo CatalogFile=winvblk.cat >> bin/winvblk.inf\r
+echo DriverVer=01/01/2006,1.0 >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [Manufacturer] >> bin/winvblk.inf\r
+echo WinVBlock=WinVBlockDriver,,NTamd64 >> bin/winvblk.inf\r
+echo.  >> bin/winvblk.inf\r
+echo [WinVBlockDriver] >> bin/winvblk.inf\r
+echo "WinVBlock Driver"=WinVBlock,WinVBlock >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [WinVBlockDriver.NTamd64] >> bin/winvblk.inf\r
+echo "WinVBlock Driver"=WinVBlock.NTamd64,WinVBlock >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [SourceDisksNames] >> bin/winvblk.inf\r
+echo 0="Install Disk" >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [SourceDisksFiles] >> bin/winvblk.inf\r
+echo aoe.exe=0 >> bin/winvblk.inf\r
+echo wvblk32.sys=0 >> bin/winvblk.inf\r
+echo wvblk64.sys=0 >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [DestinationDirs] >> bin/winvblk.inf\r
+echo Files.Driver=12 >> bin/winvblk.inf\r
+echo Files.Driver.NTamd64=12 >> bin/winvblk.inf\r
+echo Files.Tools=11 >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [Files.Driver] >> bin/winvblk.inf\r
+echo wvblk32.sys >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [Files.Driver.NTamd64] >> bin/winvblk.inf\r
+echo wvblk64.sys >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [Files.Tools] >> bin/winvblk.inf\r
+echo aoe.exe >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [WinVBlock] >> bin/winvblk.inf\r
+echo CopyFiles=Files.Driver,Files.Tools >> bin/winvblk.inf\r
+#echo DelReg=DelReg >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [WinVBlock.NTamd64] >> bin/winvblk.inf\r
+echo CopyFiles=Files.Driver.NTamd64,Files.Tools >> bin/winvblk.inf\r
+#echo DelReg=DelReg >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [WinVBlock.Services] >> bin/winvblk.inf\r
+echo AddService=WinVBlock,0x00000002,Service >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [WinVBlock.NTamd64.Services] >> bin/winvblk.inf\r
+echo AddService=WinVBlock,0x00000002,Service.NTamd64 >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [Service] >> bin/winvblk.inf\r
+echo ServiceType=0x00000001 >> bin/winvblk.inf\r
+echo StartType=0x00000000 >> bin/winvblk.inf\r
+echo ErrorControl=0x00000001 >> bin/winvblk.inf\r
+echo ServiceBinary=%%12%%\wvblk32.sys >> bin/winvblk.inf\r
+#echo LoadOrderGroup=NDIS >> bin/winvblk.inf\r
+echo. >> bin/winvblk.inf\r
+echo [Service.NTamd64] >> bin/winvblk.inf\r
+echo ServiceType=0x00000001 >> bin/winvblk.inf\r
+echo StartType=0x00000000 >> bin/winvblk.inf\r
+echo ErrorControl=0x00000001 >> bin/winvblk.inf\r
+echo ServiceBinary=%%12%%\wvblk64.sys >> bin/winvblk.inf\r
+#echo LoadOrderGroup=NDIS >> bin/winvblk.inf\r
+#echo. >> bin/winvblk.inf\r
+#echo [DelReg] >> bin/winvblk.inf\r
+#echo HKLM,SYSTEM\CurrentControlSet\Services\atapi,Group >> bin/winvblk.inf\r
 \r
 echo [Disks] > bin/txtsetup.oem\r
-echo disk = "AOE DISK",\aoe.inf,\ >> bin/txtsetup.oem\r
+echo disk = "WINVBLOCK DISK",\winvblk.inf,\ >> bin/txtsetup.oem\r
 echo. >> bin/txtsetup.oem\r
 echo [Defaults] >> bin/txtsetup.oem\r
-echo scsi = AOE >> bin/txtsetup.oem\r
+echo scsi = WINVBLOCK >> bin/txtsetup.oem\r
 echo. >> bin/txtsetup.oem\r
 echo [scsi] >> bin/txtsetup.oem\r
-echo AOE = "AoE Driver" >> bin/txtsetup.oem\r
+echo WINVBLOCK = "WinVBlock Driver" >> bin/txtsetup.oem\r
 echo. >> bin/txtsetup.oem\r
-echo [Files.scsi.AOE] >> bin/txtsetup.oem\r
-echo driver = disk,aoe32.sys,AoE >> bin/txtsetup.oem\r
-echo inf = disk,aoe.inf >> bin/txtsetup.oem\r
+echo [Files.scsi.WINVBLOCK] >> bin/txtsetup.oem\r
+echo driver = disk,wvblk32.sys,WinVBlock >> bin/txtsetup.oem\r
+echo inf = disk,winvblk.inf >> bin/txtsetup.oem\r
index 540bd05..a464a18 100644 (file)
--- a/src/aoe.c
+++ b/src/aoe.c
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -199,8 +199,8 @@ AoE_Start (
         */
        if ( ( AoE_Globals_ProbeTag->PacketData =
                                 ( PAOE_PACKET ) ExAllocatePool ( NonPagedPool,
-                                                                                                                                                                       AoE_Globals_ProbeTag->
-                                                                                                                                                                       PacketSize ) ) == NULL )
+                                                                                                                                                                       AoE_Globals_ProbeTag->PacketSize ) )
+                        == NULL )
                {
                        DBG ( "Couldn't allocate AoE_Globals_ProbeTag->PacketData\n" );
                        ExFreePool ( AoE_Globals_ProbeTag );
@@ -790,13 +790,13 @@ AoE_Request (
        if ( DeviceExtension->Disk.IsRamdisk )
                {
                        if ( Mode == AoE_RequestMode_Write )
-                               RtlCopyMemory ( &DeviceExtension->Disk.RAMDisk.
-                                                                                               PhysicalMemory[StartSector * SECTORSIZE], Buffer,
-                                                                                               SectorCount * SECTORSIZE );
+                               RtlCopyMemory ( &DeviceExtension->Disk.
+                                                                                               RAMDisk.PhysicalMemory[StartSector * SECTORSIZE],
+                                                                                               Buffer, SectorCount * SECTORSIZE );
                        else
                                RtlCopyMemory ( Buffer,
-                                                                                               &DeviceExtension->Disk.RAMDisk.
-                                                                                               PhysicalMemory[StartSector * SECTORSIZE],
+                                                                                               &DeviceExtension->Disk.
+                                                                                               RAMDisk.PhysicalMemory[StartSector * SECTORSIZE],
                                                                                                SectorCount * SECTORSIZE );
                        Irp->IoStatus.Information = SectorCount * SECTORSIZE;
                        Irp->IoStatus.Status = STATUS_SUCCESS;
@@ -1159,8 +1159,8 @@ AoE_Reply (
                                                                }
                                                        else if ( Tag->DeviceExtension->Disk.AoE.MTU <
                                                                                                ( sizeof ( AOE_PACKET ) +
-                                                                                                       ( ( Tag->DeviceExtension->Disk.
-                                                                                                                       AoE.MaxSectorsPerPacket + 1 ) * SECTORSIZE ) ) )
+                                                                                                       ( ( Tag->DeviceExtension->Disk.AoE.
+                                                                                                                       MaxSectorsPerPacket + 1 ) * SECTORSIZE ) ) )
                                                                {
                                                                        DBG ( "Got MaxSectorsPerPacket %d at size of %d. "
                                                                                                "MTU of %d reached\n",
index 15d1a15..de49265 100644 (file)
--- a/src/aoe.h
+++ b/src/aoe.h
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _AOE_H
 #  define _AOE_H
index f10c14a..56bcd0a 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -158,7 +158,7 @@ IRPHandler_Declaration ( Disk_DispatchPnP )
                                        {
                                                case BusQueryDeviceID:
                                                        StringLength =
-                                                               swprintf ( String, L"AoE\\e%d.%d",
+                                                               swprintf ( String, L"WinVBlock\\AoEe%d.%d",
                                                                                                         DeviceExtension->Disk.AoE.Major,
                                                                                                         DeviceExtension->Disk.AoE.Minor ) + 1;
                                                        if ( ( Irp->IoStatus.Information =
@@ -194,7 +194,7 @@ IRPHandler_Declaration ( Disk_DispatchPnP )
                                                        break;
                                                case BusQueryHardwareIDs:
                                                        StringLength =
-                                                               swprintf ( String, L"AoE\\e%d.%d",
+                                                               swprintf ( String, L"WinVBlock\\AoEe%d.%d",
                                                                                                         DeviceExtension->Disk.AoE.Major,
                                                                                                         DeviceExtension->Disk.AoE.Minor ) + 1;
                                                        StringLength +=
@@ -247,7 +247,7 @@ IRPHandler_Declaration ( Disk_DispatchPnP )
                                switch ( Stack->Parameters.QueryDeviceText.DeviceTextType )
                                        {
                                                case DeviceTextDescription:
-                                                       StringLength = swprintf ( String, L"AoE Disk" ) + 1;
+                                                       StringLength = swprintf ( String, L"WinVBlock AoE Disk" ) + 1;
                                                        if ( ( Irp->IoStatus.Information =
                                                                                 ( ULONG_PTR ) ExAllocatePool ( PagedPool,
                                                                                                                                                                                                                StringLength *
@@ -263,7 +263,7 @@ IRPHandler_Declaration ( Disk_DispatchPnP )
                                                        break;
                                                case DeviceTextLocationInformation:
                                                        StringLength =
-                                                               swprintf ( String, L"AoE e%d.%d",
+                                                               swprintf ( String, L"WinVBlock AoE e%d.%d",
                                                                                                         DeviceExtension->Disk.AoE.Major,
                                                                                                         DeviceExtension->Disk.AoE.Minor ) + 1;
                                                        if ( ( Irp->IoStatus.Information =
@@ -338,9 +338,9 @@ IRPHandler_Declaration ( Disk_DispatchPnP )
                                if ( !NT_SUCCESS
                                                 ( Status =
                                                         Bus_GetDeviceCapabilities ( ( ( PDRIVER_DEVICEEXTENSION )
-                                                                                                                                                                                DeviceExtension->Disk.Parent->
-                                                                                                                                                                                DeviceExtension )->Bus.
-                                                                                                                                                                        LowerDeviceObject,
+                                                                                                                                                                                DeviceExtension->Disk.
+                                                                                                                                                                                Parent->DeviceExtension )->
+                                                                                                                                                                        Bus.LowerDeviceObject,
                                                                                                                                                                         &ParentDeviceCapabilities ) ) )
                                        break;
                                RtlCopyMemory ( DeviceCapabilities->DeviceState,
@@ -489,11 +489,11 @@ IRPHandler_Declaration ( Disk_DispatchSCSI )
                                                                                         || Cdb->AsByte[0] == SCSIOP_WRITE16 )
                                                                                {
                                                                                        REVERSE_BYTES_QUAD ( &StartSector,
-                                                                                                                                                                        &( ( ( PDISK_CDB16 ) Cdb )->
-                                                                                                                                                                                       LogicalBlock[0] ) );
+                                                                                                                                                                        &( ( ( PDISK_CDB16 )
+                                                                                                                                                                                               Cdb )->LogicalBlock[0] ) );
                                                                                        REVERSE_BYTES ( &SectorCount,
-                                                                                                                                                       &( ( ( PDISK_CDB16 ) Cdb )->
-                                                                                                                                                                TransferLength[0] ) );
+                                                                                                                                                       &( ( ( PDISK_CDB16 )
+                                                                                                                                                                        Cdb )->TransferLength[0] ) );
                                                                                }
                                                                        else
                                                                                {
@@ -541,12 +541,12 @@ IRPHandler_Declaration ( Disk_DispatchSCSI )
                                                                                }
 
                                                                        if ( ( ( ( PUCHAR ) Srb->DataBuffer -
-                                                                                                        ( PUCHAR ) MmGetMdlVirtualAddress ( Irp->
-                                                                                                                                                                                                                                                        MdlAddress ) ) +
-                                                                                                ( PUCHAR ) MmGetSystemAddressForMdlSafe ( Irp->
-                                                                                                                                                                                                                                                                        MdlAddress,
-                                                                                                                                                                                                                                                                        HighPagePriority ) )
-                                                                                        == NULL )
+                                                                                                        ( PUCHAR )
+                                                                                                        MmGetMdlVirtualAddress ( Irp->MdlAddress ) ) +
+                                                                                                ( PUCHAR )
+                                                                                                MmGetSystemAddressForMdlSafe ( Irp->MdlAddress,
+                                                                                                                                                                                                                               HighPagePriority ) ) ==
+                                                                                        NULL )
                                                                                {
                                                                                        Status = STATUS_INSUFFICIENT_RESOURCES;
                                                                                        Irp->IoStatus.Information = 0;
@@ -561,14 +561,12 @@ IRPHandler_Declaration ( Disk_DispatchSCSI )
                                                                                                                                                                         SectorCount,
                                                                                                                                                                         ( ( PUCHAR ) Srb->DataBuffer -
                                                                                                                                                                                 ( PUCHAR )
-                                                                                                                                                                                MmGetMdlVirtualAddress ( Irp->
-                                                                                                                                                                                                                                                                                       MdlAddress ) )
-                                                                                                                                                                        +
+                                                                                                                                                                                MmGetMdlVirtualAddress
+                                                                                                                                                                                ( Irp->MdlAddress ) ) +
                                                                                                                                                                         ( PUCHAR )
-                                                                                                                                                                        MmGetSystemAddressForMdlSafe ( Irp->
-                                                                                                                                                                                                                                                                                                       MdlAddress,
-                                                                                                                                                                                                                                                                                                       HighPagePriority ),
-                                                                                                                                                                        Irp );
+                                                                                                                                                                        MmGetSystemAddressForMdlSafe
+                                                                                                                                                                        ( Irp->MdlAddress,
+                                                                                                                                                                                HighPagePriority ), Irp );
                                                                                }
                                                                        else
                                                                                {
@@ -577,14 +575,12 @@ IRPHandler_Declaration ( Disk_DispatchSCSI )
                                                                                                                                                                         SectorCount,
                                                                                                                                                                         ( ( PUCHAR ) Srb->DataBuffer -
                                                                                                                                                                                 ( PUCHAR )
-                                                                                                                                                                                MmGetMdlVirtualAddress ( Irp->
-                                                                                                                                                                                                                                                                                       MdlAddress ) )
-                                                                                                                                                                        +
+                                                                                                                                                                                MmGetMdlVirtualAddress
+                                                                                                                                                                                ( Irp->MdlAddress ) ) +
                                                                                                                                                                         ( PUCHAR )
-                                                                                                                                                                        MmGetSystemAddressForMdlSafe ( Irp->
-                                                                                                                                                                                                                                                                                                       MdlAddress,
-                                                                                                                                                                                                                                                                                                       HighPagePriority ),
-                                                                                                                                                                        Irp );
+                                                                                                                                                                        MmGetSystemAddressForMdlSafe
+                                                                                                                                                                        ( Irp->MdlAddress,
+                                                                                                                                                                                HighPagePriority ), Irp );
                                                                                }
                                                                        break;
                                                                case SCSIOP_VERIFY:
@@ -592,11 +588,11 @@ IRPHandler_Declaration ( Disk_DispatchSCSI )
                                                                        if ( Cdb->AsByte[0] == SCSIOP_VERIFY16 )
                                                                                {
                                                                                        REVERSE_BYTES_QUAD ( &StartSector,
-                                                                                                                                                                        &( ( ( PDISK_CDB16 ) Cdb )->
-                                                                                                                                                                                       LogicalBlock[0] ) );
+                                                                                                                                                                        &( ( ( PDISK_CDB16 )
+                                                                                                                                                                                               Cdb )->LogicalBlock[0] ) );
                                                                                        REVERSE_BYTES ( &SectorCount,
-                                                                                                                                                       &( ( ( PDISK_CDB16 ) Cdb )->
-                                                                                                                                                                TransferLength[0] ) );
+                                                                                                                                                       &( ( ( PDISK_CDB16 )
+                                                                                                                                                                        Cdb )->TransferLength[0] ) );
                                                                                }
                                                                        else
                                                                                {
@@ -616,21 +612,22 @@ IRPHandler_Declaration ( Disk_DispatchSCSI )
                                                                case SCSIOP_READ_CAPACITY:
                                                                        Temp = SECTORSIZE;
                                                                        REVERSE_BYTES ( &
-                                                                                                                                       ( ( ( PREAD_CAPACITY_DATA ) Srb->
-                                                                                                                                                       DataBuffer )->BytesPerBlock ), &Temp );
+                                                                                                                                       ( ( ( PREAD_CAPACITY_DATA )
+                                                                                                                                                       Srb->DataBuffer )->BytesPerBlock ),
+                                                                                                                                       &Temp );
                                                                        if ( ( DeviceExtension->Disk.LBADiskSize - 1 ) > 0xffffffff )
                                                                                {
-                                                                                       ( ( PREAD_CAPACITY_DATA ) Srb->DataBuffer )->
-                                                                                               LogicalBlockAddress = -1;
+                                                                                       ( ( PREAD_CAPACITY_DATA ) Srb->
+                                                                                               DataBuffer )->LogicalBlockAddress = -1;
                                                                                }
                                                                        else
                                                                                {
                                                                                        Temp =
                                                                                                ( ULONG ) ( DeviceExtension->Disk.LBADiskSize - 1 );
                                                                                        REVERSE_BYTES ( &
-                                                                                                                                                       ( ( ( PREAD_CAPACITY_DATA ) Srb->
-                                                                                                                                                                       DataBuffer )->LogicalBlockAddress ),
-                                                                                                                                                       &Temp );
+                                                                                                                                                       ( ( ( PREAD_CAPACITY_DATA )
+                                                                                                                                                                       Srb->DataBuffer )->
+                                                                                                                                                               LogicalBlockAddress ), &Temp );
                                                                                }
                                                                        Irp->IoStatus.Information = sizeof ( READ_CAPACITY_DATA );
                                                                        Srb->SrbStatus = SRB_STATUS_SUCCESS;
@@ -639,13 +636,15 @@ IRPHandler_Declaration ( Disk_DispatchSCSI )
                                                                case SCSIOP_READ_CAPACITY16:
                                                                        Temp = SECTORSIZE;
                                                                        REVERSE_BYTES ( &
-                                                                                                                                       ( ( ( PREAD_CAPACITY_DATA_EX ) Srb->
-                                                                                                                                                       DataBuffer )->BytesPerBlock ), &Temp );
+                                                                                                                                       ( ( ( PREAD_CAPACITY_DATA_EX )
+                                                                                                                                                       Srb->DataBuffer )->BytesPerBlock ),
+                                                                                                                                       &Temp );
                                                                        LargeTemp = DeviceExtension->Disk.LBADiskSize - 1;
                                                                        REVERSE_BYTES_QUAD ( &
-                                                                                                                                                        ( ( ( PREAD_CAPACITY_DATA_EX ) Srb->
-                                                                                                                                                                        DataBuffer )->LogicalBlockAddress.
-                                                                                                                                                                QuadPart ), &LargeTemp );
+                                                                                                                                                        ( ( ( PREAD_CAPACITY_DATA_EX )
+                                                                                                                                                                        Srb->DataBuffer )->
+                                                                                                                                                                LogicalBlockAddress.QuadPart ),
+                                                                                                                                                        &LargeTemp );
                                                                        Irp->IoStatus.Information = sizeof ( READ_CAPACITY_DATA_EX );
                                                                        Srb->SrbStatus = SRB_STATUS_SUCCESS;
                                                                        Status = STATUS_SUCCESS;
@@ -729,9 +728,9 @@ IRPHandler_Declaration ( Disk_DispatchDeviceControl )
                                        {
                                                CopySize =
                                                        ( Stack->Parameters.DeviceIoControl.OutputBufferLength <
-                                                               sizeof ( STORAGE_ADAPTER_DESCRIPTOR ) ? Stack->Parameters.
-                                                               DeviceIoControl.OutputBufferLength :
-                                                               sizeof ( STORAGE_ADAPTER_DESCRIPTOR ) );
+                                                               sizeof ( STORAGE_ADAPTER_DESCRIPTOR ) ? Stack->
+                                                               Parameters.DeviceIoControl.
+                                                               OutputBufferLength : sizeof ( STORAGE_ADAPTER_DESCRIPTOR ) );
                                                StorageAdapterDescriptor.Version =
                                                        sizeof ( STORAGE_ADAPTER_DESCRIPTOR );
                                                StorageAdapterDescriptor.Size =
@@ -758,9 +757,9 @@ IRPHandler_Declaration ( Disk_DispatchDeviceControl )
                                        {
                                                CopySize =
                                                        ( Stack->Parameters.DeviceIoControl.OutputBufferLength <
-                                                               sizeof ( STORAGE_DEVICE_DESCRIPTOR ) ? Stack->Parameters.
-                                                               DeviceIoControl.OutputBufferLength :
-                                                               sizeof ( STORAGE_DEVICE_DESCRIPTOR ) );
+                                                               sizeof ( STORAGE_DEVICE_DESCRIPTOR ) ? Stack->
+                                                               Parameters.DeviceIoControl.
+                                                               OutputBufferLength : sizeof ( STORAGE_DEVICE_DESCRIPTOR ) );
                                                StorageDeviceDescriptor.Version =
                                                        sizeof ( STORAGE_DEVICE_DESCRIPTOR );
                                                StorageDeviceDescriptor.Size =
@@ -792,8 +791,8 @@ IRPHandler_Declaration ( Disk_DispatchDeviceControl )
                        case IOCTL_DISK_GET_DRIVE_GEOMETRY:
                                CopySize =
                                        ( Stack->Parameters.DeviceIoControl.OutputBufferLength <
-                                               sizeof ( DISK_GEOMETRY ) ? Stack->Parameters.
-                                               DeviceIoControl.OutputBufferLength : sizeof ( DISK_GEOMETRY ) );
+                                               sizeof ( DISK_GEOMETRY ) ? Stack->Parameters.DeviceIoControl.
+                                               OutputBufferLength : sizeof ( DISK_GEOMETRY ) );
                                DiskGeometry.MediaType = FixedMedia;
                                DiskGeometry.Cylinders.QuadPart = DeviceExtension->Disk.Cylinders;
                                DiskGeometry.TracksPerCylinder = DeviceExtension->Disk.Heads;
@@ -807,8 +806,8 @@ IRPHandler_Declaration ( Disk_DispatchDeviceControl )
                        case IOCTL_SCSI_GET_ADDRESS:
                                CopySize =
                                        ( Stack->Parameters.DeviceIoControl.OutputBufferLength <
-                                               sizeof ( SCSI_ADDRESS ) ? Stack->Parameters.
-                                               DeviceIoControl.OutputBufferLength : sizeof ( SCSI_ADDRESS ) );
+                                               sizeof ( SCSI_ADDRESS ) ? Stack->Parameters.DeviceIoControl.
+                                               OutputBufferLength : sizeof ( SCSI_ADDRESS ) );
                                ScsiAdress.Length = sizeof ( SCSI_ADDRESS );
                                ScsiAdress.PortNumber = 0;
                                ScsiAdress.PathId = 0;
index 9b989c5..509a97e 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _AOEDISK_H
 #  define _AOEDISK_H
index 0c54ab7..d1b7173 100644 (file)
--- a/src/bus.c
+++ b/src/bus.c
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -459,14 +459,16 @@ IRPHandler_Declaration ( Bus_DispatchDeviceControl )
                                                TargetWalker = TargetWalker->Next;
                                        }
                                RtlCopyMemory ( Irp->AssociatedIrp.SystemBuffer, Targets,
-                                                                                               ( Stack->Parameters.
-                                                                                                       DeviceIoControl.OutputBufferLength <
+                                                                                               ( Stack->Parameters.DeviceIoControl.
+                                                                                                       OutputBufferLength <
                                                                                                        ( sizeof ( MOUNT_TARGETS ) +
                                                                                                                ( Count *
-                                                                                                                       sizeof ( MOUNT_TARGET ) ) ) ? Stack->
-                                                                                                       Parameters.DeviceIoControl.OutputBufferLength
-                                                                                                       : ( sizeof ( MOUNT_TARGETS ) +
-                                                                                                                       ( Count * sizeof ( MOUNT_TARGET ) ) ) ) );
+                                                                                                                       sizeof ( MOUNT_TARGET ) ) ) ? Stack->Parameters.
+                                                                                                       DeviceIoControl.
+                                                                                                       OutputBufferLength : ( sizeof ( MOUNT_TARGETS ) +
+                                                                                                                                                                                                ( Count *
+                                                                                                                                                                                                        sizeof
+                                                                                                                                                                                                        ( MOUNT_TARGET ) ) ) ) );
                                ExFreePool ( Targets );
 
                                KeReleaseSpinLock ( &Bus_Globals_TargetListSpinLock, Irql );
@@ -515,14 +517,16 @@ IRPHandler_Declaration ( Bus_DispatchDeviceControl )
                                                DiskWalker = DiskWalker->Disk.Next;
                                        }
                                RtlCopyMemory ( Irp->AssociatedIrp.SystemBuffer, Disks,
-                                                                                               ( Stack->Parameters.
-                                                                                                       DeviceIoControl.OutputBufferLength <
+                                                                                               ( Stack->Parameters.DeviceIoControl.
+                                                                                                       OutputBufferLength <
                                                                                                        ( sizeof ( MOUNT_DISKS ) +
                                                                                                                ( Count *
-                                                                                                                       sizeof ( MOUNT_DISK ) ) ) ? Stack->
-                                                                                                       Parameters.DeviceIoControl.OutputBufferLength
-                                                                                                       : ( sizeof ( MOUNT_DISKS ) +
-                                                                                                                       ( Count * sizeof ( MOUNT_DISK ) ) ) ) );
+                                                                                                                       sizeof ( MOUNT_DISK ) ) ) ? Stack->Parameters.
+                                                                                                       DeviceIoControl.
+                                                                                                       OutputBufferLength : ( sizeof ( MOUNT_DISKS ) +
+                                                                                                                                                                                                ( Count *
+                                                                                                                                                                                                        sizeof
+                                                                                                                                                                                                        ( MOUNT_DISK ) ) ) ) );
                                ExFreePool ( Disks );
 
                                Status = STATUS_SUCCESS;
@@ -548,8 +552,8 @@ IRPHandler_Declaration ( Bus_DispatchDeviceControl )
                                else
                                        {
                                                if ( DeviceExtension->Bus.PhysicalDeviceObject != NULL )
-                                                       IoInvalidateDeviceRelations ( DeviceExtension->Bus.
-                                                                                                                                                                               PhysicalDeviceObject,
+                                                       IoInvalidateDeviceRelations ( DeviceExtension->
+                                                                                                                                                                               Bus.PhysicalDeviceObject,
                                                                                                                                                                                BusRelations );
                                        }
                                Irp->IoStatus.Information = 0;
@@ -580,8 +584,8 @@ IRPHandler_Declaration ( Bus_DispatchDeviceControl )
                                                DiskWalker->Disk.Unmount = TRUE;
                                                DiskWalker->Disk.Next = NULL;
                                                if ( DeviceExtension->Bus.PhysicalDeviceObject != NULL )
-                                                       IoInvalidateDeviceRelations ( DeviceExtension->Bus.
-                                                                                                                                                                               PhysicalDeviceObject,
+                                                       IoInvalidateDeviceRelations ( DeviceExtension->
+                                                                                                                                                                               Bus.PhysicalDeviceObject,
                                                                                                                                                                                BusRelations );
                                        }
                                DeviceExtension->Bus.Children--;
index 5b79808..f633ed1 100644 (file)
--- a/src/bus.h
+++ b/src/bus.h
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _BUS_H
 #  define _BUS_H
index 4e25053..e781e59 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -243,8 +243,8 @@ Debug_DecodeIrp (
                {
                        case IRP_MJ_SYSTEM_CONTROL:
                                sprintf ( DebugMessage, "%s %s", DebugMessage,
-                                                                       Debug_SystemControlMinorFunctionString ( Stack->
-                                                                                                                                                                                                                                        MinorFunction ) );
+                                                                       Debug_SystemControlMinorFunctionString
+                                                                       ( Stack->MinorFunction ) );
                                break;
                        case IRP_MJ_PNP:
                                sprintf ( DebugMessage, "%s %s", DebugMessage,
@@ -253,29 +253,26 @@ Debug_DecodeIrp (
                                        {
                                                case IRP_MN_QUERY_ID:
                                                        sprintf ( DebugMessage, "%s %s", DebugMessage,
-                                                                                               Debug_QueryIdString ( Stack->Parameters.QueryId.
-                                                                                                                                                                                       IdType ) );
+                                                                                               Debug_QueryIdString ( Stack->Parameters.
+                                                                                                                                                                                       QueryId.IdType ) );
                                                        break;
                                                case IRP_MN_QUERY_DEVICE_TEXT:
                                                        sprintf ( DebugMessage, "%s %s", DebugMessage,
-                                                                                               Debug_DeviceTextTypeString ( Stack->
-                                                                                                                                                                                                                Parameters.QueryDeviceText.
-                                                                                                                                                                                                                DeviceTextType ) );
+                                                                                               Debug_DeviceTextTypeString ( Stack->Parameters.
+                                                                                                                                                                                                                QueryDeviceText.DeviceTextType ) );
                                                        break;
                                                case IRP_MN_QUERY_DEVICE_RELATIONS:
                                                        sprintf ( DebugMessage, "%s %s", DebugMessage,
-                                                                                               Debug_QueryDeviceRelationsString ( Stack->Parameters.
-                                                                                                                                                                                                                                        QueryDeviceRelations.
-                                                                                                                                                                                                                                        Type ) );
+                                                                                               Debug_QueryDeviceRelationsString ( Stack->
+                                                                                                                                                                                                                                        Parameters.QueryDeviceRelations.Type ) );
                                                        break;
                                        }
                                break;
                        case IRP_MJ_DEVICE_CONTROL:
                                sprintf ( DebugMessage, "%s (0x%08x) %s", DebugMessage,
                                                                        ( int )Stack->Parameters.DeviceIoControl.IoControlCode,
-                                                                       Debug_DeviceIoControlString ( Stack->
-                                                                                                                                                                                               Parameters.DeviceIoControl.
-                                                                                                                                                                                               IoControlCode ) );
+                                                                       Debug_DeviceIoControlString ( Stack->Parameters.
+                                                                                                                                                                                               DeviceIoControl.IoControlCode ) );
                                if ( !DeviceExtension->IsBus
                                                 && Stack->Parameters.DeviceIoControl.IoControlCode ==
                                                 IOCTL_STORAGE_QUERY_PROPERTY )
index 5200396..b4cac23 100644 (file)
@@ -1,22 +1,25 @@
 /*
- * Copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * WinVBlock is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * WinVBlock is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Jul-03-2009@22:39: Initial revision.
  */
+
 #ifndef _DEBUG_H
 #  define _DEBUG_H
 
index aaf62e6..1d54dad 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _DISK_H
 #  define _DISK_H
index 98b5094..cae067b 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
index 050e586..442f470 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _DRIVER_H
 #  define _DRIVER_H
index 1e4f4c7..5ab32e0 100644 (file)
@@ -1,22 +1,22 @@
 /**
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * Portions copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -71,7 +71,7 @@ main (
        TCHAR FullFilePath[1024];
 
        if ( !GetFullPathName
-                        ( "aoe.inf", sizeof ( FullFilePath ), FullFilePath, NULL ) )
+                        ( "winvblk.inf", sizeof ( FullFilePath ), FullFilePath, NULL ) )
                goto GetFullPathNameError;
        if ( ( Library = LoadLibrary ( "newdev.dll" ) ) == NULL )
                goto LoadLibraryError;
@@ -94,15 +94,16 @@ main (
                goto CreateDeviceInfoError;
        if ( !SetupDiSetDeviceRegistryProperty
                         ( DeviceInfoSet, &DeviceInfoData, SPDRP_HARDWAREID,
-                                ( LPBYTE ) "AoE\0\0\0",
-                                ( lstrlen ( "AoE\0\0\0" ) + 1 + 1 ) * sizeof ( TCHAR ) ) )
+                                ( LPBYTE ) "WinVBlock\0\0\0",
+                                ( lstrlen ( "WinVBlock\0\0\0" ) + 1 + 1 ) * sizeof ( TCHAR ) ) )
                goto SetDeviceRegistryPropertyError;
        if ( !SetupDiCallClassInstaller
                         ( DIF_REGISTERDEVICE, DeviceInfoSet, &DeviceInfoData ) )
                goto CallClassInstallerREGISTERDEVICEError;
 
        if ( !UpdateDriverForPlugAndPlayDevices
-                        ( 0, "AoE\0\0\0", FullFilePath, INSTALLFLAG_FORCE, &RebootRequired ) )
+                        ( 0, "WinVBlock\0\0\0", FullFilePath, INSTALLFLAG_FORCE,
+                                &RebootRequired ) )
                {
                        DWORD err = GetLastError (  );
                        DisplayError ( "UpdateDriverForPlugAndPlayDevices" );
index bc287f6..8ebeb9d 100644 (file)
--- a/src/mdi.h
+++ b/src/mdi.h
@@ -3,7 +3,7 @@
  *   Copyright 2009 Intel Corporation; author: H. Peter Anvin
  *
  *   This file is part of MEMDISK, part of the Syslinux bootloader suite.
- *   Minor adaptation for WinAoE by Shao Miller
+ *   Minor adaptation for WinVBlock by Shao Miller
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
index 36dbaaa..712836b 100644 (file)
@@ -1,22 +1,22 @@
 /**
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * Portions copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
index 949cab0..bb45cbf 100644 (file)
@@ -1,22 +1,22 @@
 /**
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * Portions copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _MOUNT_H
 #  define _MOUNT_H
index f5189c7..8c23705 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _PORTABLE_H
 #  define _PORTABLE_H
index b7e0119..7cdfd8a 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -180,8 +180,8 @@ Probe_AoE (
                                {
                                        if ( BusDeviceExtension->Bus.PhysicalDeviceObject != NULL )
                                                {
-                                                       IoInvalidateDeviceRelations ( BusDeviceExtension->Bus.
-                                                                                                                                                                               PhysicalDeviceObject,
+                                                       IoInvalidateDeviceRelations ( BusDeviceExtension->
+                                                                                                                                                                               Bus.PhysicalDeviceObject,
                                                                                                                                                                                BusRelations );
                                                }
                                }
@@ -266,8 +266,9 @@ Probe_MemDisk (
                                }
                        else if ( BusDeviceExtension->Bus.PhysicalDeviceObject != NULL )
                                {
-                                       IoInvalidateDeviceRelations ( BusDeviceExtension->Bus.
-                                                                                                                                                               PhysicalDeviceObject, BusRelations );
+                                       IoInvalidateDeviceRelations ( BusDeviceExtension->
+                                                                                                                                                               Bus.PhysicalDeviceObject,
+                                                                                                                                                               BusRelations );
                                }
                }
        else
@@ -383,8 +384,9 @@ no_grub4dos:
                                }
                        else if ( BusDeviceExtension->Bus.PhysicalDeviceObject != NULL )
                                {
-                                       IoInvalidateDeviceRelations ( BusDeviceExtension->Bus.
-                                                                                                                                                               PhysicalDeviceObject, BusRelations );
+                                       IoInvalidateDeviceRelations ( BusDeviceExtension->
+                                                                                                                                                               Bus.PhysicalDeviceObject,
+                                                                                                                                                               BusRelations );
                                }
                }
        else
index d9c4596..52de497 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _PROBE_H
 #  define _PROBE_H
index 9f02532..f9df64d 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -159,7 +159,7 @@ Protocol_Start (
                                                                                        FALSE );
        KeInitializeSpinLock ( &Protocol_Globals_SpinLock );
 
-       RtlInitUnicodeString ( &ProtocolName, L"AoE" );
+       RtlInitUnicodeString ( &ProtocolName, L"WinVBlock" );
        NdisZeroMemory ( &ProtocolCharacteristics,
                                                                         sizeof ( NDIS_PROTOCOL_CHARACTERISTICS ) );
        ProtocolCharacteristics.MajorNdisVersion = 5;
index 8f981c2..904c99c 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _PROTOCOL_H
 #  define _PROTOCOL_H
index 7d3d8ad..2034186 100644 (file)
@@ -1,21 +1,21 @@
 /**
- * Copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _RAMDISK_H
 #  define _RAMDISK_H
index 97ef21e..6210814 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -279,12 +279,12 @@ Registry_Setup (
                                                        for ( i = 0;
                                                                                i <
                                                                                ( KeyValueInformation->DataLength -
-                                                                                       sizeof ( L"AoE" ) / sizeof ( WCHAR ) ); i++ )
+                                                                                       sizeof ( L"WinVBlock" ) / sizeof ( WCHAR ) ); i++ )
                                                                {
                                                                        if ( RtlCompareMemory
-                                                                                        ( L"AoE",
+                                                                                        ( L"WinVBlock",
                                                                                                 &( ( ( PWCHAR ) KeyValueInformation->Data )[i] ),
-                                                                                                sizeof ( L"AoE" ) ) == sizeof ( L"AoE" ) )
+                                                                                                sizeof ( L"WinVBlock" ) ) == sizeof ( L"WinVBlock" ) )
                                                                                {
                                                                                        Found = TRUE;
                                                                                        break;
@@ -309,7 +309,7 @@ Registry_Setup (
                                                                {
                                                                        Updated = TRUE;
                                                                        NewValueLength =
-                                                                               KeyValueInformation->DataLength + sizeof ( L"AoE" );
+                                                                               KeyValueInformation->DataLength + sizeof ( L"WinVBlock" );
                                                                        if ( ( NewValue =
                                                                                                 ( PWCHAR ) ExAllocatePool ( NonPagedPool,
                                                                                                                                                                                                                 NewValueLength ) ) ==
@@ -318,9 +318,11 @@ Registry_Setup (
                                                                                        DBG ( "ExAllocatePool NewValue 2 failed\n" );
                                                                                        goto e2_2;
                                                                                }
-                                                                       RtlCopyMemory ( NewValue, L"AoE", sizeof ( L"AoE" ) );
+                                                                       RtlCopyMemory ( NewValue, L"WinVBlock",
+                                                                                                                                       sizeof ( L"WinVBlock" ) );
                                                                        RtlCopyMemory ( &NewValue
-                                                                                                                                       [( sizeof ( L"AoE" ) / sizeof ( WCHAR ) )],
+                                                                                                                                       [( sizeof ( L"WinVBlock" ) /
+                                                                                                                                                sizeof ( WCHAR ) )],
                                                                                                                                        KeyValueInformation->Data,
                                                                                                                                        KeyValueInformation->DataLength );
                                                                }
@@ -329,7 +331,7 @@ Registry_Setup (
                                        else
                                                {
                                                        Updated = TRUE;
-                                                       NewValueLength = sizeof ( L"AoE" ) + sizeof ( WCHAR );
+                                                       NewValueLength = sizeof ( L"WinVBlock" ) + sizeof ( WCHAR );
                                                        if ( ( NewValue =
                                                                                 ( PWCHAR ) ExAllocatePool ( NonPagedPool,
                                                                                                                                                                                                 NewValueLength ) ) == NULL )
@@ -338,7 +340,8 @@ Registry_Setup (
                                                                        goto e2_1;
                                                                }
                                                        RtlZeroMemory ( NewValue, NewValueLength );
-                                                       RtlCopyMemory ( NewValue, L"AoE", sizeof ( L"AoE" ) );
+                                                       RtlCopyMemory ( NewValue, L"WinVBlock",
+                                                                                                                       sizeof ( L"WinVBlock" ) );
                                                }
                                        if ( !NT_SUCCESS
                                                         ( ZwSetValueKey
@@ -424,8 +427,9 @@ Registry_Setup (
                                                                                                                                                                                                                 sizeof
                                                                                                                                                                                                                 ( DriverServiceNamePath )
                                                                                                                                                                                                                 +
-                                                                                                                                                                                                                KeyValueInformation->DataLength
-                                                                                                                                                                                                                - sizeof ( WCHAR ) ) ) ==
+                                                                                                                                                                                                                KeyValueInformation->
+                                                                                                                                                                                                                DataLength -
+                                                                                                                                                                                                                sizeof ( WCHAR ) ) ) ==
                                                                                         NULL )
                                                                                {
                                                                                        DBG ( "ExAllocatePool DriverServiceNameString "
index 402fd6b..a0f2bfa 100644 (file)
@@ -1,22 +1,22 @@
 /**
+ * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
- * Portions copyright (C) 2009 Shao Miller <shao.miller@yrdsb.edu.on.ca>.
- * For contact information, see http://winaoe.org/
+ * For WinAoE contact information, see http://winaoe.org/
  *
- * This file is part of WinAoE.
+ * This file is part of WinVBlock, derived from WinAoE.
  *
- * WinAoE is free software: you can redistribute it and/or modify
+ * WinVBlock is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * WinAoE is distributed in the hope that it will be useful,
+ * WinVBlock is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with WinAoE.  If not, see <http://www.gnu.org/licenses/>.
+ * along with WinVBlock.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _REGISTRY_H
 #  define _REGISTRY_H
diff --git a/src/resource.h b/src/resource.h
new file mode 100644 (file)
index 0000000..eeddb6f
--- /dev/null
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}\r
+// Microsoft Developer Studio generated include file.\r
+// Used by winvblk.rc\r
+//\r
+\r
+// Next default values for new objects\r
+// \r
+#ifdef APSTUDIO_INVOKED\r
+#  ifndef APSTUDIO_READONLY_SYMBOLS\r
+#    define _APS_NEXT_RESOURCE_VALUE        101\r
+#    define _APS_NEXT_COMMAND_VALUE         40001\r
+#    define _APS_NEXT_CONTROL_VALUE         1000\r
+#    define _APS_NEXT_SYMED_VALUE           101\r
+#  endif\r
+#endif\r
diff --git a/src/winvblock.rc b/src/winvblock.rc
new file mode 100644 (file)
index 0000000..bf938e7
--- /dev/null
@@ -0,0 +1,26 @@
+1 VERSIONINFO\r
+FILEVERSION 0,0,0,1\r
+PRODUCTVERSION 0,0,0,1\r
+FILEOS 0x40004\r
+FILETYPE 0x3\r
+{\r
+BLOCK "StringFileInfo"\r
+{\r
+       BLOCK "000004B0"\r
+       {\r
+               VALUE "CompanyName", "Shao Miller"\r
+               VALUE "FileDescription", "WinVBlock Virtual SCSI Driver"\r
+               VALUE "FileVersion", "0.0.0.1 (Aug-31-2009)"\r
+               VALUE "InternalName", "WinVBlock Virtual SCSI Driver"\r
+               VALUE "LegalCopyright", "© 2008 V., © 2009 Shao Miller, All rights reserved, Licensed under GPL."\r
+               VALUE "OriginalFilename", "winvblock.sys"\r
+               VALUE "ProductName", "WinVBlock Virtual SCSI Driver"\r
+               VALUE "ProductVersion", "0.0.0.1"\r
+       }\r
+}\r
+\r
+BLOCK "VarFileInfo"\r
+{\r
+       VALUE "Translation", 0x0000 0x04B0\r
+}\r
+}\r