Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[akhaldi] 72228: [CMAKE] Update baseaddress.cmake for the GCC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 15 11:56:47 2016 New Revision: 72228 URL: http://svn.reactos.org/svn/reactos?rev=72228&view=rev Log: [CMAKE] Update baseaddress.cmake for the GCC build. Modified: trunk/reactos/sdk/cmake/baseaddress.cmake Modified: trunk/reactos/sdk/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] Mon Aug 15 11:56:47 2016 @@ -17,341 +17,341 @@ set(baseaddress_winspool.drv 0x7bd30000) set(baseaddress_winmm 0x7bc70000) set(baseaddress_comdlg32 0x7bb70000) -set(baseaddress_shell32 0x7b1d0000) -set(baseaddress_lz32 0x7b1b0000) -set(baseaddress_version 0x7b180000) -set(baseaddress_oleaut32 0x7afb0000) -set(baseaddress_setupapi 0x7ae40000) -set(baseaddress_mpr 0x7ae00000) -set(baseaddress_crypt32 0x7acf0000) -set(baseaddress_wininet 0x7ac30000) -set(baseaddress_urlmon 0x7ab30000) -set(baseaddress_psapi 0x7ab00000) -set(baseaddress_imm32 0x7aac0000) -set(baseaddress_msvfw32 0x7aa70000) -set(baseaddress_dbghelp 0x7a9c0000) -set(baseaddress_devmgr 0x7a8e0000) -set(baseaddress_msacm32 0x7a8a0000) -set(baseaddress_netapi32 0x7a830000) -set(baseaddress_powrprof 0x7a800000) -set(baseaddress_secur32 0x7a7c0000) -set(baseaddress_wintrust 0x7a760000) -set(baseaddress_avicap32 0x7a730000) -set(baseaddress_cabinet 0x7a6e0000) -set(baseaddress_dsound 0x7a660000) -set(baseaddress_glu32 0x7a560000) -set(baseaddress_opengl32 0x7a350000) -set(baseaddress_riched20 0x7a290000) -set(baseaddress_smdll 0x7a270000) -set(baseaddress_userenv 0x7a220000) -set(baseaddress_uxtheme 0x7a1c0000) -set(baseaddress_cryptui 0x7a110000) -set(baseaddress_csrsrv 0x7a0e0000) -set(baseaddress_basesrv 0x7a0b0000) -set(baseaddress_winsrv 0x7a010000) -set(baseaddress_dplayx 0x79fa0000) -set(baseaddress_gdiplus 0x79ed0000) -set(baseaddress_msimg32 0x79ea0000) -set(baseaddress_mswsock 0x79e70000) -set(baseaddress_oledlg 0x79e20000) -set(baseaddress_rasapi32 0x79df0000) -set(baseaddress_rsaenh 0x79d80000) -set(baseaddress_samlib 0x79d40000) -set(baseaddress_sensapi 0x79d10000) -set(baseaddress_sfc_os 0x79ce0000) -set(baseaddress_snmpapi 0x79cb0000) -set(baseaddress_spoolss 0x79c80000) -set(baseaddress_usp10 0x79c00000) -set(baseaddress_aclayers 0x79bd0000) -set(baseaddress_acledit 0x79ba0000) -set(baseaddress_aclui 0x79b60000) -set(baseaddress_acppage 0x79b10000) -set(baseaddress_activeds 0x79ae0000) -set(baseaddress_actxprxy 0x798e0000) -set(baseaddress_advapi32_vista 0x798c0000) -set(baseaddress_advpack 0x79880000) -set(baseaddress_amstream 0x79830000) -set(baseaddress_apphelp 0x797f0000) -set(baseaddress_atl 0x797b0000) -set(baseaddress_atl100 0x79770000) -set(baseaddress_atl80 0x79730000) -set(baseaddress_authz 0x79700000) -set(baseaddress_avifil32 0x79680000) -set(baseaddress_batt 0x79650000) -set(baseaddress_bcrypt 0x79620000) -set(baseaddress_beepmidi 0x795f0000) -set(baseaddress_browseui 0x794e0000) -set(baseaddress_cards 0x79420000) -set(baseaddress_cfgmgr32 0x793f0000) -set(baseaddress_clusapi 0x793c0000) -set(baseaddress_comcat 0x79390000) -set(baseaddress_compstui 0x79360000) -set(baseaddress_console 0x79310000) -set(baseaddress_credui 0x792d0000) -set(baseaddress_crtdll 0x79270000) -set(baseaddress_cryptdlg 0x79240000) -set(baseaddress_cryptdll 0x79210000) -set(baseaddress_cryptnet 0x791e0000) -set(baseaddress_d3d8 0x79180000) -set(baseaddress_d3d8thk 0x79160000) -set(baseaddress_d3d9 0x790f0000) -set(baseaddress_d3dcompiler_43 0x79040000) -set(baseaddress_d3drm 0x78fb0000) -set(baseaddress_d3dwine 0x78da0000) -set(baseaddress_d3dx9_24 0x78d70000) -set(baseaddress_d3dx9_25 0x78d30000) -set(baseaddress_d3dx9_26 0x78d00000) -set(baseaddress_d3dx9_27 0x78cd0000) -set(baseaddress_d3dx9_28 0x78ca0000) -set(baseaddress_d3dx9_29 0x78c70000) -set(baseaddress_d3dx9_30 0x78c40000) -set(baseaddress_d3dx9_31 0x78c10000) -set(baseaddress_d3dx9_32 0x78be0000) -set(baseaddress_d3dx9_33 0x78bb0000) -set(baseaddress_d3dx9_34 0x78b80000) -set(baseaddress_d3dx9_35 0x78b50000) -set(baseaddress_d3dx9_36 0x78a60000) -set(baseaddress_d3dx9_37 0x78a30000) -set(baseaddress_d3dx9_38 0x78a00000) -set(baseaddress_d3dx9_39 0x789d0000) -set(baseaddress_d3dx9_40 0x789a0000) -set(baseaddress_d3dx9_41 0x78970000) -set(baseaddress_d3dx9_42 0x78940000) -set(baseaddress_d3dx9_43 0x78910000) -set(baseaddress_d3dxof 0x788d0000) -set(baseaddress_dciman32 0x788a0000) -set(baseaddress_ddraw 0x787e0000) -set(baseaddress_deskadp 0x787b0000) -set(baseaddress_deskmon 0x78780000) -set(baseaddress_devcpux 0x78750000) -set(baseaddress_devenum 0x78700000) -set(baseaddress_dinput 0x786a0000) -set(baseaddress_dinput8 0x78670000) -set(baseaddress_dmusic 0x78620000) -set(baseaddress_dplay 0x785f0000) -set(baseaddress_dxdiagn 0x785a0000) -set(baseaddress_esent 0x78570000) -set(baseaddress_faultrep 0x78540000) -set(baseaddress_fltlib 0x78510000) -set(baseaddress_fmifs 0x784f0000) -set(baseaddress_fontext 0x784c0000) -set(baseaddress_fontsub 0x78490000) -set(baseaddress_framebuf 0x78470000) -set(baseaddress_framebuf_new 0x78450000) -set(baseaddress_framedyn 0x78410000) -set(baseaddress_genincdata 0x783e0000) -set(baseaddress_getuname 0x78110000) -set(baseaddress_hid 0x780e0000) -set(baseaddress_hlink 0x780a0000) -set(baseaddress_hnetcfg 0x78060000) -set(baseaddress_httpapi 0x78030000) -set(baseaddress_iccvid 0x78000000) -set(baseaddress_ieframe 0x77f10000) -set(baseaddress_iernonce 0x77ee0000) -set(baseaddress_imagehlp 0x77eb0000) -set(baseaddress_inetcomm 0x77e50000) -set(baseaddress_inetmib1 0x77e20000) -set(baseaddress_initpki 0x77df0000) -set(baseaddress_input 0x77d90000) -set(baseaddress_inseng 0x77d60000) -set(baseaddress_iologmsg 0x77d40000) -set(baseaddress_itircl 0x77d10000) -set(baseaddress_itss 0x77cd0000) -set(baseaddress_jscript 0x77bc0000) -set(baseaddress_jsproxy 0x77b90000) -set(baseaddress_kbsdll 0x77b60000) -set(baseaddress_kernel32_vista 0x77b40000) -set(baseaddress_ksuser 0x77b10000) -set(baseaddress_libjpeg 0x77a80000) -set(baseaddress_libpng 0x779f0000) -set(baseaddress_libtiff 0x77910000) -set(baseaddress_libxslt 0x77640000) -set(baseaddress_loadperf 0x77610000) -set(baseaddress_localspl 0x775d0000) -set(baseaddress_localui 0x775a0000) -set(baseaddress_lpk 0x77570000) -set(baseaddress_lsasrv 0x77500000) -set(baseaddress_mapi32 0x774c0000) -set(baseaddress_mciavi32 0x77480000) -set(baseaddress_mcicda 0x77450000) -set(baseaddress_mciqtz32 0x77410000) -set(baseaddress_mciseq 0x773e0000) -set(baseaddress_mciwave 0x773b0000) -set(baseaddress_mgmtapi 0x77380000) -set(baseaddress_midimap 0x77350000) -set(baseaddress_mlang 0x77310000) -set(baseaddress_mmdrv 0x772e0000) -set(baseaddress_modemui 0x77270000) -set(baseaddress_mprapi 0x77240000) -set(baseaddress_msafd 0x77200000) -set(baseaddress_mscat32 0x771d0000) -set(baseaddress_mscms 0x771a0000) -set(baseaddress_mscoree 0x77150000) -set(baseaddress_msctf 0x770f0000) -set(baseaddress_msdmo 0x770c0000) -set(baseaddress_msftedit 0x77090000) -set(baseaddress_msgina 0x77000000) -set(baseaddress_mshtml 0x76d00000) -set(baseaddress_msi 0x76b90000) -set(baseaddress_msimtf 0x76b60000) -set(baseaddress_msisip 0x76b30000) -set(baseaddress_mspatcha 0x76b00000) -set(baseaddress_msports 0x76ad0000) -set(baseaddress_msrle32 0x76aa0000) -set(baseaddress_mssign32 0x76a70000) -set(baseaddress_mssip32 0x76a40000) -set(baseaddress_mstask 0x76a00000) -set(baseaddress_msv1_0 0x769d0000) -set(baseaddress_msvcrt_crt_dll_startup 0x769a0000) -set(baseaddress_msvcrt20 0x768d0000) -set(baseaddress_msvcrt40 0x76800000) -set(baseaddress_msvidc32 0x767d0000) -set(baseaddress_msxml 0x767a0000) -set(baseaddress_msxml2 0x76770000) -set(baseaddress_msxml3 0x76390000) -set(baseaddress_msxml4 0x76350000) -set(baseaddress_msxml6 0x76310000) -set(baseaddress_mycomput 0x762f0000) -set(baseaddress_nddeapi 0x762c0000) -set(baseaddress_netcfgx 0x76230000) -set(baseaddress_netevent 0x76210000) -set(baseaddress_netid 0x761c0000) -set(baseaddress_netshell 0x76110000) -set(baseaddress_newdev 0x760b0000) -set(baseaddress_normaliz 0x76080000) -set(baseaddress_npptools 0x76050000) -set(baseaddress_ntdsapi 0x76020000) -set(baseaddress_ntlanman 0x75ff0000) -set(baseaddress_ntmarta 0x75fc0000) -set(baseaddress_ntobjshex 0x75f20000) -set(baseaddress_ntprint 0x75ef0000) -set(baseaddress_objsel 0x75ec0000) -set(baseaddress_odbc32 0x75e80000) -set(baseaddress_odbccp32 0x75e50000) -set(baseaddress_oleacc 0x75dc0000) -set(baseaddress_olecli32 0x75d90000) -set(baseaddress_olepro32 0x75d60000) -set(baseaddress_olesvr32 0x75d30000) -set(baseaddress_olethk32 0x75d00000) -set(baseaddress_pdh 0x75cc0000) -set(baseaddress_pidgen 0x75c90000) -set(baseaddress_pifmgr 0x75c10000) -set(baseaddress_printui 0x75be0000) -set(baseaddress_propsys 0x75ba0000) -set(baseaddress_pstorec 0x75b70000) -set(baseaddress_qedit 0x75b20000) -set(baseaddress_qmgr 0x75ae0000) -set(baseaddress_qmgrprxy 0x75a80000) -set(baseaddress_quartz 0x75900000) -set(baseaddress_query 0x758d0000) -set(baseaddress_rasadhlp 0x758a0000) -set(baseaddress_rasdlg 0x756d0000) -set(baseaddress_rasman 0x756a0000) -set(baseaddress_resutils 0x75670000) -set(baseaddress_riched32 0x75640000) -set(baseaddress_rsabase 0x75620000) -set(baseaddress_rshell 0x75590000) -set(baseaddress_samsrv 0x75520000) -set(baseaddress_sccbase 0x754f0000) -set(baseaddress_schannel 0x754b0000) -set(baseaddress_schedsvc 0x75480000) -set(baseaddress_scrrun 0x75420000) -set(baseaddress_security 0x75400000) -set(baseaddress_serialui 0x753d0000) -set(baseaddress_sfc 0x753a0000) -set(baseaddress_shdoclc 0x75360000) -set(baseaddress_shdocvw 0x75310000) -set(baseaddress_shfolder 0x752f0000) -set(baseaddress_shimgvw 0x752a0000) -set(baseaddress_slayer 0x75270000) -set(baseaddress_slbcsp 0x75240000) -set(baseaddress_sndblst 0x75210000) -set(baseaddress_softpub 0x751f0000) -set(baseaddress_srclient 0x751c0000) -set(baseaddress_srvsvc 0x75190000) -set(baseaddress_sti 0x75150000) -set(baseaddress_stobject 0x750e0000) -set(baseaddress_streamci 0x750b0000) -set(baseaddress_sxs 0x75080000) -set(baseaddress_syssetup 0x74fd0000) -set(baseaddress_t2embed 0x74fa0000) -set(baseaddress_tapi32 0x74f60000) -set(baseaddress_tapiui 0x74ee0000) -set(baseaddress_testvdd 0x74eb0000) -set(baseaddress_themeui 0x74e90000) -set(baseaddress_traffic 0x74e60000) -set(baseaddress_twain_32 0x74e30000) -set(baseaddress_ubtrfs 0x74e10000) -set(baseaddress_uext2 0x74dd0000) -set(baseaddress_ufat 0x74d90000) -set(baseaddress_ufatx 0x74d70000) -set(baseaddress_uffs 0x74d50000) -set(baseaddress_umpnpmgr 0x74d20000) -set(baseaddress_untfs 0x74d00000) -set(baseaddress_updspapi 0x74cd0000) -set(baseaddress_ureiserfs 0x74cb0000) -set(baseaddress_url 0x74c80000) -set(baseaddress_vbscript 0x74be0000) -set(baseaddress_vdmdbg 0x74bb0000) -set(baseaddress_vssapi 0x74b80000) -set(baseaddress_wbemdisp 0x74b40000) -set(baseaddress_wbemprox 0x74ae0000) -set(baseaddress_win32kdll 0x74ab0000) -set(baseaddress_win32kdll_2k3sp2 0x74a80000) -set(baseaddress_win32kdll_xpsp2 0x74a50000) -set(baseaddress_windowscodecs 0x74930000) -set(baseaddress_windowscodecsext 0x74900000) -set(baseaddress_winfax 0x748d0000) -set(baseaddress_wing32 0x748a0000) -set(baseaddress_winhttp 0x74830000) -set(baseaddress_winscard 0x74800000) -set(baseaddress_winsta 0x747d0000) -set(baseaddress_wkssvc 0x747a0000) -set(baseaddress_wlanapi 0x74770000) -set(baseaddress_wldap32 0x74730000) -set(baseaddress_wmi 0x74710000) -set(baseaddress_wmisvc 0x746e0000) -set(baseaddress_wmiutils 0x746b0000) -set(baseaddress_wmvcore 0x74680000) -set(baseaddress_ws2_32_new 0x74630000) -set(baseaddress_wshirda 0x74600000) -set(baseaddress_wshtcpip 0x745d0000) -set(baseaddress_wsock32 0x745a0000) -set(baseaddress_wtsapi32 0x74570000) -set(baseaddress_wuapi 0x74530000) -set(baseaddress_xinput1_1 0x74500000) -set(baseaddress_xinput1_2 0x744d0000) -set(baseaddress_xinput1_3 0x744a0000) -set(baseaddress_xinput9_1_0 0x74470000) -set(baseaddress_xmllite 0x74430000) -set(baseaddress_access 0x743b0000) -set(baseaddress_appwiz 0x74330000) -set(baseaddress_cmicpl 0x742f0000) -set(baseaddress_desk 0x74250000) -set(baseaddress_hdwwiz 0x741d0000) -set(baseaddress_hhctrl 0x74180000) -set(baseaddress_imaadp32.acm 0x74150000) -set(baseaddress_inetcpl 0x740f0000) -set(baseaddress_intl 0x74080000) -set(baseaddress_joy 0x74040000) -set(baseaddress_main 0x73fa0000) -set(baseaddress_mmsys 0x73ed0000) -set(baseaddress_msacm32.drv 0x73ea0000) -set(baseaddress_msadp32.acm 0x73e70000) -set(baseaddress_msg711.acm 0x73e40000) -set(baseaddress_msgsm32.acm 0x73e10000) -set(baseaddress_msisys 0x73de0000) -set(baseaddress_ncpa 0x73db0000) -set(baseaddress_odbccp32i 0x73d80000) -set(baseaddress_powercfg 0x73d20000) -set(baseaddress_sysdm 0x73c40000) -set(baseaddress_telephon 0x73c10000) -set(baseaddress_timedate 0x73b90000) -set(baseaddress_usrmgr 0x73b40000) -set(baseaddress_wdmaud.drv 0x73980000) -set(baseaddress_wined3dcfg 0x73950000) -set(baseaddress_winemp3.acm 0x738d0000) -set(baseaddress_wshom 0x73880000) -set(baseaddress_fusion 0x73850000) -set(baseaddress_fusion_1_1 0x73810000) -set(baseaddress_fusion_2_0 0x737d0000) +set(baseaddress_shell32 0x7b1b0000) +set(baseaddress_lz32 0x7b190000) +set(baseaddress_version 0x7b160000) +set(baseaddress_oleaut32 0x7af90000) +set(baseaddress_setupapi 0x7ae20000) +set(baseaddress_mpr 0x7ade0000) +set(baseaddress_crypt32 0x7acd0000) +set(baseaddress_wininet 0x7ac10000) +set(baseaddress_urlmon 0x7ab10000) +set(baseaddress_psapi 0x7aae0000) +set(baseaddress_imm32 0x7aaa0000) +set(baseaddress_msvfw32 0x7aa50000) +set(baseaddress_dbghelp 0x7a9a0000) +set(baseaddress_devmgr 0x7a8c0000) +set(baseaddress_msacm32 0x7a880000) +set(baseaddress_netapi32 0x7a810000) +set(baseaddress_powrprof 0x7a7e0000) +set(baseaddress_secur32 0x7a7a0000) +set(baseaddress_wintrust 0x7a740000) +set(baseaddress_avicap32 0x7a710000) +set(baseaddress_cabinet 0x7a6c0000) +set(baseaddress_dsound 0x7a640000) +set(baseaddress_glu32 0x7a540000) +set(baseaddress_opengl32 0x7a330000) +set(baseaddress_riched20 0x7a270000) +set(baseaddress_smdll 0x7a250000) +set(baseaddress_userenv 0x7a200000) +set(baseaddress_uxtheme 0x7a1a0000) +set(baseaddress_cryptui 0x7a0f0000) +set(baseaddress_csrsrv 0x7a0c0000) +set(baseaddress_basesrv 0x7a090000) +set(baseaddress_winsrv 0x79ff0000) +set(baseaddress_dplayx 0x79f80000) +set(baseaddress_gdiplus 0x79eb0000) +set(baseaddress_msimg32 0x79e80000) +set(baseaddress_mswsock 0x79e50000) +set(baseaddress_oledlg 0x79e00000) +set(baseaddress_rasapi32 0x79dd0000) +set(baseaddress_rsaenh 0x79d60000) +set(baseaddress_samlib 0x79d20000) +set(baseaddress_sensapi 0x79cf0000) +set(baseaddress_sfc_os 0x79cc0000) +set(baseaddress_snmpapi 0x79c90000) +set(baseaddress_spoolss 0x79c60000) +set(baseaddress_usp10 0x79be0000) +set(baseaddress_aclayers 0x79bb0000) +set(baseaddress_acledit 0x79b80000) +set(baseaddress_aclui 0x79b40000) +set(baseaddress_acppage 0x79af0000) +set(baseaddress_activeds 0x79ac0000) +set(baseaddress_actxprxy 0x798c0000) +set(baseaddress_advapi32_vista 0x798a0000) +set(baseaddress_advpack 0x79860000) +set(baseaddress_amstream 0x79810000) +set(baseaddress_apphelp 0x797d0000) +set(baseaddress_atl 0x79790000) +set(baseaddress_atl100 0x79750000) +set(baseaddress_atl80 0x79710000) +set(baseaddress_authz 0x796e0000) +set(baseaddress_avifil32 0x79660000) +set(baseaddress_batt 0x79630000) +set(baseaddress_bcrypt 0x79600000) +set(baseaddress_beepmidi 0x795d0000) +set(baseaddress_browseui 0x794c0000) +set(baseaddress_cards 0x79400000) +set(baseaddress_cfgmgr32 0x793d0000) +set(baseaddress_clusapi 0x793a0000) +set(baseaddress_comcat 0x79370000) +set(baseaddress_compstui 0x79340000) +set(baseaddress_console 0x792f0000) +set(baseaddress_credui 0x792b0000) +set(baseaddress_crtdll 0x79250000) +set(baseaddress_cryptdlg 0x79220000) +set(baseaddress_cryptdll 0x791f0000) +set(baseaddress_cryptnet 0x791c0000) +set(baseaddress_d3d8 0x79160000) +set(baseaddress_d3d8thk 0x79140000) +set(baseaddress_d3d9 0x790d0000) +set(baseaddress_d3dcompiler_43 0x79020000) +set(baseaddress_d3drm 0x78f90000) +set(baseaddress_d3dwine 0x78d80000) +set(baseaddress_d3dx9_24 0x78d50000) +set(baseaddress_d3dx9_25 0x78d10000) +set(baseaddress_d3dx9_26 0x78ce0000) +set(baseaddress_d3dx9_27 0x78cb0000) +set(baseaddress_d3dx9_28 0x78c80000) +set(baseaddress_d3dx9_29 0x78c50000) +set(baseaddress_d3dx9_30 0x78c20000) +set(baseaddress_d3dx9_31 0x78bf0000) +set(baseaddress_d3dx9_32 0x78bc0000) +set(baseaddress_d3dx9_33 0x78b90000) +set(baseaddress_d3dx9_34 0x78b60000) +set(baseaddress_d3dx9_35 0x78b30000) +set(baseaddress_d3dx9_36 0x78a40000) +set(baseaddress_d3dx9_37 0x78a10000) +set(baseaddress_d3dx9_38 0x789e0000) +set(baseaddress_d3dx9_39 0x789b0000) +set(baseaddress_d3dx9_40 0x78980000) +set(baseaddress_d3dx9_41 0x78950000) +set(baseaddress_d3dx9_42 0x78920000) +set(baseaddress_d3dx9_43 0x788f0000) +set(baseaddress_d3dxof 0x788b0000) +set(baseaddress_dciman32 0x78880000) +set(baseaddress_ddraw 0x787c0000) +set(baseaddress_deskadp 0x78790000) +set(baseaddress_deskmon 0x78760000) +set(baseaddress_devcpux 0x78730000) +set(baseaddress_devenum 0x786e0000) +set(baseaddress_dinput 0x78680000) +set(baseaddress_dinput8 0x78650000) +set(baseaddress_dmusic 0x78600000) +set(baseaddress_dplay 0x785d0000) +set(baseaddress_dxdiagn 0x78580000) +set(baseaddress_esent 0x78550000) +set(baseaddress_faultrep 0x78520000) +set(baseaddress_fltlib 0x784f0000) +set(baseaddress_fmifs 0x784d0000) +set(baseaddress_fontext 0x784a0000) +set(baseaddress_fontsub 0x78470000) +set(baseaddress_framebuf 0x78450000) +set(baseaddress_framebuf_new 0x78430000) +set(baseaddress_framedyn 0x783f0000) +set(baseaddress_genincdata 0x783c0000) +set(baseaddress_getuname 0x780f0000) +set(baseaddress_hid 0x780c0000) +set(baseaddress_hlink 0x78080000) +set(baseaddress_hnetcfg 0x78040000) +set(baseaddress_httpapi 0x78010000) +set(baseaddress_iccvid 0x77fe0000) +set(baseaddress_ieframe 0x77ef0000) +set(baseaddress_iernonce 0x77ec0000) +set(baseaddress_imagehlp 0x77e90000) +set(baseaddress_inetcomm 0x77e30000) +set(baseaddress_inetmib1 0x77e00000) +set(baseaddress_initpki 0x77dd0000) +set(baseaddress_input 0x77d70000) +set(baseaddress_inseng 0x77d40000) +set(baseaddress_iologmsg 0x77d20000) +set(baseaddress_itircl 0x77cf0000) +set(baseaddress_itss 0x77cb0000) +set(baseaddress_jscript 0x77ba0000) +set(baseaddress_jsproxy 0x77b70000) +set(baseaddress_kbsdll 0x77b40000) +set(baseaddress_kernel32_vista 0x77b20000) +set(baseaddress_ksuser 0x77af0000) +set(baseaddress_libjpeg 0x77a60000) +set(baseaddress_libpng 0x779d0000) +set(baseaddress_libtiff 0x778f0000) +set(baseaddress_libxslt 0x77620000) +set(baseaddress_loadperf 0x775f0000) +set(baseaddress_localspl 0x775b0000) +set(baseaddress_localui 0x77580000) +set(baseaddress_lpk 0x77550000) +set(baseaddress_lsasrv 0x774e0000) +set(baseaddress_mapi32 0x774a0000) +set(baseaddress_mciavi32 0x77460000) +set(baseaddress_mcicda 0x77430000) +set(baseaddress_mciqtz32 0x773f0000) +set(baseaddress_mciseq 0x773c0000) +set(baseaddress_mciwave 0x77390000) +set(baseaddress_mgmtapi 0x77360000) +set(baseaddress_midimap 0x77330000) +set(baseaddress_mlang 0x772f0000) +set(baseaddress_mmdrv 0x772c0000) +set(baseaddress_modemui 0x77250000) +set(baseaddress_mprapi 0x77220000) +set(baseaddress_msafd 0x771e0000) +set(baseaddress_mscat32 0x771b0000) +set(baseaddress_mscms 0x77180000) +set(baseaddress_mscoree 0x77130000) +set(baseaddress_msctf 0x770d0000) +set(baseaddress_msdmo 0x770a0000) +set(baseaddress_msftedit 0x77070000) +set(baseaddress_msgina 0x76fe0000) +set(baseaddress_mshtml 0x76ce0000) +set(baseaddress_msi 0x76b70000) +set(baseaddress_msimtf 0x76b40000) +set(baseaddress_msisip 0x76b10000) +set(baseaddress_mspatcha 0x76ae0000) +set(baseaddress_msports 0x76ab0000) +set(baseaddress_msrle32 0x76a80000) +set(baseaddress_mssign32 0x76a50000) +set(baseaddress_mssip32 0x76a20000) +set(baseaddress_mstask 0x769e0000) +set(baseaddress_msv1_0 0x769b0000) +set(baseaddress_msvcrt_crt_dll_startup 0x76980000) +set(baseaddress_msvcrt20 0x768b0000) +set(baseaddress_msvcrt40 0x767e0000) +set(baseaddress_msvidc32 0x767b0000) +set(baseaddress_msxml 0x76780000) +set(baseaddress_msxml2 0x76750000) +set(baseaddress_msxml3 0x76370000) +set(baseaddress_msxml4 0x76330000) +set(baseaddress_msxml6 0x762f0000) +set(baseaddress_mycomput 0x762d0000) +set(baseaddress_nddeapi 0x762a0000) +set(baseaddress_netcfgx 0x76210000) +set(baseaddress_netevent 0x761f0000) +set(baseaddress_netid 0x761a0000) +set(baseaddress_netshell 0x760f0000) +set(baseaddress_newdev 0x76090000) +set(baseaddress_normaliz 0x76060000) +set(baseaddress_npptools 0x76030000) +set(baseaddress_ntdsapi 0x76000000) +set(baseaddress_ntlanman 0x75fd0000) +set(baseaddress_ntmarta 0x75fa0000) +set(baseaddress_ntobjshex 0x75f00000) +set(baseaddress_ntprint 0x75ed0000) +set(baseaddress_objsel 0x75ea0000) +set(baseaddress_odbc32 0x75e60000) +set(baseaddress_odbccp32 0x75e30000) +set(baseaddress_oleacc 0x75da0000) +set(baseaddress_olecli32 0x75d70000) +set(baseaddress_olepro32 0x75d40000) +set(baseaddress_olesvr32 0x75d10000) +set(baseaddress_olethk32 0x75ce0000) +set(baseaddress_pdh 0x75ca0000) +set(baseaddress_pidgen 0x75c70000) +set(baseaddress_pifmgr 0x75bf0000) +set(baseaddress_printui 0x75bc0000) +set(baseaddress_propsys 0x75b80000) +set(baseaddress_pstorec 0x75b50000) +set(baseaddress_qedit 0x75b00000) +set(baseaddress_qmgr 0x75ac0000) +set(baseaddress_qmgrprxy 0x75a60000) +set(baseaddress_quartz 0x758e0000) +set(baseaddress_query 0x758b0000) +set(baseaddress_rasadhlp 0x75880000) +set(baseaddress_rasdlg 0x756b0000) +set(baseaddress_rasman 0x75680000) +set(baseaddress_resutils 0x75650000) +set(baseaddress_riched32 0x75620000) +set(baseaddress_rsabase 0x75600000) +set(baseaddress_rshell 0x75570000) +set(baseaddress_samsrv 0x75500000) +set(baseaddress_sccbase 0x754d0000) +set(baseaddress_schannel 0x75490000) +set(baseaddress_schedsvc 0x75460000) +set(baseaddress_scrrun 0x75400000) +set(baseaddress_security 0x753e0000) +set(baseaddress_serialui 0x753b0000) +set(baseaddress_sfc 0x75380000) +set(baseaddress_shdoclc 0x75340000) +set(baseaddress_shdocvw 0x752f0000) +set(baseaddress_shfolder 0x752d0000) +set(baseaddress_shimgvw 0x75280000) +set(baseaddress_slayer 0x75250000) +set(baseaddress_slbcsp 0x75220000) +set(baseaddress_sndblst 0x751f0000) +set(baseaddress_softpub 0x751d0000) +set(baseaddress_srclient 0x751a0000) +set(baseaddress_srvsvc 0x75170000) +set(baseaddress_sti 0x75130000) +set(baseaddress_stobject 0x750c0000) +set(baseaddress_streamci 0x75090000) +set(baseaddress_sxs 0x75060000) +set(baseaddress_syssetup 0x74fb0000) +set(baseaddress_t2embed 0x74f80000) +set(baseaddress_tapi32 0x74f40000) +set(baseaddress_tapiui 0x74ec0000) +set(baseaddress_testvdd 0x74e90000) +set(baseaddress_themeui 0x74e70000) +set(baseaddress_traffic 0x74e40000) +set(baseaddress_twain_32 0x74e10000) +set(baseaddress_ubtrfs 0x74df0000) +set(baseaddress_uext2 0x74db0000) +set(baseaddress_ufat 0x74d70000) +set(baseaddress_ufatx 0x74d50000) +set(baseaddress_uffs 0x74d30000) +set(baseaddress_umpnpmgr 0x74d00000) +set(baseaddress_untfs 0x74ce0000) +set(baseaddress_updspapi 0x74cb0000) +set(baseaddress_ureiserfs 0x74c90000) +set(baseaddress_url 0x74c60000) +set(baseaddress_vbscript 0x74bc0000) +set(baseaddress_vdmdbg 0x74b90000) +set(baseaddress_vssapi 0x74b60000) +set(baseaddress_wbemdisp 0x74b20000) +set(baseaddress_wbemprox 0x74ac0000) +set(baseaddress_win32kdll 0x74a90000) +set(baseaddress_win32kdll_2k3sp2 0x74a60000) +set(baseaddress_win32kdll_xpsp2 0x74a30000) +set(baseaddress_windowscodecs 0x74910000) +set(baseaddress_windowscodecsext 0x748e0000) +set(baseaddress_winfax 0x748b0000) +set(baseaddress_wing32 0x74880000) +set(baseaddress_winhttp 0x74810000) +set(baseaddress_winscard 0x747e0000) +set(baseaddress_winsta 0x747b0000) +set(baseaddress_wkssvc 0x74780000) +set(baseaddress_wlanapi 0x74750000) +set(baseaddress_wldap32 0x74710000) +set(baseaddress_wmi 0x746f0000) +set(baseaddress_wmisvc 0x746c0000) +set(baseaddress_wmiutils 0x74690000) +set(baseaddress_wmvcore 0x74660000) +set(baseaddress_ws2_32_new 0x74610000) +set(baseaddress_wshirda 0x745e0000) +set(baseaddress_wshtcpip 0x745b0000) +set(baseaddress_wsock32 0x74580000) +set(baseaddress_wtsapi32 0x74550000) +set(baseaddress_wuapi 0x74510000) +set(baseaddress_xinput1_1 0x744e0000) +set(baseaddress_xinput1_2 0x744b0000) +set(baseaddress_xinput1_3 0x74480000) +set(baseaddress_xinput9_1_0 0x74450000) +set(baseaddress_xmllite 0x74410000) +set(baseaddress_access 0x74390000) +set(baseaddress_appwiz 0x74310000) +set(baseaddress_cmicpl 0x742d0000) +set(baseaddress_desk 0x74230000) +set(baseaddress_hdwwiz 0x741b0000) +set(baseaddress_hhctrl 0x74160000) +set(baseaddress_imaadp32.acm 0x74130000) +set(baseaddress_inetcpl 0x740d0000) +set(baseaddress_intl 0x74060000) +set(baseaddress_joy 0x74020000) +set(baseaddress_main 0x73f80000) +set(baseaddress_mmsys 0x73eb0000) +set(baseaddress_msacm32.drv 0x73e80000) +set(baseaddress_msadp32.acm 0x73e50000) +set(baseaddress_msg711.acm 0x73e20000) +set(baseaddress_msgsm32.acm 0x73df0000) +set(baseaddress_msisys 0x73dc0000) +set(baseaddress_ncpa 0x73d90000) +set(baseaddress_odbccp32i 0x73d60000) +set(baseaddress_powercfg 0x73d00000) +set(baseaddress_sysdm 0x73c20000) +set(baseaddress_telephon 0x73bf0000) +set(baseaddress_timedate 0x73b70000) +set(baseaddress_usrmgr 0x73b20000) +set(baseaddress_wdmaud.drv 0x73960000) +set(baseaddress_wined3dcfg 0x73930000) +set(baseaddress_winemp3.acm 0x738b0000) +set(baseaddress_wshom 0x73860000) +set(baseaddress_fusion 0x73830000) +set(baseaddress_fusion_1_1 0x737f0000) +set(baseaddress_fusion_2_0 0x737b0000)

