Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 59197: configure.sh: Allow passing -D parameters to cmake. Both -DVAR=value and -D VAR=value syntaxes are supported.
by spetreolle＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: spetreolle Date: Sun Jun 9 13:47:01 2013 New Revision: 59197 URL: http://svn.reactos.org/svn/reactos?rev=59197&view=rev Log: configure.sh: Allow passing -D parameters to cmake. Both -DVAR=value and -D VAR=value syntaxes are supported. Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59197&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Sun Jun 9 13:47:01 2013 @@ -9,11 +9,34 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -if [ "$1" = "Makefiles" -o "$1" = "makefiles" ]; then -CMAKE_GENERATOR="Unix Makefiles" -else + +usage() { +echo Invalid parameter given. +exit 1 +} + CMAKE_GENERATOR="Ninja" -fi +for (( i=1; i<=$#; i++ )); do + case ${!i} in + -D) + ((i++)) + if [[ "x${!i}" == x?*=* ]] ; then + ROS_CMAKEOPTS+=" -D ${!i}" + else + usage + fi + ;; + + -D?*=*) + ROS_CMAKEOPTS+=" ${!i}" + ;; + makefiles|Makefiles) + CMAKE_GENERATOR="Unix Makefiles" + ;; + *) + usage + esac +done if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -28,12 +51,12 @@ rm -f CMakeCache.txt REACTOS_BUILD_TOOLS_DIR="$PWD" -cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Preparing reactos... cd ../reactos rm -f CMakeCache.txt -cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: ninja, make, makex, etc...$.

1 0

