Sync trunk head (r41026)
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 21 May 2009 18:39:21 +0000 (18:39 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 21 May 2009 18:39:21 +0000 (18:39 +0000)
svn path=/branches/ros-amd64-bringup/; revision=41032

53 files changed:
1  2 
reactos/base/shell/explorer/taskbar/taskbar.cpp
reactos/base/shell/explorer/utility/window.cpp
reactos/boot/bootdata/packages/reactos.dff
reactos/boot/freeldr/freeldr/windows/peloader.c
reactos/boot/freeldr/freeldr/windows/winldr.c
reactos/dll/nls/idndl/idndl.rbuild
reactos/dll/ntdll/ldr/utils.c
reactos/dll/ntdll/ntdll.rbuild
reactos/dll/win32/advapi32/reg/reg.c
reactos/dll/win32/crtdll/crtdll.rbuild
reactos/dll/win32/kernel32/kernel32.rbuild
reactos/dll/win32/kernel32/misc/stubs.c
reactos/dll/win32/msafd/misc/dllmain.c
reactos/dll/win32/msvcrt/msvcrt.rbuild
reactos/dll/win32/netshell/lanstatusui.c
reactos/dll/win32/ole32/ole32.spec
reactos/dll/win32/shell32/changenotify.c
reactos/dll/win32/shlwapi/ordinal.c
reactos/dll/win32/user32/include/user32.h
reactos/dll/win32/user32/windows/draw.c
reactos/dll/win32/win32.rbuild
reactos/drivers/network/dd/pcnet/pcnet.c
reactos/drivers/network/ndis/include/ndissys.h
reactos/drivers/network/ndis/ndis.rbuild
reactos/drivers/network/ndis/ndis/io.c
reactos/drivers/network/tcpip/tcpip/dispatch.c
reactos/drivers/video/videoprt/resource.c
reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
reactos/include/ddk/wdm.h
reactos/include/ndk/extypes.h
reactos/include/psdk/winuser.h
reactos/include/reactos/win32k/ntuser.h
reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
reactos/lib/drivers/oskittcp/oskittcp.rbuild
reactos/lib/sdk/crt/crt.rbuild
reactos/lib/sdk/crt/stdio/file.c
reactos/media/doc/README.WINE
reactos/ntoskrnl/include/internal/mm.h
reactos/ntoskrnl/mm/anonmem.c
reactos/ntoskrnl/mm/i386/page.c
reactos/ntoskrnl/mm/mdlsup.c
reactos/ntoskrnl/mm/mm.c
reactos/ntoskrnl/mm/pool.c
reactos/ntoskrnl/mm/procsup.c
reactos/ntoskrnl/mm/region.c
reactos/ntoskrnl/mm/section.c
reactos/ntoskrnl/mm/virtual.c
reactos/ntoskrnl/ntoskrnl-generic.rbuild
reactos/ntoskrnl/ps/query.c
reactos/subsystems/win32/win32k/ntuser/hook.c
reactos/subsystems/win32/win32k/ntuser/misc.c
reactos/subsystems/win32/win32k/ntuser/simplecall.c
reactos/tools/rbuild/backend/mingw/mingw.cpp

@@@ -324,22 -324,22 +324,22 @@@ HICON get_window_icon_small(HWND hwnd
  {
        HICON hIcon = 0;
  
 -      SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon);
 +      SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon);
  
        if (!hIcon)
 -              SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon);
 +              SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon);
  
        if (!hIcon)
 -              SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon);
 +              SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon);
  
        if (!hIcon)
-               hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM);
+               hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM);
  
        if (!hIcon)
-               hIcon = (HICON)GetClassLong(hwnd, GCL_HICON);
+               hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON);
  
        if (!hIcon)
 -              SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon);
 +              SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon);
  
        return hIcon;
  }
