Sync with trunk r43000
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Sat, 19 Sep 2009 13:58:16 +0000 (13:58 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Sat, 19 Sep 2009 13:58:16 +0000 (13:58 +0000)
svn path=/branches/ros-amd64-bringup/; revision=43079

132 files changed:
1  2 
reactos/base/applications/cmdutils/xcopy/rsrc.rc
reactos/base/services/tftpd/tftpd.cpp
reactos/base/shell/explorer/shell/mainframe.cpp
reactos/base/shell/explorer/shell/pane.cpp
reactos/boot/bootdata/packages/reactos.dff
reactos/boot/freeldr/freeldr/bootmgr.c
reactos/dll/directx/ksuser/ksuser.c
reactos/dll/ntdll/def/ntdll_arm.def
reactos/dll/ntdll/def/ntdll_i386.def
reactos/dll/win32/advapi32/reg/reg.c
reactos/dll/win32/beepmidi/beepmidi.c
reactos/dll/win32/comctl32/comctl32.rbuild
reactos/dll/win32/crypt32/crypt32.rc
reactos/dll/win32/gdiplus/gdiplus.rbuild
reactos/dll/win32/iphlpapi/resinfo_reactos.c
reactos/dll/win32/kernel32/file/rw.c
reactos/dll/win32/kernel32/kernel32.rbuild
reactos/dll/win32/kernel32/misc/dllmain.c
reactos/dll/win32/kernel32/misc/stubs.c
reactos/dll/win32/mmdrv/mme.c
reactos/dll/win32/msacm32/msacm.rc
reactos/dll/win32/msacm32/msacm_Ja.rc
reactos/dll/win32/msacm32/msacm_Pl.rc
reactos/dll/win32/msacm32/msacm_Ru.rc
reactos/dll/win32/msafd/misc/dllmain.c
reactos/dll/win32/ole32/ole32.spec
reactos/dll/win32/opengl32/gl.c
reactos/dll/win32/psapi/psapi.c
reactos/dll/win32/shlwapi/assoc.c
reactos/dll/win32/user32/include/user32.h
reactos/dll/win32/user32/include/user32p.h
reactos/dll/win32/user32/misc/misc.c
reactos/dll/win32/user32/windows/defwnd.c
reactos/dll/win32/user32/windows/hook.c
reactos/dll/win32/user32/windows/window.c
reactos/dll/win32/wdmaud.drv/wdmaud.c
reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
reactos/dll/win32/win32.rbuild
reactos/dll/win32/ws2_32/misc/stubs.c
reactos/drivers/base/bootvid/i386/vga.c
reactos/drivers/directx/dxg/ddhmg.c
reactos/drivers/filesystems/ext2/ext2.rbuild
reactos/drivers/input/i8042prt/keyboard.c
reactos/drivers/ksfilter/ks/allocators.c
reactos/drivers/network/afd/afd/listen.c
reactos/drivers/network/afd/afd/main.c
reactos/drivers/network/dd/pcnet/pcnet.c
reactos/drivers/network/ndis/include/ndissys.h
reactos/drivers/network/ndis/ndis/miniport.c
reactos/drivers/network/tcpip/datalink/lan.c
reactos/drivers/network/tcpip/tcpip/dispatch.c
reactos/drivers/storage/class/class2/class2.c
reactos/drivers/video/videoprt/videoprt.c
reactos/hal/halx86/include/hal.h
reactos/include/crt/mingw32/intrin_x86.h
reactos/include/ddk/ndis.h
reactos/include/ddk/wdm.h
reactos/include/ddk/winddk.h
reactos/include/ndk/ldrtypes.h
reactos/include/psdk/mmddk.h
reactos/include/psdk/mmsystem.h
reactos/include/psdk/msacm.h
reactos/include/psdk/windef.h
reactos/include/psdk/winnt.h
reactos/include/psdk/winuser.h
reactos/include/reactos/libs/pseh/pseh2.h
reactos/include/reactos/win32k/ntuser.h
reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
reactos/lib/drivers/sound/mmebuddy/wave/header.c
reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
reactos/lib/inflib/infget.c
reactos/lib/inflib/infpriv.h
reactos/lib/rtl/rtl.rbuild
reactos/lib/rtl/rtlp.h
reactos/lib/sdk/crt/crt.rbuild
reactos/lib/sdk/crt/include/internal/file.h
reactos/lib/sdk/crt/include/internal/wine/cppexcept.h
reactos/lib/sdk/crt/precomp.h
reactos/lib/sdk/crt/stdio/file.c
reactos/ntoskrnl/cc/copy.c
reactos/ntoskrnl/config/cmkcbncb.c
reactos/ntoskrnl/config/cmsysini.c
reactos/ntoskrnl/ex/event.c
reactos/ntoskrnl/ex/handle.c
reactos/ntoskrnl/ex/harderr.c
reactos/ntoskrnl/ex/init.c
reactos/ntoskrnl/ex/lookas.c
reactos/ntoskrnl/ex/mutant.c
reactos/ntoskrnl/ex/sem.c
reactos/ntoskrnl/ex/sysinfo.c
reactos/ntoskrnl/ex/timer.c
reactos/ntoskrnl/include/internal/cm.h
reactos/ntoskrnl/include/internal/mm.h
reactos/ntoskrnl/io/iomgr/iocomp.c
reactos/ntoskrnl/io/iomgr/iofunc.c
reactos/ntoskrnl/io/iomgr/irp.c
reactos/ntoskrnl/kd/kdmain.c
reactos/ntoskrnl/ke/freeldr.c
reactos/ntoskrnl/ke/i386/cpu.c
reactos/ntoskrnl/ke/wait.c
reactos/ntoskrnl/mm/anonmem.c
reactos/ntoskrnl/mm/i386/page.c
reactos/ntoskrnl/mm/mminit.c
reactos/ntoskrnl/mm/pool.c
reactos/ntoskrnl/mm/region.c
reactos/ntoskrnl/mm/section.c
reactos/ntoskrnl/mm/sysldr.c
reactos/ntoskrnl/mm/virtual.c
reactos/ntoskrnl/ntoskrnl-generic.rbuild
reactos/ntoskrnl/ps/kill.c
reactos/ntoskrnl/ps/query.c
reactos/ntoskrnl/ps/security.c
reactos/ntoskrnl/rtl/libsupp.c
reactos/ntoskrnl/se/token.c
reactos/subsystems/win32/csrss/api/handle.c
reactos/subsystems/win32/csrss/api/wapi.c
reactos/subsystems/win32/win32k/ntuser/callback.c
reactos/subsystems/win32/win32k/ntuser/class.c
reactos/subsystems/win32/win32k/ntuser/event.c
reactos/subsystems/win32/win32k/ntuser/hook.c
reactos/subsystems/win32/win32k/ntuser/menu.c
reactos/subsystems/win32/win32k/ntuser/message.c
reactos/subsystems/win32/win32k/ntuser/misc.c
reactos/subsystems/win32/win32k/ntuser/painting.c
reactos/subsystems/win32/win32k/ntuser/simplecall.c
reactos/subsystems/win32/win32k/win32k.pspec
reactos/subsystems/win32/win32k/win32k.rbuild
reactos/tools/rbuild/backend/mingw/mingw.cpp

   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
  
- #ifndef __WINE_WINNLS_H
- #define __WINE_WINNLS_H
++#include <windef.h>
 +
- #include_next <winnls.h>
+ #include "xcopy.h"
  
- #define CP_UNIXCP     CP_ACP
+ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  
 -#define REACTOS_VERSION_DLL
 -#define REACTOS_STR_FILE_DESCRIPTION  "xcopy command\0"
 -#define REACTOS_STR_INTERNAL_NAME     "xcopy\0"
 -#define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe\0"
 -#include <reactos/version.rc>
--
- #endif  /* __WINE_WINNLS_H */
++#include "Bg.rc"
+ #include "Da.rc"
+ #include "De.rc"
++#include "El.rc"
+ #include "En.rc"
+ #include "Fr.rc"
++#include "It.rc"
+ #include "Ko.rc"
 -#include "Lt.rc"
+ #include "Nl.rc"
+ #include "No.rc"
+ #include "Pl.rc"
+ #include "Pt.rc"
+ #include "Ru.rc"
+ #include "Si.rc"
Simple merge
@@@ -141,10 -141,10 +141,10 @@@ bool Pane::create_header(HWND hparent, 
        hdi.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT;
  
        for(int idx=0; idx<COLUMNS; idx++) {
-               hdi.pszText = g_pos_names[idx];
+               hdi.pszText = (TCHAR*)g_pos_names[idx];
                hdi.fmt = HDF_STRING | g_pos_align[idx];
                hdi.cxy = _widths[idx];
 -              Header_InsertItem(hwnd, idx, &hdi);
 +              (void)Header_InsertItem(hwnd, idx, &hdi);
        }
  
        _hwndHeader = hwnd;
@@@ -31,601 -31,618 +31,609 @@@ Signature = "$ReactOS$
  
  
  ; 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\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\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\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\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\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\xcopy\xcopy.exe              1
 +;base\applications\control\control.exe                   1
- ;base\applications\downloader\downloader.exe             1
- ;base\applications\downloader\downloader.xml             1
 +;base\applications\dxdiag\dxdiag.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\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\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\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\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\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
 +;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\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\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\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\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\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\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\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
 +;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\avicap32\avicap32.dll                     1
 +;dll\win32\avifil32\avifil32.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\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\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\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\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\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\symbol.ttf                              3
 -media\fonts\tahoma.ttf                              3
 -media\fonts\tahomabd.ttf                            3
 -
 -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\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
@@@ -184,12 -185,9 +185,9 @@@ KsCreatePin(HANDLE FilterHandle
              PHANDLE  ConnectionHandle)
  {
      ULONG BufferSize = sizeof(KSPIN_CONNECT);
 -    PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ( ((ULONG)Connect) + ((ULONG)sizeof(KSPIN_CONNECT)) ) );
 +    PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)(Connect + 1);
  
-     if (DataFormat->Flags &  KSDATAFORMAT_ATTRIBUTES)
-     {
-         BufferSize += (ROUND_UP(DataFormat->FormatSize,sizeof(LONGLONG)) + DataFormat->FormatSize);
-     }
+     BufferSize += DataFormat->FormatSize;
  
      return KsiCreateObjectType(FilterHandle,
                                 KSSTRING_Pin,
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,aae358d..1afa8a7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,36 +1,34 @@@
 -#include "crypt32_Lt.rc"
+ /*
+  * crypt32 dll resources
+  *
+  * Copyright (C) 2006 Juan Lang
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this library; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+ #include "cryptres.h"
+ #include "version.rc"
+ #include "crypt32_De.rc"
+ #include "crypt32_En.rc"
+ #include "crypt32_Fr.rc"
+ #include "crypt32_Ko.rc"
 -#include "crypt32_Ro.rc"
+ #include "crypt32_Nl.rc"
+ #include "crypt32_No.rc"
+ #include "crypt32_Pt.rc"
+ #include "crypt32_Sv.rc"
        <library>user32</library>
        <library>gdi32</library>
        <library>kernel32</library>
+       <library>windowscodecs</library>
        <library>ntdll</library>
 +      <if property="ARCH" value="amd64">
 +              <library>crt</library>
 +      </if>
  </module>
  </group>
Simple merge
  <?xml version="1.0"?>
  <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
- <group>
-       <module name="kernel32_base" type="objectlibrary" crt="dll" allowwarnings="true">
-               <include base="kernel32_base">.</include>
-               <include base="kernel32_base">include</include>
-               <include base="ReactOS">include/reactos/subsys</include>
-               <define name="_KERNEL32_" />
-               <redefine name="_WIN32_WINNT">0x0600</redefine>
-               <define name="__NO_CTYPE_INLINES" />
-               <define name="NTDDI_VERSION">0x05020100</define>
-               <dependency>errcodes</dependency>
-               <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
-               <pch>k32.h</pch>
-               -->
-               <group compilerset="gcc">
-                       <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-                       <compilerflag>-fno-unit-at-a-time</compilerflag>
-                       <compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-                       <compilerflag compiler="cxx">-fno-rtti</compilerflag>
-               </group>
-               <directory name="debug">
-                       <file>debugger.c</file>
-                       <file>output.c</file>
-               </directory>
-               <directory name="except">
-                       <file>except.c</file>
-               </directory>
-               <directory name="file">
-                       <file>backup.c</file>
-                       <file>bintype.c</file>
-                       <file>cnotify.c</file>
-                       <file>copy.c</file>
-                       <file>create.c</file>
-                       <file>curdir.c</file>
-                       <file>delete.c</file>
-                       <file>deviceio.c</file>
-                       <file>dir.c</file>
-                       <file>dosdev.c</file>
-                       <file>file.c</file>
-                       <file>find.c</file>
-                       <file>hardlink.c</file>
-                       <file>iocompl.c</file>
-                       <file>lfile.c</file>
-                       <file>lock.c</file>
-                       <file>mailslot.c</file>
-                       <file>move.c</file>
-                       <file>npipe.c</file>
-                       <file>pipe.c</file>
-                       <file>rw.c</file>
-                       <file>tape.c</file>
-                       <file>volume.c</file>
-               </directory>
-               <directory name="mem">
-                       <file>global.c</file>
-                       <file>heap.c</file>
-                       <file>isbad.c</file>
-                       <file>local.c</file>
-                       <file>procmem.c</file>
-                       <file>resnotify.c</file>
-                       <file>section.c</file>
-                       <file>virtual.c</file>
-               </directory>
-               <directory name="misc">
-                       <file>actctx.c</file>
-                       <file>atom.c</file>
-                       <file>chartype.c</file>
-                       <file>collation.c</file>
-                       <file>casemap.c</file>
-                       <file>comm.c</file>
-                       <file>commdcb.c</file>
-                       <file>computername.c</file>
-                       <file>console.c</file>
-                       <file>dllmain.c</file>
-                       <file>env.c</file>
-                       <file>error.c</file>
-                       <file>errormsg.c</file>
-                       <file>fold.c</file>
-                       <file>handle.c</file>
-                       <file>lang.c</file>
-                       <file>ldr.c</file>
-                       <file>lzexpand.c</file>
-                       <file>muldiv.c</file>
-                       <file>nls.c</file>
-                       <file>perfcnt.c</file>
-                       <file>power.c</file>
-                       <file>recovery.c</file>
-                       <file>res.c</file>
-                       <file>sortkey.c</file>
-                       <file>stubs.c</file>
-                       <file>sysinfo.c</file>
-                       <file>time.c</file>
-                       <file>timerqueue.c</file>
-                       <file>toolhelp.c</file>
-                       <file>version.c</file>
-               </directory>
-               <directory name="process">
-                       <file>cmdline.c</file>
-                       <file>procsup.c</file>
-                       <file>job.c</file>
-                       <file>proc.c</file>
-                       <file>session.c</file>
-               </directory>
-               <directory name="string">
-                       <file>lstring.c</file>
-               </directory>
-               <directory name="synch">
-                       <file>condvar.c</file>
-                       <file>critical.c</file>
-                       <file>event.c</file>
-                       <file>mutex.c</file>
-                       <file>sem.c</file>
-                       <file>timer.c</file>
-                       <file>wait.c</file>
-               </directory>
-               <directory name="thread">
-                       <file>fiber.c</file>
-                       <file>fls.c</file>
-                       <file>thread.c</file>
-                       <file>tls.c</file>
-               </directory>
-               <directory name="misc">
-                       <file>lcformat.c</file>
-                       <file>profile.c</file>
-                       <file>utils.c</file>
-               </directory>
-               <directory name="thread">
-                       <if property="ARCH" value="i386">
-                               <directory name="i386">
-                                       <file>fiber.S</file>
-                                       <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>
-               <directory name="misc">
-                       <file>icustubs.cpp</file>
-               </directory>
-               <library>normalize</library>
-       </module>
-       <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll">
-               <importlibrary definition="kernel32.pspec" />
-               <include base="kernel32">.</include>
-               <include base="kernel32" root="intermediate">.</include>
-               <include base="kernel32">include</include>
-               <library>kernel32_base</library>
-               <library>wine</library>
-               <library>pseh</library>
-               <file>kernel32.rc</file>
-               <library>ntdll</library>
-       </module>
- </group>
 -<module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">
++<module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" allowwarnings="true">
+       <importlibrary definition="kernel32.pspec" />
+       <include base="kernel32">.</include>
+       <include base="kernel32" root="intermediate">.</include>
+       <include base="kernel32">include</include>
+       <include base="ReactOS">include/reactos/subsys</include>
+       <library>wine</library>
+       <library>pseh</library>
+       <library>normalize</library>
+       <library>ntdll</library>
+       <define name="_KERNEL32_" />
+       <redefine name="_WIN32_WINNT">0x0600</redefine>
+       <define name="__NO_CTYPE_INLINES" />
+       <define name="NTDDI_VERSION">0x05020100</define>
+       <dependency>errcodes</dependency>
+       <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
+       <pch>k32.h</pch>
+       -->
+       <group compilerset="gcc">
+               <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
+               <compilerflag>-fno-unit-at-a-time</compilerflag>
+               <compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+               <compilerflag compiler="cxx">-fno-rtti</compilerflag>
+       </group>
+       <directory name="debug">
+               <file>debugger.c</file>
+               <file>output.c</file>
+       </directory>
+       <directory name="except">
+               <file>except.c</file>
+       </directory>
+       <directory name="file">
+               <file>backup.c</file>
+               <file>bintype.c</file>
+               <file>cnotify.c</file>
+               <file>copy.c</file>
+               <file>create.c</file>
+               <file>curdir.c</file>
+               <file>delete.c</file>
+               <file>deviceio.c</file>
+               <file>dir.c</file>
+               <file>dosdev.c</file>
+               <file>file.c</file>
+               <file>find.c</file>
+               <file>hardlink.c</file>
+               <file>iocompl.c</file>
+               <file>lfile.c</file>
+               <file>lock.c</file>
+               <file>mailslot.c</file>
+               <file>move.c</file>
+               <file>npipe.c</file>
+               <file>pipe.c</file>
+               <file>rw.c</file>
+               <file>tape.c</file>
+               <file>volume.c</file>
+       </directory>
+       <directory name="mem">
+               <file>global.c</file>
+               <file>heap.c</file>
+               <file>isbad.c</file>
+               <file>local.c</file>
+               <file>procmem.c</file>
+               <file>resnotify.c</file>
+               <file>section.c</file>
+               <file>virtual.c</file>
+       </directory>
+       <directory name="misc">
+               <file>actctx.c</file>
+               <file>atom.c</file>
+               <file>chartype.c</file>
+               <file>collation.c</file>
+               <file>casemap.c</file>
+               <file>comm.c</file>
+               <file>commdcb.c</file>
+               <file>computername.c</file>
+               <file>console.c</file>
+               <file>dllmain.c</file>
+               <file>env.c</file>
+               <file>error.c</file>
+               <file>errormsg.c</file>
+               <file>fold.c</file>
+               <file>handle.c</file>
+               <file>lang.c</file>
+               <file>ldr.c</file>
+               <file>lzexpand.c</file>
+               <file>muldiv.c</file>
+               <file>nls.c</file>
+               <file>perfcnt.c</file>
+               <file>power.c</file>
+               <file>recovery.c</file>
+               <file>res.c</file>
+               <file>sortkey.c</file>
+               <file>stubs.c</file>
+               <file>sysinfo.c</file>
+               <file>time.c</file>
+               <file>timerqueue.c</file>
+               <file>toolhelp.c</file>
+               <file>version.c</file>
+       </directory>
+       <directory name="process">
+               <file>cmdline.c</file>
+               <file>procsup.c</file>
+               <file>job.c</file>
+               <file>proc.c</file>
+               <file>session.c</file>
+       </directory>
+       <directory name="string">
+               <file>lstring.c</file>
+       </directory>
+       <directory name="synch">
+               <file>condvar.c</file>
+               <file>critical.c</file>
+               <file>event.c</file>
+               <file>mutex.c</file>
+               <file>sem.c</file>
+               <file>timer.c</file>
+               <file>wait.c</file>
+       </directory>
+       <directory name="thread">
+               <file>fiber.c</file>
+               <file>fls.c</file>
+               <file>thread.c</file>
+               <file>tls.c</file>
+       </directory>
+       <directory name="misc">
+               <file>lcformat.c</file>
+               <file>profile.c</file>
+               <file>utils.c</file>
+       </directory>
+       <directory name="thread">
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file>fiber.S</file>
+                               <file>thread.S</file>
+                       </directory>
+               </if>
+       </directory>
+       <directory name="misc">
+               <file>icustubs.cpp</file>
+       </directory>
+       <file>kernel32.rc</file>
+ </module>
@@@ -41,13 -41,13 +41,13 @@@ NotifyClient
      Wave Output
  */
  
- APIENTRY DWORD
+ DWORD APIENTRY
  wodMessage(
 -    DWORD device_id,
 -    DWORD message,
 -    DWORD private_handle,
 -    DWORD parameter1,
 -    DWORD parameter2)
 +    UINT device_id,
 +    UINT message,
 +    DWORD_PTR private_handle,
 +    DWORD_PTR parameter1,
 +    DWORD_PTR parameter2)
  {
      switch ( message )
      {
Simple merge
@@@ -25,24 -27,24 +27,24 @@@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAUL
  
  DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE  10, 20, 225, 100
  STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
--CAPTION "サウンドの選択"
++CAPTION "???????"
  FONT 9, "MS Shell Dlg"
  BEGIN
  
--    LTEXT           "名前(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP
++    LTEXT           "??(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP
  
      COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60,
                      CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
  
--    PUSHBUTTON      "名前を付けて保存(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
--    PUSHBUTTON      "削除(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
++    PUSHBUTTON      "????????(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
++    PUSHBUTTON      "??(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
  
--    LTEXT           "フォーマット(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP
++    LTEXT           "??????(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP
  
      COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60,
                      CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
  
--    LTEXT           "属性(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP
++    LTEXT           "??(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP
  
  #if 0
      COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60,
@@@ -53,9 -55,7 +55,9 @@@
                      CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
  #endif
      DEFPUSHBUTTON   "OK", IDOK, 48, 80, 40, 14
--    PUSHBUTTON      "キャンセル", IDCANCEL, 92, 80, 40, 14
--    PUSHBUTTON      "ヘルプ(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
++    PUSHBUTTON      "?????", IDCANCEL, 92, 80, 40, 14
++    PUSHBUTTON      "???(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
  
  END
 +
 +#pragma code_page(default)
@@@ -18,6 -18,9 +18,8 @@@
   * License along with this library; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
 -
+ #include "wineacm.h"
  LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
  
  DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE  10, 20, 235, 100
@@@ -22,24 -27,24 +27,24 @@@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAUL
  
  DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE  10, 20, 225, 100
  STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
- CAPTION "Âûáîð çâóêà"
 -CAPTION "Выбор звука"
++CAPTION "????? ?????"
  FONT 8, "MS Shell Dlg"
  BEGIN
  
-     LTEXT           "&Èìÿ:", -1, 5, 5, 115, 8, NOT WS_GROUP
 -    LTEXT           "&Имя:", -1, 5, 5, 115, 8, NOT WS_GROUP
++    LTEXT           "&???:", -1, 5, 5, 115, 8, NOT WS_GROUP
  
      COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60,
                      CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
  
-     PUSHBUTTON      "&Ñîõðàíèòü êàê...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
-     PUSHBUTTON      "&Óäàëèòü", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
 -    PUSHBUTTON      "&Сохранить как...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
 -    PUSHBUTTON      "&Удалить", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
++    PUSHBUTTON      "&????????? ???...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
++    PUSHBUTTON      "&???????", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
  
-     LTEXT           "&Ôîðìàò:", -1, 5, 41, 44, 8, NOT WS_GROUP
 -    LTEXT           "&Формат:", -1, 5, 41, 44, 8, NOT WS_GROUP
++    LTEXT           "&??????:", -1, 5, 41, 44, 8, NOT WS_GROUP
  
      COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60,
                      CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
  
-     LTEXT           "&Ñâîéñòâà:", -1, 5, 59, 44, 8, NOT WS_GROUP
 -    LTEXT           "&Свойства:", -1, 5, 59, 44, 8, NOT WS_GROUP
++    LTEXT           "&????????:", -1, 5, 59, 44, 8, NOT WS_GROUP
  
  #if 0
      COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60,
@@@ -50,7 -55,7 +55,7 @@@
                      CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
  #endif
      DEFPUSHBUTTON   "OK", IDOK, 48, 80, 40, 14
-     PUSHBUTTON      "Îòìåíà", IDCANCEL, 92, 80, 40, 14
-     PUSHBUTTON      "&Ïîìîùü", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
 -    PUSHBUTTON      "Отмена", IDCANCEL, 92, 80, 40, 14
 -    PUSHBUTTON      "&Помощь", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
++    PUSHBUTTON      "??????", IDCANCEL, 92, 80, 40, 14
++    PUSHBUTTON      "&??????", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
  
  END
Simple merge
   *
   * On other machines we use C to forward the calls (slow...)
   */
-  
  #include "opengl32.h"
  
 +#if defined(_M_IX86)
  C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8);
 +#endif
  
- int WINAPI glEmptyFunc0() { return 0; }
+ int WINAPI glEmptyFunc0( void ) { return 0; }
  int WINAPI glEmptyFunc4( long l1 ) { return 0; }
  int WINAPI glEmptyFunc8( long l1, long l2 ) { return 0; }
  int WINAPI glEmptyFunc12( long l1, long l2, long l3 ) { return 0; }
Simple merge
Simple merge
    (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ANYPOPUP)
  
  #define NtUserValidateRgn(hWnd, hRgn) \
 -  (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_VALIDATERGN)
  
  #define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \
-   (BOOL)NtUserCallTwoParam((DWORD_PTR)hwnd, dwContextHelpId, TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID)
+   (BOOL)NtUserCallHwndParam(hWnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID)
  
  #define NtUserSetCaretPos(X, Y) \
 -  (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)X, (DWORD_PTR)Y, TWOPARAM_ROUTINE_SETCARETPOS)
  
  #define NtUserSetGUIThreadHandle(field, hwnd) \
 -  (BOOL)NtUserCallTwoParam((DWORD)field, (DWORD)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)field, (DWORD_PTR)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE)
  
  #define NtUserSetMenuItemRect(menu, mir) \
 -  (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)mir, TWOPARAM_ROUTINE_SETMENUITEMRECT)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)menu, (DWORD_PTR)mir, TWOPARAM_ROUTINE_SETMENUITEMRECT)
  
  #define NtUserSetMenuBarHeight(menu, height) \
 -  (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)menu, (DWORD_PTR)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT)
  