[akhaldi] 59196: [CMAKE] * Update base addresses. CORE-7262 #resolve
by akhaldi＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: akhaldi Date: Sun Jun 9 10:47:20 2013 New Revision: 59196 URL: http://svn.reactos.org/svn/reactos?rev=59196&view=rev Log: [CMAKE] * Update base addresses. CORE-7262 #resolve Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Jun 9 10:47:20 2013 @@ -1,300 +1,311 @@ -set(baseaddress_ntdll 0x77f20000) -set(baseaddress_kernel32 0x77da0000) -set(baseaddress_msvcrt 0x77d10000) -set(baseaddress_advapi32 0x77c60000) -set(baseaddress_msv1_0 0x77c40000) -set(baseaddress_gdi32 0x77bf0000) -set(baseaddress_user32 0x77a60000) -set(baseaddress_dhcpcsvc 0x77a10000) -set(baseaddress_dnsapi 0x779d0000) -set(baseaddress_icmp 0x779a0000) -set(baseaddress_iphlpapi 0x77960000) -set(baseaddress_ws2_32 0x77920000) -set(baseaddress_ws2help 0x778f0000) -set(baseaddress_shlwapi 0x77860000) -set(baseaddress_rpcrt4 0x777a0000) -set(baseaddress_comctl32 0x77640000) -set(baseaddress_ole32 0x77470000) -set(baseaddress_winspool.drv 0x77440000) -set(baseaddress_winmm 0x773a0000) -set(baseaddress_comdlg32 0x772b0000) -set(baseaddress_shell32 0x765d0000) -set(baseaddress_lz32 0x765b0000) -set(baseaddress_version 0x76580000) -set(baseaddress_oleaut32 0x763e0000) -set(baseaddress_setupapi 0x76220000) -set(baseaddress_mpr 0x761e0000) -set(baseaddress_crypt32 0x760e0000) -set(baseaddress_wininet 0x76050000) -set(baseaddress_urlmon 0x75f90000) -set(baseaddress_psapi 0x75f60000) -set(baseaddress_imm32 0x75f20000) -set(baseaddress_msvfw32 0x75ee0000) -set(baseaddress_dbghelp 0x75e50000) -set(baseaddress_devmgr 0x75dd0000) -set(baseaddress_msacm32 0x75d90000) -set(baseaddress_netapi32 0x75d40000) -set(baseaddress_powrprof 0x75d10000) -set(baseaddress_secur32 0x75ce0000) -set(baseaddress_wintrust 0x75c90000) -set(baseaddress_avicap32 0x75c60000) -set(baseaddress_cabinet 0x75c20000) -set(baseaddress_dsound 0x75ba0000) -set(baseaddress_glu32 0x75aa0000) -set(baseaddress_opengl32 0x75a70000) -set(baseaddress_riched20 0x759e0000) -set(baseaddress_smdll 0x759c0000) -set(baseaddress_userenv 0x75970000) -set(baseaddress_uxtheme 0x75910000) -set(baseaddress_cryptui 0x75860000) -set(baseaddress_csrsrv 0x75830000) -set(baseaddress_dplayx 0x757d0000) -set(baseaddress_gdiplus 0x75730000) -set(baseaddress_msimg32 0x75700000) -set(baseaddress_mswsock 0x756d0000) -set(baseaddress_oledlg 0x75690000) -set(baseaddress_rasapi32 0x75660000) -set(baseaddress_rsaenh 0x75600000) -set(baseaddress_samlib 0x755d0000) -set(baseaddress_sensapi 0x755a0000) -set(baseaddress_sfc_os 0x75570000) -set(baseaddress_snmpapi 0x75540000) -set(baseaddress_spoolss 0x75510000) -set(baseaddress_usp10 0x754b0000) -set(baseaddress_access 0x75440000) -set(baseaddress_acledit 0x75410000) -set(baseaddress_aclui 0x753d0000) -set(baseaddress_activeds 0x753a0000) -set(baseaddress_actxprxy 0x751d0000) -set(baseaddress_advpack 0x75190000) -set(baseaddress_amstream 0x75150000) -set(baseaddress_atl 0x75110000) -set(baseaddress_authz 0x750e0000) -set(baseaddress_avifil32 0x75080000) -set(baseaddress_batt 0x75050000) -set(baseaddress_bcrypt 0x75020000) -set(baseaddress_beepmidi 0x75000000) -set(baseaddress_browseui 0x74f40000) -set(baseaddress_cards 0x74e90000) -set(baseaddress_cfgmgr32 0x74e70000) -set(baseaddress_clusapi 0x74e40000) -set(baseaddress_comcat 0x74e20000) -set(baseaddress_compstui 0x74df0000) -set(baseaddress_credui 0x74db0000) -set(baseaddress_crtdll 0x74d60000) -set(baseaddress_cryptdlg 0x74d30000) -set(baseaddress_cryptdll 0x74d00000) -set(baseaddress_cryptnet 0x74cd0000) -set(baseaddress_csrsrv2 0x74ca0000) -set(baseaddress_d3d8 0x74c40000) -set(baseaddress_d3d8thk 0x74c20000) -set(baseaddress_d3d9 0x74bc0000) -set(baseaddress_d3dx9_24 0x74b90000) -set(baseaddress_d3dx9_25 0x74b60000) -set(baseaddress_d3dx9_26 0x74b30000) -set(baseaddress_d3dx9_27 0x74b00000) -set(baseaddress_d3dx9_28 0x74ad0000) -set(baseaddress_d3dx9_29 0x74aa0000) -set(baseaddress_d3dx9_30 0x74a70000) -set(baseaddress_d3dx9_31 0x74a40000) -set(baseaddress_d3dx9_32 0x74a10000) -set(baseaddress_d3dx9_33 0x749e0000) -set(baseaddress_d3dx9_34 0x749b0000) -set(baseaddress_d3dx9_35 0x74980000) -set(baseaddress_d3dx9_36 0x74920000) -set(baseaddress_d3dx9_37 0x748f0000) -set(baseaddress_d3dx9_38 0x748c0000) -set(baseaddress_d3dx9_39 0x74890000) -set(baseaddress_d3dx9_40 0x74860000) -set(baseaddress_d3dx9_41 0x74830000) -set(baseaddress_d3dx9_42 0x74800000) -set(baseaddress_dciman32 0x747d0000) -set(baseaddress_ddraw 0x74730000) -set(baseaddress_deskadp 0x74700000) -set(baseaddress_deskmon 0x746d0000) -set(baseaddress_devcpux 0x746a0000) -set(baseaddress_devenum 0x74660000) -set(baseaddress_dinput 0x74610000) -set(baseaddress_dinput8 0x745e0000) -set(baseaddress_dmusic 0x745a0000) -set(baseaddress_dplay 0x74580000) -set(baseaddress_dwmapi 0x74550000) -set(baseaddress_dxdiagn 0x74520000) -set(baseaddress_faultrep 0x744f0000) -set(baseaddress_fmifs 0x744d0000) -set(baseaddress_fontext 0x744a0000) -#fusion has to have dynamic address -#set(baseaddress_fusion 0x74470000) -set(baseaddress_getuname 0x74440000) -set(baseaddress_hhctrl 0x74400000) -set(baseaddress_hlink 0x743c0000) -set(baseaddress_hnetcfg 0x74380000) -set(baseaddress_httpapi 0x74350000) -set(baseaddress_iccvid 0x74320000) -set(baseaddress_imaadp32.acm 0x74300000) -set(baseaddress_imagehlp 0x742d0000) -set(baseaddress_inetcomm 0x74270000) -set(baseaddress_inetmib1 0x74240000) -set(baseaddress_initpki 0x74210000) -set(baseaddress_inseng 0x741e0000) -set(baseaddress_itircl 0x741b0000) -set(baseaddress_itss 0x74170000) -set(baseaddress_jscript 0x740c0000) -set(baseaddress_kbsdll 0x74090000) -set(baseaddress_ksproxy 0x74010000) -set(baseaddress_ksuser 0x73fe0000) -set(baseaddress_libjpeg 0x73f60000) -set(baseaddress_libpng 0x73ee0000) -set(baseaddress_libtiff 0x73e20000) -set(baseaddress_libxslt 0x73be0000) -set(baseaddress_loadperf 0x73bb0000) -set(baseaddress_localspl 0x73b70000) -set(baseaddress_localui 0x73b40000) -set(baseaddress_lpk 0x73b10000) -set(baseaddress_lsasrv 0x73ae0000) -set(baseaddress_main 0x73a30000) -set(baseaddress_mapi32 0x739f0000) -set(baseaddress_mciavi32 0x739b0000) -set(baseaddress_mcicda 0x73980000) -set(baseaddress_mciqtz32 0x73940000) -set(baseaddress_mciseq 0x73910000) -set(baseaddress_mciwave 0x738e0000) -set(baseaddress_mesa32 0x73570000) -set(baseaddress_midimap 0x73550000) -set(baseaddress_mlang 0x73520000) -set(baseaddress_mmdrv 0x73500000) -set(baseaddress_modemui 0x734a0000) -set(baseaddress_mprapi 0x73470000) -set(baseaddress_msacm32.drv 0x73440000) -set(baseaddress_msadp32.acm 0x73420000) -set(baseaddress_msafd 0x733f0000) -set(baseaddress_mscat32 0x733c0000) -set(baseaddress_mscms 0x73390000) -set(baseaddress_mscoree 0x73340000) -set(baseaddress_msctf 0x732f0000) -set(baseaddress_msdmo 0x732c0000) -set(baseaddress_msftedit 0x73290000) -set(baseaddress_msg711.acm 0x73270000) -set(baseaddress_msgina 0x73220000) -set(baseaddress_msgsm32.acm 0x73200000) -set(baseaddress_mshtml 0x730a0000) -set(baseaddress_msi 0x72f60000) -set(baseaddress_msimtf 0x72f30000) -set(baseaddress_msisip 0x72f00000) -set(baseaddress_msisys 0x72ed0000) -set(baseaddress_msports 0x72ea0000) -set(baseaddress_msrle32 0x72e70000) -set(baseaddress_mssign32 0x72e40000) -set(baseaddress_mssip32 0x72e10000) -set(baseaddress_mstask 0x72de0000) -set(baseaddress_msvcrt20 0x72d30000) -set(baseaddress_msvcrt40 0x72c80000) -set(baseaddress_msvidc32 0x72c50000) -set(baseaddress_msxml3 0x729f0000) -set(baseaddress_nddeapi 0x729d0000) -set(baseaddress_netcfgx 0x72950000) -set(baseaddress_netid 0x72900000) -set(baseaddress_netshell 0x72880000) -set(baseaddress_newdev 0x72820000) -set(baseaddress_notifyhook 0x727f0000) -set(baseaddress_ntdsapi 0x727c0000) -set(baseaddress_ntlanman 0x72790000) -set(baseaddress_ntmarta 0x72760000) -set(baseaddress_ntprint 0x72730000) -set(baseaddress_objsel 0x72700000) -set(baseaddress_odbc32 0x726c0000) -set(baseaddress_odbccp32 0x72690000) -set(baseaddress_oleacc 0x72660000) -set(baseaddress_olecli32 0x72630000) -set(baseaddress_olepro32 0x72610000) -set(baseaddress_olesvr32 0x725f0000) -set(baseaddress_olethk32 0x725c0000) -set(baseaddress_pdh 0x72590000) -set(baseaddress_pidgen 0x72560000) -set(baseaddress_printui 0x72540000) -set(baseaddress_pstorec 0x72510000) -set(baseaddress_qedit 0x724d0000) -set(baseaddress_qmgr 0x724a0000) -set(baseaddress_qmgrprxy 0x72440000) -set(baseaddress_quartz 0x722f0000) -set(baseaddress_query 0x722c0000) -set(baseaddress_rasadhlp 0x72290000) -set(baseaddress_rasdlg 0x72100000) -set(baseaddress_rasman 0x720c0000) -set(baseaddress_resutils 0x72090000) -set(baseaddress_riched32 0x72060000) -set(baseaddress_rsabase 0x72040000) -set(baseaddress_samsrv 0x72020000) -set(baseaddress_sccbase 0x71ff0000) -set(baseaddress_schannel 0x71fc0000) -set(baseaddress_security 0x71fa0000) -set(baseaddress_serialui 0x71f70000) -set(baseaddress_sfc 0x71f40000) -set(baseaddress_shdoclc 0x71f00000) -set(baseaddress_shdocvw 0x71e70000) -set(baseaddress_shfolder 0x71e50000) -set(baseaddress_shimgvw 0x71e10000) -set(baseaddress_slayer 0x71de0000) -set(baseaddress_slbcsp 0x71db0000) -set(baseaddress_sndblst 0x71d80000) -set(baseaddress_softpub 0x71d60000) -set(baseaddress_srclient 0x71d40000) -set(baseaddress_sti 0x71d00000) -set(baseaddress_sxs 0x71cd0000) -set(baseaddress_syssetup 0x71c20000) -set(baseaddress_t2embed 0x71bf0000) -set(baseaddress_tapi32 0x71bb0000) -set(baseaddress_traffic 0x71b80000) -set(baseaddress_twain_32 0x71b50000) -set(baseaddress_uext2 0x71b10000) -set(baseaddress_ufat 0x71af0000) -set(baseaddress_ufatx 0x71ad0000) -set(baseaddress_unicows 0x71aa0000) -set(baseaddress_untfs 0x71a80000) -set(baseaddress_updspapi 0x71a60000) -set(baseaddress_url 0x71a30000) -set(baseaddress_vdmdbg 0x71a00000) -set(baseaddress_wdmaud.drv 0x71840000) -set(baseaddress_win32csr 0x717a0000) -set(baseaddress_windowscodecs 0x71730000) -set(baseaddress_wined3d 0x71570000) -set(baseaddress_winemp3.acm 0x71500000) -set(baseaddress_winfax 0x714e0000) -set(baseaddress_wing32 0x714c0000) -set(baseaddress_winhttp 0x71480000) -set(baseaddress_winsta 0x71450000) -set(baseaddress_wlanapi 0x71420000) -set(baseaddress_wldap32 0x713e0000) -set(baseaddress_wmi 0x713c0000) -set(baseaddress_ws2_32_new 0x71370000) -set(baseaddress_wshirda 0x71340000) -set(baseaddress_wshtcpip 0x71320000) -set(baseaddress_wsock32 0x712f0000) -set(baseaddress_wtsapi32 0x712c0000) -set(baseaddress_wuapi 0x71290000) -set(baseaddress_xinput1_1 0x71260000) -set(baseaddress_xinput1_2 0x71230000) -set(baseaddress_xinput1_3 0x71200000) -set(baseaddress_xinput9_1_0 0x711d0000) -set(baseaddress_xmllite 0x711a0000) -set(baseaddress_appwiz 0x71140000) -set(baseaddress_console 0x71100000) -set(baseaddress_desk 0x71070000) -set(baseaddress_hdwwiz 0x70fe0000) -set(baseaddress_inetcpl 0x70fa0000) -set(baseaddress_input 0x70f50000) -set(baseaddress_intl 0x70ef0000) -set(baseaddress_joy 0x70eb0000) -set(baseaddress_mmsys 0x70dc0000) -set(baseaddress_ncpa 0x70d90000) -set(baseaddress_powercfg 0x70d30000) -set(baseaddress_sysdm 0x70c60000) -set(baseaddress_telephon 0x70c30000) -set(baseaddress_timedate 0x70be0000) -set(baseaddress_usrmgr 0x70b90000) -set(baseaddress_wined3dcfg 0x70b60000) -set(baseaddress_ftfd 0x70a60000) -set(baseaddress_hid 0x70a30000) -set(baseaddress_netevent 0x70a10000) -set(baseaddress_tapiui 0x709b0000) -set(baseaddress_iologmsg 0x669a0000) +set(baseaddress_ntdll 0x77f00000) +set(baseaddress_kernel32 0x77d70000) +set(baseaddress_msvcrt 0x77cc0000) +set(baseaddress_advapi32 0x77c10000) +set(baseaddress_gdi32 0x77ba0000) +set(baseaddress_user32 0x77a00000) +set(baseaddress_dhcpcsvc 0x779b0000) +set(baseaddress_dnsapi 0x77960000) +set(baseaddress_icmp 0x77930000) +set(baseaddress_iphlpapi 0x778f0000) +set(baseaddress_ws2_32 0x778b0000) +set(baseaddress_ws2help 0x77880000) +set(baseaddress_shlwapi 0x777e0000) +set(baseaddress_rpcrt4 0x77720000) +set(baseaddress_comctl32 0x775b0000) +set(baseaddress_ole32 0x773c0000) +set(baseaddress_winspool.drv 0x77380000) +set(baseaddress_winmm 0x772e0000) +set(baseaddress_comdlg32 0x771f0000) +set(baseaddress_shell32 0x76500000) +set(baseaddress_lz32 0x764e0000) +set(baseaddress_version 0x764b0000) +set(baseaddress_oleaut32 0x762d0000) +set(baseaddress_setupapi 0x76100000) +set(baseaddress_mpr 0x760c0000) +set(baseaddress_crypt32 0x75fc0000) +set(baseaddress_wininet 0x75f10000) +set(baseaddress_urlmon 0x75e10000) +set(baseaddress_psapi 0x75de0000) +set(baseaddress_imm32 0x75da0000) +set(baseaddress_msvfw32 0x75d60000) +set(baseaddress_dbghelp 0x75cc0000) +set(baseaddress_devmgr 0x75c40000) +set(baseaddress_msacm32 0x75c00000) +set(baseaddress_netapi32 0x75ba0000) +set(baseaddress_powrprof 0x75b70000) +set(baseaddress_secur32 0x75b40000) +set(baseaddress_wintrust 0x75ae0000) +set(baseaddress_avicap32 0x75ab0000) +set(baseaddress_cabinet 0x75a60000) +set(baseaddress_dsound 0x759f0000) +set(baseaddress_glu32 0x758e0000) +set(baseaddress_opengl32 0x758a0000) +set(baseaddress_riched20 0x75810000) +set(baseaddress_smdll 0x757f0000) +set(baseaddress_userenv 0x757a0000) +set(baseaddress_uxtheme 0x75740000) +set(baseaddress_cryptui 0x756a0000) +set(baseaddress_csrsrv 0x75670000) +set(baseaddress_basesrv 0x75640000) +set(baseaddress_consrv 0x75590000) +set(baseaddress_winsrv 0x75540000) +set(baseaddress_dplayx 0x754e0000) +set(baseaddress_gdiplus 0x75420000) +set(baseaddress_msimg32 0x753f0000) +set(baseaddress_mswsock 0x753c0000) +set(baseaddress_oledlg 0x75370000) +set(baseaddress_rasapi32 0x75340000) +set(baseaddress_rsaenh 0x752e0000) +set(baseaddress_samlib 0x752a0000) +set(baseaddress_sensapi 0x75270000) +set(baseaddress_sfc_os 0x75240000) +set(baseaddress_snmpapi 0x75210000) +set(baseaddress_spoolss 0x751d0000) +set(baseaddress_usp10 0x75160000) +set(baseaddress_acledit 0x75130000) +set(baseaddress_aclui 0x750f0000) +set(baseaddress_activeds 0x750c0000) +set(baseaddress_actxprxy 0x74eb0000) +set(baseaddress_advpack 0x74e70000) +set(baseaddress_amstream 0x74e30000) +set(baseaddress_atl100 0x74df0000) +set(baseaddress_atl 0x74dc0000) +set(baseaddress_authz 0x74d90000) +set(baseaddress_avifil32 0x74d20000) +set(baseaddress_batt 0x74cf0000) +set(baseaddress_bcrypt 0x74cc0000) +set(baseaddress_beepmidi 0x74c90000) +set(baseaddress_browseui 0x74bc0000) +set(baseaddress_cards 0x74b10000) +set(baseaddress_cfgmgr32 0x74ae0000) +set(baseaddress_clusapi 0x74ab0000) +set(baseaddress_comcat 0x74a80000) +set(baseaddress_compstui 0x74a50000) +set(baseaddress_console 0x749d0000) +set(baseaddress_credui 0x74990000) +set(baseaddress_crtdll 0x74930000) +set(baseaddress_cryptdlg 0x74900000) +set(baseaddress_cryptdll 0x748d0000) +set(baseaddress_cryptnet 0x748a0000) +set(baseaddress_d3d8 0x74840000) +set(baseaddress_d3d8thk 0x74820000) +set(baseaddress_d3d9 0x747c0000) +set(baseaddress_d3dx9_24 0x74790000) +set(baseaddress_d3dx9_25 0x74760000) +set(baseaddress_d3dx9_26 0x74730000) +set(baseaddress_d3dx9_27 0x74700000) +set(baseaddress_d3dx9_28 0x746d0000) +set(baseaddress_d3dx9_29 0x746a0000) +set(baseaddress_d3dx9_30 0x74670000) +set(baseaddress_d3dx9_31 0x74640000) +set(baseaddress_d3dx9_32 0x74610000) +set(baseaddress_d3dx9_33 0x745e0000) +set(baseaddress_d3dx9_34 0x745b0000) +set(baseaddress_d3dx9_35 0x74580000) +set(baseaddress_d3dx9_36 0x74520000) +set(baseaddress_d3dx9_37 0x744f0000) +set(baseaddress_d3dx9_38 0x744c0000) +set(baseaddress_d3dx9_39 0x74490000) +set(baseaddress_d3dx9_40 0x74460000) +set(baseaddress_d3dx9_41 0x74430000) +set(baseaddress_d3dx9_42 0x74400000) +set(baseaddress_dciman32 0x743d0000) +set(baseaddress_ddraw 0x74320000) +set(baseaddress_deskadp 0x742f0000) +set(baseaddress_deskmon 0x742c0000) +set(baseaddress_devcpux 0x74290000) +set(baseaddress_devenum 0x74250000) +set(baseaddress_dinput8 0x74220000) +set(baseaddress_dinput 0x741c0000) +set(baseaddress_dmusic 0x74170000) +set(baseaddress_dplay 0x74140000) +set(baseaddress_dwmapi 0x74110000) +set(baseaddress_dxdiagn 0x740e0000) +set(baseaddress_faultrep 0x740b0000) +set(baseaddress_fmifs 0x74090000) +set(baseaddress_fontext 0x74060000) +set(baseaddress_framebuf 0x74040000) +set(baseaddress_framebuf_new 0x74020000) +set(baseaddress_genincdata 0x73ff0000) +set(baseaddress_getuname 0x73fc0000) +set(baseaddress_hid 0x73f90000) +set(baseaddress_hlink 0x73f50000) +set(baseaddress_hnetcfg 0x73f10000) +set(baseaddress_httpapi 0x73ee0000) +set(baseaddress_iccvid 0x73eb0000) +set(baseaddress_ieframe 0x73e20000) +set(baseaddress_iernonce 0x73df0000) +set(baseaddress_imagehlp 0x73dc0000) +set(baseaddress_inetcomm 0x73d60000) +set(baseaddress_inetmib1 0x73d30000) +set(baseaddress_initpki 0x73d00000) +set(baseaddress_input 0x73ca0000) +set(baseaddress_inseng 0x73c70000) +set(baseaddress_iologmsg 0x73c50000) +set(baseaddress_itircl 0x73c20000) +set(baseaddress_itss 0x73be0000) +set(baseaddress_jscript 0x73b20000) +set(baseaddress_kbsdll 0x73af0000) +set(baseaddress_ksuser 0x73ac0000) +set(baseaddress_libjpeg 0x73a20000) +set(baseaddress_libpng 0x739a0000) +set(baseaddress_libtiff 0x738c0000) +set(baseaddress_libxslt 0x73640000) +set(baseaddress_loadperf 0x73610000) +set(baseaddress_localspl 0x735d0000) +set(baseaddress_localui 0x735a0000) +set(baseaddress_lpk 0x73570000) +set(baseaddress_lsasrv 0x73510000) +set(baseaddress_mapi32 0x734d0000) +set(baseaddress_mciavi32 0x73490000) +set(baseaddress_mcicda 0x73460000) +set(baseaddress_mciqtz32 0x73420000) +set(baseaddress_mciseq 0x733f0000) +set(baseaddress_mciwave 0x733c0000) +set(baseaddress_mesa32 0x72bc0000) +set(baseaddress_midimap 0x72b90000) +set(baseaddress_mlang 0x72b50000) +set(baseaddress_mmdrv 0x72b20000) +set(baseaddress_modemui 0x72ab0000) +set(baseaddress_mprapi 0x72a80000) +set(baseaddress_msafd 0x72a40000) +set(baseaddress_mscat32 0x72a10000) +set(baseaddress_mscms 0x729e0000) +set(baseaddress_mscoree 0x72990000) +set(baseaddress_msctf 0x72940000) +set(baseaddress_msdmo 0x72910000) +set(baseaddress_msftedit 0x728e0000) +set(baseaddress_msgina 0x72880000) +set(baseaddress_mshtml 0x726a0000) +set(baseaddress_msi 0x72550000) +set(baseaddress_msimtf 0x72520000) +set(baseaddress_msisip 0x724f0000) +set(baseaddress_msports 0x724c0000) +set(baseaddress_msrle32 0x72490000) +set(baseaddress_mssign32 0x72460000) +set(baseaddress_mssip32 0x72430000) +set(baseaddress_mstask 0x723f0000) +set(baseaddress_msv1_0 0x723c0000) +set(baseaddress_msvcrt20 0x722f0000) +set(baseaddress_msvcrt40 0x72220000) +set(baseaddress_msvidc32 0x721f0000) +set(baseaddress_msxml2 0x721c0000) +set(baseaddress_msxml3 0x71eb0000) +set(baseaddress_msxml4 0x71e70000) +set(baseaddress_msxml6 0x71e30000) +set(baseaddress_msxml 0x71e00000) +set(baseaddress_nddeapi 0x71dd0000) +set(baseaddress_netcfgx 0x71d50000) +set(baseaddress_netevent 0x71d30000) +set(baseaddress_netid 0x71ce0000) +set(baseaddress_netshell 0x71c60000) +set(baseaddress_newdev 0x71c00000) +set(baseaddress_notifyhook 0x71bd0000) +set(baseaddress_ntdsapi 0x71ba0000) +set(baseaddress_ntlanman 0x71b70000) +set(baseaddress_ntmarta 0x71b40000) +set(baseaddress_ntprint 0x71b10000) +set(baseaddress_objsel 0x71ae0000) +set(baseaddress_odbc32 0x71aa0000) +set(baseaddress_odbccp32 0x71a70000) +set(baseaddress_oleacc 0x71a40000) +set(baseaddress_olecli32 0x71a10000) +set(baseaddress_olepro32 0x719e0000) +set(baseaddress_olesvr32 0x719b0000) +set(baseaddress_olethk32 0x71980000) +set(baseaddress_pdh 0x71940000) +set(baseaddress_pidgen 0x71910000) +set(baseaddress_printui 0x718e0000) +set(baseaddress_propsys 0x718a0000) +set(baseaddress_pstorec 0x71870000) +set(baseaddress_qedit 0x71830000) +set(baseaddress_qmgr 0x71800000) +set(baseaddress_qmgrprxy 0x717a0000) +set(baseaddress_quartz 0x71640000) +set(baseaddress_query 0x71610000) +set(baseaddress_rasadhlp 0x715e0000) +set(baseaddress_rasdlg 0x71450000) +set(baseaddress_rasman 0x71410000) +set(baseaddress_resutils 0x713e0000) +set(baseaddress_riched32 0x713b0000) +set(baseaddress_rsabase 0x71390000) +set(baseaddress_samsrv 0x71330000) +set(baseaddress_sccbase 0x71300000) +set(baseaddress_schannel 0x712d0000) +set(baseaddress_security 0x712b0000) +set(baseaddress_serialui 0x71280000) +set(baseaddress_sfc 0x71250000) +set(baseaddress_shdoclc 0x71210000) +set(baseaddress_shdocvw 0x711c0000) +set(baseaddress_shfolder 0x711a0000) +set(baseaddress_shimgvw 0x71160000) +set(baseaddress_slayer 0x71130000) +set(baseaddress_slbcsp 0x71100000) +set(baseaddress_sndblst 0x710d0000) +set(baseaddress_softpub 0x710b0000) +set(baseaddress_srclient 0x71080000) +set(baseaddress_sti 0x71040000) +set(baseaddress_sxs 0x71010000) +set(baseaddress_syssetup 0x70f60000) +set(baseaddress_t2embed 0x70f30000) +set(baseaddress_tapi32 0x70ef0000) +set(baseaddress_tapiui 0x70e90000) +set(baseaddress_traffic 0x70e60000) +set(baseaddress_twain_32 0x70e30000) +set(baseaddress_uext2 0x70df0000) +set(baseaddress_ufat 0x70dd0000) +set(baseaddress_ufatx 0x70db0000) +set(baseaddress_unicows 0x70d80000) +set(baseaddress_untfs 0x70d60000) +set(baseaddress_updspapi 0x70d30000) +set(baseaddress_url 0x70d00000) +set(baseaddress_vbscript 0x70c80000) +set(baseaddress_vdmdbg 0x70c50000) +set(baseaddress_windowscodecs 0x70b20000) +set(baseaddress_wined3d 0x70960000) +set(baseaddress_winfax 0x70930000) +set(baseaddress_wing32 0x70900000) +set(baseaddress_winhttp 0x708a0000) +set(baseaddress_winsta 0x70870000) +set(baseaddress_wlanapi 0x70840000) +set(baseaddress_wldap32 0x70800000) +set(baseaddress_wmi 0x707e0000) +set(baseaddress_ws2_32_new 0x70790000) +set(baseaddress_wshirda 0x70760000) +set(baseaddress_wshtcpip 0x70730000) +set(baseaddress_wsock32 0x70700000) +set(baseaddress_wtsapi32 0x706d0000) +set(baseaddress_wuapi 0x70690000) +set(baseaddress_xinput1_1 0x70660000) +set(baseaddress_xinput1_2 0x70630000) +set(baseaddress_xinput1_3 0x70600000) +set(baseaddress_xinput9_1_0 0x705d0000) +set(baseaddress_xmllite 0x70590000) +set(baseaddress_access 0x70510000) +set(baseaddress_appwiz 0x704b0000) +set(baseaddress_cmicpl 0x70470000) +set(baseaddress_desk 0x703d0000) +set(baseaddress_hdwwiz 0x70340000) +set(baseaddress_hhctrl 0x702f0000) +set(baseaddress_imaadp32.acm 0x702c0000) +set(baseaddress_inetcpl 0x70280000) +set(baseaddress_intl 0x70220000) +set(baseaddress_joy 0x701e0000) +set(baseaddress_main 0x70130000) +set(baseaddress_mmsys 0x70030000) +set(baseaddress_msacm32.drv 0x70000000) +set(baseaddress_msadp32.acm 0x6ffd0000) +set(baseaddress_msg711.acm 0x6ffa0000) +set(baseaddress_msgsm32.acm 0x6ff70000) +set(baseaddress_msisys 0x6ff40000) +set(baseaddress_ncpa 0x6ff10000) +set(baseaddress_odbccp32i 0x6fee0000) +set(baseaddress_powercfg 0x6fe80000) +set(baseaddress_sysdm 0x6fdb0000) +set(baseaddress_telephon 0x6fd80000) +set(baseaddress_timedate 0x6fd20000) +set(baseaddress_usrmgr 0x6fcc0000) +set(baseaddress_wdmaud.drv 0x6fb00000) +set(baseaddress_wined3dcfg 0x6fad0000) +set(baseaddress_winemp3.acm 0x6fa50000)

