Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/15: [CMAKE] Add baseaddress_msvc_x64.cmake

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=280aa211794eb5ab93bf5… commit 280aa211794eb5ab93bf5a955253e1480ded5720 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 4 20:12:23 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [CMAKE] Add baseaddress_msvc_x64.cmake --- CMakeLists.txt | 6 +- sdk/cmake/baseaddress_msvc_x64.cmake | 391 +++++++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cbb6b3f190..a128b804842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,7 +236,11 @@ else() if(NO_ROSSYM) include(sdk/cmake/baseaddress_dwarf.cmake) elseif(MSVC) - include(sdk/cmake/baseaddress_msvc.cmake) + if (ARCH STREQUAL "amd64") + include(sdk/cmake/baseaddress_msvc_x64.cmake) + else() + include(sdk/cmake/baseaddress_msvc.cmake) + endif() else() include(sdk/cmake/baseaddress.cmake) endif() diff --git a/sdk/cmake/baseaddress_msvc_x64.cmake b/sdk/cmake/baseaddress_msvc_x64.cmake new file mode 100644 index 00000000000..b0b32e21b93 --- /dev/null +++ b/sdk/cmake/baseaddress_msvc_x64.cmake @@ -0,0 +1,391 @@ +# +# +set(baseaddress_ntdll 0x7FFB7500000) +set(baseaddress_kernel32 0x7FFB6500000) +set(baseaddress_msvcrt 0x7FFB5500000) +set(baseaddress_advapi32 0x7FFB4500000) +set(baseaddress_gdi32 0x7FFB3500000) +set(baseaddress_user32 0x7FFB2500000) +set(baseaddress_dhcpcsvc 0x7FFB1500000) +set(baseaddress_dnsapi 0x7FFB0500000) +set(baseaddress_icmp 0x7FFAF500000) +set(baseaddress_iphlpapi 0x7FFAE500000) +set(baseaddress_ws2_32 0x7FFAD500000) +set(baseaddress_ws2help 0x7FFAC500000) +set(baseaddress_shlwapi 0x7FFAB500000) +set(baseaddress_rpcrt4 0x7FFAA500000) +set(baseaddress_comctl32 0x7FFA9500000) +set(baseaddress_ole32 0x7FFA8500000) +set(baseaddress_winspool 0x7FFA7500000) +set(baseaddress_winmm 0x7FFA6500000) +set(baseaddress_comdlg32 0x7FFA5500000) +set(baseaddress_shell32 0x7FFA4500000) +set(baseaddress_lz32 0x7FFA3500000) +set(baseaddress_version 0x7FFA2500000) +set(baseaddress_oleaut32 0x7FFA1500000) +set(baseaddress_setupapi 0x7FFA0500000) +set(baseaddress_mpr 0x7FF9F500000) +set(baseaddress_crypt32 0x7FF9E500000) +set(baseaddress_wininet 0x7FF9D500000) +set(baseaddress_urlmon 0x7FF9C500000) +set(baseaddress_psapi 0x7FF9B500000) +set(baseaddress_imm32 0x7FF9A500000) +set(baseaddress_msvfw32 0x7FF99500000) +set(baseaddress_dbghelp 0x7FF98500000) +set(baseaddress_devmgr 0x7FF97500000) +set(baseaddress_msacm32 0x7FF96500000) +set(baseaddress_netapi32 0x7FF95500000) +set(baseaddress_powrprof 0x7FF94500000) +set(baseaddress_secur32 0x7FF93500000) +set(baseaddress_wintrust 0x7FF92500000) +set(baseaddress_avicap32 0x7FF91500000) +set(baseaddress_cabinet 0x7FF90500000) +set(baseaddress_dsound 0x7FF8F500000) +set(baseaddress_glu32 0x7FF8E500000) +set(baseaddress_opengl32 0x7FF8D500000) +set(baseaddress_riched20 0x7FF8C500000) +set(baseaddress_smdll 0x7FF8B500000) +set(baseaddress_userenv 0x7FF8A500000) +set(baseaddress_uxtheme 0x7FF89500000) +set(baseaddress_cryptui 0x7FF88500000) +set(baseaddress_csrsrv 0x7FF87500000) +set(baseaddress_basesrv 0x7FF86500000) +set(baseaddress_winsrv 0x7FF85500000) +set(baseaddress_dplayx 0x7FF84500000) +set(baseaddress_gdiplus 0x7FF83500000) +set(baseaddress_msimg32 0x7FF82500000) +set(baseaddress_mswsock 0x7FF81500000) +set(baseaddress_oledlg 0x7FF80500000) +set(baseaddress_rasapi32 0x7FF7F500000) +set(baseaddress_rsaenh 0x7FF7E500000) +set(baseaddress_samlib 0x7FF7D500000) +set(baseaddress_sensapi 0x7FF7C500000) +set(baseaddress_sfc_os 0x7FF7B500000) +set(baseaddress_snmpapi 0x7FF7A500000) +set(baseaddress_spoolss 0x7FF79500000) +set(baseaddress_usp10 0x7FF78500000) +set(baseaddress_access 0x7FF78200000) +set(baseaddress_acgenral 0x7FF78000000) +set(baseaddress_aclayers 0x7FF77500000) +set(baseaddress_acledit 0x7FF76500000) +set(baseaddress_aclui 0x7FF75500000) +set(baseaddress_acppage 0x7FF74500000) +set(baseaddress_activeds 0x7FF73500000) +set(baseaddress_actxprxy 0x7FF72500000) +set(baseaddress_advapi32_vista 0x7FF71500000) +set(baseaddress_advpack 0x7FF70500000) +set(baseaddress_amstream 0x7FF6F500000) +set(baseaddress_apphelp 0x7FF6E500000) +set(baseaddress_appwiz 0x7FF6E000000) +set(baseaddress_atl 0x7FF6D500000) # 0001E000 +set(baseaddress_atl100 0x7FF6C500000) +set(baseaddress_atl80 0x7FF6B500000) +set(baseaddress_authz 0x7FF6A500000) +set(baseaddress_avifil32 0x7FF69500000) +set(baseaddress_batt 0x7FF68500000) +set(baseaddress_bcrypt 0x7FF67500000) +set(baseaddress_beepmidi 0x7FF66500000) +set(baseaddress_browseui 0x7FF65500000) +set(baseaddress_bthci 0x7FF64600000) # 0000D000 +set(baseaddress_cards 0x7FF64500000) # 000A0000 +set(baseaddress_cfgmgr32 0x7FF63500000) +set(baseaddress_clusapi 0x7FF62500000) +set(baseaddress_cmicpl 0x7FF61600000) +set(baseaddress_comcat 0x7FF61500000) # 00007000 +set(baseaddress_compstui 0x7FF60500000) +set(baseaddress_console 0x7FF5F500000) +set(baseaddress_credui 0x7FF5E500000) +set(baseaddress_crtdll 0x7FF5D500000) +set(baseaddress_cryptdlg 0x7FF5C500000) +set(baseaddress_cryptdll 0x7FF5B500000) +set(baseaddress_cryptnet 0x7FF5A500000) +set(baseaddress_custom 0x7FF5A000000) +set(baseaddress_d3d8 0x7FF59500000) +set(baseaddress_d3d8thk 0x7FF58500000) +set(baseaddress_d3d9 0x7FF57500000) +set(baseaddress_d3dcompiler_43 0x7FF56500000) +set(baseaddress_d3drm 0x7FF55500000) +set(baseaddress_d3dwine 0x7FF54500000) +set(baseaddress_d3dx9_24 0x7FF53500000) +set(baseaddress_d3dx9_25 0x7FF52500000) +set(baseaddress_d3dx9_26 0x7FF51500000) +set(baseaddress_d3dx9_27 0x7FF50500000) +set(baseaddress_d3dx9_28 0x7FF4F500000) +set(baseaddress_d3dx9_29 0x7FF4E500000) +set(baseaddress_d3dx9_30 0x7FF4D500000) +set(baseaddress_d3dx9_31 0x7FF4C500000) +set(baseaddress_d3dx9_32 0x7FF4B500000) +set(baseaddress_d3dx9_33 0x7FF4A500000) +set(baseaddress_d3dx9_34 0x7FF49500000) +set(baseaddress_d3dx9_35 0x7FF48500000) +set(baseaddress_d3dx9_36 0x7FF47500000) +set(baseaddress_d3dx9_37 0x7FF46500000) +set(baseaddress_d3dx9_38 0x7FF45500000) +set(baseaddress_d3dx9_39 0x7FF44500000) +set(baseaddress_d3dx9_40 0x7FF43500000) +set(baseaddress_d3dx9_41 0x7FF42500000) +set(baseaddress_d3dx9_42 0x7FF41500000) +set(baseaddress_d3dx9_43 0x7FF40500000) +set(baseaddress_d3dxof 0x7FF3F500000) +set(baseaddress_dciman32 0x7FF3E500000) +set(baseaddress_ddraw 0x7FF3D500000) +set(baseaddress_desk 0x7FF3D000000) +set(baseaddress_deskadp 0x7FF3C500000) +set(baseaddress_deskmon 0x7FF3B500000) +set(baseaddress_devcpux 0x7FF3A500000) +set(baseaddress_devenum 0x7FF39500000) +set(baseaddress_dinput 0x7FF38500000) +set(baseaddress_dinput8 0x7FF37500000) +set(baseaddress_dmusic 0x7FF36500000) +set(baseaddress_dplay 0x7FF35500000) +set(baseaddress_dxdiagn 0x7FF34500000) +set(baseaddress_dxtn 0x7FF34000000) +set(baseaddress_esent 0x7FF33500000) +set(baseaddress_faultrep 0x7FF32500000) +set(baseaddress_fltlib 0x7FF31500000) +set(baseaddress_fmifs 0x7FF30500000) +set(baseaddress_fontext 0x7FF2F500000) +set(baseaddress_fontsub 0x7FF2E500000) +#set(baseaddress_framebuf 0x7FF2D500000) +#set(baseaddress_framebuf_new 0x7FF2C500000) +set(baseaddress_framedyn 0x7FF2B500000) +#set(baseaddress_genincdata 0x7FF2A500000) +set(baseaddress_getuname 0x7FF29500000) +set(baseaddress_hdwwiz 0x7FF29700000) +set(baseaddress_hhctrl 0x7FF28600000) +set(baseaddress_hid 0x7FF28500000) +set(baseaddress_hlink 0x7FF27500000) +set(baseaddress_hnetcfg 0x7FF26500000) +set(baseaddress_httpapi 0x7FF25500000) +set(baseaddress_iccvid 0x7FF24500000) +set(baseaddress_ieframe 0x7FF23500000) +set(baseaddress_iernonce 0x7FF22500000) +set(baseaddress_imaadp32.acm 0x7FF22000000) +set(baseaddress_imagehlp 0x7FF21500000) +set(baseaddress_inetcomm 0x7FF20500000) +set(baseaddress_inetcpl 0x7FF20000000) +set(baseaddress_inetmib1 0x7FF1F500000) +set(baseaddress_initpki 0x7FF1E500000) +set(baseaddress_input 0x7FF1D500000) +set(baseaddress_inseng 0x7FF1C500000) +set(baseaddress_intl 0x7FF1C000000) +set(baseaddress_iologmsg 0x7FF1B500000) +set(baseaddress_itircl 0x7FF1A500000) +set(baseaddress_itss 0x7FF19500000) +set(baseaddress_joy 0x7FF19000000) +set(baseaddress_jscript 0x7FF18500000) # 000A4000 +set(baseaddress_jsproxy 0x7FF17500000) +set(baseaddress_kbdeo 0x7FF17000000) +set(baseaddress_kbsdll 0x7FF16500000) +set(baseaddress_kernel32_vista 0x7FF15500000) +set(baseaddress_ksuser 0x7FF14500000) +set(baseaddress_libjpeg 0x7FF13500000) +set(baseaddress_libpng 0x7FF12500000) +set(baseaddress_libtiff 0x7FF11500000) +set(baseaddress_libtirpc 0x7FF11000000) +set(baseaddress_libxslt 0x7FF10500000) +set(baseaddress_load_notifications 0x7FF10000000) +set(baseaddress_loadperf 0x7FF0F500000) +set(baseaddress_localmon 0x7FF0F000000) +set(baseaddress_localspl 0x7FF0E500000) +set(baseaddress_localspl_apitest 0x7FF0E000000) +set(baseaddress_localui 0x7FF0D500000) +set(baseaddress_lpk 0x7FF0C500000) +set(baseaddress_lsasrv 0x7FF0B500000) +set(baseaddress_main 0x7FF0B000000) +set(baseaddress_mapi32 0x7FF0A500000) +set(baseaddress_mbedtls 0x7FF09500000) +set(baseaddress_mciavi32 0x7FF08500000) +set(baseaddress_mcicda 0x7FF07500000) +set(baseaddress_mciqtz32 0x7FF06500000) +set(baseaddress_mciseq 0x7FF05500000) +set(baseaddress_mciwave 0x7FF04500000) +set(baseaddress_mgmtapi 0x7FF03500000) +set(baseaddress_midimap 0x7FF02500000) +set(baseaddress_mlang 0x7FF01500000) +set(baseaddress_mmdrv 0x7FF00500000) +set(baseaddress_mmsys 0x7FF00000000) +set(baseaddress_modemui 0x7FEFF500000) +set(baseaddress_mprapi 0x7FEFE500000) +set(baseaddress_msacm32.drv 0x7FEFE100000) +set(baseaddress_msadp32.acm 0x7FEFE000000) +set(baseaddress_msafd 0x7FEFD500000) +set(baseaddress_mscat32 0x7FEFC500000) +set(baseaddress_mscms 0x7FEFB500000) +set(baseaddress_mscoree 0x7FEFA500000) +set(baseaddress_msctf 0x7FEF9500000) +set(baseaddress_msdmo 0x7FEF8500000) +set(baseaddress_msftedit 0x7FEF7500000) +set(baseaddress_msg711.acm 0x7FEF7000000) +set(baseaddress_msgina 0x7FEF6500000) +set(baseaddress_msgsm32.acm 0x7FEF6000000) +set(baseaddress_mshtml 0x7FEF5500000) +set(baseaddress_msi 0x7FEF4500000) +set(baseaddress_msimtf 0x7FEF3500000) +set(baseaddress_msisip 0x7FEF2500000) +set(baseaddress_msisys 0x7FEF2000000) +set(baseaddress_mspatcha 0x7FEF1500000) +set(baseaddress_msports 0x7FEF0500000) +set(baseaddress_msrle32 0x7FEEF500000) +set(baseaddress_mssign32 0x7FEEE500000) +set(baseaddress_mssip32 0x7FEED500000) +set(baseaddress_mstask 0x7FEEC500000) +set(baseaddress_msv1_0 0x7FEEB500000) +set(baseaddress_msvcrt20 0x7FEE9500000) +set(baseaddress_msvcrt40 0x7FEE8500000) +set(baseaddress_msvcrt_crt_dll_startup 0x7FEEA500000) +set(baseaddress_msvidc32 0x7FEE7500000) +set(baseaddress_msxml 0x7FEE6500000) +set(baseaddress_msxml2 0x7FEE5500000) +set(baseaddress_msxml3 0x7FEE4500000) +set(baseaddress_msxml4 0x7FEE3500000) +set(baseaddress_msxml6 0x7FEE2500000) +set(baseaddress_mycomput 0x7FEE1500000) +set(baseaddress_ncpa 0x7FEE1000000) +set(baseaddress_nddeapi 0x7FEE0500000) +set(baseaddress_netcfgx 0x7FEDF500000) +set(baseaddress_netevent 0x7FEDE500000) +set(baseaddress_netid 0x7FEDD500000) +set(baseaddress_netshell 0x7FEDC500000) +set(baseaddress_newdev 0x7FEDB500000) +set(baseaddress_nfs41_np 0x7FEDB000000) +set(baseaddress_normaliz 0x7FEDA500000) +set(baseaddress_notifyhook 0x7FED9500000) +set(baseaddress_npptools 0x7FED8500000) +set(baseaddress_ntdll_vista 0x7FED8000000) +set(baseaddress_ntdsapi 0x7FED7500000) +set(baseaddress_ntlanman 0x7FED6500000) +set(baseaddress_ntmarta 0x7FED5500000) +set(baseaddress_ntobjshex 0x7FED4500000) +set(baseaddress_objsel 0x7FED2500000) +set(baseaddress_odbc32 0x7FED1500000) +set(baseaddress_odbccp32 0x7FED0500000) +set(baseaddress_odbccp32i 0x7FED0000000) +set(baseaddress_oleacc 0x7FECF500000) # 0003A000 +set(baseaddress_olecli32 0x7FECE500000) +set(baseaddress_olepro32 0x7FECD500000) +set(baseaddress_olesvr32 0x7FECC500000) +set(baseaddress_olethk32 0x7FECB500000) +set(baseaddress_openglcfg 0x7FECB000000) +set(baseaddress_pdh 0x7FECA500000) +set(baseaddress_pidgen 0x7FEC9500000) +set(baseaddress_pifmgr 0x7FEC8500000) +set(baseaddress_powercfg 0x7FEC8000000) +set(baseaddress_printui 0x7FEC7500000) +set(baseaddress_propsys 0x7FEC6500000) +set(baseaddress_pstorec 0x7FEC5500000) +set(baseaddress_qedit 0x7FEC4500000) +set(baseaddress_qmgr 0x7FEC3500000) +set(baseaddress_qmgrprxy 0x7FEC2500000) +set(baseaddress_quartz 0x7FEC1500000) +set(baseaddress_query 0x7FEC0500000) +set(baseaddress_rasadhlp 0x7FEBF500000) +set(baseaddress_rasdlg 0x7FEBE500000) +set(baseaddress_rasman 0x7FEBD500000) +set(baseaddress_redirtest1 0x7FEBD500000) +set(baseaddress_redirtest2 0x7FEBD000000) +set(baseaddress_resutils 0x7FEBC500000) +set(baseaddress_riched32 0x7FEBB500000) +set(baseaddress_rsabase 0x7FEBA500000) +set(baseaddress_rshell 0x7FEB9500000) +set(baseaddress_samsrv 0x7FEB8500000) +set(baseaddress_sccbase 0x7FEB7500000) +set(baseaddress_schannel 0x7FEB6500000) +set(baseaddress_schedsvc 0x7FEB5500000) +set(baseaddress_scrrun 0x7FEB4500000) +set(baseaddress_security 0x7FEB3500000) +set(baseaddress_serialui 0x7FEB2500000) +set(baseaddress_sfc 0x7FEB1500000) +set(baseaddress_shdoclc 0x7FEB0500000) +set(baseaddress_shdocvw 0x7FEAF500000) +set(baseaddress_shellbtrfs 0x7FEAF000000) +set(baseaddress_shfolder 0x7FEAE500000) +set(baseaddress_shimgvw 0x7FEAD500000) +set(baseaddress_shsvcs 0x7FEAD000000) +set(baseaddress_slbcsp 0x7FEAB500000) +set(baseaddress_sndblst 0x7FEAA500000) +set(baseaddress_softpub 0x7FEA9500000) +set(baseaddress_srclient 0x7FEA8500000) +set(baseaddress_srvsvc 0x7FEA7500000) +set(baseaddress_sti 0x7FEA6500000) +set(baseaddress_stobject 0x7FEA5500000) +set(baseaddress_streamci 0x7FEA4500000) +set(baseaddress_sxs 0x7FEA3500000) +set(baseaddress_sysdm 0x7FEA3000000) +set(baseaddress_syssetup 0x7FEA2500000) # 00101000 +set(baseaddress_t2embed 0x7FEA1500000) +set(baseaddress_tapi32 0x7FEA0500000) +set(baseaddress_tapiui 0x7FE9F500000) +set(baseaddress_telephon 0x7FE9F000000) +set(baseaddress_testvdd 0x7FE9E500000) +set(baseaddress_themeui 0x7FE9D500000) +set(baseaddress_timedate 0x7FE9D000000) +set(baseaddress_traffic 0x7FE9C500000) +set(baseaddress_twain_32 0x7FE9B500000) +set(baseaddress_ubtrfs 0x7FE9A500000) +set(baseaddress_ucdfs 0x7FE9A000000) +set(baseaddress_uext2 0x7FE99500000) +set(baseaddress_ufat 0x7FE98500000) +set(baseaddress_ufatx 0x7FE97500000) +set(baseaddress_uffs 0x7FE96500000) +set(baseaddress_umpnpmgr 0x7FE95500000) +set(baseaddress_untfs 0x7FE94500000) +set(baseaddress_updspapi 0x7FE93500000) +set(baseaddress_ureiserfs 0x7FE92500000) +set(baseaddress_url 0x7FE91500000) +set(baseaddress_usrmgr 0x7FE91000000) +set(baseaddress_vbscript 0x7FE90500000) # 00058000 +set(baseaddress_vdmdbg 0x7FE8F500000) +set(baseaddress_verifier 0x7FE8F000000) +set(baseaddress_vfd 0x7FE8EA00000) +set(baseaddress_vssapi 0x7FE8E500000) +set(baseaddress_wbemdisp 0x7FE8D500000) +set(baseaddress_wbemprox 0x7FE8C500000) +set(baseaddress_wdmaud.drv 0x7FE8C000000) +set(baseaddress_win32u 0x7FE8B500000) +set(baseaddress_win32u_2k3sp2 0x7FE8A500000) +set(baseaddress_win32u_xpsp2 0x7FE89500000) +set(baseaddress_windowscodecs 0x7FE88500000) +set(baseaddress_windowscodecsext 0x7FE87500000) +set(baseaddress_wined3dcfg 0x7FE87100000) +set(baseaddress_winemp3.acm 0x7FE87000000) +set(baseaddress_winfax 0x7FE86500000) +set(baseaddress_wing32 0x7FE85500000) +set(baseaddress_winhttp 0x7FE84500000) +set(baseaddress_winprint 0x7FE84000000) +set(baseaddress_winscard 0x7FE83500000) +set(baseaddress_winsta 0x7FE82500000) +set(baseaddress_wkssvc 0x7FE81500000) +set(baseaddress_wlanapi 0x7FE80500000) +set(baseaddress_wldap32 0x7FE7F500000) +set(baseaddress_wlnotify 0x7FE7F000000) +set(baseaddress_wmi 0x7FE7E500000) +set(baseaddress_wmisvc 0x7FE7D500000) +set(baseaddress_wmiutils 0x7FE7C500000) +set(baseaddress_wmvcore 0x7FE7B500000) +set(baseaddress_wshirda 0x7FE79500000) +set(baseaddress_wshom 0x7FE79000000) +set(baseaddress_wshtcpip 0x7FE78500000) +set(baseaddress_wsock32 0x7FE77500000) +set(baseaddress_wtsapi32 0x7FE76500000) +set(baseaddress_wuapi 0x7FE75500000) +set(baseaddress_wuauserv 0x7FE75000000) +set(baseaddress_xinput1_1 0x7FE74500000) +set(baseaddress_xinput1_2 0x7FE73500000) +set(baseaddress_xinput1_3 0x7FE72500000) +set(baseaddress_xinput9_1_0 0x7FE71500000) +set(baseaddress_xmllite 0x7FE70500000) +set(baseaddress_zipfldr 0x7FE70000000) +# Extra found files +set(baseaddress_fusion 0x7FE53500000) +set(baseaddress_fusion_1_1 0x7FE52500000) +set(baseaddress_fusion_2_0 0x7FE51500000) +# These were warned about by cmake +set(baseaddress_dcomlaunch 0x7FE51000000) +set(baseaddress_netlogon 0x7FE50500000) +set(baseaddress_w32time 0x7FE50000000) +set(baseaddress_dpnhpast 0x7FE4F500000) +set(baseaddress_cryptext 0x7FE4F000000) +set(baseaddress_netplwiz 0x7FE4E500000) +set(baseaddress_msxml3r 0x7FE4E000000) +set(baseaddress_xolehlp 0x7FE4D500000)