- #define NtUserGetWindowInfo(hwnd, pwi) \
-   (BOOL)NtUserCallTwoParam((DWORD_PTR)hwnd, (DWORD_PTR)pwi, TWOPARAM_ROUTINE_GETWINDOWINFO)
  #define NtUserRegisterLogonProcess(hproc, x) \
 -  (BOOL)NtUserCallTwoParam((DWORD)hproc, (DWORD)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)hproc, (DWORD_PTR)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC)
  
  #define NtUserGetSysColorBrushes(HBrushes, count) \
 -  (BOOL)NtUserCallTwoParam((DWORD)(HBrushes), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)(HBrushes), (DWORD_PTR)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES)
  
  #define NtUserGetSysColors(ColorRefs, count) \
 -  (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORS)
 +  (BOOL)NtUserCallTwoParam((DWORD_PTR)(ColorRefs), (DWORD_PTR)(count), TWOPARAM_ROUTINE_GETSYSCOLORS)
  
  #define NtUserSetCaretBlinkTime(uMSeconds) \
 -  (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME)
 +  (BOOL)NtUserCallOneParam((DWORD_PTR)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME)
  
  /*
  #define NtUserEnumClipboardFormats(format) \
Simple merge
Simple merge
@@@ -10,6 -12,9 +12,9 @@@
        <library>user32</library>
        <library>winmm</library>
        <library>advapi32</library>
+       <library>libsamplerate</library>
+       <library>msvcrt</library>
        <file>wdmaud.c</file>
+       <file>mixer.c</file>
        <file>wdmaud.rc</file>
 -</module>
 +</module>
Simple merge
Simple merge
@@@ -144,10 -142,10 +142,10 @@@ DdHmgDestroy(VOID
  *--*/
  PVOID
  FASTCALL