1 0

[ekohl] 59195: [NETAPI32] Add level 3 support to NetLocalGroupAddMembers and NetLocalGroupDelMembers.
by ekohl＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: ekohl Date: Sun Jun 9 09:40:24 2013 New Revision: 59195 URL: http://svn.reactos.org/svn/reactos?rev=59195&view=rev Log: [NETAPI32] Add level 3 support to NetLocalGroupAddMembers and NetLocalGroupDelMembers. Modified: trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/misc.c trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -213,6 +213,115 @@ if (Use != NULL) SamFreeMemory(Use); + + return ApiStatus; +} + + +static +NET_API_STATUS +BuildSidListFromDomainAndName(IN PUNICODE_STRING ServerName, + IN PLOCALGROUP_MEMBERS_INFO_3 buf, + IN ULONG EntryCount, + OUT PLOCALGROUP_MEMBERS_INFO_0 *MemberList) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE LsaHandle = NULL; + PUNICODE_STRING NamesArray = NULL; + ULONG i; + PLSA_REFERENCED_DOMAIN_LIST Domains = NULL; + PLSA_TRANSLATED_SID Sids = NULL; + PLOCALGROUP_MEMBERS_INFO_0 MemberBuffer = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + ApiStatus = NetApiBufferAllocate(sizeof(UNICODE_STRING) * EntryCount, + (LPVOID*)&NamesArray); + if (ApiStatus != NERR_Success) + { + goto done; + } + + for (i = 0; i < EntryCount; i++) + { + RtlInitUnicodeString(&NamesArray[i], + buf[i].lgrmi3_domainandname); + } + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + 0, + NULL); + + Status = LsaOpenPolicy(ServerName, + (PLSA_OBJECT_ATTRIBUTES)&ObjectAttributes, + POLICY_EXECUTE, + &LsaHandle); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = LsaLookupNames(LsaHandle, + EntryCount, + NamesArray, + &Domains, + &Sids); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + ApiStatus = NetApiBufferAllocate(sizeof(LOCALGROUP_MEMBERS_INFO_0) * EntryCount, + (LPVOID*)&MemberBuffer); + if (ApiStatus != NERR_Success) + { + goto done; + } + + for (i = 0; i < EntryCount; i++) + { + ApiStatus = BuildSidFromSidAndRid(Domains->Domains[Sids[i].DomainIndex].Sid, + Sids[i].RelativeId, + &MemberBuffer[i].lgrmi0_sid); + if (ApiStatus != NERR_Success) + { + goto done; + } + } + +done: + if (ApiStatus != NERR_Success) + { + if (MemberBuffer != NULL) + { + for (i = 0; i < EntryCount; i++) + { + if (MemberBuffer[i].lgrmi0_sid != NULL) + NetApiBufferFree(MemberBuffer[i].lgrmi0_sid); + } + + NetApiBufferFree(MemberBuffer); + MemberBuffer = NULL; + } + } + + if (Sids != NULL) + LsaFreeMemory(Sids); + + if (Domains != NULL) + LsaFreeMemory(Domains); + + if (LsaHandle != NULL) + LsaClose(LsaHandle); + + if (NamesArray != NULL) + NetApiBufferFree(NamesArray); + + *MemberList = MemberBuffer; return ApiStatus; } @@ -433,6 +542,18 @@ break; case 3: + Status = BuildSidListFromDomainAndName((servername != NULL) ? &ServerName : NULL, + (PLOCALGROUP_MEMBERS_INFO_3)buf, + totalentries, + &MemberList); + if (!NT_SUCCESS(Status)) + { + ERR("BuildSidListFromDomainAndName failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + default: ApiStatus = ERROR_INVALID_LEVEL; goto done; @@ -517,6 +638,17 @@ } done: + if (level == 3 && MemberList != NULL) + { + for (i = 0; i < totalentries; i++) + { + if (MemberList[i].lgrmi0_sid != NULL) + NetApiBufferFree(MemberList[i].lgrmi0_sid); + } + + NetApiBufferFree(MemberList); + } + if (AliasHandle != NULL) SamCloseHandle(AliasHandle); @@ -707,6 +839,18 @@ break; case 3: + Status = BuildSidListFromDomainAndName((servername != NULL) ? &ServerName : NULL, + (PLOCALGROUP_MEMBERS_INFO_3)buf, + totalentries, + &MemberList); + if (!NT_SUCCESS(Status)) + { + ERR("BuildSidListFromDomainAndName failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + default: ApiStatus = ERROR_INVALID_LEVEL; goto done; @@ -791,6 +935,17 @@ } done: + if (level == 3 && MemberList != NULL) + { + for (i = 0; i < totalentries; i++) + { + if (MemberList[i].lgrmi0_sid != NULL) + NetApiBufferFree(MemberList[i].lgrmi0_sid); + } + + NetApiBufferFree(MemberList); + } + if (AliasHandle != NULL) SamCloseHandle(AliasHandle); Modified: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -175,4 +175,47 @@ return Status; } + +NET_API_STATUS +BuildSidFromSidAndRid(IN PSID SrcSid, + IN ULONG RelativeId, + OUT PSID *DestSid) +{ + UCHAR RidCount; + PSID DstSid; + ULONG i; + ULONG DstSidSize; + PULONG p, q; + NET_API_STATUS ApiStatus = NERR_Success; + + RidCount = *RtlSubAuthorityCountSid(SrcSid); + if (RidCount >= 8) + return ERROR_INVALID_PARAMETER; + + DstSidSize = RtlLengthRequiredSid(RidCount + 1); + + ApiStatus = NetApiBufferAllocate(DstSidSize, + &DstSid); + if (ApiStatus != NERR_Success) + return ApiStatus; + + RtlInitializeSid(DstSid, + RtlIdentifierAuthoritySid(SrcSid), + RidCount + 1); + + for (i = 0; i < (ULONG)RidCount; i++) + { + p = RtlSubAuthoritySid(SrcSid, i); + q = RtlSubAuthoritySid(DstSid, i); + *q = *p; + } + + q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount); + *q = RelativeId; + + *DestSid = DstSid; + + return NERR_Success; +} + /* EOF */ Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -52,4 +52,9 @@ IN ULONG DesiredAccess, OUT SAM_HANDLE *DomainHandle); +NET_API_STATUS +BuildSidFromSidAndRid(IN PSID SrcSid, + IN ULONG RelativeId, + OUT PSID *DestSid); + #endif Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -47,46 +47,6 @@ BOOLEAN BuiltinDone; } ENUM_CONTEXT, *PENUM_CONTEXT; - - -static PSID -CreateSidFromSidAndRid(PSID SrcSid, - ULONG RelativeId) -{ - UCHAR RidCount; - PSID DstSid; - ULONG i; - ULONG DstSidSize; - PULONG p, q; - - RidCount = *RtlSubAuthorityCountSid(SrcSid); - if (RidCount >= 8) - return NULL; - - DstSidSize = RtlLengthRequiredSid(RidCount + 1); - - DstSid = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - DstSidSize); - if (DstSid == NULL) - return NULL; - - RtlInitializeSid(DstSid, - RtlIdentifierAuthoritySid(SrcSid), - RidCount + 1); - - for (i = 0; i < (ULONG)RidCount; i++) - { - p = RtlSubAuthoritySid(SrcSid, i); - q = RtlSubAuthoritySid(DstSid, i); - *q = *p; - } - - q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount); - *q = RelativeId; - - return DstSid; -} static @@ -1728,12 +1688,12 @@ } /* Build the User SID from the Account Domain SID and the users RID */ - UserSid = CreateSidFromSidAndRid(AccountDomainSid, - RelativeIds[0]); - if (UserSid == NULL) - { - ERR("CreateSidFromSidAndRid failed!\n"); - ApiStatus = ERROR_NOT_ENOUGH_MEMORY; + ApiStatus = BuildSidFromSidAndRid(AccountDomainSid, + RelativeIds[0], + &UserSid); + if (ApiStatus != NERR_Success) + { + ERR("BuildSidFromSidAndRid failed!\n"); goto done; } @@ -1881,7 +1841,7 @@ SamFreeMemory(Use); if (UserSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, UserSid); + NetApiBufferFree(UserSid); if (AccountDomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid);

