Merge to trunk head (r46631)
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 1 Apr 2010 02:52:00 +0000 (02:52 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 1 Apr 2010 02:52:00 +0000 (02:52 +0000)
svn path=/branches/reactos-yarotows/; revision=46633

285 files changed:
1  2 
ReactOS-amd64.rbuild
base/applications/network/ftp/fake.h
base/applications/network/ftp/ftp.rbuild
base/services/dhcp/dhcp.rbuild
baseaddress.rbuild
boot/bootdata/packages/reactos.dff
boot/freeldr/freeldr/disk/scsiport.c
boot/freeldr/freeldr/freeldr_arch.rbuild
boot/freeldr/freeldr/freeldr_base.rbuild
boot/freeldr/freeldr/freeldr_main.rbuild
boot/freeldr/freeldr/setupldr_main.rbuild
boot/freeldr/freeldr/windows/winldr.c
dll/directx/bdaplgin/bdaplgin.cpp
dll/directx/bdaplgin/bdaplgin.rbuild
dll/directx/directx.rbuild
dll/directx/ksproxy/ksproxy.cpp
dll/directx/ksproxy/ksproxy.rbuild
dll/directx/msdvbnp/ethernetfilter.cpp
dll/directx/msdvbnp/ipv4.cpp
dll/directx/msdvbnp/ipv6.cpp
dll/directx/msdvbnp/msdvbnp.cpp
dll/directx/msdvbnp/msdvbnp.rbuild
dll/directx/msdvbnp/networkprovider.cpp
dll/directx/msdvbnp/precomp.h
dll/directx/msdvbnp/scanningtuner.cpp
dll/directx/msvidctl/msvidctl.cpp
dll/directx/msvidctl/msvidctl.rbuild
dll/ntdll/ntdll.rbuild
dll/win32/crtdll/crtdll.rbuild
dll/win32/gdi32/objects/bitmap.c
dll/win32/gdi32/objects/dc.c
dll/win32/gdi32/objects/font.c
dll/win32/hid/precomp.h
dll/win32/kernel32/kernel32.pspec
dll/win32/msvcrt/msvcrt.def
dll/win32/msvcrt/msvcrt.rbuild
dll/win32/msvcrt20/msvcrt20.rbuild
dll/win32/msvcrt40/msvcrt40.rbuild
dll/win32/setupapi/devinst.c
dll/win32/setupapi/setupapi.rbuild
dll/win32/setupapi/setupapi_private.h
dll/win32/user32/misc/desktop.c
dll/win32/user32/misc/winsta.c
dll/win32/user32/windows/defwnd.c
dll/win32/user32/windows/draw.c
drivers/base/kddll/kddll.h
drivers/battery/battc/battc.c
drivers/bus/acpi/compbatt/compbatt.c
drivers/bus/acpi/compbatt/compbatt.h
drivers/bus/acpi/compbatt/compmisc.c
drivers/bus/acpi/compbatt/comppnp.c
drivers/directx/dxapi/dxapi_driver.h
drivers/directx/dxg/dxg_int.h
drivers/filesystems/ext2/inc/ext2fsd.h
drivers/ksfilter/ks/bag.c
drivers/ksfilter/ks/device.c
drivers/ksfilter/ks/deviceinterface.c
drivers/ksfilter/ks/driver.c
drivers/ksfilter/ks/filterfactory.c
drivers/ksfilter/ks/kcom.c
drivers/ksfilter/ks/ksfunc.h
drivers/ksfilter/ks/kstypes.h
drivers/ksfilter/ks/misc.c
drivers/multimedia/bdasup/bdasup.c
drivers/serial/serial/serial.h
drivers/storage/ide/uniata/atapi.h
drivers/storage/ide/uniata/bsmaster.h
drivers/storage/ide/uniata/config.h
drivers/storage/ide/uniata/id_ata.cpp
drivers/storage/ide/uniata/srb.h
drivers/storage/scsiport/stubs.c
drivers/video/displays/vga/vgaddi.h
hal/halx86/directory.rbuild
hal/halx86/generic/acpi/halacpi.c
hal/halx86/generic/acpi/halpnpdd.c
hal/halx86/generic/halinit.c
hal/halx86/generic/legacy/halpcat.c
hal/halx86/generic/misc.c
hal/halx86/hal.rbuild
hal/halx86/hal_generic.rbuild
hal/halx86/halacpi.rbuild
hal/halx86/halamd64.rbuild
hal/halx86/halmps.rbuild
hal/halx86/halxbox.rbuild
hal/halx86/include/hal.h
hal/halx86/include/halacpi.h
hal/halx86/include/halp.h
include/crt/_mingw.h
include/crt/_mingw_mac.h
include/crt/crtdefs.h
include/crt/ctype.h
include/crt/mingw32/intrin_x86.h
include/crt/stdlib.h
include/crt/tchar.h
include/ddk/afilter.h
include/ddk/bdasup.h
include/ddk/csq.h
include/ddk/hidclass.h
include/ddk/hidpi.h
include/ddk/mcd.h
include/ddk/mce.h
include/ddk/miniport.h
include/ddk/minitape.h
include/ddk/ndis.h
include/ddk/ntagp.h
include/ddk/ntdd8042.h
include/ddk/ntddk.h
include/ddk/ntifs.h
include/ddk/ntimage.h
include/ddk/ntpoapi.h
include/ddk/parallel.h
include/ddk/scsiwmi.h
include/ddk/smbus.h
include/ddk/srb.h
include/ddk/storport.h
include/ddk/tdikrnl.h
include/ddk/upssvc.h
include/ddk/video.h
include/ddk/videoagp.h
include/ddk/wdm.h
include/ddk/wmilib.h
include/ndk/iofuncs.h
include/ndk/ketypes.h
include/ndk/peb_teb.h
include/ndk/pstypes.h
include/ndk/rtlfuncs.h
include/psdk/atsmedia.h
include/psdk/batclass.h
include/psdk/cfg.h
include/psdk/cfgmgr32.h
include/psdk/devpropdef.h
include/psdk/evntprov.h
include/psdk/ks.h
include/psdk/ktmtypes.h
include/psdk/ntdef.h
include/psdk/ntiologc.h
include/psdk/tvout.h
include/psdk/usbioctl.h
include/psdk/winbase.h
include/psdk/wincon.h
include/psdk/windef.h
include/psdk/wingdi.h
include/psdk/winnt.h
include/psdk/winuser.h
include/reactos/idl/pnp.idl
include/reactos/mingw-w64/internal.h
include/reactos/mingw-w64/oscalls.h
include/reactos/mingw-w64/reactos.diff
include/reactos/mingw-w64/sect_attribs.h
include/xdk/amd64/ke.h
include/xdk/amd64/mm.h
include/xdk/arm/ke.h
include/xdk/cmfuncs.h
include/xdk/cmtypes.h
include/xdk/exfuncs.h
include/xdk/extypes.h
include/xdk/generate.bat
include/xdk/halfuncs.h
include/xdk/haltypes.h
include/xdk/ia64/ke.h
include/xdk/interlocked.h
include/xdk/iofuncs.h
include/xdk/iotypes.h
include/xdk/kdfuncs.h
include/xdk/kdtypes.h
include/xdk/kefuncs.h
include/xdk/ketypes.h
include/xdk/mips/ke.h
include/xdk/mmfuncs.h
include/xdk/mmtypes.h
include/xdk/ntddk.template.h
include/xdk/nttmapi.h
include/xdk/obfuncs.h
include/xdk/obtypes.h
include/xdk/pofuncs.h
include/xdk/potypes.h
include/xdk/ppc/ke.h
include/xdk/psfuncs.h
include/xdk/pstypes.h
include/xdk/rtlfuncs.h
include/xdk/rtltypes.h
include/xdk/sefuncs.h
include/xdk/setypes.h
include/xdk/wdm.template.h
include/xdk/wmifuncs.h
include/xdk/wmitypes.h
include/xdk/x86/ke.h
include/xdk/x86/mm.h
include/xdk/zwfuncs.h
lib/3rdparty/libwine/debug_ros.c
lib/3rdparty/mingw/CRT_fp10.c
lib/3rdparty/mingw/CRT_fp8.c
lib/3rdparty/mingw/CRT_glob.c
lib/3rdparty/mingw/CRT_noglob.c
lib/3rdparty/mingw/_newmode.c
lib/3rdparty/mingw/atonexit.c
lib/3rdparty/mingw/binmode.c
lib/3rdparty/mingw/charmax.c
lib/3rdparty/mingw/crt0_c.c
lib/3rdparty/mingw/crt0_w.c
lib/3rdparty/mingw/crt_handler.c
lib/3rdparty/mingw/crtbegin.c
lib/3rdparty/mingw/crtdll.c
lib/3rdparty/mingw/crtend.c
lib/3rdparty/mingw/crtexe.c
lib/3rdparty/mingw/cxa_pure_virtual.c
lib/3rdparty/mingw/dll_argv.c
lib/3rdparty/mingw/dllargv.c
lib/3rdparty/mingw/dllentry.c
lib/3rdparty/mingw/dllmain.c
lib/3rdparty/mingw/gccmain.c
lib/3rdparty/mingw/gs_support.c
lib/3rdparty/mingw/isascii.c
lib/3rdparty/mingw/iscsym.c
lib/3rdparty/mingw/iscsymf.c
lib/3rdparty/mingw/merr.c
lib/3rdparty/mingw/mingw.rbuild
lib/3rdparty/mingw/mingw_custom.c
lib/3rdparty/mingw/mingw_helpers.c
lib/3rdparty/mingw/moldname-msvcrt.def
lib/3rdparty/mingw/natstart.c
lib/3rdparty/mingw/ofmt_stub.c
lib/3rdparty/mingw/pesect.c
lib/3rdparty/mingw/pseudo-reloc-list.c
lib/3rdparty/mingw/pseudo-reloc.c
lib/3rdparty/mingw/reactos.diff
lib/3rdparty/mingw/strcasecmp.c
lib/3rdparty/mingw/strncasecmp.c
lib/3rdparty/mingw/tlsmcrt.c
lib/3rdparty/mingw/tlsmthread.c
lib/3rdparty/mingw/tlssup.c
lib/3rdparty/mingw/tlsthrd.c
lib/3rdparty/mingw/toascii.c
lib/3rdparty/mingw/txtmode.c
lib/3rdparty/mingw/ucrtexe.c
lib/3rdparty/mingw/udll_argv.c
lib/3rdparty/mingw/udllargc.c
lib/3rdparty/mingw/wcscmpi.c
lib/3rdparty/mingw/wildcard.c
lib/3rdparty/mingw/xncommod.c
lib/3rdparty/mingw/xthdloc.c
lib/3rdparty/mingw/xtxtmode.c
lib/rtl/registry.c
lib/rtl/rtl.rbuild
lib/sdk/crt/crt.rbuild
lib/sdk/crt/except/xcptfil.c
lib/sdk/crt/float/chgsign.c
lib/sdk/crt/float/copysign.c
lib/sdk/crt/float/fpclass.c
lib/sdk/crt/float/isnan.c
lib/sdk/crt/float/scalb.c
lib/sdk/crt/include/internal/ieee.h
lib/sdk/crt/libcntpr.rbuild
lib/sdk/crt/math/frexp.c
lib/sdk/crt/math/huge_val.c
lib/sdk/crt/math/modf.c
lib/sdk/crt/string/ctype.c
media/inf/bda.inf
media/inf/inf.rbuild
media/inf/kscaptur.inf
ntoskrnl/config/cmhvlist.c
ntoskrnl/config/cmnotify.c
ntoskrnl/config/cmquota.c
ntoskrnl/config/cmsysini.c
ntoskrnl/include/internal/amd64/asmmacro.S
ntoskrnl/include/internal/amd64/intrin_i.h
ntoskrnl/include/internal/amd64/ke.h
ntoskrnl/include/internal/amd64/mm.h
ntoskrnl/include/internal/arch/intrin_i.h
ntoskrnl/include/internal/arch/ke.h
ntoskrnl/include/internal/arch/mm.h
ntoskrnl/include/internal/cm.h
ntoskrnl/include/internal/cm_x.h
ntoskrnl/include/ntoskrnl.h
ntoskrnl/io/pnpmgr/pnpmgr.c
ntoskrnl/mm/mminit.c
ntoskrnl/ntoskrnl-generic.rbuild
ntoskrnl/ntoskrnl.pspec
ntoskrnl/se/semgr.c
subsystems/subsystems.rbuild
subsystems/win32/win32k/include/timer.h
subsystems/win32/win32k/include/winpos.h
subsystems/win32/win32k/ntuser/timer.c
subsystems/win32/win32k/objects/dcstate.c
subsystems/win32/win32k/pch.h

Simple merge
Simple merge
Simple merge
Simple merge
index 1a37bcc,0000000..49d33a7
mode 100644,000000..100644
--- /dev/null
@@@ -1,814 -1,0 +1,818 @@@
 +; Main ReactOS package
 +
 +.Set DiskLabelTemplate="ReactOS"                ; Label of disk
 +.Set CabinetNameTemplate="reactos.cab"          ; reactos.cab
 +.Set InfFileName="reactos.inf"                  ; reactos.inf
 +
 +
 +;.Set Cabinet=on
 +;.Set Compress=on
 +
 +.InfBegin
 +[Version]
 +Signature = "$ReactOS$"
 +
 +[Directories]
 +1 = system32
 +2 = system32\drivers
 +3 = Fonts
 +4 =
 +5 = system32\drivers\etc
 +6 = inf
 +7 = bin
 +8 = media
 +
 +.InfEnd
 +
 +; Contents of disk
 +.InfBegin
 +[SourceFiles]
 +.InfEnd
 +
 +
 +; Base files
 +base\applications\cacls\cacls.exe                       1
 +base\applications\calc\calc.exe                         1
 +base\applications\charmap\charmap.exe                   1
 +base\applications\cmdutils\dbgprint\dbgprint.exe        1
 +base\applications\cmdutils\doskey\doskey.exe            1
 +base\applications\cmdutils\find\find.exe                1
 +base\applications\cmdutils\hostname\hostname.exe        1
 +base\applications\cmdutils\lodctr\lodctr.exe            1
 +base\applications\cmdutils\more\more.exe                1
 +base\applications\cmdutils\reg\reg.exe                  1
 +base\applications\cmdutils\xcopy\xcopy.exe              1
 +base\applications\control\control.exe                   1
 +base\applications\dxdiag\dxdiag.exe                     1
 +base\applications\fontview\fontview.exe                 1
 +base\applications\mscutils\devmgmt\devmgmt.exe          1
 +base\applications\mscutils\eventvwr\eventvwr.exe        1
 +base\applications\games\solitaire\sol.exe               1
 +base\applications\games\spider\spider.exe               1
 +base\applications\games\winemine\winemine.exe           1
 +base\applications\hh\hh.exe                             4
 +base\applications\kbswitch\kbswitch.exe                 1
 +base\applications\kbswitch\kbsdll\kbsdll.dll            1
 +base\applications\logoff\logoff.exe                     1
 +base\applications\magnify\magnify.exe                   1
 +base\applications\mplay32\mplay32.exe                   1
 +base\applications\msconfig\msconfig.exe                 1
 +base\applications\mstsc\mstsc.exe                       1
 +base\applications\network\arp\arp.exe                   1
 +base\applications\network\dwnl\dwnl.exe                 1
 +base\applications\network\route\route.exe               1
 +base\applications\network\finger\finger.exe             1
 +base\applications\network\ftp\ftp.exe                   1
 +base\applications\network\ipconfig\ipconfig.exe         1
 +base\applications\network\netstat\netstat.exe           1
 +base\applications\network\nslookup\nslookup.exe         1
 +base\applications\network\ping\ping.exe                 1
 +base\applications\network\telnet\telnet.exe             1
 +base\applications\network\tracert\tracert.exe           1
 +base\applications\network\whois\whois.exe               1
 +base\applications\notepad\notepad.exe                   1
 +base\applications\paint\paint.exe                       1
 +base\applications\rapps\rapps.exe                       1
 +base\applications\regedit\regedit.exe                   4
 +base\applications\regedit\clb\clb.dll                   1
 +base\applications\regedt32\regedt32.exe                 1
 +base\applications\sc\sc.exe                             1
 +base\applications\screensavers\3dtext\3dtext.scr        1
 +base\applications\screensavers\logon\logon.scr          1
 +base\applications\mscutils\servman\servman.exe          1
 +base\applications\shutdown\shutdown.exe                 1
 +base\applications\sndrec32\sndrec32.exe                 1
 +base\applications\sndvol32\sndvol32.exe                 1
 +base\applications\taskmgr\taskmgr.exe                   1
 +base\applications\winhlp32\winhlp32.exe                 4
 +base\applications\winver\winver.exe                     1
 +base\applications\wordpad\wordpad.exe                   1
 +base\applications\write\write.exe                       1
 +
 +base\services\audiosrv\audiosrv.exe                 1
 +base\services\dhcp\dhcp.exe                         1
 +base\services\eventlog\eventlog.exe                 1
 +base\services\rpcss\rpcss.exe                       1
 +base\services\spoolsv\spoolsv.exe                   1
 +base\services\tcpsvcs\tcpsvcs.exe                   1
 +base\services\telnetd\telnetd.exe                   1
 +base\services\tcpsvcs\quotes                        5
 +base\services\umpnpmgr\umpnpmgr.exe                 1
 +base\services\wlansvc\wlansvc.exe                   1
 +base\services\svchost\svchost.exe                   1
 +
 +base\setup\setup\setup.exe                          1
 +base\setup\vmwinst\vmwinst.exe                      1
 +
 +base\shell\cmd\cmd.exe                              1
 +base\shell\explorer\explorer.exe                    4
 +base\shell\explorer\explorer-cfg-template.xml       4
 +base\shell\explorer\notifyhook\notifyhook.dll       1
 +base\shell\explorer-new\explorer_new.exe            4   optional
 +
 +base\system\autochk\autochk.exe                     1
 +base\system\bootok\bootok.exe                       1
 +base\system\format\format.exe                       1
 +base\system\lsass\lsass.exe                         1
 +base\system\msiexec\msiexec.exe                     1
 +base\system\regsvr32\regsvr32.exe                   1
 +base\system\rundll32\rundll32.exe                   1
 +base\system\runonce\runonce.exe                     1
 +base\system\services\services.exe                   1
 +base\system\userinit\userinit.exe                   1
 +base\system\winlogon\winlogon.exe                   1
 +base\system\expand\expand.exe                       1
 +base\system\smss\smss.exe                           1
 +
 +
 +; Dynamic Link Libraries
 +dll\3rdparty\mesa32\mesa32.dll                      1
 +dll\3rdparty\libjpeg\libjpeg.dll                    1
 +dll\3rdparty\libxslt\libxslt.dll                    1
 +dll\3rdparty\dxtn\dxtn.dll                          1   optional
 +
 +dll\cpl\access\access.cpl                           1
 +dll\cpl\appwiz\appwiz.cpl                           1
 +dll\cpl\console\console.dll                         1
 +dll\cpl\desk\desk.cpl                               1
 +dll\cpl\hdwwiz\hdwwiz.cpl                           1
 +dll\cpl\input\input.dll                             1
 +dll\cpl\intl\intl.cpl                               1
 +dll\cpl\joy\joy.cpl                                 1
 +;dll\cpl\liccpa\liccpa.cpl                          1
 +dll\cpl\main\main.cpl                               1
 +dll\cpl\mmsys\mmsys.cpl                             1
 +dll\cpl\ncpa\ncpa.cpl                               1
 +;dll\cpl\odbccp32\odbccp32.cpl                      1
 +dll\cpl\powercfg\powercfg.cpl                       1
 +dll\cpl\sysdm\sysdm.cpl                             1
 +;dll\cpl\telephon\telephon.cpl                      1
 +dll\cpl\timedate\timedate.cpl                       1
 +;dll\cpl\usrmgr\usrmgr.cpl                          1
 +
 +dll\directx\amstream\amstream.dll                   1
++dll\directx\bdaplgin\bdaplgin.ax                    1
 +dll\directx\dinput\dinput.dll                       1
 +dll\directx\dinput8\dinput8.dll                     1
 +dll\directx\dmusic\dmusic.dll                       1
 +dll\directx\dplay\dplay.dll                         1
 +dll\directx\dplayx\dplayx.dll                       1
 +dll\directx\dsound\dsound.dll                       1
 +dll\directx\dxdiagn\dxdiagn.dll                     1
 +dll\directx\wine\ddraw\ddraw.dll                    1
 +dll\directx\d3d8thk\d3d8thk.dll                     1
 +dll\directx\devenum\devenum.dll                     1
 +dll\directx\ksproxy\ksproxy.ax                      1
 +dll\directx\ksuser\ksuser.dll                       1
 +dll\directx\msdmo\msdmo.dll                         1
++dll\directx\msdvbnp\msdvbnp.ax                      1
++dll\directx\msvidctl\msvidctl.dll                   1
 +dll\directx\quartz\quartz.dll                       1
 +dll\directx\qedit\qedit.dll                         1
 +dll\directx\wine\d3d8\d3d8.dll                      1
 +dll\directx\wine\wined3d\wined3d.dll                1
 +dll\directx\wine\d3d9\d3d9.dll                      1
 +
 +dll\keyboard\kbda1\kbda1.dll                        1
 +dll\keyboard\kbda2\kbda2.dll                        1
 +dll\keyboard\kbda3\kbda3.dll                        1
 +dll\keyboard\kbdal\kbdal.dll                        1
 +dll\keyboard\kbdarme\kbdarme.dll                    1
 +dll\keyboard\kbdarmw\kbdarmw.dll                    1
 +dll\keyboard\kbdaze\kbdaze.dll                      1
 +dll\keyboard\kbdazel\kbdazel.dll                    1
 +dll\keyboard\kbdbgm\kbdbgm.dll                      1
 +dll\keyboard\kbdbgt\kbdbgt.dll                      1
 +dll\keyboard\kbdblr\kbdblr.dll                      1
 +dll\keyboard\kbdbr\kbdbr.dll                        1
 +dll\keyboard\kbdbga\kbdbga.dll                      1
 +dll\keyboard\kbdbe\kbdbe.dll                        1
 +dll\keyboard\kbdbur\kbdbur.dll                      1
 +dll\keyboard\kbdcan\kbdcan.dll                      1
 +dll\keyboard\kbdcr\kbdcr.dll                        1
 +dll\keyboard\kbdcz\kbdcz.dll                        1
 +dll\keyboard\kbdcz1\kbdcz1.dll                      1
 +dll\keyboard\kbdda\kbdda.dll                        1
 +dll\keyboard\kbddv\kbddv.dll                        1
 +dll\keyboard\kbdes\kbdes.dll                        1
 +dll\keyboard\kbdest\kbdest.dll                      1
 +dll\keyboard\kbdfc\kbdfc.dll                        1
 +dll\keyboard\kbdfi\kbdfi.dll                        1
 +dll\keyboard\kbdfr\kbdfr.dll                        1
 +dll\keyboard\kbdgeo\kbdgeo.dll                      1
 +dll\keyboard\kbdgerg\kbdgerg.dll                    1
 +dll\keyboard\kbdgneo\kbdgneo.dll                    1
 +dll\keyboard\kbdgrist\kbdgrist.dll                  1
 +dll\keyboard\kbdgr\kbdgr.dll                        1
 +dll\keyboard\kbdhe\kbdhe.dll                        1
 +dll\keyboard\kbdheb\kbdheb.dll                      1
 +dll\keyboard\kbdhu\kbdhu.dll                        1
 +dll\keyboard\kbdic\kbdic.dll                        1
 +dll\keyboard\kbdinasa\kbdinasa.dll                  1
 +dll\keyboard\kbdinben\kbdinben.dll                  1
 +dll\keyboard\kbdindev\kbdindev.dll                  1
 +dll\keyboard\kbdinguj\kbdinguj.dll                  1
 +dll\keyboard\kbdinmal\kbdinmal.dll                  1
 +dll\keyboard\kbdir\kbdir.dll                        1
 +dll\keyboard\kbdit\kbdit.dll                        1
 +dll\keyboard\kbdja\kbdja.dll                        1
 +dll\keyboard\kbdkaz\kbdkaz.dll                      1
 +dll\keyboard\kbdla\kbdla.dll                        1
 +dll\keyboard\kbdlt1\kbdlt1.dll                      1
 +dll\keyboard\kbdlv\kbdlv.dll                        1
 +dll\keyboard\kbdmac\kbdmac.dll                      1
 +dll\keyboard\kbdne\kbdne.dll                        1
 +dll\keyboard\kbdno\kbdno.dll                        1
 +dll\keyboard\kbdpl1\kbdpl1.dll                      1
 +dll\keyboard\kbdpo\kbdpo.dll                        1
 +dll\keyboard\kbdro\kbdro.dll                        1
 +dll\keyboard\kbdru\kbdru.dll                        1
 +dll\keyboard\kbdru1\kbdru1.dll                      1
 +dll\keyboard\kbdsg\kbdsg.dll                        1
 +dll\keyboard\kbdsk\kbdsk.dll                        1
 +dll\keyboard\kbdsk1\kbdsk1.dll                      1
 +dll\keyboard\kbdsw\kbdsw.dll                        1
 +dll\keyboard\kbdtat\kbdtat.dll                      1
 +dll\keyboard\kbdth0\kbdth0.dll                      1
 +dll\keyboard\kbdth1\kbdth1.dll                      1
 +dll\keyboard\kbdth2\kbdth2.dll                      1
 +dll\keyboard\kbdth3\kbdth3.dll                      1
 +dll\keyboard\kbdtuf\kbdtuf.dll                      1
 +dll\keyboard\kbdtuq\kbdtuq.dll                      1
 +dll\keyboard\kbduk\kbduk.dll                        1
 +dll\keyboard\kbdur\kbdur.dll                        1
 +dll\keyboard\kbdurs\kbdurs.dll                      1
 +dll\keyboard\kbdus\kbdus.dll                        1
 +dll\keyboard\kbdusa\kbdusa.dll                      1
 +dll\keyboard\kbdusl\kbdusl.dll                      1
 +dll\keyboard\kbdusr\kbdusr.dll                      1
 +dll\keyboard\kbdusx\kbdusx.dll                      1
 +dll\keyboard\kbduzb\kbduzb.dll                      1
 +dll\keyboard\kbdvntc\kbdvntc.dll                    1
 +dll\keyboard\kbdycc\kbdycc.dll                      1
 +dll\keyboard\kbdycl\kbdycl.dll                      1
 +dll\keyboard\kbdko\kbdko.dll                        1
 +
 +dll\ntdll\ntdll.dll                                 1
 +
 +dll\win32\acledit\acledit.dll                       1
 +dll\win32\aclui\aclui.dll                           1
 +dll\win32\activeds\activeds.dll                     1
 +dll\win32\advapi32\advapi32.dll                     1
 +dll\win32\advpack\advpack.dll                       1
 +dll\win32\actxprxy\actxprxy.dll                     1
 +dll\win32\atl\atl.dll                               1
 +dll\win32\authz\authz.dll                           1
 +dll\win32\avicap32\avicap32.dll                     1
 +dll\win32\avifil32\avifil32.dll                     1
 +dll\win32\batt\batt.dll                             1
 +dll\win32\bcrypt\bcrypt.dll                         1
 +dll\win32\beepmidi\beepmidi.dll                     1
 +dll\win32\browseui\browseui.dll                     1
 +dll\win32\cabinet\cabinet.dll                       1
 +dll\win32\cards\cards.dll                           1
 +dll\win32\cfgmgr32\cfgmgr32.dll                     1
 +dll\win32\clusapi\clusapi.dll                       1
 +dll\win32\comcat\comcat.dll                         1
 +dll\win32\comctl32\comctl32.dll                     1
 +dll\win32\comdlg32\comdlg32.dll                     1
 +dll\win32\compstui\compstui.dll                     1
 +dll\win32\credui\credui.dll                         1
 +dll\win32\crtdll\crtdll.dll                         1
 +dll\win32\crypt32\crypt32.dll                       1
 +dll\win32\cryptdlg\cryptdlg.dll                     1
 +dll\win32\cryptdll\cryptdll.dll                     1
 +dll\win32\cryptnet\cryptnet.dll                     1
 +dll\win32\cryptui\cryptui.dll                       1
 +dll\win32\dbghelp\dbghelp.dll                       1
 +dll\win32\dciman32\dciman32.dll                     1
 +dll\win32\dwmapi\dwmapi.dll                         1
 +dll\win32\devmgr\devmgr.dll                         1
 +dll\win32\dhcpcsvc\dhcpcsvc.dll                     1
 +dll\win32\dnsapi\dnsapi.dll                         1
 +dll\win32\faultrep\faultrep.dll                     1
 +dll\win32\fmifs\fmifs.dll                           1
 +dll\win32\fusion\fusion.dll                         1
 +dll\win32\gdi32\gdi32.dll                           1
 +dll\win32\gdiplus\gdiplus.dll                       1
 +dll\win32\getuname\getuname.dll                     1
 +dll\win32\glu32\glu32.dll                           1
 +dll\win32\hhctrl.ocx\hhctrl.ocx                     1
 +dll\win32\hid\hid.dll                               1
 +dll\win32\hlink\hlink.dll                           1
 +dll\win32\hnetcfg\hnetcfg.dll                       1
 +dll\win32\httpapi\httpapi.dll                       1
 +dll\win32\iccvid\iccvid.dll                         1
 +dll\win32\icmp\icmp.dll                             1
 +dll\win32\imaadp32.acm\imaadp32.acm                 1
 +dll\win32\imagehlp\imagehlp.dll                     1
 +dll\win32\imm32\imm32.dll                           1
 +dll\win32\inetcomm\inetcomm.dll                     1
 +dll\win32\inetmib1\inetmib1.dll                     1
 +dll\win32\initpki\initpki.dll                       1
 +dll\win32\inseng\inseng.dll                         1
 +dll\win32\iphlpapi\iphlpapi.dll                     1
 +dll\win32\itircl\itircl.dll                         1
 +dll\win32\itss\itss.dll                             1
 +dll\win32\jscript\jscript.dll                       1
 +dll\win32\kernel32\kernel32.dll                     1
 +dll\win32\loadperf\loadperf.dll                     1
 +dll\win32\localspl\localspl.dll                     1
 +dll\win32\localui\localui.dll                       1
 +dll\win32\lsasrv\lsasrv.dll                         1
 +dll\win32\lz32\lz32.dll                             1
 +dll\win32\mapi32\mapi32.dll                         1
 +dll\win32\mciavi32\mciavi32.dll                     1
 +dll\win32\mcicda\mcicda.dll                         1
 +dll\win32\mciqtz32\mciqtz32.dll                     1
 +dll\win32\mciseq\mciseq.dll                         1
 +dll\win32\mciwave\mciwave.dll                       1
 +dll\win32\mlang\mlang.dll                           1
 +dll\win32\mmdrv\mmdrv.dll                           1
 +dll\win32\modemui\modemui.dll                       1
 +dll\win32\mpr\mpr.dll                               1
 +dll\win32\mprapi\mprapi.dll                         1
 +dll\win32\msacm32\msacm32.dll                       1
 +dll\win32\msacm32\msacm32.drv\msacm32.drv           1
 +dll\win32\msadp32.acm\msadp32.acm                   1
 +dll\win32\msafd\msafd.dll                           1
 +dll\win32\mscat32\mscat32.dll                       1
 +dll\win32\mscms\mscms.dll                           1
 +dll\win32\mscoree\mscoree.dll                       1
 +dll\win32\msctf\msctf.dll                           1
 +dll\win32\msftedit\msftedit.dll                     1
 +dll\win32\msg711.acm\msg711.acm                     1
 +dll\win32\msgina\msgina.dll                         1
 +dll\win32\msgsm32.acm\msgsm32.acm                   1
 +dll\win32\mshtml\mshtml.dll                         1
 +dll\win32\mshtml.tlb\mshtml.tlb                     1
 +dll\win32\msi\msi.dll                               1
 +dll\win32\msimg32\msimg32.dll                       1
 +dll\win32\msimtf\msimtf.dll                         1
 +dll\win32\msisip\msisip.dll                         1
 +dll\win32\msisys.ocx\msisys.ocx                     1
 +dll\win32\msnet32\msnet32.dll                       1
 +dll\win32\msrle32\msrle32.dll                       1
 +dll\win32\mssign32\mssign32.dll                     1
 +dll\win32\mssip32\mssip32.dll                       1
 +dll\win32\mstask\mstask.dll                         1
 +dll\win32\msvcrt\msvcrt.dll                         1
 +dll\win32\msvcrt20\msvcrt20.dll                     1
 +dll\win32\msvcrt40\msvcrt40.dll                     1
 +dll\win32\msvfw32\msvfw32.dll                       1
 +dll\win32\msvidc32\msvidc32.dll                     1
 +dll\win32\mswsock\mswsock.dll                       1
 +dll\win32\msxml3\msxml3.dll                         1
 +dll\win32\nddeapi\nddeapi.dll                       1
 +dll\win32\netapi32\netapi32.dll                     1
 +dll\win32\netcfgx\netcfgx.dll                       1
 +dll\win32\netid\netid.dll                           1
 +dll\win32\netshell\netshell.dll                     1
 +dll\win32\newdev\newdev.dll                         1
 +dll\win32\ntdsapi\ntdsapi.dll                       1
 +dll\win32\ntlanman\ntlanman.dll                     1
 +dll\win32\ntmarta\ntmarta.dll                       1
 +dll\win32\ntprint\ntprint.dll                       1
 +dll\win32\objsel\objsel.dll                         1
 +dll\win32\odbc32\odbc32.dll                         1
 +dll\win32\odbccp32\odbccp32.dll                     1
 +dll\win32\ole32\ole32.dll                           1
 +dll\win32\oleacc\oleacc.dll                         1
 +dll\win32\oleaut32\oleaut32.dll                     1
 +dll\win32\olecli32\olecli32.dll                     1
 +dll\win32\oledlg\oledlg.dll                         1
 +dll\win32\olepro32\olepro32.dll                     1
 +dll\win32\olesvr32\olesvr32.dll                     1
 +dll\win32\olethk32\olethk32.dll                     1
 +dll\win32\opengl32\opengl32.dll                     1
 +dll\win32\pdh\pdh.dll                               1
 +dll\win32\pidgen\pidgen.dll                         1
 +dll\win32\powrprof\powrprof.dll                     1
 +dll\win32\printui\printui.dll                       1
 +dll\win32\psapi\psapi.dll                           1
 +dll\win32\pstorec\pstorec.dll                       1
 +dll\win32\qmgr\qmgr.dll                             1
 +dll\win32\qmgrprxy\qmgrprxy.dll                     1
 +dll\win32\query\query.dll                           1
 +dll\win32\rasadhlp\rasadhlp.dll                     1
 +dll\win32\rasapi32\rasapi32.dll                     1
 +dll\win32\rasdlg\rasdlg.dll                         1
 +dll\win32\resutils\resutils.dll                     1
 +dll\win32\rasman\rasman.dll                         1
 +dll\win32\riched20\riched20.dll                     1
 +dll\win32\riched32\riched32.dll                     1
 +dll\win32\rpcrt4\rpcrt4.dll                         1
 +dll\win32\rsabase\rsabase.dll                       1
 +dll\win32\rsaenh\rsaenh.dll                         1
 +dll\win32\samlib\samlib.dll                         1
 +dll\win32\samsrv\samsrv.dll                         1
 +dll\win32\sccbase\sccbase.dll                       1
 +dll\win32\schannel\schannel.dll                     1
 +dll\win32\secur32\secur32.dll                       1
 +dll\win32\security\security.dll                     1
 +dll\win32\sensapi\sensapi.dll                       1
 +dll\win32\serialui\serialui.dll                     1
 +dll\win32\setupapi\setupapi.dll                     1
 +dll\win32\sfc\sfc.dll                               1
 +dll\win32\sfc_os\sfc_os.dll                         1
 +dll\win32\shdoclc\shdoclc.dll                       1
 +dll\win32\shdocvw\shdocvw.dll                       1
 +dll\win32\shell32\shell32.dll                       1
 +dll\win32\shfolder\shfolder.dll                     1
 +dll\win32\shimgvw\shimgvw.dll                       1
 +dll\win32\shlwapi\shlwapi.dll                       1
 +dll\win32\slbcsp\slbcsp.dll                         1
 +dll\win32\smdll\smdll.dll                           1
 +dll\win32\snmpapi\snmpapi.dll                       1
 +dll\win32\softpub\softpub.dll                       1
 +dll\win32\spoolss\spoolss.dll                       1
 +dll\win32\srclient\srclient.dll                     1
 +dll\win32\stdole2.tlb\stdole2.tlb                   1
 +dll\win32\stdole32.tlb\stdole32.tlb                 1
 +dll\win32\sti\sti.dll                               1
 +dll\win32\sxs\sxs.dll                               1
 +dll\win32\syssetup\syssetup.dll                     1
 +dll\win32\t2embed\t2embed.dll                       1
 +dll\win32\tapi32\tapi32.dll                         1
 +dll\win32\tapiui\tapiui.dll                         1
 +dll\win32\traffic\traffic.dll                       1
 +dll\win32\twain_32\twain_32.dll                     1
 +dll\win32\uext2\uext2.dll                           1
 +dll\win32\ufat\ufat.dll                             1
 +dll\win32\ufatx\ufatx.dll                           1   optional
 +dll\win32\untfs\untfs.dll                           1
 +dll\win32\updspapi\updspapi.dll                     1
 +dll\win32\url\url.dll                               1
 +dll\win32\urlmon\urlmon.dll                         1
 +dll\win32\user32\user32.dll                         1
 +dll\win32\userenv\userenv.dll                       1
 +dll\win32\usp10\usp10.dll                           1
 +dll\win32\uxtheme\uxtheme.dll                       1
 +dll\win32\vdmdbg\vdmdbg.dll                         1
 +dll\win32\version\version.dll                       1
 +dll\win32\windowscodecs\windowscodecs.dll           1
 +dll\win32\winemp3.acm\winemp3.acm                   1
 +dll\win32\winfax\winfax.dll                         1
 +dll\win32\winhttp\winhttp.dll                       1
 +dll\win32\wininet\wininet.dll                       1
 +dll\win32\winmm\winmm.dll                           1
 +dll\win32\winspool\winspool.drv                     1
 +dll\win32\winsta\winsta.dll                         1
 +dll\win32\wlanapi\wlanapi.dll                       1
 +dll\win32\wintrust\wintrust.dll                     1
 +dll\win32\wldap32\wldap32.dll                       1
 +dll\win32\wmi\wmi.dll                               1
 +dll\win32\ws2_32\ws2_32.dll                         1
 +dll\win32\ws2help\ws2help.dll                       1
 +dll\win32\wshirda\wshirda.dll                       1
 +dll\win32\wshtcpip\wshtcpip.dll                     1
 +dll\win32\wsock32\wsock32.dll                       1
 +dll\win32\wtsapi32\wtsapi32.dll                     1
 +dll\win32\wuapi\wuapi.dll                           1
 +dll\win32\xinput1_1\xinput1_1.dll                   1
 +dll\win32\xinput1_2\xinput1_2.dll                   1
 +dll\win32\xinput1_3\xinput1_3.dll                   1
 +dll\win32\xinput9_1_0\xinput9_1_0.dll               1
 +dll\win32\xmllite\xmllite.dll                       1
 +dll\win32\winmm\midimap\midimap.dll                 1
 +dll\win32\wdmaud.drv\wdmaud.drv                     1
 +
 +; Shell Extensions
 +dll\shellext\deskadp\deskadp.dll                    1
 +dll\shellext\deskmon\deskmon.dll                    1
 +
 +; Drivers
 +drivers\base\bootvid\bootvid.dll                    1
 +drivers\base\beep\beep.sys                          2
 +drivers\base\null\null.sys                          2
 +drivers\base\nmidebug\nmidebug.sys                  2
 +
 +drivers\battery\cmbatt\cmbatt.sys                   2
 +drivers\battery\battc\battc.sys                     2
 +
 +drivers\bus\isapnp\isapnp.sys                       2
 +
 +drivers\directx\dxapi\dxapi.sys                     2
 +drivers\directx\dxg\dxg.sys                         2
 +drivers\directx\dxgthk\dxgthk.sys                   2
 +
 +drivers\filesystems\fs_rec\fs_rec.sys               2
 +drivers\filesystems\msfs\msfs.sys                   2
 +drivers\filesystems\mup\mup.sys                     2
 +drivers\filesystems\npfs\npfs.sys                   2
 +
 +drivers\input\mouclass\mouclass.sys                 2
 +drivers\input\sermouse\sermouse.sys                 2
 +
 +drivers\ksfilter\ks\ks.sys                          2
++drivers\multimedia\bdasup\bdasup.sys                2
 +
 +drivers\network\afd\afd.sys                         2
 +drivers\network\ndis\ndis.sys                       2
 +drivers\network\tcpip\tcpip.sys                     2
 +drivers\network\tdi\tdi.sys                         2
 +drivers\network\dd\ne2000\ne2000.sys                2
 +drivers\network\dd\pcnet\pcnet.sys                  2
 +
 +drivers\serial\serenum\serenum.sys                  2
 +drivers\serial\serial\serial.sys                    2
 +
 +drivers\storage\ide\pciide\pciide.sys               2
 +drivers\storage\ide\pciidex\pciidex.sys             2
 +
 +;drivers\usb\miniport\usbohci\usbohci.sys           2
 +;drivers\usb\miniport\usbuhci\usbuhci.sys           2
 +;drivers\usb\usbhub\usbhub.sys                      2
 +;drivers\usb\usbport\usbport.sys                    2
 +drivers\usb\nt4compat\usbdriver\usbdriver.sys       2
 +
 +drivers\video\displays\vga\vgaddi.dll               1
 +drivers\video\displays\framebuf\framebuf.dll        1
 +drivers\video\miniport\vga\vgamp.sys                2
 +drivers\video\miniport\vbe\vbemp.sys                2
 +drivers\video\videoprt\videoprt.sys                 2
 +drivers\video\font\ftfd\ftfd.dll                   1
 +
 +drivers\wdm\audio\filters\kmixer\kmixer.sys         2
 +drivers\wdm\audio\sysaudio\sysaudio.sys             2
 +drivers\wdm\audio\legacy\wdmaud\wdmaud.sys          2
 +drivers\wdm\audio\backpln\portcls\portcls.sys       2
 +drivers\wdm\audio\drm\drmk\drmk.sys                 2
 +drivers\wmi\wmilib.sys                              2
 +
 +; Media
 +media\fonts\DejaVuSans.ttf                          3
 +media\fonts\DejaVuSans-Bold.ttf                     3
 +media\fonts\DejaVuSans-BoldOblique.ttf              3
 +media\fonts\DejaVuSansMono.ttf                      3
 +media\fonts\DejaVuSansMono-Bold.ttf                 3
 +media\fonts\DejaVuSansMono-BoldOblique.ttf          3
 +media\fonts\DejaVuSansMono-Oblique.ttf              3
 +media\fonts\DejaVuSans-Oblique.ttf                  3
 +media\fonts\DejaVuSerif.ttf                         3
 +media\fonts\DejaVuSerif-Bold.ttf                    3
 +media\fonts\DejaVuSerif-BoldItalic.ttf              3
 +media\fonts\DejaVuSerif-Italic.ttf                  3
 +
 +media\fonts\FreeMono.ttf                            3
 +media\fonts\FreeMonoBold.ttf                        3
 +media\fonts\FreeMonoBoldOblique.ttf                 3
 +media\fonts\FreeMonoOblique.ttf                     3
 +
 +media\fonts\LiberationMono-Bold.ttf                 3
 +media\fonts\LiberationMono-BoldItalic.ttf           3
 +media\fonts\LiberationMono-Italic.ttf               3
 +media\fonts\LiberationMono-Regular.ttf              3
 +media\fonts\LiberationSans-Bold.ttf                 3
 +media\fonts\LiberationSans-BoldItalic.ttf           3
 +media\fonts\LiberationSans-Italic.ttf               3
 +media\fonts\LiberationSans-Regular.ttf              3
 +media\fonts\LiberationSerif-Bold.ttf                3
 +media\fonts\LiberationSerif-BoldItalic.ttf          3
 +media\fonts\LiberationSerif-Italic.ttf              3
 +media\fonts\LiberationSerif-Regular.ttf             3
 +
 +media\fonts\Marlett.ttf                             3
 +media\fonts\symbol.ttf                              3
 +media\fonts\tahoma.ttf                              3
 +media\fonts\tahomabd.ttf                            3
 +
 +media\vgafonts\vgafonts.cab                         4
 +
 +media\nls\c_037.nls                                 1
 +media\nls\c_424.nls                                 1
 +media\nls\c_500.nls                                 1
 +media\nls\c_737.nls                                 1
 +media\nls\c_775.nls                                 1
 +media\nls\c_850.nls                                 1
 +media\nls\c_852.nls                                 1
 +media\nls\c_855.nls                                 1
 +media\nls\c_856.nls                                 1
 +media\nls\c_857.nls                                 1
 +media\nls\c_860.nls                                 1
 +media\nls\c_861.nls                                 1
 +media\nls\c_862.nls                                 1
 +media\nls\c_863.nls                                 1
 +media\nls\c_864.nls                                 1
 +media\nls\c_865.nls                                 1
 +media\nls\c_866.nls                                 1
 +media\nls\c_869.nls                                 1
 +media\nls\c_874.nls                                 1
 +media\nls\c_875.nls                                 1
 +media\nls\c_878.nls                                 1
 +media\nls\c_932.nls                                 1
 +media\nls\c_936.nls                                 1
 +media\nls\c_949.nls                                 1
 +media\nls\c_950.nls                                 1
 +media\nls\c_1006.nls                                1
 +media\nls\c_1026.nls                                1
 +media\nls\c_1250.nls                                1
 +media\nls\c_1251.nls                                1
 +media\nls\c_1253.nls                                1
 +media\nls\c_1254.nls                                1
 +media\nls\c_1255.nls                                1
 +media\nls\c_1256.nls                                1
 +media\nls\c_1257.nls                                1
 +media\nls\c_1258.nls                                1
 +media\nls\c_10000.nls                               1
 +media\nls\c_10006.nls                               1
 +media\nls\c_10007.nls                               1
 +media\nls\c_10029.nls                               1
 +media\nls\c_10079.nls                               1
 +media\nls\c_10081.nls                               1
 +media\nls\c_20866.nls                               1
 +media\nls\c_21866.nls                               1
 +media\nls\c_28591.nls                               1
 +media\nls\c_28592.nls                               1
 +media\nls\c_28593.nls                               1
 +media\nls\c_28594.nls                               1
 +media\nls\c_28595.nls                               1
 +media\nls\c_28596.nls                               1
 +media\nls\c_28597.nls                               1
 +media\nls\c_28598.nls                               1
 +media\nls\c_28599.nls                               1
 +media\nls\c_28600.nls                               1
 +media\nls\c_28603.nls                               1
 +media\nls\c_28604.nls                               1
 +media\nls\c_28605.nls                               1
 +media\nls\c_28606.nls                               1
 +media\drivers\etc\services                          5
 +media\inf\audio.inf                                 6
 +media\inf\acpi.inf                                  6
 +media\inf\battery.inf                               6
 +media\inf\cdrom.inf                                 6
 +media\inf\cpu.inf                                   6
 +media\inf\display.inf                               6
 +media\inf\font.inf                                  6
 +media\inf\fdc.inf                                   6
 +media\inf\hdc.inf                                   6
 +media\inf\intl.inf                                  6
 +media\inf\layout.inf                                6
 +media\inf\machine.inf                               6
 +media\inf\msmouse.inf                               6
 +media\inf\keyboard.inf                              6
 +media\inf\ks.inf                                    6
 +media\inf\NET_NIC.inf                               6
 +media\inf\netamd.inf                                6
 +media\inf\netisa.inf                                6
 +media\inf\netrtpnt.inf                              6
 +media\inf\nettcpip.inf                              6
 +media\inf\ports.inf                                 6
 +media\inf\scsi.inf                                  6
 +media\inf\syssetup.inf                              6
 +media\inf\usbport.inf                               6
 +media\inf\usb.inf                                   6
 +media\inf\usbstor.inf                               6
 +media\inf\xboxdisp.inf                              6
 +
 +
 +; Media Files
 +media\sounds\ReactOS_LogOn.wav                      8
 +
 +; Ini Files
 +boot\bootdata\system.ini                            4
 +
 +; Regression Testing
 +boot\bootdata\bootcdregtest\regtest.cmd             7   optional
 +
 +; Subsystems
 +subsystems\win32\csrss\csrss.exe                    1
 +subsystems\win32\csrss\win32csr\win32csr.dll        1
 +subsystems\win32\csrss\csrsrv\csrsrv.dll            1
 +subsystems\ntvdm\ntvdm.exe                          1
 +subsystems\win32\win32k\win32k.sys                  1
 +
 +; Optional/proprietary files
 +modules\optional\DroidSansFallback.ttf              3  optional
 +modules\optional\NOTICE_for_Droid_Font.txt          4  optional
 +modules\optional\netkvm2k.inf                       6  optional
 +modules\optional\netkvm2k.cat                       6  optional
 +modules\optional\netkvm.sys                         2  optional
 +modules\optional\alcxwdm.inf                        6  optional
 +modules\optional\alcxwdm.sys                        2  optional
 +modules\optional\mfc42.dll                          1  optional
 +modules\optional\mfc42u.dll                         1  optional
 +modules\optional\mfc71.dll                          1  optional
 +modules\optional\mfc71u.dll                         1  optional
 +modules\optional\msvbvm50.dll                       1  optional
 +modules\optional\msvbvm60.dll                       1  optional
 +modules\optional\msvcirt.dll                        1  optional
 +modules\optional\msvcp71.dll                        1  optional
 +modules\optional\msvcr71.dll                        1  optional
 +modules\optional\vmx_fb.dll                         1  optional
 +modules\optional\vmx_mode.dll                       1  optional
 +modules\optional\vmx_svga.inf                       6  optional
 +modules\optional\vmx_svga.sys                       2  optional
 +modules\optional\wine_gecko-1.0.0-x86.cab           4  optional
 +
 +; Rosapps
 +modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
 +modules\rosapps\applications\screensavers\matrix\matrix.scr                1   optional
 +modules\rosapps\applications\screensavers\blankscr\scrnsave.scr            1   optional
 +modules\rosapps\applications\screensavers\starfield\starfield.scr          1   optional
 +modules\rosapps\applications\screensavers\mazescr\mazescr.scr              1   optional
 +modules\rosapps\applications\screensavers\butterflies\butterflies.scr      1   optional
 +modules\rosapps\applications\cmdutils\comp\comp.exe                                     1   optional
 +modules\rosapps\applications\cmdutils\mode\mode.exe                                     1   optional
 +modules\rosapps\applications\cmdutils\sort\sort.exe                                     1   optional
 +modules\rosapps\applications\cmdutils\tee\tee.exe                                       1   optional
 +modules\rosapps\applications\cmdutils\touch\touch.exe                                   1   optional
 +modules\rosapps\applications\cmdutils\uptime\uptime.exe                                 1   optional
 +modules\rosapps\applications\cmdutils\y\y.exe                                           1   optional
 +modules\rosapps\applications\devutils\gdb2\gdb2.exe                                     1   optional
 +modules\rosapps\applications\devutils\gdihv\gdihv.exe                                   1   optional
 +modules\rosapps\applications\devutils\genguid\genguid.exe                               1   optional
 +modules\rosapps\applications\sysutils\gettype\gettype.exe                               1   optional
 +modules\rosapps\applications\net\ncftp\ncftp.exe                                        1   optional
 +modules\rosapps\applications\net\netreg\netreg.exe                                      1   optional
 +modules\rosapps\applications\net\niclist\niclist.exe                                    1   optional
 +modules\rosapps\applications\net\roshttpd\roshttpd.exe                                  1   optional
 +modules\rosapps\applications\notevil\notevil.exe                                        1   optional
 +modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe                                 1   optional
 +modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe                         1   optional
 +modules\rosapps\applications\sysutils\chklib\chklib.exe                                 1   optional
 +modules\rosapps\applications\sysutils\ctm\ctm.exe                                       1   optional
 +modules\rosapps\applications\sysutils\kill\kill.exe                                     1   optional
 +modules\rosapps\applications\sysutils\lsdd\lsdd.exe                                     1   optional
 +modules\rosapps\applications\sysutils\man\man.exe                                       1   optional
 +modules\rosapps\applications\sysutils\pedump\pedump.exe                                 1   optional
 +modules\rosapps\applications\sysutils\regexpl\regexpl.exe                               1   optional
 +modules\rosapps\applications\sysutils\tcat\tcat.exe                                     1   optional
 +modules\rosapps\applications\sysutils\tlist\tlist.exe                                   1   optional
 +modules\rosapps\applications\sysutils\screenshot\screenshot.exe                         1   optional
 +modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe                       1   optional
 +modules\rosapps\applications\sysutils\utils\cat\cat.exe                                 1   optional
 +modules\rosapps\applications\sysutils\utils\driver\load\load.exe                        1   optional
 +modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe                    1   optional
 +modules\rosapps\applications\sysutils\utils\infinst\infinst.exe                         1   optional
 +modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe                   1   optional
 +modules\rosapps\applications\sysutils\utils\objdir\objdir.exe                           1   optional
 +modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe                       1   optional
 +modules\rosapps\applications\sysutils\utils\ps\ps.exe                                   1   optional
 +modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe                         1   optional
 +modules\rosapps\applications\sysutils\utils\stats\stats.exe                             1   optional
 +modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe                     1   optional
 +modules\rosapps\applications\winfile\winfile.exe                                        1   optional
 +modules\rosapps\demos\maze\maze.exe                                        1   optional
 +modules\rosapps\drivers\green\green.sys                                    2   optional
 +
 +; Rostests
 +modules\rostests\rosautotest\rosautotest.exe                               1   optional
 +modules\rostests\tests\pseh2\pseh2_test.exe                                7   optional
 +modules\rostests\winetests\advapi32\advapi32_winetest.exe                  7   optional
 +modules\rostests\winetests\advpack\advpack_winetest.exe                    7   optional
 +modules\rostests\winetests\browseui\browseui_winetest.exe                  7   optional
 +modules\rostests\winetests\cabinet\cabinet_winetest.exe                    7   optional
 +modules\rostests\winetests\comcat\comcat_winetest.exe                      7   optional
 +modules\rostests\winetests\comctl32\comctl32_winetest.exe                  7   optional
 +modules\rostests\winetests\comdlg32\comdlg32_winetest.exe                  7   optional
 +modules\rostests\winetests\crypt32\crypt32_winetest.exe                    7   optional
 +modules\rostests\winetests\cryptnet\cryptnet_winetest.exe                  7   optional
 +modules\rostests\winetests\dsound\dsound_winetest.exe                      7   optional
 +modules\rostests\winetests\gdi32\gdi32_winetest.exe                        7   optional
 +modules\rostests\winetests\gdiplus\gdiplus_winetest.exe                    7   optional
 +modules\rostests\winetests\hlink\hlink_winetest.exe                        7   optional
 +modules\rostests\winetests\icmp\icmp_winetest.exe                          7   optional
 +modules\rostests\winetests\iphlpapi\iphlpapi_winetest.exe                  7   optional
 +modules\rostests\winetests\jscript\jscript_winetest.exe                    7   optional
 +modules\rostests\winetests\kernel32\kernel32_winetest.exe                  7   optional
 +modules\rostests\winetests\lz32\lz32_winetest.exe                          7   optional
 +modules\rostests\winetests\mapi32\mapi32_winetest.exe                      7   optional
 +modules\rostests\winetests\mlang\mlang_winetest.exe                        7   optional
 +modules\rostests\winetests\mshtml\mshtml_winetest.exe                      7   optional
 +modules\rostests\winetests\msi\msi_winetest.exe                            7   optional
 +modules\rostests\winetests\mstask\mstask_winetest.exe                      7   optional
 +modules\rostests\winetests\msvcrt\msvcrt_winetest.exe                      7   optional
 +modules\rostests\winetests\msxml3\msxml3_winetest.exe                      7   optional
 +modules\rostests\winetests\netapi32\netapi32_winetest.exe                  7   optional
 +modules\rostests\winetests\ntdll\ntdll_winetest.exe                        7   optional
 +modules\rostests\winetests\odbccp32\odbccp32_winetest.exe                  7   optional
 +modules\rostests\winetests\ole32\ole32_winetest.exe                        7   optional
 +modules\rostests\winetests\oleaut32\oleaut32_winetest.exe                  7   optional
 +modules\rostests\winetests\powrprof\powrprof_winetest.exe                  7   optional
 +modules\rostests\winetests\psapi\psapi_winetest.exe                        7   optional
 +modules\rostests\winetests\riched20\riched20_winetest.exe                  7   optional
 +modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe                      7   optional
 +modules\rostests\winetests\rsabase\rsabase_winetest.exe                    7   optional
 +modules\rostests\winetests\rsaenh\rsaenh_winetest.exe                      7   optional
 +modules\rostests\winetests\schannel\schannel_winetest.exe                  7   optional
 +modules\rostests\winetests\secur32\secur32_winetest.exe                    7   optional
 +modules\rostests\winetests\setupapi\setupapi_winetest.exe                  7   optional
 +modules\rostests\winetests\shdocvw\shdocvw_winetest.exe                    7   optional
 +modules\rostests\winetests\shell32\shell32_winetest.exe                    7   optional
 +modules\rostests\winetests\shlwapi\shlwapi_winetest.exe                    7   optional
 +modules\rostests\winetests\urlmon\urlmon_winetest.exe                      7   optional
 +modules\rostests\winetests\user32\user32_winetest.exe                      7   optional
 +modules\rostests\winetests\usp10\usp10_winetest.exe                        7   optional
 +modules\rostests\winetests\uxtheme\uxtheme_winetest.exe                    7   optional
 +modules\rostests\winetests\version\version_winetest.exe                    7   optional
 +modules\rostests\winetests\winhttp\winhttp_winetest.exe                    7   optional
 +modules\rostests\winetests\wininet\wininet_winetest.exe                    7   optional
 +modules\rostests\winetests\winmm\winmm_winetest.exe                        7   optional
 +modules\rostests\winetests\wintrust\wintrust_winetest.exe                  7   optional
 +modules\rostests\winetests\wlanapi\wlanapi_winetest.exe                    7   optional
 +modules\rostests\winetests\ws2_32\ws2_32_winetest.exe                      7   optional
 +modules\rostests\winetests\xmllite\xmllite_winetest.exe                    7   optional
 +
 +
 +modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,6647558..6647558
mode 000000,100644..100644
--- /dev/null
index 0000000,6017443..6017443
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,f9fe873..f9fe873
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,7d22a84..7d22a84
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,1b4e16b..1b4e16b
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,de73519..de73519
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,e2d8407..e2d8407
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,6f22e57..6f22e57
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,3653dec..3653dec
mode 000000,100644..100644
--- /dev/null
index 0000000,4623a65..4623a65
mode 000000,100644..100644
--- /dev/null
index 0000000,49e4c91..49e4c91
mode 000000,100644..100644
--- /dev/null
index 0000000,69cc7ce..69cc7ce
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,b807315..b807315
mode 000000,100644..100644
--- /dev/null
index 0000000,8174614..8174614
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,d744cd5..d744cd5
mode 000000,100644..100644
--- /dev/null
index 0000000,2c390a1..2c390a1
mode 000000,100644..100644
--- /dev/null
index 0000000,372e565..372e565
mode 000000,100644..100644
--- /dev/null
index 0000000,9fb3de0..9fb3de0
mode 000000,100644..100644
--- /dev/null
index 0000000,2599a78..2599a78
mode 000000,100644..100644
--- /dev/null
index 0000000,46a5387..46a5387
mode 000000,100644..100644
--- /dev/null
index 0000000,4d18ac1..4d18ac1
mode 000000,100644..100644
--- /dev/null
index 0000000,e26f34a..e26f34a
mode 000000,100644..100644
--- /dev/null
index 0000000,547f4e4..547f4e4
mode 000000,100644..100644
--- /dev/null
index 0000000,a9a0317..a9a0317
mode 000000,100644..100644
--- /dev/null
index 0000000,2920636..2920636
mode 000000,100644..100644
--- /dev/null
index 0000000,722096b..722096b
mode 000000,100644..100644
--- /dev/null
index 0000000,a1a2fcf..a1a2fcf
mode 000000,100644..100644
--- /dev/null
index 0000000,aac22cb..aac22cb
mode 000000,100644..100644
--- /dev/null
index 0000000,1817849..1817849
mode 000000,100644..100644
--- /dev/null
index 0000000,b030a23..b030a23
mode 000000,100644..100644
--- /dev/null
index 0000000,716ee87..716ee87
mode 000000,100644..100644
--- /dev/null
index 0000000,a4bb363..a4bb363
mode 000000,100644..100644
--- /dev/null
index 0000000,31384ad..31384ad
mode 000000,100644..100644
--- /dev/null
index 0000000,b714f97..b714f97
mode 000000,100644..100644
--- /dev/null
index 0000000,e4a23f4..e4a23f4
mode 000000,100644..100644
--- /dev/null
index 0000000,003e9b7..003e9b7
mode 000000,100644..100644
--- /dev/null
index 0000000,721005f..721005f
mode 000000,100644..100644
--- /dev/null
index 0000000,40912fa..40912fa
mode 000000,100644..100644
--- /dev/null
index 0000000,84310a9..84310a9
mode 000000,100644..100644
--- /dev/null
index 0000000,9fd1ec6..9fd1ec6
mode 000000,100644..100644
--- /dev/null
index 0000000,3caf825..3caf825
mode 000000,100644..100644
--- /dev/null
index 0000000,b3a81bc..b3a81bc
mode 000000,100644..100644
--- /dev/null
index 0000000,48666e6..48666e6
mode 000000,100644..100644
--- /dev/null
index 0000000,adda1fb..adda1fb
mode 000000,100644..100644
--- /dev/null
index 0000000,a5302dc..a5302dc
mode 000000,100644..100644
--- /dev/null
index 0000000,ab74f70..ab74f70
mode 000000,100644..100644
--- /dev/null
index 0000000,6c89220..6c89220
mode 000000,100644..100644
--- /dev/null
index 0000000,6892aee..6892aee
mode 000000,100644..100644
--- /dev/null
index 0000000,1005bf1..1005bf1
mode 000000,100644..100644
--- /dev/null
index 0000000,6279a55..6279a55
mode 000000,100644..100644
--- /dev/null
index 0000000,c4fd0ba..c4fd0ba
mode 000000,100644..100644
--- /dev/null
index 0000000,19d4274..19d4274
mode 000000,100644..100644
--- /dev/null
index 0000000,d2cddd1..d2cddd1
mode 000000,100644..100644
--- /dev/null
index 0000000,3299df5..3299df5
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,6050003..6050003
mode 000000,100644..100644
--- /dev/null
index 0000000,f458db9..f458db9
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,e7b3965..e7b3965
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,8e47df0..8e47df0
mode 000000,100644..100644
--- /dev/null
index 0000000,c917f9b..c917f9b
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,c917f9b..c917f9b
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,06abb8d..06abb8d
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,067b996..067b996
mode 000000,100644..100644
--- /dev/null
index 0000000,f98e990..f98e990
mode 000000,100644..100644
--- /dev/null
index 0000000,9ff88af..9ff88af
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,5920198..5920198
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,73e206d..73e206d
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,88d81ed..88d81ed
mode 000000,100644..100644
--- /dev/null
index 0000000,17aba0b..17aba0b
mode 000000,100644..100644
--- /dev/null
index 0000000,b06afda..b06afda
mode 000000,100644..100644
--- /dev/null
index 0000000,2450b8b..2450b8b
mode 000000,100644..100644
--- /dev/null
index 0000000,c018abf..c018abf
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,2e76727..2e76727
mode 000000,100644..100644
--- /dev/null
index 0000000,946b321..946b321
mode 000000,100644..100644
--- /dev/null
index 0000000,0c700ee..0c700ee
mode 000000,100644..100644
--- /dev/null
index 0000000,76e0e0c..76e0e0c
mode 000000,100644..100644
--- /dev/null
index 0000000,3511925..3511925
mode 000000,100644..100644
--- /dev/null
index 0000000,bcec754..bcec754
mode 000000,100644..100644
--- /dev/null
index 0000000,2fce2b4..2fce2b4
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,dab0901..dab0901
mode 000000,100644..100644
Binary files differ
Simple merge
index 0000000,aa93ffb..aa93ffb
mode 000000,100644..100644
Binary files differ
index 0000000,f4e9781..f4e9781
mode 000000,100644..100644
--- /dev/null
index 0000000,afb5d4d..afb5d4d
mode 000000,100644..100644
--- /dev/null
index 0000000,b5c5a58..b5c5a58
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d36d885,0000000..e27d1c2
mode 100644,000000..100644
--- /dev/null
@@@ -1,289 -1,0 +1,295 @@@
 +/*
 + * COPYRIGHT:         See COPYING in the top level directory
 + * PROJECT:           ReactOS kernel
 + * PURPOSE:           Functions for saving and restoring dc states
 + * FILE:              subsystem/win32/win32k/objects/dcstate.c
 + * PROGRAMER:         Timo Kreuzer (timo.kreuzer@rectos.org)
 + */
 +
 +#include <w32k.h>
 +
 +#define NDEBUG
 +#include <debug.h>
 +
 +VOID
 +FASTCALL
 +DC_vCopyState(PDC pdcSrc, PDC pdcDst, BOOL To)
 +{
 +    DPRINT("DC_vCopyState(%p, %p)\n", pdcSrc->BaseObject.hHmgr, pdcDst->BaseObject.hHmgr);
 +
 +    /* Copy full DC attribute */
 +    *pdcDst->pdcattr = *pdcSrc->pdcattr;
 +
 +    /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */
 +    /* The VisRectRegion field needs to be set to a valid state */
 +
 +    /* Mark some fields as dirty */
 +    pdcDst->pdcattr->ulDirty_ |= 0x0012001f; // Note: Use if, To is FALSE....
 +
 +    /* Copy DC level */
 +    pdcDst->dclevel.pColorSpace     = pdcSrc->dclevel.pColorSpace;
 +    pdcDst->dclevel.lSaveDepth      = pdcSrc->dclevel.lSaveDepth;
 +    pdcDst->dclevel.hdcSave         = pdcSrc->dclevel.hdcSave;
 +    pdcDst->dclevel.laPath          = pdcSrc->dclevel.laPath;
 +    pdcDst->dclevel.ca              = pdcSrc->dclevel.ca;
 +    pdcDst->dclevel.mxWorldToDevice = pdcSrc->dclevel.mxWorldToDevice;
 +    pdcDst->dclevel.mxDeviceToWorld = pdcSrc->dclevel.mxDeviceToWorld;
 +    pdcDst->dclevel.mxWorldToPage   = pdcSrc->dclevel.mxWorldToPage;
 +    pdcDst->dclevel.efM11PtoD       = pdcSrc->dclevel.efM11PtoD;
 +    pdcDst->dclevel.efM22PtoD       = pdcSrc->dclevel.efM22PtoD;
 +    pdcDst->dclevel.sizl            = pdcSrc->dclevel.sizl;
 +    pdcDst->dclevel.hpal            = pdcSrc->dclevel.hpal;
 +
 +    /* Handle references here correctly */
 +    DC_vSelectSurface(pdcDst, pdcSrc->dclevel.pSurface);
 +    DC_vSelectFillBrush(pdcDst, pdcSrc->dclevel.pbrFill);
 +    DC_vSelectLineBrush(pdcDst, pdcSrc->dclevel.pbrLine);
 +    DC_vSelectPalette(pdcDst, pdcSrc->dclevel.ppal);
 +
 +    // FIXME: handle refs
 +    pdcDst->dclevel.plfnt           = pdcSrc->dclevel.plfnt;
 +
 +    /* ROS hacks */
 +    if (pdcDst->dctype != DC_TYPE_MEMORY)
 +    {
 +        pdcDst->rosdc.bitsPerPixel = pdcSrc->rosdc.bitsPerPixel;
 +    }
 +
 +    /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */
 +    if (To) // Copy "To" SaveDC state.
 +    {
 +        if (pdcSrc->rosdc.hClipRgn)
 +        {
 +           pdcDst->rosdc.hClipRgn = IntSysCreateRectRgn(0, 0, 0, 0);
 +           NtGdiCombineRgn(pdcDst->rosdc.hClipRgn, pdcSrc->rosdc.hClipRgn, 0, RGN_COPY);
 +        }
 +        // FIXME! Handle prgnMeta!
 +    }
 +    else // Copy "!To" RestoreDC state.
 +    {  /* The VisRectRegion field needs to be set to a valid state */
 +       GdiExtSelectClipRgn(pdcDst, pdcSrc->rosdc.hClipRgn, RGN_COPY);
 +    }
 +}
 +
 +
 +BOOL FASTCALL
 +IntGdiCleanDC(HDC hDC)
 +{
 +    PDC dc;
 +    if (!hDC) return FALSE;
 +    dc = DC_LockDc(hDC);
 +    if (!dc) return FALSE;
 +    // Clean the DC
 +    if (defaultDCstate) DC_vCopyState(defaultDCstate, dc, FALSE);
 +
 +    if (dc->dctype != DC_TYPE_MEMORY)
 +    {
 +        dc->rosdc.bitsPerPixel = defaultDCstate->rosdc.bitsPerPixel;
 +    }
 +
 +    DC_UnlockDc(dc);
 +
 +    return TRUE;
 +}
 +
 +
 +BOOL
 +APIENTRY
 +NtGdiResetDC(
 +    IN HDC hdc,
 +    IN LPDEVMODEW pdm,
 +    OUT PBOOL pbBanding,
 +    IN OPTIONAL VOID *pDriverInfo2,
 +    OUT VOID *ppUMdhpdev)
 +{
 +    UNIMPLEMENTED;
 +    return 0;
 +}
 +
 +
 +VOID
 +NTAPI
 +DC_vRestoreDC(
 +    IN PDC pdc,
 +    INT iSaveLevel)
 +{
 +    PEPROCESS pepCurrentProcess;
 +    HDC hdcSave;
 +    PDC pdcSave;
 +
 +    ASSERT(iSaveLevel > 0);
 +    DPRINT("DC_vRestoreDC(%p, %ld)\n", pdc->BaseObject.hHmgr, iSaveLevel);
 +
 +    /* Get current process */
 +    pepCurrentProcess = PsGetCurrentProcess();
 +
 +    /* Loop the save levels */
 +    while (pdc->dclevel.lSaveDepth > iSaveLevel)
 +    {
 +        hdcSave = pdc->dclevel.hdcSave;
 +        DPRINT("RestoreDC = %p\n", hdcSave);
 +
 +        /* Set us as the owner */
 +        if (!GDIOBJ_SetOwnership(hdcSave, pepCurrentProcess))
 +        {
 +            /* Could not get ownership. That's bad! */
 +            DPRINT1("Could not get ownership of saved DC (%p) for hdc %p!\n",
 +                    hdcSave, pdc->BaseObject.hHmgr);
 +            return;// FALSE;
 +        }
 +
 +        /* Lock the saved dc */
 +        pdcSave = DC_LockDc(hdcSave);
 +        if (!pdcSave)
 +        {
 +            /* WTF? Internal error! */
 +            DPRINT1("Could not lock the saved DC (%p) for dc %p!\n",
 +                    hdcSave, pdc->BaseObject.hHmgr);
 +            return;// FALSE;
 +        }
 +
 +        /* Remove the saved dc from the queue */
 +        pdc->dclevel.hdcSave = pdcSave->dclevel.hdcSave;
 +
 +        /* Decrement save level */
 +        pdc->dclevel.lSaveDepth--;
 +
 +        /* Is this the state we want? */
 +        if (pdc->dclevel.lSaveDepth == iSaveLevel)
 +        {
 +            /* Copy the state back */
 +            DC_vCopyState(pdcSave, pdc, FALSE);
 +
 +            // Restore Path by removing it, if the Save flag is set.
 +            // BeginPath will takecare of the rest.
 +            if (pdc->dclevel.hPath && pdc->dclevel.flPath & DCPATH_SAVE)
 +            {
 +                PATH_Delete(pdc->dclevel.hPath);
 +                pdc->dclevel.hPath = 0;
 +                pdc->dclevel.flPath &= ~DCPATH_SAVE;
 +            }
 +        }
 +
 +        /* Prevent save dc from being restored */
 +        pdcSave->dclevel.lSaveDepth = 1;
 +
 +        /* Unlock it */
 +        DC_UnlockDc(pdcSave);
 +        /* Delete the saved dc */
 +        GreDeleteObject(hdcSave);
 +    }
 +
 +    DPRINT("Leave DC_vRestoreDC()\n");
 +}
 +
 +
 +
 +BOOL
 +APIENTRY
 +NtGdiRestoreDC(
 +    HDC hdc,
 +    INT iSaveLevel)
 +{
 +    PDC pdc;
 +
 +    DPRINT("NtGdiRestoreDC(%p, %d)\n", hdc, iSaveLevel);
 +
 +    /* Lock the original DC */
 +    pdc = DC_LockDc(hdc);
 +    if (!pdc)
 +    {
 +        SetLastWin32Error(ERROR_INVALID_HANDLE);
 +        return FALSE;
 +    }
 +
 +    ASSERT(pdc->dclevel.lSaveDepth > 0);
 +
 +    /* Negative values are relative to the stack top */
 +    if (iSaveLevel < 0)
 +        iSaveLevel = pdc->dclevel.lSaveDepth + iSaveLevel;
 +
 +    /* Check if we have a valid instance */
 +    if (iSaveLevel <= 0 || iSaveLevel >= pdc->dclevel.lSaveDepth)
 +    {
 +        DPRINT("Illegal save level, requested: %ld, current: %ld\n",
 +               iSaveLevel, pdc->dclevel.lSaveDepth);
 +        DC_UnlockDc(pdc);
 +        SetLastWin32Error(ERROR_INVALID_PARAMETER);
 +        return FALSE;
 +    }
 +
 +    /* Call the internal function */
 +    DC_vRestoreDC(pdc, iSaveLevel);
 +
 +    DC_UnlockDc(pdc);
 +
 +    DPRINT("Leave NtGdiRestoreDC\n");
 +    return TRUE;
 +}
 +
 +
 +INT
 +APIENTRY
 +NtGdiSaveDC(
 +    HDC hDC)
 +{
 +    HDC hdcSave;
 +    PDC pdc, pdcSave;
 +    INT lSaveDepth;
 +
 +    DPRINT("NtGdiSaveDC(%p)\n", hDC);
 +
 +    /* Lock the original dc */
 +    pdc = DC_LockDc(hDC);
 +    if (pdc == NULL)
 +    {
 +        DPRINT("Could not lock DC\n");
 +        SetLastWin32Error(ERROR_INVALID_HANDLE);
 +        return 0;
 +    }
 +
 +    /* Allocate a new dc */
 +    pdcSave = DC_AllocDcWithHandle();
 +    if (pdcSave == NULL)
 +    {
 +        DPRINT("Could not allocate a new DC\n");
 +        DC_UnlockDc(pdc);
 +        return 0;
 +    }
 +    hdcSave = pdcSave->BaseObject.hHmgr;
 +
 +    InterlockedIncrement(&pdc->ppdev->cPdevRefs);
 +    DC_vInitDc(pdcSave, DCTYPE_MEMORY, pdc->ppdev);
 +
++    /* Handle references here correctly */
++//    pdcSrc->dclevel.pSurface = NULL;
++//    pdcSrc->dclevel.pbrFill = NULL;
++//    pdcSrc->dclevel.pbrLine = NULL;
++//    pdcSrc->dclevel.ppal = NULL;
++
 +    /* Make it a kernel handle
 +       (FIXME: windows handles this different, see wiki)*/
 +    GDIOBJ_SetOwnership(hdcSave, NULL);
 +
 +    /* Copy the current state */
 +    DC_vCopyState(pdc, pdcSave, TRUE);
 +
 +    /* Copy path. FIXME: why this way? */
 +    pdcSave->dclevel.hPath = pdc->dclevel.hPath;
 +    pdcSave->dclevel.flPath = pdc->dclevel.flPath | DCPATH_SAVESTATE;
 +    if (pdcSave->dclevel.hPath) pdcSave->dclevel.flPath |= DCPATH_SAVE;
 +
 +    /* Set new dc as save dc */
 +    pdc->dclevel.hdcSave = hdcSave;
 +
 +    /* Increase save depth, return old value */
 +    lSaveDepth = pdc->dclevel.lSaveDepth++;
 +
 +    /* Cleanup and return */
 +    DC_UnlockDc(pdcSave);
 +    DC_UnlockDc(pdc);
 +
 +    DPRINT("Leave NtGdiSaveDC: %ld, hdcSave = %p\n", lSaveDepth, hdcSave);
 +    return lSaveDepth;
 +}
 +
Simple merge