- DdHmgLock( HANDLE DdHandle, UCHAR ObjectType,  BOOLEAN LockOwned)
+ DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned)
  {
  
 -    DWORD Index = (DWORD)DdHandle & 0x1FFFFF;
 +    DWORD Index = (DWORD)(DWORD_PTR)DdHandle & 0x1FFFFF;
      PDD_ENTRY pEntry = NULL;
      PVOID Object = NULL;
  
@@@ -1,8 -1,9 +1,9 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 -<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys">
 +<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys" allowwarnings="true">
        <bootstrap installbase="$(CDOUTPUT)" />
        <include base="ext2fs">inc</include>
+       <compilerflag compilerset="msc">/wd4003</compilerflag>
        <library>ntoskrnl</library>
        <library>hal</library>
        <directory name="src">
@@@ -315,7 -315,7 +315,7 @@@ IKsAllocator_fnAllocateFrame
      if (Frame)
      {
          *OutFrame = Frame;
--        InterlockedIncrement((PLONG)This->Status.AllocatedFrames);
++        InterlockedIncrement((PLONG)&This->Status.AllocatedFrames);
          return STATUS_SUCCESS;
      }
  
@@@ -744,9 -741,10 +741,10 @@@ NTSTATUS DispTdiQueryInformation
          AddressInfo = (PTDI_CONNECTION_INFORMATION)
            MmGetSystemAddressForMdl(Irp->MdlAddress);
  
 -        switch ((ULONG)IrpSp->FileObject->FsContext2) {
 +        switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) {
            case TDI_TRANSPORT_ADDRESS_FILE:
              AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle;
+             Endpoint = AddrFile ? AddrFile->Connection : NULL;
              break;
  
            case TDI_CONNECTION_FILE:
@@@ -1060,9 -1058,7 +1058,9 @@@ NTSTATUS DispTdiSendDatagram
                    ("About to call send routine %x\n",
                     (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send)));
  
-         if( (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send) )
+         if( (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send != NULL) )
 +        {
 +              ULONG DataUsed = 0;
              Status = (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send)(
                  Request.Handle.AddressHandle,
                  DgramInfo->SendDatagramInformation,
Simple merge
Simple merge
Simple merge
@@@ -5815,7 -5792,7 +5792,7 @@@ KeAcquireSpinLockRaiseToDpc
  
  #define ASSERT(exp) \
    (VOID)((!(exp)) ? \
--    RtlAssert( #exp, __FILE__, __LINE__, NULL ), FALSE : TRUE)
++    RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE)
  
  #define ASSERTMSG(msg, exp) \
    (VOID)((!(exp)) ? \
Simple merge
Simple merge
@@@ -1881,11 -1886,15 +1886,15 @@@ MCIDEVICEID WINAPI mciGetDeviceIDFromEl
  BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT);
  BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT);
  BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD);
 -HTASK WINAPI mciGetCreatorTask(MCIDEVICEID);
 +HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID);
  YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD);
  