1 0

[tkreuzer] 59194: [NDK] - Add NUMBER_POOL_LOOKASIDE_LISTS constant - Add PAT MSR constants for amd64 - Add missing extern "C" [NTOSKRNL] - Fix pool lookaside list usage for 64 bit
by tkreuzer＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: tkreuzer Date: Sun Jun 9 08:54:33 2013 New Revision: 59194 URL: http://svn.reactos.org/svn/reactos?rev=59194&view=rev Log: [NDK] - Add NUMBER_POOL_LOOKASIDE_LISTS constant - Add PAT MSR constants for amd64 - Add missing extern "C" [NTOSKRNL] - Fix pool lookaside list usage for 64 bit Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/amd64/mmtypes.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -125,6 +125,16 @@ #define MSR_GS_SWAP 0xC0000102 // +// Caching values for the PAT MSR +// +#define PAT_UC 0ULL +#define PAT_WC 1ULL +#define PAT_WT 4ULL +#define PAT_WP 5ULL +#define PAT_WB 6ULL +#define PAT_UCM 7ULL + +// // Flags in MSR_EFER // #define MSR_LMA 0x0400 @@ -187,6 +197,11 @@ #define SYNCH_LEVEL 12 #define NMI_STACK_SIZE 0x2000 + +// +// Number of pool lookaside lists per pool in the PRCB +// +#define NUMBER_POOL_LOOKASIDE_LISTS 32 // // Trap Frame Definition @@ -527,8 +542,8 @@ #endif KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; // 2003: 33, vista:49 PP_LOOKASIDE_LIST PPLookasideList[16]; - GENERAL_LOOKASIDE_POOL PPNPagedLookasideList[32]; - GENERAL_LOOKASIDE_POOL PPPagedLookasideList[32]; + GENERAL_LOOKASIDE_POOL PPNPagedLookasideList[NUMBER_POOL_LOOKASIDE_LISTS]; + GENERAL_LOOKASIDE_POOL PPPagedLookasideList[NUMBER_POOL_LOOKASIDE_LISTS]; UINT64 PacketBarrier; SINGLE_LIST_ENTRY DeferredReadyListHead; LONG MmPageFaultCount; Modified: trunk/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -19,6 +19,10 @@ #ifndef _AMD64_MMTYPES_H #define _AMD64_MMTYPES_H + +#ifdef __cplusplus +extern "C" { +#endif // // Dependencies @@ -198,5 +202,8 @@ #endif } MMPTE_HARDWARE_LARGEPAGE, *PMMPTE_HARDWARE_LARGEPAGE; +#ifdef __cplusplus +}; // extern "C" +#endif #endif // !AMD64_MMTYPES_H Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -18,6 +18,10 @@ #ifndef _ARM_KETYPES_H #define _ARM_KETYPES_H + +#ifdef __cplusplus +extern "C" { +#endif // // Dependencies @@ -105,7 +109,7 @@ // ULONG R0; // ULONG R1; // ULONG R2; -// ULONG R3; +// ULONG R3; ULONG R4; ULONG R5; ULONG R6; @@ -134,7 +138,7 @@ typedef union _ARM_STATUS_REGISTER { - + struct { ULONG Mode:5; @@ -239,7 +243,7 @@ ULONG DMultipler:1; ULONG DAssociativty:3; ULONG DSize:4; - ULONG DReserved:2; + ULONG DReserved:2; ULONG Separate:1; ULONG CType:4; ULONG Reserved:3; @@ -478,7 +482,7 @@ ULONG VdmAlert; ULONG KernelReserved[14]; ULONG SecondLevelCacheSize; - ULONG HalReserved[16]; + ULONG HalReserved[16]; // arm part UCHAR IrqlMask[32]; ULONG IrqlTable[32]; @@ -525,5 +529,10 @@ #define KeGetPreviousMode() _KeGetPreviousMode() #define KeGetDcacheFillSize() PCR->DcacheFillSize +#endif // !NTOS_MODE_USER + +#ifdef __cplusplus +}; // extern "C" #endif -#endif + +#endif // !_ARM_KETYPES_H Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -18,6 +18,10 @@ #ifndef _ARM_MMTYPES_H #define _ARM_MMTYPES_H + +#ifdef __cplusplus +extern "C" { +#endif // // Dependencies @@ -178,7 +182,7 @@ typedef struct _MMPDE { - union + union { MMPDE_HARDWARE Hard; ULONG Long; @@ -191,4 +195,8 @@ #define HARDWARE_PTE HARDWARE_PTE_ARMV6 #define PHARDWARE_PTE PHARDWARE_PTE_ARMV6 -#endif +#ifdef __cplusplus +}; // extern "C" +#endif + +#endif Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -33,6 +33,10 @@ #include <lpctypes.h> #ifdef NTOS_MODE_USER #include <obtypes.h> +#endif + +#ifdef __cplusplus +extern "C" { #endif // @@ -1462,5 +1466,10 @@ SIZE_T ModifiedPageCountPageFile; } SYSTEM_MEMORY_LIST_INFORMATION, *PSYSTEM_MEMORY_LIST_INFORMATION; +#endif // !NTOS_MODE_USER + +#ifdef __cplusplus +}; // extern "C" #endif -#endif + +#endif // !_EXTYPES_H Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -185,6 +185,11 @@ #define SYNCH_LEVEL (IPI_LEVEL - 2) #endif #endif + +// +// Number of pool lookaside lists per pool in the PRCB +// +#define NUMBER_POOL_LOOKASIDE_LISTS 32 // // Trap Frame Definition @@ -558,8 +563,8 @@ ULONG SpareCounter1[8]; #endif PP_LOOKASIDE_LIST PPLookasideList[16]; - PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; - PP_LOOKASIDE_LIST PPPagedLookasideList[32]; + PP_LOOKASIDE_LIST PPNPagedLookasideList[NUMBER_POOL_LOOKASIDE_LISTS]; + PP_LOOKASIDE_LIST PPPagedLookasideList[NUMBER_POOL_LOOKASIDE_LISTS]; volatile ULONG PacketBarrier; volatile ULONG ReverseStall; PVOID IpiFrame; Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -18,6 +18,10 @@ #ifndef _I386_MMTYPES_H #define _I386_MMTYPES_H + +#ifdef __cplusplus +extern "C" { +#endif // // Dependencies @@ -171,4 +175,8 @@ #define HARDWARE_PTE HARDWARE_PTE_X86 #define PHARDWARE_PTE PHARDWARE_PTE_X86 +#ifdef __cplusplus +}; // extern "C" #endif + +#endif Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -30,6 +30,10 @@ #ifndef NTOS_MODE_USER #include <extypes.h> #include <setypes.h> +#endif + +#ifdef __cplusplus +extern "C" { #endif #ifndef NTOS_MODE_USER @@ -1422,4 +1426,8 @@ #endif // !NTOS_MODE_USER +#ifdef __cplusplus +}; // extern "C" +#endif + #endif // _PSTYPES_H Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -25,6 +25,10 @@ #include <umtypes.h> #include <mmtypes.h> #include <ldrtypes.h> + +#ifdef __cplusplus +extern "C" { +#endif // // Maximum Atom Length @@ -1521,4 +1525,9 @@ } MESSAGE_RESOURCE_DATA, *PMESSAGE_RESOURCE_DATA; #endif /* !NTOS_MODE_USER */ + +#ifdef __cplusplus +} +#endif + #endif /* !_RTLTYPES_H */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun Jun 9 08:54:33 2013 @@ -1675,7 +1675,7 @@ // // Handle lookaside list optimization for both paged and nonpaged pool // - if (i <= MAXIMUM_PROCESSORS) + if (i <= NUMBER_POOL_LOOKASIDE_LISTS) { // // Try popping it from the per-CPU lookaside list @@ -2258,7 +2258,7 @@ // // Is this allocation small enough to have come from a lookaside list? // - if (BlockSize <= MAXIMUM_PROCESSORS) + if (BlockSize <= NUMBER_POOL_LOOKASIDE_LISTS) { // // Try pushing it into the per-CPU lookaside list