@@@ -116,524 -121,534 +117,530 @@@ Signature = "$ReactOS$
  
  
  ; 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\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\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\powercfg\powercfg.cpl                       1
 +;dll\cpl\sysdm\sysdm.cpl                             1
  ;dll\cpl\telephon\telephon.cpl                      1
 -dll\cpl\timedate\timedate.cpl                       1
 +;dll\cpl\timedate\timedate.cpl                       1
  ;dll\cpl\usrmgr\usrmgr.cpl                          1
  
 -dll\directx\amstream\amstream.dll                   1
 -dll\directx\dinput\dinput.dll                       1
 -dll\directx\dinput8\dinput8.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\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\avifil32\avifil32.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\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\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\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\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\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\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\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\winmm\midimap\midimap.dll                 1
 -dll\win32\winmm\wavemap\msacm32.drv                 1   optional
 -dll\win32\wdmaud.drv\wdmaud.drv                     1
 +;dll\directx\amstream\amstream.dll                   1
 +;dll\directx\dinput\dinput.dll                       1
 +;dll\directx\dinput8\dinput8.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\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\nt;dll\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\avifil32\avifil32.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\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\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\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\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\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\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\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\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\wintab32\wintab32.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\winmm\midimap\midimap.dll                 1
 +;dll\win32\winmm\wavemap\msacm32.drv                 1   optional
 +;dll\win32\wdmaud.drv\wdmaud.drv                     1
  
  ; Shell Extensions
 -dll\shellext\deskadp\deskadp.dll                    1
 -dll\shellext\deskmon\deskmon.dll                    1
 +;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\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\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
 +;drivers\base\bootvid\bootvid.dll                    1
 +;drivers\base\beep\beep.sys                          2
 +;drivers\base\null\null.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\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\tahoma.ttf                              3
 -media\fonts\tahomabd.ttf                            3
 -
 -media\nls\c_037.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\cdrom.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\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\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\tahoma.ttf                              3
 +;media\fonts\tahomabd.ttf                            3
 +
 +;media\nls\c_037.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\cdrom.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\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
 +;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\ntvdm\ntvdm.exe                          1
 -subsystems\win32\win32k\win32k.sys                  1
 +;subsystems\win32\csrss\csrss.exe                    1
 +;subsystems\win32\csrss\win32csr\win32csr.dll        1
 +;subsystems\ntvdm\ntvdm.exe                          1
 +;subsystems\win32\win32k\win32k.sys                  1
- boot\bootdata\bootcdregtest\testboot.bat            7   optional
  
  ; Modules
  modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