8 years, 4 months

[jimtabor] 72227: [Win32SS] - Fix regression from 62529, striped all the MF_POPUP from the code, no way to know if the submenu is a drop menu. See CORE-9269.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Aug 15 01:14:47 2016 New Revision: 72227 URL: http://svn.reactos.org/svn/reactos?rev=72227&view=rev Log: [Win32SS] - Fix regression from 62529, striped all the MF_POPUP from the code, no way to know if the submenu is a drop menu. See CORE-9269. Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Mon Aug 15 01:14:47 2016 @@ -4738,7 +4738,7 @@ if (pItem->spSubMenu) { - return (pItem->spSubMenu->cItems << 8) | ((pItem->fState|pItem->fType) & 0xff); + return (pItem->spSubMenu->cItems << 8) | ((pItem->fState|pItem->fType|MF_POPUP) & 0xff); } else return (pItem->fType | pItem->fState); Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Mon Aug 15 01:14:47 2016 @@ -1062,6 +1062,7 @@ { PMENU pSubMenu = DesktopPtrToUser(pItem->spSubMenu); HMENU hsubmenu = UserHMGetHandle(pSubMenu); + Type |= MF_POPUP; // Fix CORE-9269 if (!IsMenu(hsubmenu)) return (UINT)-1; else return (pSubMenu->cItems << 8) | ((pItem->fState|pItem->fType|Type) & 0xff); }