1 0

[hbelusca] 59193: [KERNEL32] - Fix IN/OUT declaration of parameters for GetFullPathNameA/W - Fix a bad usage of GetFullPathNameW in the GetTempPathW API, where the source and destination buffer for...
by hbelusca＠svn.reactos.org 08 Jun '13

08 Jun '13

Author: hbelusca Date: Sat Jun 8 14:48:33 2013 New Revision: 59193 URL: http://svn.reactos.org/svn/reactos?rev=59193&view=rev Log: [KERNEL32] - Fix IN/OUT declaration of parameters for GetFullPathNameA/W - Fix a bad usage of GetFullPathNameW in the GetTempPathW API, where the source and destination buffer for GetFullPathNameW was the same (Yet another Wineism :(( ). On Windows, using the same buffer fills it with a garbled string. Avoid this behaviour on ReactOS too, because internally GetFullPathNameW calls RtlGetFullPathName_U, the latter zeroing-out the destination buffer before usage. [RTL:PATH] See comments of revision r59183 (and in particular, fix some ntdll:RtlDos* path functions). Modified: trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sat Jun 8 14:48:33 2013 @@ -986,8 +986,8 @@ WINAPI GetFullPathNameA(IN LPCSTR lpFileName, IN DWORD nBufferLength, - IN LPSTR lpBuffer, - IN LPSTR *lpFilePart) + OUT LPSTR lpBuffer, + OUT LPSTR *lpFilePart) { NTSTATUS Status; PWCHAR Buffer; @@ -1099,11 +1099,11 @@ WINAPI GetFullPathNameW(IN LPCWSTR lpFileName, IN DWORD nBufferLength, - IN LPWSTR lpBuffer, + OUT LPWSTR lpBuffer, OUT LPWSTR *lpFilePart) { /* Call Rtl to do the work */ - return RtlGetFullPathName_U((LPWSTR)lpFileName, + return RtlGetFullPathName_U(lpFileName, nBufferLength * sizeof(WCHAR), lpBuffer, lpFilePart) / sizeof(WCHAR); @@ -2079,6 +2079,7 @@ static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 }; static const WCHAR userprofile[] = { 'U','S','E','R','P','R','O','F','I','L','E',0 }; WCHAR tmp_path[MAX_PATH]; + WCHAR full_tmp_path[MAX_PATH]; UINT ret; DPRINT("%u,%p\n", count, path); @@ -2087,42 +2088,44 @@ !(ret = GetEnvironmentVariableW( temp, tmp_path, MAX_PATH )) && !(ret = GetEnvironmentVariableW( userprofile, tmp_path, MAX_PATH )) && !(ret = GetWindowsDirectoryW( tmp_path, MAX_PATH ))) + { return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_path, NULL); - if (!ret) return 0; - - if (ret > MAX_PATH - 2) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - if (tmp_path[ret-1] != '\\') - { - tmp_path[ret++] = '\\'; - tmp_path[ret] = '\0'; - } - - ret++; /* add space for terminating 0 */ - - if (count) - { - lstrcpynW(path, tmp_path, count); - if (count >= ret) - ret--; /* return length without 0 */ - else if (count < 4) - path[0] = 0; /* avoid returning ambiguous "X:" */ - } - - DPRINT("GetTempPathW returning %u, %S\n", ret, path); - return ret; + } + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + ret = GetFullPathNameW(tmp_path, MAX_PATH, full_tmp_path, NULL); + if (!ret) return 0; + + if (ret > MAX_PATH - 2) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + if (full_tmp_path[ret-1] != '\\') + { + full_tmp_path[ret++] = '\\'; + full_tmp_path[ret] = '\0'; + } + + ret++; /* add space for terminating 0 */ + + if (count) + { + lstrcpynW(path, full_tmp_path, count); + if (count >= ret) + ret--; /* return length without 0 */ + else if (count < 4) + path[0] = 0; /* avoid returning ambiguous "X:" */ + } + + DPRINT("GetTempPathW returning %u, %S\n", ret, path); + return ret; } /* Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59193&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sat Jun 8 14:48:33 2013 @@ -160,7 +160,7 @@ { /* Check if the character is a path or drive separator */ c = *End; - if ((c == '\\') || (c == '/') || ((c == ':') && (End == PathCopy.Buffer + 1))) + if (IS_PATH_SEPARATOR(c) || ((c == ':') && (End == PathCopy.Buffer + 1))) { /* Get the next lower case character */ End++; @@ -422,30 +422,33 @@ if (PartName) { /* Loop from the back until we find a path separator */ - p = &NewBuffer[(DosLength - 1) / sizeof (WCHAR)]; - while (p > NewBuffer) if (*p-- == '\\') break; - - /* Was one found? */ - if (p > NewBuffer) - { - /* Move past it -- anything left? */ - p++; - if (!*p) + p = &NewBuffer[DosLength / sizeof(WCHAR)]; + while (--p > NewBuffer) + { + /* We found a path separator, move past it */ + if (*p == OBJ_NAME_PATH_SEPARATOR) { - /* The path ends with a path separator, no part name */ - *PartName = NULL; + ++p; + break; } - else - { - /* What follows the path separator is the part name */ - *PartName = p; - } + } + + /* Check whether a separator was found and if something remains */ + if ((p > NewBuffer) && *p) + { + /* What follows the path separator is the partial name */ + *PartName = p; + } + else + { + /* The path ends with a path separator, no partial name */ + *PartName = NULL; } } /* Build the final NT path string */ + NtPath->Buffer = NewBuffer; NtPath->Length = (USHORT)DosLength; - NtPath->Buffer = NewBuffer; NtPath->MaximumLength = (USHORT)DosLength + sizeof(UNICODE_NULL); return STATUS_SUCCESS; } @@ -574,7 +577,6 @@ /* Nothing else is expected */ default: ASSERT(FALSE); - } /* Now copy the prefix and the buffer */ @@ -592,7 +594,7 @@ NtName->Length = (USHORT)Length; NtName->MaximumLength = (USHORT)MaxLength; NewBuffer[LengthChars] = UNICODE_NULL; - DPRINT("new buffer: %S\n", NewBuffer); + DPRINT("New buffer: %S\n", NewBuffer); DPRINT("NT Name: %wZ\n", NtName); /* Check if a partial name was requested */ @@ -651,7 +653,7 @@ RelativeName->RelativeName.Buffer = (PWSTR)((ULONG_PTR)NewBuffer + PrefixLength + FullPath.Length - PrefixCut * sizeof(WCHAR)); RelativeName->RelativeName.Length = (USHORT)(PathLength - FullPath.Length); /* If relative name starts with \, skip it */ - if (RelativeName->RelativeName.Buffer[0] == L'\\') + if (RelativeName->RelativeName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) { RelativeName->RelativeName.Buffer++; RelativeName->RelativeName.Length -= sizeof(WCHAR); @@ -1121,7 +1123,7 @@ FullPath.Length = (USHORT)FullPathLength; /* If full path isn't \ terminated, do it */ - if (FullPath.Buffer[CharLength - 1] != L'\\') + if (FullPath.Buffer[CharLength - 1] != OBJ_NAME_PATH_SEPARATOR) { if ((CharLength + 1) * sizeof(WCHAR) > SavedLength) { @@ -1129,7 +1131,7 @@ goto Leave; } - FullPath.Buffer[CharLength] = L'\\'; + FullPath.Buffer[CharLength] = OBJ_NAME_PATH_SEPARATOR; FullPath.Buffer[CharLength + 1] = UNICODE_NULL; FullPath.Length += sizeof(WCHAR); } @@ -1500,6 +1502,9 @@ if (!name || !*name) return 0; + /* Zero out the destination buffer (implies that "name" should be different from "buffer" to get this function well-behaving) */ + RtlZeroMemory(buffer, size); + if (file_part) *file_part = NULL; /* check for DOS device name */ @@ -1733,9 +1738,9 @@ } /* Add a terminating slash if needed */ - if ((BufferStart != NewBuffer) && (BufferStart[-1] != '\\')) - { - *BufferStart++ = '\\'; + if ((BufferStart != NewBuffer) && (BufferStart[-1] != OBJ_NAME_PATH_SEPARATOR)) + { + *BufferStart++ = OBJ_NAME_PATH_SEPARATOR; } /* Bail out if we reached the end */ @@ -2051,6 +2056,7 @@ /* Initialize optional arguments */ if (FullNameOut) *FullNameOut = NULL; if (FilePartSize) *FilePartSize = 0; + if (LengthNeeded) *LengthNeeded = 0; if (DynamicString) { DynamicString->Length = DynamicString->MaximumLength = 0; @@ -2322,7 +2328,7 @@ &StaticCandidateString, Status); } - DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + DPRINT("Status: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); goto Quickie; } else