@@@ -430,14 -431,13 +431,13 @@@ VOI
  LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion)
  {
        CHAR  MsgBuffer[256];
-       CHAR  SystemPath[512], SearchPath[512];
-       CHAR  FileName[512];
-       CHAR  BootPath[512];
+       CHAR  FullPath[MAX_PATH], SystemRoot[MAX_PATH], BootPath[MAX_PATH];
+       CHAR  FileName[MAX_PATH];
        CHAR  BootOptions[256];
+       PCHAR PathSeparator;
        PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL;
        BOOLEAN Status;
 -      ULONG SectionId;
 +      ULONG_PTR SectionId;
-       ULONG BootDevice;
        PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA;
        KERNEL_ENTRY_POINT KiSystemStartup;
        PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL;
@@@ -2,9 -2,9 +2,9 @@@
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
  <module name="idndl" type="win32dll" installname="idndl.dll" entrypoint="0">
        <library>kernel32</library>
-       <compilerflag compiler="cpp">-fno-exceptions</compilerflag>
-       <compilerflag compiler="cpp">-fno-rtti</compilerflag>
-       <define name="WINVER">0x600</define>
+       <compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+       <compilerflag compiler="cxx">-fno-rtti</compilerflag>
+       <redefine name="WINVER">0x600</redefine>
        <file>idndl.cpp</file>
 -      <importlibrary definition="idndl.def" />
 +      <importlibrary definition="idndl-$(ARCH).def" />
  </module>
@@@ -2552,8 -2667,8 +2668,8 @@@ LdrpDetachProcess(BOOLEAN UnloadAll
     Entry = ModuleListHead->Blink;
     while (Entry != ModuleListHead)
       {
 -       Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList);
 +       Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks);
-        if (((UnloadAll && Module->LoadCount == 0xFFFF) || Module->LoadCount == 0) &&
+        if (((UnloadAll && Module->LoadCount == LDRP_PROCESS_CREATION_TIME) || Module->LoadCount == 0) &&
             Module->Flags & LDRP_ENTRY_PROCESSED &&
             !(Module->Flags & LDRP_UNLOAD_IN_PROGRESS))
           {
               {
                 TRACE_LDR("Unload %wZ - Calling entry point at %x\n",
                           &Module->BaseDllName, Module->EntryPoint);
-                LdrpCallDllEntry(Module, DLL_PROCESS_DETACH, (PVOID)(INT_PTR)(Module->LoadCount == 0xFFFF ? 1 : 0));
 -               LdrpCallDllEntry(Module, DLL_PROCESS_DETACH, (PVOID)(Module->LoadCount == LDRP_PROCESS_CREATION_TIME ? 1 : 0));
++               LdrpCallDllEntry(Module, DLL_PROCESS_DETACH, (PVOID)(INT_PTR)(Module->LoadCount == LDRP_PROCESS_CREATION_TIME ? 1 : 0));
               }
             else
               {
         Entry = ModuleListHead->Blink;
         while (Entry != ModuleListHead)
           {
 -           Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList);
 +           Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks);
             Entry = Entry->Blink;
             if (Module->Flags & LDRP_UNLOAD_IN_PROGRESS &&
-                ((UnloadAll && Module->LoadCount != 0xFFFF) || Module->LoadCount == 0))
+                ((UnloadAll && Module->LoadCount != LDRP_PROCESS_CREATION_TIME) || Module->LoadCount == 0))
               {
                 /* remove the module entry from the list */
                 RemoveEntryList (&Module->InLoadOrderLinks);
@@@ -2651,7 -2766,7 +2767,7 @@@ LdrpAttachProcess(VOID
             Module->Flags |= LDRP_LOAD_IN_PROGRESS;
             TRACE_LDR("%wZ loaded - Calling init routine at %x for process attaching\n",
                       &Module->BaseDllName, Module->EntryPoint);
-            Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(INT_PTR)(Module->LoadCount == 0xFFFF ? 1 : 0));
 -           Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(Module->LoadCount == LDRP_PROCESS_CREATION_TIME ? 1 : 0));
++           Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(INT_PTR)(Module->LoadCount == LDRP_PROCESS_CREATION_TIME ? 1 : 0));
             if (!Result)
               {
                 Status = STATUS_DLL_INIT_FAILED;
Simple merge
Simple merge
@@@ -1,8 -1,7 +1,7 @@@
  <module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true" installbase="system32" installname="crtdll.dll" iscrt="true">
 -      <importlibrary definition="crtdll.def" />
 +      <importlibrary definition="crtdll.spec" />
        <include base="crtdll">.</include>
        <include base="crt">include</include>
-       <define name="_DISABLE_TIDENTS" />
        <define name="USE_MSVCRT_PREFIX" />
        <define name="_MSVCRT_LIB_" />
        <define name="_MSVCRT_" />
                                        <file>thread.S</file>
                                </directory>
                        </if>
 +                      <if property="ARCH" value="amd64">
 +                              <directory name="amd64">
 +                                      <file>fiber.S</file>
 +                                      <file>thread.S</file>
 +                              </directory>
 +                      </if>
                </directory>
  
-               <compilerflag compiler="cpp">-fno-exceptions</compilerflag>
-               <compilerflag compiler="cpp">-fno-rtti</compilerflag>
+               <compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+               <compilerflag compiler="cxx">-fno-rtti</compilerflag>
  
                <directory name="misc">
                        <file>icustubs.cpp</file>
@@@ -1,8 -1,7 +1,7 @@@
  <module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" iscrt="yes">
 -      <importlibrary definition="msvcrt.def" />
 +      <importlibrary definition="msvcrt-$(ARCH).def" />
        <include base="msvcrt">.</include>
        <include base="crt">include</include>
-       <define name="_DISABLE_TIDENTS" />
        <define name="USE_MSVCRT_PREFIX" />
        <define name="_MSVCRT_" />
        <define name="_MSVCRT_LIB_" />
Simple merge
Simple merge
Simple merge
@@@ -511,17 -511,15 +511,23 @@@ typedef struct _NDIS40_MINIPORT_CHARACT
  VOID
  NTAPI
  ExGetCurrentProcessorCounts(
 +  PULONG ThreadKernelTime,
+    PULONG ThreadKernelTime,
     PULONG TotalCpuTime,
     PULONG ProcessorNumber);
  
+ VOID
+ NTAPI
+ ExGetCurrentProcessorCpuUsage(
+     PULONG CpuUsage);
 +/* portability fixes */
 +#ifdef _M_AMD64
 +#define KfReleaseSpinLock KeReleaseSpinLock
 +#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel
 +#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel
 +#endif
 +
  #endif /* __NDISSYS_H */
  
  /* EOF */
@@@ -1,12 -1,10 +1,10 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
  <module name="ndis" type="kernelmodedriver" installbase="system32/drivers" installname="ndis.sys">
 -      <importlibrary definition="ndis.def"></importlibrary>
 +      <importlibrary definition="ndis-$(ARCH).def"></importlibrary>
        <include base="ndis">include</include>
        <define name="NDIS_WRAPPER" />
-       <define name="NDIS50" />
        <define name="NDIS51" />
-       <define name="NDIS50_MINIPORT" />
        <define name="NDIS51_MINIPORT" />
        <define name="NDIS_LEGACY_DRIVER" />
        <define name="NDIS_LEGACY_MINIPORT" />
Simple merge
Simple merge
Simple merge
@@@ -1723,10 -1722,12 +1724,12 @@@ enum ThreadStateRoutine
      THREADSTATE_ACTIVEWINDOW,
      THREADSTATE_CAPTUREWINDOW,
      THREADSTATE_PROGMANWINDOW,
-     THREADSTATE_TASKMANWINDOW
+     THREADSTATE_TASKMANWINDOW,
+     THREADSTATE_GETMESSAGETIME,
+     THREADSTATE_GETINPUTSTATE
  };
  
 -DWORD
 +DWORD_PTR
  NTAPI
  NtUserGetThreadState(
    DWORD Routine);
@@@ -1,9 -1,8 +1,8 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 -<module name="oskittcp" type="staticlibrary">
 +<module name="oskittcp" type="staticlibrary" allowwarnings="true">
        <define name="__NTDRIVER__"/>
        <define name="KERNEL"/>
-       <define name="_DISABLE_TIDENTS"/>
        <define name="__NO_CTYPE_INLINES" />
        <include base="oskittcp">include/freebsd</include>
        <include base="oskittcp">include/freebsd/sys/include</include>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -439,11 -442,29 +442,29 @@@ NTAP
  NtGetWriteWatch(IN HANDLE ProcessHandle,
                  IN ULONG Flags,
                  IN PVOID BaseAddress,
 -                IN ULONG RegionSize,
 +                IN SIZE_T RegionSize,
                  IN PVOID *UserAddressArray,
 -                OUT PULONG EntriesInUserAddressArray,
 +                OUT PULONG_PTR EntriesInUserAddressArray,
                  OUT PULONG Granularity)
  {
+     if (!EntriesInUserAddressArray || !Granularity)
+     {
+         return STATUS_ACCESS_VIOLATION;
+     }
+     if (!*EntriesInUserAddressArray || !RegionSize)
+     {
+         return STATUS_INVALID_PARAMETER;
+     }
+     if (!UserAddressArray)
+     {
+         return STATUS_ACCESS_VIOLATION;
+     }
+     /* HACK: Set granularity to PAGE_SIZE */
+     *Granularity = PAGE_SIZE;
      UNIMPLEMENTED;
      return STATUS_NOT_IMPLEMENTED;
  }
@@@ -452,8 -476,13 +476,13 @@@ NTSTATU
  NTAPI
  NtResetWriteWatch(IN HANDLE ProcessHandle,
                   IN PVOID BaseAddress,
 -                 IN ULONG RegionSize)
 +                 IN SIZE_T RegionSize)
  {
+     if (!RegionSize)
+     {
+         return STATUS_INVALID_PARAMETER;
+     }
      UNIMPLEMENTED;
      return STATUS_NOT_IMPLEMENTED;
  }