3 years, 12 months

[reactos] 01/01: [RTL] Add code to SxS manifest parser to parse XML namespaces (#2512)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=427ea67b9c58f3647c29b… commit 427ea67b9c58f3647c29b02aa9b2ad8355928d87 Author: William Kent <wjk011(a)gmail.com> AuthorDate: Sun Sep 20 16:56:42 2020 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 22:56:42 2020 +0200 [RTL] Add code to SxS manifest parser to parse XML namespaces (#2512) * [XDK] Typo fix * [XDK] Add missing ACTIVATION_CONTEXT_SECTION values * [RTL] Merge changes from Wine * [ROSTESTS] Fix typo * [NTDLL] Typo fix * Add test for new functionality * [ROSTESTS] Fix path * [ROSTESTS] Add test to testlist.c --- dll/ntdll/ldr/ldrinit.c | 2 +- modules/rostests/apitests/kernel32/CMakeLists.txt | 3 +- modules/rostests/apitests/kernel32/DefaultActCtx.c | 8 + modules/rostests/apitests/kernel32/testlist.c | 2 + modules/rostests/apitests/kernel32/xmlns.manifest | 24 + modules/rostests/winetests/kernel32/actctx.c | 2 +- sdk/include/xdk/winnt_old.h | 6 +- sdk/lib/rtl/actctx.c | 1502 ++++++++++---------- 8 files changed, 778 insertions(+), 771 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index f2b2116e782..0a0be84b0c4 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1646,7 +1646,7 @@ LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) { for (n = 0; n < ContextCompatInfo->ElementCount; ++n) { - if (ContextCompatInfo->Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && + if (ContextCompatInfo->Elements[n].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS && RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, KnownCompatGuids[cur].Guid, sizeof(GUID)) == sizeof(GUID)) { if (LdrpDisableProcessCompatGuidDetection()) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 9e0ca36563a..9aebaa979a5 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -58,7 +58,8 @@ list(APPEND MANIFEST_FILES classtest2.manifest comctl32dep.manifest dep1.manifest - deptest.manifest) + deptest.manifest + xmlns.manifest) foreach(item ${MANIFEST_FILES}) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}") diff --git a/modules/rostests/apitests/kernel32/DefaultActCtx.c b/modules/rostests/apitests/kernel32/DefaultActCtx.c index c5d7118e0f4..ad19fc48ed3 100644 --- a/modules/rostests/apitests/kernel32/DefaultActCtx.c +++ b/modules/rostests/apitests/kernel32/DefaultActCtx.c @@ -131,3 +131,11 @@ START_TEST(DefaultActCtx) } } + +HANDLE _CreateActCtxFromFile(LPCWSTR FileName, int line); + +START_TEST(ActCtxWithXmlNamespaces) +{ + // _CreateActCtxFromFile() contains all the assertions we need. + (void)_CreateActCtxFromFile(L"xmlns.manifest", __LINE__); +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 35240ac3774..b96dfa956f0 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -3,6 +3,7 @@ #define STANDALONE #include <apitest.h> +extern void func_ActCtxWithXmlNamespaces(void); extern void func_ConsoleCP(void); extern void func_CreateProcess(void); extern void func_DefaultActCtx(void); @@ -70,5 +71,6 @@ const struct test winetest_testlist[] = { "TerminateProcess", func_TerminateProcess }, { "TunnelCache", func_TunnelCache }, { "WideCharToMultiByte", func_WideCharToMultiByte }, + { "ActCtxWithXmlNamespaces", func_ActCtxWithXmlNamespaces }, { 0, 0 } }; diff --git a/modules/rostests/apitests/kernel32/xmlns.manifest b/modules/rostests/apitests/kernel32/xmlns.manifest new file mode 100644 index 00000000000..373533af5e3 --- /dev/null +++ b/modules/rostests/apitests/kernel32/xmlns.manifest @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"> + <ms_compatibility:compatibility xmlns:ms_compatibility="urn:schemas-microsoft-com:compatibility.v1"> + <ms_compatibility:application> +  + +  + <ms_compatibility:supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> + +  + <ms_compatibility:supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /> + +  + <ms_compatibility:supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> + </ms_compatibility:application> + </ms_compatibility:compatibility> + <application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware> + </windowsSettings> + </application> +</assembly> diff --git a/modules/rostests/winetests/kernel32/actctx.c b/modules/rostests/winetests/kernel32/actctx.c index 6ba8e997d4c..1e7d80d93a1 100644 --- a/modules/rostests/winetests/kernel32/actctx.c +++ b/modules/rostests/winetests/kernel32/actctx.c @@ -2792,7 +2792,7 @@ static void test_with_compat(HANDLE handle, DWORD num_compat, const GUID* expect wine_dbgstr_guid(&compat_info.Elements[n].Id), wine_dbgstr_guid(expected_compat[n]), n); - ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS, + ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS, "Wrong type, got %u for %u\n", (DWORD)compat_info.Elements[n].Type, n); } } diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 09b774cbfca..dff77bab5c3 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -1089,6 +1089,8 @@ typedef VOID (NTAPI *WORKERCALLBACKFUNC)(PVOID); #define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION 6 #define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7 #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 +#define ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS 10 +#define ACTIVATION_CONTEXT_SECTION_COMPATIBILITY_INFO 11 #endif /* (_WIN32_WINNT >= 0x0501) */ #define BTYPE(x) ((x)&N_BTMASK) #define ISPTR(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)) @@ -4036,8 +4038,8 @@ typedef struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION { } ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; typedef enum { - ACTCX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, - ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS } ACTCTX_COMPATIBILITY_ELEMENT_TYPE; typedef struct _COMPATIBILITY_CONTEXT_ELEMENT { diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index e51e7c43421..0850095b2b6 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -9,7 +9,7 @@ * Jacek Caban for CodeWeavers * Alexandre Julliard * Stefan Ginsberg (stefan.ginsberg(a)reactos.org) - * Samuel Serapi�n + * Samuel Serapión */ /* Based on Wine 3.2-37c98396 */ @@ -43,7 +43,7 @@ BOOLEAN RtlpNotAllowingMultipleActivation; #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) #define ACTCTX_FAKE_COOKIE ((ULONG_PTR) 0xf00bad) - +#define MAX_NAMESPACES 64 typedef struct { @@ -51,10 +51,26 @@ typedef struct unsigned int len; } xmlstr_t; +struct xml_elem +{ + xmlstr_t name; + xmlstr_t ns; + int ns_pos; +}; + +struct xml_attr +{ + xmlstr_t name; + xmlstr_t value; +}; + typedef struct { const WCHAR *ptr; const WCHAR *end; + struct xml_attr namespaces[MAX_NAMESPACES]; + int ns_pos; + BOOL error; } xmlbuf_t; struct file_info @@ -416,6 +432,12 @@ struct entity WCHAR *clsid; WCHAR *version; } clrsurrogate; + struct + { + WCHAR *name; + WCHAR *value; + WCHAR *ns; + } settings; } u; }; @@ -520,8 +542,23 @@ struct actctx_loader unsigned int allocated_dependencies; }; -static const WCHAR asmv1W[] = {'a','s','m','v','1',':',0}; -static const WCHAR asmv2W[] = {'a','s','m','v','2',':',0}; +static const xmlstr_t empty_xmlstr; + +#ifdef __i386__ +static const WCHAR current_archW[] = {'x','8','6',0}; +#elif defined __x86_64__ +static const WCHAR current_archW[] = {'a','m','d','6','4',0}; +#elif defined __arm__ +static const WCHAR current_archW[] = {'a','r','m',0}; +#elif defined __aarch64__ +static const WCHAR current_archW[] = {'a','r','m','6','4',0}; +#else +static const WCHAR current_archW[] = {'n','o','n','e',0}; +#endif + +static const WCHAR asmv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; +static const WCHAR asmv2W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','2',0}; +static const WCHAR asmv3W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','3',0}; typedef struct _ACTIVATION_CONTEXT_WRAPPED { @@ -666,6 +703,22 @@ static const WCHAR requestedExecutionLevelW[] = {'r','e','q','u','e','s','t','e' static const WCHAR requestedPrivilegesW[] = {'r','e','q','u','e','s','t','e','d','P','r','i','v','i','l','e','g','e','s',0}; static const WCHAR securityW[] = {'s','e','c','u','r','i','t','y',0}; static const WCHAR trustInfoW[] = {'t','r','u','s','t','I','n','f','o',0}; +static const WCHAR windowsSettingsW[] = {'w','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR autoElevateW[] = {'a','u','t','o','E','l','e','v','a','t','e',0}; +static const WCHAR disableThemingW[] = {'d','i','s','a','b','l','e','T','h','e','m','i','n','g',0}; +static const WCHAR disableWindowFilteringW[] = {'d','i','s','a','b','l','e','W','i','n','d','o','w','F','i','l','t','e','r','i','n','g',0}; +static const WCHAR windowsSettings2005NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','0','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR windowsSettings2011NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','1','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR windowsSettings2016NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','6','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR windowsSettings2017NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','7','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; +static const WCHAR dpiAwarenessW[] = {'d','p','i','A','w','a','r','e','n','e','s','s',0}; +static const WCHAR gdiScalingW[] = {'g','d','i','S','c','a','l','i','n','g',0}; +static const WCHAR highResolutionScrollingAwareW[] = {'h','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; +static const WCHAR longPathAwareW[] = {'l','o','n','g','P','a','t','h','A','w','a','r','e',0}; +static const WCHAR magicFutureSettingW[] = {'m','a','g','i','c','F','u','t','u','r','e','S','e','t','t','i','n','g',0}; +static const WCHAR printerDriverIsolationW[] = {'p','r','i','n','t','e','r','D','r','i','v','e','r','I','s','o','l','a','t','i','o','n',0}; +static const WCHAR ultraHighResolutionScrollingAwareW[] = {'u','l','t','r','a','H','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; struct olemisc_entry { @@ -749,23 +802,31 @@ static inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str) !strncmpW(xmlstr->ptr + 1, str, xmlstr->len - 1) && !str[xmlstr->len - 1]); } -static inline BOOL xml_elem_cmp(const xmlstr_t *elem, const WCHAR *str, const WCHAR *namespace) +static inline BOOL xml_attr_cmp(const struct xml_attr* attr, const WCHAR *str) { - UINT len = strlenW( namespace ); + return xmlstr_cmp(&attr->name, str); +} - if (!strncmpW(elem->ptr, str, elem->len) && !str[elem->len]) return TRUE; - return (elem->len > len && !strncmpW(elem->ptr, namespace, len) && - !strncmpW(elem->ptr + len, str, elem->len - len) && !str[elem->len - len]); +static BOOL xml_name_cmp( const struct xml_elem *elem1, const struct xml_elem *elem2 ) +{ + return (elem1->name.len == elem2->name.len && + elem1->ns.len == elem2->ns.len && + !wcsncmp( elem1->name.ptr, elem2->name.ptr, elem1->name.len ) && + !wcsncmp( elem1->ns.ptr, elem2->ns.ptr, elem1->ns.len )); } -static inline BOOL xml_elem_cmp_end(const xmlstr_t *elem, const WCHAR *str, const WCHAR *namespace) +static inline BOOL xml_elem_cmp(const struct xml_elem* elem, const WCHAR *str, const WCHAR *namespace) { - if (elem->len && elem->ptr[0] == '/') + if (!xmlstr_cmp( &elem->name, str )) return FALSE; + if (xmlstr_cmp( &elem->ns, namespace )) return TRUE; + if (!wcscmp( namespace, asmv1W )) { - xmlstr_t elem_end; - elem_end.ptr = elem->ptr + 1; - elem_end.len = elem->len - 1; - return xml_elem_cmp( &elem_end, str, namespace ); + if (xmlstr_cmp( &elem->ns, asmv2W )) return TRUE; + if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; + } + else if (!wcscmp( namespace, asmv2W )) + { + if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; } return FALSE; } @@ -775,16 +836,6 @@ static inline BOOL isxmlspace( WCHAR ch ) return (ch == ' ' || ch == '\r' || ch == '\n' || ch == '\t'); } -static UNICODE_STRING xmlstr2unicode(const xmlstr_t *xmlstr) -{ - UNICODE_STRING res; - - res.Buffer = (PWSTR)xmlstr->ptr; - res.Length = res.MaximumLength = (USHORT)xmlstr->len * sizeof(WCHAR); - - return res; -} - static struct assembly *add_assembly(ACTIVATION_CONTEXT *actctx, enum assembly_type at) { struct assembly *assembly; @@ -1173,89 +1224,162 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) } } -static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, - BOOL* error, BOOL* end) +static BOOL set_error(xmlbuf_t* xmlbuf) +{ + xmlbuf->error = TRUE; + return FALSE; +} + +static BOOL is_xmlns_attr(const struct xml_attr *attr) +{ + const int len = wcslen( xmlnsW ); + if (attr->name.len < len) return FALSE; + if (wcsncmp( attr->name.ptr, xmlnsW, len )) return FALSE; + return (attr->name.len == len || attr->name.ptr[len] == ':'); +} + +static void push_xmlns( xmlbuf_t *xmlbuf, const struct xml_attr *attr ) +{ + const int len = wcslen( xmlnsW ); + struct xml_attr *ns; + + if (xmlbuf->ns_pos == MAX_NAMESPACES - 1) + { + // FIXME( "too many namespaces in manifest\n" ); + set_error( xmlbuf ); + return; + } + ns = &xmlbuf->namespaces[xmlbuf->ns_pos++]; + ns->value = attr->value; + if (attr->name.len > len) + { + ns->name.ptr = attr->name.ptr + len + 1; + ns->name.len = attr->name.len - len - 1; + } + else ns->name = empty_xmlstr; +} + +static xmlstr_t find_xmlns( xmlbuf_t *xmlbuf, const xmlstr_t *name ) +{ + int i; + + for (i = xmlbuf->ns_pos - 1; i >= 0; i--) + { + if (xmlbuf->namespaces[i].name.len == name->len && + !wcsncmp( xmlbuf->namespaces[i].name.ptr, name->ptr, name->len )) + return xmlbuf->namespaces[i].value; + } + + return empty_xmlstr; +} + +static BOOL next_xml_attr(xmlbuf_t* xmlbuf, struct xml_attr* attr, BOOL* end) { const WCHAR* ptr; + WCHAR quote; - *error = TRUE; + if (xmlbuf->error) return FALSE; while (xmlbuf->ptr < xmlbuf->end && isxmlspace(*xmlbuf->ptr)) xmlbuf->ptr++; - if (xmlbuf->ptr == xmlbuf->end) return FALSE; + if (xmlbuf->ptr == xmlbuf->end) return set_error( xmlbuf ); if (*xmlbuf->ptr == '/') { xmlbuf->ptr++; if (xmlbuf->ptr == xmlbuf->end || *xmlbuf->ptr != '>') - return FALSE; + return set_error( xmlbuf ); xmlbuf->ptr++; *end = TRUE; - *error = FALSE; return FALSE; } if (*xmlbuf->ptr == '>') { xmlbuf->ptr++; - *error = FALSE; return FALSE; } ptr = xmlbuf->ptr; while (ptr < xmlbuf->end && *ptr != '=' && *ptr != '>' && !isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end) return FALSE; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); - name->ptr = xmlbuf->ptr; - name->len = ptr-xmlbuf->ptr; + attr->name.ptr = xmlbuf->ptr; + attr->name.len = ptr-xmlbuf->ptr; xmlbuf->ptr = ptr; /* skip spaces before '=' */ while (ptr < xmlbuf->end && *ptr != '=' && isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || *ptr != '=') return FALSE; + if (ptr == xmlbuf->end || *ptr != '=') return set_error( xmlbuf ); /* skip '=' itself */ ptr++; - if (ptr == xmlbuf->end) return FALSE; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); /* skip spaces after '=' */ while (ptr < xmlbuf->end && *ptr != '"' && *ptr != '\'' && isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return FALSE; + if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return set_error( xmlbuf ); - value->ptr = ++ptr; - if (ptr == xmlbuf->end) return FALSE; + quote = *ptr++; + attr->value.ptr = ptr; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); - ptr = memchrW(ptr, ptr[-1], xmlbuf->end - ptr); - if (!ptr) + while (ptr < xmlbuf->end && *ptr != quote) ptr++; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; - return FALSE; + return set_error( xmlbuf ); } - value->len = ptr - value->ptr; + attr->value.len = ptr - attr->value.ptr; xmlbuf->ptr = ptr + 1; + if (xmlbuf->ptr != xmlbuf->end) return TRUE; - if (xmlbuf->ptr == xmlbuf->end) return FALSE; + return set_error( xmlbuf ); +} - *error = FALSE; - return TRUE; +static void read_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem ) +{ + const WCHAR* ptr = xmlbuf->ptr; + + elem->ns = empty_xmlstr; + elem->name.ptr = ptr; + while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && *ptr != '/') + { + if (*ptr == ':') + { + elem->ns.ptr = elem->name.ptr; + elem->ns.len = ptr - elem->ns.ptr; + elem->name.ptr = ptr + 1; + } + ptr++; + } + elem->name.len = ptr - elem->name.ptr; + xmlbuf->ptr = ptr; } -static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) +static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct xml_elem *parent ) { const WCHAR* ptr; + struct xml_attr attr; + xmlbuf_t attr_buf; + BOOL end = FALSE; + + xmlbuf->ns_pos = parent->ns_pos; /* restore namespace stack to parent state */ + + if (xmlbuf->error) return FALSE; for (;;) { - ptr = memchrW(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr); - if (!ptr) + for (ptr = xmlbuf->ptr; ptr < xmlbuf->end; ptr++) if (*ptr == '<') break; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; - return FALSE; + return set_error( xmlbuf ); } ptr++; if (ptr + 3 < xmlbuf->end && ptr[0] == '!' && ptr[1] == '-' && ptr[2] == '-') /* skip comment */ @@ -1266,7 +1390,7 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) if (ptr + 3 > xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; - return FALSE; + return set_error( xmlbuf ); } xmlbuf->ptr = ptr + 3; } @@ -1274,13 +1398,37 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) } xmlbuf->ptr = ptr; - while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && (*ptr != '/' || ptr == xmlbuf->ptr)) - ptr++; + /* check for element terminating the parent element */ + if (ptr < xmlbuf->end && *ptr == '/') + { + xmlbuf->ptr++; + read_xml_elem( xmlbuf, elem ); + elem->ns = find_xmlns( xmlbuf, &elem->ns ); + if (!xml_name_cmp( elem, parent )) + { + /*ERR( "wrong closing element %s for %s\n", + debugstr_xmlstr(&elem->name), debugstr_xmlstr(&parent->name ));*/ + return set_error( xmlbuf ); + } + while (xmlbuf->ptr < xmlbuf->end && isxmlspace(*xmlbuf->ptr)) xmlbuf->ptr++; + if (xmlbuf->ptr == xmlbuf->end || *xmlbuf->ptr++ != '>') return set_error( xmlbuf ); + return FALSE; + } - elem->ptr = xmlbuf->ptr; - elem->len = ptr - xmlbuf->ptr; - xmlbuf->ptr = ptr; - return xmlbuf->ptr != xmlbuf->end; + read_xml_elem( xmlbuf, elem ); + + /* parse namespace attributes */ + attr_buf = *xmlbuf; + while (next_xml_attr( &attr_buf, &attr, &end )) + { + if (is_xmlns_attr( &attr )) push_xmlns( xmlbuf, &attr ); + } + elem->ns = find_xmlns( xmlbuf, &elem->ns ); + elem->ns_pos = xmlbuf->ns_pos; + + if (xmlbuf->ptr != xmlbuf->end) return TRUE; + + return set_error( xmlbuf ); } static BOOL parse_xml_header(xmlbuf_t* xmlbuf) @@ -1317,7 +1465,6 @@ static BOOL parse_version(const xmlstr_t *str, struct assembly_version *version) unsigned int ver[4]; unsigned int pos; const WCHAR *curr; - UNICODE_STRING strU; /* major.minor.build.revision */ ver[0] = ver[1] = ver[2] = ver[3] = pos = 0; @@ -1341,123 +1488,79 @@ static BOOL parse_version(const xmlstr_t *str, struct assembly_version *version) return TRUE; error: - strU = xmlstr2unicode(str); - DPRINT1( "Wrong version definition in manifest file (%wZ)\n", &strU ); return FALSE; } -static BOOL parse_expect_elem(xmlbuf_t* xmlbuf, const WCHAR* name, const WCHAR *namespace) +static void parse_expect_no_attr(xmlbuf_t* xmlbuf, BOOL* end) { - xmlstr_t elem; - UNICODE_STRING elemU; - if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - if (xml_elem_cmp(&elem, name, namespace)) return TRUE; - elemU = xmlstr2unicode(&elem); - DPRINT1( "unexpected element %wZ\n", &elemU ); - return FALSE; -} + struct xml_attr attr; -static BOOL parse_expect_no_attr(xmlbuf_t* xmlbuf, BOOL* end) -{ - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL error; - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, end)) + while (next_xml_attr(xmlbuf, &attr, end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1( "unexpected attr %wZ=%wZ\n", &attr_nameU, - &attr_valueU); + // TODO: report error + // if (!is_xmlns_attr( &attr )) WARN("unexpected attr %s\n", debugstr_xml_attr(&attr)); } - return !error; } -static BOOL parse_end_element(xmlbuf_t *xmlbuf) +static void parse_expect_end_elem(xmlbuf_t *xmlbuf, const struct xml_elem *parent) { - BOOL end = FALSE; - return parse_expect_no_attr(xmlbuf, &end) && !end; -} + struct xml_elem elem; -static BOOL parse_expect_end_elem(xmlbuf_t *xmlbuf, const WCHAR *name, const WCHAR *namespace) -{ - xmlstr_t elem; - UNICODE_STRING elemU; - if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - if (!xml_elem_cmp_end(&elem, name, namespace)) + if (next_xml_elem(xmlbuf, &elem, parent)) { - elemU = xmlstr2unicode(&elem); - DPRINT1( "unexpected element %wZ\n", &elemU ); - return FALSE; + // FIXME( "unexpected element %s\n", debugstr_xml_elem(&elem) ); + set_error( xmlbuf ); } - return parse_end_element(xmlbuf); } -static BOOL parse_unknown_elem(xmlbuf_t *xmlbuf, const xmlstr_t *unknown_elem) +static void parse_unknown_elem(xmlbuf_t *xmlbuf, const struct xml_elem *parent) { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, error, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; - while(next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)); - if(error || end) return end; + while (next_xml_attr(xmlbuf, &attr, &end)); + if (end) return; - while(ret && (ret = next_xml_elem(xmlbuf, &elem))) - { - if(*elem.ptr == '/' && elem.len - 1 == unknown_elem->len && - !strncmpW(elem.ptr+1, unknown_elem->ptr, unknown_elem->len)) - break; - else - ret = parse_unknown_elem(xmlbuf, &elem); - } - - return ret && parse_end_element(xmlbuf); + while (next_xml_elem(xmlbuf, &elem, parent)) + parse_unknown_elem(xmlbuf, &elem); } -static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* actctx, - struct assembly_identity* ai) +static void parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* actctx, + struct assembly_identity* ai, const struct xml_elem *parent) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; - UNICODE_STRING attr_valueU, attr_nameU; + struct xml_attr attr; + BOOL end = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, g_nameW)) + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(ai->name = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, typeW)) + else if (xml_attr_cmp(&attr, typeW)) { - if (!(ai->type = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->type = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, versionW)) + else if (xml_attr_cmp(&attr, versionW)) { - if (!parse_version(&attr_value, &ai->version)) return FALSE; + if (!parse_version(&attr.value, &ai->version)) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, processorArchitectureW)) + else if (xml_attr_cmp(&attr, processorArchitectureW)) { - if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->arch = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, publicKeyTokenW)) + else if (xml_attr_cmp(&attr, publicKeyTokenW)) { - if (!(ai->public_key = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->public_key = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, languageW)) + else if (xml_attr_cmp(&attr, languageW)) { - DPRINT("Unsupported yet language attribute (%.*S)\n", - attr_value.len, attr_value.ptr); - if (!(ai->language = xmlstrdupW(&attr_value))) return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(ai->language = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error || end) return end; - return parse_expect_end_elem(xmlbuf, assemblyIdentityW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } static enum comclass_threadingmodel parse_com_class_threadingmodel(xmlstr_t *value) @@ -1554,109 +1657,97 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) return TRUE; } -static BOOL parse_com_class_progid(xmlbuf_t* xmlbuf, struct entity *entity) +static void parse_com_class_progid(xmlbuf_t *xmlbuf, struct entity *entity, const struct xml_elem *parent) { xmlstr_t content; BOOL end = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end) || end || !parse_text_content(xmlbuf, &content)) - return FALSE; + parse_expect_no_attr(xmlbuf, &end); + if (end) set_error( xmlbuf ); + if (!parse_text_content(xmlbuf, &content)) return; - if (!com_class_add_progid(&content, entity)) return FALSE; - return parse_expect_end_elem(xmlbuf, progidW, asmv1W); + if (!com_class_add_progid(&content, entity)) set_error( xmlbuf ); + parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader *acl) +static void parse_com_class_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, struct actctx_loader *acl, + const struct xml_elem *parent ) { - xmlstr_t elem, attr_name, attr_value; - BOOL ret = TRUE, end = FALSE, error; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - UNICODE_STRING attr_valueU, attr_nameU; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) - return FALSE; + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, clsidW)) + if (xml_attr_cmp(&attr, clsidW)) { - if (!(entity->u.comclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.clsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, progidW)) + else if (xml_attr_cmp(&attr, progidW)) { - if (!(entity->u.comclass.progid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.progid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, threadingmodelW)) + else if (xml_attr_cmp(&attr, threadingmodelW)) { - entity->u.comclass.model = parse_com_class_threadingmodel(&attr_value); + entity->u.comclass.model = parse_com_class_threadingmodel(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusW)) + else if (xml_attr_cmp(&attr, miscstatusW)) { - entity->u.comclass.miscstatus = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatus = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatuscontentW)) + else if (xml_attr_cmp(&attr, miscstatuscontentW)) { - entity->u.comclass.miscstatuscontent = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatuscontent = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusthumbnailW)) + else if (xml_attr_cmp(&attr, miscstatusthumbnailW)) { - entity->u.comclass.miscstatusthumbnail = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatusthumbnail = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusiconW)) + else if (xml_attr_cmp(&attr, miscstatusiconW)) { - entity->u.comclass.miscstatusicon = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatusicon = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusdocprintW)) + else if (xml_attr_cmp(&attr, miscstatusdocprintW)) { - entity->u.comclass.miscstatusdocprint = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatusdocprint = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, descriptionW)) + else if (xml_attr_cmp(&attr, descriptionW)) { /* not stored */ } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); - } } - if (error) return FALSE; - acl->actctx->sections |= SERVERREDIRECT_SECTION; if (entity->u.comclass.progid) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, comClassW)) + if (xml_elem_cmp(&elem, progidW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; - } - else if (xmlstr_cmp(&elem, progidW)) - { - ret = parse_com_class_progid(xmlbuf, entity); + parse_com_class_progid(xmlbuf, entity, &elem); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &attr_nameU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } if (entity->u.comclass.progids.num) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - - return ret; } static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) @@ -1670,8 +1761,7 @@ static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) num = num * 10 + *curr - '0'; else { - UNICODE_STRING strU = xmlstr2unicode(str); - DPRINT1("wrong numeric value %wZ\n", &strU); + // DPRINT1("wrong numeric value %wZ\n", &strU); return FALSE; } } @@ -1680,57 +1770,87 @@ static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) return TRUE; } -static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) +static void parse_add_interface_class( xmlbuf_t *xmlbuf, struct entity_array *entities, + struct actctx_loader *acl, WCHAR *clsid ) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; - struct entity* entity; - UNICODE_STRING attr_valueU, attr_nameU; + struct entity *entity; + WCHAR *str; + + if (!clsid) return; + + if (!(str = strdupW(clsid))) + { + set_error( xmlbuf ); + return; + } + + if (!(entity = add_entity(entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, str); + set_error( xmlbuf ); + return; + } + + entity->u.comclass.clsid = str; + entity->u.comclass.model = ThreadingModel_Both; + + acl->actctx->sections |= SERVERREDIRECT_SECTION; +} + +static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, + struct actctx_loader *acl, const struct xml_elem *parent ) +{ + WCHAR *psclsid = NULL; + struct entity *entity; + struct xml_attr attr; + BOOL end = FALSE; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION))) - return FALSE; + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, iidW)) + if (xml_attr_cmp(&attr, iidW)) { - if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, g_nameW)) + else if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.ifaceps.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, baseInterfaceW)) + else if (xml_attr_cmp(&attr, baseInterfaceW)) { - if (!(entity->u.ifaceps.base = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.base = xmlstrdupW(&attr.value))) set_error( xmlbuf ); entity->u.ifaceps.mask |= BaseIface; } - else if (xmlstr_cmp(&attr_name, nummethodsW)) + else if (xml_attr_cmp(&attr, nummethodsW)) { - if (!(parse_nummethods(&attr_value, entity))) return FALSE; + if (!(parse_nummethods(&attr.value, entity))) set_error( xmlbuf ); entity->u.ifaceps.mask |= NumMethods; } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - /* not used */ - else if (xmlstr_cmp(&attr_name, proxyStubClsid32W) || xmlstr_cmp(&attr_name, threadingmodelW)) + else if (xml_attr_cmp(&attr, proxyStubClsid32W)) { + if (!(psclsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else + /* not used */ + else if (xml_attr_cmp(&attr, threadingmodelW)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } } - if (error) return FALSE; acl->actctx->sections |= IFACEREDIRECT_SECTION; - if (end) return TRUE; + if (!end) parse_expect_end_elem(xmlbuf, parent); + + parse_add_interface_class(xmlbuf, &dll->entities, acl, psclsid ? psclsid : entity->u.ifaceps.iid); - return parse_expect_end_elem(xmlbuf, comInterfaceProxyStubW, asmv1W); + RtlFreeHeap(RtlGetProcessHeap(), 0, psclsid); } static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) @@ -1757,8 +1877,7 @@ static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) *flags |= LIBFLAG_FHASDISKIMAGE; else { - UNICODE_STRING valueU = xmlstr2unicode(value); - DPRINT1("unknown flags value %wZ\n", &valueU); + // DPRINT1("unknown flags value %wZ\n", &valueU); return FALSE; } @@ -1775,7 +1894,6 @@ static BOOL parse_typelib_version(const xmlstr_t *str, struct entity *entity) unsigned int ver[2]; unsigned int pos; const WCHAR *curr; - UNICODE_STRING strW; /* major.minor */ ver[0] = ver[1] = pos = 0; @@ -1797,54 +1915,44 @@ static BOOL parse_typelib_version(const xmlstr_t *str, struct entity *entity) return TRUE; error: - strW = xmlstr2unicode(str); - DPRINT1("FIXME: wrong typelib version value (%wZ)\n", &strW); return FALSE; } -static BOOL parse_typelib_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) +static void parse_typelib_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - UNICODE_STRING attr_valueU, attr_nameU; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION))) - return FALSE; + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, tlbidW)) + if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.typelib.tlbid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.typelib.tlbid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, versionW)) + else if (xml_attr_cmp(&attr, versionW)) { - if (!parse_typelib_version(&attr_value, entity)) return FALSE; + if (!parse_typelib_version(&attr.value, entity)) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, helpdirW)) + else if (xml_attr_cmp(&attr, helpdirW)) { - if (!(entity->u.typelib.helpdir = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.typelib.helpdir = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, flagsW)) + else if (xml_attr_cmp(&attr, flagsW)) { - if (!parse_typelib_flags(&attr_value, entity)) return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!parse_typelib_flags(&attr.value, entity)) set_error( xmlbuf ); } } - if (error) return FALSE; - acl->actctx->sections |= TLIBREDIRECT_SECTION; - - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, typelibW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } static inline int aligned_string_len(int len) @@ -1862,595 +1970,533 @@ static int get_assembly_version(struct assembly *assembly, WCHAR *ret) return sprintfW(ret, fmtW, ver->major, ver->minor, ver->build, ver->revision); } -static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) +static void parse_window_class_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem, content, attr_name, attr_value; - BOOL end = FALSE, ret = TRUE, error; + struct xml_elem elem; + struct xml_attr attr; + xmlstr_t content; + BOOL end = FALSE; struct entity* entity; - UNICODE_STRING elemU, attr_nameU, attr_valueU; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION))) - return FALSE; - + { + set_error( xmlbuf ); + return; + } entity->u.class.versioned = TRUE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, versionedW)) + if (xml_attr_cmp(&attr, versionedW)) { - if (xmlstr_cmpi(&attr_value, noW)) + if (xmlstr_cmpi(&attr.value, noW)) entity->u.class.versioned = FALSE; - else if (!xmlstr_cmpi(&attr_value, yesW)) - return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + else if (!xmlstr_cmpi(&attr.value, yesW)) + set_error( xmlbuf ); } } - if (error || end) return end; + if (end) return; - if (!parse_text_content(xmlbuf, &content)) return FALSE; - - if (!(entity->u.class.name = xmlstrdupW(&content))) return FALSE; + if (!parse_text_content(xmlbuf, &content)) return; + if (!(entity->u.class.name = xmlstrdupW(&content))) set_error( xmlbuf ); acl->actctx->sections |= WINDOWCLASS_SECTION; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, windowClassW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else - { - elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); - } + parse_unknown_elem(xmlbuf, &elem); } - - return ret; } -static BOOL parse_binding_redirect_elem(xmlbuf_t* xmlbuf) +static void parse_binding_redirect_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_valueU, attr_nameU; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - - if (xmlstr_cmp(&attr_name, oldVersionW)) + if (xml_attr_cmp(&attr, oldVersionW)) { - DPRINT1("Not stored yet oldVersion=%wZ\n", &attr_valueU); + // FIXME("Not stored yet %s\n", debugstr_xml_attr(&attr)); } - else if (xmlstr_cmp(&attr_name, newVersionW)) + else if (xml_attr_cmp(&attr, newVersionW)) { - DPRINT1("Not stored yet newVersion=%wZ\n", &attr_valueU); - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + // FIXME("Not stored yet %s\n", debugstr_xml_attr(&attr)); } } - if (error || end) return end; - return parse_expect_end_elem(xmlbuf, bindingRedirectW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_description_elem(xmlbuf_t* xmlbuf) +static void parse_description_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { - xmlstr_t elem, content, attr_name, attr_value; - BOOL end = FALSE, ret = TRUE, error = FALSE; - - UNICODE_STRING elem1U, elem2U; - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) - { - elem1U = xmlstr2unicode(&attr_name); - elem2U = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); - } - - if (error) return FALSE; - if (end) return TRUE; + struct xml_elem elem; + struct xml_attr attr; + xmlstr_t content; + BOOL end = FALSE; - if (!parse_text_content(xmlbuf, &content)) - return FALSE; + while (next_xml_attr(xmlbuf, &attr, &end)); - elem1U = xmlstr2unicode(&content); - DPRINT("Got description %wZ\n", &elem1U); + if (end) return; + if (!parse_text_content(xmlbuf, &content)) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, descriptionW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else - { - elem1U = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elem1U); - ret = parse_unknown_elem(xmlbuf, &elem); - } + parse_unknown_elem(xmlbuf, &elem); } - - return ret; } -static BOOL parse_com_interface_external_proxy_stub_elem(xmlbuf_t* xmlbuf, +static void parse_com_interface_external_proxy_stub_elem(xmlbuf_t *xmlbuf, struct assembly* assembly, - struct actctx_loader* acl) + struct actctx_loader* acl, + const struct xml_elem *parent) { - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION); - if (!entity) return FALSE; + if (!(entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION))) + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, iidW)) + if (xml_attr_cmp(&attr, iidW)) { - if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, g_nameW)) + else if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.ifaceps.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, baseInterfaceW)) + else if (xml_attr_cmp(&attr, baseInterfaceW)) { - if (!(entity->u.ifaceps.base = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.base = xmlstrdupW(&attr.value))) set_error( xmlbuf ); entity->u.ifaceps.mask |= BaseIface; } - else if (xmlstr_cmp(&attr_name, nummethodsW)) + else if (xml_attr_cmp(&attr, nummethodsW)) { - if (!(parse_nummethods(&attr_value, entity))) return FALSE; + if (!(parse_nummethods(&attr.value, entity))) set_error( xmlbuf ); entity->u.ifaceps.mask |= NumMethods; } - else if (xmlstr_cmp(&attr_name, proxyStubClsid32W)) - { - if (!(entity->u.ifaceps.ps32 = xmlstrdupW(&attr_value))) return FALSE; - } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, proxyStubClsid32W)) { - if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.ps32 = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else + else if (xml_attr_cmp(&attr, tlbidW)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error) return FALSE; acl->actctx->sections |= IFACEREDIRECT_SECTION; - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, comInterfaceExternalProxyStubW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_clr_class_elem( xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) + { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, error, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); - if (!entity) return FALSE; + if (!(entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, g_nameW)) + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.comclass.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, clsidW)) + else if (xml_attr_cmp(&attr, clsidW)) { - if (!(entity->u.comclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.clsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, progidW)) + else if (xml_attr_cmp(&attr, progidW)) { - if (!(entity->u.comclass.progid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.progid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, threadingmodelW)) + else if (xml_attr_cmp(&attr, threadingmodelW)) { - entity->u.comclass.model = parse_com_class_threadingmodel(&attr_value); + entity->u.comclass.model = parse_com_class_threadingmodel(&attr.value); } - else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + else if (xml_attr_cmp(&attr, runtimeVersionW)) { - if (!(entity->u.comclass.version = xmlstrdupW(&attr_value))) return FALSE; - } - else - { - UNICODE_STRING attr_nameU, attr_valueU; - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(entity->u.comclass.version = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error) return FALSE; acl->actctx->sections |= SERVERREDIRECT_SECTION; if (entity->u.comclass.progid) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, clrClassW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else if (xmlstr_cmp(&elem, progidW)) + if (xml_elem_cmp(&elem, progidW, asmv1W)) { - ret = parse_com_class_progid(xmlbuf, entity); + parse_com_class_progid(xmlbuf, entity, &elem); } else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } if (entity->u.comclass.progids.num) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - - return ret; } -static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_clr_surrogate_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES); - if (!entity) return FALSE; + if (!(entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES))) + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, g_nameW)) + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.clrsurrogate.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.clrsurrogate.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, clsidW)) + else if (xml_attr_cmp(&attr, clsidW)) { - if (!(entity->u.clrsurrogate.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.clrsurrogate.clsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + else if (xml_attr_cmp(&attr, runtimeVersionW)) { - if (!(entity->u.clrsurrogate.version = xmlstrdupW(&attr_value))) return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(entity->u.clrsurrogate.version = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error) return FALSE; acl->actctx->sections |= CLRSURROGATES_SECTION; - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, clrSurrogateW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, BOOL optional) +static void parse_dependent_assembly_elem( xmlbuf_t *xmlbuf, struct actctx_loader *acl, + const struct xml_elem *parent, BOOL optional ) { + struct xml_elem elem; + struct xml_attr attr; struct assembly_identity ai; - xmlstr_t elem, attr_name, attr_value; - BOOL end = FALSE, error = FALSE, ret = TRUE, delayed = FALSE; + BOOL end = FALSE; - UNICODE_STRING elem1U, elem2U; + memset(&ai, 0, sizeof(ai)); + ai.optional = optional; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { static const WCHAR allowDelayedBindingW[] = {'a','l','l','o','w','D','e','l','a','y','e','d','B','i','n','d','i','n','g',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; - if (xmlstr_cmp(&attr_name, allowDelayedBindingW)) - delayed = xmlstr_cmp(&attr_value, trueW); - else - { - elem1U = xmlstr2unicode(&attr_name); - elem2U = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); - } + if (xml_attr_cmp(&attr, allowDelayedBindingW)) + ai.delayed = xmlstr_cmp(&attr.value, trueW); } - if (error || end) return end; + if (end) return; - memset(&ai, 0, sizeof(ai)); - ai.optional = optional; - ai.delayed = delayed; - - if (!parse_expect_elem(xmlbuf, assemblyIdentityW, asmv1W) || - !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) - return FALSE; - - //TRACE( "adding name=%s version=%s arch=%s\n", debugstr_w(ai.name), debugstr_version(&ai.version), debugstr_w(ai.arch) ); - - /* store the newly found identity for later loading */ - if (!add_dependent_assembly_id(acl, &ai)) return FALSE; - - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, dependentAssemblyW)) + if (xml_elem_cmp(&elem, assemblyIdentityW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai, &elem); + /* store the newly found identity for later loading */ + if (ai.arch && !wcscmp(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); + if (!add_dependent_assembly_id(acl, &ai)) set_error( xmlbuf ); } - else if (xmlstr_cmp(&elem, bindingRedirectW)) + else if (xml_elem_cmp(&elem, bindingRedirectW, asmv1W)) { - ret = parse_binding_redirect_elem(xmlbuf); + parse_binding_redirect_elem(xmlbuf, &elem); } else { - DPRINT1("unknown elem %S\n", elem.ptr); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) +static void parse_dependency_elem( xmlbuf_t *xmlbuf, struct actctx_loader *acl, + const struct xml_elem *parent ) + { - xmlstr_t attr_name, attr_value, elem; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, ret = TRUE, error, optional = FALSE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE, optional = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - - if (xmlstr_cmp(&attr_name, optionalW)) + if (xml_attr_cmp(&attr, optionalW)) { - optional = xmlstr_cmpi( &attr_value, yesW ); - DPRINT1("optional=%wZ\n", &attr_valueU); - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + optional = xmlstr_cmpi( &attr.value, yesW ); } } - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, dependencyW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else if (xmlstr_cmp(&elem, dependentAssemblyW)) + if (xml_elem_cmp(&elem, dependentAssemblyW, asmv1W)) { - ret = parse_dependent_assembly_elem(xmlbuf, acl, optional); + parse_dependent_assembly_elem(xmlbuf, acl, &elem, optional); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown element %wZ\n", &attr_nameU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_noinherit_elem(xmlbuf_t* xmlbuf) +static void parse_noinherit_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { BOOL end = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - return end || parse_expect_end_elem(xmlbuf, noInheritW, asmv1W); + parse_expect_no_attr(xmlbuf, &end); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_noinheritable_elem(xmlbuf_t* xmlbuf) +static void parse_noinheritable_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { BOOL end = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - return end || parse_expect_end_elem(xmlbuf, noInheritableW, asmv1W); + parse_expect_no_attr(xmlbuf, &end); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader* acl) +static void parse_file_elem( xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader* acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value, elem; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; struct dll_redirect* dll; - if (!(dll = add_dll_redirect(assembly))) return FALSE; - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + if (!(dll = add_dll_redirect(assembly))) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); + set_error( xmlbuf ); + return; + } - if (xmlstr_cmp(&attr_name, g_nameW)) + while (next_xml_attr(xmlbuf, &attr, &end)) + { + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(dll->name = xmlstrdupW(&attr_value))) return FALSE; - DPRINT("name=%wZ\n", &attr_valueU); + if (!(dll->name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, hashW)) + else if (xml_attr_cmp(&attr, hashW)) { - if (!(dll->hash = xmlstrdupW(&attr_value))) return FALSE; + if (!(dll->hash = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, hashalgW)) + else if (xml_attr_cmp(&attr, hashalgW)) { static const WCHAR sha1W[] = {'S','H','A','1',0}; - if (!xmlstr_cmpi(&attr_value, sha1W)) - DPRINT1("hashalg should be SHA1, got %wZ\n", &attr_valueU); - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!xmlstr_cmpi(&attr.value, sha1W)) { + //FIXME("hashalg should be SHA1, got %s\n", debugstr_xmlstr(&attr.value)); + } } } - if (error || !dll->name) return FALSE; + if (!dll->name) set_error( xmlbuf ); acl->actctx->sections |= DLLREDIRECT_SECTION; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, fileW)) + if (xml_elem_cmp(&elem, comClassW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_com_class_elem(xmlbuf, dll, acl, &elem); } - else if (xmlstr_cmp(&elem, comClassW)) + else if (xml_elem_cmp(&elem, comInterfaceProxyStubW, asmv1W)) { - ret = parse_com_class_elem(xmlbuf, dll, acl); - } - else if (xmlstr_cmp(&elem, comInterfaceProxyStubW)) - { - ret = parse_cominterface_proxy_stub_elem(xmlbuf, dll, acl); + parse_cominterface_proxy_stub_elem(xmlbuf, dll, acl, &elem); } else if (xml_elem_cmp(&elem, hashW, asmv2W)) { - DPRINT1("asmv2hash (undocumented) not supported\n"); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } - else if (xmlstr_cmp(&elem, typelibW)) + else if (xml_elem_cmp(&elem, typelibW, asmv1W)) { - ret = parse_typelib_elem(xmlbuf, dll, acl); + parse_typelib_elem(xmlbuf, dll, acl, &elem); } - else if (xmlstr_cmp(&elem, windowClassW)) + else if (xml_elem_cmp(&elem, windowClassW, asmv1W)) { - ret = parse_window_class_elem(xmlbuf, dll, acl); + parse_window_class_elem(xmlbuf, dll, acl, &elem); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &attr_nameU); - ret = parse_unknown_elem( xmlbuf, &elem ); + parse_unknown_elem( xmlbuf, &elem ); } } - - return ret; } -static BOOL parse_supportedos_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +static void parse_supportedos_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, IdW)) + if (xml_attr_cmp(&attr, IdW)) { COMPATIBILITY_CONTEXT_ELEMENT *compat; UNICODE_STRING str; GUID compat_id; - str.Buffer = (PWSTR)attr_value.ptr; - str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + str.Buffer = (PWSTR)attr.value.ptr; + str.Length = str.MaximumLength = (USHORT)attr.value.len * sizeof(WCHAR); if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) { - if (!(compat = add_compat_context(assembly))) return FALSE; - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + if (!(compat = add_compat_context(assembly))) + { + set_error( xmlbuf ); + return; + } + compat->Type = ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS; compat->Id = compat_id; } - else - { - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("Invalid guid %wZ\n", &attr_valueU); - } - } - else - { - UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } } - if (error) return FALSE; - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, supportedOSW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, - struct actctx_loader* acl) +static void parse_compatibility_application_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader* acl, const struct xml_elem *parent) { - BOOL ret = TRUE; - xmlstr_t elem; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, applicationW)) + if (xml_elem_cmp(&elem, supportedOSW, compatibilityNSW)) { - ret = parse_end_element(xmlbuf); - break; + parse_supportedos_elem(xmlbuf, assembly, acl, &elem); } - else if (xmlstr_cmp(&elem, supportedOSW)) + else { - ret = parse_supportedos_elem(xmlbuf, assembly, acl); + parse_unknown_elem(xmlbuf, &elem); + } + } +} + +static void parse_compatibility_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader* acl, const struct xml_elem *parent) +{ + struct xml_elem elem; + + while (next_xml_elem(xmlbuf, &elem, parent)) + { + if (xml_elem_cmp(&elem, applicationW, compatibilityNSW)) + { + parse_compatibility_application_elem(xmlbuf, assembly, acl, &elem); } else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } +} - return ret; +static void parse_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl, + struct xml_elem *parent ) +{ + struct xml_elem elem; + struct xml_attr attr; + xmlstr_t content; + BOOL end = FALSE; + struct entity *entity; + + while (next_xml_attr( xmlbuf, &attr, &end )) + { + } + + if (end) return; + + if (!parse_text_content( xmlbuf, &content )) return; + + entity = add_entity( &assembly->entities, ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS ); + if (!entity) + { + set_error( xmlbuf ); + return; + } + entity->u.settings.name = xmlstrdupW( &parent->name ); + entity->u.settings.value = xmlstrdupW( &content ); + entity->u.settings.ns = xmlstrdupW( &parent->ns ); + + while (next_xml_elem(xmlbuf, &elem, parent)) + { + parse_unknown_elem( xmlbuf, &elem ); + } } -static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, - struct actctx_loader* acl) +static void parse_windows_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem( xmlbuf, &elem, parent )) { - if (xmlstr_cmp_end(&elem, compatibilityW)) + if (xml_elem_cmp( &elem, autoElevateW, windowsSettings2005NSW ) || + xml_elem_cmp( &elem, disableThemingW, windowsSettings2005NSW ) || + xml_elem_cmp( &elem, disableWindowFilteringW, windowsSettings2011NSW ) || + xml_elem_cmp( &elem, dpiAwareW, windowsSettings2005NSW ) || + xml_elem_cmp( &elem, dpiAwarenessW, windowsSettings2016NSW ) || + xml_elem_cmp( &elem, gdiScalingW, windowsSettings2017NSW ) || + xml_elem_cmp( &elem, highResolutionScrollingAwareW, windowsSettings2017NSW ) || + xml_elem_cmp( &elem, longPathAwareW, windowsSettings2016NSW ) || + xml_elem_cmp( &elem, magicFutureSettingW, windowsSettings2017NSW ) || + xml_elem_cmp( &elem, printerDriverIsolationW, windowsSettings2011NSW ) || + xml_elem_cmp( &elem, ultraHighResolutionScrollingAwareW, windowsSettings2017NSW )) { - ret = parse_end_element(xmlbuf); - break; + parse_settings_elem( xmlbuf, assembly, acl, &elem ); } - else if (xmlstr_cmp(&elem, applicationW)) + else { - ret = parse_compatibility_application_elem(xmlbuf, assembly, acl); + parse_unknown_elem( xmlbuf, &elem ); + } + } +} + +static void parse_application_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) +{ + struct xml_elem elem; + + while (next_xml_elem( xmlbuf, &elem, parent )) + { + if (xml_elem_cmp( &elem, windowsSettingsW, asmv3W )) + { + parse_windows_settings_elem( xmlbuf, assembly, acl, &elem ); } else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem( xmlbuf, &elem ); } } - return ret; } -static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_requested_execution_level_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { static const WCHAR levelW[] = {'l','e','v','e','l',0}; static const WCHAR asInvokerW[] = {'a','s','I','n','v','o','k','e','r',0}; @@ -2460,250 +2506,172 @@ static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assemb static const WCHAR falseW[] = {'f','a','l','s','e',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, ret = TRUE, error; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; /* Multiple requestedExecutionLevel elements are not supported. */ - if (assembly->run_level != ACTCTX_RUN_LEVEL_UNSPECIFIED) - return FALSE; + if (assembly->run_level != ACTCTX_RUN_LEVEL_UNSPECIFIED) set_error( xmlbuf ); - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - if (xmlstr_cmp(&attr_name, levelW)) + if (xml_attr_cmp(&attr, levelW)) { - if (xmlstr_cmpi(&attr_value, asInvokerW)) + if (xmlstr_cmpi(&attr.value, asInvokerW)) assembly->run_level = ACTCTX_RUN_LEVEL_AS_INVOKER; - else if (xmlstr_cmpi(&attr_value, highestAvailableW)) + else if (xmlstr_cmpi(&attr.value, highestAvailableW)) assembly->run_level = ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE; - else if (xmlstr_cmpi(&attr_value, requireAdministratorW)) + else if (xmlstr_cmpi(&attr.value, requireAdministratorW)) assembly->run_level = ACTCTX_RUN_LEVEL_REQUIRE_ADMIN; - else - DPRINT1("unknown execution level: %wZ\n", &attr_valueU); } - else if (xmlstr_cmp(&attr_name, uiAccessW)) + else if (xml_attr_cmp(&attr, uiAccessW)) { - if (xmlstr_cmpi(&attr_value, falseW)) + if (xmlstr_cmpi(&attr.value, falseW)) assembly->ui_access = FALSE; - else if (xmlstr_cmpi(&attr_value, trueW)) + else if (xmlstr_cmpi(&attr.value, trueW)) assembly->ui_access = TRUE; - else - DPRINT1("unknown uiAccess value: %wZ\n", &attr_valueU); } - else - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } - if (error) return FALSE; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, requestedExecutionLevelW, asmv2W)) - { - ret = parse_end_element(xmlbuf); - break; - } - else - { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown element %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); - } + parse_unknown_elem(xmlbuf, &elem); } - - return ret; } -static BOOL parse_requested_privileges_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_requested_privileges_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, requestedPrivilegesW, asmv2W)) + if (xml_elem_cmp(&elem, requestedExecutionLevelW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_requested_execution_level_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, requestedExecutionLevelW, asmv2W)) - ret = parse_requested_execution_level_elem(xmlbuf, assembly, acl); else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_security_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +static void parse_security_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, securityW, asmv2W)) + if (xml_elem_cmp(&elem, requestedPrivilegesW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_requested_privileges_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, requestedPrivilegesW, asmv2W)) - ret = parse_requested_privileges_elem(xmlbuf, assembly, acl); else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_trust_info_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +static void parse_trust_info_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, trustInfoW, asmv2W)) + if (xml_elem_cmp(&elem, securityW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_security_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, securityW, asmv2W)) - ret = parse_security_elem(xmlbuf, assembly, acl); else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, - struct assembly* assembly, - struct assembly_identity* expected_ai) +static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly, + struct actctx_loader* acl, const struct xml_elem *parent, + struct assembly_identity* expected_ai) { - xmlstr_t attr_name, attr_value, elem; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error, version = FALSE, xmlns = FALSE, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE, version = FALSE; - DPRINT("(%p)\n", xmlbuf); - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - - if (xmlstr_cmp(&attr_name, manifestVersionW)) + if (xml_attr_cmp(&attr, manifestVersionW)) { static const WCHAR v10W[] = {'1','.','0',0}; - if (!xmlstr_cmp(&attr_value, v10W)) + if (!xmlstr_cmp(&attr.value, v10W)) { - DPRINT1("wrong version %wZ\n", &attr_valueU); - return FALSE; + break; } version = TRUE; } - else if (xmlstr_cmp(&attr_name, xmlnsW)) - { - if (!xmlstr_cmp(&attr_value, manifestv1W) && - !xmlstr_cmp(&attr_value, manifestv2W) && - !xmlstr_cmp(&attr_value, manifestv3W)) - { - DPRINT1("wrong namespace %wZ\n", &attr_valueU); - return FALSE; - } - xmlns = TRUE; - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); - } } - if (error || end || !xmlns || !version) return FALSE; - if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - - if (assembly->type == APPLICATION_MANIFEST && xmlstr_cmp(&elem, noInheritW)) + if (end || !version) { - if (!parse_noinherit_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) - return FALSE; - assembly->no_inherit = TRUE; + set_error( xmlbuf ); + return; } - if (xml_elem_cmp(&elem, noInheritableW, asmv1W)) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (!parse_noinheritable_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) - return FALSE; - } - else if ((assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST) && - assembly->no_inherit) - return FALSE; - - while (ret) - { - if (xml_elem_cmp_end(&elem, assemblyW, asmv1W)) + if (assembly->type == APPLICATION_MANIFEST && xml_elem_cmp(&elem, noInheritW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_noinherit_elem(xmlbuf, &elem); + assembly->no_inherit = TRUE; + } + else if (xml_elem_cmp(&elem, noInheritableW, asmv1W)) + { + parse_noinheritable_elem(xmlbuf, &elem); } else if (xml_elem_cmp(&elem, descriptionW, asmv1W)) { - ret = parse_description_elem(xmlbuf); + parse_description_elem(xmlbuf, &elem); } else if (xml_elem_cmp(&elem, comInterfaceExternalProxyStubW, asmv1W)) { - ret = parse_com_interface_external_proxy_stub_elem(xmlbuf, assembly, acl); + parse_com_interface_external_proxy_stub_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, dependencyW, asmv1W)) { - ret = parse_dependency_elem(xmlbuf, acl); + parse_dependency_elem(xmlbuf, acl, &elem); } else if (xml_elem_cmp(&elem, fileW, asmv1W)) { - ret = parse_file_elem(xmlbuf, assembly, acl); + parse_file_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, clrClassW, asmv1W)) { - ret = parse_clr_class_elem(xmlbuf, assembly, acl); + parse_clr_class_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, clrSurrogateW, asmv1W)) { - ret = parse_clr_surrogate_elem(xmlbuf, assembly, acl); + parse_clr_surrogate_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, trustInfoW, asmv2W) || - xml_elem_cmp(&elem, trustInfoW, asmv1W)) + else if (xml_elem_cmp(&elem, trustInfoW, asmv1W)) { - ret = parse_trust_info_elem(xmlbuf, assembly, acl); + parse_trust_info_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, assemblyIdentityW, asmv1W)) { - if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; + parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id, &elem); - if (expected_ai) + if (!xmlbuf->error && expected_ai) { /* FIXME: more tests */ if (assembly->type == ASSEMBLY_MANIFEST && memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) { - DPRINT1("wrong version for assembly manifest: %u.%u.%u.%u / %u.%u.%u.%u\n", - expected_ai->version.major, expected_ai->version.minor, - expected_ai->version.build, expected_ai->version.revision, - assembly->id.version.major, assembly->id.version.minor, - assembly->id.version.build, assembly->id.version.revision); - ret = FALSE; + set_error( xmlbuf ); } else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && (assembly->id.version.major != expected_ai->version.major || @@ -2712,62 +2680,64 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, (assembly->id.version.build == expected_ai->version.build && assembly->id.version.revision < expected_ai->version.revision))) { - DPRINT1("wrong version for shared assembly manifest\n"); - ret = FALSE; + set_error( xmlbuf ); } } } else if (xml_elem_cmp(&elem, compatibilityW, compatibilityNSW)) { - ret = parse_compatibility_elem(xmlbuf, assembly, acl); + parse_compatibility_elem(xmlbuf, assembly, acl, &elem); + } + else if (xml_elem_cmp(&elem, applicationW, asmv3W)) + { + parse_application_elem(xmlbuf, assembly, acl, &elem); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown element %wZ\n", &attr_nameU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } - if (ret) ret = next_xml_elem(xmlbuf, &elem); } - return ret; + if ((assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST) && + assembly->no_inherit) + { + set_error( xmlbuf ); + } } static NTSTATUS parse_manifest_buffer( struct actctx_loader* acl, struct assembly *assembly, struct assembly_identity* ai, xmlbuf_t *xmlbuf ) { - xmlstr_t elem; - UNICODE_STRING elemU; + struct xml_elem elem; + struct xml_elem parent = {0}; + + xmlbuf->error = FALSE; + xmlbuf->ns_pos = 0; - if (!next_xml_elem(xmlbuf, &elem)) return STATUS_SXS_CANT_GEN_ACTCTX; + if (!next_xml_elem(xmlbuf, &elem, &parent)) return STATUS_SXS_CANT_GEN_ACTCTX; - if (xmlstr_cmp(&elem, g_xmlW) && - (!parse_xml_header(xmlbuf) || !next_xml_elem(xmlbuf, &elem))) + if (xmlstr_cmp(&elem.name, g_xmlW) && + (!parse_xml_header(xmlbuf) || !next_xml_elem(xmlbuf, &elem, &parent))) return STATUS_SXS_CANT_GEN_ACTCTX; if (!xml_elem_cmp(&elem, assemblyW, asmv1W)) { - elemU = xmlstr2unicode(&elem); - DPRINT1("root element is %wZ, not <assembly>\n", &elemU); return STATUS_SXS_CANT_GEN_ACTCTX; } - if (!parse_assembly_elem(xmlbuf, acl, assembly, ai)) + parse_assembly_elem(xmlbuf, assembly, acl, &elem, ai); + if (xmlbuf->error) { - DPRINT1("failed to parse manifest %S\n", assembly->manifest.info ); return STATUS_SXS_CANT_GEN_ACTCTX; } - if (next_xml_elem(xmlbuf, &elem)) + if (next_xml_elem(xmlbuf, &elem, &parent)) { - elemU = xmlstr2unicode(&elem); - DPRINT1("unexpected element %wZ\n", &elemU); return STATUS_SXS_CANT_GEN_ACTCTX; } if (xmlbuf->ptr != xmlbuf->end) { - DPRINT1("parse error\n"); return STATUS_SXS_CANT_GEN_ACTCTX; } return STATUS_SUCCESS; @@ -3572,7 +3542,7 @@ static struct string_index *find_string_index(const struct strsection_header *se { const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); - if (!_wcsnicmp(nameW, name->Buffer, name->Length / sizeof(WCHAR)) && + if (!_wcsnicmp(nameW, name->Buffer, name->Length / sizeof(WCHAR)) && wcslen(nameW) == name->Length / sizeof(WCHAR)) { index = iter; @@ -5714,7 +5684,7 @@ RtlpFindActivationContextSection_CheckParameters( ULONG flags, const GUID *guid, const UNICODE_STRING *section_name, PACTCTX_SECTION_KEYED_DATA data ) { /* Check general parameter combinations */ - if (!section_name || !section_name->Buffer || + if (!section_name || !section_name->Buffer || (flags & ~FIND_ACTCTX_VALID_MASK) || ((flags & FIND_ACTCTX_VALID_MASK) && !data) || (data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex)))

3 years, 12 months

[reactos] 01/01: [RAPPS] Use `RegDeleteKeyExW` for deleting the apps strings from registry only if it is available in advapi32 Otherwise, use `RegDeleteKeyW` instead, on Windows versions whose don't have the Ex function (XP SP3 x32, Server 2003 SP0 and earlier). It will fix regression with Rapps startup there, due to that missing function. CORE-17264

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b62948ef774538fb5066e… commit b62948ef774538fb5066e88c3b92ce2010bd842c Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Sep 16 17:54:20 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 19:23:06 2020 +0200 [RAPPS] Use `RegDeleteKeyExW` for deleting the apps strings from registry only if it is available in advapi32 Otherwise, use `RegDeleteKeyW` instead, on Windows versions whose don't have the Ex function (XP SP3 x32, Server 2003 SP0 and earlier). It will fix regression with Rapps startup there, due to that missing function. CORE-17264 --- base/applications/rapps/installed.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 4179334a60a..5296c3fc6ae 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -141,16 +141,34 @@ BOOL CInstalledApplicationInfo::UninstallApplication(BOOL bModify) return StartProcess(bModify ? szModifyPath : szUninstallString, TRUE); } +typedef LSTATUS (WINAPI *RegDeleteKeyExWProc)(HKEY, LPCWSTR, REGSAM, DWORD); + LSTATUS CInstalledApplicationInfo::RemoveFromRegistry() { ATL::CStringW szFullName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + szKeyName; + HMODULE hMod = GetModuleHandleW(L"advapi32.dll"); + RegDeleteKeyExWProc pRegDeleteKeyExW; - // TODO: if there are subkeys inside, simply RegDeleteKeyExW will fail + // TODO: if there are subkeys inside, simply RegDeleteKeyExW + // (or RegDeleteKeyW on Server 2003 SP0 and earlier) will fail // we don't have RegDeleteTree for ReactOS now. (It's a WinVista API) // write a function to delete all subkeys recursively to solve this // or consider letting ReactOS having this API - return RegDeleteKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName, WowKey, 0); + /* Load RegDeleteKeyExW from advapi32.dll if available */ + if (hMod) + { + pRegDeleteKeyExW = (RegDeleteKeyExWProc)GetProcAddress(hMod, "RegDeleteKeyExW"); + + if (pRegDeleteKeyExW) + { + /* Return it */ + return pRegDeleteKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName, WowKey, 0); + } + } + + /* Otherwise, return non-Ex function */ + return RegDeleteKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName); } BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param)

3 years, 12 months

[reactos] 01/01: [REACTOS] *.spec: Fix some function/parameter types (#3154)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=889b077b23490f5eeeb55… commit 889b077b23490f5eeeb5558501a8a25c637396d1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Sep 20 19:21:11 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 19:21:11 2020 +0200 [REACTOS] *.spec: Fix some function/parameter types (#3154) --- boot/freeldr/freeldr/freeldr.spec | 2 +- dll/appcompat/apphelp/apphelp.spec | 2 +- dll/ntdll/def/ntdll.spec | 4 ++-- dll/win32/advapi32/advapi32.spec | 4 ++-- dll/win32/oledlg/oledlg.spec | 4 ++-- dll/win32/shell32/shell32.spec | 4 ++-- dll/win32/shlwapi/shlwapi.spec | 2 +- drivers/storage/class/classpnp/classpnp.spec | 2 +- drivers/storage/port/scsiport/scsiport.spec | 2 +- drivers/storage/port/storport/storport.spec | 2 +- drivers/wdm/audio/legacy/stream/stream.spec | 2 +- ntoskrnl/ntoskrnl.spec | 14 +++++++------- sdk/lib/debugsup/debugsup-ntos.spec | 6 +++--- win32ss/drivers/videoprt/videoprt.spec | 2 +- win32ss/user/user32/user32.spec | 4 ++-- win32ss/win32k.spec | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/boot/freeldr/freeldr/freeldr.spec b/boot/freeldr/freeldr/freeldr.spec index aec37ea8457..3ffd70aac37 100644 --- a/boot/freeldr/freeldr/freeldr.spec +++ b/boot/freeldr/freeldr/freeldr.spec @@ -1,5 +1,5 @@ @ stdcall RtlAssert(ptr ptr long ptr) -@ cdecl ScsiDebugPrint() +@ varargs ScsiDebugPrint(long str) @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) @ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) diff --git a/dll/appcompat/apphelp/apphelp.spec b/dll/appcompat/apphelp/apphelp.spec index 8f08f24d47a..b2f7ba27fa0 100644 --- a/dll/appcompat/apphelp/apphelp.spec +++ b/dll/appcompat/apphelp/apphelp.spec @@ -172,7 +172,7 @@ @ stub SE_GetShimCount @ stub SE_LdrEntryRemoved @ stub SetPermLayers -@ cdecl ShimDbgPrint(long str str) +@ varargs ShimDbgPrint(long str str) @ stdcall ShimDumpCache(ptr ptr wstr long) @ stdcall ShimFlushCache(ptr ptr wstr long) @ stdcall SetPermLayerState(wstr wstr long long long) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 6f3204ae897..dc9969102e2 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -108,8 +108,8 @@ @ stdcall -version=0x502 EtwStopTraceW(double wstr ptr) @ stdcall -version=0x502 EtwTraceEvent(double ptr) @ stdcall -stub EtwTraceEventInstance(double ptr ptr ptr) -@ varargs EtwTraceMessage(ptr long ptr long) -@ stdcall -stub EtwTraceMessageVa(double long ptr long ptr) +@ varargs EtwTraceMessage(int64 long ptr long) +@ stdcall -stub EtwTraceMessageVa(int64 long ptr long ptr) @ stdcall EtwUnregisterTraceGuids(double) @ stdcall -version=0x502 EtwUpdateTraceA(double str ptr) @ stdcall -version=0x502 EtwUpdateTraceW(double wstr ptr) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 543b6ca4f6b..9a580df9df6 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -631,8 +631,8 @@ @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory @ stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent @ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance -@ varargs TraceMessage(ptr long ptr long) ntdll.EtwTraceMessage -@ stdcall TraceMessageVa(double long ptr long ptr) ntdll.EtwTraceMessageVa +@ varargs TraceMessage() ntdll.EtwTraceMessage +@ stdcall TraceMessageVa() ntdll.EtwTraceMessageVa @ stdcall TreeResetNamedSecurityInfoA(str ptr ptr ptr ptr ptr ptr long ptr ptr ptr) @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) @ stub TrusteeAccessToObjectA diff --git a/dll/win32/oledlg/oledlg.spec b/dll/win32/oledlg/oledlg.spec index c4f35fd5778..3220d070ef2 100644 --- a/dll/win32/oledlg/oledlg.spec +++ b/dll/win32/oledlg/oledlg.spec @@ -7,10 +7,10 @@ 7 stdcall OleUIConvertA(ptr) 8 stdcall OleUIBusyA(ptr) 9 stdcall OleUIUpdateLinksA(ptr long str long) - 10 varargs OleUIPromptUserA(long long) + 10 varargs OleUIPromptUserA(long ptr) 11 stdcall OleUIObjectPropertiesA(ptr) 12 stdcall OleUIChangeSourceA(ptr) - 13 varargs OleUIPromptUserW(long long) + 13 varargs OleUIPromptUserW(long ptr) 14 stdcall OleUIAddVerbMenuW(ptr wstr long long long long long long ptr) 15 stdcall OleUIBusyW(ptr) 16 stdcall OleUIChangeIconW(ptr) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index f5270cc103f..b96c0f209d5 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -178,8 +178,8 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxW(long long wstr wstr long) ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') -183 varargs ShellMessageBoxA(long long str str long) +182 varargs ShellMessageBoxW() ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') +183 varargs ShellMessageBoxA(ptr ptr str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long) 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 9bcd21739bf..dd1e3cd7d1b 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 varargs -noname ShellMessageBoxWrapW(long long wstr wstr long) +388 varargs -noname ShellMessageBoxWrapW(ptr ptr wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) diff --git a/drivers/storage/class/classpnp/classpnp.spec b/drivers/storage/class/classpnp/classpnp.spec index 9ab5443db18..6662c168f33 100644 --- a/drivers/storage/class/classpnp/classpnp.spec +++ b/drivers/storage/class/classpnp/classpnp.spec @@ -30,7 +30,7 @@ @ stdcall ClassInvalidateBusRelations(ptr) @ stdcall ClassMarkChildrenMissing(ptr) @ stdcall ClassMarkChildMissing(ptr long) - @ varargs ClassDebugPrint(long long) + @ varargs ClassDebugPrint(long str) @ stdcall ClassGetDriverExtension(ptr) @ stdcall ClassCompleteRequest(ptr ptr long) @ stdcall ClassReleaseRemoveLock(ptr ptr) diff --git a/drivers/storage/port/scsiport/scsiport.spec b/drivers/storage/port/scsiport/scsiport.spec index 705ab7c3a45..f01b7a48f12 100644 --- a/drivers/storage/port/scsiport/scsiport.spec +++ b/drivers/storage/port/scsiport/scsiport.spec @@ -1,4 +1,4 @@ -@ cdecl ScsiDebugPrint() +@ varargs ScsiDebugPrint(long str) @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) @ stdcall -arch=i386,arm ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger diff --git a/drivers/storage/port/storport/storport.spec b/drivers/storage/port/storport/storport.spec index a36e5ed49a8..7ccc9513fd9 100644 --- a/drivers/storage/port/storport/storport.spec +++ b/drivers/storage/port/storport/storport.spec @@ -6,7 +6,7 @@ @ stdcall StorPortCompleteRequest(ptr long long long long) @ stdcall StorPortConvertPhysicalAddressToUlong(long long) @ stdcall StorPortConvertUlongToPhysicalAddress(long) -@ cdecl StorPortDebugPrint() +@ varargs StorPortDebugPrint(long str) @ stdcall StorPortDeviceBusy(ptr long long long long) @ stdcall StorPortDeviceReady(ptr long long long) @ cdecl StorPortExtendedFunction() diff --git a/drivers/wdm/audio/legacy/stream/stream.spec b/drivers/wdm/audio/legacy/stream/stream.spec index 85cb8dc4b6a..0986510c112 100644 --- a/drivers/wdm/audio/legacy/stream/stream.spec +++ b/drivers/wdm/audio/legacy/stream/stream.spec @@ -3,7 +3,7 @@ @ stdcall StreamClassRegisterAdapter(ptr ptr ptr) @ stdcall StreamClassReenumerateStreams(ptr long) @ stdcall StreamClassDebugAssert(long long ptr long) -@ cdecl StreamClassDebugPrint (long str) +@ varargs StreamClassDebugPrint(long str) @ cdecl StreamClassDeviceNotification(long ptr) @ stdcall StreamClassGetDmaBuffer(ptr) @ stdcall StreamClassReadWriteConfig(ptr long ptr long long) \ No newline at end of file diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 5da7e3bf0af..2965a67ffbf 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -47,9 +47,9 @@ @ stdcall DbgBreakPointWithStatus(long) @ stdcall DbgCommandString(ptr ptr) @ stdcall DbgLoadImageSymbols(ptr ptr long) -@ cdecl DbgPrint(str) -@ cdecl DbgPrintEx(long long str) -@ cdecl DbgPrintReturnControlC(str) +@ varargs DbgPrint(str) +@ varargs DbgPrintEx(long long str) +@ varargs DbgPrintReturnControlC(str) @ stdcall DbgPrompt(str ptr long) @ stdcall DbgQueryDebugFilterState(long long) @ stdcall DbgSetDebugFilterState(long long long) @@ -1404,8 +1404,8 @@ @ stdcall WmiStartTrace(ptr) @ stdcall WmiStopTrace(ptr) @ fastcall WmiTraceFastEvent(ptr) -@ cdecl WmiTraceMessage() -@ stdcall WmiTraceMessageVa(double long ptr long long) +@ varargs WmiTraceMessage(int64 long ptr long) +@ stdcall WmiTraceMessageVa(int64 long ptr long ptr) @ stdcall WmiUpdateTrace(ptr) @ stdcall XIPDispatch(long ptr long) @ stdcall ZwAccessCheckAndAuditAlarm(ptr ptr ptr ptr ptr long ptr long ptr ptr ptr) @@ -1595,7 +1595,7 @@ @ cdecl memset() @ cdecl qsort() @ cdecl rand() -@ cdecl sprintf() +@ varargs sprintf(ptr str) @ cdecl srand() @ cdecl strcat() @ cdecl strchr() @@ -1615,7 +1615,7 @@ @ cdecl towupper() @ stdcall vDbgPrintEx(long long str ptr) @ stdcall vDbgPrintExWithPrefix(str long long str ptr) -@ cdecl vsprintf() +@ cdecl vsprintf(ptr str ptr) @ cdecl wcscat() @ cdecl wcschr() @ cdecl wcscmp() diff --git a/sdk/lib/debugsup/debugsup-ntos.spec b/sdk/lib/debugsup/debugsup-ntos.spec index f7ec548c629..04e5e970a59 100644 --- a/sdk/lib/debugsup/debugsup-ntos.spec +++ b/sdk/lib/debugsup/debugsup-ntos.spec @@ -1,8 +1,8 @@ @ stdcall DbgBreakPoint() @ stdcall DbgBreakPointWithStatus(long) -@ varargs DbgPrint() -@ varargs DbgPrintEx() +@ varargs DbgPrint(str) +@ varargs DbgPrintEx(long long str) @ stdcall DbgPrompt(ptr ptr long) @ stdcall RtlAssert(ptr ptr long ptr) @ stdcall RtlUnwind(ptr ptr ptr ptr) -@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr) +@ stdcall vDbgPrintExWithPrefix(str long long str ptr) diff --git a/win32ss/drivers/videoprt/videoprt.spec b/win32ss/drivers/videoprt/videoprt.spec index ee12c0692de..2f9b065afe7 100644 --- a/win32ss/drivers/videoprt/videoprt.spec +++ b/win32ss/drivers/videoprt/videoprt.spec @@ -19,7 +19,7 @@ @ stdcall VideoPortCreateSecondaryDisplay(ptr ptr long) @ stdcall VideoPortCreateSpinLock(ptr ptr) @ stdcall VideoPortDDCMonitorHelper(ptr ptr ptr long) -@ cdecl VideoPortDebugPrint(long ptr) +@ varargs VideoPortDebugPrint(long str) @ stdcall VideoPortDeleteEvent(ptr ptr) @ stdcall VideoPortDeleteSpinLock(ptr ptr) @ stdcall VideoPortDisableInterrupt(ptr) diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index dc54a3e22e5..9e87f95c49f 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -744,7 +744,7 @@ 735 stdcall WindowFromPoint(double) 736 stdcall keybd_event(long long long long) 737 stdcall mouse_event(long long long long long) -738 varargs wsprintfA(str str) -739 varargs wsprintfW(wstr wstr) +738 varargs wsprintfA(ptr str) +739 varargs wsprintfW(ptr wstr) 740 stdcall wvsprintfA(ptr str ptr) 741 stdcall wvsprintfW(ptr wstr ptr) diff --git a/win32ss/win32k.spec b/win32ss/win32k.spec index a33552cbd74..6bf69b5f6ec 100644 --- a/win32ss/win32k.spec +++ b/win32ss/win32k.spec @@ -30,7 +30,7 @@ @ stdcall EngCreateSemaphore() @ stdcall EngCreateWnd(ptr ptr ptr long long) @ stdcall EngDebugBreak() NTOSKRNL.DbgBreakPoint -@ stdcall EngDebugPrint(ptr ptr ptr) +@ stdcall EngDebugPrint(str str ptr) @ stdcall EngDeleteClip(ptr) @ stdcall EngDeleteDriverObj(ptr long long) @ stdcall EngDeleteEvent(ptr)

3 years, 12 months

[reactos] 01/01: [RAPPS] Display custom applications icons for installed applications CORE-17257 (#3144)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eb90143f8bd4af34f494… commit 7eb90143f8bd4af34f49437e456293cd67bd39f6 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Sep 20 20:19:59 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 19:19:59 2020 +0200 [RAPPS] Display custom applications icons for installed applications CORE-17257 (#3144) * [RAPPS] Display custom applications icons for installed applications - Implement `RetrieveIcon` helper function in `CInstalledApplicationInfo` class, which retrueves the current app's icon from registry, same as it done for `CAvailableApplicationInfo`. - Use it for loading the icon in `CAppsListView::AddInstalledApplication` function, via `ExtractIconW`. Load default Rapps icon only when the app has no its custom icon. - Retrieve `DisplayIcon` value from registry in `CInstalledApps::Enum` function, same as other registry values (like app name, description, etc).Store it in `szDisplayIcon` string, which is used in `CInstalledApplicationInfo::RetrieveIcon` for retrieving the data of that value. - Increase `LISTVIEW_ICON_SIZE` macro from 24 to 32, so 32x32 icon size is now used instead of 24x24. This makes displayed icons more accurate, since most of apps contain 32x32 icon, so they look a bit distorted with 24x24 size. --- base/applications/rapps/appview.cpp | 22 ++++++++++++++++++++-- base/applications/rapps/include/appview.h | 2 +- base/applications/rapps/include/installed.h | 2 ++ base/applications/rapps/installed.cpp | 11 +++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 58584fa3b72..0bdcc67cdbc 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1382,7 +1382,26 @@ BOOL CAppsListView::AddInstalledApplication(CInstalledApplicationInfo *InstAppIn return FALSE; } - HICON hIcon = (HICON)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + /* Load icon from registry */ + HICON hIcon = NULL; + ATL::CStringW szIconPath; + if (InstAppInfo->RetrieveIcon(szIconPath)) + { + PathParseIconLocationW((LPWSTR)szIconPath.GetString()); + + /* Load only the 1st icon from the application executable, + * because all apps provide the executables which have the main icon + * as 1st in the index , so we don't need other icons here */ + hIcon = ExtractIconW(hInst, + szIconPath.GetString(), + 0); + } + + if (!hIcon) + { + /* Load default icon */ + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + } int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); DestroyIcon(hIcon); @@ -2024,4 +2043,3 @@ BOOL CApplicationView::ItemCheckStateChanged(BOOL bChecked, LPVOID CallbackParam return TRUE; } // **** CApplicationView **** - diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 7e8b9da6bc0..668131245ce 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -20,7 +20,7 @@ using namespace Gdiplus; -#define LISTVIEW_ICON_SIZE 24 +#define LISTVIEW_ICON_SIZE 32 // default broken-image icon size #define BROKENIMG_ICON_SIZE 96 diff --git a/base/applications/rapps/include/installed.h b/base/applications/rapps/include/installed.h index a719ed9057f..6e950056481 100644 --- a/base/applications/rapps/include/installed.h +++ b/base/applications/rapps/include/installed.h @@ -16,9 +16,11 @@ public: CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey); BOOL GetApplicationRegString(LPCWSTR lpKeyName, ATL::CStringW& String); BOOL GetApplicationRegDword(LPCWSTR lpKeyName, DWORD *lpValue); + BOOL RetrieveIcon(ATL::CStringW& IconLocation); BOOL UninstallApplication(BOOL bModify); LSTATUS RemoveFromRegistry(); + ATL::CStringW szDisplayIcon; ATL::CStringW szDisplayName; ATL::CStringW szDisplayVersion; ATL::CStringW szPublisher; diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 955ba012130..4179334a60a 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -126,6 +126,16 @@ BOOL CInstalledApplicationInfo::GetApplicationRegDword(LPCWSTR lpKeyName, DWORD return TRUE; } +BOOL CInstalledApplicationInfo::RetrieveIcon(ATL::CStringW& IconLocation) +{ + if (szDisplayIcon.IsEmpty()) + { + return FALSE; + } + IconLocation = szDisplayIcon; + return TRUE; +} + BOOL CInstalledApplicationInfo::UninstallApplication(BOOL bModify) { return StartProcess(bModify ? szModifyPath : szUninstallString, TRUE); @@ -206,6 +216,7 @@ BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param) // those items without display name are ignored if (Info->GetApplicationRegString(L"DisplayName", Info->szDisplayName)) { + Info->GetApplicationRegString(L"DisplayIcon", Info->szDisplayIcon); Info->GetApplicationRegString(L"DisplayVersion", Info->szDisplayVersion); Info->GetApplicationRegString(L"Publisher", Info->szPublisher); Info->GetApplicationRegString(L"RegOwner", Info->szRegOwner);

3 years, 12 months

[reactos] 01/01: [SDK] Add dummy import lib files for MSVC_IDE build, to work around a CMake bug generating broken dll targets ROSBE-159

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5730485a51d8bb58ff9f8… commit 5730485a51d8bb58ff9f8f2131b85c128510a6b6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 10 22:03:52 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 19:18:15 2020 +0200 [SDK] Add dummy import lib files for MSVC_IDE build, to work around a CMake bug generating broken dll targets ROSBE-159 --- sdk/cmake/msvc.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 94847a84167..e1899089a6f 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -172,6 +172,13 @@ string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_LIBRARY "${C string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}") string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") +# HACK2: CMake lacks the ability to completely remove the 'implib' argument for solution files... +# To work around this, we just let it create a dummy file +if(MSVC_IDE) + set(CMAKE_IMPORT_LIBRARY_SUFFIX ".dummy") +endif() + + if(CMAKE_DISABLE_NINJA_DEPSLOG) set(cl_includes_flag "") else()

3 years, 12 months

[reactos] 02/02: [CREATECABFILE] Update rapps example scripts for new usage

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7119b13a2881721b63c8f… commit 7119b13a2881721b63c8f7db45294fdc56631fe5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 12 21:00:38 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 17:30:26 2020 +0200 [CREATECABFILE] Update rapps example scripts for new usage --- base/applications/rapps/CreateCabFile.bat | 32 +++++++++++++++++++++++------ base/applications/rapps/CreateCabFile.sh | 34 ++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/base/applications/rapps/CreateCabFile.bat b/base/applications/rapps/CreateCabFile.bat index 4e216478c33..bccd8b356a4 100644 --- a/base/applications/rapps/CreateCabFile.bat +++ b/base/applications/rapps/CreateCabFile.bat @@ -1,12 +1,32 @@ @echo off -cd ..\..\..\media +IF "%1"=="" GOTO show_usage +IF "%2"=="" GOTO show_usage +IF "%3"=="" GOTO show_usage -mkdir rapps\utf16 +SET CABMAN_CMD=%1 +SET UTF16LE_CMD=%2 +SET RAPPSDB_PATH=%3 -for %%f in (rapps\*.txt) do ( - ..\output-MinGW-i386\host-tools\utf16le.exe "rapps\%%~nf.txt" "rapps\utf16\%%~nf.txt" +mkdir "%RAPPSDB_PATH%\utf16" + +echo Converting txt files to utf16 +for %%f in (%RAPPSDB_PATH%\*.txt) do ( + %UTF16LE_CMD% "%RAPPSDB_PATH%\%%~nf.txt" "%RAPPSDB_PATH%\utf16\%%~nf.txt" ) -..\output-MinGW-i386\host-tools\cabman.exe -M mszip -S rapps\rappmgr.cab rapps\utf16\*.txt -rmdir /s /q rapps\utf16 +echo Building rappmgr.cab +%CABMAN_CMD% -M mszip -S "%RAPPSDB_PATH%\rappmgr.cab" "%RAPPSDB_PATH%\utf16\*.txt" + +echo Building rappmgr2.cab +%CABMAN_CMD% -M mszip -S "%RAPPSDB_PATH%\rappmgr2.cab" "%RAPPSDB_PATH%\utf16\*.txt" -F icons "%RAPPSDB_PATH%\icons\*.ico" + +echo Cleaning up +rmdir /s /q "%RAPPSDB_PATH%\utf16" + +echo Done + +goto :eof + +:show_usage +echo Usage: CreateCabFile.bat path\to\cabman.exe path\to\utf16le.exe path\to\rapps-db diff --git a/base/applications/rapps/CreateCabFile.sh b/base/applications/rapps/CreateCabFile.sh index 3a31ca7235c..c7783e6d772 100644 --- a/base/applications/rapps/CreateCabFile.sh +++ b/base/applications/rapps/CreateCabFile.sh @@ -1,9 +1,29 @@ #/bin/sh -cd ../../../media -mkdir rapps/utf16 -for i in $(find -type f); do - ../../host-tools/utf16le $i utf16/$i + +if [ "$#" != "3" ]; then + echo "Usage: CreateCabFile.sh path/to/cabman path/to/utf16le path/to/rapps-db" + exit -1 +fi + +CABMAN_CMD="$1" +UTF16LE_CMD="$2" +RAPPSDB_PATH="$3" + +mkdir "$RAPPSDB_PATH/utf16" + +echo Converting txt files to utf16 +for filename in $RAPPSDB_PATH/*.txt; do + just_filename=$(basename -- "$filename") + $UTF16LE_CMD "$filename" "$RAPPSDB_PATH/utf16/$just_filename" done -cd .. -../../host-tools/cabman -M mszip -S rapps/rappmgr.cab rapps/utf16/*.txt -rm -r rapps/uft16 \ No newline at end of file + +echo Building rappmgr.cab +$CABMAN_CMD -M mszip -S "$RAPPSDB_PATH/rappmgr.cab" "$RAPPSDB_PATH/utf16/*.txt" + +echo Building rappmgr2.cab +$CABMAN_CMD -M mszip -S "$RAPPSDB_PATH/rappmgr2.cab" "$RAPPSDB_PATH/utf16/*.txt" -F icons "$RAPPSDB_PATH/icons/*.ico" + +echo Cleaning up +rm -r "$RAPPSDB_PATH/utf16" + +echo Done

3 years, 12 months

[reactos] 01/02: [CABMAN] Add commandline support for creating a cab with folders CORE-17230

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70193adc891cd59b0379b… commit 70193adc891cd59b0379bef9dd5627ac222ba954 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 12 16:21:34 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 17:28:02 2020 +0200 [CABMAN] Add commandline support for creating a cab with folders CORE-17230 --- sdk/tools/cabman/cabinet.cxx | 77 ++++++++++++++++++++++++++------------------ sdk/tools/cabman/cabinet.h | 14 +++++--- sdk/tools/cabman/cabman.cxx | 25 +++++++++++--- sdk/tools/cabman/dfp.cxx | 8 ++--- 4 files changed, 78 insertions(+), 46 deletions(-) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 175efef918a..29f9975b6fe 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -155,7 +155,7 @@ void CCabinet::ConvertPath(std::string& Path) } -const char* CCabinet::GetFileName(const char* Path) +std::string CCabinet::GetFileName(const std::string& Path) /* * FUNCTION: Returns a pointer to file name * ARGUMENTS: @@ -172,7 +172,7 @@ const char* CCabinet::GetFileName(const char* Path) if (IsSeparator(Path [i - 1])) j = i; - return Path + j; + return Path.c_str() + j; } @@ -225,7 +225,7 @@ void CCabinet::SetDestinationPath(const char* DestinationPath) NormalizePath(DestPath); } -ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) +ULONG CCabinet::AddSearchCriteria(const std::string& SearchCriteria, const std::string& TargetFolder) /* * FUNCTION: Adds a criteria to the search criteria list * ARGUMENTS: @@ -248,6 +248,7 @@ ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) // Set the actual criteria string Criteria->Search = SearchCriteria; + Criteria->TargetFolder = TargetFolder; return CAB_STATUS_SUCCESS; } @@ -274,6 +275,16 @@ bool CCabinet::HasSearchCriteria() return !CriteriaList.empty(); } +std::string CCabinet::CreateCabFilename(PCFFILE_NODE Node) +{ + std::string fname = GetFileName(Node->FileName); + if (!Node->TargetFolder.empty()) + { + fname = Node->TargetFolder + fname; + } + return fname; +} + bool CCabinet::SetCompressionCodec(const char* CodecName) /* * FUNCTION: Selects the codec to use for compression @@ -591,6 +602,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) for (PSEARCH_CRITERIA Criteria : CriteriaList) { + // FIXME: We could handle path\filename here if (MatchFileNamePattern((*Search->Next)->FileName.c_str(), Criteria->Search.c_str())) { bFound = true; @@ -1202,7 +1214,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) SourceFile = fopen(FileNode->FileName.c_str(), "rb"); if (SourceFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName.c_str())); + DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileNameOnDisk.c_str())); return CAB_STATUS_NOFILE; } @@ -1227,7 +1239,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; - Size = sizeof(CFFILE) + (ULONG)strlen(GetFileName(FileNode->FileName.c_str())) + 1; + Size = sizeof(CFFILE) + (ULONG)CreateCabFilename(FileNode).length() + 1; CABHeader.FileTableOffset += Size; TotalFileSize += Size; DiskSize += Size; @@ -1500,7 +1512,7 @@ ULONG CCabinet::CloseCabinet() } -ULONG CCabinet::AddFile(char* FileName) +ULONG CCabinet::AddFile(const std::string& FileName, const std::string& TargetFolder) /* * FUNCTION: Adds a file to the current disk * ARGUMENTS: @@ -1534,6 +1546,9 @@ ULONG CCabinet::AddFile(char* FileName) FileNode->FolderNode = CurrentFolderNode; FileNode->FileName = NewFileName; + FileNode->TargetFolder = TargetFolder; + if (FileNode->TargetFolder.length() > 0 && FileNode->TargetFolder[FileNode->TargetFolder.length() - 1] != '\\') + FileNode->TargetFolder += '\\'; /* FIXME: Check for and handle large files (>= 2GB) */ FileNode->File.FileSize = GetSizeOfFile(SrcFile); @@ -1569,9 +1584,6 @@ bool CCabinet::CreateSimpleCabinet() */ { bool bRet = false; - const char* pszFile; - char szFilePath[PATH_MAX]; - char szFile[PATH_MAX]; ULONG Status; #if defined(_WIN32) @@ -1595,26 +1607,25 @@ bool CCabinet::CreateSimpleCabinet() for (PSEARCH_CRITERIA Criteria : CriteriaList) { // Store the file path with a trailing slash in szFilePath - ConvertPath(Criteria->Search); - pszFile = strrchr(Criteria->Search.c_str(), DIR_SEPARATOR_CHAR); + std::string szSearchPath = Criteria->Search; + ConvertPath(szSearchPath); + auto sep = szSearchPath.find_last_of(DIR_SEPARATOR_CHAR); + std::string szFilePath; + std::string pszFile; - if(pszFile) + if (sep != std::string::npos) { - // Set the pointer to the start of the file name, not the slash - pszFile++; + pszFile = szSearchPath.substr(sep + 1); // We want the filename, not the dir separator! - strncpy(szFilePath, Criteria->Search.c_str(), pszFile - Criteria->Search.c_str()); - szFilePath[pszFile - Criteria->Search.c_str()] = 0; + szFilePath = szSearchPath.substr(0, sep + 1); } else { - pszFile = Criteria->Search.c_str(); + pszFile = Criteria->Search; -#if defined(_WIN32) - szFilePath[0] = 0; -#else +#if !defined(_WIN32) // needed for opendir() - strcpy(szFilePath, "./"); + szFilePath = "./"; #endif } @@ -1633,10 +1644,10 @@ bool CCabinet::CreateSimpleCabinet() { if(!(FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - strcpy(szFile, szFilePath); - strcat(szFile, FindFileData.cFileName); + std::string szFile = szFilePath; + szFile += FindFileData.cFileName; - Status = AddFile(szFile); + Status = AddFile(szFile, Criteria->TargetFolder); if(Status != CAB_STATUS_SUCCESS) { @@ -1651,22 +1662,22 @@ bool CCabinet::CreateSimpleCabinet() FindClose(hFind); #else // Unix: Use opendir/readdir to loop through all entries, stat to check if it's a file and MatchFileNamePattern to match the file against the pattern - dirp = opendir(szFilePath); + dirp = opendir(szFilePath.c_str()); if(dirp) { while( (dp = readdir(dirp)) ) { - strcpy(szFile, szFilePath); - strcat(szFile, dp->d_name); + std::string szFile = szFilePath; + szFile += dp->d_name; - if(stat(szFile, &stbuf) == 0) + if(stat(szFile.c_str(), &stbuf) == 0) { if(stbuf.st_mode != S_IFDIR) { - if(MatchFileNamePattern(dp->d_name, pszFile)) + if(MatchFileNamePattern(dp->d_name, pszFile.c_str())) { - Status = AddFile(szFile); + Status = AddFile(szFile, Criteria->TargetFolder); if(Status != CAB_STATUS_SUCCESS) { @@ -1890,6 +1901,7 @@ ULONG CCabinet::LocateFile(const char* FileName, for (PCFFILE_NODE Node : FileList) { + // FIXME: We could handle path\filename here if (strcasecmp(FileName, Node->FileName.c_str()) == 0) { CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); @@ -2011,6 +2023,7 @@ ULONG CCabinet::ReadFileTable() Status = ReadString(Buf, PATH_MAX); if (Status != CAB_STATUS_SUCCESS) return Status; + // FIXME: We could split up folder\file.txt here File->FileName = Buf; DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%X). Size (%u bytes) ControlId (0x%X).\n", @@ -2195,7 +2208,7 @@ void CCabinet::DestroyDeletedFileNodes() DPRINT(MAX_TRACE, ("Deleting file node: '%s'\n", CurNode->FileName.c_str())); - TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName.c_str())) + 1); + TotalFileSize -= (sizeof(CFFILE) + (ULONG)CreateCabFilename(CurNode).length() + 1); delete CurNode; } @@ -2669,7 +2682,7 @@ ULONG CCabinet::WriteFileEntries() return CAB_STATUS_CANNOT_WRITE; } - std::string fname = GetFileName(File->FileName.c_str()); + std::string fname = CreateCabFilename(File); if (fwrite(fname.c_str(), fname.length() + 1, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 0940436d975..1697588bbfc 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -227,6 +227,7 @@ typedef struct _CFFILE_NODE { CFFILE File = { 0 }; std::string FileName; + std::string TargetFolder; PCFDATA_NODE DataBlock = nullptr; // First data block of file. NULL if not known bool Commit = false; // true if the file data should be committed bool Delete = false; // true if marked for deletion @@ -235,7 +236,8 @@ typedef struct _CFFILE_NODE typedef struct _SEARCH_CRITERIA { - std::string Search; // The actual search criteria + std::string Search; // The actual search criteria + std::string TargetFolder; // The filename will be TargetFolder\file } SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH @@ -311,8 +313,8 @@ public: bool IsSeparator(char Char); /* Replaces \ or / with the one used be the host environment */ void ConvertPath(std::string& Path); - /* Returns a pointer to the filename part of a fully qualified filename */ - const char* GetFileName(const char* Path); + /* Returns the filename part of a fully qualified filename */ + std::string GetFileName(const std::string& Path); /* Normalizes a path */ void NormalizePath(std::string& Path); /* Returns name of cabinet file */ @@ -342,12 +344,14 @@ public: /* Returns whether a codec engine is selected */ bool IsCodecSelected(); /* Adds a search criteria for adding files to a simple cabinet, displaying files in a cabinet or extracting them */ - ULONG AddSearchCriteria(const char* SearchCriteria); + ULONG AddSearchCriteria(const std::string& SearchCriteria, const std::string& TargetFolder); /* Destroys the search criteria list */ void DestroySearchCriteria(); /* Returns whether we have search criteria */ bool HasSearchCriteria(); + std::string CreateCabFilename(PCFFILE_NODE Node); + #ifndef CAB_READ_ONLY /* Creates a simple cabinet based on the search criteria data */ bool CreateSimpleCabinet(); @@ -370,7 +374,7 @@ public: /* Closes the current cabinet */ ULONG CloseCabinet(); /* Adds a file to the current disk */ - ULONG AddFile(char* FileName); + ULONG AddFile(const std::string& FileName, const std::string& TargetFolder); /* Sets the maximum size of the current disk */ void SetMaxDiskSize(ULONG Size); #endif /* CAB_READ_ONLY */ diff --git a/sdk/tools/cabman/cabman.cxx b/sdk/tools/cabman/cabman.cxx index 0dd0ceaab1d..d258b534e79 100644 --- a/sdk/tools/cabman/cabman.cxx +++ b/sdk/tools/cabman/cabman.cxx @@ -193,7 +193,7 @@ void CCABManager::Usage() printf("ReactOS Cabinet Manager\n\n"); printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); printf("CABMAN [-M mode] -C dirfile [-I] [-RC file] [-P dir]\n"); - printf("CABMAN [-M mode] -S cabinet filename [...]\n"); + printf("CABMAN [-M mode] -S cabinet filename [-F folder] [filename] [...]\n"); printf(" cabinet Cabinet file.\n"); printf(" filename Name of the file to add to or extract from the cabinet.\n"); printf(" Wild cards and multiple filenames\n"); @@ -206,6 +206,7 @@ void CCABManager::Usage() printf(" -C Create cabinet.\n"); printf(" -D Display cabinet directory.\n"); printf(" -E Extract files from cabinet.\n"); + printf(" -F Put the files from the next 'filename' filter in the cab in folder\filename.\n"); printf(" -I Don't create the cabinet, only the .inf file.\n"); printf(" -L dir Location to place extracted or generated files\n"); printf(" (default is current directory).\n"); @@ -233,7 +234,7 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) int i; bool ShowUsage; bool FoundCabinet = false; - + std::string NextFolder; ShowUsage = (argc < 2); for (i = 1; i < argc; i++) @@ -262,6 +263,19 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) Mode = CM_MODE_EXTRACT; break; + case 'f': + case 'F': + if (argv[i][2] == 0) + { + i++; + NextFolder = argv[i]; + } + else + { + NextFolder = argv[i] + 2; + } + break; + case 'i': case 'I': InfFileOnly = true; @@ -374,7 +388,8 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) else if(FoundCabinet) { // For creating simple cabinets, displaying or extracting them, add the argument as a search criteria - AddSearchCriteria(argv[i]); + AddSearchCriteria(argv[i], NextFolder); + NextFolder.clear(); } else { @@ -618,7 +633,7 @@ void CCABManager::OnExtract(PCFFILE File, { if (Verbose) { - printf("Extracting %s\n", GetFileName(FileName)); + printf("Extracting %s\n", GetFileName(FileName).c_str()); } } @@ -651,7 +666,7 @@ void CCABManager::OnAdd(PCFFILE File, { if (Verbose) { - printf("Adding %s\n", GetFileName(FileName)); + printf("Adding %s\n", GetFileName(FileName).c_str()); } } diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index b6b4335e59a..575b48f0816 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -6,7 +6,7 @@ * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> * NOTES: The directive file format is similar to the - * directive file format used by Microsoft's MAKECAB + * directive file format used by Microsoft's MAKECAB (But not entirely compatible!) * REVISIONS: * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable @@ -1123,17 +1123,17 @@ ULONG CDFParser::PerformFileCopy() DPRINT(MID_TRACE, ("Adding file: '%s' destination: '%s'.\n", SrcName, DstName)); - Status = AddFile(SrcName); + Status = AddFile(SrcName, std::string()); if (Status == CAB_STATUS_CANNOT_OPEN) { strcpy(SrcName, FileRelativePath.c_str()); strcat(SrcName, BaseFilename); - Status = AddFile(SrcName); + Status = AddFile(SrcName, std::string()); } switch (Status) { case CAB_STATUS_SUCCESS: - sprintf(InfLine, "%s=%s", GetFileName(SrcName), DstName); + sprintf(InfLine, "%s=%s", GetFileName(SrcName).c_str(), DstName); WriteInfLine(InfLine); break;

3 years, 12 months

[reactos] 01/01: [MORE] Implement 'Q' key for 'Quit' (#3210)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9f60321f088ebd2b02a3… commit a9f60321f088ebd2b02a334cd7241c9e1df21475 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 20 07:16:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 07:16:21 2020 +0900 [MORE] Implement 'Q' key for 'Quit' (#3210) Implement 'Quit' action for keyboard key 'Q'. CORE-4019 --- base/applications/cmdutils/more/more.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index 161818a5e6b..14dd0d54c32 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -8,6 +8,7 @@ * PROGRAMMERS: Paolo Pantaleo * Timothy Schepens * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ /* * MORE.C - external command. @@ -133,6 +134,7 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) */ ConClearLine(Pager->Screen->Stream); + /* Ctrl+C or Ctrl+Esc: Control Break */ if ((KeyEvent.wVirtualKeyCode == VK_ESCAPE) || ((KeyEvent.wVirtualKeyCode == L'C') && (KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) @@ -143,6 +145,17 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) return FALSE; } + /* 'Q': Quit */ + // FIXME: Available only when command extensions are enabled. + if ((KeyEvent.wVirtualKeyCode == L'Q') && + !(KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))) + { + /* We break, output a newline */ + WCHAR ch = L'\n'; + ConStreamWrite(Pager->Screen->Stream, &ch, 1); + return FALSE; + } + return TRUE; }

4 years

[reactos] 05/05: [CMD] FOR: Fix a bug when parsing the "delims=" option in FOR loops.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d5a1a455c9e8b158e4c6… commit 5d5a1a455c9e8b158e4c6f4c51a1ee20e0da95f0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 4 22:22:07 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:56 2020 +0200 [CMD] FOR: Fix a bug when parsing the "delims=" option in FOR loops. Suppose the following FOR-loop command, to be run from the command-line (if using a batch file, double each percent '%' sign): FOR %l IN ("a,b,c,d,e" "f,g,h,i,j") DO ( FOR /F "delims=, tokens=1-3*" %a IN (%l) DO @echo %a-%b-%c-%d ) The outermost FOR-loop enumerates the two strings "a,b,c,d,e" and "f,g,h,i,j" (placed in %l), and parse each of these in turn, splitting them at each specified delimiter (here only one character) ',' and storing the results in consecutive tokens %a, %b, %c, %d, with the last token %d containing all the remaining string (non-split). The expected result is: a-b-c-d,e f-g-h-i,j However, due to the way the delimiters string specified by the "delims=" option is stored (no stack/heap duplication of the FOR-option substring, but reading from it directly), during the first run of the innermost FOR-loop, the option string "delims=, tokens=1-3*" was truncated to just after the ',' due to the erroneous "delims=" parsing, so that when this FOR-loop ran for a second time (to deal with the second string), the option string was already erroneously truncated, without the "tokens=..." part, so that the parsing results were not stored in the tokens and resulting in: a-b-c-d,e f-%b-%c-%d instead. The solution is to save where the "delims=" string needs to be cut, but wait until running the actual FOR-loop to terminate it (and saving the original character too), run the FOR-loop body, and then restore the original character where termination took place. This allows having the FOR-loop option string valid for the next execution of the FOR-loop. --- base/shell/cmd/for.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index 67a9240c787..300588bed31 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -121,6 +121,8 @@ static LPTSTR ReadFileContents(FILE *InputFile, TCHAR *Buffer) static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { LPTSTR Delims = _T(" \t"); + LPTSTR DelimsEndPtr = NULL; + TCHAR DelimsEndChr = _T('\0'); TCHAR Eol = _T(';'); INT SkipLines = 0; DWORD Tokens = (1 << 1); @@ -148,8 +150,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) else if (_tcsnicmp(Param, _T("delims="), 7) == 0) { Param += 7; - /* delims=xxx: Specifies the list of characters that separate tokens */ + /* + * delims=xxx: Specifies the list of characters that separate tokens. + * This option does not cumulate: only the latest 'delims=' specification + * is taken into account. + */ Delims = Param; + DelimsEndPtr = NULL; while (*Param && *Param != Quote) { if (*Param == _T(' ')) @@ -158,13 +165,19 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) Param += _tcsspn(Param, _T(" ")); /* Exclude trailing spaces if this is not the last parameter */ if (*Param && *Param != Quote) - *FirstSpace = _T('\0'); + { + /* Save where the delimiters specification string ends */ + DelimsEndPtr = FirstSpace; + } break; } Param++; } if (*Param == Quote) - *Param++ = _T('\0'); + { + /* Save where the delimiters specification string ends */ + DelimsEndPtr = Param++; + } } else if (_tcsnicmp(Param, _T("eol="), 4) == 0) { @@ -301,6 +314,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) return 1; } + /* Patch the delimiters string */ + if (DelimsEndPtr) + { + DelimsEndChr = *DelimsEndPtr; + *DelimsEndPtr = _T('\0'); + } + /* Loop over the input line by line */ for (In = FullInput, Skip = SkipLines; !ExitingOrGoto(Cmd) && (In != NULL); @@ -343,6 +363,10 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) Ret = RunInstance(Cmd); } + /* Restore the delimiters string */ + if (DelimsEndPtr) + *DelimsEndPtr = DelimsEndChr; + cmd_free(FullInput); }

4 years

← Newer
1
...
5
6
7
8
9
10
11
...
39
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 September 2020