8 years, 4 months

[ekohl] 72226: [LSASRV] Implement LsarEnumerateAccountsWithUserRight.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 14 20:37:35 2016 New Revision: 72226 URL: http://svn.reactos.org/svn/reactos?rev=72226&view=rev Log: [LSASRV] Implement LsarEnumerateAccountsWithUserRight. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Aug 14 20:37:35 2016 @@ -2285,8 +2285,274 @@ PRPC_UNICODE_STRING UserRight, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + ACCESS_MASK AccountRight = 0; + PLUID Luid = NULL; + ULONG AccountKeyBufferSize; + PWSTR AccountKeyBuffer = NULL; + HKEY AccountsKeyHandle = NULL; + HKEY AccountKeyHandle = NULL; + HKEY AttributeKeyHandle; + ACCESS_MASK SystemAccess; + PPRIVILEGE_SET PrivilegeSet; + PLSAPR_ACCOUNT_INFORMATION EnumBuffer = NULL, ReturnBuffer; + ULONG SubKeyCount = 0; + ULONG EnumIndex, EnumCount; + ULONG Size, i; + BOOL Found; + NTSTATUS Status; + + TRACE("LsarEnumerateAccountsWithUserRights(%p %wZ %p)\n", + PolicyHandle, UserRight, EnumerationBuffer); + + /* Validate the privilege and account right names */ + if (UserRight != NULL) + { + Luid = LsarpLookupPrivilegeValue(UserRight); + if (Luid == NULL) + { + AccountRight = LsapLookupAccountRightValue(UserRight); + if (AccountRight == 0) + return STATUS_NO_SUCH_PRIVILEGE; + } + } + + if (EnumerationBuffer == NULL) + return STATUS_INVALID_PARAMETER; + + EnumerationBuffer->EntriesRead = 0; + EnumerationBuffer->Information = NULL; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + Status = LsapRegOpenKey(PolicyObject->KeyHandle, + L"Accounts", + KEY_READ, + &AccountsKeyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRegOpenKey returned 0x%08lx\n", Status); + return Status; + } + + Status = LsapRegQueryKeyInfo(AccountsKeyHandle, + &SubKeyCount, + &AccountKeyBufferSize, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRegOpenKey returned 0x%08lx\n", Status); + return Status; + } + + AccountKeyBufferSize += sizeof(WCHAR); + AccountKeyBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, AccountKeyBufferSize); + if (AccountKeyBuffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + EnumBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + SubKeyCount * sizeof(LSAPR_ACCOUNT_INFORMATION)); + if (EnumBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumCount = 0; + EnumIndex = 0; + while (TRUE) + { + Found = FALSE; + + Status = LsapRegEnumerateSubKey(AccountsKeyHandle, + EnumIndex, + AccountKeyBufferSize, + AccountKeyBuffer); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Account key name: %S\n", AccountKeyBuffer); + + Status = LsapRegOpenKey(AccountsKeyHandle, + AccountKeyBuffer, + KEY_READ, + &AccountKeyHandle); + if (NT_SUCCESS(Status)) + { + if (Luid != NULL || AccountRight != 0) + { + Status = LsapRegOpenKey(AccountKeyHandle, + (Luid != NULL) ? L"Privilgs" : L"ActSysAc", + KEY_READ, + &AttributeKeyHandle); + if (NT_SUCCESS(Status)) + { + if (Luid != NULL) + { + Size = 0; + LsapRegQueryValue(AttributeKeyHandle, + NULL, + NULL, + NULL, + &Size); + if (Size != 0) + { + PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + if (PrivilegeSet) + { + if (LsapRegQueryValue(AttributeKeyHandle, + NULL, + NULL, + PrivilegeSet, + &Size) == STATUS_SUCCESS) + { + for (i = 0; i < PrivilegeSet->PrivilegeCount; i++) + { + if (RtlEqualLuid(&(PrivilegeSet->Privilege[i].Luid), Luid)) + { + TRACE("%S got the privilege!\n", AccountKeyBuffer); + Found = TRUE; + break; + } + } + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet); + } + } + } + else if (AccountRight != 0) + { + SystemAccess = 0; + Size = sizeof(ACCESS_MASK); + LsapRegQueryValue(AttributeKeyHandle, + NULL, + NULL, + &SystemAccess, + &Size); + if (SystemAccess & AccountRight) + { + TRACE("%S got the account right!\n", AccountKeyBuffer); + Found = TRUE; + } + } + + LsapRegCloseKey(AttributeKeyHandle); + } + } + else + { + /* enumerate all accounts */ + Found = TRUE; + } + + if (Found == TRUE) + { + TRACE("Add account: %S\n", AccountKeyBuffer); + + Status = LsapRegOpenKey(AccountKeyHandle, + L"Sid", + KEY_READ, + &AttributeKeyHandle); + if (NT_SUCCESS(Status)) + { + Size = 0; + LsapRegQueryValue(AttributeKeyHandle, + NULL, + NULL, + NULL, + &Size); + if (Size != 0) + { + EnumBuffer[EnumCount].Sid = midl_user_allocate(Size); + if (EnumBuffer[EnumCount].Sid != NULL) + { + Status = LsapRegQueryValue(AttributeKeyHandle, + NULL, + NULL, + EnumBuffer[EnumCount].Sid, + &Size); + if (NT_SUCCESS(Status)) + { + EnumCount++; + } + else + { + TRACE("SampRegQueryValue returned %08lX\n", Status); + midl_user_free(EnumBuffer[EnumCount].Sid); + EnumBuffer[EnumCount].Sid = NULL; + } + } + } + + LsapRegCloseKey(AttributeKeyHandle); + } + } + + LsapRegCloseKey(AccountKeyHandle); + } + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + + if (NT_SUCCESS(Status) && EnumCount != 0) + { + ReturnBuffer = midl_user_allocate(EnumCount * sizeof(LSAPR_ACCOUNT_INFORMATION)); + if (ReturnBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + RtlCopyMemory(ReturnBuffer, + EnumBuffer, + EnumCount * sizeof(LSAPR_ACCOUNT_INFORMATION)); + + EnumerationBuffer->EntriesRead = EnumCount; + EnumerationBuffer->Information = ReturnBuffer; + } + +done: + if (EnumBuffer != NULL) + { + if (Status != STATUS_SUCCESS) + { + for (i = 0; i < EnumCount; i++) + { + if (EnumBuffer[i].Sid != NULL) + midl_user_free(EnumBuffer[i].Sid); + } + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, EnumBuffer); + } + + if (AccountKeyBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AccountKeyBuffer); + + if (Status == STATUS_SUCCESS && EnumCount == 0) + Status = STATUS_NO_MORE_ENTRIES; + + return Status; }

8 years, 4 months

[hbelusca] 72225: [ROSTESTS]: Add an interactive test that tests some parts of the event log service. CORE-11843 CORE-11838

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 14 19:15:54 2016 New Revision: 72225 URL: http://svn.reactos.org/svn/reactos?rev=72225&view=rev Log: [ROSTESTS]: Add an interactive test that tests some parts of the event log service. CORE-11843 CORE-11838 Added: trunk/rostests/win32/advapi32/ trunk/rostests/win32/advapi32/CMakeLists.txt (with props) trunk/rostests/win32/advapi32/eventlog/ trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt (with props) trunk/rostests/win32/advapi32/eventlog/EvtLogTest.c (with props) trunk/rostests/win32/advapi32/eventlog/MyEventProvider.mc (with props) Modified: trunk/rostests/win32/CMakeLists.txt Modified: trunk/rostests/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/CMakeLists.txt?rev=… ============================================================================== --- trunk/rostests/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/win32/CMakeLists.txt [iso-8859-1] Sun Aug 14 19:15:54 2016 @@ -1,2 +1,3 @@ +add_subdirectory(advapi32) add_subdirectory(kernel32) add_subdirectory(user32) Added: trunk/rostests/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/advapi32/CMakeLists… ============================================================================== --- trunk/rostests/win32/advapi32/CMakeLists.txt (added) +++ trunk/rostests/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug 14 19:15:54 2016 @@ -0,0 +1 @@ +add_subdirectory(eventlog) Propchange: trunk/rostests/win32/advapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/advapi32/eventlog/C… ============================================================================== --- trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt (added) +++ trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt [iso-8859-1] Sun Aug 14 19:15:54 2016 @@ -0,0 +1,21 @@ +## Original MSVC commands: +## mc -U MyEventProvider.mc +## rc /fo $(IntDir)MyEventProvider.res MyEventProvider.rc +## link /dll /noentry /SUBSYSTEM:CONSOLE",5.0" /out:$(SolutionDir)$(Configuration)\MyEventProvider.dll $(IntDir)MyEventProvider.res + +## add_message_headers(UNICODE MyEventProvider.mc) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.h + COMMAND ${CMAKE_MC_COMPILER} -U ${CMAKE_CURRENT_SOURCE_DIR}/MyEventProvider.mc -r ${CMAKE_CURRENT_BINARY_DIR}/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/MyEventProvider.mc) + +add_library(MyEventProvider SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc) +set_module_type(MyEventProvider win32dll UNICODE ENTRYPOINT 0) +add_cd_file(TARGET MyEventProvider DESTINATION reactos/bin FOR all) + +add_executable(evtlogtest EvtLogTest.c) +add_dependencies(evtlogtest MyEventProvider) +set_module_type(evtlogtest win32cui UNICODE) +add_importlibs(evtlogtest advapi32 msvcrt kernel32) +add_cd_file(TARGET evtlogtest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/advapi32/eventlog/EvtLogTest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/advapi32/eventlog/E… ============================================================================== --- trunk/rostests/win32/advapi32/eventlog/EvtLogTest.c (added) +++ trunk/rostests/win32/advapi32/eventlog/EvtLogTest.c [iso-8859-1] Sun Aug 14 19:15:54 2016 @@ -0,0 +1,468 @@ +/* + * PROJECT: ReactOS Tests + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rostests/win32/advapi32/eventlog/EvtLogTest.c + * PURPOSE: Interactively test some EventLog service APIs and its behaviour. + * PROGRAMMER: Hermes Belusca-Maito + */ + +#include <stdio.h> +#include <conio.h> + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "MyEventProvider.h" + +#define PROVIDER_NAME L"MyEventProvider" + +BOOL CreateEventLog(LPCWSTR EventLogName, + UINT MaxSize, + UINT SourcesCount, + LPCWSTR EventLogSources[]) +{ + BOOL Success = FALSE; + LONG lRet; + HKEY hKey = NULL, hEventKey = NULL, hSrcKey = NULL; + UINT i; + // WCHAR evtFile[] = L"D:\\myfile.evtx"; + + wprintf(L"Creating log %s of MaxSize 0x%x with %d sources...", EventLogName, MaxSize, SourcesCount); + + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Eventlog", + 0, KEY_CREATE_SUB_KEY, + &hKey); + if (lRet != ERROR_SUCCESS) + goto Quit; + + /* + * At this precise moment, EventLog detects we create a new log registry key + * and therefore creates for us the log file in System32\config (<= Win2k3) + * or in System32\winevt\Logs (>= Vista). + */ + lRet = RegCreateKeyExW(hKey, + EventLogName, + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, + &hEventKey, NULL); + if (lRet != ERROR_SUCCESS) + goto Quit; + + RegSetValueExW(hEventKey, L"MaxSize", 0, REG_DWORD, + (LPBYTE)&MaxSize, sizeof(MaxSize)); + + i = 0; + RegSetValueExW(hEventKey, L"Retention", 0, REG_DWORD, + (LPBYTE)&i, sizeof(i)); + +#if 0 + /* + * Set the flag that will allow EventLog to use an alternative log file name. + * If this flag is not set, EventLog will not care about the "File" value. + * When the flag is set, EventLog monitors for the "File" value, which can be + * changed at run-time, in which case a new event log file is created. + */ + i = 1; + RegSetValueExW(hEventKey, L"Flags", 0, REG_DWORD, + (LPBYTE)&i, sizeof(i)); + + RegSetValueExW(hEventKey, L"File", 0, REG_EXPAND_SZ, + (LPBYTE)evtFile, sizeof(evtFile)); +#endif + + for (i = 0; i < SourcesCount; i++) + { + lRet = RegCreateKeyExW(hEventKey, + EventLogSources[i], + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_QUERY_VALUE, NULL, + &hSrcKey, NULL); + RegFlushKey(hSrcKey); + RegCloseKey(hSrcKey); + } + + RegFlushKey(hEventKey); + + Success = TRUE; + +Quit: + if (Success) + wprintf(L"Success\n"); + else + wprintf(L"Failure\n"); + + if (hEventKey) + RegCloseKey(hEventKey); + + if (hKey) + RegCloseKey(hKey); + + return Success; +} + +BOOL RemoveEventLog(LPCWSTR EventLogName) +{ + BOOL Success = FALSE; + LONG lRet; + HKEY hKey, hEventKey; + DWORD MaxKeyNameLen, KeyNameLen; + LPWSTR Buf = NULL; + + wprintf(L"Deleting log %s...", EventLogName); + + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Eventlog", + 0, KEY_CREATE_SUB_KEY, + &hKey); + if (lRet != ERROR_SUCCESS) + goto Quit; + + lRet = RegOpenKeyExW(hKey, + EventLogName, + 0, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + &hEventKey); + if (lRet != ERROR_SUCCESS) + goto Quit; + + lRet = RegQueryInfoKeyW(hEventKey, + NULL, NULL, NULL, NULL, + &MaxKeyNameLen, + NULL, NULL, NULL, NULL, NULL, NULL); + if (lRet != ERROR_SUCCESS) + goto Quit; + + MaxKeyNameLen++; + + Buf = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, MaxKeyNameLen * sizeof(WCHAR)); + if (!Buf) + goto Quit; + + KeyNameLen = MaxKeyNameLen; + while (RegEnumKeyExW(hEventKey, + 0, + Buf, + &KeyNameLen, + NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + RegDeleteKeyW(hEventKey, Buf); + KeyNameLen = MaxKeyNameLen; + } + + RegFlushKey(hEventKey); + + HeapFree(GetProcessHeap(), 0, Buf); + + Success = TRUE; + +Quit: + if (Success) + { + RegCloseKey(hEventKey); + RegDeleteKeyW(hKey, EventLogName); + + wprintf(L"Success\n"); + } + else + { + if (hEventKey) + RegCloseKey(hEventKey); + + wprintf(L"Failure\n"); + } + + if (hKey) + RegCloseKey(hKey); + + return Success; +} + +VOID TestEventsGeneration(VOID) +{ + BOOL Success = FALSE; + LPCWSTR EvtLog = L"MyLog"; + LPCWSTR Sources[] = {L"Source1", L"Source2"}; + HANDLE hEventLog; + ULONG MaxSize = max(0x30 + 0x28 + 0x200, 0x010000); + + /* Create the test event log */ + if (!CreateEventLog(EvtLog, MaxSize, ARRAYSIZE(Sources), Sources)) + return; + + wprintf(L"Press any key to continue...\n"); + _getch(); + + /* To report events we can either use a handle got from OpenEventLog or from RegisterEventSource! */ + hEventLog = OpenEventLogW(NULL, EvtLog); + wprintf(L"OpenEventLogW(NULL, EvtLog = %s) ", EvtLog); + if (hEventLog) + { + LPCWSTR String = L"Event from OpenEventLog handle with EvtLog"; + + wprintf(L"succeeded\n"); + Success = ReportEventW(hEventLog, EVENTLOG_INFORMATION_TYPE, 1, 1, NULL, 1, 0, &String, NULL); + if (!Success) + wprintf(L" Failed to report event\n"); + } + else + { + wprintf(L"failed\n"); + } + CloseEventLog(hEventLog); + + /* This call should fail (where we use a source name for OpenEventLog) */ + hEventLog = OpenEventLogW(NULL, L"Source1"); + wprintf(L"OpenEventLogW(NULL, Source = %s) ", L"Source1"); + if (hEventLog) + { + LPCWSTR String = L"Event from OpenEventLog handle with Source"; + + wprintf(L"succeeded\n"); + Success = ReportEventW(hEventLog, EVENTLOG_INFORMATION_TYPE, 1, 1, NULL, 1, 0, &String, NULL); + if (!Success) + wprintf(L" Failed to report event\n"); + } + else + { + wprintf(L"failed\n"); + } + CloseEventLog(hEventLog); + + /* Now use RegisterEventSource */ + hEventLog = RegisterEventSourceW(NULL, EvtLog); + wprintf(L"RegisterEventSourceW(NULL, EvtLog = %s) ", EvtLog); + if (hEventLog) + { + LPCWSTR String = L"Event from RegisterEventSource handle with EvtLog"; + + wprintf(L"succeeded\n"); + Success = ReportEventW(hEventLog, EVENTLOG_INFORMATION_TYPE, 1, 1, NULL, 1, 0, &String, NULL); + if (!Success) + wprintf(L" Failed to report event\n"); + } + else + { + wprintf(L"failed\n"); + } + DeregisterEventSource(hEventLog); + + /* Now use RegisterEventSource */ + hEventLog = RegisterEventSourceW(NULL, L"Source1"); + wprintf(L"RegisterEventSourceW(NULL, Source = %s) ", L"Source1"); + if (hEventLog) + { + LPCWSTR String = L"Event from RegisterEventSource handle with Source"; + + wprintf(L"succeeded\n"); + Success = ReportEventW(hEventLog, EVENTLOG_INFORMATION_TYPE, 1, 1, NULL, 1, 0, &String, NULL); + if (!Success) + wprintf(L" Failed to report event\n"); + } + else + { + wprintf(L"failed\n"); + } + DeregisterEventSource(hEventLog); + + /* Now fill the log with one big event */ + hEventLog = OpenEventLogW(NULL, EvtLog); + wprintf(L"OpenEventLogW(NULL, EvtLog = %s) ", EvtLog); + if (hEventLog) + { + // LPWSTR String = L"Big event"; + PVOID Data; + + wprintf(L"succeeded\n"); + + // MaxSize -= (0x30 + 0x28 + 0x300 + 0x40); + MaxSize = 0xFC80 - sizeof(EVENTLOGRECORD); // With a StartOffset of 0x14, that should allow seeing the effect of splitting the EOF record in half... + Data = HeapAlloc(GetProcessHeap(), 0, MaxSize); + if (Data) + { + RtlFillMemory(Data, MaxSize, 0xCA); + Success = ReportEventW(hEventLog, EVENTLOG_INFORMATION_TYPE, 1, 1, NULL, 0 /* 1 */, MaxSize, NULL /* &String */, Data); + if (!Success) + wprintf(L" Failed to report event\n"); + + HeapFree(GetProcessHeap(), 0, Data); + } + } + else + { + wprintf(L"failed\n"); + } + CloseEventLog(hEventLog); + + wprintf(L"Press any key to continue...\n"); + _getch(); + + /* Delete the test event log */ + RemoveEventLog(EvtLog); +} + +/* + * This code was adapted from the MSDN article "Reporting Events" at: + * https://msdn.microsoft.com/en-us/library/windows/desktop/aa363680(v=vs.85).… + */ +VOID TestMyEventProvider(VOID) +{ + LONG lRet; + HKEY hKey = NULL, hSourceKey = NULL; + DWORD dwData; + // WCHAR DllPath[] = L"C:\\Users\\ReactOS\\Desktop\\EvtLogTest\\Debug\\" PROVIDER_NAME L".dll"; + WCHAR DllPath[] = L"C:\\" PROVIDER_NAME L".dll"; + + wprintf(L"Testing \"" PROVIDER_NAME L"\" in 'Application' log..."); + + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Eventlog\\Application", + 0, KEY_CREATE_SUB_KEY, + &hKey); + if (lRet != ERROR_SUCCESS) + goto Quit; + + lRet = RegCreateKeyExW(hKey, + PROVIDER_NAME, + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, + &hSourceKey, NULL); + if (lRet != ERROR_SUCCESS) + goto Quit; + + dwData = 3; + RegSetValueExW(hSourceKey, L"CategoryCount", 0, REG_DWORD, + (LPBYTE)&dwData, sizeof(dwData)); + + dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE; + RegSetValueExW(hSourceKey, L"TypesSupported", 0, REG_DWORD, + (LPBYTE)&dwData, sizeof(dwData)); + + RegSetValueExW(hSourceKey, L"CategoryMessageFile", 0, REG_SZ, + (LPBYTE)DllPath, sizeof(DllPath)); + + RegSetValueExW(hSourceKey, L"EventMessageFile", 0, REG_SZ, + (LPBYTE)DllPath, sizeof(DllPath)); + + RegSetValueExW(hSourceKey, L"ParameterMessageFile", 0, REG_SZ, + (LPBYTE)DllPath, sizeof(DllPath)); + + RegFlushKey(hSourceKey); + + { + CONST LPWSTR pBadCommand = L"The command that was not valid"; + CONST LPWSTR pFilename = L"c:\\folder\\file.ext"; + CONST LPWSTR pNumberOfRetries = L"3"; + CONST LPWSTR pSuccessfulRetries = L"0"; + CONST LPWSTR pQuarts = L"8"; + CONST LPWSTR pGallons = L"2"; + + HANDLE hEventLog = NULL; + LPWSTR pInsertStrings[2] = {NULL, NULL}; + DWORD dwEventDataSize = 0; + + // The source name (provider) must exist as a subkey of Application. + hEventLog = RegisterEventSourceW(NULL, PROVIDER_NAME); + if (NULL == hEventLog) + { + wprintf(L"RegisterEventSource failed with 0x%x.\n", GetLastError()); + goto cleanup; + } + + // This event includes user-defined data as part of the event. + // The event message does not use insert strings. + dwEventDataSize = ((DWORD)wcslen(pBadCommand) + 1) * sizeof(WCHAR); + if (!ReportEventW(hEventLog, EVENTLOG_ERROR_TYPE, UI_CATEGORY, MSG_INVALID_COMMAND, NULL, 0, dwEventDataSize, NULL, pBadCommand)) + { + wprintf(L"ReportEvent failed with 0x%x for event 0x%x.\n", GetLastError(), MSG_INVALID_COMMAND); + goto cleanup; + } + + // This event uses insert strings. + pInsertStrings[0] = pFilename; + if (!ReportEventW(hEventLog, EVENTLOG_ERROR_TYPE, DATABASE_CATEGORY, MSG_BAD_FILE_CONTENTS, NULL, 1, 0, (LPCWSTR*)pInsertStrings, NULL)) + { + wprintf(L"ReportEvent failed with 0x%x for event 0x%x.\n", GetLastError(), MSG_BAD_FILE_CONTENTS); + goto cleanup; + } + + // This event uses insert strings. + pInsertStrings[0] = pNumberOfRetries; + pInsertStrings[1] = pSuccessfulRetries; + if (!ReportEventW(hEventLog, EVENTLOG_WARNING_TYPE, NETWORK_CATEGORY, MSG_RETRIES, NULL, 2, 0, (LPCWSTR*)pInsertStrings, NULL)) + { + wprintf(L"ReportEvent failed with 0x%x for event 0x%x.\n", GetLastError(), MSG_RETRIES); + goto cleanup; + } + + // This event uses insert strings. + pInsertStrings[0] = pQuarts; + pInsertStrings[1] = pGallons; + if (!ReportEventW(hEventLog, EVENTLOG_INFORMATION_TYPE, UI_CATEGORY, MSG_COMPUTE_CONVERSION, NULL, 2, 0, (LPCWSTR*)pInsertStrings, NULL)) + { + wprintf(L"ReportEvent failed with 0x%x for event 0x%x.\n", GetLastError(), MSG_COMPUTE_CONVERSION); + goto cleanup; + } + + wprintf(L"All events successfully reported.\n"); + +cleanup: + + if (hEventLog) + DeregisterEventSource(hEventLog); + + } + +Quit: + // RegDeleteKeyW(hKey, PROVIDER_NAME); + + if (hKey) + RegCloseKey(hKey); +} + +int wmain(int argc, WCHAR* argv[]) +{ + UINT Choice = 0; + + wprintf(L"\n" + L"EventLog API interactive tester for ReactOS\n" + L"===========================================\n" + L"\n"); + +ChoiceMenu: + do + { + wprintf(L"What do you want to do:\n" + L"1) Test events generation.\n" + L"2) Test customized event provider.\n" + L"\n" + L"0) Quit the program.\n" + L"(Enter the right number, or 0 to quit): "); + wscanf(L"%lu", &Choice); + wprintf(L"\n\n"); + } while ((Choice != 0) && (Choice != 1) && (Choice != 2)); + + switch (Choice) + { + case 0: + goto Quit; + break; + + case 1: + TestEventsGeneration(); + break; + + case 2: + TestMyEventProvider(); + break; + + default: + break; + } + wprintf(L"\n\n\n\n"); + goto ChoiceMenu; + +Quit: + wprintf(L"Press any key to quit...\n"); + _getch(); + return 0; +} Propchange: trunk/rostests/win32/advapi32/eventlog/EvtLogTest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/advapi32/eventlog/MyEventProvider.mc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/advapi32/eventlog/M… ============================================================================== --- trunk/rostests/win32/advapi32/eventlog/MyEventProvider.mc (added) +++ trunk/rostests/win32/advapi32/eventlog/MyEventProvider.mc [iso-8859-1] Sun Aug 14 19:15:54 2016 @@ -0,0 +1,102 @@ +; // MyEventProvider.mc + +; // This is the header section. + + +SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS + Informational=0x1:STATUS_SEVERITY_INFORMATIONAL + Warning=0x2:STATUS_SEVERITY_WARNING + Error=0x3:STATUS_SEVERITY_ERROR + ) + + +FacilityNames=(System=0x0:FACILITY_SYSTEM + Runtime=0x2:FACILITY_RUNTIME + Stubs=0x3:FACILITY_STUBS + Io=0x4:FACILITY_IO_ERROR_CODE + ) + +LanguageNames=(English=0x409:MSG00409) + + +; // The following are the categories of events. + +MessageIdTypedef=WORD + +MessageId=0x1 +SymbolicName=NETWORK_CATEGORY +Language=English +Network Events +. + +MessageId=0x2 +SymbolicName=DATABASE_CATEGORY +Language=English +Database Events +. + +MessageId=0x3 +SymbolicName=UI_CATEGORY +Language=English +UI Events +. + + +; // The following are the message definitions. + +MessageIdTypedef=DWORD + +MessageId=0x100 +Severity=Error +Facility=Runtime +SymbolicName=MSG_INVALID_COMMAND +Language=English +The command is not valid. +. + + +MessageId=0x101 +Severity=Error +Facility=System +SymbolicName=MSG_BAD_FILE_CONTENTS +Language=English +File %1 contains content that is not valid. +. + +MessageId=0x102 +Severity=Warning +Facility=System +SymbolicName=MSG_RETRIES +Language=English +There have been %1 retries with %2 success! Disconnect from +the server and try again later. +. + +MessageId=0x103 +Severity=Informational +Facility=System +SymbolicName=MSG_COMPUTE_CONVERSION +Language=English +%1 %%4096 = %2 %%4097. +. + + +; // The following are the parameter strings */ + + +MessageId=0x1000 +Severity=Success +Facility=System +SymbolicName=QUARTS_UNITS +Language=English +quarts%0 +. + +MessageId=0x1001 +Severity=Success +Facility=System +SymbolicName=GALLONS_UNITS +Language=English +gallons%0 +. + Propchange: trunk/rostests/win32/advapi32/eventlog/MyEventProvider.mc ------------------------------------------------------------------------------ svn:eol-style = CRLF