+ #ifdef _WINE
+ DWORD WINAPI GetDriverFlags(HDRVR hDriver);
+ #endif
  typedef struct tagMCI_SEQ_SET_PARMS {
 -      DWORD dwCallback;
 +      DWORD_PTR dwCallback;
        DWORD dwTimeFormat;
        DWORD dwAudio;
        DWORD dwTempo;
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -159,8 -158,8 +158,8 @@@ typedef struct _CLIENTINF
      PPROCESSINFO ppi;
  } CLIENTINFO, *PCLIENTINFO;
  
--/* Make sure it fits exactly into the TEB */
--C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET(TEB, Win32ClientInfo));
++/* Make sure it fits into the TEB */
++C_ASSERT(sizeof(CLIENTINFO) <= sizeof(((PTEB)0)->Win32ClientInfo));
  
  #define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo))
  
  /*
      Standard MME driver entry-point for messages relating to auxiliary devices.
  */
- APIENTRY DWORD
+ DWORD
+ APIENTRY
  auxMessage(
 -    DWORD DeviceId,
 -    DWORD Message,
 -    DWORD PrivateHandle,
 -    DWORD Parameter1,
 -    DWORD Parameter2)
 +    UINT DeviceId,
 +    UINT Message,
 +    DWORD_PTR PrivateHandle,
 +    DWORD_PTR Parameter1,
 +    DWORD_PTR Parameter2)
  {
      MMRESULT Result = MMSYSERR_NOTSUPPORTED;
  
  /*
      Standard MME driver entry-point for messages relating to MIDI input.
  */
- APIENTRY DWORD
+ DWORD
+ APIENTRY
  midMessage(
 -    DWORD DeviceId,
 -    DWORD Message,
 -    DWORD PrivateHandle,
 -    DWORD Parameter1,
 -    DWORD Parameter2)
 +    UINT DeviceId,
 +    UINT Message,
 +    DWORD_PTR PrivateHandle,
 +    DWORD_PTR Parameter1,
 +    DWORD_PTR Parameter2)
  {
      MMRESULT Result = MMSYSERR_NOTSUPPORTED;
  
  /*
      Standard MME driver entry-point for messages relating to MIDI output.
  */
- APIENTRY DWORD
+ DWORD
+ APIENTRY
  modMessage(
 -    DWORD DeviceId,
 -    DWORD Message,
 -    DWORD PrivateHandle,
 -    DWORD Parameter1,
 -    DWORD Parameter2)
 +    UINT DeviceId,
 +    UINT Message,
 +    DWORD_PTR PrivateHandle,
 +    DWORD_PTR Parameter1,
 +    DWORD_PTR Parameter2)
  {
      MMRESULT Result = MMSYSERR_NOTSUPPORTED;
  
  /*
      Standard MME driver entry-point for messages relating to mixers.
  */
- APIENTRY DWORD
+ DWORD
+ APIENTRY
  mxdMessage(
 -    DWORD DeviceId,
 -    DWORD Message,
 -    DWORD PrivateHandle,
 -    DWORD Parameter1,
 -    DWORD Parameter2)
 +    UINT DeviceId,
 +    UINT Message,
 +    DWORD_PTR PrivateHandle,
 +    DWORD_PTR Parameter1,
 +    DWORD_PTR Parameter2)
  {
      MMRESULT Result = MMSYSERR_NOTSUPPORTED;
  
      Standard MME driver entry-point for messages relating to wave audio
      input.
  */
- APIENTRY DWORD
+ DWORD
+ APIENTRY
  widMessage(
 -    DWORD DeviceId,
 -    DWORD Message,
 -    DWORD PrivateHandle,
 -    DWORD Parameter1,
 -    DWORD Parameter2)
 +    UINT DeviceId,
 +    UINT Message,
 +    DWORD_PTR PrivateHandle,
 +    DWORD_PTR Parameter1,
 +    DWORD_PTR Parameter2)
  {
      MMRESULT Result = MMSYSERR_NOTSUPPORTED;
  
@@@ -31,13 -31,14 +31,14 @@@ MMRESULT HelloWorld(PSOUND_DEVICE_INSTA
      Standard MME driver entry-point for messages relating to wave audio
      output.
  */
- APIENTRY DWORD
+ DWORD
+ APIENTRY
  wodMessage(
 -    DWORD DeviceId,
 -    DWORD Message,
 -    DWORD PrivateHandle,
 -    DWORD Parameter1,
 -    DWORD Parameter2)
 +    UINT DeviceId,
 +    UINT Message,
 +    DWORD_PTR PrivateHandle,
 +    DWORD_PTR Parameter1,
 +    DWORD_PTR Parameter2)
  {
      MMRESULT Result = MMSYSERR_NOTSUPPORTED;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #define EH_NESTED_CALL      0x10
  
  #ifndef _M_ARM
+ #ifdef _MSC_VER
+ #pragma warning(push)
+ #pragma warning(disable:4733)
+ #endif
  static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame )
  {
 +#if defined(__i386__)
      frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0);
        __writefsdword(0, (unsigned long)frame);
      return frame->Next;
  
  static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame )
  {
 +#if defined(__i386__)
        __writefsdword(0, (unsigned long)frame->Next);
      return frame->Next;
 +#else
 +      NT_TIB *teb = (NT_TIB *)NtCurrentTeb();
 +      teb->ExceptionList = frame->Next;
 +      return frame->Next;
 +#endif
  }