1 0

[ekohl] 59192: [NETAPI32] Implement NetLocalGroupDelMember and NetLocalGroupDelMembers (level 0 only).
by ekohl＠svn.reactos.org 08 Jun '13

08 Jun '13

Author: ekohl Date: Sat Jun 8 14:41:56 2013 New Revision: 59192 URL: http://svn.reactos.org/svn/reactos?rev=59192&view=rev Log: [NETAPI32] Implement NetLocalGroupDelMember and NetLocalGroupDelMembers (level 0 only). Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sat Jun 8 14:41:56 2013 @@ -648,29 +648,159 @@ /************************************************************ * NetLocalGroupDelMember (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupDelMember( +NET_API_STATUS +WINAPI +NetLocalGroupDelMember( LPCWSTR servername, LPCWSTR groupname, PSID membersid) { - FIXME("(%s %s %p) stub!\n", debugstr_w(servername), + LOCALGROUP_MEMBERS_INFO_0 Member; + + TRACE("(%s %s %p)\n", debugstr_w(servername), debugstr_w(groupname), membersid); - return NERR_Success; + + Member.lgrmi0_sid = membersid; + + return NetLocalGroupDelMembers(servername, + groupname, + 0, + (LPBYTE)&Member, + 1); } + /************************************************************ * NetLocalGroupDelMembers (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupDelMembers( +NET_API_STATUS +WINAPI +NetLocalGroupDelMembers( LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE buf, DWORD totalentries) { - FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername), + UNICODE_STRING ServerName; + UNICODE_STRING AliasName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE AliasHandle = NULL; + PLOCALGROUP_MEMBERS_INFO_0 MemberList = NULL; + ULONG i; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %s %d %p %d)\n", debugstr_w(servername), debugstr_w(groupname), level, buf, totalentries); - return NERR_Success; + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&AliasName, groupname); + + switch (level) + { + case 0: + MemberList = (PLOCALGROUP_MEMBERS_INFO_0)buf; + break; + + case 3: + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the builtin domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_REMOVE_MEMBER, + &AliasHandle); + if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; + } + + if (AliasHandle == NULL) + { + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the account domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_REMOVE_MEMBER, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + } + + /* Remove members from the alias */ + for (i = 0; i < totalentries; i++) + { + Status = SamRemoveMemberFromAlias(AliasHandle, + MemberList[i].lgrmi0_sid); + if (!NT_SUCCESS(Status)) + { + ERR("SamAddMemberToAlias failed (Status %lu)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + +done: + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; }