8 years, 4 months

[hbelusca] 72224: [ROSTESTS]: Update the code file header.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 14 19:12:30 2016 New Revision: 72224 URL: http://svn.reactos.org/svn/reactos?rev=72224&view=rev Log: [ROSTESTS]: Update the code file header. Modified: trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c Modified: trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/paintdesktop… ============================================================================== --- trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c [iso-8859-1] (original) +++ trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c [iso-8859-1] Sun Aug 14 19:12:30 2016 @@ -1,10 +1,14 @@ /* - * PaintDesktop.c + * PROJECT: ReactOS Tests + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rostests/win32/user32/paintdesktop/PaintDesktop.c * - * Demonstrates how the user32!PaintDesktop() API visually works. - * This API paints the desktop inside the given HDC with its origin - * always fixed to the origin of the monitor on which the window is - * present. + * PURPOSE: Demonstrates how the user32!PaintDesktop() API visually works. + * This API paints the desktop inside the given HDC with its + * origin always fixed to the origin of the monitor on which + * the window is present. + * + * PROGRAMMER: Hermes Belusca-Maito */ #define WIN32_LEAN_AND_MEAN

8 years, 4 months

[hbelusca] 72223: [SDK:MC]: Ensure the EOL style of MC files is *always* CR-LF in *all* platforms.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 14 19:10:41 2016 New Revision: 72223 URL: http://svn.reactos.org/svn/reactos?rev=72223&view=rev Log: [SDK:MC]: Ensure the EOL style of MC files is *always* CR-LF in *all* platforms. Modified: trunk/reactos/sdk/include/reactos/mc/bootmsg.mc (contents, props changed) Modified: trunk/reactos/sdk/include/reactos/mc/bootmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/boo… ============================================================================== --- trunk/reactos/sdk/include/reactos/mc/bootmsg.mc [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/mc/bootmsg.mc [iso-8859-1] Sun Aug 14 19:10:41 2016 @@ -1,17 +1,17 @@ -MessageId=9001 -SymbolicName=BM_MSG_FIRST -Language=English -BM_MSG_FIRST -. - -MessageId=9002 -SymbolicName=BM_MSG_BCD_ERROR -Language=English -The Boot Configuration Data for your PC is missing or contains errors. -. - -MessageId=9999 -SymbolicName=BM_MSG_TEST -Language=English -We are A-ok!!! -. +MessageId=9001 +SymbolicName=BM_MSG_FIRST +Language=English +BM_MSG_FIRST +. + +MessageId=9002 +SymbolicName=BM_MSG_BCD_ERROR +Language=English +The Boot Configuration Data for your PC is missing or contains errors. +. + +MessageId=9999 +SymbolicName=BM_MSG_TEST +Language=English +We are A-ok!!! +. Propchange: trunk/reactos/sdk/include/reactos/mc/bootmsg.mc ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Sun Aug 14 19:10:41 2016 @@ -1 +1 @@ -native +CRLF