+ #ifdef _MSC_VER
+ #pragma warning(pop)
+ #endif
  #endif
  
  #define __TRY _SEH2_TRY
@@@ -58,9 -58,8 +58,9 @@@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt)
  #include <internal/mbstring.h>
  #include <internal/mtdll.h>
  #include <internal/rterror.h>
++#include <internal/safecrt.h>
+ #include <internal/time.h>
  #include <internal/tls.h>
  #include <internal/printf.h>
- #include <internal/time.h>
- #include <internal/safecrt.h>
  
  #endif /* _CRT_PRECOMP_H */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -237,9 -235,8 +235,9 @@@ NtQuerySemaphore(IN HANDLE SemaphoreHan
                                           SemaphoreInformation,
                                           SemaphoreInformationLength,
                                           ReturnLength,
 +                                         NULL,
                                           PreviousMode);
-     if(!NT_SUCCESS(Status))
+     if (!NT_SUCCESS(Status))
      {
          /* Invalid buffers */
          DPRINT("NtQuerySemaphore() failed, Status: 0x%x\n", Status);
Simple merge
@@@ -522,9 -528,8 +528,9 @@@ NtQueryTimer(IN HANDLE TimerHandle
                                           TimerInformation,
                                           TimerInformationLength,
                                           ReturnLength,
 +                                         NULL,
                                           PreviousMode);
-     if(!NT_SUCCESS(Status)) return Status;
+     if (!NT_SUCCESS(Status)) return Status;
  
      /* Get the Timer Object */
      Status = ObReferenceObjectByHandle(TimerHandle,
Simple merge
Simple merge
Simple merge
@@@ -50,14 -50,10 +50,10 @@@ KdpServiceDispatcher(ULONG Service
              break;
  
  #if DBG
-         case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */
+         case ' soR': /* ROS-INTERNAL */
          {
 -            switch ((ULONG)Buffer1)
 +            switch ((ULONG_PTR)Buffer1)
              {
-                 case DumpNonPagedPool:
-                     MiDebugDumpNonPagedPool(FALSE);
-                     break;
                  case ManualBugCheck:
                      KeBugCheck(MANUALLY_INITIATED_CRASH);
                      break;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -157,21 -156,13 +156,13 @@@ MmInit1(VOID
      MmInitializePageList();
         
      //
 -    // Initialize ARM³ in phase 1
 +    // Initialize ARM³ in phase 1
      //
      MmArmInitSystem(1, KeLoaderBlock);
-                                                                   // DEPRECATED
-     /* Put nonpaged pool after the loaded modules */              // DEPRECATED
-     MiNonPagedPoolStart = (PVOID)((ULONG_PTR)MmSystemRangeStart + // DEPRECATED
-                                   MmBootImageSize);               // DEPRECATED
-     MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE;                 // DEPRECATED
-                                                                   // DEPRECATED
-     /* Initialize nonpaged pool */                                // DEPRECATED
-     MiInitializeNonPagedPool();                                   // DEPRECATED
-                                                                   // DEPRECATED
-     /* Put the paged pool after nonpaged pool */
-     MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MiNonPagedPoolStart +
-                                            MiNonPagedPoolLength);
+     /* Put the paged pool after the loaded modules */
+     MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart +
+                                            MmBootImageSize);
      MmPagedPoolSize = MM_PAGED_POOL_SIZE;
  
      //
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -866,8 -853,8 +853,8 @@@ NtWriteVirtualMemory(IN HANDLE ProcessH
  {
      KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
      PEPROCESS Process;
-     NTSTATUS Status = STATUS_SUCCESS;
+     NTSTATUS Status;
 -    ULONG BytesWritten = 0;
 +    SIZE_T BytesWritten = 0;
      PAGED_CODE();
  
      /* Check if we came from user mode */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -514,67 -514,12 +514,12 @@@ NtUserCallTwoParam
           UNIMPLEMENTED
           RETURN( 0);
  
-       case TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID:
-          if(!(Window = UserGetWindowObject((HWND)Param1)))
-          {
-             RETURN( (DWORD_PTR)FALSE);
-          }
-          if ( Param2 )
-             IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param2);
-          else
-             IntRemoveProp(Window, gpsi->atomContextHelpIdProp);
-          RETURN( (DWORD_PTR)TRUE);
  
        case TWOPARAM_ROUTINE_SETCARETPOS:
 -         RETURN( (DWORD)co_IntSetCaretPos((int)Param1, (int)Param2));
 +         RETURN( (DWORD_PTR)co_IntSetCaretPos((int)Param1, (int)Param2));
  
-       case TWOPARAM_ROUTINE_GETWINDOWINFO:
-          {
-             WINDOWINFO wi;
-             DWORD_PTR Ret;
-             if(!(Window = UserGetWindowObject((HWND)Param1)))
-             {
-                RETURN( FALSE);
-             }
- #if 0
-             /*
-              * According to WINE, Windows' doesn't check the cbSize field
-              */
-             Status = MmCopyFromCaller(&wi.cbSize, (PVOID)Param2, sizeof(wi.cbSize));
-             if(!NT_SUCCESS(Status))
-             {
-                SetLastNtError(Status);
-                RETURN( FALSE);
-             }
-             if(wi.cbSize != sizeof(WINDOWINFO))
-             {
-                SetLastWin32Error(ERROR_INVALID_PARAMETER);
-                RETURN( FALSE);
-             }
- #endif
-             if((Ret = (DWORD_PTR)IntGetWindowInfo(Window, &wi)))
-             {
-                Status = MmCopyToCaller((PVOID)Param2, &wi, sizeof(WINDOWINFO));
-                if(!NT_SUCCESS(Status))
-                {
-                   SetLastNtError(Status);
-                   RETURN( FALSE);
-                }
-             }
-             RETURN( Ret);
-          }
        case TWOPARAM_ROUTINE_REGISTERLOGONPROC:
 -         RETURN( (DWORD)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2));
 +         RETURN( (DWORD_PTR)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2));
  
        case TWOPARAM_ROUTINE_ROS_REGSYSCLASSES:
        {
@@@ -1,9 -1,9 +1,9 @@@
  #include "include/reactos/msvctarget.h"
  
- @ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr)
- @ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr)
- @ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr)
- @ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr)
 -@ stdcall FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add
 -@ stdcall FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div
 -@ stdcall FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul
 -@ stdcall FLOATOBJ_SubFloatObj(ptr ptr) FLOATOBJ_Sub
++@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add
++@ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div
++@ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul
++@ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr) FLOATOBJ_Sub
  @ stdcall BRUSHOBJ_hGetColorTransform(ptr)
  @ stdcall BRUSHOBJ_pvAllocRbrush(ptr long)
  @ stdcall BRUSHOBJ_pvGetRbrush(ptr)