1 0

[ekohl] 59191: [NETAPI32] Implement NetLocalGroupAddMember and NetLocalGroupAddMember (level 0 only).
by ekohl＠svn.reactos.org 08 Jun '13

08 Jun '13

Author: ekohl Date: Sat Jun 8 13:47:34 2013 New Revision: 59191 URL: http://svn.reactos.org/svn/reactos?rev=59191&view=rev Log: [NETAPI32] Implement NetLocalGroupAddMember and NetLocalGroupAddMember (level 0 only). Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sat Jun 8 13:47:34 2013 @@ -374,29 +374,159 @@ /************************************************************ * NetLocalGroupAddMember (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupAddMember( +NET_API_STATUS +WINAPI +NetLocalGroupAddMember( LPCWSTR servername, LPCWSTR groupname, PSID membersid) { - FIXME("(%s %s %p) stub!\n", debugstr_w(servername), + LOCALGROUP_MEMBERS_INFO_0 Member; + + TRACE("(%s %s %p)\n", debugstr_w(servername), debugstr_w(groupname), membersid); - return NERR_Success; + + Member.lgrmi0_sid = membersid; + + return NetLocalGroupAddMembers(servername, + groupname, + 0, + (LPBYTE)&Member, + 1); } + /************************************************************ * NetLocalGroupAddMembers (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupAddMembers( +NET_API_STATUS +WINAPI +NetLocalGroupAddMembers( LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE buf, DWORD totalentries) { - FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername), + UNICODE_STRING ServerName; + UNICODE_STRING AliasName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE AliasHandle = NULL; + PLOCALGROUP_MEMBERS_INFO_0 MemberList = NULL; + ULONG i; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %s %d %p %d)\n", debugstr_w(servername), debugstr_w(groupname), level, buf, totalentries); - return NERR_Success; + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&AliasName, groupname); + + switch (level) + { + case 0: + MemberList = (PLOCALGROUP_MEMBERS_INFO_0)buf; + break; + + case 3: + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the builtin domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_ADD_MEMBER, + &AliasHandle); + if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; + } + + if (AliasHandle == NULL) + { + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the account domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_ADD_MEMBER, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + } + + /* Add new members to the alias */ + for (i = 0; i < totalentries; i++) + { + Status = SamAddMemberToAlias(AliasHandle, + MemberList[i].lgrmi0_sid); + if (!NT_SUCCESS(Status)) + { + ERR("SamAddMemberToAlias failed (Status %lu)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + +done: + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; }

1 0

[ekohl] 59190: [NETAPI32] NetLocalGroupGetMembers: Implement levels 2 and 3. Fixes netapi32:access winetest failures.
by ekohl＠svn.reactos.org 08 Jun '13

08 Jun '13

Author: ekohl Date: Sat Jun 8 11:04:18 2013 New Revision: 59190 URL: http://svn.reactos.org/svn/reactos?rev=59190&view=rev Log: [NETAPI32] NetLocalGroupGetMembers: Implement levels 2 and 3. Fixes netapi32:access winetest failures. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sat Jun 8 11:04:18 2013 @@ -946,6 +946,8 @@ LPVOID Buffer = NULL; PLOCALGROUP_MEMBERS_INFO_0 MembersInfo0; PLOCALGROUP_MEMBERS_INFO_1 MembersInfo1; + PLOCALGROUP_MEMBERS_INFO_2 MembersInfo2; + PLOCALGROUP_MEMBERS_INFO_3 MembersInfo3; LPWSTR Ptr; ULONG Size = 0; ULONG SidLength; @@ -1060,7 +1062,7 @@ goto done; } - + /* Get name and domain information for all members */ if (level != 0) { InitializeObjectAttributes(&ObjectAttributes, @@ -1108,6 +1110,19 @@ EnumContext->Names[i].Name.Length + sizeof(WCHAR); break; + case 2: + Size = sizeof(LOCALGROUP_MEMBERS_INFO_2) + + RtlLengthSid(EnumContext->Sids[i]) + + EnumContext->Names[i].Name.Length + sizeof(WCHAR) + + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); + break; + + case 3: + Size = sizeof(LOCALGROUP_MEMBERS_INFO_3) + + EnumContext->Names[i].Name.Length + sizeof(WCHAR) + + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); + break; + default: ApiStatus = ERROR_INVALID_LEVEL; goto done; @@ -1132,6 +1147,16 @@ case 1: MembersInfo1 = (PLOCALGROUP_MEMBERS_INFO_1)Buffer; Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_1) * EnumContext->Count); + break; + + case 2: + MembersInfo2 = (PLOCALGROUP_MEMBERS_INFO_2)Buffer; + Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_2) * EnumContext->Count); + break; + + case 3: + MembersInfo3 = (PLOCALGROUP_MEMBERS_INFO_3)Buffer; + Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_3) * EnumContext->Count); break; } @@ -1166,6 +1191,51 @@ MembersInfo1->lgrmi1_name = (LPWSTR)Ptr; memcpy(MembersInfo1->lgrmi1_name, + EnumContext->Names[i].Name.Buffer, + EnumContext->Names[i].Name.Length); + break; + + case 2: + MembersInfo2->lgrmi2_sid = (PSID)Ptr; + + SidLength = RtlLengthSid(EnumContext->Sids[i]); + memcpy(MembersInfo2->lgrmi2_sid, + EnumContext->Sids[i], + SidLength); + + Ptr = (PVOID)((ULONG_PTR)Ptr + SidLength); + + MembersInfo2->lgrmi2_sidusage = EnumContext->Names[i].Use; + + MembersInfo2->lgrmi2_domainandname = (LPWSTR)Ptr; + memcpy(MembersInfo2->lgrmi2_domainandname, + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer, + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length); + + Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length); + + *((LPWSTR)Ptr) = L'\\'; + + Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR)); + + memcpy(Ptr, + EnumContext->Names[i].Name.Buffer, + EnumContext->Names[i].Name.Length); + break; + + case 3: + MembersInfo3->lgrmi3_domainandname = (PSID)Ptr; + memcpy(MembersInfo2->lgrmi2_domainandname, + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer, + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length); + + Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length); + + *((LPWSTR)Ptr) = L'\\'; + + Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR)); + + memcpy(Ptr, EnumContext->Names[i].Name.Buffer, EnumContext->Names[i].Name.Length); break;

1 0

[fireball] 59189: [KMTEST] - Fix variable declaration placement.
by fireball＠svn.reactos.org 08 Jun '13

08 Jun '13

Author: fireball Date: Sat Jun 8 10:31:39 2013 New Revision: 59189 URL: http://svn.reactos.org/svn/reactos?rev=59189&view=rev Log: [KMTEST] - Fix variable declaration placement. Modified: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c Modified: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeDevQueu… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeDevQueue.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeDevQueue.c [iso-8859-1] Sat Jun 8 10:31:39 2013 @@ -75,6 +75,7 @@ PKDEVICE_QUEUE_ENTRY element; KIRQL OldIrql; PKDEVICE_QUEUE_ENTRY* elem_array; + PKDEVICE_QUEUE_ENTRY return_value; PLIST_ENTRY next; ULONG key; @@ -125,8 +126,6 @@ /* Test deletion */ trace("******* Testing KeRemoveDeviceQueue **************** \n"); DPRINT1("\nStart KeRemoveDeviceQueue test\n"); - - PKDEVICE_QUEUE_ENTRY return_value; DPRINT1("Start deleting elements from queue\n"); for (i = 0; i < INSERT_COUNT; i++) {