Simple merge
Simple merge
Simple merge
@@@ -4815,10 -4814,10 +4817,10 @@@ MmForceSectionClosed 
  NTSTATUS NTAPI
  MmMapViewInSystemSpace (IN PVOID SectionObject,
                          OUT PVOID * MappedBase,
 -                        IN OUT PULONG ViewSize)
 +                        IN OUT PSIZE_T ViewSize)
  {
     PROS_SECTION_OBJECT Section;
-    PMM_AVL_TABLE AddressSpace;
+    PMMSUPPORT AddressSpace;
     NTSTATUS Status;
  
     DPRINT("MmMapViewInSystemSpace() called\n");
Simple merge
Simple merge
@@@ -83,29 -83,51 +83,54 @@@ NtUserGetThreadState
     {
        case THREADSTATE_GETTHREADINFO:
           GetW32ThreadInfo();
 -         RETURN(0);
 -
 +         break;
        case THREADSTATE_FOCUSWINDOW:
 -         RETURN( (DWORD)IntGetThreadFocusWindow());
 +         ret = (DWORD_PTR)IntGetThreadFocusWindow();
 +         break;
        case THREADSTATE_CAPTUREWINDOW:
           /* FIXME should use UserEnterShared */
 -         RETURN( (DWORD)IntGetCapture());
 +         ret = (DWORD_PTR)IntGetCapture();
 +         break;
        case THREADSTATE_PROGMANWINDOW:
 -         RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hProgmanWindow);
 +         ret = (DWORD_PTR)GetW32ThreadInfo()->pDeskInfo->hProgmanWindow;
 +         break;
        case THREADSTATE_TASKMANWINDOW:
 -         RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow);
 +         ret = (DWORD_PTR)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow;
 +         break;
        case THREADSTATE_ACTIVEWINDOW:
 -         RETURN ( (DWORD)UserGetActiveWindow());
 +         ret = (DWORD_PTR)UserGetActiveWindow();
 +         break;
+       case THREADSTATE_INSENDMESSAGE:
+          {
+            DWORD Ret = ISMEX_NOSEND;
+            PUSER_MESSAGE_QUEUE MessageQueue = 
+                 ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue;
+            DPRINT1("THREADSTATE_INSENDMESSAGE\n");
+            if (!IsListEmpty(&MessageQueue->SentMessagesListHead))
+            {
+              Ret = ISMEX_SEND;
+            }
+            else if (!IsListEmpty(&MessageQueue->NotifyMessagesListHead))
+            {
+            /* FIXME Need to set message flag when in callback mode with notify */
+              Ret = ISMEX_NOTIFY;
+            }
+            /* FIXME Need to set message flag if replied to or ReplyMessage */
+            RETURN( Ret);           
+          }
+       case THREADSTATE_GETMESSAGETIME: 
+          /* FIXME Needs more work! */
+          RETURN( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->timeLast);
+       case THREADSTATE_GETINPUTSTATE:
+          RETURN( HIWORD(IntGetQueueStatus(FALSE)) & (QS_KEY | QS_MOUSEBUTTON));
     }
 -   RETURN( 0);
  
 -CLEANUP:
 -   DPRINT("Leave NtUserGetThreadState, ret=%i\n",_ret_);
 +   DPRINT("Leave NtUserGetThreadState, ret=%i\n", ret);
     UserLeave();
 -   END_CLEANUP;
 +
 +   return ret;
  }
  
  
@@@ -152,8 -152,15 +152,15 @@@ NtUserCallOneParam
  
     switch(Routine)
     {
+       case ONEPARAM_ROUTINE_POSTQUITMESSAGE:
+           {
+                 PTHREADINFO pti;
+                 pti = PsGetCurrentThreadWin32Thread();
+                 MsqPostQuitMessage(pti->MessageQueue, Param);
+                 RETURN(TRUE);
+           }
        case ONEPARAM_ROUTINE_SHOWCURSOR:
 -         RETURN( (DWORD)UserShowCursor((BOOL)Param) );
 +         RETURN( (DWORD_PTR)UserShowCursor((BOOL)Param) );
  
        case ONEPARAM_ROUTINE_GETDESKTOPMAPPING:
           {
@@@ -535,16 -437,47 +437,47 @@@ MingwBackend::GenerateGlobalVariables (
                  "PREFIX := %s\n",
                  compilerPrefix.c_str () );
        fprintf ( fMakefile,
-                 "nasm := %s\n",
+                 "nasm := $(Q)%s\n",
                  nasmCommand.c_str () );
  
-       GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data );
-       GenerateProjectGccOptions ( "=", ProjectNode.non_if_data );
+       GenerateGlobalProperties ( "=", ProjectNode.non_if_data );
+       fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
+       fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" );
+       fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
+       fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
+       fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" );
+       fprintf ( fMakefile, "endif\n" );
+       fprintf ( fMakefile, "ifneq ($(TUNE),)\n" );
+       fprintf ( fMakefile, "PROJECT_CFLAGS += -mtune=$(TUNE)\n" );
+       fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" );
+       fprintf ( fMakefile, "endif\n" );
+       fprintf ( fMakefile, "PROJECT_CFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
+       fprintf ( fMakefile, "PROJECT_CXXFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
+       fprintf ( fMakefile, "PROJECT_ASFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
+       MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data );
+       MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data );
+       if ( usePipe )
+       {
+               fprintf ( fMakefile, "PROJECT_CFLAGS += -pipe\n" );
+               fprintf ( fMakefile, "PROJECT_CXXFLAGS += -pipe\n" );
+               fprintf ( fMakefile, "PROJECT_ASFLAGS += -pipe\n" );
+       }
+       // Because RosBE gcc is built to suck
+       fputs ( "BUILTIN_HOST_CINCLUDES+= $(HOST_CFLAGS)\n", fMakefile );
+       fputs ( "BUILTIN_HOST_CPPINCLUDES+= $(HOST_CFLAGS)\n", fMakefile );
+       fputs ( "BUILTIN_HOST_CXXINCLUDES+= $(HOST_CPPFLAGS)\n", fMakefile );
  
-       fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" );
-       fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" );
+       // Would be nice to have our own C++ runtime
+       fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile );
+       // TODO: linker flags
        fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () );
 -      fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)' '$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'\n" );
 +      fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" );
        /* hack to get libgcc_eh.a, should check mingw version or something */
        if (Environment::GetArch() == "amd64")
        {