8 years, 4 months

[ekohl] 72222: [LSASRV] Add missing TRACE messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 14 16:16:40 2016 New Revision: 72222 URL: http://svn.reactos.org/svn/reactos?rev=72222&view=rev Log: [LSASRV] Add missing TRACE messages. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Aug 14 16:16:40 2016 @@ -70,7 +70,7 @@ PLSA_DB_OBJECT DbObject; NTSTATUS Status = STATUS_SUCCESS; - TRACE("0x%p\n", ObjectHandle); + TRACE("LsarClose(%p)\n", ObjectHandle); // RtlEnterCriticalSection(&PolicyHandleTableLock); @@ -94,6 +94,8 @@ NTSTATUS WINAPI LsarDelete( LSAPR_HANDLE ObjectHandle) { + TRACE("LsarDelete(%p)\n", ObjectHandle); + return LsarDeleteObject(&ObjectHandle); } @@ -286,7 +288,8 @@ PLSA_DB_OBJECT PolicyObject; NTSTATUS Status; - TRACE("LsarOpenPolicy called!\n"); + TRACE("LsarOpenPolicy(%S %p %lx %p)\n", + SystemName, ObjectAttributes, DesiredAccess, PolicyHandle); RtlEnterCriticalSection(&PolicyHandleTableLock); @@ -655,6 +658,9 @@ PLSA_DB_OBJECT PolicyObject; PLSA_DB_OBJECT AccountObject = NULL; NTSTATUS Status = STATUS_SUCCESS; + + TRACE("LsarCreateAccount(%p %p %lx %p)\n", + PolicyHandle, AccountSid, DesiredAccess, AccountHandle); /* Validate the AccountSid */ if (!RtlValidSid(AccountSid)) @@ -706,8 +712,8 @@ ULONG i; NTSTATUS Status = STATUS_SUCCESS; - TRACE("(%p %p %p %lu)\n", PolicyHandle, EnumerationContext, - EnumerationBuffer, PreferedMaximumLength); + TRACE("LsarEnumerateAccount(%p %p %p %lu)\n", + PolicyHandle, EnumerationContext, EnumerationBuffer, PreferedMaximumLength); if (EnumerationContext == NULL || EnumerationBuffer == NULL) @@ -951,7 +957,7 @@ ULONG i; NTSTATUS Status; - TRACE("(%p %lu %p %p %p %d %p)\n", + TRACE("LsarLookupNames(%p %lu %p %p %p %d %p)\n", PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount); @@ -1012,7 +1018,7 @@ ULONG i; NTSTATUS Status; - TRACE("(%p %p %p %p %d %p)\n", + TRACE("LsarLookupSids(%p %p %p %p %d %p)\n", PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames, LookupLevel, MappedCount); @@ -1073,6 +1079,9 @@ PSECURITY_DESCRIPTOR SecretSd = NULL; ULONG SecretSdSize; NTSTATUS Status = STATUS_SUCCESS; + + TRACE("LsarCreateSecret(%p %wZ %lx %p)\n", + PolicyHandle, SecretName, DesiredAccess, SecretHandle); /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, @@ -1211,6 +1220,9 @@ PLSA_DB_OBJECT PolicyObject; NTSTATUS Status; + TRACE("LsarOpenAccount(%p %p %lx %p)\n", + PolicyHandle, AccountSid, DesiredAccess, AccountHandle); + /* Validate the AccountSid */ if (!RtlValidSid(AccountSid)) return STATUS_INVALID_PARAMETER; @@ -1244,6 +1256,9 @@ ULONG PrivilegeSetSize = 0; PLSAPR_PRIVILEGE_SET PrivilegeSet = NULL; NTSTATUS Status; + + TRACE("LsarEnumeratePrivilegesAccount(%p %p)\n", + AccountHandle, Privileges); *Privileges = NULL; @@ -1302,6 +1317,9 @@ ULONG i, j; BOOL bFound; NTSTATUS Status; + + TRACE("LsarAddPrivilegesToAccount(%p %p)\n", + AccountHandle, Privileges); /* Validate the AccountHandle */ Status = LsapValidateDbObject(AccountHandle, @@ -1455,7 +1473,8 @@ BOOL bFound; NTSTATUS Status; - TRACE("(%p %u %p)\n", AccountHandle, AllPrivileges, Privileges); + TRACE("LsarRemovePrivilegesFromAccount(%p %u %p)\n", + AccountHandle, AllPrivileges, Privileges); /* */ if ((AllPrivileges == FALSE && Privileges == NULL) || @@ -1605,7 +1624,8 @@ ULONG Size; NTSTATUS Status; - TRACE("(%p %p)\n", AccountHandle, QuotaLimits); + TRACE("LsarGetQuotasForAccount(%p %p)\n", + AccountHandle, QuotaLimits); /* Validate the account handle */ Status = LsapValidateDbObject(AccountHandle, @@ -1638,7 +1658,8 @@ ULONG Size; NTSTATUS Status; - TRACE("(%p %p)\n", AccountHandle, QuotaLimits); + TRACE("LsarSetQuotasForAccount(%p %p)\n", + AccountHandle, QuotaLimits); /* Validate the account handle */ Status = LsapValidateDbObject(AccountHandle, @@ -1698,6 +1719,9 @@ ULONG Size = sizeof(ACCESS_MASK); NTSTATUS Status; + TRACE("LsarGetSystemAccessAccount(%p %p)\n", + AccountHandle, SystemAccess); + /* Validate the account handle */ Status = LsapValidateDbObject(AccountHandle, LsaDbAccountObject, @@ -1727,6 +1751,9 @@ PLSA_DB_OBJECT AccountObject; NTSTATUS Status; + TRACE("LsarSetSystemAccessAccount(%p %lx)\n", + AccountHandle, SystemAccess); + /* Validate the account handle */ Status = LsapValidateDbObject(AccountHandle, LsaDbAccountObject, @@ -1792,6 +1819,9 @@ PLSA_DB_OBJECT PolicyObject; PLSA_DB_OBJECT SecretObject = NULL; NTSTATUS Status = STATUS_SUCCESS; + + TRACE("LsarOpenSecret(%p %wZ %lx %p)\n", + PolicyHandle, SecretName, DesiredAccess, SecretHandle); /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, @@ -3012,6 +3042,9 @@ PBYTE CurrentValue = NULL; NTSTATUS Status; + TRACE("LsarRetrievePrivateData(%p %wZ %p)\n", + PolicyHandle, KeyName, EncryptedData); + /* Validate the SecretHandle */ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, @@ -3262,7 +3295,7 @@ { NTSTATUS Status; - TRACE("(%p %p %p %p %d %p %lu %lu)\n", + TRACE("LsarLookupSids2(%p %p %p %p %d %p %lu %lu)\n", PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames, LookupLevel, MappedCount, LookupOptions, ClientRevision); @@ -3300,7 +3333,7 @@ ULONG i; NTSTATUS Status; - TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", + TRACE("LsarLookupNames2(%p %lu %p %p %p %d %p %lu %lu)\n", PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount, LookupOptions, ClientRevision); @@ -3448,7 +3481,7 @@ { NTSTATUS Status; - TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", + TRACE("LsarLookupNames3(%p %lu %p %p %p %d %p %lu %lu)\n", PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount, LookupOptions, ClientRevision); @@ -3556,7 +3589,7 @@ { NTSTATUS Status; - TRACE("(%p %p %p %p %d %p %lu %lu)\n", + TRACE("LsarLookupSids3(%p %p %p %p %d %p %lu %lu)\n", PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames, LookupLevel, MappedCount, LookupOptions, ClientRevision); @@ -3592,7 +3625,7 @@ { NTSTATUS Status; - TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", + TRACE("LsarLookupNames4(%p %lu %p %p %p %d %p %lu %lu)\n", RpcHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount, LookupOptions, ClientRevision);

8 years, 4 months

[gadamopoulos] 72221: [SHELL32] - Fix a bug in CStartMenu_Constructor and add some comments to explain what this part does.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 14 16:15:02 2016 New Revision: 72221 URL: http://svn.reactos.org/svn/reactos?rev=72221&view=rev Log: [SHELL32] - Fix a bug in CStartMenu_Constructor and add some comments to explain what this part does. Modified: trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp [iso-8859-1] Sun Aug 14 16:15:02 2016 @@ -472,6 +472,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + /* psf is a merged folder, so now we want to get the pidl of the programs item from the merged folder */ { hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute); if (FAILED(hr)) @@ -491,13 +492,14 @@ if (FAILED(hr)) return hr; - hr = psfParent->GetDisplayNameOf(pcidlPrograms, SHGDN_NORMAL, &str); + hr = psfParent->GetDisplayNameOf(pcidlPrograms, SHGDN_FORPARSING | SHGDN_INFOLDER, &str); if (FAILED(hr)) return hr; StrRetToBuf(&str, pcidlPrograms, szDisplayName, _countof(szDisplayName)); ILFree(pidlProgramsAbsolute); + /* We got the display name from the fs folder and we parse it with the merged folder here */ hr = psf->ParseDisplayName(NULL, NULL, szDisplayName, NULL, &pidlPrograms, NULL); if (FAILED(hr)) return hr;

8 years, 4 months

[ekohl] 72220: [LSASRV] LsarQuerySecurityObject: Build a new SD that conatains requested information only and return it to the caller.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 14 15:42:40 2016 New Revision: 72220 URL: http://svn.reactos.org/svn/reactos?rev=72220&view=rev Log: [LSASRV] LsarQuerySecurityObject: Build a new SD that conatains requested information only and return it to the caller. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Aug 14 15:42:40 2016 @@ -136,13 +136,20 @@ { PLSA_DB_OBJECT DbObject = NULL; PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSECURITY_DESCRIPTOR ResultSd = NULL; PLSAPR_SR_SECURITY_DESCRIPTOR SdData = NULL; ACCESS_MASK DesiredAccess = 0; ULONG RelativeSdSize = 0; + ULONG ResultSdSize = 0; NTSTATUS Status; + + TRACE("LsarQuerySecurityObject(%p %lx %p)\n", + ObjectHandle, SecurityInformation, SecurityDescriptor); if (SecurityDescriptor == NULL) return STATUS_INVALID_PARAMETER; + + *SecurityDescriptor = NULL; if ((SecurityInformation & OWNER_SECURITY_INFORMATION) || (SecurityInformation & GROUP_SECURITY_INFORMATION) || @@ -181,10 +188,40 @@ if (!NT_SUCCESS(Status)) goto done; - /* - * FIXME: Invalidate the SD information that was not requested. - * (see SecurityInformation) - */ + /* Invalidate the SD information that was not requested */ + if (!(SecurityInformation & OWNER_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Owner = NULL; + + if (!(SecurityInformation & GROUP_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Group = NULL; + + if (!(SecurityInformation & DACL_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_DACL_PRESENT; + + if (!(SecurityInformation & SACL_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_SACL_PRESENT; + + /* Calculate the required SD size */ + Status = RtlMakeSelfRelativeSD(RelativeSd, + NULL, + &ResultSdSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the new SD */ + ResultSd = MIDL_user_allocate(ResultSdSize); + if (ResultSd == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Build the new SD */ + Status = RtlMakeSelfRelativeSD(RelativeSd, + ResultSd, + &ResultSdSize); + if (!NT_SUCCESS(Status)) + goto done; /* Allocate the SD data buffer */ SdData = MIDL_user_allocate(sizeof(LSAPR_SR_SECURITY_DESCRIPTOR)); @@ -196,16 +233,19 @@ /* Fill the SD data buffer and return it to the caller */ SdData->Length = RelativeSdSize; - SdData->SecurityDescriptor = (PBYTE)RelativeSd; + SdData->SecurityDescriptor = (PBYTE)ResultSd; *SecurityDescriptor = SdData; done: if (!NT_SUCCESS(Status)) { - if (RelativeSd != NULL) - MIDL_user_free(RelativeSd); - } + if (ResultSd != NULL) + MIDL_user_free(ResultSd); + } + + if (RelativeSd != NULL) + MIDL_user_free(RelativeSd); return Status; } @@ -2174,7 +2214,7 @@ PLSA_DB_OBJECT DbObject; NTSTATUS Status; - TRACE("(%p)\n", ObjectHandle); + TRACE("LsarDeleteObject(%p)\n", ObjectHandle); if (ObjectHandle == NULL) return STATUS_INVALID_PARAMETER;

8 years, 4 months

[apriyadarshi] 72219: Added Port Reset for non Idle ports FIXED missing VendorId, RevisionId and SerialNo

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Sun Aug 14 12:54:10 2016 New Revision: 72219 URL: http://svn.reactos.org/svn/reactos?rev=72219&view=rev Log: Added Port Reset for non Idle ports FIXED missing VendorId, RevisionId and SerialNo Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Sun Aug 14 12:54:10 2016 @@ -24,8 +24,8 @@ ) { AHCI_PORT_CMD cmd; - ULONG mappedLength, portNumber; PAHCI_MEMORY_REGISTERS abar; + ULONG mappedLength, portNumber, ticks; PAHCI_ADAPTER_EXTENSION adapterExtension; STOR_PHYSICAL_ADDRESS commandListPhysical, receivedFISPhysical; @@ -76,7 +76,22 @@ cmd.Status = StorPortReadRegisterUlong(adapterExtension, &PortExtension->Port->CMD); if ((cmd.FR != 0) || (cmd.CR != 0) || (cmd.FRE != 0) || (cmd.ST != 0)) { - AhciDebugPrint("\tPort is not idle: %x\n", cmd); + cmd.ST = 0; + cmd.FRE = 0; + + ticks = 3; + do + { + StorPortStallExecution(50000); + cmd.Status = StorPortReadRegisterUlong(adapterExtension, &PortExtension->Port->CMD); + if (ticks == 0) + { + AhciDebugPrint("\tAttempt to reset port failed: %x\n", cmd); + return FALSE; + } + ticks--; + } + while(cmd.CR != 0 || cmd.FR != 0); } // 10.1.2 For each implemented port, system software shall allocate memory for and program: @@ -1644,6 +1659,15 @@ PortExtension->DeviceParams.BytesPerPhysicalSector = DEVICE_ATA_BLOCK_SIZE; + // last byte should be NULL + StorPortCopyMemory(PortExtension->DeviceParams.VendorId, IdentifyDeviceData->ModelNumber, sizeof(PortExtension->DeviceParams.VendorId) - 1); + StorPortCopyMemory(PortExtension->DeviceParams.RevisionID, IdentifyDeviceData->FirmwareRevision, sizeof(PortExtension->DeviceParams.RevisionID) - 1); + StorPortCopyMemory(PortExtension->DeviceParams.SerialNumber, IdentifyDeviceData->SerialNumber, sizeof(PortExtension->DeviceParams.SerialNumber) - 1); + + PortExtension->DeviceParams.VendorId[sizeof(PortExtension->DeviceParams.VendorId) - 1] = '\0'; + PortExtension->DeviceParams.RevisionID[sizeof(PortExtension->DeviceParams.RevisionID) - 1] = '\0'; + PortExtension->DeviceParams.SerialNumber[sizeof(PortExtension->DeviceParams.SerialNumber) - 1] = '\0'; + // TODO: Add other device params AhciDebugPrint("\tATA Device\n"); } @@ -1658,6 +1682,7 @@ if (Srb->DataTransferLength < INQUIRYDATABUFFERSIZE) { AhciDebugPrint("\tDataBufferLength < sizeof(INQUIRYDATA), Could crash the driver.\n"); + NT_ASSERT(FALSE); } // update data transfer length @@ -1674,10 +1699,14 @@ InquiryData->DeviceType = PortExtension->DeviceParams.AccessType; InquiryData->RemovableMedia = PortExtension->DeviceParams.RemovableDevice; - // TODO: Fill VendorID, Product Revision Level and other string fields - InquiryData->VendorId[0] = '2'; - InquiryData->ProductId[0] = '3'; - InquiryData->ProductRevisionLevel[0] = '4'; + // Fill VendorID, Product Revision Level and other string fields + StorPortCopyMemory(InquiryData->VendorId, PortExtension->DeviceParams.VendorId, sizeof(InquiryData->VendorId) - 1); + StorPortCopyMemory(InquiryData->ProductId, PortExtension->DeviceParams.RevisionID, sizeof(PortExtension->DeviceParams.RevisionID)); + StorPortCopyMemory(InquiryData->ProductRevisionLevel, PortExtension->DeviceParams.SerialNumber, sizeof(InquiryData->ProductRevisionLevel) - 1); + + InquiryData->VendorId[sizeof(InquiryData->VendorId) - 1] = '\0'; + InquiryData->ProductId[sizeof(InquiryData->ProductId) - 1] = '\0'; + InquiryData->ProductRevisionLevel[sizeof(InquiryData->ProductRevisionLevel) - 1] = '\0'; // send queue depth status = StorPortSetDeviceQueueDepth(PortExtension->AdapterExtension, Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Sun Aug 14 12:54:10 2016 @@ -76,9 +76,7 @@ #define AHCI_Global_Port_CAP_NCS(x) (((x) & 0xF00) >> 8) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#ifdef DBG - #define AhciDebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) -#endif +#define AhciDebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) typedef VOID @@ -472,9 +470,9 @@ LARGE_INTEGER MaxLba; ULONG BytesPerLogicalSector; ULONG BytesPerPhysicalSector; - // UCHAR VendorId[41]; - // UCHAR RevisionID[9]; - // UCHAR SerialNumber[21]; + UCHAR VendorId[41]; + UCHAR RevisionID[9]; + UCHAR SerialNumber[21]; } DeviceParams; STOR_DPC CommandCompletion;

8 years, 4 months

← Newer
1
...
28
29
30
31
32
33
34
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016