1 0

[fireball] 59188: [KMTEST] - Implement simple KeDeviceQueue test by Moscow State Technical University students. Improvements are welcome.
by fireball＠svn.reactos.org 08 Jun '13

08 Jun '13

Author: fireball Date: Sat Jun 8 10:19:26 2013 New Revision: 59188 URL: http://svn.reactos.org/svn/reactos?rev=59188&view=rev Log: [KMTEST] - Implement simple KeDeviceQueue test by Moscow State Technical University students. Improvements are welcome. Added: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sat Jun 8 10:19:26 2013 @@ -44,6 +44,7 @@ ntos_io/IoIrp.c ntos_io/IoMdl.c ntos_ke/KeApc.c + ntos_ke/KeDevQueue.c ntos_ke/KeDpc.c ntos_ke/KeEvent.c ntos_ke/KeGuardedMutex.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Jun 8 10:19:26 2013 @@ -28,6 +28,7 @@ KMT_TESTFUNC Test_IoIrp; KMT_TESTFUNC Test_IoMdl; KMT_TESTFUNC Test_KeApc; +KMT_TESTFUNC Test_KeDeviceQueue; KMT_TESTFUNC Test_KeDpc; KMT_TESTFUNC Test_KeEvent; KMT_TESTFUNC Test_KeGuardedMutex; @@ -76,6 +77,7 @@ { "IoIrp", Test_IoIrp }, { "IoMdl", Test_IoMdl }, { "KeApc", Test_KeApc }, + { "KeDeviceQueue", Test_KeDeviceQueue }, { "KeDpc", Test_KeDpc }, { "KeEvent", Test_KeEvent }, { "KeGuardedMutex", Test_KeGuardedMutex }, Added: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeDevQueu… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeDevQueue.c (added) +++ trunk/rostests/kmtests/ntos_ke/KeDevQueue.c [iso-8859-1] Sat Jun 8 10:19:26 2013 @@ -0,0 +1,200 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite for Device Queues + * PROGRAMMERS: Pavel Batusov, Moscow State Technical University + * Denis Volhonsky, Moscow State Technical University + * Alexandra Safonova, Moscow State Technical University + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#define NUMBER 255 +#define INSERT_COUNT 5 + +int Check_mem(void* a, int n, int size) +{ + int i; + for (i = 0; i < size; i++) { + if (*((unsigned char*)a + i) != n) { + return 0; + } + } + return 1; +} + +void Test_Initialize() +{ + PKDEVICE_QUEUE testing_queue; + void* double_queue; + + trace("******* Testing KeInitializeDeviceQueue ************\n"); + DPRINT1("\nStart test for KeInitializeDeviceQueue function\n"); + + testing_queue = ExAllocatePool(NonPagedPool, sizeof(KDEVICE_QUEUE)); + + testing_queue->Busy = TRUE; + testing_queue->Size = 0; + + KeInitializeDeviceQueue(testing_queue); + + /* Check for properly setting up fields */ + ok(!testing_queue->Busy, "(Initialize testing) Test 1:\tExpected 'not busy' status\n"); + DPRINT1("1 test complete\n"); + + ok(testing_queue->Size == sizeof(KDEVICE_QUEUE), "(Initialize testing) Test 2:\tExpected another size for KDEVICE_QUEUE\n"); + DPRINT1("2 test complete\n"); + + ok(testing_queue->Type == DeviceQueueObject, "(Initialize testing) Test 3:\tExpected type == DeviceQueueObject\n"); + DPRINT1("3 test complete\n"); + + /* Make sure it does not write outside allocated buffer */ + double_queue = ExAllocatePool(NonPagedPool, sizeof(KDEVICE_QUEUE) * 2); + + memset(double_queue, NUMBER, sizeof(KDEVICE_QUEUE) * 2); + KeInitializeDeviceQueue(double_queue); + + ok(Check_mem((void*)((char*)double_queue + sizeof(KDEVICE_QUEUE)), NUMBER, sizeof(KDEVICE_QUEUE)), "(Initialize testing) Test 4:\tFunction uses someone else's memory \n"); + DPRINT1("4 test complete\n"); + +//==================================================================== + + ExFreePool(testing_queue); + ExFreePool(double_queue); + + DPRINT1("KeInitializeDeviceQueue test finished\n"); +} + +void Tests_Insert_And_Delete() +{ + ULONG i, j; + PKDEVICE_QUEUE testing_queue; + PKDEVICE_QUEUE_ENTRY element; + KIRQL OldIrql; + PKDEVICE_QUEUE_ENTRY* elem_array; + PLIST_ENTRY next; + ULONG key; + + trace("******* Testing KeInsertDeviceQueue **************** \n"); + DPRINT1("\nStart KeInsertDeviceQueue test\n"); + + testing_queue = ExAllocatePool(NonPagedPool, sizeof(KDEVICE_QUEUE)); + KeInitializeDeviceQueue(testing_queue); + + element = ExAllocatePool(NonPagedPool, sizeof(KDEVICE_QUEUE_ENTRY)); + + /* Raise to dispatch level */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeInsertDeviceQueue(testing_queue, element); + ok(!element->Inserted, "Wrong 'Inserted' status\n"); + DPRINT1("1 test complete\n"); + + /* Fill the queue*/ + elem_array = ExAllocatePool(NonPagedPool, sizeof(PKDEVICE_QUEUE_ENTRY) * INSERT_COUNT); + + DPRINT1("Arrow of tests starting\n"); + for (i = 0; i < INSERT_COUNT; i++) { + elem_array[i] = ExAllocatePool(NonPagedPool, sizeof(KDEVICE_QUEUE_ENTRY)); + elem_array[i]->Inserted = FALSE; + elem_array[i]->SortKey = i; + KeInsertDeviceQueue(testing_queue, elem_array[i]); + ok(elem_array[i]->Inserted, "Element was not inserted\n"); + } + DPRINT1("Arrow of tests complete\n"); + + ok(testing_queue->Size == sizeof(KDEVICE_QUEUE), "Wrong size of queue\n"); + + /* Check how the queue was filled */ + next = &testing_queue->DeviceListHead; + + DPRINT1("Arrow of tests starting\n"); + for (i = 0; i < INSERT_COUNT; i++) { + next = next->Flink; + key = CONTAINING_RECORD(next, KDEVICE_QUEUE_ENTRY, DeviceListEntry)->SortKey; + ok(key == i, "Sort key was changed\n"); + } + DPRINT1("Arrow of tests complete\n"); + + trace("****************************************************\n\n"); + DPRINT1("KeInsertDeviceQueue test finish\n"); + + /* Test deletion */ + trace("******* Testing KeRemoveDeviceQueue **************** \n"); + DPRINT1("\nStart KeRemoveDeviceQueue test\n"); + + PKDEVICE_QUEUE_ENTRY return_value; + + DPRINT1("Start deleting elements from queue\n"); + for (i = 0; i < INSERT_COUNT; i++) { + return_value = KeRemoveDeviceQueue(testing_queue); + ok(return_value == elem_array[i], "Returning element != head element\n"); + ok(return_value->Inserted == FALSE, "Returning element is still in queue\n"); + next = &testing_queue->DeviceListHead; + for (j = i + 1; j < INSERT_COUNT; j++) { + next = next->Flink; + ok(CONTAINING_RECORD(next, KDEVICE_QUEUE_ENTRY, DeviceListEntry)->SortKey == j, "Queue was damaged\n"); + } + } + DPRINT1("Deleting finish. Queue must be empty\n"); + + ok(KeRemoveDeviceQueue(testing_queue) == NULL, "Queue is not empty\n"); + ok(testing_queue->Busy == FALSE, "Queue is busy\n"); + + trace("****************************************************\n\n"); + DPRINT1("Finish KeRemoveDeviceQueue test\n"); + +//==================================================================== + trace("******* Testing KeRemoveEntryDeviceQueue *********** \n"); + DPRINT1("\nStart KeRemoveEntryDeviceQueue test\n"); + + DPRINT1("Filling queue\n"); + for (i = 0; i < INSERT_COUNT; i++) { + elem_array[i]->SortKey = i; + elem_array[i]->Inserted = FALSE; + KeInsertDeviceQueue(testing_queue, elem_array[i]); + } + + //Delete half elements + DPRINT1("Deleting elements\n"); + for (i = 0; i < INSERT_COUNT / 2; i++) { + ok(KeRemoveEntryDeviceQueue(testing_queue, elem_array[i * 2 + 1]), "Element is not deleted\n"); + } + + //Checking queue + DPRINT1("Checking\n"); + next = &testing_queue->DeviceListHead; + for (i = 0; i < INSERT_COUNT / 2 + 1; i++) { + ok(CONTAINING_RECORD(next, KDEVICE_QUEUE_ENTRY, DeviceListEntry)->SortKey == i * 2, "Queue was damaged\n"); + next = next->Flink; + } + + //Trying delete elements, which are not in this queue + DPRINT1("Trying delete nonexistent elements\n"); + for (i = 0; i < INSERT_COUNT / 2; i++) { + ok(!KeRemoveEntryDeviceQueue(testing_queue, elem_array[i * 2 + 1]), "Wrong remove operation\n"); + } + + trace("****************************************************\n\n"); +//Îñâîáîæäåíåè ïàìÿòè +//==================================================================== + for (i = 0; i < INSERT_COUNT; i++) { + ExFreePool(elem_array[i]); + } + + /* Return back to previous IRQL */ + KeLowerIrql(OldIrql); + + ExFreePool(testing_queue); + ExFreePool(element); +} + +START_TEST(KeDeviceQueue) +{ + Test_Initialize(); + Tests_Insert_And_Delete(); +} + Propchange: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs