From 49ca94a0f8bc871cb3a7100349853c69c48b7bd8 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 22 Jan 2014 22:51:13 +0000 Subject: [PATCH 001/124] [BASEADDRESSES] * Update modules' based addresses. svn path=/trunk/; revision=61757 --- reactos/cmake/baseaddress.cmake | 578 ++++++++++++++++---------------- 1 file changed, 294 insertions(+), 284 deletions(-) diff --git a/reactos/cmake/baseaddress.cmake b/reactos/cmake/baseaddress.cmake index e4ea958b98f..5d25f132d55 100644 --- a/reactos/cmake/baseaddress.cmake +++ b/reactos/cmake/baseaddress.cmake @@ -1,267 +1,277 @@ -set(baseaddress_ntdll 0x77f00000) -set(baseaddress_kernel32 0x77d70000) -set(baseaddress_msvcrt 0x77cc0000) -set(baseaddress_advapi32 0x77c10000) -set(baseaddress_gdi32 0x77ba0000) -set(baseaddress_user32 0x77a00000) -set(baseaddress_dhcpcsvc 0x779b0000) -set(baseaddress_dnsapi 0x77960000) -set(baseaddress_icmp 0x77930000) -set(baseaddress_iphlpapi 0x778f0000) -set(baseaddress_ws2_32 0x778b0000) -set(baseaddress_ws2help 0x77880000) -set(baseaddress_shlwapi 0x777e0000) -set(baseaddress_rpcrt4 0x77720000) -set(baseaddress_comctl32 0x775b0000) -set(baseaddress_ole32 0x773c0000) -set(baseaddress_winspool.drv 0x77380000) -set(baseaddress_winmm 0x772e0000) -set(baseaddress_comdlg32 0x771f0000) -set(baseaddress_shell32 0x76500000) -set(baseaddress_lz32 0x764e0000) -set(baseaddress_version 0x764b0000) -set(baseaddress_oleaut32 0x762d0000) -set(baseaddress_setupapi 0x76100000) -set(baseaddress_mpr 0x760c0000) -set(baseaddress_crypt32 0x75fc0000) -set(baseaddress_wininet 0x75f10000) -set(baseaddress_urlmon 0x75e10000) -set(baseaddress_psapi 0x75de0000) -set(baseaddress_imm32 0x75da0000) -set(baseaddress_msvfw32 0x75d60000) -set(baseaddress_dbghelp 0x75cc0000) -set(baseaddress_devmgr 0x75c40000) -set(baseaddress_msacm32 0x75c00000) -set(baseaddress_netapi32 0x75ba0000) -set(baseaddress_powrprof 0x75b70000) -set(baseaddress_secur32 0x75b40000) -set(baseaddress_wintrust 0x75ae0000) -set(baseaddress_avicap32 0x75ab0000) -set(baseaddress_cabinet 0x75a60000) -set(baseaddress_dsound 0x759f0000) -set(baseaddress_glu32 0x758e0000) -set(baseaddress_opengl32 0x72bc0000) -set(baseaddress_riched20 0x75810000) -set(baseaddress_smdll 0x757f0000) -set(baseaddress_userenv 0x757a0000) -set(baseaddress_uxtheme 0x75740000) -set(baseaddress_cryptui 0x756a0000) -set(baseaddress_csrsrv 0x75670000) -set(baseaddress_basesrv 0x75640000) -set(baseaddress_consrv 0x75590000) -set(baseaddress_winsrv 0x75540000) -set(baseaddress_dplayx 0x754e0000) -set(baseaddress_gdiplus 0x75420000) -set(baseaddress_msimg32 0x753f0000) -set(baseaddress_mswsock 0x753c0000) -set(baseaddress_oledlg 0x75370000) -set(baseaddress_rasapi32 0x75340000) -set(baseaddress_rsaenh 0x752e0000) -set(baseaddress_samlib 0x752a0000) -set(baseaddress_sensapi 0x75270000) -set(baseaddress_sfc_os 0x75240000) -set(baseaddress_snmpapi 0x75210000) -set(baseaddress_spoolss 0x751d0000) -set(baseaddress_usp10 0x75160000) -set(baseaddress_acledit 0x75130000) -set(baseaddress_aclui 0x750f0000) -set(baseaddress_activeds 0x750c0000) -set(baseaddress_actxprxy 0x74eb0000) -set(baseaddress_advpack 0x74e70000) -set(baseaddress_amstream 0x74e30000) -set(baseaddress_atl100 0x74df0000) -set(baseaddress_atl 0x74dc0000) -set(baseaddress_authz 0x74d90000) -set(baseaddress_avifil32 0x74d20000) -set(baseaddress_batt 0x74cf0000) -set(baseaddress_bcrypt 0x74cc0000) -set(baseaddress_beepmidi 0x74c90000) -set(baseaddress_browseui 0x74bc0000) -set(baseaddress_cards 0x74b10000) -set(baseaddress_cfgmgr32 0x74ae0000) -set(baseaddress_clusapi 0x74ab0000) -set(baseaddress_comcat 0x74a80000) -set(baseaddress_compstui 0x74a50000) -set(baseaddress_console 0x749d0000) -set(baseaddress_credui 0x74990000) -set(baseaddress_crtdll 0x74930000) -set(baseaddress_cryptdlg 0x74900000) -set(baseaddress_cryptdll 0x748d0000) -set(baseaddress_cryptnet 0x748a0000) -set(baseaddress_d3d8 0x74840000) -set(baseaddress_d3d8thk 0x74820000) -set(baseaddress_d3d9 0x747c0000) -set(baseaddress_d3dx9_24 0x74790000) -set(baseaddress_d3dx9_25 0x74760000) -set(baseaddress_d3dx9_26 0x74730000) -set(baseaddress_d3dx9_27 0x74700000) -set(baseaddress_d3dx9_28 0x746d0000) -set(baseaddress_d3dx9_29 0x746a0000) -set(baseaddress_d3dx9_30 0x74670000) -set(baseaddress_d3dx9_31 0x74640000) -set(baseaddress_d3dx9_32 0x74610000) -set(baseaddress_d3dx9_33 0x745e0000) -set(baseaddress_d3dx9_34 0x745b0000) -set(baseaddress_d3dx9_35 0x74580000) -set(baseaddress_d3dx9_36 0x74520000) -set(baseaddress_d3dx9_37 0x744f0000) -set(baseaddress_d3dx9_38 0x744c0000) -set(baseaddress_d3dx9_39 0x74490000) -set(baseaddress_d3dx9_40 0x74460000) -set(baseaddress_d3dx9_41 0x74430000) -set(baseaddress_d3dx9_42 0x74400000) -set(baseaddress_dciman32 0x743d0000) -set(baseaddress_ddraw 0x74320000) -set(baseaddress_deskadp 0x742f0000) -set(baseaddress_deskmon 0x742c0000) -set(baseaddress_devcpux 0x74290000) -set(baseaddress_devenum 0x74250000) -set(baseaddress_dinput8 0x74220000) -set(baseaddress_dinput 0x741c0000) -set(baseaddress_dmusic 0x74170000) -set(baseaddress_dplay 0x74140000) -set(baseaddress_dwmapi 0x74110000) -set(baseaddress_dxdiagn 0x740e0000) -set(baseaddress_faultrep 0x740b0000) -set(baseaddress_fmifs 0x74090000) -set(baseaddress_fontext 0x74060000) -set(baseaddress_framebuf 0x74040000) -set(baseaddress_framebuf_new 0x74020000) -set(baseaddress_genincdata 0x73ff0000) -set(baseaddress_getuname 0x73fc0000) -set(baseaddress_hid 0x73f90000) -set(baseaddress_hlink 0x73f50000) -set(baseaddress_hnetcfg 0x73f10000) -set(baseaddress_httpapi 0x73ee0000) -set(baseaddress_iccvid 0x73eb0000) -set(baseaddress_ieframe 0x73e20000) -set(baseaddress_iernonce 0x73df0000) -set(baseaddress_imagehlp 0x73dc0000) -set(baseaddress_inetcomm 0x73d60000) -set(baseaddress_inetmib1 0x73d30000) -set(baseaddress_initpki 0x73d00000) -set(baseaddress_input 0x73ca0000) -set(baseaddress_inseng 0x73c70000) -set(baseaddress_iologmsg 0x73c50000) -set(baseaddress_itircl 0x73c20000) -set(baseaddress_itss 0x73be0000) -set(baseaddress_jscript 0x73b20000) -set(baseaddress_kbsdll 0x73af0000) -set(baseaddress_ksuser 0x73ac0000) -set(baseaddress_libjpeg 0x73a20000) -set(baseaddress_libpng 0x739a0000) -set(baseaddress_libtiff 0x738c0000) -set(baseaddress_libxslt 0x73640000) -set(baseaddress_loadperf 0x73610000) -set(baseaddress_localspl 0x735d0000) -set(baseaddress_localui 0x735a0000) -set(baseaddress_lpk 0x73570000) -set(baseaddress_lsasrv 0x73510000) -set(baseaddress_mapi32 0x734d0000) -set(baseaddress_mciavi32 0x73490000) -set(baseaddress_mcicda 0x73460000) -set(baseaddress_mciqtz32 0x73420000) -set(baseaddress_mciseq 0x733f0000) -set(baseaddress_mciwave 0x733c0000) -set(baseaddress_midimap 0x72b90000) -set(baseaddress_mlang 0x72b50000) -set(baseaddress_mmdrv 0x72b20000) -set(baseaddress_modemui 0x72ab0000) -set(baseaddress_mprapi 0x72a80000) -set(baseaddress_msafd 0x72a40000) -set(baseaddress_mscat32 0x72a10000) -set(baseaddress_mscms 0x729e0000) -set(baseaddress_mscoree 0x72990000) -set(baseaddress_msctf 0x72940000) -set(baseaddress_msdmo 0x72910000) -set(baseaddress_msftedit 0x728e0000) -set(baseaddress_msgina 0x72880000) -set(baseaddress_mshtml 0x726a0000) -set(baseaddress_msi 0x72550000) -set(baseaddress_msimtf 0x72520000) -set(baseaddress_msisip 0x724f0000) -set(baseaddress_msports 0x724c0000) -set(baseaddress_msrle32 0x72490000) -set(baseaddress_mssign32 0x72460000) -set(baseaddress_mssip32 0x72430000) -set(baseaddress_mstask 0x723f0000) -set(baseaddress_msv1_0 0x723c0000) -set(baseaddress_msvcrt20 0x722f0000) -set(baseaddress_msvcrt40 0x72220000) -set(baseaddress_msvidc32 0x721f0000) -set(baseaddress_msxml2 0x721c0000) -set(baseaddress_msxml3 0x71eb0000) -set(baseaddress_msxml4 0x71e70000) -set(baseaddress_msxml6 0x71e30000) -set(baseaddress_msxml 0x71e00000) -set(baseaddress_nddeapi 0x71dd0000) -set(baseaddress_netcfgx 0x71d50000) -set(baseaddress_netevent 0x71d30000) -set(baseaddress_netid 0x71ce0000) -set(baseaddress_netshell 0x71c60000) -set(baseaddress_newdev 0x71c00000) -set(baseaddress_notifyhook 0x71bd0000) -set(baseaddress_ntdsapi 0x71ba0000) -set(baseaddress_ntlanman 0x71b70000) -set(baseaddress_ntmarta 0x71b40000) -set(baseaddress_ntprint 0x71b10000) -set(baseaddress_objsel 0x71ae0000) -set(baseaddress_odbc32 0x71aa0000) -set(baseaddress_odbccp32 0x71a70000) -set(baseaddress_oleacc 0x71a40000) -set(baseaddress_olecli32 0x71a10000) -set(baseaddress_olepro32 0x719e0000) -set(baseaddress_olesvr32 0x719b0000) -set(baseaddress_olethk32 0x71980000) -set(baseaddress_pdh 0x71940000) -set(baseaddress_pidgen 0x71910000) -set(baseaddress_printui 0x718e0000) -set(baseaddress_propsys 0x718a0000) -set(baseaddress_pstorec 0x71870000) -set(baseaddress_qedit 0x71830000) -set(baseaddress_qmgr 0x71800000) -set(baseaddress_qmgrprxy 0x717a0000) -set(baseaddress_quartz 0x71640000) -set(baseaddress_query 0x71610000) -set(baseaddress_rasadhlp 0x715e0000) -set(baseaddress_rasdlg 0x71450000) -set(baseaddress_rasman 0x71410000) -set(baseaddress_resutils 0x713e0000) -set(baseaddress_riched32 0x713b0000) -set(baseaddress_rsabase 0x71390000) -set(baseaddress_samsrv 0x71330000) -set(baseaddress_sccbase 0x71300000) -set(baseaddress_schannel 0x712d0000) -set(baseaddress_security 0x712b0000) -set(baseaddress_serialui 0x71280000) -set(baseaddress_sfc 0x71250000) -set(baseaddress_shdoclc 0x71210000) -set(baseaddress_shdocvw 0x711c0000) -set(baseaddress_shfolder 0x711a0000) -set(baseaddress_shimgvw 0x71160000) -set(baseaddress_slayer 0x71130000) -set(baseaddress_slbcsp 0x71100000) -set(baseaddress_sndblst 0x710d0000) -set(baseaddress_softpub 0x710b0000) -set(baseaddress_srclient 0x71080000) -set(baseaddress_sti 0x71040000) -set(baseaddress_sxs 0x71010000) -set(baseaddress_syssetup 0x70f60000) -set(baseaddress_t2embed 0x70f30000) -set(baseaddress_tapi32 0x70ef0000) -set(baseaddress_tapiui 0x70e90000) -set(baseaddress_traffic 0x70e60000) -set(baseaddress_twain_32 0x70e30000) -set(baseaddress_uext2 0x70df0000) -set(baseaddress_ufat 0x70dd0000) -set(baseaddress_ufatx 0x70db0000) -set(baseaddress_unicows 0x70d80000) -set(baseaddress_untfs 0x70d60000) -set(baseaddress_updspapi 0x70d30000) -set(baseaddress_url 0x70d00000) -set(baseaddress_vbscript 0x70c80000) -set(baseaddress_vdmdbg 0x70c50000) -set(baseaddress_windowscodecs 0x70b20000) +set(baseaddress_ntdll 0x77f10000) +set(baseaddress_kernel32 0x77d80000) +set(baseaddress_msvcrt 0x77cd0000) +set(baseaddress_advapi32 0x77c20000) +set(baseaddress_gdi32 0x77bb0000) +set(baseaddress_user32 0x77a20000) +set(baseaddress_dhcpcsvc 0x779d0000) +set(baseaddress_dnsapi 0x77980000) +set(baseaddress_icmp 0x77950000) +set(baseaddress_iphlpapi 0x77910000) +set(baseaddress_ws2_32 0x778d0000) +set(baseaddress_ws2help 0x778a0000) +set(baseaddress_shlwapi 0x77800000) +set(baseaddress_rpcrt4 0x77740000) +set(baseaddress_comctl32 0x775c0000) +set(baseaddress_ole32 0x77400000) +set(baseaddress_winspool.drv 0x773c0000) +set(baseaddress_winmm 0x77320000) +set(baseaddress_comdlg32 0x77230000) +set(baseaddress_shell32 0x76540000) +set(baseaddress_lz32 0x76520000) +set(baseaddress_version 0x764f0000) +set(baseaddress_oleaut32 0x76340000) +set(baseaddress_setupapi 0x76170000) +set(baseaddress_mpr 0x76130000) +set(baseaddress_crypt32 0x76030000) +set(baseaddress_wininet 0x75f80000) +set(baseaddress_urlmon 0x75e90000) +set(baseaddress_psapi 0x75e60000) +set(baseaddress_imm32 0x75e20000) +set(baseaddress_msvfw32 0x75de0000) +set(baseaddress_dbghelp 0x75d30000) +set(baseaddress_devmgr 0x75cb0000) +set(baseaddress_msacm32 0x75c70000) +set(baseaddress_netapi32 0x75c00000) +set(baseaddress_powrprof 0x75bd0000) +set(baseaddress_secur32 0x75ba0000) +set(baseaddress_wintrust 0x75b40000) +set(baseaddress_avicap32 0x75b10000) +set(baseaddress_cabinet 0x75ac0000) +set(baseaddress_dsound 0x75a50000) +set(baseaddress_glu32 0x75950000) +set(baseaddress_opengl32 0x75720000) +set(baseaddress_riched20 0x75690000) +set(baseaddress_smdll 0x75670000) +set(baseaddress_userenv 0x75620000) +set(baseaddress_uxtheme 0x755c0000) +set(baseaddress_cryptui 0x75520000) +set(baseaddress_csrsrv 0x754f0000) +set(baseaddress_basesrv 0x754c0000) +set(baseaddress_consrv 0x754a0000) +set(baseaddress_winsrv 0x753e0000) +set(baseaddress_dplayx 0x75370000) +set(baseaddress_gdiplus 0x752b0000) +set(baseaddress_msimg32 0x75280000) +set(baseaddress_mswsock 0x75250000) +set(baseaddress_oledlg 0x75200000) +set(baseaddress_rasapi32 0x751d0000) +set(baseaddress_rsaenh 0x75160000) +set(baseaddress_samlib 0x75120000) +set(baseaddress_sensapi 0x750f0000) +set(baseaddress_sfc_os 0x750c0000) +set(baseaddress_snmpapi 0x75090000) +set(baseaddress_spoolss 0x75060000) +set(baseaddress_usp10 0x74ff0000) +set(baseaddress_acledit 0x74fc0000) +set(baseaddress_aclui 0x74f80000) +set(baseaddress_activeds 0x74f50000) +set(baseaddress_actxprxy 0x74da0000) +set(baseaddress_advpack 0x74d60000) +set(baseaddress_amstream 0x74d10000) +set(baseaddress_atl100 0x74cd0000) +set(baseaddress_atl80 0x74ca0000) +set(baseaddress_atl 0x74c70000) +set(baseaddress_authz 0x74c40000) +set(baseaddress_avifil32 0x74bd0000) +set(baseaddress_batt 0x74ba0000) +set(baseaddress_bcrypt 0x74b70000) +set(baseaddress_beepmidi 0x74b40000) +set(baseaddress_browseui 0x74a70000) +set(baseaddress_cards 0x749c0000) +set(baseaddress_cfgmgr32 0x74990000) +set(baseaddress_clusapi 0x74960000) +set(baseaddress_comcat 0x74930000) +set(baseaddress_compstui 0x74900000) +set(baseaddress_console 0x74880000) +set(baseaddress_credui 0x74840000) +set(baseaddress_crtdll 0x747e0000) +set(baseaddress_cryptdlg 0x747b0000) +set(baseaddress_cryptdll 0x74780000) +set(baseaddress_cryptnet 0x74750000) +set(baseaddress_d3d8 0x746f0000) +set(baseaddress_d3d8thk 0x746d0000) +set(baseaddress_d3d9 0x74670000) +set(baseaddress_d3dcompiler_43 0x745c0000) +set(baseaddress_d3dx9_24 0x74590000) +set(baseaddress_d3dx9_25 0x74560000) +set(baseaddress_d3dx9_26 0x74530000) +set(baseaddress_d3dx9_27 0x74500000) +set(baseaddress_d3dx9_28 0x744d0000) +set(baseaddress_d3dx9_29 0x744a0000) +set(baseaddress_d3dx9_30 0x74470000) +set(baseaddress_d3dx9_31 0x74440000) +set(baseaddress_d3dx9_32 0x74410000) +set(baseaddress_d3dx9_33 0x743e0000) +set(baseaddress_d3dx9_34 0x743b0000) +set(baseaddress_d3dx9_35 0x74380000) +set(baseaddress_d3dx9_36 0x742b0000) +set(baseaddress_d3dx9_37 0x74280000) +set(baseaddress_d3dx9_38 0x74250000) +set(baseaddress_d3dx9_39 0x74220000) +set(baseaddress_d3dx9_40 0x741f0000) +set(baseaddress_d3dx9_41 0x741c0000) +set(baseaddress_d3dx9_42 0x74190000) +set(baseaddress_d3dx9_43 0x74160000) +set(baseaddress_d3dxof 0x74110000) +set(baseaddress_dciman32 0x740e0000) +set(baseaddress_ddraw 0x74030000) +set(baseaddress_deskadp 0x74000000) +set(baseaddress_deskmon 0x73fd0000) +set(baseaddress_devcpux 0x73fa0000) +set(baseaddress_devenum 0x73f50000) +set(baseaddress_dinput8 0x73f20000) +set(baseaddress_dinput 0x73ec0000) +set(baseaddress_dmusic 0x73e70000) +set(baseaddress_dplay 0x73e40000) +set(baseaddress_dwmapi 0x73e10000) +set(baseaddress_dxdiagn 0x73dc0000) +set(baseaddress_dxgi 0x73d80000) +set(baseaddress_faultrep 0x73d50000) +set(baseaddress_fmifs 0x73d30000) +set(baseaddress_fontext 0x73d00000) +set(baseaddress_framebuf 0x73ce0000) +set(baseaddress_framebuf_new 0x73cc0000) +set(baseaddress_framedyn 0x73c80000) +set(baseaddress_genincdata 0x73c50000) +set(baseaddress_getuname 0x73ae0000) +set(baseaddress_hid 0x73ab0000) +set(baseaddress_hlink 0x73a70000) +set(baseaddress_hnetcfg 0x73a30000) +set(baseaddress_httpapi 0x73a00000) +set(baseaddress_iccvid 0x739d0000) +set(baseaddress_ieframe 0x73930000) +set(baseaddress_iernonce 0x73900000) +set(baseaddress_imagehlp 0x738d0000) +set(baseaddress_inetcomm 0x73870000) +set(baseaddress_inetmib1 0x73840000) +set(baseaddress_initpki 0x73810000) +set(baseaddress_input 0x737b0000) +set(baseaddress_inseng 0x73780000) +set(baseaddress_iologmsg 0x73760000) +set(baseaddress_itircl 0x73730000) +set(baseaddress_itss 0x736f0000) +set(baseaddress_jscript 0x73600000) +set(baseaddress_kbsdll 0x735d0000) +set(baseaddress_ksuser 0x735a0000) +set(baseaddress_libjpeg 0x73510000) +set(baseaddress_libpng 0x73490000) +set(baseaddress_libtiff 0x733a0000) +set(baseaddress_libxslt 0x730f0000) +set(baseaddress_loadperf 0x730c0000) +set(baseaddress_localspl 0x73080000) +set(baseaddress_localui 0x73050000) +set(baseaddress_lpk 0x73020000) +set(baseaddress_lsasrv 0x72fc0000) +set(baseaddress_mapi32 0x72f80000) +set(baseaddress_mciavi32 0x72f40000) +set(baseaddress_mcicda 0x72f10000) +set(baseaddress_mciqtz32 0x72ed0000) +set(baseaddress_mciseq 0x72ea0000) +set(baseaddress_mciwave 0x72e70000) +set(baseaddress_midimap 0x72e40000) +set(baseaddress_mlang 0x72e00000) +set(baseaddress_mmdevapi 0x72dc0000) +set(baseaddress_mmdrv 0x72d90000) +set(baseaddress_modemui 0x72d20000) +set(baseaddress_mprapi 0x72cf0000) +set(baseaddress_msafd 0x72cb0000) +set(baseaddress_mscat32 0x72c80000) +set(baseaddress_mscms 0x72c50000) +set(baseaddress_mscoree 0x72c00000) +set(baseaddress_msctf 0x72bb0000) +set(baseaddress_msdmo 0x72b80000) +set(baseaddress_msftedit 0x72b50000) +set(baseaddress_msgina 0x72ae0000) +set(baseaddress_mshtml 0x72910000) +set(baseaddress_msi 0x727b0000) +set(baseaddress_msimtf 0x72780000) +set(baseaddress_msisip 0x72750000) +set(baseaddress_msports 0x72720000) +set(baseaddress_msrle32 0x726e0000) +set(baseaddress_mssign32 0x726b0000) +set(baseaddress_mssip32 0x72680000) +set(baseaddress_mstask 0x72650000) +set(baseaddress_msv1_0 0x72620000) +set(baseaddress_msvcrt20 0x72560000) +set(baseaddress_msvcrt40 0x724a0000) +set(baseaddress_msvidc32 0x72470000) +set(baseaddress_msxml2 0x72440000) +set(baseaddress_msxml3 0x72110000) +set(baseaddress_msxml4 0x720d0000) +set(baseaddress_msxml6 0x72090000) +set(baseaddress_msxml 0x72060000) +set(baseaddress_nddeapi 0x72030000) +set(baseaddress_netcfgx 0x71fa0000) +set(baseaddress_netevent 0x71f80000) +set(baseaddress_netid 0x71f30000) +set(baseaddress_netshell 0x71ea0000) +set(baseaddress_newdev 0x71e40000) +set(baseaddress_notifyhook 0x71e10000) +set(baseaddress_ntdsapi 0x71de0000) +set(baseaddress_ntlanman 0x71db0000) +set(baseaddress_ntmarta 0x71d80000) +set(baseaddress_ntprint 0x71d50000) +set(baseaddress_objsel 0x71d20000) +set(baseaddress_odbc32 0x71ce0000) +set(baseaddress_odbccp32 0x71cb0000) +set(baseaddress_oleacc 0x71c80000) +set(baseaddress_olecli32 0x71c50000) +set(baseaddress_olepro32 0x71c20000) +set(baseaddress_olesvr32 0x71bf0000) +set(baseaddress_olethk32 0x71bc0000) +set(baseaddress_pdh 0x71b80000) +set(baseaddress_pidgen 0x71b50000) +set(baseaddress_printui 0x71b20000) +set(baseaddress_propsys 0x71ae0000) +set(baseaddress_pstorec 0x71ab0000) +set(baseaddress_qedit 0x71a60000) +set(baseaddress_qmgr 0x71a20000) +set(baseaddress_qmgrprxy 0x719d0000) +set(baseaddress_quartz 0x71860000) +set(baseaddress_query 0x71830000) +set(baseaddress_rasadhlp 0x71800000) +set(baseaddress_rasdlg 0x71670000) +set(baseaddress_rasman 0x71640000) +set(baseaddress_resutils 0x71610000) +set(baseaddress_riched32 0x715e0000) +set(baseaddress_rsabase 0x715c0000) +set(baseaddress_samsrv 0x71550000) +set(baseaddress_sccbase 0x71520000) +set(baseaddress_schannel 0x714f0000) +set(baseaddress_scrrun 0x714b0000) +set(baseaddress_security 0x71490000) +set(baseaddress_serialui 0x71460000) +set(baseaddress_sfc 0x71430000) +set(baseaddress_shdoclc 0x713f0000) +set(baseaddress_shdocvw 0x713a0000) +set(baseaddress_shfolder 0x71380000) +set(baseaddress_shimgvw 0x71340000) +set(baseaddress_slayer 0x71310000) +set(baseaddress_slbcsp 0x712e0000) +set(baseaddress_sndblst 0x712b0000) +set(baseaddress_softpub 0x71290000) +set(baseaddress_srclient 0x71260000) +set(baseaddress_sti 0x71220000) +set(baseaddress_sxs 0x711f0000) +set(baseaddress_syssetup 0x71140000) +set(baseaddress_t2embed 0x71110000) +set(baseaddress_tapi32 0x710d0000) +set(baseaddress_tapiui 0x71070000) +set(baseaddress_traffic 0x71040000) +set(baseaddress_twain_32 0x71010000) +set(baseaddress_uext2 0x70fd0000) +set(baseaddress_ufat 0x70fa0000) +set(baseaddress_ufatx 0x70f70000) +set(baseaddress_untfs 0x70f10000) +set(baseaddress_updspapi 0x70ee0000) +set(baseaddress_url 0x70eb0000) +set(baseaddress_vbscript 0x70e30000) +set(baseaddress_vdmdbg 0x70e00000) +set(baseaddress_wbemdisp 0x70cd0000) +set(baseaddress_wbemprox 0x70c70000) +set(baseaddress_windowscodecs 0x70b60000) +set(baseaddress_windowscodecsext 0x70b30000) set(baseaddress_wined3d 0x70960000) set(baseaddress_winfax 0x70930000) set(baseaddress_wing32 0x70900000) @@ -288,23 +298,23 @@ set(baseaddress_desk 0x703d0000) set(baseaddress_hdwwiz 0x70340000) set(baseaddress_hhctrl 0x702f0000) set(baseaddress_imaadp32.acm 0x702c0000) -set(baseaddress_inetcpl 0x70280000) -set(baseaddress_intl 0x70220000) -set(baseaddress_joy 0x701e0000) -set(baseaddress_main 0x70130000) -set(baseaddress_mmsys 0x70030000) -set(baseaddress_msacm32.drv 0x70000000) -set(baseaddress_msadp32.acm 0x6ffd0000) -set(baseaddress_msg711.acm 0x6ffa0000) -set(baseaddress_msgsm32.acm 0x6ff70000) -set(baseaddress_msisys 0x6ff40000) -set(baseaddress_ncpa 0x6ff10000) -set(baseaddress_odbccp32i 0x6fee0000) -set(baseaddress_powercfg 0x6fe80000) -set(baseaddress_sysdm 0x6fdb0000) -set(baseaddress_telephon 0x6fd80000) -set(baseaddress_timedate 0x6fd20000) -set(baseaddress_usrmgr 0x6fcc0000) -set(baseaddress_wdmaud.drv 0x6fb00000) -set(baseaddress_wined3dcfg 0x6fad0000) -set(baseaddress_winemp3.acm 0x6fa50000) +set(baseaddress_inetcpl 0x70260000) +set(baseaddress_intl 0x70200000) +set(baseaddress_joy 0x701c0000) +set(baseaddress_main 0x70110000) +set(baseaddress_mmsys 0x70010000) +set(baseaddress_msacm32.drv 0x6ffe0000) +set(baseaddress_msadp32.acm 0x6ffb0000) +set(baseaddress_msg711.acm 0x6ff80000) +set(baseaddress_msgsm32.acm 0x6ff50000) +set(baseaddress_msisys 0x6ff20000) +set(baseaddress_ncpa 0x6fef0000) +set(baseaddress_odbccp32i 0x6fec0000) +set(baseaddress_powercfg 0x6fe50000) +set(baseaddress_sysdm 0x6fd80000) +set(baseaddress_telephon 0x6fd50000) +set(baseaddress_timedate 0x6fcf0000) +set(baseaddress_usrmgr 0x6fc90000) +set(baseaddress_wdmaud.drv 0x6fad0000) +set(baseaddress_wined3dcfg 0x6faa0000) +set(baseaddress_winemp3.acm 0x6fa20000) From 0739ebd3f93445f36be07fb0310e350b46e15fcd Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 22 Jan 2014 23:41:04 +0000 Subject: [PATCH 002/124] [KSECDD] Implement IRP_MJ_DEVICE_CONTROL, handle ioctl 0x390004, used by MS advapi32 to generate random numbers. Even though it is not very crypto-safe, for now we just use RtlRandomEx, "improved" by xoring the seed with some data from KeTickCount (no idea whether that does any good) svn path=/trunk/; revision=61759 --- reactos/drivers/crypto/ksecdd/CMakeLists.txt | 1 + reactos/drivers/crypto/ksecdd/dispatch.c | 48 ++++++++++++++++++- reactos/drivers/crypto/ksecdd/ksecdd.c | 1 + reactos/drivers/crypto/ksecdd/ksecdd.h | 10 ++++ reactos/drivers/crypto/ksecdd/random.c | 50 ++++++++++++++++++++ 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 reactos/drivers/crypto/ksecdd/random.c diff --git a/reactos/drivers/crypto/ksecdd/CMakeLists.txt b/reactos/drivers/crypto/ksecdd/CMakeLists.txt index 29163b45824..070f9278223 100644 --- a/reactos/drivers/crypto/ksecdd/CMakeLists.txt +++ b/reactos/drivers/crypto/ksecdd/CMakeLists.txt @@ -4,6 +4,7 @@ spec2def(ksecdd.sys ksecdd.spec) list(APPEND SOURCE ksecdd.c dispatch.c + random.c stubs.c ksecdd.rc) diff --git a/reactos/drivers/crypto/ksecdd/dispatch.c b/reactos/drivers/crypto/ksecdd/dispatch.c index c1726df161e..fe6be34331e 100644 --- a/reactos/drivers/crypto/ksecdd/dispatch.c +++ b/reactos/drivers/crypto/ksecdd/dispatch.c @@ -81,6 +81,35 @@ KsecQueryVolumeInformation( return STATUS_SUCCESS; } +static +NTSTATUS +KsecDeviceControl( + ULONG IoControlCode, + PVOID Buffer, + SIZE_T InputLength, + PSIZE_T OutputLength) +{ + NTSTATUS Status; + + Status = STATUS_SUCCESS; + + /* Check ioctl code */ + switch (IoControlCode) + { + case IOCTL_KSEC_GEN_RANDOM: + + Status = KsecGenRandom(Buffer, *OutputLength); + break; + + default: + DPRINT1("Unhandled control code 0x%lx\n", IoControlCode); + __debugbreak(); + return STATUS_INVALID_PARAMETER; + } + + return Status; +} + NTSTATUS NTAPI KsecDdDispatch( @@ -91,9 +120,10 @@ KsecDdDispatch( ULONG_PTR Information; NTSTATUS Status; PVOID Buffer; - SIZE_T OutputLength; + SIZE_T InputLength, OutputLength; FILE_INFORMATION_CLASS FileInfoClass; FS_INFORMATION_CLASS FsInfoClass; + ULONG IoControlCode; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); @@ -149,6 +179,22 @@ KsecDdDispatch( Information = OutputLength; break; + case IRP_MJ_DEVICE_CONTROL: + + /* Extract the parameters */ + Buffer = Irp->AssociatedIrp.SystemBuffer; + InputLength = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; + OutputLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; + IoControlCode = IoStackLocation->Parameters.DeviceIoControl.IoControlCode; + + /* Call the internal function */ + Status = KsecDeviceControl(IoControlCode, + Buffer, + InputLength, + &OutputLength); + Information = OutputLength; + break; + default: DPRINT1("Unhandled major function %lu!\n", IoStackLocation->MajorFunction); diff --git a/reactos/drivers/crypto/ksecdd/ksecdd.c b/reactos/drivers/crypto/ksecdd/ksecdd.c index c6513e247cc..d955b0f9365 100644 --- a/reactos/drivers/crypto/ksecdd/ksecdd.c +++ b/reactos/drivers/crypto/ksecdd/ksecdd.c @@ -50,6 +50,7 @@ DriverEntry( DriverObject->MajorFunction[IRP_MJ_WRITE] = KsecDdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = KsecDdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = KsecDdDispatch; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = KsecDdDispatch; return STATUS_SUCCESS; } diff --git a/reactos/drivers/crypto/ksecdd/ksecdd.h b/reactos/drivers/crypto/ksecdd/ksecdd.h index 098c77c5df4..934152d9b91 100644 --- a/reactos/drivers/crypto/ksecdd/ksecdd.h +++ b/reactos/drivers/crypto/ksecdd/ksecdd.h @@ -9,6 +9,10 @@ #define _NO_KSECDD_IMPORT_ #include +// 0x390004 +#define IOCTL_KSEC_GEN_RANDOM \ + CTL_CODE(FILE_DEVICE_KSEC, 0x01, METHOD_BUFFERED, FILE_ANY_ACCESS) + NTSTATUS NTAPI KsecDdDispatch( @@ -16,3 +20,9 @@ KsecDdDispatch( PIRP Irp); +NTSTATUS +NTAPI +KsecGenRandom( + PVOID Buffer, + SIZE_T Length); + diff --git a/reactos/drivers/crypto/ksecdd/random.c b/reactos/drivers/crypto/ksecdd/random.c new file mode 100644 index 00000000000..fdf724d48db --- /dev/null +++ b/reactos/drivers/crypto/ksecdd/random.c @@ -0,0 +1,50 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Drivers + * PURPOSE: Kernel Security Support Provider Interface Driver + * + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "ksecdd.h" + +#define NDEBUG +#include + + +/* GLOBALS ********************************************************************/ + +static ULONG KsecRandomSeed = 0x62b409a1; + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +KsecGenRandom( + PVOID Buffer, + SIZE_T Length) +{ + ULONG i, RandomValue; + PULONG P; + + /* Try to generate a more random seed */ + KsecRandomSeed ^= _rotl(KeTickCount.LowPart, (KsecRandomSeed % 23)); + + P = Buffer; + for (i = 0; i < Length / sizeof(ULONG); i++) + { + P[i] = RtlRandomEx(&KsecRandomSeed); + } + + Length &= (sizeof(ULONG) - 1); + if (Length > 0) + { + RandomValue = RtlRandomEx(&KsecRandomSeed); + RtlCopyMemory(&P[i], &RandomValue, Length); + } + + return STATUS_SUCCESS; +} From 93a84eb12de02f37cee4d510373748b2a10c8616 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:13:16 +0000 Subject: [PATCH 003/124] [DEVMGR] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61760 --- reactos/dll/win32/devmgr/advprop.c | 3 +++ reactos/dll/win32/devmgr/devprblm.c | 2 +- reactos/dll/win32/devmgr/hwpage.c | 1 + reactos/dll/win32/devmgr/hwresource.c | 2 +- reactos/dll/win32/devmgr/misc.c | 2 +- reactos/dll/win32/devmgr/precomp.h | 12 +++++++----- reactos/dll/win32/devmgr/stubs.c | 1 + 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/devmgr/advprop.c b/reactos/dll/win32/devmgr/advprop.c index 2baa99154a3..821cbb9542a 100644 --- a/reactos/dll/win32/devmgr/advprop.c +++ b/reactos/dll/win32/devmgr/advprop.c @@ -26,8 +26,11 @@ * UPDATE HISTORY: * 04-04-2004 Created */ + #include "precomp.h" +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/devmgr/devprblm.c b/reactos/dll/win32/devmgr/devprblm.c index 15912b68840..90a5406b4da 100644 --- a/reactos/dll/win32/devmgr/devprblm.c +++ b/reactos/dll/win32/devmgr/devprblm.c @@ -24,12 +24,12 @@ * UPDATE HISTORY: * 04-04-2004 Created */ + #include "precomp.h" #define NDEBUG #include - BOOL ShowDeviceProblemWizard(IN HWND hWndParent OPTIONAL, IN HDEVINFO hDevInfo, diff --git a/reactos/dll/win32/devmgr/hwpage.c b/reactos/dll/win32/devmgr/hwpage.c index 82ee053340c..f46749092ed 100644 --- a/reactos/dll/win32/devmgr/hwpage.c +++ b/reactos/dll/win32/devmgr/hwpage.c @@ -24,6 +24,7 @@ * UPDATE HISTORY: * 04-04-2004 Created */ + #include "precomp.h" #define NDEBUG diff --git a/reactos/dll/win32/devmgr/hwresource.c b/reactos/dll/win32/devmgr/hwresource.c index b3c73ef0545..f874a0ce76e 100644 --- a/reactos/dll/win32/devmgr/hwresource.c +++ b/reactos/dll/win32/devmgr/hwresource.c @@ -6,8 +6,8 @@ * UPDATE HISTORY: * 2005/11/24 Created */ -#include "precomp.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/devmgr/misc.c b/reactos/dll/win32/devmgr/misc.c index 550ea9f21fe..002a079e7c2 100644 --- a/reactos/dll/win32/devmgr/misc.c +++ b/reactos/dll/win32/devmgr/misc.c @@ -24,6 +24,7 @@ * UPDATE HISTORY: * 2005/11/24 Created */ + #include "precomp.h" #define NDEBUG @@ -31,7 +32,6 @@ HINSTANCE hDllInstance = NULL; - INT LengthOfStrResource(IN HINSTANCE hInst, IN UINT uID) diff --git a/reactos/dll/win32/devmgr/precomp.h b/reactos/dll/win32/devmgr/precomp.h index 1a3072635f6..ff48d5deb45 100644 --- a/reactos/dll/win32/devmgr/precomp.h +++ b/reactos/dll/win32/devmgr/precomp.h @@ -1,14 +1,18 @@ #ifndef __DEVMGR_H #define __DEVMGR_H +#include + #define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN -#include +#include +#include +#include +#include +#include #include #include #include #include -#include #include #include "resource.h" @@ -221,5 +225,3 @@ FindCurrentDriver(IN HDEVINFO DeviceInfoSet, OUT PSP_DRVINFO_DATA DriverInfoData); #endif /* __DEVMGR_H */ - -/* EOF */ diff --git a/reactos/dll/win32/devmgr/stubs.c b/reactos/dll/win32/devmgr/stubs.c index f70acbd2549..c05a89a0e2b 100644 --- a/reactos/dll/win32/devmgr/stubs.c +++ b/reactos/dll/win32/devmgr/stubs.c @@ -15,6 +15,7 @@ * UPDATE HISTORY: * 04-04-2004 Created */ + #include #define NDEBUG From a8bce773fa969cc9f8507e9fe2b74c589d723b0f Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:15:11 +0000 Subject: [PATCH 004/124] [DHCPCSVC] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 svn path=/trunk/; revision=61761 --- reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c | 2 ++ reactos/dll/win32/dhcpcsvc/include/rosdhcp.h | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c b/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c index 05d11044f57..21db0af1ed7 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c @@ -55,6 +55,8 @@ #include +#include + #define PERIOD 0x2e #define hyphenchar(c) ((c) == 0x2d) #define bslashchar(c) ((c) == 0x5c) diff --git a/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h b/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h index 3875dc21beb..8a11d5299fb 100644 --- a/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h +++ b/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h @@ -1,24 +1,22 @@ #ifndef ROSDHCP_H #define ROSDHCP_H +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include + #include #include #include -#include -#include #define NTOS_MODE_USER #include -//#include -//#include #include #include -//#include -//#include + #include "debug.h" + #define IFNAMSIZ MAX_INTERFACE_NAME_LEN #undef interface /* wine/objbase.h -- Grrr */ @@ -104,4 +102,5 @@ extern DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern int inet_aton(const char *s, struct in_addr *addr); int warn( char *format, ... ); -#endif/*ROSDHCP_H*/ + +#endif /* ROSDHCP_H */ From 20a454e74167c51dd0ab2aed9b94bdbd0d3793ff Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:16:46 +0000 Subject: [PATCH 005/124] [DNSAPI] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61762 --- reactos/dll/win32/dnsapi/dnsapi/precomp.h | 13 ++++++++----- reactos/dll/win32/dnsapi/dnsapi/record.c | 1 + reactos/dll/win32/dnsapi/dnsapi/stubs.c | 1 + reactos/dll/win32/dnsapi/include/internal/windns.h | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/dnsapi/dnsapi/precomp.h b/reactos/dll/win32/dnsapi/dnsapi/precomp.h index 591fec20b5c..1fb4f01c64a 100644 --- a/reactos/dll/win32/dnsapi/dnsapi/precomp.h +++ b/reactos/dll/win32/dnsapi/dnsapi/precomp.h @@ -8,14 +8,17 @@ /* INCLUDES ******************************************************************/ -#define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN -#define NTOS_MODE_USER +#include /* PSDK/NDK Headers */ -#include -//#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #include +#define NTOS_MODE_USER #include /* Internal DNSAPI Headers */ diff --git a/reactos/dll/win32/dnsapi/dnsapi/record.c b/reactos/dll/win32/dnsapi/dnsapi/record.c index 00b67fc48a8..32811d6904b 100644 --- a/reactos/dll/win32/dnsapi/dnsapi/record.c +++ b/reactos/dll/win32/dnsapi/dnsapi/record.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "precomp.h" #define NDEBUG diff --git a/reactos/dll/win32/dnsapi/dnsapi/stubs.c b/reactos/dll/win32/dnsapi/dnsapi/stubs.c index be67929c2bc..dd1c7bb91ab 100644 --- a/reactos/dll/win32/dnsapi/dnsapi/stubs.c +++ b/reactos/dll/win32/dnsapi/dnsapi/stubs.c @@ -1,4 +1,5 @@ #include "precomp.h" + #include DNS_STATUS WINAPI diff --git a/reactos/dll/win32/dnsapi/include/internal/windns.h b/reactos/dll/win32/dnsapi/include/internal/windns.h index 6e28bdc3e12..a383abb537a 100644 --- a/reactos/dll/win32/dnsapi/include/internal/windns.h +++ b/reactos/dll/win32/dnsapi/include/internal/windns.h @@ -11,4 +11,4 @@ typedef struct DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS(int Status); void DnsIntFreeRecordList(PDNS_RECORD ToFree); -#endif//WINDNS_INTERNAL_H +#endif /* WINDNS_INTERNAL_H */ From 946e9d16fefef68b226e55071f6543c7351b9f96 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:19:27 +0000 Subject: [PATCH 006/124] [FMIFS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61763 --- reactos/dll/win32/fmifs/init.c | 4 ++++ reactos/dll/win32/fmifs/precomp.h | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/fmifs/init.c b/reactos/dll/win32/fmifs/init.c index 27f635981a2..f37f6e6df43 100644 --- a/reactos/dll/win32/fmifs/init.c +++ b/reactos/dll/win32/fmifs/init.c @@ -10,6 +10,10 @@ #include "precomp.h" +#include +#include +#include + static BOOLEAN FmIfsInitialized = FALSE; LIST_ENTRY ProviderListHead; diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h index 426380830fe..9d203b7da28 100644 --- a/reactos/dll/win32/fmifs/precomp.h +++ b/reactos/dll/win32/fmifs/precomp.h @@ -20,17 +20,11 @@ /* PSDK/NDK Headers */ #include #include -#include -#include -#include #include /* FMIFS Public Header */ #include -/* VFATLIB Public Header */ -//#include - extern LIST_ENTRY ProviderListHead; typedef struct _IFS_PROVIDER From 2fab6263e9638a93cb3a7efc512ee0ffa71e5748 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:22:13 +0000 Subject: [PATCH 007/124] [FUSION] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61764 --- reactos/dll/win32/fusion/CMakeLists.txt | 2 +- reactos/dll/win32/fusion/asmcache.c | 2 -- reactos/dll/win32/fusion/asmname.c | 2 +- reactos/dll/win32/fusion/fusionpriv.h | 5 ++--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/fusion/CMakeLists.txt b/reactos/dll/win32/fusion/CMakeLists.txt index da8a57209d0..545c18717ec 100644 --- a/reactos/dll/win32/fusion/CMakeLists.txt +++ b/reactos/dll/win32/fusion/CMakeLists.txt @@ -15,7 +15,7 @@ list(APPEND SOURCE add_library(fusion SHARED ${SOURCE} version.rc) set_module_type(fusion win32dll) -target_link_libraries(fusion wine) +target_link_libraries(fusion uuid wine) add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) diff --git a/reactos/dll/win32/fusion/asmcache.c b/reactos/dll/win32/fusion/asmcache.c index fd1cbf4ae78..1a95dacb53b 100644 --- a/reactos/dll/win32/fusion/asmcache.c +++ b/reactos/dll/win32/fusion/asmcache.c @@ -20,8 +20,6 @@ #include "fusionpriv.h" -#include - static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; diff --git a/reactos/dll/win32/fusion/asmname.c b/reactos/dll/win32/fusion/asmname.c index afba6859a52..90b1f474372 100644 --- a/reactos/dll/win32/fusion/asmname.c +++ b/reactos/dll/win32/fusion/asmname.c @@ -21,7 +21,7 @@ #include "fusionpriv.h" #include -#include +#include typedef struct { IAssemblyName IAssemblyName_iface; diff --git a/reactos/dll/win32/fusion/fusionpriv.h b/reactos/dll/win32/fusion/fusionpriv.h index cf8a228d952..2a61e4f4766 100644 --- a/reactos/dll/win32/fusion/fusionpriv.h +++ b/reactos/dll/win32/fusion/fusionpriv.h @@ -31,13 +31,12 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define INITGUID - #include #include #include -#include +#include #include +#include #include From 0c66b2f86cba768a2b9a71a0226339475525fa85 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:25:09 +0000 Subject: [PATCH 008/124] [GDIPLUS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61765 --- reactos/dll/win32/gdiplus/CMakeLists.txt | 3 ++- reactos/dll/win32/gdiplus/gdiplus_private.h | 6 ++---- reactos/dll/win32/gdiplus/guid.c | 17 +++++++++++++++++ reactos/dll/win32/gdiplus/image.c | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 reactos/dll/win32/gdiplus/guid.c diff --git a/reactos/dll/win32/gdiplus/CMakeLists.txt b/reactos/dll/win32/gdiplus/CMakeLists.txt index 234ab9bdfc3..aa61ec36d25 100644 --- a/reactos/dll/win32/gdiplus/CMakeLists.txt +++ b/reactos/dll/win32/gdiplus/CMakeLists.txt @@ -22,12 +22,13 @@ list(APPEND SOURCE pen.c region.c stringformat.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) add_library(gdiplus SHARED ${SOURCE} gdiplus.rc) set_module_type(gdiplus win32dll) -target_link_libraries(gdiplus uuid wine) +target_link_libraries(gdiplus wine) add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/gdiplus/gdiplus_private.h b/reactos/dll/win32/gdiplus/gdiplus_private.h index 4539568f720..94ec592abd6 100644 --- a/reactos/dll/win32/gdiplus/gdiplus_private.h +++ b/reactos/dll/win32/gdiplus/gdiplus_private.h @@ -29,12 +29,10 @@ #define NONAMELESSUNION #define COBJMACROS -#define INITGUID - #include #include #include -#include +#include #include #include @@ -457,4 +455,4 @@ GpStatus gdip_format_string(HDC hdc, void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; -#endif +#endif /* __WINE_GP_PRIVATE_H_ */ diff --git a/reactos/dll/win32/gdiplus/guid.c b/reactos/dll/win32/gdiplus/guid.c new file mode 100644 index 00000000000..6075a471188 --- /dev/null +++ b/reactos/dll/win32/gdiplus/guid.c @@ -0,0 +1,17 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +#include +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/dll/win32/gdiplus/image.c b/reactos/dll/win32/gdiplus/image.c index 1c4f9ce8b53..84a05453cb7 100644 --- a/reactos/dll/win32/gdiplus/image.c +++ b/reactos/dll/win32/gdiplus/image.c @@ -20,6 +20,7 @@ #include "gdiplus_private.h" #include +#include #include #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) From f91ac77f2411d4c86daec55bb4650688058b19aa Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:27:43 +0000 Subject: [PATCH 009/124] [HHCTRL.OCX] * Remove one time mshtmhst.h inclusion from the main header and put it back where it belongs. * Move resource.h inclusion to the main header. * Remove redundant winnls.h inclusion. CORE-7716 svn path=/trunk/; revision=61766 --- reactos/dll/win32/hhctrl.ocx/content.c | 2 -- reactos/dll/win32/hhctrl.ocx/help.c | 2 -- reactos/dll/win32/hhctrl.ocx/hhctrl.h | 8 +++----- reactos/dll/win32/hhctrl.ocx/stream.h | 2 +- reactos/dll/win32/hhctrl.ocx/webbrowser.c | 2 ++ 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/reactos/dll/win32/hhctrl.ocx/content.c b/reactos/dll/win32/hhctrl.ocx/content.c index cf052d9e041..2a411bd69c7 100644 --- a/reactos/dll/win32/hhctrl.ocx/content.c +++ b/reactos/dll/win32/hhctrl.ocx/content.c @@ -19,8 +19,6 @@ #include "hhctrl.h" -#include "resource.h" - typedef enum { INSERT_NEXT, INSERT_CHILD diff --git a/reactos/dll/win32/hhctrl.ocx/help.c b/reactos/dll/win32/hhctrl.ocx/help.c index 846d1ed25e1..c7ad4e744ad 100644 --- a/reactos/dll/win32/hhctrl.ocx/help.c +++ b/reactos/dll/win32/hhctrl.ocx/help.c @@ -25,8 +25,6 @@ #include #include -#include "resource.h" - static LRESULT Help_OnSize(HWND hWnd); static void ExpandContract(HHInfo *pHHInfo); diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.h b/reactos/dll/win32/hhctrl.ocx/hhctrl.h index 4600b79f85a..60ed3308d3d 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.h +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.h @@ -26,19 +26,16 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define COBJMACROS - #include #include #include -#include #include #include #include -#include #include #include @@ -48,6 +45,7 @@ #include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); +#include "resource.h" #include "stream.h" #define WB_GOBACK 0 @@ -326,4 +324,4 @@ static inline LPSTR strdupWtoA(LPCWSTR str) extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN; extern BOOL hh_process DECLSPEC_HIDDEN; -#endif +#endif /* HHCTRL_H */ diff --git a/reactos/dll/win32/hhctrl.ocx/stream.h b/reactos/dll/win32/hhctrl.ocx/stream.h index 8d61ad54d51..b45869b7381 100644 --- a/reactos/dll/win32/hhctrl.ocx/stream.h +++ b/reactos/dll/win32/hhctrl.ocx/stream.h @@ -45,4 +45,4 @@ BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN; -#endif +#endif /* HHCTRL_STREAM_H */ diff --git a/reactos/dll/win32/hhctrl.ocx/webbrowser.c b/reactos/dll/win32/hhctrl.ocx/webbrowser.c index 195eed2e0e4..afa213d8bc9 100644 --- a/reactos/dll/win32/hhctrl.ocx/webbrowser.c +++ b/reactos/dll/win32/hhctrl.ocx/webbrowser.c @@ -20,6 +20,8 @@ #include "hhctrl.h" +#include + typedef struct IOleClientSiteImpl { IOleClientSite IOleClientSite_iface; From fbecb771e603bed8ea751da92c231a172dac98b6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:28:58 +0000 Subject: [PATCH 010/124] [HID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61767 --- reactos/dll/win32/hid/hid.c | 2 ++ reactos/dll/win32/hid/precomp.h | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/hid/hid.c b/reactos/dll/win32/hid/hid.c index 47f450d2ee9..a73b9e592a0 100644 --- a/reactos/dll/win32/hid/hid.c +++ b/reactos/dll/win32/hid/hid.c @@ -28,6 +28,8 @@ #include "precomp.h" +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/hid/precomp.h b/reactos/dll/win32/hid/precomp.h index a9d6b1dcacc..0f39db1beb2 100644 --- a/reactos/dll/win32/hid/precomp.h +++ b/reactos/dll/win32/hid/precomp.h @@ -1,7 +1,6 @@ #include + #define WIN32_NO_STATUS -#include -#include #define NTOS_MODE_USER #include @@ -14,9 +13,7 @@ typedef VOID (WINAPI *PINTERFACE_DEREFERENCE)( PVOID Context); -//#include #include -//#include extern HINSTANCE hDllInstance; extern const GUID HidClassGuid; From 24e5e1b0be780d36edbb0b799a48135c1098e9d9 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 11:30:37 +0000 Subject: [PATCH 011/124] [IEFRAME] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61768 --- reactos/dll/win32/ieframe/ieframe.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/reactos/dll/win32/ieframe/ieframe.h b/reactos/dll/win32/ieframe/ieframe.h index fe4dbbf16e2..e0afc62cbcb 100644 --- a/reactos/dll/win32/ieframe/ieframe.h +++ b/reactos/dll/win32/ieframe/ieframe.h @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include #define WIN32_NO_STATUS @@ -26,7 +25,6 @@ #define COM_NO_WINDOWS_H #define COBJMACROS - #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -39,7 +37,6 @@ #include #include #include -#include #include #include #include From 6f607e42cc9fe82b33f54c2d7122585d4a84fa55 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:42:15 +0000 Subject: [PATCH 012/124] [IMAGEHLP] * Remove one time winternl.h inclusion from the main header and put it back where it belongs. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61769 --- reactos/dll/win32/imagehlp/access.c | 2 ++ reactos/dll/win32/imagehlp/modify.c | 1 - reactos/dll/win32/imagehlp/precomp.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/imagehlp/access.c b/reactos/dll/win32/imagehlp/access.c index 98c27187ffa..cdeee792b7e 100644 --- a/reactos/dll/win32/imagehlp/access.c +++ b/reactos/dll/win32/imagehlp/access.c @@ -20,6 +20,8 @@ #include "precomp.h" +#include + /*********************************************************************** * Data */ diff --git a/reactos/dll/win32/imagehlp/modify.c b/reactos/dll/win32/imagehlp/modify.c index 8a1d1910625..d2b095c2622 100644 --- a/reactos/dll/win32/imagehlp/modify.c +++ b/reactos/dll/win32/imagehlp/modify.c @@ -22,7 +22,6 @@ static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD WordCount); - /*********************************************************************** * BindImage (IMAGEHLP.@) */ diff --git a/reactos/dll/win32/imagehlp/precomp.h b/reactos/dll/win32/imagehlp/precomp.h index 27d9c0c965b..fbca3c7e800 100644 --- a/reactos/dll/win32/imagehlp/precomp.h +++ b/reactos/dll/win32/imagehlp/precomp.h @@ -4,10 +4,11 @@ #include #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include #include -#include #include #include From a45f2450755df3c1c7a17f9b46e5e5848fa2f4af Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:43:25 +0000 Subject: [PATCH 013/124] [ITSS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61770 --- reactos/dll/win32/itss/moniker.c | 2 ++ reactos/dll/win32/itss/precomp.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/itss/moniker.c b/reactos/dll/win32/itss/moniker.c index 86e82de2c2c..86d81091862 100644 --- a/reactos/dll/win32/itss/moniker.c +++ b/reactos/dll/win32/itss/moniker.c @@ -22,6 +22,8 @@ #include "precomp.h" +#include + /*****************************************************************************/ typedef struct { diff --git a/reactos/dll/win32/itss/precomp.h b/reactos/dll/win32/itss/precomp.h index 5f6aa249645..1bf6ab0c518 100644 --- a/reactos/dll/win32/itss/precomp.h +++ b/reactos/dll/win32/itss/precomp.h @@ -1,7 +1,7 @@ #ifndef _ITSS_PCH_ #define _ITSS_PCH_ -#include +#include #include #include @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include From 4ba913a711e24e70316504bda49ea171a5650b4f Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:45:05 +0000 Subject: [PATCH 014/124] [JSCRIPT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61771 --- reactos/dll/win32/jscript/activex.c | 1 - reactos/dll/win32/jscript/engine.h | 2 ++ reactos/dll/win32/jscript/jscript.c | 2 -- reactos/dll/win32/jscript/jscript.h | 13 ++++++------- reactos/dll/win32/jscript/jscript_main.c | 4 +--- reactos/dll/win32/jscript/jsstr.h | 3 +++ reactos/dll/win32/jscript/jsval.h | 2 +- reactos/dll/win32/jscript/regexp.h | 2 ++ 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/reactos/dll/win32/jscript/activex.c b/reactos/dll/win32/jscript/activex.c index 30d7869b9d6..0bdf80e9767 100644 --- a/reactos/dll/win32/jscript/activex.c +++ b/reactos/dll/win32/jscript/activex.c @@ -18,7 +18,6 @@ #include "jscript.h" -#include #include /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ diff --git a/reactos/dll/win32/jscript/engine.h b/reactos/dll/win32/jscript/engine.h index 618c6f09da0..cb135bdca00 100644 --- a/reactos/dll/win32/jscript/engine.h +++ b/reactos/dll/win32/jscript/engine.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; diff --git a/reactos/dll/win32/jscript/jscript.c b/reactos/dll/win32/jscript/jscript.c index dda7051eb8b..01639fb256c 100644 --- a/reactos/dll/win32/jscript/jscript.c +++ b/reactos/dll/win32/jscript/jscript.c @@ -18,8 +18,6 @@ #include "jscript.h" -#include - #ifdef _WIN64 #define CTXARG_T DWORDLONG diff --git a/reactos/dll/win32/jscript/jscript.h b/reactos/dll/win32/jscript/jscript.h index 4c4e03cd3e0..7d29493fee3 100644 --- a/reactos/dll/win32/jscript/jscript.h +++ b/reactos/dll/win32/jscript/jscript.h @@ -20,9 +20,7 @@ #include #include -#include #include -#include #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -32,15 +30,16 @@ #include #include -#include -#include +#include +#include #include #include - -#include -#include +#include #include +#include +#include + WINE_DEFAULT_DEBUG_CHANNEL(jscript); #include "resource.h" diff --git a/reactos/dll/win32/jscript/jscript_main.c b/reactos/dll/win32/jscript/jscript_main.c index 9cfb2e55c58..03f1f56465a 100644 --- a/reactos/dll/win32/jscript/jscript_main.c +++ b/reactos/dll/win32/jscript/jscript_main.c @@ -18,14 +18,12 @@ #include "jscript.h" -#include #include +#include #include LONG module_ref = 0; -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); - HINSTANCE jscript_hinstance; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) diff --git a/reactos/dll/win32/jscript/jsstr.h b/reactos/dll/win32/jscript/jsstr.h index 2ad03f18959..c30a830f232 100644 --- a/reactos/dll/win32/jscript/jsstr.h +++ b/reactos/dll/win32/jscript/jsstr.h @@ -33,6 +33,9 @@ * * In the future more layouts and transformations may be added. */ + +#pragma once + struct _jsstr_t { unsigned length_flags; unsigned ref; diff --git a/reactos/dll/win32/jscript/jsval.h b/reactos/dll/win32/jscript/jsval.h index 963f59f6a08..1121425373f 100644 --- a/reactos/dll/win32/jscript/jsval.h +++ b/reactos/dll/win32/jscript/jsval.h @@ -246,4 +246,4 @@ HRESULT jsval_to_variant(jsval_t,VARIANT*) DECLSPEC_HIDDEN; void jsval_release(jsval_t) DECLSPEC_HIDDEN; HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN; -#endif +#endif /* JSVAL_H */ diff --git a/reactos/dll/win32/jscript/regexp.h b/reactos/dll/win32/jscript/regexp.h index de86aa215c6..5a13a0015aa 100644 --- a/reactos/dll/win32/jscript/regexp.h +++ b/reactos/dll/win32/jscript/regexp.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + /* * Code in this file is based on files: * js/src/jsregexp.h From 3c885f3ebf39a395aa7f78ef809319689d5df76b Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:45:58 +0000 Subject: [PATCH 015/124] [KERNEL32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61772 --- reactos/dll/win32/kernel32/client/debugger.c | 3 +++ reactos/dll/win32/kernel32/client/dosdev.c | 1 + reactos/dll/win32/kernel32/client/file/deviceio.c | 3 +++ reactos/dll/win32/kernel32/client/power.c | 2 ++ reactos/dll/win32/kernel32/client/toolhelp.c | 2 -- reactos/dll/win32/kernel32/k32.h | 10 +++------- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/kernel32/client/debugger.c b/reactos/dll/win32/kernel32/client/debugger.c index c3244f42a55..02891937fed 100644 --- a/reactos/dll/win32/kernel32/client/debugger.c +++ b/reactos/dll/win32/kernel32/client/debugger.c @@ -9,6 +9,9 @@ /* INCLUDES *****************************************************************/ #include + +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/kernel32/client/dosdev.c b/reactos/dll/win32/kernel32/client/dosdev.c index a7a7aba7656..ddd20106f57 100644 --- a/reactos/dll/win32/kernel32/client/dosdev.c +++ b/reactos/dll/win32/kernel32/client/dosdev.c @@ -11,6 +11,7 @@ /* INCLUDES ******************************************************************/ #include + #define NDEBUG #include #include diff --git a/reactos/dll/win32/kernel32/client/file/deviceio.c b/reactos/dll/win32/kernel32/client/file/deviceio.c index c477c4f0653..892ac806163 100644 --- a/reactos/dll/win32/kernel32/client/file/deviceio.c +++ b/reactos/dll/win32/kernel32/client/file/deviceio.c @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include + +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/kernel32/client/power.c b/reactos/dll/win32/kernel32/client/power.c index 411d209571d..7864221f378 100644 --- a/reactos/dll/win32/kernel32/client/power.c +++ b/reactos/dll/win32/kernel32/client/power.c @@ -12,6 +12,8 @@ #include +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/kernel32/client/toolhelp.c b/reactos/dll/win32/kernel32/client/toolhelp.c index 0eae03bb0fe..5a574f0051f 100644 --- a/reactos/dll/win32/kernel32/client/toolhelp.c +++ b/reactos/dll/win32/kernel32/client/toolhelp.c @@ -17,8 +17,6 @@ #include -#include - #define NDEBUG #include diff --git a/reactos/dll/win32/kernel32/k32.h b/reactos/dll/win32/kernel32/k32.h index 8a812383a12..e544b0c7eef 100644 --- a/reactos/dll/win32/kernel32/k32.h +++ b/reactos/dll/win32/kernel32/k32.h @@ -11,10 +11,10 @@ /* INCLUDES ******************************************************************/ +#include + /* PSDK/NDK Headers */ #define WIN32_NO_STATUS -#include -#include #include #include #include @@ -28,7 +28,6 @@ #define NTDDI_VERSION NTDDI_WS03SP1 #include -#include #include #include #include @@ -36,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -48,10 +46,8 @@ #include #include #include -#include /* DDK Driver Headers */ -#include #include /* Internal Kernel32 Header */ @@ -69,4 +65,4 @@ /* Virtual DOS Machines (VDM) Support Definitions */ #include "include/vdm.h" -#endif +#endif /* __K32_H */ From 44f2f5994ec8fce5050f950780e33831411b6cd0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:46:55 +0000 Subject: [PATCH 016/124] [LOCALSPL] * Remove one time resource.h inclusion from the main header and put it back where it belongs. CORE-7716 svn path=/trunk/; revision=61773 --- reactos/dll/win32/localspl/localmon.c | 2 ++ reactos/dll/win32/localspl/localspl_private.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/localspl/localmon.c b/reactos/dll/win32/localspl/localmon.c index 3e243bfcbdd..e78b6121fed 100644 --- a/reactos/dll/win32/localspl/localmon.c +++ b/reactos/dll/win32/localspl/localmon.c @@ -20,6 +20,8 @@ #include "localspl_private.h" +#include "resource.h" + /*****************************************************/ static CRITICAL_SECTION port_handles_cs; diff --git a/reactos/dll/win32/localspl/localspl_private.h b/reactos/dll/win32/localspl/localspl_private.h index 0fd85d32560..359b30b8dda 100644 --- a/reactos/dll/win32/localspl/localspl_private.h +++ b/reactos/dll/win32/localspl/localspl_private.h @@ -44,8 +44,6 @@ #include WINE_DEFAULT_DEBUG_CHANNEL(localspl); -#include "resource.h" - /* ## DLL-wide Globals ## */ extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN; void setup_provider(void) DECLSPEC_HIDDEN; @@ -88,5 +86,4 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } - #endif /* __WINE_LOCALSPL_PRIVATE__ */ From f2296246ea75371f2966ef6cdb5eb9706ca545ea Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:49:49 +0000 Subject: [PATCH 017/124] [LPK] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61774 --- reactos/dll/win32/lpk/dllmain.c | 1 - reactos/dll/win32/lpk/ros_lpk.h | 6 ++---- reactos/dll/win32/lpk/stub.c | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/lpk/dllmain.c b/reactos/dll/win32/lpk/dllmain.c index 1d5bdc0e781..f54beb950bf 100644 --- a/reactos/dll/win32/lpk/dllmain.c +++ b/reactos/dll/win32/lpk/dllmain.c @@ -45,4 +45,3 @@ LpkDllInitialize ( return TRUE; } - diff --git a/reactos/dll/win32/lpk/ros_lpk.h b/reactos/dll/win32/lpk/ros_lpk.h index a2330f48daa..5535e8042fe 100644 --- a/reactos/dll/win32/lpk/ros_lpk.h +++ b/reactos/dll/win32/lpk/ros_lpk.h @@ -5,13 +5,12 @@ * PROGRAMMER: Magnus Olsen (greatlrd) * */ -#define WIN32_NO_STATUS -#define NTOS_MODE_USER #include + +#define WIN32_NO_STATUS #include #include -#include /* FIXME USP10 api that does not have prototype in any include file */ VOID WINAPI LpkPresent(VOID); @@ -65,4 +64,3 @@ DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6); DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); - diff --git a/reactos/dll/win32/lpk/stub.c b/reactos/dll/win32/lpk/stub.c index 3df3afee430..37072f05b78 100644 --- a/reactos/dll/win32/lpk/stub.c +++ b/reactos/dll/win32/lpk/stub.c @@ -8,6 +8,8 @@ #include "ros_lpk.h" +#include + #define UNIMPLEMENTED DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); /* From 830213a1cf4792b5b99f8d4c2f412542845fd216 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:51:20 +0000 Subject: [PATCH 018/124] [LSASRV] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61775 --- reactos/dll/win32/lsasrv/authpackage.c | 4 ++++ reactos/dll/win32/lsasrv/authport.c | 3 +++ reactos/dll/win32/lsasrv/lookup.c | 2 ++ reactos/dll/win32/lsasrv/lsasrv.h | 9 --------- reactos/dll/win32/lsasrv/utils.c | 2 ++ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/lsasrv/authpackage.c b/reactos/dll/win32/lsasrv/authpackage.c index 16ff508c81a..a9f57ab76c6 100644 --- a/reactos/dll/win32/lsasrv/authpackage.c +++ b/reactos/dll/win32/lsasrv/authpackage.c @@ -8,6 +8,10 @@ #include "lsasrv.h" +#include +#include +#include + typedef enum _LSA_TOKEN_INFORMATION_TYPE { LsaTokenInformationNull, diff --git a/reactos/dll/win32/lsasrv/authport.c b/reactos/dll/win32/lsasrv/authport.c index ee685dd42ee..61527ea2f0a 100644 --- a/reactos/dll/win32/lsasrv/authport.c +++ b/reactos/dll/win32/lsasrv/authport.c @@ -8,6 +8,9 @@ #include "lsasrv.h" +#include +#include + static LIST_ENTRY LsapLogonContextList; static HANDLE PortThreadHandle = NULL; diff --git a/reactos/dll/win32/lsasrv/lookup.c b/reactos/dll/win32/lsasrv/lookup.c index be83d49ff04..426a9b83606 100644 --- a/reactos/dll/win32/lsasrv/lookup.c +++ b/reactos/dll/win32/lsasrv/lookup.c @@ -9,6 +9,8 @@ #include "lsasrv.h" +#include "resources.h" + /* GLOBALS *****************************************************************/ typedef wchar_t *PSAMPR_SERVER_NAME; diff --git a/reactos/dll/win32/lsasrv/lsasrv.h b/reactos/dll/win32/lsasrv/lsasrv.h index dd7b100ecac..fdf08072574 100644 --- a/reactos/dll/win32/lsasrv/lsasrv.h +++ b/reactos/dll/win32/lsasrv/lsasrv.h @@ -16,20 +16,13 @@ #include #include #include -#include #define NTOS_MODE_USER #include #include -#include -#include -#include #include -#include #include #include -#include -#include #include #include @@ -41,8 +34,6 @@ #include WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); -#include "resources.h" - typedef enum _LSA_DB_OBJECT_TYPE { LsaDbIgnoreObject, diff --git a/reactos/dll/win32/lsasrv/utils.c b/reactos/dll/win32/lsasrv/utils.c index 0b82c9acc15..6db656d9ecb 100644 --- a/reactos/dll/win32/lsasrv/utils.c +++ b/reactos/dll/win32/lsasrv/utils.c @@ -9,6 +9,8 @@ #include "lsasrv.h" +#include + /* FUNCTIONS ***************************************************************/ INT From 48cab4c068c800e9a8cdf259c8c8ca8f9cca2974 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:52:54 +0000 Subject: [PATCH 019/124] [MAPI32] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61776 --- reactos/dll/win32/mapi32/mapi32_main.c | 2 -- reactos/dll/win32/mapi32/precomp.h | 11 ++++++----- reactos/dll/win32/mapi32/prop.c | 1 - reactos/dll/win32/mapi32/stubs.c | 12 +----------- reactos/dll/win32/mapi32/util.c | 2 -- reactos/dll/win32/mapi32/util.h | 6 +----- 6 files changed, 8 insertions(+), 26 deletions(-) diff --git a/reactos/dll/win32/mapi32/mapi32_main.c b/reactos/dll/win32/mapi32/mapi32_main.c index cadbc184af8..471010aaa62 100644 --- a/reactos/dll/win32/mapi32/mapi32_main.c +++ b/reactos/dll/win32/mapi32/mapi32_main.c @@ -20,8 +20,6 @@ #include "precomp.h" -#include - DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; diff --git a/reactos/dll/win32/mapi32/precomp.h b/reactos/dll/win32/mapi32/precomp.h index b2489ec920c..c22246fedf4 100644 --- a/reactos/dll/win32/mapi32/precomp.h +++ b/reactos/dll/win32/mapi32/precomp.h @@ -1,7 +1,7 @@ #ifndef _MAPI32_PCH_ #define _MAPI32_PCH_ -#include +#include #include @@ -16,14 +16,15 @@ #include #include #include +#include #include -#include - -#include +#include #include -WINE_DEFAULT_DEBUG_CHANNEL(mapi); +#include #include "util.h" +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + #endif /* _MAPI32_PCH_ */ diff --git a/reactos/dll/win32/mapi32/prop.c b/reactos/dll/win32/mapi32/prop.c index d39637502fa..6128a600fd7 100644 --- a/reactos/dll/win32/mapi32/prop.c +++ b/reactos/dll/win32/mapi32/prop.c @@ -20,7 +20,6 @@ #include "precomp.h" -#include #include BOOL WINAPI FBadRglpszA(LPSTR*,ULONG); diff --git a/reactos/dll/win32/mapi32/stubs.c b/reactos/dll/win32/mapi32/stubs.c index 8cd1231fbfe..65da2d5db43 100644 --- a/reactos/dll/win32/mapi32/stubs.c +++ b/reactos/dll/win32/mapi32/stubs.c @@ -1,13 +1,4 @@ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -#include -#include -#include - -#include +#include "precomp.h" typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK; @@ -109,4 +100,3 @@ FixMAPI(void) UNIMPLEMENTED; return E_NOTIMPL; } - diff --git a/reactos/dll/win32/mapi32/util.c b/reactos/dll/win32/mapi32/util.c index 59363c911a8..66e657f86e0 100644 --- a/reactos/dll/win32/mapi32/util.c +++ b/reactos/dll/win32/mapi32/util.c @@ -22,9 +22,7 @@ #include "precomp.h" #include - #include -#include #include #include diff --git a/reactos/dll/win32/mapi32/util.h b/reactos/dll/win32/mapi32/util.h index 3b1ac28ad0c..20db3d51cec 100644 --- a/reactos/dll/win32/mapi32/util.h +++ b/reactos/dll/win32/mapi32/util.h @@ -19,12 +19,8 @@ */ #ifndef _MAPI_UTIL_H - #define _MAPI_UTIL_H -#include -//#include - extern void load_mapi_providers(void) DECLSPEC_HIDDEN; extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; @@ -65,4 +61,4 @@ typedef struct MAPI_FUNCTIONS { extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; -#endif +#endif /* _MAPI_UTIL_H */ From a63971940f228ffca3ec6dface5f292b376fc2bd Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:53:38 +0000 Subject: [PATCH 020/124] [MCIAVI32] * Remove one time mciavi.h inclusion from the main header and put it back where it belongs. CORE-7716 svn path=/trunk/; revision=61777 --- reactos/dll/win32/mciavi32/mciavi.c | 1 + reactos/dll/win32/mciavi32/private_mciavi.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/mciavi32/mciavi.c b/reactos/dll/win32/mciavi32/mciavi.c index 3fe4c2dc3e9..de9055dd3ce 100644 --- a/reactos/dll/win32/mciavi32/mciavi.c +++ b/reactos/dll/win32/mciavi32/mciavi.c @@ -39,6 +39,7 @@ #include "private_mciavi.h" +#include #include static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); diff --git a/reactos/dll/win32/mciavi32/private_mciavi.h b/reactos/dll/win32/mciavi32/private_mciavi.h index d262628554f..7e78af273c5 100644 --- a/reactos/dll/win32/mciavi32/private_mciavi.h +++ b/reactos/dll/win32/mciavi32/private_mciavi.h @@ -21,18 +21,18 @@ #ifndef __WINE_PRIVATE_MCIAVI_H #define __WINE_PRIVATE_MCIAVI_H +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include #include #include #include #include #include #include -#include #include WINE_DEFAULT_DEBUG_CHANNEL(mciavi); From 237fce68228828e6b6916d1ee72dbdcd1f2879dc Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:55:56 +0000 Subject: [PATCH 021/124] [MMDEVAPI] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61778 --- reactos/dll/win32/mmdevapi/devenum.c | 2 +- reactos/dll/win32/mmdevapi/mmdevapi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/mmdevapi/devenum.c b/reactos/dll/win32/mmdevapi/devenum.c index 29e8392de7c..7aa5a009aeb 100644 --- a/reactos/dll/win32/mmdevapi/devenum.c +++ b/reactos/dll/win32/mmdevapi/devenum.c @@ -20,7 +20,7 @@ #include -#include +#include #include #define _WINDOWS_H #include diff --git a/reactos/dll/win32/mmdevapi/mmdevapi.h b/reactos/dll/win32/mmdevapi/mmdevapi.h index 04355226d18..07d930684e0 100644 --- a/reactos/dll/win32/mmdevapi/mmdevapi.h +++ b/reactos/dll/win32/mmdevapi/mmdevapi.h @@ -25,8 +25,8 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#define NONAMELESSUNION #define COBJMACROS +#define NONAMELESSUNION #include #include @@ -37,9 +37,9 @@ #include #include +#include #include -#include WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; From ea9913784342e1678599141aefab01c569ae58b7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:57:47 +0000 Subject: [PATCH 022/124] [MPR] * Move mprres.h inclusion to the main header. CORE-7716 svn path=/trunk/; revision=61779 --- reactos/dll/win32/mpr/mpr_main.c | 1 + reactos/dll/win32/mpr/mprres.h | 1 + reactos/dll/win32/mpr/nps.c | 1 - reactos/dll/win32/mpr/precomp.h | 3 +++ reactos/dll/win32/mpr/wnet.c | 2 -- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/mpr/mpr_main.c b/reactos/dll/win32/mpr/mpr_main.c index e319a0d59d5..f6ca1021b23 100644 --- a/reactos/dll/win32/mpr/mpr_main.c +++ b/reactos/dll/win32/mpr/mpr_main.c @@ -19,6 +19,7 @@ */ #include "precomp.h" + #include "wnetpriv.h" /* diff --git a/reactos/dll/win32/mpr/mprres.h b/reactos/dll/win32/mpr/mprres.h index 292b4765260..83e95450a6e 100644 --- a/reactos/dll/win32/mpr/mprres.h +++ b/reactos/dll/win32/mpr/mprres.h @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ diff --git a/reactos/dll/win32/mpr/nps.c b/reactos/dll/win32/mpr/nps.c index 7137425997e..bb1264635aa 100644 --- a/reactos/dll/win32/mpr/nps.c +++ b/reactos/dll/win32/mpr/nps.c @@ -22,7 +22,6 @@ #include "precomp.h" #include "netspi.h" -#include "mprres.h" /*********************************************************************** * NPS_ProxyPasswordDialog diff --git a/reactos/dll/win32/mpr/precomp.h b/reactos/dll/win32/mpr/precomp.h index bdda98b7c2c..6d5a884c54b 100644 --- a/reactos/dll/win32/mpr/precomp.h +++ b/reactos/dll/win32/mpr/precomp.h @@ -13,6 +13,9 @@ #include #include + +#include "mprres.h" + WINE_DEFAULT_DEBUG_CHANNEL(mpr); #endif /* _MPR_PCH_ */ diff --git a/reactos/dll/win32/mpr/wnet.c b/reactos/dll/win32/mpr/wnet.c index 16d23aa739e..712c87a35a9 100644 --- a/reactos/dll/win32/mpr/wnet.c +++ b/reactos/dll/win32/mpr/wnet.c @@ -28,8 +28,6 @@ #include #include -#include "mprres.h" - /* Data structures representing network service providers. Assumes only one * thread creates them, and that they are constant for the life of the process * (and therefore doesn't synchronize access). From 9b0d1bcfb36e0383a362d9233cf7c7e56afb248a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:59:52 +0000 Subject: [PATCH 023/124] [MSACM32] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61780 --- reactos/dll/win32/msacm32/wineacm.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/msacm32/wineacm.h b/reactos/dll/win32/msacm32/wineacm.h index 16b6c41f365..11dea6e05b7 100644 --- a/reactos/dll/win32/msacm32/wineacm.h +++ b/reactos/dll/win32/msacm32/wineacm.h @@ -20,19 +20,20 @@ #ifndef __WINE_WINEACM_H #define __WINE_WINEACM_H -#include +#include #include #define WIN32_NO_STATUS #define NOBITMAP -#include -#include - +#include #include #include +#include +#include + WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** From 1b2a553fb05d18ea645b1ac94aeb593bf14dc74d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 18:01:03 +0000 Subject: [PATCH 024/124] [MSAFD] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61781 --- reactos/dll/win32/msafd/misc/dllmain.c | 2 ++ reactos/dll/win32/msafd/misc/helpers.c | 3 +++ reactos/dll/win32/msafd/misc/stubs.c | 1 + reactos/dll/win32/msafd/msafd.h | 9 ++++----- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/msafd/misc/dllmain.c b/reactos/dll/win32/msafd/misc/dllmain.c index 61a4244c85a..db0de7c47b1 100644 --- a/reactos/dll/win32/msafd/misc/dllmain.c +++ b/reactos/dll/win32/msafd/misc/dllmain.c @@ -12,6 +12,8 @@ #include +#include + #if DBG //DWORD DebugTraceLevel = DEBUG_ULTRA; DWORD DebugTraceLevel = 0; diff --git a/reactos/dll/win32/msafd/misc/helpers.c b/reactos/dll/win32/msafd/misc/helpers.c index 7eac4c46ad0..8c0e588e5f7 100644 --- a/reactos/dll/win32/msafd/misc/helpers.c +++ b/reactos/dll/win32/msafd/misc/helpers.c @@ -9,8 +9,11 @@ * CSH 01/09-2000 Created * Alex 16/07/2004 - Complete Rewrite */ + #include +#include + CRITICAL_SECTION HelperDLLDatabaseLock; LIST_ENTRY HelperDLLDatabaseListHead; diff --git a/reactos/dll/win32/msafd/misc/stubs.c b/reactos/dll/win32/msafd/misc/stubs.c index e3840599665..eaa2d704628 100644 --- a/reactos/dll/win32/msafd/misc/stubs.c +++ b/reactos/dll/win32/msafd/misc/stubs.c @@ -7,6 +7,7 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include INT diff --git a/reactos/dll/win32/msafd/msafd.h b/reactos/dll/win32/msafd/msafd.h index ec8e9e5a828..97f3816563d 100644 --- a/reactos/dll/win32/msafd/msafd.h +++ b/reactos/dll/win32/msafd/msafd.h @@ -4,17 +4,18 @@ * FILE: include/msafd.h * PURPOSE: Ancillary Function Driver DLL header */ + #ifndef __MSAFD_H #define __MSAFD_H +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include + #include #include -#include -#include #include #define NTOS_MODE_USER #include @@ -507,5 +508,3 @@ MsafdReturnWithErrno(NTSTATUS Status, } #endif /* __MSAFD_H */ - -/* EOF */ From 3cdb13b7e3c5ed7ca6ec46231a56200869cc98fb Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 18:01:59 +0000 Subject: [PATCH 025/124] [MSCOREE] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61782 --- reactos/dll/win32/mscoree/mscoree_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/reactos/dll/win32/mscoree/mscoree_private.h b/reactos/dll/win32/mscoree/mscoree_private.h index 3bcb90519d9..eb533bf72da 100644 --- a/reactos/dll/win32/mscoree/mscoree_private.h +++ b/reactos/dll/win32/mscoree/mscoree_private.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include From 9f87212d661602c43edf23632f7532f1c27188d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Thu, 23 Jan 2014 21:06:48 +0000 Subject: [PATCH 026/124] [CMLIB] - Increase Hive dirty counter when marking cells as dirty - Clear the counter accordingly when flushing the hive [NTOSKRNL] - Lazy flush the registry when unlocking it - Correctly update hive lazy flush count when actully flushing it - Respect the force flush parameter CORE-6762 #comment Should be fixed with r61783, let's see what testbot says. svn path=/trunk/; revision=61783 --- reactos/lib/cmlib/hivecell.c | 1 + reactos/lib/cmlib/hivewrt.c | 1 + reactos/ntoskrnl/config/cmlazy.c | 53 ++++++++++++++++++++---------- reactos/ntoskrnl/config/cmsysini.c | 5 +++ 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/reactos/lib/cmlib/hivecell.c b/reactos/lib/cmlib/hivecell.c index 0c709076126..3d253a507b0 100644 --- a/reactos/lib/cmlib/hivecell.c +++ b/reactos/lib/cmlib/hivecell.c @@ -120,6 +120,7 @@ HvMarkCellDirty( RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); + RegistryHive->DirtyCount++; return TRUE; } diff --git a/reactos/lib/cmlib/hivewrt.c b/reactos/lib/cmlib/hivewrt.c index bdbce20bbe3..a5f0c8e8220 100644 --- a/reactos/lib/cmlib/hivewrt.c +++ b/reactos/lib/cmlib/hivewrt.c @@ -265,6 +265,7 @@ HvSyncHive( /* Clear dirty bitmap. */ RtlClearAllBits(&RegistryHive->DirtyVector); + RegistryHive->DirtyCount = 0; return TRUE; } diff --git a/reactos/ntoskrnl/config/cmlazy.c b/reactos/ntoskrnl/config/cmlazy.c index 1577c0cce89..348739e8c5d 100644 --- a/reactos/ntoskrnl/config/cmlazy.c +++ b/reactos/ntoskrnl/config/cmlazy.c @@ -23,7 +23,7 @@ BOOLEAN CmpLazyFlushPending; BOOLEAN CmpForceForceFlush; BOOLEAN CmpHoldLazyFlush = TRUE; ULONG CmpLazyFlushIntervalInSeconds = 5; -ULONG CmpLazyFlushHiveCount = 7; +static ULONG CmpLazyFlushHiveCount = 7; ULONG CmpLazyFlushCount = 1; LONG CmpFlushStarveWriters; @@ -31,9 +31,9 @@ LONG CmpFlushStarveWriters; BOOLEAN NTAPI -CmpDoFlushNextHive(IN BOOLEAN ForceFlush, - OUT PBOOLEAN Error, - OUT PULONG DirtyCount) +CmpDoFlushNextHive(_In_ BOOLEAN ForceFlush, + _Out_ PBOOLEAN Error, + _Out_ PULONG DirtyCount) { NTSTATUS Status; PLIST_ENTRY NextEntry; @@ -51,13 +51,10 @@ CmpDoFlushNextHive(IN BOOLEAN ForceFlush, /* Make sure we have to flush at least one hive */ if (!HiveCount) HiveCount = 1; - /* Don't force flush */ - CmpForceForceFlush = FALSE; - /* Acquire the list lock and loop */ ExAcquirePushLockShared(&CmpHiveListHeadLock); NextEntry = CmpHiveListHead.Flink; - while (NextEntry != &CmpHiveListHead) + while ((NextEntry != &CmpHiveListHead) && HiveCount) { /* Get the hive and check if we should flush it */ CmHive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); @@ -67,17 +64,21 @@ CmpDoFlushNextHive(IN BOOLEAN ForceFlush, /* Great sucess! */ Result = TRUE; - /* Ignore clean or volatile hves */ - if (!(CmHive->Hive.DirtyCount) || + /* One less to flush */ + HiveCount--; + + /* Ignore clean or volatile hives */ + if ((!CmHive->Hive.DirtyCount && !ForceFlush) || (CmHive->Hive.HiveFlags & HIVE_VOLATILE)) { /* Don't do anything but do update the count */ CmHive->FlushCount = CmpLazyFlushCount; + DPRINT("Hive %wZ is clean.\n", &CmHive->FileFullPath); } else { /* Do the sync */ - DPRINT1("Flushing: %wZ\n", CmHive->FileFullPath); + DPRINT1("Flushing: %wZ\n", &CmHive->FileFullPath); DPRINT1("Handle: %p\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]); Status = HvSyncHive(&CmHive->Hive); if(!NT_SUCCESS(Status)) @@ -85,7 +86,9 @@ CmpDoFlushNextHive(IN BOOLEAN ForceFlush, /* Let them know we failed */ *Error = TRUE; Result = FALSE; + break; } + CmHive->FlushCount = CmpLazyFlushCount; } } else if ((CmHive->Hive.DirtyCount) && @@ -95,6 +98,7 @@ CmpDoFlushNextHive(IN BOOLEAN ForceFlush, /* Use another lazy flusher for this hive */ ASSERT(CmHive->FlushCount == CmpLazyFlushCount); *DirtyCount += CmHive->Hive.DirtyCount; + DPRINT("CmHive %wZ already uptodate.\n", &CmHive->FileFullPath); } /* Try the next one */ @@ -139,6 +143,7 @@ CmpLazyFlushDpcRoutine(IN PKDPC Dpc, IN PVOID SystemArgument2) { /* Check if we should queue the lazy flush worker */ + DPRINT("Flush pending: %s, Holding lazy flush: %s.\n", CmpLazyFlushPending ? "yes" : "no", CmpHoldLazyFlush ? "yes" : "no"); if ((!CmpLazyFlushPending) && (!CmpHoldLazyFlush)) { CmpLazyFlushPending = TRUE; @@ -173,20 +178,27 @@ CmpLazyFlushWorker(IN PVOID Parameter) PAGED_CODE(); /* Don't do anything if lazy flushing isn't enabled yet */ - if (CmpHoldLazyFlush) return; + if (CmpHoldLazyFlush) + { + DPRINT1("Lazy flush held. Bye bye.\n"); + CmpLazyFlushPending = FALSE; + return; + } /* Check if we are forcing a flush */ ForceFlush = CmpForceForceFlush; if (ForceFlush) { + DPRINT("Forcing flush.\n"); /* Lock the registry exclusively */ CmpLockRegistryExclusive(); } else { - /* Do a normal lock */ - CmpLockRegistry(); + DPRINT("Not forcing flush.\n"); + /* Starve writers before locking */ InterlockedIncrement(&CmpFlushStarveWriters); + CmpLockRegistry(); } /* Flush the next hive */ @@ -198,14 +210,21 @@ CmpLazyFlushWorker(IN PVOID Parameter) } /* Check if we have starved writers */ - if (!ForceFlush) InterlockedDecrement(&CmpFlushStarveWriters); + if (!ForceFlush) + InterlockedDecrement(&CmpFlushStarveWriters); /* Not pending anymore, release the registry lock */ CmpLazyFlushPending = FALSE; CmpUnlockRegistry(); - /* Check if we need to flush another hive */ - if ((MoreWork) || (DirtyCount)) CmpLazyFlush(); + DPRINT("Lazy flush done. More work to be done: %s. Entries still dirty: %u.\n", + MoreWork ? "Yes" : "No", DirtyCount); + + if (MoreWork) + { + /* Relaunch the flush timer, so the remaining hives get flushed */ + CmpLazyFlush(); + } } VOID diff --git a/reactos/ntoskrnl/config/cmsysini.c b/reactos/ntoskrnl/config/cmsysini.c index cec7e9a95fa..45242d28388 100644 --- a/reactos/ntoskrnl/config/cmsysini.c +++ b/reactos/ntoskrnl/config/cmsysini.c @@ -1949,6 +1949,11 @@ CmpUnlockRegistry(VOID) CmpDoFlushAll(TRUE); CmpFlushOnLockRelease = FALSE; } + else + { + /* Lazy flush the registry */ + CmpLazyFlush(); + } /* Release the lock and leave the critical region */ ExReleaseResourceLite(&CmpRegistryLock); From e35095afbf73798a9955032ae6d7d082b108189a Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Thu, 23 Jan 2014 22:05:03 +0000 Subject: [PATCH 027/124] [MSGINA] - Add the ability for administrators to unlock a computer that was locked by another user. - Remove outdated code. svn path=/trunk/; revision=61784 --- reactos/dll/win32/msgina/gui.c | 16 +++- reactos/dll/win32/msgina/msgina.c | 139 +++++++++++++++++++++--------- reactos/dll/win32/msgina/msgina.h | 8 ++ 3 files changed, 119 insertions(+), 44 deletions(-) diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c index 1f05ae26c06..1e1a3bf0aa7 100644 --- a/reactos/dll/win32/msgina/gui.c +++ b/reactos/dll/win32/msgina/gui.c @@ -639,10 +639,18 @@ DoUnlock( else { /* Wrong user name */ - LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, 256); - wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName); - LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); - MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); + if (DoAdminUnlock(UserName, NULL, Password)) + { + *Action = WLX_SAS_ACTION_UNLOCK_WKSTA; + res = TRUE; + } + else + { + LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, 256); + wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName); + LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); + MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); + } } } diff --git a/reactos/dll/win32/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c index 8a9ed4355f8..2c7c1c18b46 100644 --- a/reactos/dll/win32/msgina/msgina.c +++ b/reactos/dll/win32/msgina/msgina.c @@ -31,6 +31,8 @@ HINSTANCE hDllInstance; extern GINA_UI GinaGraphicalUI; extern GINA_UI GinaTextUI; static PGINA_UI pGinaUI; +static SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; +static PSID AdminSid; /* * @implemented @@ -589,6 +591,83 @@ DuplicationString(PWSTR Str) return NewStr; } + +BOOL +DoAdminUnlock( + IN PWSTR UserName, + IN PWSTR Domain, + IN PWSTR Password) +{ + HANDLE hToken = NULL; + PTOKEN_GROUPS Groups = NULL; + BOOL bIsAdmin = FALSE; + ULONG Size; + ULONG i; + NTSTATUS Status; + + TRACE("(%S %S %S)\n", UserName, Domain, Password); + + if (!LogonUserW(UserName, + Domain, + Password, + LOGON32_LOGON_INTERACTIVE, + LOGON32_PROVIDER_DEFAULT, + &hToken)) + { + WARN("LogonUserW() failed\n"); + return FALSE; + } + + Status = NtQueryInformationToken(hToken, + TokenGroups, + NULL, + 0, + &Size); + if ((Status != STATUS_SUCCESS) && (Status != STATUS_BUFFER_TOO_SMALL)) + { + TRACE("NtQueryInformationToken() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Groups = HeapAlloc(GetProcessHeap(), 0, Size); + if (Groups == NULL) + { + TRACE("HeapAlloc() failed\n"); + goto done; + } + + Status = NtQueryInformationToken(hToken, + TokenGroups, + Groups, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + TRACE("NtQueryInformationToken() failed (Status 0x%08lx)\n", Status); + goto done; + } + + for (i = 0; i < Groups->GroupCount; i++) + { + if (RtlEqualSid(Groups->Groups[i].Sid, AdminSid)) + { + TRACE("Member of Admins group\n"); + bIsAdmin = TRUE; + break; + } + } + +done: + if (Groups != NULL) + HeapFree(GetProcessHeap(), 0, Groups); + + if (hToken != NULL) + CloseHandle(hToken); + + return bIsAdmin; +} + + BOOL DoLoginTasks( IN OUT PGINA_CONTEXT pgContext, @@ -698,46 +777,6 @@ cleanup: return FALSE; } -#if 0 -static -BOOL -CheckAutoAdminLogon( - IN PGINA_CONTEXT pgContext) -{ - HKEY WinLogonKey = NULL; - LPWSTR AutoLogon = NULL; - BOOL result = FALSE; - LONG rc; - - if (pgContext->AutoLogonState == AUTOLOGON_DISABLED) - return FALSE; - - rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", - 0, - KEY_QUERY_VALUE, - &WinLogonKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - - rc = ReadRegSzKey(WinLogonKey, - L"AutoAdminLogon", - &AutoLogon); - - if (rc != ERROR_SUCCESS) - goto cleanup; - - if (wcscmp(AutoLogon, L"1") == 0) - result = TRUE; - -cleanup: - if (WinLogonKey != NULL) - RegCloseKey(WinLogonKey); - HeapFree(GetProcessHeap(), 0, AutoLogon); - - return result; -} -#endif static BOOL DoAutoLogon( @@ -982,7 +1021,27 @@ DllMain( UNREFERENCED_PARAMETER(lpvReserved); if (dwReason == DLL_PROCESS_ATTACH) + { hDllInstance = hinstDLL; + RtlAllocateAndInitializeSid(&SystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &AdminSid); + + } + else if (dwReason == DLL_PROCESS_DETACH) + { + if (AdminSid != NULL) + RtlFreeSid(AdminSid); + } + return TRUE; } diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h index 5dde55567f9..a8d1432adbe 100644 --- a/reactos/dll/win32/msgina/msgina.h +++ b/reactos/dll/win32/msgina/msgina.h @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include WINE_DEFAULT_DEBUG_CHANNEL(msgina); @@ -79,6 +81,12 @@ typedef struct _GINA_UI /* msgina.c */ +BOOL +DoAdminUnlock( + IN PWSTR UserName, + IN PWSTR Domain, + IN PWSTR Password); + BOOL DoLoginTasks( IN OUT PGINA_CONTEXT pgContext, From 154606ab0434367e446996791bbb2a3e6db3c2db Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Jan 2014 17:37:14 +0000 Subject: [PATCH 028/124] [MSCTF] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61787 --- reactos/dll/win32/msctf/msctf_internal.h | 1 - 1 file changed, 1 deletion(-) diff --git a/reactos/dll/win32/msctf/msctf_internal.h b/reactos/dll/win32/msctf/msctf_internal.h index c6b26436f66..e59765daf50 100644 --- a/reactos/dll/win32/msctf/msctf_internal.h +++ b/reactos/dll/win32/msctf/msctf_internal.h @@ -37,7 +37,6 @@ #include #include #include -#include #include #include From 32c14e45f62924c8928a90202b0d01cdc4ffcf38 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Jan 2014 17:59:28 +0000 Subject: [PATCH 029/124] [MSIMTF] * Create a main header and move some inclusions to it. * Improve the header inclusions. CORE-7716 svn path=/trunk/; revision=61788 --- reactos/dll/win32/msimtf/activeimmapp.c | 26 +------------------------ reactos/dll/win32/msimtf/main.c | 21 +------------------- reactos/dll/win32/msimtf/precomp.h | 23 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 45 deletions(-) create mode 100644 reactos/dll/win32/msimtf/precomp.h diff --git a/reactos/dll/win32/msimtf/activeimmapp.c b/reactos/dll/win32/msimtf/activeimmapp.c index 4cd77a4ff70..30ce15f9d2b 100644 --- a/reactos/dll/win32/msimtf/activeimmapp.c +++ b/reactos/dll/win32/msimtf/activeimmapp.c @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include - -#include - -#define COBJMACROS - -#include -#include -#include -//#include "winreg.h" -//#include "winuser.h" -//#include "winerror.h" -#include -#include -//#include "imm.h" - -//#include "wine/unicode.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(msimtf); +#include "precomp.h" typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; diff --git a/reactos/dll/win32/msimtf/main.c b/reactos/dll/win32/msimtf/main.c index 6ea02beeacf..a834fdc86fd 100644 --- a/reactos/dll/win32/msimtf/main.c +++ b/reactos/dll/win32/msimtf/main.c @@ -16,28 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -#include - -#include -//#include - -#define COBJMACROS - -#include -#include -#include -//#include "winuser.h" -#include #include -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(msimtf); extern HRESULT ActiveIMMApp_Constructor(IUnknown *punkOuter, IUnknown **ppOut); diff --git a/reactos/dll/win32/msimtf/precomp.h b/reactos/dll/win32/msimtf/precomp.h new file mode 100644 index 00000000000..bf62888ba14 --- /dev/null +++ b/reactos/dll/win32/msimtf/precomp.h @@ -0,0 +1,23 @@ +#ifndef _MSIMTF_PCH_ +#define _MSIMTF_PCH_ + +#include + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include +#include +#include +#include +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(msimtf); + +#endif /* _MSIMTF_PCH_ */ From 4c38d2c309bd0db815a572c70bc6f4292235d3ee Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Jan 2014 18:00:48 +0000 Subject: [PATCH 030/124] [MSPORTS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61789 --- reactos/dll/win32/msports/classinst.c | 5 +++++ reactos/dll/win32/msports/internal.h | 2 +- reactos/dll/win32/msports/precomp.h | 11 +++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/msports/classinst.c b/reactos/dll/win32/msports/classinst.c index f433b798321..fa369b2c3a7 100644 --- a/reactos/dll/win32/msports/classinst.c +++ b/reactos/dll/win32/msports/classinst.c @@ -8,6 +8,11 @@ #include "precomp.h" +#include + +#define NTOS_MODE_USER +#include + typedef enum _PORT_TYPE { UnknownPort, diff --git a/reactos/dll/win32/msports/internal.h b/reactos/dll/win32/msports/internal.h index 8f67052f938..3bf949ecf29 100644 --- a/reactos/dll/win32/msports/internal.h +++ b/reactos/dll/win32/msports/internal.h @@ -6,4 +6,4 @@ * COPYRIGHT: Copyright 2011 Eric Kohl */ -extern HINSTANCE hInstance; \ No newline at end of file +extern HINSTANCE hInstance; diff --git a/reactos/dll/win32/msports/precomp.h b/reactos/dll/win32/msports/precomp.h index 891f14c2c2c..e9f5d9193e0 100644 --- a/reactos/dll/win32/msports/precomp.h +++ b/reactos/dll/win32/msports/precomp.h @@ -1,16 +1,19 @@ -#define WIN32_NO_STATUS #include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #include #include -#include -#include #include #include #include -WINE_DEFAULT_DEBUG_CHANNEL(msports); #include "internal.h" #include "resource.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msports); From 0be7d31f221288a4457e751419bbae67abed90c6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Jan 2014 18:03:28 +0000 Subject: [PATCH 031/124] [MSVFW32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 svn path=/trunk/; revision=61790 --- reactos/dll/win32/msvfw32/drawdib.c | 16 +-------- reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_De.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_En.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_He.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_It.rc | 4 +-- reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_No.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc | 2 -- reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc | 2 -- reactos/dll/win32/msvfw32/mciwnd.c | 13 +------- reactos/dll/win32/msvfw32/msvideo_main.c | 22 +++---------- reactos/dll/win32/msvfw32/msvideo_private.h | 27 +++++++--------- reactos/dll/win32/msvfw32/resource.h | 34 ++++++++++++++++++++ reactos/dll/win32/msvfw32/rsrc.rc | 7 ++-- 27 files changed, 58 insertions(+), 105 deletions(-) create mode 100644 reactos/dll/win32/msvfw32/resource.h diff --git a/reactos/dll/win32/msvfw32/drawdib.c b/reactos/dll/win32/msvfw32/drawdib.c index 6acec39bd2a..cc22b4444ef 100644 --- a/reactos/dll/win32/msvfw32/drawdib.c +++ b/reactos/dll/win32/msvfw32/drawdib.c @@ -20,21 +20,7 @@ * Handle palettes */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include -//#include - -#include -#include -#include -//#include "winuser.h" -#include - -#include +#include "msvideo_private.h" WINE_DEFAULT_DEBUG_CHANNEL(msvideo); diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc index 185528593b8..a5eb41d343a 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc index ce99f640479..54b915ffc31 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc index 7668a7f0b06..e1ed5c35c37 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc index e763a5263dd..813463d8c2b 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc index 5fa94a707c4..28b2841dc90 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc index 41694638f30..0394c0e0888 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc index 70bf4d97006..7038ed0d514 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc index 8d8656135b1..67481e5b68c 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc @@ -16,9 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - -/*UTF-8*/ +/* UTF-8 */ #pragma code_page(65001) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc index 04227491b3a..aaf0ae67689 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc index 1518d467966..2db5576097d 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc index bdd6a48f05a..e0372596c50 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc index 7905b7a3f8a..4dcc1416937 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc index 642c853fd1c..0a3675e054c 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 207, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc index b12b516e09f..e6b4f9b3022 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc index 77302d67cdc..2f6e5934e18 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc index fd3d4096087..24c6624ca48 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc index 6ea6aa4be0b..2cd211d3efe 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc index 6d28bb1ff05..c329279ec88 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc index b02d144c0ad..1d06aebace2 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc index 5c26a82a00b..38828690d06 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc index ad960d132b0..92ba6362ea1 100644 --- a/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc +++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/msvfw32/mciwnd.c b/reactos/dll/win32/msvfw32/mciwnd.c index b221e8a855c..6138afb09bf 100644 --- a/reactos/dll/win32/msvfw32/mciwnd.c +++ b/reactos/dll/win32/msvfw32/mciwnd.c @@ -21,23 +21,12 @@ * Add support for MCIWNDF_RECORD. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "msvideo_private.h" -#include - -#include -#include -//#include "winnls.h" -#include -//#include "winuser.h" #include -#include #include #include #include -#include WINE_DEFAULT_DEBUG_CHANNEL(mci); diff --git a/reactos/dll/win32/msvfw32/msvideo_main.c b/reactos/dll/win32/msvfw32/msvideo_main.c index c45fd31f96a..0b6442003ce 100644 --- a/reactos/dll/win32/msvfw32/msvideo_main.c +++ b/reactos/dll/win32/msvfw32/msvideo_main.c @@ -26,24 +26,12 @@ * - no thread safety */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include -//#include - -#include -#include -#include -#include -#include -#include -#include -#include #include "msvideo_private.h" -#include + +#include +#include + +#include "resource.h" /* Drivers32 settings */ #define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32" diff --git a/reactos/dll/win32/msvfw32/msvideo_private.h b/reactos/dll/win32/msvfw32/msvideo_private.h index 4ca97806e44..f06d4f17de6 100644 --- a/reactos/dll/win32/msvfw32/msvideo_private.h +++ b/reactos/dll/win32/msvfw32/msvideo_private.h @@ -19,12 +19,22 @@ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +#include +#include +#include +#include + +#include #define ICM_CHOOSE_COMPRESSOR 1 #define IDC_COMP_LIST 880 -#define IDS_FULLFRAMES 901 /* HIC struct (same layout as Win95 one) */ typedef struct tagWINE_HIC { @@ -46,17 +56,4 @@ typedef struct tagWINE_HIC { extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN; -#define IDC_CONFIGURE 882 -#define IDC_ABOUT 883 - -#define IDC_QUALITY_SCROLL 884 -#define IDC_QUALITY_TXT 886 - -#define IDC_KEYFRAME_CHECKBOX 887 -#define IDC_KEYFRAME 888 -#define IDC_KEYFRAME_FRAMES 889 -#define IDC_DATARATE_CHECKBOX 894 -#define IDC_DATARATE 895 -#define IDC_DATARATE_KB 896 - #endif /* __WINE_MSVIDEO_PRIVATE_H */ diff --git a/reactos/dll/win32/msvfw32/resource.h b/reactos/dll/win32/msvfw32/resource.h new file mode 100644 index 00000000000..2309c61014c --- /dev/null +++ b/reactos/dll/win32/msvfw32/resource.h @@ -0,0 +1,34 @@ +/* + * Copyright 1999 Marcus Meissner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma once + +#define IDS_FULLFRAMES 901 + +#define IDC_CONFIGURE 882 +#define IDC_ABOUT 883 + +#define IDC_QUALITY_SCROLL 884 +#define IDC_QUALITY_TXT 886 + +#define IDC_KEYFRAME_CHECKBOX 887 +#define IDC_KEYFRAME 888 +#define IDC_KEYFRAME_FRAMES 889 +#define IDC_DATARATE_CHECKBOX 894 +#define IDC_DATARATE 895 +#define IDC_DATARATE_KB 896 diff --git a/reactos/dll/win32/msvfw32/rsrc.rc b/reactos/dll/win32/msvfw32/rsrc.rc index 00a16381d5c..a80e8e67aed 100644 --- a/reactos/dll/win32/msvfw32/rsrc.rc +++ b/reactos/dll/win32/msvfw32/rsrc.rc @@ -16,9 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winuser.h" -//#include "msvideo_private.h" +#include +#include + +#include "resource.h" #ifdef LANGUAGE_DA_DK #include "lang/msvfw32_Da.rc" From 3dc50e3afcc5533cd8c0303ac818d48e15a86271 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Jan 2014 18:18:39 +0000 Subject: [PATCH 032/124] [MSWSOCK] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61791 --- reactos/dll/win32/mswsock/extensions.c | 3 +++ reactos/dll/win32/mswsock/precomp.h | 7 ++----- reactos/dll/win32/mswsock/stubs.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/mswsock/extensions.c b/reactos/dll/win32/mswsock/extensions.c index 30642672b97..f6b857bd3eb 100644 --- a/reactos/dll/win32/mswsock/extensions.c +++ b/reactos/dll/win32/mswsock/extensions.c @@ -9,6 +9,9 @@ #include "precomp.h" +#include +#include + /* * @implemented */ diff --git a/reactos/dll/win32/mswsock/precomp.h b/reactos/dll/win32/mswsock/precomp.h index 4faed6bf939..e2fddb508f1 100644 --- a/reactos/dll/win32/mswsock/precomp.h +++ b/reactos/dll/win32/mswsock/precomp.h @@ -1,11 +1,8 @@ +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include #include #include -#include -#include -#include -#include diff --git a/reactos/dll/win32/mswsock/stubs.c b/reactos/dll/win32/mswsock/stubs.c index 7661bee08fb..ceecbf5562f 100644 --- a/reactos/dll/win32/mswsock/stubs.c +++ b/reactos/dll/win32/mswsock/stubs.c @@ -9,6 +9,9 @@ #include "precomp.h" +#include +#include + typedef DWORD (* LPFN_NSPAPI)(VOID); typedef struct _NS_ROUTINE { DWORD dwFunctionCount; From 6e7e5845895d11b0c52a1769ba917eca0dcfaa10 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Jan 2014 20:15:05 +0000 Subject: [PATCH 033/124] [MSXML3] * Move some inclusions to the main header. CORE-7716 svn path=/trunk/; revision=61792 --- reactos/dll/win32/msxml3/bsc.c | 4 ---- reactos/dll/win32/msxml3/dispex.c | 2 -- reactos/dll/win32/msxml3/domdoc.c | 2 -- reactos/dll/win32/msxml3/httprequest.c | 3 --- reactos/dll/win32/msxml3/mxnamespace.c | 2 -- reactos/dll/win32/msxml3/precomp.h | 7 ++++++- reactos/dll/win32/msxml3/saxreader.c | 2 -- reactos/dll/win32/msxml3/xmldoc.c | 4 ---- reactos/dll/win32/msxml3/xslpattern.tab.c | 7 ++----- reactos/dll/win32/msxml3/xslpattern.yy.c | 5 +---- 10 files changed, 9 insertions(+), 29 deletions(-) diff --git a/reactos/dll/win32/msxml3/bsc.c b/reactos/dll/win32/msxml3/bsc.c index 2bfce0aff38..b660d5bfa19 100644 --- a/reactos/dll/win32/msxml3/bsc.c +++ b/reactos/dll/win32/msxml3/bsc.c @@ -18,10 +18,6 @@ #include "precomp.h" -#include -#include -#include - struct bsc_t { IBindStatusCallback IBindStatusCallback_iface; diff --git a/reactos/dll/win32/msxml3/dispex.c b/reactos/dll/win32/msxml3/dispex.c index 427f9601f9f..578d052f5b4 100644 --- a/reactos/dll/win32/msxml3/dispex.c +++ b/reactos/dll/win32/msxml3/dispex.c @@ -18,8 +18,6 @@ #include "precomp.h" -#include - static CRITICAL_SECTION cs_dispex_static_data; static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = { diff --git a/reactos/dll/win32/msxml3/domdoc.c b/reactos/dll/win32/msxml3/domdoc.c index 36d65731402..db25d5c558b 100644 --- a/reactos/dll/win32/msxml3/domdoc.c +++ b/reactos/dll/win32/msxml3/domdoc.c @@ -33,8 +33,6 @@ #include #include -#include - #ifdef HAVE_LIBXML2 /* not defined in older versions */ diff --git a/reactos/dll/win32/msxml3/httprequest.c b/reactos/dll/win32/msxml3/httprequest.c index 992dad0a8ca..8f8e64495f7 100644 --- a/reactos/dll/win32/msxml3/httprequest.c +++ b/reactos/dll/win32/msxml3/httprequest.c @@ -22,13 +22,10 @@ #include "precomp.h" #include -#include #include #include #include -#include - #ifdef HAVE_LIBXML2 static const WCHAR colspaceW[] = {':',' ',0}; diff --git a/reactos/dll/win32/msxml3/mxnamespace.c b/reactos/dll/win32/msxml3/mxnamespace.c index db021b9f12d..69a7cbea0a6 100644 --- a/reactos/dll/win32/msxml3/mxnamespace.c +++ b/reactos/dll/win32/msxml3/mxnamespace.c @@ -20,8 +20,6 @@ #include "precomp.h" -#include - struct ns { BSTR prefix; diff --git a/reactos/dll/win32/msxml3/precomp.h b/reactos/dll/win32/msxml3/precomp.h index 89cd273d282..d272c70203c 100644 --- a/reactos/dll/win32/msxml3/precomp.h +++ b/reactos/dll/win32/msxml3/precomp.h @@ -15,12 +15,17 @@ #include #include +#include #include #include +#include +#include #include -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include #include "msxml_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + #endif /* _MSXML3_PCH_ */ diff --git a/reactos/dll/win32/msxml3/saxreader.c b/reactos/dll/win32/msxml3/saxreader.c index 3a02dc971e1..4ba8c18eee0 100644 --- a/reactos/dll/win32/msxml3/saxreader.c +++ b/reactos/dll/win32/msxml3/saxreader.c @@ -25,8 +25,6 @@ # include #endif -#include - #ifdef HAVE_LIBXML2 typedef enum diff --git a/reactos/dll/win32/msxml3/xmldoc.c b/reactos/dll/win32/msxml3/xmldoc.c index f33b508a776..bb12bca2bb4 100644 --- a/reactos/dll/win32/msxml3/xmldoc.c +++ b/reactos/dll/win32/msxml3/xmldoc.c @@ -20,10 +20,6 @@ #include "precomp.h" -#include -#include -#include - #ifdef HAVE_LIBXML2 /* FIXME: IXMLDocument needs to implement diff --git a/reactos/dll/win32/msxml3/xslpattern.tab.c b/reactos/dll/win32/msxml3/xslpattern.tab.c index 70d9f382697..9e75e8be3cd 100644 --- a/reactos/dll/win32/msxml3/xslpattern.tab.c +++ b/reactos/dll/win32/msxml3/xslpattern.tab.c @@ -78,16 +78,13 @@ /* Line 189 of yacc.c */ #line 21 "xslpattern.y" -#include +#include "precomp.h" + #include #ifdef HAVE_LIBXML2 #include "xslpattern.h" #include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - static const xmlChar NameTest_mod_pre[] = "*[name()='"; static const xmlChar NameTest_mod_post[] = "']"; diff --git a/reactos/dll/win32/msxml3/xslpattern.yy.c b/reactos/dll/win32/msxml3/xslpattern.yy.c index f61ced65b8a..01b7488f94b 100644 --- a/reactos/dll/win32/msxml3/xslpattern.yy.c +++ b/reactos/dll/win32/msxml3/xslpattern.yy.c @@ -526,16 +526,13 @@ static yyconst flex_int16_t yy_chk[178] = * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #line 22 "xslpattern.l" -#include "config.h" +#include "precomp.h" #include "wine/port.h" #ifdef HAVE_LIBXML2 #include "xslpattern.h" #include "xslpattern.tab.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #define SCAN xslpattern_get_extra(yyscanner) From 12519e3de823fa202511c2aa64d03d2adbbaf754 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Jan 2014 20:24:47 +0000 Subject: [PATCH 034/124] [NETAPI32] * Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header. CORE-7716 svn path=/trunk/; revision=61793 --- reactos/dll/win32/netapi32/access.c | 1 - reactos/dll/win32/netapi32/browsr.c | 2 ++ reactos/dll/win32/netapi32/ds.c | 3 +++ reactos/dll/win32/netapi32/group.c | 1 - reactos/dll/win32/netapi32/local_group.c | 1 - reactos/dll/win32/netapi32/misc.c | 3 --- reactos/dll/win32/netapi32/nbcmdqueue.c | 5 ++--- reactos/dll/win32/netapi32/nbcmdqueue.h | 9 -------- reactos/dll/win32/netapi32/nbnamecache.c | 5 +---- reactos/dll/win32/netapi32/nbnamecache.h | 10 --------- reactos/dll/win32/netapi32/nbt.c | 14 +------------ reactos/dll/win32/netapi32/netapi32.c | 11 ++-------- reactos/dll/win32/netapi32/netapi32.h | 26 +++++++++++------------- reactos/dll/win32/netapi32/netbios.c | 6 +++--- reactos/dll/win32/netapi32/netbios.h | 6 ------ reactos/dll/win32/netapi32/share.c | 4 +--- reactos/dll/win32/netapi32/user.c | 4 +++- reactos/dll/win32/netapi32/wksta.c | 24 +++------------------- 18 files changed, 33 insertions(+), 102 deletions(-) diff --git a/reactos/dll/win32/netapi32/access.c b/reactos/dll/win32/netapi32/access.c index 968cd30469f..7ba2fa553cf 100644 --- a/reactos/dll/win32/netapi32/access.c +++ b/reactos/dll/win32/netapi32/access.c @@ -22,7 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - /************************************************************ * ACCESS_QueryAdminDisplayInformation * diff --git a/reactos/dll/win32/netapi32/browsr.c b/reactos/dll/win32/netapi32/browsr.c index 80c4b8d080d..9ccb3dc0eac 100644 --- a/reactos/dll/win32/netapi32/browsr.c +++ b/reactos/dll/win32/netapi32/browsr.c @@ -20,6 +20,8 @@ #include "netapi32.h" +#include + /************************************************************ * I_BrowserSetNetlogonState (NETAPI32.@) */ diff --git a/reactos/dll/win32/netapi32/ds.c b/reactos/dll/win32/netapi32/ds.c index 0707737895c..98caa95eeb0 100644 --- a/reactos/dll/win32/netapi32/ds.c +++ b/reactos/dll/win32/netapi32/ds.c @@ -20,6 +20,9 @@ #include "netapi32.h" +#include +#include + WINE_DEFAULT_DEBUG_CHANNEL(ds); DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName, diff --git a/reactos/dll/win32/netapi32/group.c b/reactos/dll/win32/netapi32/group.c index e8d1a920861..92627ece51a 100644 --- a/reactos/dll/win32/netapi32/group.c +++ b/reactos/dll/win32/netapi32/group.c @@ -22,7 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - /************************************************************ * NetGroupAdd (NETAPI32.@) * diff --git a/reactos/dll/win32/netapi32/local_group.c b/reactos/dll/win32/netapi32/local_group.c index c3a623a34f2..6670b395513 100644 --- a/reactos/dll/win32/netapi32/local_group.c +++ b/reactos/dll/win32/netapi32/local_group.c @@ -22,7 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - typedef enum _ENUM_PHASE { BuiltinPhase, diff --git a/reactos/dll/win32/netapi32/misc.c b/reactos/dll/win32/netapi32/misc.c index 8f12992a206..c864e17e0ae 100644 --- a/reactos/dll/win32/netapi32/misc.c +++ b/reactos/dll/win32/netapi32/misc.c @@ -11,15 +11,12 @@ #include "netapi32.h" - WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - /* GLOBALS *******************************************************************/ static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - /* FUNCTIONS *****************************************************************/ NTSTATUS diff --git a/reactos/dll/win32/netapi32/nbcmdqueue.c b/reactos/dll/win32/netapi32/nbcmdqueue.c index e201a39ca73..7e95010817c 100644 --- a/reactos/dll/win32/netapi32/nbcmdqueue.c +++ b/reactos/dll/win32/netapi32/nbcmdqueue.c @@ -14,9 +14,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include "nbcmdqueue.h" + +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); diff --git a/reactos/dll/win32/netapi32/nbcmdqueue.h b/reactos/dll/win32/netapi32/nbcmdqueue.h index a595f83f3f6..8bd45b1e0be 100644 --- a/reactos/dll/win32/netapi32/nbcmdqueue.h +++ b/reactos/dll/win32/netapi32/nbcmdqueue.h @@ -17,15 +17,6 @@ #ifndef __NBCMDQUEUE_H__ #define __NBCMDQUEUE_H__ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -#include -#include -#include - /* This file defines a queue of pending NetBIOS commands. The queue operations * are thread safe, with the exception of NBCmdQueueDestroy: ensure no other * threads are manipulating the queue when calling NBCmdQueueDestroy. diff --git a/reactos/dll/win32/netapi32/nbnamecache.c b/reactos/dll/win32/netapi32/nbnamecache.c index 0fcbfbe434f..ae726e9ab59 100644 --- a/reactos/dll/win32/netapi32/nbnamecache.c +++ b/reactos/dll/win32/netapi32/nbnamecache.c @@ -19,10 +19,7 @@ * rather more efficient than not having a name cache at all. */ -#include -//#include "wine/port.h" - -#include "nbnamecache.h" +#include "netapi32.h" typedef struct _NBNameCacheNode { diff --git a/reactos/dll/win32/netapi32/nbnamecache.h b/reactos/dll/win32/netapi32/nbnamecache.h index b8379c8fe21..bfdbb33abbe 100644 --- a/reactos/dll/win32/netapi32/nbnamecache.h +++ b/reactos/dll/win32/netapi32/nbnamecache.h @@ -17,16 +17,6 @@ #ifndef __WINE_NBNAMECACHE_H #define __WINE_NBNAMECACHE_H -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include - -#include -#include -#include - struct NBNameCache; /* Represents an entry in the name cache. If the NetBIOS name is known, it's diff --git a/reactos/dll/win32/netapi32/nbt.c b/reactos/dll/win32/netapi32/nbt.c index 74cde806e5f..d0ae2853b49 100644 --- a/reactos/dll/win32/netapi32/nbt.c +++ b/reactos/dll/win32/netapi32/nbt.c @@ -65,22 +65,10 @@ * See also other FIXMEs in the code. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "netapi32.h" -#include -#include - -#include -#include #include -#include #include -#include - -#include "netbios.h" -#include "nbnamecache.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); diff --git a/reactos/dll/win32/netapi32/netapi32.c b/reactos/dll/win32/netapi32/netapi32.c index 343f3b7b7fc..d81953d4a97 100644 --- a/reactos/dll/win32/netapi32/netapi32.c +++ b/reactos/dll/win32/netapi32/netapi32.c @@ -16,17 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#include - -#include -//#include "lm.h" -#include "netbios.h" - -#define NTOS_MODE_USER -#include #include "netapi32.h" +#include + WINE_DEFAULT_DEBUG_CHANNEL(netbios); static HMODULE NETAPI32_hModule; diff --git a/reactos/dll/win32/netapi32/netapi32.h b/reactos/dll/win32/netapi32/netapi32.h index 65970fc1867..c33f9336eb0 100644 --- a/reactos/dll/win32/netapi32/netapi32.h +++ b/reactos/dll/win32/netapi32/netapi32.h @@ -1,34 +1,32 @@ - #ifndef __WINE_NETAPI32_H__ #define __WINE_NETAPI32_H__ +#include + #include -//#include "ntstatus.h" #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include -//#include "winerror.h" -//#include "lmcons.h" #include #include -#include #include -//#include "lmshare.h" -//#include "lmuse.h" #include -#include -#include +#include +#include + #include -//#include "wine/unicode.h" -#include #define NTOS_MODE_USER -#include -#include #include + #include +#include "nbnamecache.h" +#include "netbios.h" NET_API_STATUS WINAPI @@ -64,4 +62,4 @@ BuildSidFromSidAndRid(IN PSID SrcSid, BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); -#endif \ No newline at end of file +#endif /* __WINE_NETAPI32_H__ */ diff --git a/reactos/dll/win32/netapi32/netbios.c b/reactos/dll/win32/netapi32/netbios.c index e835baf9b0c..8cb1e63c1ea 100644 --- a/reactos/dll/win32/netapi32/netbios.c +++ b/reactos/dll/win32/netapi32/netbios.c @@ -14,10 +14,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include + +#include "netapi32.h" + #include "nbcmdqueue.h" -#include "netbios.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); diff --git a/reactos/dll/win32/netapi32/netbios.h b/reactos/dll/win32/netapi32/netbios.h index 6adbd3d126f..b211af28b10 100644 --- a/reactos/dll/win32/netapi32/netbios.h +++ b/reactos/dll/win32/netapi32/netbios.h @@ -17,12 +17,6 @@ #ifndef __WINE_NETBIOS_H__ #define __WINE_NETBIOS_H__ -//#include -#include -#include -#include -#include - /* This file describes the interface WINE's NetBIOS implementation uses to * interact with a transport implementation (where a transport might be * NetBIOS-over-TCP/IP (aka NetBT, NBT), NetBIOS-over-IPX, etc.) diff --git a/reactos/dll/win32/netapi32/share.c b/reactos/dll/win32/netapi32/share.c index b687a34b429..a83718c77c9 100644 --- a/reactos/dll/win32/netapi32/share.c +++ b/reactos/dll/win32/netapi32/share.c @@ -15,9 +15,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -//#include "winerror.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(share); diff --git a/reactos/dll/win32/netapi32/user.c b/reactos/dll/win32/netapi32/user.c index 56252bae5f9..6452a4ad225 100644 --- a/reactos/dll/win32/netapi32/user.c +++ b/reactos/dll/win32/netapi32/user.c @@ -29,8 +29,10 @@ #include "netapi32.h" -WINE_DEFAULT_DEBUG_CHANNEL(netapi32); +#include +#include +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); typedef struct _ENUM_CONTEXT { diff --git a/reactos/dll/win32/netapi32/wksta.c b/reactos/dll/win32/netapi32/wksta.c index 836d34a14e7..3512d31c06c 100644 --- a/reactos/dll/win32/netapi32/wksta.c +++ b/reactos/dll/win32/netapi32/wksta.c @@ -18,28 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -//#include "wine/port.h" +#include "netapi32.h" -#include -//#include -#include -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include -#include -//#include "winsock2.h" -//#include "nb30.h" -//#include "lmcons.h" -//#include "lmapibuf.h" -//#include "lmerr.h" -//#include "lmwksta.h" -#include -//#include "winerror.h" -#include -#include "netbios.h" -#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(netapi32); From b41d73f8351223fe8c544ce4dbb5503a231b2009 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 10:45:26 +0000 Subject: [PATCH 035/124] [NETCFGX] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61798 --- reactos/dll/win32/netcfgx/netcfgx.c | 6 ++++ reactos/dll/win32/netcfgx/precomp.h | 30 +++++++------------- reactos/dll/win32/netcfgx/tcpipconf_notify.c | 6 ++++ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/reactos/dll/win32/netcfgx/netcfgx.c b/reactos/dll/win32/netcfgx/netcfgx.c index dfe665be705..3ae083a5b26 100644 --- a/reactos/dll/win32/netcfgx/netcfgx.c +++ b/reactos/dll/win32/netcfgx/netcfgx.c @@ -9,6 +9,12 @@ #include "precomp.h" +#include + +#define NTOS_MODE_USER +#include +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/netcfgx/precomp.h b/reactos/dll/win32/netcfgx/precomp.h index a5000fd6b4e..22e86236a90 100644 --- a/reactos/dll/win32/netcfgx/precomp.h +++ b/reactos/dll/win32/netcfgx/precomp.h @@ -1,37 +1,27 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include #include -#include #include -#include +#include #include -#include -#define NTOS_MODE_USER -#include -#include #include #include -#include -#include -#include -#include -#include #include -#include "resource.h" -//#include - -//#include #include +#include "resource.h" + typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); typedef struct { REFIID riid; @@ -72,4 +62,4 @@ HRESULT WINAPI TcpipConfigNotify_Constructor (IUnknown * pUnkOuter, REFIID riid, extern const GUID CLSID_TcpipConfigNotifyObject; -#endif +#endif /* _PRECOMP_H__ */ diff --git a/reactos/dll/win32/netcfgx/tcpipconf_notify.c b/reactos/dll/win32/netcfgx/tcpipconf_notify.c index cf4966d1b00..7f53c298f5f 100644 --- a/reactos/dll/win32/netcfgx/tcpipconf_notify.c +++ b/reactos/dll/win32/netcfgx/tcpipconf_notify.c @@ -1,5 +1,11 @@ #include "precomp.h" +#include +#include +#include +#include +#include + typedef struct { DWORD EnableSecurityFilters; From 52f491e006d49fc526c2f3a09e357e023a70ce12 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 10:59:27 +0000 Subject: [PATCH 036/124] [NETSHELL] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61799 --- reactos/dll/win32/netshell/enumlist.h | 2 ++ reactos/dll/win32/netshell/lanconnectui.cpp | 3 +++ reactos/dll/win32/netshell/lanstatusui.cpp | 2 ++ reactos/dll/win32/netshell/netshell.cpp | 2 ++ reactos/dll/win32/netshell/precomp.h | 12 ++++-------- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/netshell/enumlist.h b/reactos/dll/win32/netshell/enumlist.h index 3d6ff3709c3..8557e6413c1 100644 --- a/reactos/dll/win32/netshell/enumlist.h +++ b/reactos/dll/win32/netshell/enumlist.h @@ -1,3 +1,5 @@ +#pragma once + typedef struct tagGUIDStruct { BYTE dummy; /* offset 01 is unknown */ diff --git a/reactos/dll/win32/netshell/lanconnectui.cpp b/reactos/dll/win32/netshell/lanconnectui.cpp index 691b40e010f..0fe78fa8c99 100644 --- a/reactos/dll/win32/netshell/lanconnectui.cpp +++ b/reactos/dll/win32/netshell/lanconnectui.cpp @@ -1,5 +1,8 @@ #include "precomp.h" +#include +#include + /// CLASSID /// {7007ACC5-3202-11D1-AAD2-00805FC1270E} /// open network properties and wlan properties diff --git a/reactos/dll/win32/netshell/lanstatusui.cpp b/reactos/dll/win32/netshell/lanstatusui.cpp index 334927d8725..ca4f0d4b77d 100644 --- a/reactos/dll/win32/netshell/lanstatusui.cpp +++ b/reactos/dll/win32/netshell/lanstatusui.cpp @@ -1,5 +1,7 @@ #include "precomp.h" +#include + /// CLSID /// HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{7007ACCF-3202-11D1-AAD2-00805FC1270E} // IID B722BCCB-4E68-101B-A2BC-00AA00404770 diff --git a/reactos/dll/win32/netshell/netshell.cpp b/reactos/dll/win32/netshell/netshell.cpp index 8da0dc2e254..f40a8655780 100644 --- a/reactos/dll/win32/netshell/netshell.cpp +++ b/reactos/dll/win32/netshell/netshell.cpp @@ -1,5 +1,7 @@ #include "precomp.h" +#include + HINSTANCE netshell_hInstance; const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; diff --git a/reactos/dll/win32/netshell/precomp.h b/reactos/dll/win32/netshell/precomp.h index f156176d3b3..00e33838386 100644 --- a/reactos/dll/win32/netshell/precomp.h +++ b/reactos/dll/win32/netshell/precomp.h @@ -1,26 +1,23 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include #include -#include #include +#include #include -#include #include #include #include -#include #include #include #include #include -#include -#include #include WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -60,7 +57,6 @@ extern HINSTANCE netshell_hInstance; extern const GUID CLSID_NetworkConnections; extern const GUID CLSID_LANConnectUI; extern const GUID CLSID_LanConnectStatusUI; -extern const GUID GUID_DEVCLASS_NET; /* shfldr_netconnect.c */ HRESULT ShowNetConnectionProperties(INetConnection * pNetConnect, HWND hwnd); @@ -91,4 +87,4 @@ HRESULT WINAPI LanConnectStatusUI_Constructor(IUnknown *pUnkOuter, REFIID riid, #include "enumlist.h" -#endif +#endif /* _PRECOMP_H__ */ From 7f3ef2dfd59312f771bd0a836055a6993e8cde00 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 11:32:30 +0000 Subject: [PATCH 037/124] [NEWDEV] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61800 --- reactos/dll/win32/newdev/newdev.c | 3 +++ reactos/dll/win32/newdev/newdev_private.h | 9 ++------- reactos/dll/win32/newdev/wizard.c | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/newdev/newdev.c b/reactos/dll/win32/newdev/newdev.c index d7f375142fa..72f5bccaac8 100644 --- a/reactos/dll/win32/newdev/newdev.c +++ b/reactos/dll/win32/newdev/newdev.c @@ -22,6 +22,9 @@ #include "newdev_private.h" +#include +#include + /* Global variables */ HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/newdev/newdev_private.h b/reactos/dll/win32/newdev/newdev_private.h index e622c38132d..1161203b3f1 100644 --- a/reactos/dll/win32/newdev/newdev_private.h +++ b/reactos/dll/win32/newdev/newdev_private.h @@ -1,31 +1,26 @@ #ifndef __NEWDEV_PRIVATE_H #define __NEWDEV_PRIVATE_H +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H #define COBJMACROS -#include #include #include #include #include #include -#include #include -#include #include #include -#include -#include #include WINE_DEFAULT_DEBUG_CHANNEL(newdev); -#include - #include "resource.h" extern HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/newdev/wizard.c b/reactos/dll/win32/newdev/wizard.c index 3e834c7955a..12be7e0dedc 100644 --- a/reactos/dll/win32/newdev/wizard.c +++ b/reactos/dll/win32/newdev/wizard.c @@ -20,6 +20,10 @@ #include "newdev_private.h" +#include +#include +#include + HANDLE hThread; static VOID From 3d7942351bbf118ea0b5ca51a0c78bf543924d0c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 11:59:58 +0000 Subject: [PATCH 038/124] [OLEAUT32] * Move some inclusions to the main header. CORE-7716 svn path=/trunk/; revision=61801 --- reactos/dll/win32/oleaut32/olefont.c | 2 -- reactos/dll/win32/oleaut32/olepicture.c | 1 - reactos/dll/win32/oleaut32/precomp.h | 5 +++-- reactos/dll/win32/oleaut32/tmarshal.c | 2 -- reactos/dll/win32/oleaut32/typelib.c | 2 -- reactos/dll/win32/oleaut32/usrmarshal.c | 2 -- reactos/dll/win32/oleaut32/variant.c | 2 -- reactos/dll/win32/oleaut32/vartype.c | 2 -- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/reactos/dll/win32/oleaut32/olefont.c b/reactos/dll/win32/oleaut32/olefont.c index 770d6597f3d..e6102195aec 100644 --- a/reactos/dll/win32/oleaut32/olefont.c +++ b/reactos/dll/win32/oleaut32/olefont.c @@ -24,8 +24,6 @@ #include "precomp.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(ole); /*********************************************************************** diff --git a/reactos/dll/win32/oleaut32/olepicture.c b/reactos/dll/win32/oleaut32/olepicture.c index f510d13202d..47667bf6480 100644 --- a/reactos/dll/win32/oleaut32/olepicture.c +++ b/reactos/dll/win32/oleaut32/olepicture.c @@ -42,7 +42,6 @@ # include #endif -#include #include #include diff --git a/reactos/dll/win32/oleaut32/precomp.h b/reactos/dll/win32/oleaut32/precomp.h index 9d390f862af..cc22ae27455 100644 --- a/reactos/dll/win32/oleaut32/precomp.h +++ b/reactos/dll/win32/oleaut32/precomp.h @@ -17,14 +17,15 @@ #include #include #include -#include +#include #include -#include #include +#include #include #include "connpt.h" #include "variant.h" +#include "resource.h" #endif /* _OLEAUT32_PCH_ */ diff --git a/reactos/dll/win32/oleaut32/tmarshal.c b/reactos/dll/win32/oleaut32/tmarshal.c index 82eee54ca7b..efeeb25aec2 100644 --- a/reactos/dll/win32/oleaut32/tmarshal.c +++ b/reactos/dll/win32/oleaut32/tmarshal.c @@ -23,8 +23,6 @@ #include "precomp.h" -#include - #include "typelib.h" #include diff --git a/reactos/dll/win32/oleaut32/typelib.c b/reactos/dll/win32/oleaut32/typelib.c index 48b5ff943ff..451c43f16da 100644 --- a/reactos/dll/win32/oleaut32/typelib.c +++ b/reactos/dll/win32/oleaut32/typelib.c @@ -54,8 +54,6 @@ #include "typelib.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib); diff --git a/reactos/dll/win32/oleaut32/usrmarshal.c b/reactos/dll/win32/oleaut32/usrmarshal.c index de9095141a5..37e6e617c62 100644 --- a/reactos/dll/win32/oleaut32/usrmarshal.c +++ b/reactos/dll/win32/oleaut32/usrmarshal.c @@ -21,8 +21,6 @@ #include "precomp.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(ole); #define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align))&~(_Align)) diff --git a/reactos/dll/win32/oleaut32/variant.c b/reactos/dll/win32/oleaut32/variant.c index 5329bae1a16..189840dbdeb 100644 --- a/reactos/dll/win32/oleaut32/variant.c +++ b/reactos/dll/win32/oleaut32/variant.c @@ -27,8 +27,6 @@ #include "precomp.h" -#include "resource.h" - WINE_DEFAULT_DEBUG_CHANNEL(variant); const char * const wine_vtypes[VT_CLSID+1] = diff --git a/reactos/dll/win32/oleaut32/vartype.c b/reactos/dll/win32/oleaut32/vartype.c index 9a24323da86..78cd6e32f82 100644 --- a/reactos/dll/win32/oleaut32/vartype.c +++ b/reactos/dll/win32/oleaut32/vartype.c @@ -20,8 +20,6 @@ #include "precomp.h" -#include "resource.h" - WINE_DEFAULT_DEBUG_CHANNEL(variant); extern HMODULE hProxyDll DECLSPEC_HIDDEN; From 6bd727485923f0db64992eec94f12519ad20d9f4 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 12:35:30 +0000 Subject: [PATCH 039/124] [RASADHLP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61802 --- reactos/dll/win32/rasadhlp/autodial.c | 5 ++--- reactos/dll/win32/rasadhlp/init.c | 3 --- reactos/dll/win32/rasadhlp/precomp.h | 16 ---------------- reactos/dll/win32/rasadhlp/winsock.c | 5 ++--- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/reactos/dll/win32/rasadhlp/autodial.c b/reactos/dll/win32/rasadhlp/autodial.c index 20e4d5a0535..e3729a4ca73 100644 --- a/reactos/dll/win32/rasadhlp/autodial.c +++ b/reactos/dll/win32/rasadhlp/autodial.c @@ -5,10 +5,10 @@ * PURPOSE: DLL Initialization */ -/* INCLUDES ******************************************************************/ #include "precomp.h" -/* DATA **********************************************************************/ +#include +#include /* FUNCTIONS *****************************************************************/ @@ -120,4 +120,3 @@ AcsHlpNoteNewConnection(IN PAUTODIAL_ADDR ConnectionAddress, /* Send it to the driver */ return AcsHlpSendCommand(&Command); } - diff --git a/reactos/dll/win32/rasadhlp/init.c b/reactos/dll/win32/rasadhlp/init.c index c0c05350aaa..f096ae48e5a 100644 --- a/reactos/dll/win32/rasadhlp/init.c +++ b/reactos/dll/win32/rasadhlp/init.c @@ -5,11 +5,8 @@ * PURPOSE: DLL Initialization */ -/* INCLUDES ******************************************************************/ #include "precomp.h" -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ BOOLEAN diff --git a/reactos/dll/win32/rasadhlp/precomp.h b/reactos/dll/win32/rasadhlp/precomp.h index 02fbd73724c..0d61664607e 100644 --- a/reactos/dll/win32/rasadhlp/precomp.h +++ b/reactos/dll/win32/rasadhlp/precomp.h @@ -1,10 +1,3 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/msafd.h - * PURPOSE: Ancillary Function Driver DLL header - */ - #define _WIN32_WINNT 0x502 #define _CRT_SECURE_NO_DEPRECATE #define WIN32_NO_STATUS @@ -16,19 +9,10 @@ /* PSDK Headers */ #include #include -#include #include -//#include #include #include -/* NDK */ -#include -#include - -/* Shared GUIDs */ -#include - /* These should go in rasadhlp.h */ #define FILE_DEVICE_ACD 0x000000F1 #define _ACD_CTL_CODE(function, method, access) \ diff --git a/reactos/dll/win32/rasadhlp/winsock.c b/reactos/dll/win32/rasadhlp/winsock.c index f85661d33e6..7e3e585a483 100644 --- a/reactos/dll/win32/rasadhlp/winsock.c +++ b/reactos/dll/win32/rasadhlp/winsock.c @@ -5,10 +5,10 @@ * PURPOSE: DLL Initialization */ -/* INCLUDES ******************************************************************/ #include "precomp.h" -/* DATA **********************************************************************/ +#include +#include /* FUNCTIONS *****************************************************************/ @@ -134,4 +134,3 @@ WSNoteSuccessfulHostentLookup(IN CONST CHAR FAR *Name, AutodialConnection.Ip4Address = Address; AcsHlpNoteNewConnection(&AutodialAdddress, &AutodialConnection); } - From 99527147cb86041bfe5fd34b9b1b8293c9f1a118 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 12:55:52 +0000 Subject: [PATCH 040/124] [SAMLIB] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61803 --- reactos/dll/win32/samlib/dllmain.c | 2 +- reactos/dll/win32/samlib/precomp.h | 10 +--------- reactos/dll/win32/samlib/samlib.c | 9 +++++++++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/reactos/dll/win32/samlib/dllmain.c b/reactos/dll/win32/samlib/dllmain.c index 99b7275e55c..630d1f998b5 100644 --- a/reactos/dll/win32/samlib/dllmain.c +++ b/reactos/dll/win32/samlib/dllmain.c @@ -24,7 +24,7 @@ * PROGRAMER: Eric Kohl */ -#include "precomp.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/samlib/precomp.h b/reactos/dll/win32/samlib/precomp.h index edec5427e65..e2fddb508f1 100644 --- a/reactos/dll/win32/samlib/precomp.h +++ b/reactos/dll/win32/samlib/precomp.h @@ -3,14 +3,6 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include #include - -#define NTOS_MODE_USER -#include -#include - -#include - -#include -WINE_DEFAULT_DEBUG_CHANNEL(samlib); diff --git a/reactos/dll/win32/samlib/samlib.c b/reactos/dll/win32/samlib/samlib.c index 00e00fe69b1..97a41792100 100644 --- a/reactos/dll/win32/samlib/samlib.c +++ b/reactos/dll/win32/samlib/samlib.c @@ -26,6 +26,15 @@ #include "precomp.h" +#define NTOS_MODE_USER +#include +#include +#include + +#include + +WINE_DEFAULT_DEBUG_CHANNEL(samlib); + NTSTATUS WINAPI SystemFunction006(LPCSTR password, From 8360ee1d2d2a222cc7f1f134f37da5e4c4fcd58e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 13:16:43 +0000 Subject: [PATCH 041/124] [SAMSRV] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61804 --- reactos/dll/win32/samsrv/registry.c | 3 +++ reactos/dll/win32/samsrv/samsrv.c | 2 ++ reactos/dll/win32/samsrv/samsrv.h | 14 ++------------ reactos/dll/win32/samsrv/setup.c | 4 ++++ reactos/dll/win32/samsrv/utils.c | 2 ++ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/reactos/dll/win32/samsrv/registry.c b/reactos/dll/win32/samsrv/registry.c index e84dadde88b..d27cb8eb036 100644 --- a/reactos/dll/win32/samsrv/registry.c +++ b/reactos/dll/win32/samsrv/registry.c @@ -9,6 +9,9 @@ #include "samsrv.h" +#include +#include + /* FUNCTIONS ***************************************************************/ static diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c index 19342d2091a..201d116a57f 100644 --- a/reactos/dll/win32/samsrv/samsrv.c +++ b/reactos/dll/win32/samsrv/samsrv.c @@ -19,6 +19,8 @@ #include "samsrv.h" +#include + /* GLOBALS *******************************************************************/ ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash; diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index 9ce7ff32cc0..36dd16587d2 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -9,32 +9,24 @@ #include #include -#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include #include #include -#include #define NTOS_MODE_USER -#include #include -#include #include #include -#include #include - -#include - #include #include WINE_DEFAULT_DEBUG_CHANNEL(samsrv); -#include "resources.h" - typedef enum _SAM_DB_OBJECT_TYPE { SamDbIgnoreObject, @@ -438,5 +430,3 @@ NTSTATUS WINAPI SystemFunction007(PUNICODE_STRING string, LPBYTE hash); - -/* EOF */ diff --git a/reactos/dll/win32/samsrv/setup.c b/reactos/dll/win32/samsrv/setup.c index 4ec43f7e4ba..2e5c970fec0 100644 --- a/reactos/dll/win32/samsrv/setup.c +++ b/reactos/dll/win32/samsrv/setup.c @@ -9,6 +9,10 @@ #include "samsrv.h" +#include + +#include "resources.h" + /* GLOBALS *****************************************************************/ #define TICKS_PER_SECOND 10000000LL diff --git a/reactos/dll/win32/samsrv/utils.c b/reactos/dll/win32/samsrv/utils.c index f18efa0505b..4d0f039fd41 100644 --- a/reactos/dll/win32/samsrv/utils.c +++ b/reactos/dll/win32/samsrv/utils.c @@ -9,6 +9,8 @@ #include "samsrv.h" +#include + /* FUNCTIONS ***************************************************************/ INT From 76350fef1c831e42d1b794da1d57eae7e7f7c89d Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 25 Jan 2014 13:55:08 +0000 Subject: [PATCH 042/124] [CRYPTLIB] Add a library for common encryption/hashing algorithms. Currently implements MD4, MD5, SHA1, RC4 (all taken from advapi32 with minor modifications) and AES (taken from OpenWrt Linux). The library is currently used by advapi32 only, but ksecdd will make use of it later as well. svn path=/trunk/; revision=61805 --- reactos/dll/win32/advapi32/CMakeLists.txt | 7 +- reactos/dll/win32/advapi32/crypt/crypt.c | 69 ++-- reactos/dll/win32/advapi32/crypt/crypt.h | 18 - reactos/dll/win32/advapi32/misc/sysfunc.c | 15 +- reactos/lib/CMakeLists.txt | 1 + reactos/lib/cryptlib/CMakeLists.txt | 9 + reactos/lib/cryptlib/README.txt | 29 ++ .../crypt/crypt_md4.c => lib/cryptlib/md4.c} | 66 +--- reactos/lib/cryptlib/md4.h | 19 ++ .../crypt/crypt_md5.c => lib/cryptlib/md5.c} | 20 +- reactos/lib/cryptlib/md5.h | 19 ++ reactos/lib/cryptlib/mvAesAlg.c | 317 ++++++++++++++++++ reactos/lib/cryptlib/mvAesAlg.h | 19 ++ reactos/lib/cryptlib/mvAesBoxes.dat | 123 +++++++ reactos/lib/cryptlib/mvOs.h | 7 + .../crypt/crypt_arc4.c => lib/cryptlib/rc4.c} | 36 +- reactos/lib/cryptlib/rc4.h | 13 + .../crypt/crypt_sha.c => lib/cryptlib/sha1.c} | 27 +- reactos/lib/cryptlib/sha1.h | 24 ++ reactos/lib/cryptlib/util.c | 26 ++ reactos/lib/cryptlib/util.h | 10 + 21 files changed, 679 insertions(+), 195 deletions(-) create mode 100644 reactos/lib/cryptlib/CMakeLists.txt create mode 100644 reactos/lib/cryptlib/README.txt rename reactos/{dll/win32/advapi32/crypt/crypt_md4.c => lib/cryptlib/md4.c} (80%) create mode 100644 reactos/lib/cryptlib/md4.h rename reactos/{dll/win32/advapi32/crypt/crypt_md5.c => lib/cryptlib/md5.c} (95%) create mode 100644 reactos/lib/cryptlib/md5.h create mode 100644 reactos/lib/cryptlib/mvAesAlg.c create mode 100644 reactos/lib/cryptlib/mvAesAlg.h create mode 100644 reactos/lib/cryptlib/mvAesBoxes.dat create mode 100644 reactos/lib/cryptlib/mvOs.h rename reactos/{dll/win32/advapi32/crypt/crypt_arc4.c => lib/cryptlib/rc4.c} (66%) create mode 100644 reactos/lib/cryptlib/rc4.h rename reactos/{dll/win32/advapi32/crypt/crypt_sha.c => lib/cryptlib/sha1.c} (92%) create mode 100644 reactos/lib/cryptlib/sha1.h create mode 100644 reactos/lib/cryptlib/util.c create mode 100644 reactos/lib/cryptlib/util.h diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index 50e74231036..db953400474 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -8,6 +8,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${REACTOS_SOURCE_DIR}/lib/cryptlib ${CMAKE_CURRENT_BINARY_DIR}) add_rpc_files(client @@ -17,12 +18,8 @@ add_rpc_files(client list(APPEND SOURCE crypt/crypt.c - crypt/crypt_arc4.c crypt/crypt_des.c crypt/crypt_lmhash.c - crypt/crypt_md4.c - crypt/crypt_md5.c - crypt/crypt_sha.c misc/dllmain.c misc/efs.c misc/hwprofiles.c @@ -56,7 +53,7 @@ list(APPEND SOURCE add_library(advapi32 SHARED ${SOURCE}) set_module_type(advapi32 win32dll UNICODE) -target_link_libraries(advapi32 wine ${PSEH_LIB}) +target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) add_delay_importlibs(advapi32 rpcrt4) add_importlibs(advapi32 secur32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/advapi32/crypt/crypt.c b/reactos/dll/win32/advapi32/crypt/crypt.c index 81b37c891e5..5d6266b3003 100644 --- a/reactos/dll/win32/advapi32/crypt/crypt.c +++ b/reactos/dll/win32/advapi32/crypt/crypt.c @@ -27,23 +27,6 @@ #include WINE_DEFAULT_DEBUG_CHANNEL(crypt); - -/* - * Note: this code is harmless on little-endian machines. - */ -VOID byteReverse(unsigned char *buf, unsigned longs) -{ - unsigned int t; - - do - { - t = (unsigned int)((unsigned)buf[3] << 8 | buf[2]) << 16 | - ((unsigned)buf[1] << 8 | buf[0]); - *(unsigned int *)buf = t; - buf += 4; - } while (--longs); -} - static HWND crypt_hWindow; #define CRYPT_Alloc(size) (LocalAlloc(LMEM_ZEROINIT, size)) @@ -323,7 +306,7 @@ static void CRYPT_CreateMachineGuid(void) * dwProvType [I] Crypto provider type to get a handle. * dwFlags [I] flags for the operation * - * RETURNS + * RETURNS * TRUE on success, FALSE on failure. */ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, @@ -347,7 +330,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, SetLastError(NTE_BAD_PROV_TYPE); return FALSE; } - + if (!phProv) { SetLastError(ERROR_INVALID_PARAMETER); @@ -583,7 +566,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, */ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags) { - PCRYPTPROV pProv = (PCRYPTPROV)hProv; + PCRYPTPROV pProv = (PCRYPTPROV)hProv; TRACE("(0x%lx, %p, %08x)\n", hProv, pdwReserved, dwFlags); @@ -636,7 +619,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) } pProv->refcount--; - if (pProv->refcount <= 0) + if (pProv->refcount <= 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; @@ -1144,10 +1127,10 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, { DWORD numkeys; WCHAR *provNameW; - + RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &numkeys, pcbProvName, NULL, NULL, NULL, NULL, NULL, NULL); - + if (!(provNameW = CRYPT_Alloc(*pcbProvName * sizeof(WCHAR)))) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1169,7 +1152,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, DWORD size = sizeof(DWORD); DWORD result; HKEY subkey; - + result = RegEnumKeyW(hKey, dwIndex, pszProvName, *pcbProvName / sizeof(WCHAR)); if (result) { @@ -1313,7 +1296,7 @@ BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, *pdwProvType += (*(--ch) - '0') * 10; *pdwProvType += (*(--ch) - '0') * 100; CRYPT_Free(keyname); - + result = RegQueryValueExW(hSubkey, typenameW, NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName); if (result) { @@ -1366,7 +1349,7 @@ BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, /****************************************************************************** * CryptExportKey (ADVAPI32.@) - * + * * Exports a cryptographic key from a CSP. * * PARAMS @@ -1507,8 +1490,8 @@ BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, return FALSE; } CRYPT_Free(keyname); - - result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); + + result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); RegCloseKey(hKey); if (result) @@ -1517,10 +1500,10 @@ BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, SetLastError(NTE_PROV_TYPE_ENTRY_BAD); else SetLastError(result); - + return FALSE; } - + return TRUE; } @@ -1768,7 +1751,7 @@ BOOL WINAPI CryptHashData (HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen * * Compute the cryptographic hash of a session key object. * - * PARAMS + * PARAMS * hHash [I] Handle to the hash object. * hKey [I] Handle to the key to be hashed. * dwFlags [I] Can be CRYPT_LITTLE_ENDIAN. @@ -1883,7 +1866,7 @@ BOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescript PCRYPTHASH hash = (PCRYPTHASH)hHash; PCRYPTPROV prov; - TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", + TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", hHash, dwKeySpec, debugstr_w(sDescription), dwFlags, pbSignature, pdwSigLen); if (!hash) @@ -1914,7 +1897,7 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescripti LPWSTR wsDescription; BOOL result; - TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", + TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", hHash, dwKeySpec, debugstr_a(sDescription), dwFlags, pbSignature, pdwSigLen); CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1); @@ -2075,7 +2058,7 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p return FALSE; } CRYPT_Free(keyname); - + if (dwFlags & CRYPT_DELETE_DEFAULT) { RegDeleteValueW(hTypeKey, nameW); @@ -2097,7 +2080,7 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p return FALSE; } CRYPT_Free(keyname); - + if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (const BYTE *)pszProvName, (strlenW(pszProvName) + 1)*sizeof(WCHAR))) { @@ -2105,7 +2088,7 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p RegCloseKey(hProvKey); return FALSE; } - + RegCloseKey(hProvKey); } RegCloseKey(hTypeKey); @@ -2201,7 +2184,7 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbDa * RETURNS * Success: TRUE * Failure: FALSE - * + * * NOTES * Because of security flaws sDescription should not be used and should thus be * NULL. It is supported only for compatibility with Microsoft's Cryptographic @@ -2224,7 +2207,7 @@ BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DW SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - + prov = hash->pProvider; return prov->pFuncs->pCPVerifySignature(prov->hPrivate, hash->hPrivate, pbSignature, dwSigLen, key->hPrivate, sDescription, dwFlags); @@ -2316,8 +2299,8 @@ BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) FIXME("couldn't open /dev/urandom\n"); SetLastError(NTE_FAIL); return FALSE; -} - +} + /* These functions have nearly identical prototypes to CryptProtectMemory and CryptUnprotectMemory, in crypt32.dll. @@ -2332,10 +2315,10 @@ BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) * memory [I/O] Pointer to memory to encrypt. * length [I] Length of region to encrypt in bytes. * flags [I] Control whether other processes are able to decrypt the memory. - * RTL_ENCRYPT_OPTION_SAME_PROCESS - * RTL_ENCRYPT_OPTION_CROSS_PROCESS + * RTL_ENCRYPT_OPTION_SAME_PROCESS + * RTL_ENCRYPT_OPTION_CROSS_PROCESS * RTL_ENCRYPT_OPTION_SAME_LOGON - * + * * RETURNS * Success: STATUS_SUCCESS * Failure: NTSTATUS error code diff --git a/reactos/dll/win32/advapi32/crypt/crypt.h b/reactos/dll/win32/advapi32/crypt/crypt.h index a3e4f0a14ca..937e30b6e69 100644 --- a/reactos/dll/win32/advapi32/crypt/crypt.h +++ b/reactos/dll/win32/advapi32/crypt/crypt.h @@ -91,30 +91,12 @@ extern unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *ke extern unsigned char *CRYPT_DESunhash( unsigned char *dst, const unsigned char *key, const unsigned char *src ) DECLSPEC_HIDDEN; -void byteReverse(unsigned char *buf, unsigned longs); struct ustring { DWORD Length; DWORD MaximumLength; unsigned char *Buffer; }; -typedef struct { - unsigned int buf[4]; - unsigned int i[2]; - unsigned char in[64]; - unsigned char digest[16]; -} MD4_CTX; - -typedef struct tag_arc4_info { - unsigned char state[256]; - unsigned char x, y; -} arc4_info; - -VOID WINAPI MD4Init( MD4_CTX *ctx ); -VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ); -VOID WINAPI MD4Final(MD4_CTX *ctx); -void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen); -void arc4_ProcessString(arc4_info *a4i, BYTE *inoutString, unsigned int length); NTSTATUS WINAPI SystemFunction032(struct ustring *data, const struct ustring *key); #endif /* __WINE_CRYPT_H_ */ diff --git a/reactos/dll/win32/advapi32/misc/sysfunc.c b/reactos/dll/win32/advapi32/misc/sysfunc.c index d105b64ea54..b8fc700b076 100644 --- a/reactos/dll/win32/advapi32/misc/sysfunc.c +++ b/reactos/dll/win32/advapi32/misc/sysfunc.c @@ -12,6 +12,9 @@ */ #include +#include +#include +#include static const unsigned char CRYPT_LMhash_Magic[8] = { 'K', 'G', 'S', '!', '@', '#', '$', '%' }; @@ -502,10 +505,10 @@ WINAPI SystemFunction030(LPCVOID b1, LPCVOID b2) NTSTATUS WINAPI SystemFunction032(struct ustring *data, const struct ustring *key) { - arc4_info a4i; + RC4_CONTEXT a4i; - arc4_init(&a4i, key->Buffer, key->Length); - arc4_ProcessString(&a4i, data->Buffer, data->Length); + rc4_init(&a4i, key->Buffer, key->Length); + rc4_crypt(&a4i, data->Buffer, data->Length); return STATUS_SUCCESS; } @@ -626,10 +629,10 @@ SystemFunction036(PVOID pbBuffer, ULONG dwLen) * memory [I/O] Pointer to memory to encrypt. * length [I] Length of region to encrypt in bytes. * flags [I] Control whether other processes are able to decrypt the memory. - * RTL_ENCRYPT_OPTION_SAME_PROCESS - * RTL_ENCRYPT_OPTION_CROSS_PROCESS + * RTL_ENCRYPT_OPTION_SAME_PROCESS + * RTL_ENCRYPT_OPTION_CROSS_PROCESS * RTL_ENCRYPT_OPTION_SAME_LOGON - * + * * RETURNS * Success: STATUS_SUCCESS * Failure: NTSTATUS error code diff --git a/reactos/lib/CMakeLists.txt b/reactos/lib/CMakeLists.txt index 49944594571..8918d671094 100644 --- a/reactos/lib/CMakeLists.txt +++ b/reactos/lib/CMakeLists.txt @@ -7,6 +7,7 @@ if(CMAKE_CROSSCOMPILING) add_subdirectory(3rdparty) add_subdirectory(atl) add_subdirectory(cportlib) +add_subdirectory(cryptlib) #add_subdirectory(dnslib) Nothing links to this lib. add_subdirectory(drivers) add_subdirectory(epsapi) diff --git a/reactos/lib/cryptlib/CMakeLists.txt b/reactos/lib/cryptlib/CMakeLists.txt new file mode 100644 index 00000000000..015d13bebf4 --- /dev/null +++ b/reactos/lib/cryptlib/CMakeLists.txt @@ -0,0 +1,9 @@ + +add_library(cryptlib + md4.c + md5.c + mvAesAlg.c + rc4.c + sha1.c + util.c +) diff --git a/reactos/lib/cryptlib/README.txt b/reactos/lib/cryptlib/README.txt new file mode 100644 index 00000000000..631e8761237 --- /dev/null +++ b/reactos/lib/cryptlib/README.txt @@ -0,0 +1,29 @@ + +This libbrary implements the following algorithms: + +MD4 +--- +- files: md4.c, md4.h +- Implements: MD4Init, MD4Update, MD4Final + +MD5 +--- +- files: md5.c, md5.h +- Implements: MD5Init, MD5Update, MD5Final + +RC4 +--- +- files: rc4.c, rc4.h +- Implements: rc4_init, rc4_crypt + +SHA1 +---- +- files: sha1.c, sha1.h +- Implements: A_SHAInit, A_SHAUpdate, A_SHAFinal + +AES +--- +- files: mvAesAlg.c, mvAesAlg.h, mvOs.h, mvAesBoxes.dat +- Taken from: http://enduser.subsignal.org/~trondah/tree/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/ +- Original reference implementation: https://github.com/briandfoy/crypt-rijndael/tree/master/rijndael-vals/reference%20implementation +- Implements: rijndaelEncrypt128, rijndaelDecrypt128 diff --git a/reactos/dll/win32/advapi32/crypt/crypt_md4.c b/reactos/lib/cryptlib/md4.c similarity index 80% rename from reactos/dll/win32/advapi32/crypt/crypt_md4.c rename to reactos/lib/cryptlib/md4.c index 9726a425c3d..a553a20eb4e 100644 --- a/reactos/dll/win32/advapi32/crypt/crypt_md4.c +++ b/reactos/lib/cryptlib/md4.c @@ -33,7 +33,8 @@ * will fill a supplied 16-byte array with the digest. */ -#include +#include "md4.h" +#include "util.h" static void MD4Transform( unsigned int buf[4], unsigned int const in[16] ); @@ -41,7 +42,7 @@ static void MD4Transform( unsigned int buf[4], unsigned int const in[16] ); * Start MD4 accumulation. Set bit count to 0 and buffer to mysterious * initialization constants. */ -VOID WINAPI MD4Init( MD4_CTX *ctx ) +VOID NTAPI MD4Init( MD4_CTX *ctx ) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -55,7 +56,7 @@ VOID WINAPI MD4Init( MD4_CTX *ctx ) * Update context to reflect the concatenation of another buffer full * of bytes. */ -VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ) +VOID NTAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ) { register unsigned int t; @@ -106,10 +107,10 @@ VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len } /* - * Final wrapup - pad to 64-byte boundary with the bit pattern + * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) */ -VOID WINAPI MD4Final( MD4_CTX *ctx ) +VOID NTAPI MD4Final( MD4_CTX *ctx ) { unsigned int count; unsigned char *p; @@ -243,58 +244,3 @@ static void MD4Transform( unsigned int buf[4], const unsigned int in[16] ) buf[3] += d; } -#ifndef __REACTOS__ -/****************************************************************************** - * SystemFunction007 [ADVAPI32.@] - * - * MD4 hash a unicode string - * - * PARAMS - * string [I] the string to hash - * output [O] the md4 hash of the string (16 bytes) - * - * RETURNS - * Success: STATUS_SUCCESS - * Failure: STATUS_UNSUCCESSFUL - * - */ -NTSTATUS WINAPI SystemFunction007(const UNICODE_STRING *string, LPBYTE hash) -{ - MD4_CTX ctx; - - MD4Init( &ctx ); - MD4Update( &ctx, (const BYTE *)string->Buffer, string->Length ); - MD4Final( &ctx ); - memcpy( hash, ctx.digest, 0x10 ); - - return STATUS_SUCCESS; -} - -/****************************************************************************** - * SystemFunction010 [ADVAPI32.@] - * SystemFunction011 [ADVAPI32.@] - * - * MD4 hashes 16 bytes of data - * - * PARAMS - * unknown [] seems to have no effect on the output - * data [I] pointer to data to hash (16 bytes) - * output [O] the md4 hash of the data (16 bytes) - * - * RETURNS - * Success: STATUS_SUCCESS - * Failure: STATUS_UNSUCCESSFUL - * - */ -NTSTATUS WINAPI SystemFunction010(LPVOID unknown, const BYTE *data, LPBYTE hash) -{ - MD4_CTX ctx; - - MD4Init( &ctx ); - MD4Update( &ctx, data, 0x10 ); - MD4Final( &ctx ); - memcpy( hash, ctx.digest, 0x10 ); - - return STATUS_SUCCESS; -} -#endif /* !__REACTOS__ */ diff --git a/reactos/lib/cryptlib/md4.h b/reactos/lib/cryptlib/md4.h new file mode 100644 index 00000000000..9611ccabece --- /dev/null +++ b/reactos/lib/cryptlib/md4.h @@ -0,0 +1,19 @@ + +#pragma once + +#include + +typedef struct +{ + unsigned int buf[4]; + unsigned int i[2]; + unsigned char in[64]; + unsigned char digest[16]; +} MD4_CTX; + +VOID NTAPI MD4Init( MD4_CTX *ctx ); + +VOID NTAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ); + +VOID NTAPI MD4Final( MD4_CTX *ctx ); + diff --git a/reactos/dll/win32/advapi32/crypt/crypt_md5.c b/reactos/lib/cryptlib/md5.c similarity index 95% rename from reactos/dll/win32/advapi32/crypt/crypt_md5.c rename to reactos/lib/cryptlib/md5.c index 52648f786a1..a847997172a 100644 --- a/reactos/dll/win32/advapi32/crypt/crypt_md5.c +++ b/reactos/lib/cryptlib/md5.c @@ -33,15 +33,8 @@ * will fill a supplied 16-byte array with the digest. */ -#include - -typedef struct -{ - unsigned int i[2]; - unsigned int buf[4]; - unsigned char in[64]; - unsigned char digest[16]; -} MD5_CTX; +#include "md5.h" +#include "util.h" static void MD5Transform( unsigned int buf[4], const unsigned int in[16] ); @@ -49,7 +42,7 @@ static void MD5Transform( unsigned int buf[4], const unsigned int in[16] ); * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious * initialization constants. */ -VOID WINAPI MD5Init( MD5_CTX *ctx ) +VOID NTAPI MD5Init( MD5_CTX *ctx ) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -63,7 +56,7 @@ VOID WINAPI MD5Init( MD5_CTX *ctx ) * Update context to reflect the concatenation of another buffer full * of bytes. */ -VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ) +VOID NTAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ) { register unsigned int t; @@ -114,10 +107,10 @@ VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len } /* - * Final wrapup - pad to 64-byte boundary with the bit pattern + * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) */ -VOID WINAPI MD5Final( MD5_CTX *ctx ) +VOID NTAPI MD5Final( MD5_CTX *ctx ) { unsigned int count; unsigned char *p; @@ -260,3 +253,4 @@ static void MD5Transform( unsigned int buf[4], const unsigned int in[16] ) buf[2] += c; buf[3] += d; } + diff --git a/reactos/lib/cryptlib/md5.h b/reactos/lib/cryptlib/md5.h new file mode 100644 index 00000000000..57ee7164769 --- /dev/null +++ b/reactos/lib/cryptlib/md5.h @@ -0,0 +1,19 @@ + +#pragma once + +#include + +typedef struct +{ + unsigned int i[2]; + unsigned int buf[4]; + unsigned char in[64]; + unsigned char digest[16]; +} MD5_CTX; + +VOID NTAPI MD5Init( MD5_CTX *ctx ); + +VOID NTAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); + +VOID NTAPI MD5Final( MD5_CTX *ctx ); + diff --git a/reactos/lib/cryptlib/mvAesAlg.c b/reactos/lib/cryptlib/mvAesAlg.c new file mode 100644 index 00000000000..f71201e381f --- /dev/null +++ b/reactos/lib/cryptlib/mvAesAlg.c @@ -0,0 +1,317 @@ +/* rijndael-alg-ref.c v2.0 August '99 + * Reference ANSI C code + * authors: Paulo Barreto + * Vincent Rijmen, K.U.Leuven + * + * This code is placed in the public domain. + */ + +#include "mvOs.h" + +#include "mvAesAlg.h" + +#include "mvAesBoxes.dat" + + +MV_U8 mul1(MV_U8 aa, MV_U8 bb); +void KeyAddition(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC], MV_U8 BC); +void ShiftRow128Enc(MV_U8 a[4][MAXBC]); +void ShiftRow128Dec(MV_U8 a[4][MAXBC]); +void Substitution(MV_U8 a[4][MAXBC], MV_U8 box[256]); +void MixColumn(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC]); +void InvMixColumn(MV_U8 a[4][MAXBC]); + + +#define mul(aa, bb) (mask[bb] & Alogtable[aa + Logtable[bb]]) + +MV_U8 mul1(MV_U8 aa, MV_U8 bb) +{ + return mask[bb] & Alogtable[aa + Logtable[bb]]; +} + + +void KeyAddition(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC], MV_U8 BC) +{ + /* Exor corresponding text input and round key input bytes + */ + ((MV_U32*)(&(a[0][0])))[0] ^= ((MV_U32*)(&(rk[0][0])))[0]; + ((MV_U32*)(&(a[1][0])))[0] ^= ((MV_U32*)(&(rk[1][0])))[0]; + ((MV_U32*)(&(a[2][0])))[0] ^= ((MV_U32*)(&(rk[2][0])))[0]; + ((MV_U32*)(&(a[3][0])))[0] ^= ((MV_U32*)(&(rk[3][0])))[0]; + +} + +void ShiftRow128Enc(MV_U8 a[4][MAXBC]) { + /* Row 0 remains unchanged + * The other three rows are shifted a variable amount + */ + MV_U8 tmp[MAXBC]; + + tmp[0] = a[1][1]; + tmp[1] = a[1][2]; + tmp[2] = a[1][3]; + tmp[3] = a[1][0]; + + ((MV_U32*)(&(a[1][0])))[0] = ((MV_U32*)(&(tmp[0])))[0]; + /* + a[1][0] = tmp[0]; + a[1][1] = tmp[1]; + a[1][2] = tmp[2]; + a[1][3] = tmp[3]; + */ + tmp[0] = a[2][2]; + tmp[1] = a[2][3]; + tmp[2] = a[2][0]; + tmp[3] = a[2][1]; + + ((MV_U32*)(&(a[2][0])))[0] = ((MV_U32*)(&(tmp[0])))[0]; + /* + a[2][0] = tmp[0]; + a[2][1] = tmp[1]; + a[2][2] = tmp[2]; + a[2][3] = tmp[3]; + */ + tmp[0] = a[3][3]; + tmp[1] = a[3][0]; + tmp[2] = a[3][1]; + tmp[3] = a[3][2]; + + ((MV_U32*)(&(a[3][0])))[0] = ((MV_U32*)(&(tmp[0])))[0]; + /* + a[3][0] = tmp[0]; + a[3][1] = tmp[1]; + a[3][2] = tmp[2]; + a[3][3] = tmp[3]; + */ +} + +void ShiftRow128Dec(MV_U8 a[4][MAXBC]) { + /* Row 0 remains unchanged + * The other three rows are shifted a variable amount + */ + MV_U8 tmp[MAXBC]; + + tmp[0] = a[1][3]; + tmp[1] = a[1][0]; + tmp[2] = a[1][1]; + tmp[3] = a[1][2]; + + ((MV_U32*)(&(a[1][0])))[0] = ((MV_U32*)(&(tmp[0])))[0]; + /* + a[1][0] = tmp[0]; + a[1][1] = tmp[1]; + a[1][2] = tmp[2]; + a[1][3] = tmp[3]; + */ + + tmp[0] = a[2][2]; + tmp[1] = a[2][3]; + tmp[2] = a[2][0]; + tmp[3] = a[2][1]; + + ((MV_U32*)(&(a[2][0])))[0] = ((MV_U32*)(&(tmp[0])))[0]; + /* + a[2][0] = tmp[0]; + a[2][1] = tmp[1]; + a[2][2] = tmp[2]; + a[2][3] = tmp[3]; + */ + + tmp[0] = a[3][1]; + tmp[1] = a[3][2]; + tmp[2] = a[3][3]; + tmp[3] = a[3][0]; + + ((MV_U32*)(&(a[3][0])))[0] = ((MV_U32*)(&(tmp[0])))[0]; + /* + a[3][0] = tmp[0]; + a[3][1] = tmp[1]; + a[3][2] = tmp[2]; + a[3][3] = tmp[3]; + */ +} + +void Substitution(MV_U8 a[4][MAXBC], MV_U8 box[256]) { + /* Replace every byte of the input by the byte at that place + * in the nonlinear S-box + */ + int i, j; + + for(i = 0; i < 4; i++) + for(j = 0; j < 4; j++) a[i][j] = box[a[i][j]] ; +} + +void MixColumn(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC]) { + /* Mix the four bytes of every column in a linear way + */ + MV_U8 b[4][MAXBC]; + int i, j; + + for(j = 0; j < 4; j++){ + b[0][j] = mul(25,a[0][j]) ^ mul(1,a[1][j]) ^ a[2][j] ^ a[3][j]; + b[1][j] = mul(25,a[1][j]) ^ mul(1,a[2][j]) ^ a[3][j] ^ a[0][j]; + b[2][j] = mul(25,a[2][j]) ^ mul(1,a[3][j]) ^ a[0][j] ^ a[1][j]; + b[3][j] = mul(25,a[3][j]) ^ mul(1,a[0][j]) ^ a[1][j] ^ a[2][j]; + } + for(i = 0; i < 4; i++) + /*for(j = 0; j < BC; j++) a[i][j] = b[i][j];*/ + ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0] ^ ((MV_U32*)(&(rk[i][0])))[0];; +} + +void InvMixColumn(MV_U8 a[4][MAXBC]) { + /* Mix the four bytes of every column in a linear way + * This is the opposite operation of Mixcolumn + */ + MV_U8 b[4][MAXBC]; + int i, j; + + for(j = 0; j < 4; j++){ + b[0][j] = mul(223,a[0][j]) ^ mul(104,a[1][j]) ^ mul(238,a[2][j]) ^ mul(199,a[3][j]); + b[1][j] = mul(223,a[1][j]) ^ mul(104,a[2][j]) ^ mul(238,a[3][j]) ^ mul(199,a[0][j]); + b[2][j] = mul(223,a[2][j]) ^ mul(104,a[3][j]) ^ mul(238,a[0][j]) ^ mul(199,a[1][j]); + b[3][j] = mul(223,a[3][j]) ^ mul(104,a[0][j]) ^ mul(238,a[1][j]) ^ mul(199,a[2][j]); + } + for(i = 0; i < 4; i++) + /*for(j = 0; j < BC; j++) a[i][j] = b[i][j];*/ + ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0]; +} + +int rijndaelKeySched (MV_U8 k[4][MAXKC], int keyBits, int blockBits, MV_U8 W[MAXROUNDS+1][4][MAXBC]) +{ + /* Calculate the necessary round keys + * The number of calculations depends on keyBits and blockBits + */ + int KC, BC, ROUNDS; + int i, j, t, rconpointer = 0; + MV_U8 tk[4][MAXKC]; + + switch (keyBits) { + case 128: KC = 4; break; + case 192: KC = 6; break; + case 256: KC = 8; break; + default : return (-1); + } + + switch (blockBits) { + case 128: BC = 4; break; + case 192: BC = 6; break; + case 256: BC = 8; break; + default : return (-2); + } + + switch (keyBits >= blockBits ? keyBits : blockBits) { + case 128: ROUNDS = 10; break; + case 192: ROUNDS = 12; break; + case 256: ROUNDS = 14; break; + default : return (-3); /* this cannot happen */ + } + + + for(j = 0; j < KC; j++) + for(i = 0; i < 4; i++) + tk[i][j] = k[i][j]; + t = 0; + /* copy values into round key array */ + for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++) + for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j]; + + while (t < (ROUNDS+1)*BC) { /* while not enough round key material calculated */ + /* calculate new values */ + for(i = 0; i < 4; i++) + tk[i][0] ^= S[tk[(i+1)%4][KC-1]]; + tk[0][0] ^= rcon[rconpointer++]; + + if (KC != 8) + for(j = 1; j < KC; j++) + for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1]; + else { + for(j = 1; j < KC/2; j++) + for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1]; + for(i = 0; i < 4; i++) tk[i][KC/2] ^= S[tk[i][KC/2 - 1]]; + for(j = KC/2 + 1; j < KC; j++) + for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1]; + } + /* copy values into round key array */ + for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++) + for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j]; + } + + return 0; +} + + + +int rijndaelEncrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds) +{ + /* Encryption of one block. + */ + int r, BC, ROUNDS; + + BC = 4; + ROUNDS = rounds; + + /* begin with a key addition + */ + + KeyAddition(a,rk[0],BC); + + /* ROUNDS-1 ordinary rounds + */ + for(r = 1; r < ROUNDS; r++) { + Substitution(a,S); + ShiftRow128Enc(a); + MixColumn(a, rk[r]); + /*KeyAddition(a,rk[r],BC);*/ + } + + /* Last round is special: there is no MixColumn + */ + Substitution(a,S); + ShiftRow128Enc(a); + KeyAddition(a,rk[ROUNDS],BC); + + return 0; +} + + +int rijndaelDecrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds) +{ + int r, BC, ROUNDS; + + BC = 4; + ROUNDS = rounds; + + /* To decrypt: apply the inverse operations of the encrypt routine, + * in opposite order + * + * (KeyAddition is an involution: it 's equal to its inverse) + * (the inverse of Substitution with table S is Substitution with the inverse table of S) + * (the inverse of Shiftrow is Shiftrow over a suitable distance) + */ + + /* First the special round: + * without InvMixColumn + * with extra KeyAddition + */ + KeyAddition(a,rk[ROUNDS],BC); + ShiftRow128Dec(a); + Substitution(a,Si); + + /* ROUNDS-1 ordinary rounds + */ + for(r = ROUNDS-1; r > 0; r--) { + KeyAddition(a,rk[r],BC); + InvMixColumn(a); + ShiftRow128Dec(a); + Substitution(a,Si); + + } + + /* End with the extra key addition + */ + + KeyAddition(a,rk[0],BC); + + return 0; +} + diff --git a/reactos/lib/cryptlib/mvAesAlg.h b/reactos/lib/cryptlib/mvAesAlg.h new file mode 100644 index 00000000000..ec81e403fac --- /dev/null +++ b/reactos/lib/cryptlib/mvAesAlg.h @@ -0,0 +1,19 @@ +/* rijndael-alg-ref.h v2.0 August '99 + * Reference ANSI C code + * authors: Paulo Barreto + * Vincent Rijmen, K.U.Leuven + */ +#ifndef __RIJNDAEL_ALG_H +#define __RIJNDAEL_ALG_H + +#define MAXBC (128/32) +#define MAXKC (256/32) +#define MAXROUNDS 14 + + +int rijndaelKeySched (MV_U8 k[4][MAXKC], int keyBits, int blockBits, MV_U8 rk[MAXROUNDS+1][4][MAXBC]); + +int rijndaelEncrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds); +int rijndaelDecrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds); + +#endif /* __RIJNDAEL_ALG_H */ diff --git a/reactos/lib/cryptlib/mvAesBoxes.dat b/reactos/lib/cryptlib/mvAesBoxes.dat new file mode 100644 index 00000000000..4011b187b43 --- /dev/null +++ b/reactos/lib/cryptlib/mvAesBoxes.dat @@ -0,0 +1,123 @@ +static MV_U8 mask[256] = { +0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +}; + +static MV_U8 Logtable[256] = { + 0, 0, 25, 1, 50, 2, 26, 198, 75, 199, 27, 104, 51, 238, 223, 3, +100, 4, 224, 14, 52, 141, 129, 239, 76, 113, 8, 200, 248, 105, 28, 193, +125, 194, 29, 181, 249, 185, 39, 106, 77, 228, 166, 114, 154, 201, 9, 120, +101, 47, 138, 5, 33, 15, 225, 36, 18, 240, 130, 69, 53, 147, 218, 142, +150, 143, 219, 189, 54, 208, 206, 148, 19, 92, 210, 241, 64, 70, 131, 56, +102, 221, 253, 48, 191, 6, 139, 98, 179, 37, 226, 152, 34, 136, 145, 16, +126, 110, 72, 195, 163, 182, 30, 66, 58, 107, 40, 84, 250, 133, 61, 186, + 43, 121, 10, 21, 155, 159, 94, 202, 78, 212, 172, 229, 243, 115, 167, 87, +175, 88, 168, 80, 244, 234, 214, 116, 79, 174, 233, 213, 231, 230, 173, 232, + 44, 215, 117, 122, 235, 22, 11, 245, 89, 203, 95, 176, 156, 169, 81, 160, +127, 12, 246, 111, 23, 196, 73, 236, 216, 67, 31, 45, 164, 118, 123, 183, +204, 187, 62, 90, 251, 96, 177, 134, 59, 82, 161, 108, 170, 85, 41, 157, +151, 178, 135, 144, 97, 190, 220, 252, 188, 149, 207, 205, 55, 63, 91, 209, + 83, 57, 132, 60, 65, 162, 109, 71, 20, 42, 158, 93, 86, 242, 211, 171, + 68, 17, 146, 217, 35, 32, 46, 137, 180, 124, 184, 38, 119, 153, 227, 165, +103, 74, 237, 222, 197, 49, 254, 24, 13, 99, 140, 128, 192, 247, 112, 7, +}; + +static MV_U8 Alogtable[512] = { + 1, 3, 5, 15, 17, 51, 85, 255, 26, 46, 114, 150, 161, 248, 19, 53, + 95, 225, 56, 72, 216, 115, 149, 164, 247, 2, 6, 10, 30, 34, 102, 170, +229, 52, 92, 228, 55, 89, 235, 38, 106, 190, 217, 112, 144, 171, 230, 49, + 83, 245, 4, 12, 20, 60, 68, 204, 79, 209, 104, 184, 211, 110, 178, 205, + 76, 212, 103, 169, 224, 59, 77, 215, 98, 166, 241, 8, 24, 40, 120, 136, +131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206, 73, 219, 118, 154, +181, 196, 87, 249, 16, 48, 80, 240, 11, 29, 39, 105, 187, 214, 97, 163, +254, 25, 43, 125, 135, 146, 173, 236, 47, 113, 147, 174, 233, 32, 96, 160, +251, 22, 58, 78, 210, 109, 183, 194, 93, 231, 50, 86, 250, 21, 63, 65, +195, 94, 226, 61, 71, 201, 64, 192, 91, 237, 44, 116, 156, 191, 218, 117, +159, 186, 213, 100, 172, 239, 42, 126, 130, 157, 188, 223, 122, 142, 137, 128, +155, 182, 193, 88, 232, 35, 101, 175, 234, 37, 111, 177, 200, 67, 197, 84, +252, 31, 33, 99, 165, 244, 7, 9, 27, 45, 119, 153, 176, 203, 70, 202, + 69, 207, 74, 222, 121, 139, 134, 145, 168, 227, 62, 66, 198, 81, 243, 14, + 18, 54, 90, 238, 41, 123, 141, 140, 143, 138, 133, 148, 167, 242, 13, 23, + 57, 75, 221, 124, 132, 151, 162, 253, 28, 36, 108, 180, 199, 82, 246, 1, + + 3, 5, 15, 17, 51, 85, 255, 26, 46, 114, 150, 161, 248, 19, 53, + 95, 225, 56, 72, 216, 115, 149, 164, 247, 2, 6, 10, 30, 34, 102, 170, +229, 52, 92, 228, 55, 89, 235, 38, 106, 190, 217, 112, 144, 171, 230, 49, + 83, 245, 4, 12, 20, 60, 68, 204, 79, 209, 104, 184, 211, 110, 178, 205, + 76, 212, 103, 169, 224, 59, 77, 215, 98, 166, 241, 8, 24, 40, 120, 136, +131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206, 73, 219, 118, 154, +181, 196, 87, 249, 16, 48, 80, 240, 11, 29, 39, 105, 187, 214, 97, 163, +254, 25, 43, 125, 135, 146, 173, 236, 47, 113, 147, 174, 233, 32, 96, 160, +251, 22, 58, 78, 210, 109, 183, 194, 93, 231, 50, 86, 250, 21, 63, 65, +195, 94, 226, 61, 71, 201, 64, 192, 91, 237, 44, 116, 156, 191, 218, 117, +159, 186, 213, 100, 172, 239, 42, 126, 130, 157, 188, 223, 122, 142, 137, 128, +155, 182, 193, 88, 232, 35, 101, 175, 234, 37, 111, 177, 200, 67, 197, 84, +252, 31, 33, 99, 165, 244, 7, 9, 27, 45, 119, 153, 176, 203, 70, 202, + 69, 207, 74, 222, 121, 139, 134, 145, 168, 227, 62, 66, 198, 81, 243, 14, + 18, 54, 90, 238, 41, 123, 141, 140, 143, 138, 133, 148, 167, 242, 13, 23, + 57, 75, 221, 124, 132, 151, 162, 253, 28, 36, 108, 180, 199, 82, 246, 1, + +}; + +static MV_U8 S[256] = { + 99, 124, 119, 123, 242, 107, 111, 197, 48, 1, 103, 43, 254, 215, 171, 118, +202, 130, 201, 125, 250, 89, 71, 240, 173, 212, 162, 175, 156, 164, 114, 192, +183, 253, 147, 38, 54, 63, 247, 204, 52, 165, 229, 241, 113, 216, 49, 21, + 4, 199, 35, 195, 24, 150, 5, 154, 7, 18, 128, 226, 235, 39, 178, 117, + 9, 131, 44, 26, 27, 110, 90, 160, 82, 59, 214, 179, 41, 227, 47, 132, + 83, 209, 0, 237, 32, 252, 177, 91, 106, 203, 190, 57, 74, 76, 88, 207, +208, 239, 170, 251, 67, 77, 51, 133, 69, 249, 2, 127, 80, 60, 159, 168, + 81, 163, 64, 143, 146, 157, 56, 245, 188, 182, 218, 33, 16, 255, 243, 210, +205, 12, 19, 236, 95, 151, 68, 23, 196, 167, 126, 61, 100, 93, 25, 115, + 96, 129, 79, 220, 34, 42, 144, 136, 70, 238, 184, 20, 222, 94, 11, 219, +224, 50, 58, 10, 73, 6, 36, 92, 194, 211, 172, 98, 145, 149, 228, 121, +231, 200, 55, 109, 141, 213, 78, 169, 108, 86, 244, 234, 101, 122, 174, 8, +186, 120, 37, 46, 28, 166, 180, 198, 232, 221, 116, 31, 75, 189, 139, 138, +112, 62, 181, 102, 72, 3, 246, 14, 97, 53, 87, 185, 134, 193, 29, 158, +225, 248, 152, 17, 105, 217, 142, 148, 155, 30, 135, 233, 206, 85, 40, 223, +140, 161, 137, 13, 191, 230, 66, 104, 65, 153, 45, 15, 176, 84, 187, 22, +}; + +static MV_U8 Si[256] = { + 82, 9, 106, 213, 48, 54, 165, 56, 191, 64, 163, 158, 129, 243, 215, 251, +124, 227, 57, 130, 155, 47, 255, 135, 52, 142, 67, 68, 196, 222, 233, 203, + 84, 123, 148, 50, 166, 194, 35, 61, 238, 76, 149, 11, 66, 250, 195, 78, + 8, 46, 161, 102, 40, 217, 36, 178, 118, 91, 162, 73, 109, 139, 209, 37, +114, 248, 246, 100, 134, 104, 152, 22, 212, 164, 92, 204, 93, 101, 182, 146, +108, 112, 72, 80, 253, 237, 185, 218, 94, 21, 70, 87, 167, 141, 157, 132, +144, 216, 171, 0, 140, 188, 211, 10, 247, 228, 88, 5, 184, 179, 69, 6, +208, 44, 30, 143, 202, 63, 15, 2, 193, 175, 189, 3, 1, 19, 138, 107, + 58, 145, 17, 65, 79, 103, 220, 234, 151, 242, 207, 206, 240, 180, 230, 115, +150, 172, 116, 34, 231, 173, 53, 133, 226, 249, 55, 232, 28, 117, 223, 110, + 71, 241, 26, 113, 29, 41, 197, 137, 111, 183, 98, 14, 170, 24, 190, 27, +252, 86, 62, 75, 198, 210, 121, 32, 154, 219, 192, 254, 120, 205, 90, 244, + 31, 221, 168, 51, 136, 7, 199, 49, 177, 18, 16, 89, 39, 128, 236, 95, + 96, 81, 127, 169, 25, 181, 74, 13, 45, 229, 122, 159, 147, 201, 156, 239, +160, 224, 59, 77, 174, 42, 245, 176, 200, 235, 187, 60, 131, 83, 153, 97, + 23, 43, 4, 126, 186, 119, 214, 38, 225, 105, 20, 99, 85, 33, 12, 125, +}; + +/* +static MV_U8 iG[4][4] = { +{0x0e, 0x09, 0x0d, 0x0b}, +{0x0b, 0x0e, 0x09, 0x0d}, +{0x0d, 0x0b, 0x0e, 0x09}, +{0x09, 0x0d, 0x0b, 0x0e}, +}; +*/ +static MV_U32 rcon[30] = { + 0x01,0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, }; diff --git a/reactos/lib/cryptlib/mvOs.h b/reactos/lib/cryptlib/mvOs.h new file mode 100644 index 00000000000..da6a573f446 --- /dev/null +++ b/reactos/lib/cryptlib/mvOs.h @@ -0,0 +1,7 @@ + +#pragma once + +typedef unsigned char MV_U8; +typedef unsigned short MV_U16; +typedef unsigned long MV_U32; + diff --git a/reactos/dll/win32/advapi32/crypt/crypt_arc4.c b/reactos/lib/cryptlib/rc4.c similarity index 66% rename from reactos/dll/win32/advapi32/crypt/crypt_arc4.c rename to reactos/lib/cryptlib/rc4.c index f38783bf673..906dd18130c 100644 --- a/reactos/dll/win32/advapi32/crypt/crypt_arc4.c +++ b/reactos/lib/cryptlib/rc4.c @@ -20,9 +20,9 @@ /* http://cryptopp.sourceforge.net/docs/ref521/arc4_8cpp-source.html */ -#include +#include "rc4.h" -void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen) +void rc4_init(RC4_CONTEXT *a4i, const unsigned char *key, unsigned int keyLen) { unsigned int keyIndex = 0, stateIndex = 0; unsigned int i, a; @@ -44,9 +44,9 @@ void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen) } } -void arc4_ProcessString(arc4_info *a4i, BYTE *inoutString, unsigned int length) +void rc4_crypt(RC4_CONTEXT *a4i, unsigned char *inoutString, unsigned int length) { - BYTE *const s=a4i->state; + unsigned char *const s=a4i->state; unsigned int x = a4i->x; unsigned int y = a4i->y; unsigned int a, b; @@ -65,31 +65,3 @@ void arc4_ProcessString(arc4_info *a4i, BYTE *inoutString, unsigned int length) a4i->x = x; a4i->y = y; } - -#ifndef __REACTOS__ -/****************************************************************************** - * SystemFunction032 [ADVAPI32.@] - * - * Encrypts a string data using ARC4 - * - * PARAMS - * data [I/O] data to encrypt - * key [I] key data - * - * RETURNS - * Success: STATUS_SUCCESS - * Failure: STATUS_UNSUCCESSFUL - * - * NOTES - * see http://web.it.kth.se/~rom/ntsec.html#crypto-strongavail - */ -NTSTATUS WINAPI SystemFunction032(struct ustring *data, const struct ustring *key) -{ - arc4_info a4i; - - arc4_init(&a4i, key->Buffer, key->Length); - arc4_ProcessString(&a4i, data->Buffer, data->Length); - - return STATUS_SUCCESS; -} -#endif diff --git a/reactos/lib/cryptlib/rc4.h b/reactos/lib/cryptlib/rc4.h new file mode 100644 index 00000000000..964881cbdba --- /dev/null +++ b/reactos/lib/cryptlib/rc4.h @@ -0,0 +1,13 @@ + +#pragma once + +typedef struct _RC4_CONTEXT +{ + unsigned char state[256]; + unsigned char x, y; +} RC4_CONTEXT; + +void rc4_init(RC4_CONTEXT *a4i, const unsigned char *key, unsigned int keyLen); + +void rc4_crypt(RC4_CONTEXT *a4i, unsigned char *inoutString, unsigned int length); + diff --git a/reactos/dll/win32/advapi32/crypt/crypt_sha.c b/reactos/lib/cryptlib/sha1.c similarity index 92% rename from reactos/dll/win32/advapi32/crypt/crypt_sha.c rename to reactos/lib/cryptlib/sha1.c index b677c426ea8..ba9cd7ba488 100644 --- a/reactos/dll/win32/advapi32/crypt/crypt_sha.c +++ b/reactos/lib/cryptlib/sha1.c @@ -17,16 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -/* SHA Context Structure Declaration */ - -typedef struct { - ULONG Unknown[6]; - ULONG State[5]; - ULONG Count[2]; - UCHAR Buffer[64]; -} SHA_CTX, *PSHA_CTX; +#include "sha1.h" /* SHA1 Helper Macros */ @@ -107,7 +98,7 @@ static void SHA1Transform(ULONG State[5], UCHAR Buffer[64]) * RETURNS * Nothing */ -VOID WINAPI +VOID NTAPI A_SHAInit(PSHA_CTX Context) { /* SHA1 initialization constants */ @@ -133,8 +124,8 @@ A_SHAInit(PSHA_CTX Context) * RETURNS * Nothing */ -VOID WINAPI -A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) +VOID NTAPI +A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, ULONG BufferSize) { ULONG BufferContentSize; @@ -146,21 +137,21 @@ A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) if (BufferContentSize + BufferSize < 64) { - RtlCopyMemory(&Context->Buffer[BufferContentSize], Buffer, + memcpy(&Context->Buffer[BufferContentSize], Buffer, BufferSize); } else { while (BufferContentSize + BufferSize >= 64) { - RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, + memcpy(Context->Buffer + BufferContentSize, Buffer, 64 - BufferContentSize); Buffer += 64 - BufferContentSize; BufferSize -= 64 - BufferContentSize; SHA1Transform(Context->State, Context->Buffer); BufferContentSize = 0; } - RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, BufferSize); + memcpy(Context->Buffer + BufferContentSize, Buffer, BufferSize); } } @@ -176,7 +167,7 @@ A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) * RETURNS * Nothing */ -VOID WINAPI +VOID NTAPI A_SHAFinal(PSHA_CTX Context, PULONG Result) { INT Pad, Index; @@ -193,7 +184,7 @@ A_SHAFinal(PSHA_CTX Context, PULONG Result) LengthHi = (Context->Count[0] << 3) | (Context->Count[1] >> (32 - 3)); LengthLo = (Context->Count[1] << 3); - RtlZeroMemory(Buffer + 1, Pad - 1); + memset(Buffer + 1, 0, Pad - 1); Buffer[0] = 0x80; Count = (ULONG*)(Buffer + Pad); Count[0] = DWORD2BE(LengthHi); diff --git a/reactos/lib/cryptlib/sha1.h b/reactos/lib/cryptlib/sha1.h new file mode 100644 index 00000000000..e9e094efd7f --- /dev/null +++ b/reactos/lib/cryptlib/sha1.h @@ -0,0 +1,24 @@ + +#pragma once + +#include + +/* SHA Context Structure Declaration */ +typedef struct +{ + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX, *PSHA_CTX; + +VOID NTAPI +A_SHAInit(PSHA_CTX Context); + +VOID NTAPI +A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, ULONG BufferSize); + +VOID NTAPI +A_SHAFinal(PSHA_CTX Context, PULONG Result); + + diff --git a/reactos/lib/cryptlib/util.c b/reactos/lib/cryptlib/util.c new file mode 100644 index 00000000000..9858ec78528 --- /dev/null +++ b/reactos/lib/cryptlib/util.c @@ -0,0 +1,26 @@ + + +#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +#include +#include + +void +byteReverse(unsigned char *buf, unsigned longs) +{ + unsigned int t; + + do + { +#if 0 + t = (unsigned int)((unsigned)buf[3] << 8 | buf[2]) << 16 | + ((unsigned)buf[1] << 8 | buf[0]); +#else + t = _byteswap_ulong(*(unsigned int *)buf); +#endif + *(unsigned int *)buf = t; + buf += 4; + } while (--longs); +} + +#endif // (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + diff --git a/reactos/lib/cryptlib/util.h b/reactos/lib/cryptlib/util.h new file mode 100644 index 00000000000..f2e2cf526af --- /dev/null +++ b/reactos/lib/cryptlib/util.h @@ -0,0 +1,10 @@ + +#pragma once + + +#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +#define byteReverse(buf, long)((void)(buf, long)) +#else +void +byteReverse(unsigned char *buf, unsigned longs); +#endif From eea5796fdac6b0f830ab44ea52ef1a3386b3c562 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 15:37:02 +0000 Subject: [PATCH 043/124] [SCRRUN] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61806 --- reactos/dll/win32/scrrun/filesystem.c | 1 + reactos/dll/win32/scrrun/scrrun_private.h | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/scrrun/filesystem.c b/reactos/dll/win32/scrrun/filesystem.c index 79c37c90684..9dcace63540 100644 --- a/reactos/dll/win32/scrrun/filesystem.c +++ b/reactos/dll/win32/scrrun/filesystem.c @@ -21,6 +21,7 @@ #include #include #include +#include struct folder { IFolder IFolder_iface; diff --git a/reactos/dll/win32/scrrun/scrrun_private.h b/reactos/dll/win32/scrrun/scrrun_private.h index 7801bcf5d7e..4fccf44d133 100644 --- a/reactos/dll/win32/scrrun/scrrun_private.h +++ b/reactos/dll/win32/scrrun/scrrun_private.h @@ -19,7 +19,7 @@ #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ -#include +#include #include @@ -31,13 +31,12 @@ #include #include +#include #include #include #include #include -#include - #include WINE_DEFAULT_DEBUG_CHANNEL(scrrun); From aa6b0a87fe43ce723b6afb39c4716db022966b8f Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 15:49:57 +0000 Subject: [PATCH 044/124] [SECUR32] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61807 --- reactos/dll/win32/secur32/dllmain.c | 1 - reactos/dll/win32/secur32/precomp.h | 4 ---- reactos/dll/win32/secur32/secext.c | 4 +++- reactos/dll/win32/secur32/stubs.c | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/secur32/dllmain.c b/reactos/dll/win32/secur32/dllmain.c index 57385c94e9d..bed6f5abc0e 100644 --- a/reactos/dll/win32/secur32/dllmain.c +++ b/reactos/dll/win32/secur32/dllmain.c @@ -7,7 +7,6 @@ * Created 05/08/00 */ -/* INCLUDES ******************************************************************/ #include "precomp.h" /* GLOBALS *******************************************************************/ diff --git a/reactos/dll/win32/secur32/precomp.h b/reactos/dll/win32/secur32/precomp.h index ba2e353a351..5752b760d73 100644 --- a/reactos/dll/win32/secur32/precomp.h +++ b/reactos/dll/win32/secur32/precomp.h @@ -6,8 +6,6 @@ * PROGRAMMER: Alex Ionescu (alex@relsoft.net) */ -/* INCLUDES ******************************************************************/ - #include /* SDK/DDK/NDK Headers. */ @@ -16,10 +14,8 @@ #define COM_NO_WINDOWS_H #include #include -#include #define NTOS_MODE_USER #include -#include #include #include diff --git a/reactos/dll/win32/secur32/secext.c b/reactos/dll/win32/secur32/secext.c index 710f82ed9eb..2f694f19ca4 100644 --- a/reactos/dll/win32/secur32/secext.c +++ b/reactos/dll/win32/secur32/secext.c @@ -18,12 +18,14 @@ #include "precomp.h" +#include +#include + #define NDEBUG #include #define UNLEN 256 - /*********************************************************************** * GetComputerObjectNameA (SECUR32.@) Wine 1.1.14 * diff --git a/reactos/dll/win32/secur32/stubs.c b/reactos/dll/win32/secur32/stubs.c index 56214cf10b1..b2a94dcc6a0 100644 --- a/reactos/dll/win32/secur32/stubs.c +++ b/reactos/dll/win32/secur32/stubs.c @@ -1,4 +1,3 @@ - #include "precomp.h" #define NDEBUG @@ -50,4 +49,3 @@ GetSecurityUserInfo( UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } - From 9587e01663976f4eb0afdc2613279668d61a2860 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 25 Jan 2014 15:56:09 +0000 Subject: [PATCH 045/124] [MSGINA] - Enable the "Change Password" button of the security dialog. - Initialize the "Change Password" dialog. svn path=/trunk/; revision=61808 --- reactos/dll/win32/msgina/gui.c | 31 ++++++++++++++++++++++++-- reactos/dll/win32/msgina/lang/bg-BG.rc | 2 +- reactos/dll/win32/msgina/lang/cs-CZ.rc | 2 +- reactos/dll/win32/msgina/lang/de-DE.rc | 2 +- reactos/dll/win32/msgina/lang/es-ES.rc | 2 +- reactos/dll/win32/msgina/lang/fr-FR.rc | 2 +- reactos/dll/win32/msgina/lang/he-IL.rc | 2 +- reactos/dll/win32/msgina/lang/id-ID.rc | 2 +- reactos/dll/win32/msgina/lang/it-IT.rc | 2 +- reactos/dll/win32/msgina/lang/ja-JP.rc | 2 +- reactos/dll/win32/msgina/lang/no-NO.rc | 2 +- reactos/dll/win32/msgina/lang/pl-PL.rc | 2 +- reactos/dll/win32/msgina/lang/ro-RO.rc | 2 +- reactos/dll/win32/msgina/lang/ru-RU.rc | 2 +- reactos/dll/win32/msgina/lang/sk-SK.rc | 2 +- reactos/dll/win32/msgina/lang/tr-TR.rc | 2 +- reactos/dll/win32/msgina/lang/uk-UA.rc | 2 +- 17 files changed, 45 insertions(+), 18 deletions(-) diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c index 1e1a3bf0aa7..07b6d514c89 100644 --- a/reactos/dll/win32/msgina/gui.c +++ b/reactos/dll/win32/msgina/gui.c @@ -220,6 +220,14 @@ GetTextboxText( } +static +BOOL +DoChangePassword(HWND hwndDlg) +{ + return FALSE; +} + + static INT_PTR CALLBACK ChangePasswordDialogProc( IN HWND hwndDlg, @@ -227,17 +235,36 @@ ChangePasswordDialogProc( IN WPARAM wParam, IN LPARAM lParam) { + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + switch (uMsg) { case WM_INITDIALOG: - FIXME("ChangePasswordDialogProc: WM_INITDLG\n"); + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + + SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, pgContext->UserName); + SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_ADDSTRING, 0, (LPARAM)pgContext->Domain); + SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_SETCURSEL, 0, 0); + SetFocus(GetDlgItem(hwndDlg, IDC_CHANGEPWD_OLDPWD)); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - EndDialog(hwndDlg, TRUE); + if (DoChangePassword(hwndDlg)) + { + EndDialog(hwndDlg, TRUE); + } + else + { + SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NULL); + SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NULL); + SetFocus(GetDlgItem(hwndDlg, IDC_CHANGEPWD_OLDPWD)); + } return TRUE; case IDCANCEL: diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc index 2a048c87129..e88e000f7c1 100644 --- a/reactos/dll/win32/msgina/lang/bg-BG.rc +++ b/reactos/dll/win32/msgina/lang/bg-BG.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "Заключване на компютъра", IDC_LOCK, 25, 154, 99, 14 PUSHBUTTON "Изход", IDC_LOGOFF, 90, 135, 75, 14 PUSHBUTTON "Изключване", IDC_SHUTDOWN, 170, 135, 75, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Задачен управител", IDC_TASKMGR, 10, 135, 75, 14 PUSHBUTTON "Отказ", IDCANCEL, 130, 154, 99, 14 END diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc index 54a2468213e..3d25f68e1e8 100644 --- a/reactos/dll/win32/msgina/lang/cs-CZ.rc +++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc @@ -51,7 +51,7 @@ BEGIN PUSHBUTTON "Uzamknout poÄítaÄ", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Odhlásit", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Správce úloh", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Storno", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc index f540fff326f..28185199612 100644 --- a/reactos/dll/win32/msgina/lang/de-DE.rc +++ b/reactos/dll/win32/msgina/lang/de-DE.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "Computer sperren", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Abmelden...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Password ändern", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Password ändern", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Task-Manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 189, 154, 76, 14 END diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc index 929ebee4461..f740ffdb4fc 100644 --- a/reactos/dll/win32/msgina/lang/es-ES.rc +++ b/reactos/dll/win32/msgina/lang/es-ES.rc @@ -48,7 +48,7 @@ BEGIN PUSHBUTTON "Bloquear computadora", IDC_LOCK, 4, 135, 83, 14 PUSHBUTTON "Salir", IDC_LOGOFF, 92, 135, 88, 14 PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 186, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Administrador de tareas", IDC_TASKMGR, 92, 154, 88, 14 PUSHBUTTON "Cancelar", IDCANCEL, 186, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc index f0e09b25ab1..5732f52d09d 100644 --- a/reactos/dll/win32/msgina/lang/fr-FR.rc +++ b/reactos/dll/win32/msgina/lang/fr-FR.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "Verrouiller l'ordinateur", IDC_LOCK, 4, 135, 82, 14 PUSHBUTTON "Déconnecter", IDC_LOGOFF, 93, 135, 85, 14 PUSHBUTTON "Éteindre", IDC_SHUTDOWN, 184, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Gestionnaire de tâches", IDC_TASKMGR, 93, 154, 85, 14 PUSHBUTTON "Annuler", IDCANCEL, 184, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc index 5f59f139ad7..bf778f02a5d 100644 --- a/reactos/dll/win32/msgina/lang/he-IL.rc +++ b/reactos/dll/win32/msgina/lang/he-IL.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "לנעול ×ת המחשב", IDC_LOCK, 10, 76, 70, 14 PUSHBUTTON "להתנתק", IDC_LOGOFF, 90, 76, 70, 14 PUSHBUTTON "לכבות", IDC_SHUTDOWN, 170, 76, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "מנהל המשימות", IDC_TASKMGR, 90, 95, 70, 14 PUSHBUTTON "ביטול", IDCANCEL, 170, 95, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc index 924a0aebdf0..ec30a7271bc 100644 --- a/reactos/dll/win32/msgina/lang/id-ID.rc +++ b/reactos/dll/win32/msgina/lang/id-ID.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "Kunci komputer", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Keluar", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Matikan", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Manager Tugas", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Batal", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc index 19596a1b9b7..e6b1a3ed90b 100644 --- a/reactos/dll/win32/msgina/lang/it-IT.rc +++ b/reactos/dll/win32/msgina/lang/it-IT.rc @@ -54,7 +54,7 @@ BEGIN PUSHBUTTON "Bloccare il computer", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Fine sessione", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Task manager", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Annulla", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc index 023ed6cd546..65ad7386c0f 100644 --- a/reactos/dll/win32/msgina/lang/ja-JP.rc +++ b/reactos/dll/win32/msgina/lang/ja-JP.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "コンピュータã®ãƒ­ãƒƒã‚¯", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "ログオフ", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "シャットダウン", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "タスク マãƒãƒ¼ã‚¸ãƒ£", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "キャンセル", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc index 1bf186511bf..a7cde1ea879 100644 --- a/reactos/dll/win32/msgina/lang/no-NO.rc +++ b/reactos/dll/win32/msgina/lang/no-NO.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "LÃ¥s datamaskinen...", IDC_LOCK, 7, 135, 74, 14 PUSHBUTTON "Logg av...", IDC_LOGOFF, 86, 135, 78, 14 PUSHBUTTON "Avslutt...", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Oppgavebehandling...", IDC_TASKMGR, 86, 154, 78, 14 PUSHBUTTON "Avbryt", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc index 1722f8579d6..531104efb86 100644 --- a/reactos/dll/win32/msgina/lang/pl-PL.rc +++ b/reactos/dll/win32/msgina/lang/pl-PL.rc @@ -55,7 +55,7 @@ BEGIN PUSHBUTTON "Blokada komputera", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Wyloguj", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "WyÅ‚Ä…cz", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "ZmieÅ„ hasÅ‚o", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "ZmieÅ„ hasÅ‚o", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Menedżer zadaÅ„", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Anuluj", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc index 2624eeb335d..19f83f5842a 100644 --- a/reactos/dll/win32/msgina/lang/ro-RO.rc +++ b/reactos/dll/win32/msgina/lang/ro-RO.rc @@ -48,7 +48,7 @@ BEGIN PUSHBUTTON "&Blochează calculatorul", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "&Deautentifică-mă", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "ÃŽnchid&e calculatorul", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Schim&bă parola", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Schim&bă parola", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "&Gestionar de activități…", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "A&nulează", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc index eaba616da25..6ba97fc1b26 100644 --- a/reactos/dll/win32/msgina/lang/ru-RU.rc +++ b/reactos/dll/win32/msgina/lang/ru-RU.rc @@ -48,7 +48,7 @@ BEGIN PUSHBUTTON "Заблокировать", IDC_LOCK, 7, 135, 86, 14 PUSHBUTTON "Завершение ÑеанÑа", IDC_LOGOFF, 102, 135, 86, 14 PUSHBUTTON "Выключение", IDC_SHUTDOWN, 198, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "ДиÑпетчер задач", IDC_TASKMGR, 102, 154, 86, 14 PUSHBUTTON "Отмена", IDCANCEL, 198, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc index 6956d1bf68a..38ee9257d05 100644 --- a/reactos/dll/win32/msgina/lang/sk-SK.rc +++ b/reactos/dll/win32/msgina/lang/sk-SK.rc @@ -51,7 +51,7 @@ BEGIN PUSHBUTTON "Uzamknúť poÄítaÄ", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "OdhlásiÅ¥", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Vypnúť", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Správca úloh", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 170, 154, 70, 14 END diff --git a/reactos/dll/win32/msgina/lang/tr-TR.rc b/reactos/dll/win32/msgina/lang/tr-TR.rc index ba61e2740ce..267a080e0a9 100644 --- a/reactos/dll/win32/msgina/lang/tr-TR.rc +++ b/reactos/dll/win32/msgina/lang/tr-TR.rc @@ -48,7 +48,7 @@ BEGIN PUSHBUTTON "Bilgisayarı Kilitle", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Oturumu Kapat", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Bilgisayarı Kapat", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Åžifreyi DeÄŸiÅŸtir", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Åžifreyi DeÄŸiÅŸtir", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Görev Yöneticisi", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 189, 154, 76, 14 END diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc index 2d386342660..1b4d3249072 100644 --- a/reactos/dll/win32/msgina/lang/uk-UA.rc +++ b/reactos/dll/win32/msgina/lang/uk-UA.rc @@ -54,7 +54,7 @@ BEGIN PUSHBUTTON "БлокуваннÑ", IDC_LOCK, 6, 135, 70, 14 PUSHBUTTON "Вихід із ÑиÑтеми...", IDC_LOGOFF, 80, 135, 80, 14 PUSHBUTTON "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸...", IDC_SHUTDOWN, 165, 135, 86, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "ДиÑпетчер завдань", IDC_TASKMGR, 80, 154, 80, 14 PUSHBUTTON "СкаÑувати", IDCANCEL, 165, 154, 86, 14 END From 94e3683b77a620b173c834c3b3cc4f3f198476f3 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 17:11:51 +0000 Subject: [PATCH 046/124] [SHDOCVW] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61811 --- reactos/dll/win32/shdocvw/shdocvw.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/shdocvw/shdocvw.h b/reactos/dll/win32/shdocvw/shdocvw.h index 2e7b44105bc..3d40e19fbb6 100644 --- a/reactos/dll/win32/shdocvw/shdocvw.h +++ b/reactos/dll/win32/shdocvw/shdocvw.h @@ -22,7 +22,7 @@ #ifndef __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H -#include +#include #include @@ -34,11 +34,10 @@ #include #include +#include #include #include -#include - #include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); From 1bb3dbb5285bf8367b14e1a680d7ab15e0771fd4 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 17:24:24 +0000 Subject: [PATCH 047/124] [SHELL32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61812 --- reactos/dll/win32/shell32/CMenuBand.cpp | 1 + reactos/dll/win32/shell32/CMenuBand.h | 3 ++- reactos/dll/win32/shell32/CMenuDeskBar.cpp | 1 - reactos/dll/win32/shell32/CMenuDeskBar.h | 1 + reactos/dll/win32/shell32/authors.cpp | 1 - reactos/dll/win32/shell32/autocomplete.h | 2 +- reactos/dll/win32/shell32/brsfolder.cpp | 1 - reactos/dll/win32/shell32/changenotify.cpp | 1 - reactos/dll/win32/shell32/control.cpp | 1 - reactos/dll/win32/shell32/dialogs.cpp | 1 - reactos/dll/win32/shell32/dragdrophelper.h | 2 +- reactos/dll/win32/shell32/drvdefext.cpp | 3 ++- reactos/dll/win32/shell32/drvdefext.h | 5 ++--- reactos/dll/win32/shell32/enumidlist.h | 3 ++- reactos/dll/win32/shell32/filedefext.h | 2 +- reactos/dll/win32/shell32/folder_options.cpp | 2 +- reactos/dll/win32/shell32/folders/admintools.cpp | 1 - reactos/dll/win32/shell32/folders/admintools.h | 2 +- reactos/dll/win32/shell32/folders/cpanel.h | 2 +- reactos/dll/win32/shell32/folders/desktop.h | 2 +- reactos/dll/win32/shell32/folders/fonts.h | 2 +- reactos/dll/win32/shell32/folders/fs.h | 2 +- reactos/dll/win32/shell32/folders/mycomp.h | 2 +- reactos/dll/win32/shell32/folders/mydocuments.h | 2 +- reactos/dll/win32/shell32/folders/netplaces.h | 2 +- reactos/dll/win32/shell32/folders/printers.cpp | 2 ++ reactos/dll/win32/shell32/folders/printers.h | 2 +- reactos/dll/win32/shell32/folders/recyclebin.cpp | 6 ++++-- reactos/dll/win32/shell32/folders/recyclebin.h | 2 +- reactos/dll/win32/shell32/newmenu.h | 2 +- reactos/dll/win32/shell32/openwithmenu.h | 2 +- reactos/dll/win32/shell32/pidl.h | 2 +- reactos/dll/win32/shell32/precomp.h | 15 ++------------- reactos/dll/win32/shell32/shell32_main.cpp | 1 + reactos/dll/win32/shell32/shell32_main.h | 5 +---- reactos/dll/win32/shell32/shell32_version.h | 2 ++ reactos/dll/win32/shell32/shellitem.h | 2 +- reactos/dll/win32/shell32/shelllink.cpp | 2 ++ reactos/dll/win32/shell32/shelllink.h | 2 +- reactos/dll/win32/shell32/shellord.cpp | 3 +++ reactos/dll/win32/shell32/shellpath.cpp | 2 ++ reactos/dll/win32/shell32/shfldr.h | 2 +- reactos/dll/win32/shell32/shlfileop.cpp | 3 ++- reactos/dll/win32/shell32/shlview.cpp | 2 ++ reactos/dll/win32/shell32/startmenu.h | 2 +- reactos/dll/win32/shell32/xdg.h | 3 ++- 46 files changed, 56 insertions(+), 55 deletions(-) diff --git a/reactos/dll/win32/shell32/CMenuBand.cpp b/reactos/dll/win32/shell32/CMenuBand.cpp index 9239fbffbba..c2d75b64aa3 100644 --- a/reactos/dll/win32/shell32/CMenuBand.cpp +++ b/reactos/dll/win32/shell32/CMenuBand.cpp @@ -7,6 +7,7 @@ */ #include "precomp.h" + #include WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); diff --git a/reactos/dll/win32/shell32/CMenuBand.h b/reactos/dll/win32/shell32/CMenuBand.h index b0dae637d1c..208d0640214 100644 --- a/reactos/dll/win32/shell32/CMenuBand.h +++ b/reactos/dll/win32/shell32/CMenuBand.h @@ -1,3 +1,4 @@ +#pragma once class CMenuBand; @@ -160,4 +161,4 @@ BEGIN_COM_MAP(CMenuBand) COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) END_COM_MAP() -}; \ No newline at end of file +}; diff --git a/reactos/dll/win32/shell32/CMenuDeskBar.cpp b/reactos/dll/win32/shell32/CMenuDeskBar.cpp index 4d58b4ba24a..140b663794a 100644 --- a/reactos/dll/win32/shell32/CMenuDeskBar.cpp +++ b/reactos/dll/win32/shell32/CMenuDeskBar.cpp @@ -1,4 +1,3 @@ - #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/CMenuDeskBar.h b/reactos/dll/win32/shell32/CMenuDeskBar.h index 939cd1bafd6..68ee2f0118f 100644 --- a/reactos/dll/win32/shell32/CMenuDeskBar.h +++ b/reactos/dll/win32/shell32/CMenuDeskBar.h @@ -1,3 +1,4 @@ +#pragma once class CMenuDeskBar: public CComCoClass, diff --git a/reactos/dll/win32/shell32/authors.cpp b/reactos/dll/win32/shell32/authors.cpp index 76f71dbb716..d37927eda68 100644 --- a/reactos/dll/win32/shell32/authors.cpp +++ b/reactos/dll/win32/shell32/authors.cpp @@ -1,2 +1 @@ - const char * const SHELL_Authors[] = { "Copyright 1993-2012 WINE team", "Copyright 1998-2012 ReactOS Team", 0 }; diff --git a/reactos/dll/win32/shell32/autocomplete.h b/reactos/dll/win32/shell32/autocomplete.h index 5e72ff6d5f0..c1c2ebd110f 100644 --- a/reactos/dll/win32/shell32/autocomplete.h +++ b/reactos/dll/win32/shell32/autocomplete.h @@ -63,4 +63,4 @@ BEGIN_COM_MAP(CAutoComplete) END_COM_MAP() }; -#endif // _AUTOCOMPLETE_H_ +#endif /* _AUTOCOMPLETE_H_ */ diff --git a/reactos/dll/win32/shell32/brsfolder.cpp b/reactos/dll/win32/shell32/brsfolder.cpp index 3c62304a7ae..ace33088257 100644 --- a/reactos/dll/win32/shell32/brsfolder.cpp +++ b/reactos/dll/win32/shell32/brsfolder.cpp @@ -25,7 +25,6 @@ #include "precomp.h" - WINE_DEFAULT_DEBUG_CHANNEL(shell); /* original margins and control size */ diff --git a/reactos/dll/win32/shell32/changenotify.cpp b/reactos/dll/win32/shell32/changenotify.cpp index c0706a8cf00..e776158e3b2 100644 --- a/reactos/dll/win32/shell32/changenotify.cpp +++ b/reactos/dll/win32/shell32/changenotify.cpp @@ -20,7 +20,6 @@ #include "precomp.h" - WINE_DEFAULT_DEBUG_CHANNEL(shell); namespace diff --git a/reactos/dll/win32/shell32/control.cpp b/reactos/dll/win32/shell32/control.cpp index 0082ff36877..855c1f86f4d 100644 --- a/reactos/dll/win32/shell32/control.cpp +++ b/reactos/dll/win32/shell32/control.cpp @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shlctrl); diff --git a/reactos/dll/win32/shell32/dialogs.cpp b/reactos/dll/win32/shell32/dialogs.cpp index ed94a4d55c6..d47832ee124 100644 --- a/reactos/dll/win32/shell32/dialogs.cpp +++ b/reactos/dll/win32/shell32/dialogs.cpp @@ -20,7 +20,6 @@ #include "precomp.h" - typedef struct { HWND hwndOwner ; diff --git a/reactos/dll/win32/shell32/dragdrophelper.h b/reactos/dll/win32/shell32/dragdrophelper.h index 52909bdb9f3..a520ed655f0 100644 --- a/reactos/dll/win32/shell32/dragdrophelper.h +++ b/reactos/dll/win32/shell32/dragdrophelper.h @@ -50,4 +50,4 @@ BEGIN_COM_MAP(CDropTargetHelper) END_COM_MAP() }; -#endif // _DRAGDROPHELPER_H_ +#endif /* _DRAGDROPHELPER_H_ */ diff --git a/reactos/dll/win32/shell32/drvdefext.cpp b/reactos/dll/win32/shell32/drvdefext.cpp index 08b03e2aff5..2379c058ff5 100644 --- a/reactos/dll/win32/shell32/drvdefext.cpp +++ b/reactos/dll/win32/shell32/drvdefext.cpp @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _USE_MATH_DEFINES #include "precomp.h" + +#define _USE_MATH_DEFINES #include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/drvdefext.h b/reactos/dll/win32/shell32/drvdefext.h index efb91066006..4611f88f9a2 100644 --- a/reactos/dll/win32/shell32/drvdefext.h +++ b/reactos/dll/win32/shell32/drvdefext.h @@ -19,7 +19,7 @@ */ #ifndef _DRV_DEF_EXT_H_ -#define _FILE_DEF_EXT_H_ +#define _DRV_DEF_EXT_H_ class CDrvDefExt : public CComCoClass, @@ -72,5 +72,4 @@ BEGIN_COM_MAP(CDrvDefExt) END_COM_MAP() }; -#endif // _FILE_DEF_EXT_H_ - +#endif /* _DRV_DEF_EXT_H_ */ diff --git a/reactos/dll/win32/shell32/enumidlist.h b/reactos/dll/win32/shell32/enumidlist.h index 03bde1bccf0..5c056f5d700 100644 --- a/reactos/dll/win32/shell32/enumidlist.h +++ b/reactos/dll/win32/shell32/enumidlist.h @@ -13,6 +13,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __ENUMIDLIST_H__ #define __ENUMIDLIST_H__ @@ -49,4 +50,4 @@ BEGIN_COM_MAP(IEnumIDListImpl) END_COM_MAP() }; -#endif /* ndef __ENUMIDLIST_H__ */ +#endif /* __ENUMIDLIST_H__ */ diff --git a/reactos/dll/win32/shell32/filedefext.h b/reactos/dll/win32/shell32/filedefext.h index 33117b1060a..4252bcd3f05 100644 --- a/reactos/dll/win32/shell32/filedefext.h +++ b/reactos/dll/win32/shell32/filedefext.h @@ -116,4 +116,4 @@ BEGIN_COM_MAP(CFileDefExt) END_COM_MAP() }; -#endif // _FILE_DEF_EXT_H_ +#endif /* _FILE_DEF_EXT_H_ */ diff --git a/reactos/dll/win32/shell32/folder_options.cpp b/reactos/dll/win32/shell32/folder_options.cpp index b609b1076e1..76445683241 100644 --- a/reactos/dll/win32/shell32/folder_options.cpp +++ b/reactos/dll/win32/shell32/folder_options.cpp @@ -20,8 +20,8 @@ #include "precomp.h" - WINE_DEFAULT_DEBUG_CHANNEL (fprop); + #define MAX_PROPERTY_SHEET_PAGE (32) /// Folder Options: diff --git a/reactos/dll/win32/shell32/folders/admintools.cpp b/reactos/dll/win32/shell32/folders/admintools.cpp index 42edb6e847b..0e93a4f2160 100644 --- a/reactos/dll/win32/shell32/folders/admintools.cpp +++ b/reactos/dll/win32/shell32/folders/admintools.cpp @@ -23,7 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); - /* This folder should not exist. It is just a file system folder... */ diff --git a/reactos/dll/win32/shell32/folders/admintools.h b/reactos/dll/win32/shell32/folders/admintools.h index bfbf456790c..7c3a8361504 100644 --- a/reactos/dll/win32/shell32/folders/admintools.h +++ b/reactos/dll/win32/shell32/folders/admintools.h @@ -84,4 +84,4 @@ class CAdminToolsFolder : END_COM_MAP() }; -#endif // _SHFLDR_ADMINTOOLS_H_ +#endif /* _SHFLDR_ADMINTOOLS_H_ */ diff --git a/reactos/dll/win32/shell32/folders/cpanel.h b/reactos/dll/win32/shell32/folders/cpanel.h index 0ceec8d37b6..0d3b6d9559e 100644 --- a/reactos/dll/win32/shell32/folders/cpanel.h +++ b/reactos/dll/win32/shell32/folders/cpanel.h @@ -107,4 +107,4 @@ class CControlPanelFolder : END_COM_MAP() }; -#endif // _SHFLDR_CPANEL_H_ +#endif /* _SHFLDR_CPANEL_H_ */ diff --git a/reactos/dll/win32/shell32/folders/desktop.h b/reactos/dll/win32/shell32/folders/desktop.h index 16f47a12d73..6f4c723d06a 100644 --- a/reactos/dll/win32/shell32/folders/desktop.h +++ b/reactos/dll/win32/shell32/folders/desktop.h @@ -105,4 +105,4 @@ class CDesktopFolder : END_COM_MAP() }; -#endif // _CDESKTOPFOLDER_H_ +#endif /* _CDESKTOPFOLDER_H_ */ diff --git a/reactos/dll/win32/shell32/folders/fonts.h b/reactos/dll/win32/shell32/folders/fonts.h index d21c740086b..68db4609444 100644 --- a/reactos/dll/win32/shell32/folders/fonts.h +++ b/reactos/dll/win32/shell32/folders/fonts.h @@ -92,4 +92,4 @@ class CFontsFolder : END_COM_MAP() }; -#endif // _SHFLDR_FONTS_H_ +#endif /* _SHFLDR_FONTS_H_ */ diff --git a/reactos/dll/win32/shell32/folders/fs.h b/reactos/dll/win32/shell32/folders/fs.h index 8b687c3ffc9..23213680aea 100644 --- a/reactos/dll/win32/shell32/folders/fs.h +++ b/reactos/dll/win32/shell32/folders/fs.h @@ -126,4 +126,4 @@ struct _DoDropData { DWORD pdwEffect; }; -#endif // _CFSFOLDER_H_ +#endif /* _CFSFOLDER_H_ */ diff --git a/reactos/dll/win32/shell32/folders/mycomp.h b/reactos/dll/win32/shell32/folders/mycomp.h index 5844b7a4665..b8275a7fd5d 100644 --- a/reactos/dll/win32/shell32/folders/mycomp.h +++ b/reactos/dll/win32/shell32/folders/mycomp.h @@ -82,4 +82,4 @@ class CDrivesFolder : END_COM_MAP() }; -#endif // _CDRIVESFOLDER_H_ +#endif /* _CDRIVESFOLDER_H_ */ diff --git a/reactos/dll/win32/shell32/folders/mydocuments.h b/reactos/dll/win32/shell32/folders/mydocuments.h index e03bab3774d..c52ffe5346f 100644 --- a/reactos/dll/win32/shell32/folders/mydocuments.h +++ b/reactos/dll/win32/shell32/folders/mydocuments.h @@ -81,4 +81,4 @@ class CMyDocsFolder : END_COM_MAP() }; -#endif // _SHFLDR_MYDOCUMENTS_H_ +#endif /* _SHFLDR_MYDOCUMENTS_H_ */ diff --git a/reactos/dll/win32/shell32/folders/netplaces.h b/reactos/dll/win32/shell32/folders/netplaces.h index 21949606df0..a6ca94ed510 100644 --- a/reactos/dll/win32/shell32/folders/netplaces.h +++ b/reactos/dll/win32/shell32/folders/netplaces.h @@ -82,4 +82,4 @@ class CNetFolder : END_COM_MAP() }; -#endif // _SHFLDR_NETPLACES_H_ +#endif /* _SHFLDR_NETPLACES_H_ */ diff --git a/reactos/dll/win32/shell32/folders/printers.cpp b/reactos/dll/win32/shell32/folders/printers.cpp index f493a04adcb..f459fa0d595 100644 --- a/reactos/dll/win32/shell32/folders/printers.cpp +++ b/reactos/dll/win32/shell32/folders/printers.cpp @@ -23,6 +23,8 @@ #include +#include + WINE_DEFAULT_DEBUG_CHANNEL (shell); /*********************************************************************** diff --git a/reactos/dll/win32/shell32/folders/printers.h b/reactos/dll/win32/shell32/folders/printers.h index 128ed50cdbe..7e4edced98a 100644 --- a/reactos/dll/win32/shell32/folders/printers.h +++ b/reactos/dll/win32/shell32/folders/printers.h @@ -85,4 +85,4 @@ class CPrinterFolder : END_COM_MAP() }; -#endif // _SHFLDR_PRINTERS_H_ +#endif /* _SHFLDR_PRINTERS_H_ */ diff --git a/reactos/dll/win32/shell32/folders/recyclebin.cpp b/reactos/dll/win32/shell32/folders/recyclebin.cpp index 50753d2341a..733873a807b 100644 --- a/reactos/dll/win32/shell32/folders/recyclebin.cpp +++ b/reactos/dll/win32/shell32/folders/recyclebin.cpp @@ -19,10 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define MAX_PROPERTY_SHEET_PAGE 32 - #include +#include + +#define MAX_PROPERTY_SHEET_PAGE 32 + WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin); typedef struct diff --git a/reactos/dll/win32/shell32/folders/recyclebin.h b/reactos/dll/win32/shell32/folders/recyclebin.h index 709c3eca4f7..8355697e845 100644 --- a/reactos/dll/win32/shell32/folders/recyclebin.h +++ b/reactos/dll/win32/shell32/folders/recyclebin.h @@ -110,4 +110,4 @@ class CRecycleBin : END_COM_MAP() }; -#endif // _SHFLDR_RECYCLEBIN_H_ +#endif /* _SHFLDR_RECYCLEBIN_H_ */ diff --git a/reactos/dll/win32/shell32/newmenu.h b/reactos/dll/win32/shell32/newmenu.h index 12767d02739..88b29823356 100644 --- a/reactos/dll/win32/shell32/newmenu.h +++ b/reactos/dll/win32/shell32/newmenu.h @@ -99,4 +99,4 @@ BEGIN_COM_MAP(CNewMenu) END_COM_MAP() }; -#endif // _SHV_ITEM_NEW_H_ +#endif /* _SHV_ITEM_NEW_H_ */ diff --git a/reactos/dll/win32/shell32/openwithmenu.h b/reactos/dll/win32/shell32/openwithmenu.h index 67b1e947b49..739fe05931e 100644 --- a/reactos/dll/win32/shell32/openwithmenu.h +++ b/reactos/dll/win32/shell32/openwithmenu.h @@ -68,4 +68,4 @@ class COpenWithMenu : END_COM_MAP() }; -#endif // _SHE_OCMENU_H_ +#endif /* _SHE_OCMENU_H_ */ diff --git a/reactos/dll/win32/shell32/pidl.h b/reactos/dll/win32/shell32/pidl.h index ad149c04402..2def2a8300d 100644 --- a/reactos/dll/win32/shell32/pidl.h +++ b/reactos/dll/win32/shell32/pidl.h @@ -302,4 +302,4 @@ LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida); BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); -#endif +#endif /* __WINE_PIDL_H */ diff --git a/reactos/dll/win32/shell32/precomp.h b/reactos/dll/win32/shell32/precomp.h index b977194b79f..f464d095bcf 100644 --- a/reactos/dll/win32/shell32/precomp.h +++ b/reactos/dll/win32/shell32/precomp.h @@ -12,33 +12,23 @@ #include #include -#include #include #include #include -#include #include #include -#include -#include #include #include #include #include #include -#include -#include #include #include #include -#include -#include - #include #include #include #include -#include //#include "base/shell/explorer-new/todo.h" //#include "dlgs.h" @@ -51,8 +41,6 @@ #include "enumidlist.h" #include "shfldr.h" #include "shellfolder.h" -#include "xdg.h" - #include "shellitem.h" #include "shelllink.h" #include "dragdrophelper.h" @@ -76,6 +64,7 @@ #include "CMenuDeskBar.h" #include +#include extern const GUID CLSID_AdminFolderShortcut; extern const GUID CLSID_FontsFolderShortcut; @@ -87,4 +76,4 @@ extern const GUID CLSID_UnixDosFolder; extern const GUID SHELL32_AdvtShortcutProduct; extern const GUID SHELL32_AdvtShortcutComponent; -#endif +#endif /* _PRECOMP_H__ */ diff --git a/reactos/dll/win32/shell32/shell32_main.cpp b/reactos/dll/win32/shell32/shell32_main.cpp index 92c1195c6a8..21ccb1aa81d 100644 --- a/reactos/dll/win32/shell32/shell32_main.cpp +++ b/reactos/dll/win32/shell32/shell32_main.cpp @@ -20,6 +20,7 @@ */ #include "precomp.h" + #include "shell32_version.h" #include diff --git a/reactos/dll/win32/shell32/shell32_main.h b/reactos/dll/win32/shell32/shell32_main.h index bb0a148b027..7c6d8643c60 100644 --- a/reactos/dll/win32/shell32/shell32_main.h +++ b/reactos/dll/win32/shell32/shell32_main.h @@ -22,9 +22,6 @@ #ifndef __WINE_SHELL_MAIN_H #define __WINE_SHELL_MAIN_H -#include - - /******************************************* * global SHELL32.DLL variables */ @@ -205,4 +202,4 @@ LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT EXTERN_C HRESULT WINAPI DoRegisterServer(void); EXTERN_C HRESULT WINAPI DoUnregisterServer(void); -#endif +#endif /* __WINE_SHELL_MAIN_H */ diff --git a/reactos/dll/win32/shell32/shell32_version.h b/reactos/dll/win32/shell32/shell32_version.h index cd0d8dbb9c7..92a0baf9bf9 100644 --- a/reactos/dll/win32/shell32/shell32_version.h +++ b/reactos/dll/win32/shell32/shell32_version.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define WINE_FILEVERSION_MAJOR 5 #define WINE_FILEVERSION_MINOR 0 #define WINE_FILEVERSION_BUILD 3900 diff --git a/reactos/dll/win32/shell32/shellitem.h b/reactos/dll/win32/shell32/shellitem.h index 9bb0f6c12e6..a75698edfac 100644 --- a/reactos/dll/win32/shell32/shellitem.h +++ b/reactos/dll/win32/shell32/shellitem.h @@ -60,4 +60,4 @@ BEGIN_COM_MAP(CShellItem) END_COM_MAP() }; -#endif // _SHELLITEM_H_ +#endif /* _SHELLITEM_H_ */ diff --git a/reactos/dll/win32/shell32/shelllink.cpp b/reactos/dll/win32/shell32/shelllink.cpp index f74fcb9cd05..156e4073426 100644 --- a/reactos/dll/win32/shell32/shelllink.cpp +++ b/reactos/dll/win32/shell32/shelllink.cpp @@ -36,6 +36,8 @@ #include "precomp.h" +#include + WINE_DEFAULT_DEBUG_CHANNEL(shell); #define SHLINK_LOCAL 0 diff --git a/reactos/dll/win32/shell32/shelllink.h b/reactos/dll/win32/shell32/shelllink.h index 40c5f10d8a2..47cb0fa8abb 100644 --- a/reactos/dll/win32/shell32/shelllink.h +++ b/reactos/dll/win32/shell32/shelllink.h @@ -179,4 +179,4 @@ BEGIN_COM_MAP(CShellLink) END_COM_MAP() }; -#endif // _SHELLLINK_H_ +#endif /* _SHELLLINK_H_ */ diff --git a/reactos/dll/win32/shell32/shellord.cpp b/reactos/dll/win32/shell32/shellord.cpp index 0e6f8010c87..629e1f832cd 100644 --- a/reactos/dll/win32/shell32/shellord.cpp +++ b/reactos/dll/win32/shell32/shellord.cpp @@ -22,6 +22,9 @@ #include "precomp.h" +#include +#include + WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); diff --git a/reactos/dll/win32/shell32/shellpath.cpp b/reactos/dll/win32/shell32/shellpath.cpp index 685d16926eb..8511feffda9 100644 --- a/reactos/dll/win32/shell32/shellpath.cpp +++ b/reactos/dll/win32/shell32/shellpath.cpp @@ -26,6 +26,8 @@ #include "precomp.h" +#include + WINE_DEFAULT_DEBUG_CHANNEL(shell); /* diff --git a/reactos/dll/win32/shell32/shfldr.h b/reactos/dll/win32/shell32/shfldr.h index 886f36619b8..8a194ce17d5 100644 --- a/reactos/dll/win32/shell32/shfldr.h +++ b/reactos/dll/win32/shell32/shfldr.h @@ -75,4 +75,4 @@ static int __inline SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str) void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags); BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); -#endif // _SHFLDR_H_ +#endif /* _SHFLDR_H_ */ diff --git a/reactos/dll/win32/shell32/shlfileop.cpp b/reactos/dll/win32/shell32/shlfileop.cpp index 97cdb02b23a..1135afc258a 100644 --- a/reactos/dll/win32/shell32/shlfileop.cpp +++ b/reactos/dll/win32/shell32/shlfileop.cpp @@ -21,9 +21,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#define NO_SHLWAPI_STREAM #include "precomp.h" +#include "xdg.h" + WINE_DEFAULT_DEBUG_CHANNEL(shell); #define IsAttrib(x, y) ((INVALID_FILE_ATTRIBUTES != (x)) && ((x) & (y))) diff --git a/reactos/dll/win32/shell32/shlview.cpp b/reactos/dll/win32/shell32/shlview.cpp index 5d8f4b2fed0..5cf59f3a64a 100644 --- a/reactos/dll/win32/shell32/shlview.cpp +++ b/reactos/dll/win32/shell32/shlview.cpp @@ -50,6 +50,8 @@ TODO: #include "precomp.h" +#include + WINE_DEFAULT_DEBUG_CHANNEL(shell); #undef SV_CLASS_NAME diff --git a/reactos/dll/win32/shell32/startmenu.h b/reactos/dll/win32/shell32/startmenu.h index c91467af52c..29e2778bb6a 100644 --- a/reactos/dll/win32/shell32/startmenu.h +++ b/reactos/dll/win32/shell32/startmenu.h @@ -152,4 +152,4 @@ BEGIN_COM_MAP(CMenuBandSite) END_COM_MAP() }; -#endif // _STARTMENU_H_ +#endif /* _STARTMENU_H_ */ diff --git a/reactos/dll/win32/shell32/xdg.h b/reactos/dll/win32/shell32/xdg.h index 6c083c66e32..ef40cc95911 100644 --- a/reactos/dll/win32/shell32/xdg.h +++ b/reactos/dll/win32/shell32/xdg.h @@ -13,6 +13,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __XDG_H__ #define __XDG_H__ @@ -48,4 +49,4 @@ HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count); void TRASH_DisposeElement(TRASH_ELEMENT *element); -#endif /* ndef __XDG_H__ */ +#endif /* __XDG_H__ */ From bdc225df748ef73528f339df68e41f14d7edae16 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 18:07:29 +0000 Subject: [PATCH 048/124] [SMDLL] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61813 --- reactos/dll/win32/smdll/dllmain.c | 2 +- reactos/dll/win32/smdll/precomp.h | 9 +++++---- reactos/dll/win32/smdll/query.c | 5 +++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/smdll/dllmain.c b/reactos/dll/win32/smdll/dllmain.c index 604f8944d40..69f25548907 100644 --- a/reactos/dll/win32/smdll/dllmain.c +++ b/reactos/dll/win32/smdll/dllmain.c @@ -5,7 +5,7 @@ * PURPOSE: SM Helper Library */ -#include "precomp.h" +#include BOOL WINAPI DllMainCRTStartup(HANDLE hinstDll, DWORD fdwReason, LPVOID fImpLoad) { diff --git a/reactos/dll/win32/smdll/precomp.h b/reactos/dll/win32/smdll/precomp.h index 75509b224f0..ef73922dae9 100644 --- a/reactos/dll/win32/smdll/precomp.h +++ b/reactos/dll/win32/smdll/precomp.h @@ -1,4 +1,5 @@ -#define NTOS_MODE_USER -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include diff --git a/reactos/dll/win32/smdll/query.c b/reactos/dll/win32/smdll/query.c index a26e8b7b1c9..f7858ece5fe 100644 --- a/reactos/dll/win32/smdll/query.c +++ b/reactos/dll/win32/smdll/query.c @@ -7,6 +7,11 @@ #include "precomp.h" +#define NTOS_MODE_USER +#include +#include +#include + #define NDEBUG #include From d949029f99ed4adcf375a886ee629e066539ba00 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 18:44:55 +0000 Subject: [PATCH 049/124] [STI] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61814 --- reactos/dll/win32/sti/CMakeLists.txt | 1 + reactos/dll/win32/sti/guid.c | 14 ++++++++++++++ reactos/dll/win32/sti/precomp.h | 19 +++++++++++++++++++ reactos/dll/win32/sti/sti.c | 16 +--------------- reactos/dll/win32/sti/sti_main.c | 21 +-------------------- 5 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 reactos/dll/win32/sti/guid.c create mode 100644 reactos/dll/win32/sti/precomp.h diff --git a/reactos/dll/win32/sti/CMakeLists.txt b/reactos/dll/win32/sti/CMakeLists.txt index aa46801d69b..fab24cc291f 100644 --- a/reactos/dll/win32/sti/CMakeLists.txt +++ b/reactos/dll/win32/sti/CMakeLists.txt @@ -11,6 +11,7 @@ spec2def(sti.dll sti.spec) list(APPEND SOURCE sti.c sti_main.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) diff --git a/reactos/dll/win32/sti/guid.c b/reactos/dll/win32/sti/guid.c new file mode 100644 index 00000000000..1c276f9817d --- /dev/null +++ b/reactos/dll/win32/sti/guid.c @@ -0,0 +1,14 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/dll/win32/sti/precomp.h b/reactos/dll/win32/sti/precomp.h new file mode 100644 index 00000000000..8c0b0f6342a --- /dev/null +++ b/reactos/dll/win32/sti/precomp.h @@ -0,0 +1,19 @@ +#ifndef _STI_PCH_ +#define _STI_PCH_ + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include +#include +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(sti); + +#endif /* _STI_PCH_ */ diff --git a/reactos/dll/win32/sti/sti.c b/reactos/dll/win32/sti/sti.c index d326710d328..77f6a9aaa81 100644 --- a/reactos/dll/win32/sti/sti.c +++ b/reactos/dll/win32/sti/sti.c @@ -17,26 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -#include - -#define COBJMACROS - -#include -#include #include -//#include "winerror.h" -//#include "objbase.h" -#include -#include #include -WINE_DEFAULT_DEBUG_CHANNEL(sti); - static const WCHAR registeredAppsLaunchPath[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', diff --git a/reactos/dll/win32/sti/sti_main.c b/reactos/dll/win32/sti/sti_main.c index 2bd3a093b2c..291daebab7d 100644 --- a/reactos/dll/win32/sti/sti_main.c +++ b/reactos/dll/win32/sti/sti_main.c @@ -17,26 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include - -#define COBJMACROS - -#include -#include -//#include "winreg.h" -//#include "winerror.h" -//#include "objbase.h" -#include -//#include "wia_lh.h" -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(sti); +#include "precomp.h" extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; From b0f8149ac24a33b7f1b2ae28ce542bef75dadb78 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 19:01:00 +0000 Subject: [PATCH 050/124] [SXS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61817 --- reactos/dll/win32/sxs/CMakeLists.txt | 1 + reactos/dll/win32/sxs/cache.c | 23 ++++------------------- reactos/dll/win32/sxs/guid.c | 16 ++++++++++++++++ reactos/dll/win32/sxs/name.c | 17 ----------------- reactos/dll/win32/sxs/sxs.c | 8 +------- reactos/dll/win32/sxs/sxs_private.h | 18 ++++++++++++++++++ 6 files changed, 40 insertions(+), 43 deletions(-) create mode 100644 reactos/dll/win32/sxs/guid.c diff --git a/reactos/dll/win32/sxs/CMakeLists.txt b/reactos/dll/win32/sxs/CMakeLists.txt index 5ad7a23c463..b21b2dd3ad3 100644 --- a/reactos/dll/win32/sxs/CMakeLists.txt +++ b/reactos/dll/win32/sxs/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE cache.c name.c sxs.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/sxs.def) diff --git a/reactos/dll/win32/sxs/cache.c b/reactos/dll/win32/sxs/cache.c index e5b7656af61..7896e275732 100644 --- a/reactos/dll/win32/sxs/cache.c +++ b/reactos/dll/win32/sxs/cache.c @@ -18,27 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include - -#define COBJMACROS -#define INITGUID - -#include -#include -#include -#include -#include - -#include -#include -#include #include "sxs_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(sxs); +#include +#include + +#include static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; diff --git a/reactos/dll/win32/sxs/guid.c b/reactos/dll/win32/sxs/guid.c new file mode 100644 index 00000000000..613a04b95bb --- /dev/null +++ b/reactos/dll/win32/sxs/guid.c @@ -0,0 +1,16 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/dll/win32/sxs/name.c b/reactos/dll/win32/sxs/name.c index f4be576af0e..5512e774793 100644 --- a/reactos/dll/win32/sxs/name.c +++ b/reactos/dll/win32/sxs/name.c @@ -18,25 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include - -#define COBJMACROS - -#include -#include -#include -#include - -#include -#include #include "sxs_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(sxs); - struct name { IAssemblyName IAssemblyName_iface; diff --git a/reactos/dll/win32/sxs/sxs.c b/reactos/dll/win32/sxs/sxs.c index f25a490a2cc..f5aab4c9d03 100644 --- a/reactos/dll/win32/sxs/sxs.c +++ b/reactos/dll/win32/sxs/sxs.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include - -#include -#include - +#include "sxs_private.h" /*********************************************************************** * DllMain (SXS.@) diff --git a/reactos/dll/win32/sxs/sxs_private.h b/reactos/dll/win32/sxs/sxs_private.h index 8ff99201e2a..dd2b2c34d24 100644 --- a/reactos/dll/win32/sxs/sxs_private.h +++ b/reactos/dll/win32/sxs/sxs_private.h @@ -16,6 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include +#include +#include +#include + +#include +#include + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + enum name_attr_id { NAME_ATTR_ID_NAME, From 45f68df5a101aa504f1c28bea6ed54d3f7b6db47 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 19:51:44 +0000 Subject: [PATCH 051/124] [SYSSETUP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61818 --- reactos/dll/win32/syssetup/classinst.c | 1 - reactos/dll/win32/syssetup/dllmain.c | 1 - reactos/dll/win32/syssetup/globals.h | 1 + reactos/dll/win32/syssetup/install.c | 7 +++++++ reactos/dll/win32/syssetup/logfile.c | 2 +- reactos/dll/win32/syssetup/precomp.h | 18 ++---------------- reactos/dll/win32/syssetup/security.c | 6 +++++- reactos/dll/win32/syssetup/wizard.c | 5 +++++ 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/reactos/dll/win32/syssetup/classinst.c b/reactos/dll/win32/syssetup/classinst.c index 5c3a4d0a754..8e043211426 100644 --- a/reactos/dll/win32/syssetup/classinst.c +++ b/reactos/dll/win32/syssetup/classinst.c @@ -11,7 +11,6 @@ #define NDEBUG #include - /* * @unimplemented */ diff --git a/reactos/dll/win32/syssetup/dllmain.c b/reactos/dll/win32/syssetup/dllmain.c index 731a784ab90..120fb63ed4e 100644 --- a/reactos/dll/win32/syssetup/dllmain.c +++ b/reactos/dll/win32/syssetup/dllmain.c @@ -32,7 +32,6 @@ HINSTANCE hDllInstance; - /* FUNCTIONS *****************************************************************/ BOOL WINAPI diff --git a/reactos/dll/win32/syssetup/globals.h b/reactos/dll/win32/syssetup/globals.h index 756a68be5f5..f6764808e6a 100644 --- a/reactos/dll/win32/syssetup/globals.h +++ b/reactos/dll/win32/syssetup/globals.h @@ -16,6 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#pragma once typedef struct _TZ_INFO { diff --git a/reactos/dll/win32/syssetup/install.c b/reactos/dll/win32/syssetup/install.c index ce5024aeee8..097537e394f 100644 --- a/reactos/dll/win32/syssetup/install.c +++ b/reactos/dll/win32/syssetup/install.c @@ -28,7 +28,14 @@ #include "precomp.h" +#include +#include +#include +#include +#include +#include #include +#include #define NDEBUG #include diff --git a/reactos/dll/win32/syssetup/logfile.c b/reactos/dll/win32/syssetup/logfile.c index 4d3679f98ef..ea0db8e547d 100644 --- a/reactos/dll/win32/syssetup/logfile.c +++ b/reactos/dll/win32/syssetup/logfile.c @@ -25,13 +25,13 @@ */ /* INCLUDES *****************************************************************/ + #include "precomp.h" /* GLOBALS ******************************************************************/ HANDLE hLogFile = NULL; - /* FUNCTIONS ****************************************************************/ BOOL WINAPI diff --git a/reactos/dll/win32/syssetup/precomp.h b/reactos/dll/win32/syssetup/precomp.h index 6dbfee864c0..79b5f488bc6 100644 --- a/reactos/dll/win32/syssetup/precomp.h +++ b/reactos/dll/win32/syssetup/precomp.h @@ -1,4 +1,4 @@ -#include +#include #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -8,26 +8,12 @@ #include #include #include -#include -#include #include -#include -#include #define NTOS_MODE_USER -#include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include "globals.h" #include "resource.h" diff --git a/reactos/dll/win32/syssetup/security.c b/reactos/dll/win32/syssetup/security.c index 0e55d0befb5..c181f2c09ae 100644 --- a/reactos/dll/win32/syssetup/security.c +++ b/reactos/dll/win32/syssetup/security.c @@ -10,10 +10,14 @@ #include "precomp.h" +#include +#include +#include +#include + #define NDEBUG #include - /* FUNCTIONS ****************************************************************/ NTSTATUS diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c index 39c33631c6a..9cbcb49b6a6 100644 --- a/reactos/dll/win32/syssetup/wizard.c +++ b/reactos/dll/win32/syssetup/wizard.c @@ -11,6 +11,11 @@ #include "precomp.h" +#include +#include +#include +#include + #define NDEBUG #include From aeec575e5a53c5a03edffc9a9e9760888b81992d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 20:24:12 +0000 Subject: [PATCH 052/124] [URLMON] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61819 --- reactos/dll/win32/urlmon/umon.c | 1 + reactos/dll/win32/urlmon/urlmon_main.c | 2 ++ reactos/dll/win32/urlmon/urlmon_main.h | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/urlmon/umon.c b/reactos/dll/win32/urlmon/umon.c index ffedf647334..132e97ede49 100644 --- a/reactos/dll/win32/urlmon/umon.c +++ b/reactos/dll/win32/urlmon/umon.c @@ -22,6 +22,7 @@ #include "urlmon_main.h" +#include #include typedef struct { diff --git a/reactos/dll/win32/urlmon/urlmon_main.c b/reactos/dll/win32/urlmon/urlmon_main.c index 3610b635852..50167187dfb 100644 --- a/reactos/dll/win32/urlmon/urlmon_main.c +++ b/reactos/dll/win32/urlmon/urlmon_main.c @@ -20,6 +20,8 @@ #include "urlmon_main.h" +#include + #include DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); diff --git a/reactos/dll/win32/urlmon/urlmon_main.h b/reactos/dll/win32/urlmon/urlmon_main.h index 59bca7e9c0a..e93c80b1457 100644 --- a/reactos/dll/win32/urlmon/urlmon_main.h +++ b/reactos/dll/win32/urlmon/urlmon_main.h @@ -33,18 +33,18 @@ #include #include #include -#include +#include +#include #include #include -#include #include #define NO_SHLWAPI_REG #include +#include #include #include -#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; From 9d7f24e068f896c631b759004c30db4193382c73 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 22:24:43 +0000 Subject: [PATCH 053/124] [USERENV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61820 --- reactos/dll/win32/userenv/desktop.c | 3 ++- reactos/dll/win32/userenv/directory.c | 1 - reactos/dll/win32/userenv/environment.c | 1 - reactos/dll/win32/userenv/gpolicy.c | 1 - reactos/dll/win32/userenv/internal.h | 2 -- reactos/dll/win32/userenv/misc.c | 2 ++ reactos/dll/win32/userenv/precomp.h | 7 +++---- reactos/dll/win32/userenv/profile.c | 3 ++- reactos/dll/win32/userenv/registry.c | 1 - reactos/dll/win32/userenv/setup.c | 1 + 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/reactos/dll/win32/userenv/desktop.c b/reactos/dll/win32/userenv/desktop.c index a8ca97ac6d8..3ff403dd9a5 100644 --- a/reactos/dll/win32/userenv/desktop.c +++ b/reactos/dll/win32/userenv/desktop.c @@ -26,10 +26,11 @@ #include "precomp.h" +#include + #define NDEBUG #include - /* FUNCTIONS ***************************************************************/ static diff --git a/reactos/dll/win32/userenv/directory.c b/reactos/dll/win32/userenv/directory.c index d3232fb52ae..938d10190b1 100644 --- a/reactos/dll/win32/userenv/directory.c +++ b/reactos/dll/win32/userenv/directory.c @@ -29,7 +29,6 @@ #define NDEBUG #include - /* FUNCTIONS ***************************************************************/ BOOL diff --git a/reactos/dll/win32/userenv/environment.c b/reactos/dll/win32/userenv/environment.c index baf2a80c0c6..20c1b0f6721 100644 --- a/reactos/dll/win32/userenv/environment.c +++ b/reactos/dll/win32/userenv/environment.c @@ -29,7 +29,6 @@ #define NDEBUG #include - static BOOL SetUserEnvironmentVariable(LPVOID *Environment, diff --git a/reactos/dll/win32/userenv/gpolicy.c b/reactos/dll/win32/userenv/gpolicy.c index 8302ce8be5f..fca2b051a21 100644 --- a/reactos/dll/win32/userenv/gpolicy.c +++ b/reactos/dll/win32/userenv/gpolicy.c @@ -29,7 +29,6 @@ #define NDEBUG #include - typedef struct _GP_NOTIFY { struct _GP_NOTIFY *Next; diff --git a/reactos/dll/win32/userenv/internal.h b/reactos/dll/win32/userenv/internal.h index d22ab2097a4..5ec526f47fe 100644 --- a/reactos/dll/win32/userenv/internal.h +++ b/reactos/dll/win32/userenv/internal.h @@ -111,5 +111,3 @@ VOID UninitializeGPNotifications(VOID); #endif /* _INTERNAL_H */ - -/* EOF */ diff --git a/reactos/dll/win32/userenv/misc.c b/reactos/dll/win32/userenv/misc.c index 1075b33965b..d5747fbf1af 100644 --- a/reactos/dll/win32/userenv/misc.c +++ b/reactos/dll/win32/userenv/misc.c @@ -26,6 +26,8 @@ #include "precomp.h" +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/precomp.h b/reactos/dll/win32/userenv/precomp.h index f97e089a20c..62b7c70aa07 100644 --- a/reactos/dll/win32/userenv/precomp.h +++ b/reactos/dll/win32/userenv/precomp.h @@ -1,17 +1,16 @@ #include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include #include #include #include +#include #define NTOS_MODE_USER -#include #include #include -#include -#include #include "internal.h" -#include "resources.h" diff --git a/reactos/dll/win32/userenv/profile.c b/reactos/dll/win32/userenv/profile.c index 888115baeaf..094be567628 100644 --- a/reactos/dll/win32/userenv/profile.c +++ b/reactos/dll/win32/userenv/profile.c @@ -26,10 +26,11 @@ #include "precomp.h" +#include + #define NDEBUG #include - /* FUNCTIONS ***************************************************************/ BOOL diff --git a/reactos/dll/win32/userenv/registry.c b/reactos/dll/win32/userenv/registry.c index 512cef813f8..196a5112563 100644 --- a/reactos/dll/win32/userenv/registry.c +++ b/reactos/dll/win32/userenv/registry.c @@ -29,7 +29,6 @@ #define NDEBUG #include - /* FUNCTIONS ***************************************************************/ static diff --git a/reactos/dll/win32/userenv/setup.c b/reactos/dll/win32/userenv/setup.c index ed4eb5d4e16..b219ce3949b 100644 --- a/reactos/dll/win32/userenv/setup.c +++ b/reactos/dll/win32/userenv/setup.c @@ -29,6 +29,7 @@ #define NDEBUG #include +#include "resources.h" typedef struct _FOLDERDATA { From eb50f7b329af63cd0a6f803c661aa9384738829e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 25 Jan 2014 23:07:09 +0000 Subject: [PATCH 054/124] [UXTHEME] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61822 --- reactos/dll/win32/uxtheme/system.c | 1 + reactos/dll/win32/uxtheme/uxini.c | 2 +- reactos/dll/win32/uxtheme/uxthemep.h | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/uxtheme/system.c b/reactos/dll/win32/uxtheme/system.c index 9f475403ee8..f0e2769eaf5 100644 --- a/reactos/dll/win32/uxtheme/system.c +++ b/reactos/dll/win32/uxtheme/system.c @@ -20,6 +20,7 @@ #include "uxthemep.h" +#include #include #include diff --git a/reactos/dll/win32/uxtheme/uxini.c b/reactos/dll/win32/uxtheme/uxini.c index edc2ddfb81b..9779aba4278 100644 --- a/reactos/dll/win32/uxtheme/uxini.c +++ b/reactos/dll/win32/uxtheme/uxini.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include + /*********************************************************************** * Defines and global variables */ diff --git a/reactos/dll/win32/uxtheme/uxthemep.h b/reactos/dll/win32/uxtheme/uxthemep.h index 15b3608a627..320bb7f4195 100644 --- a/reactos/dll/win32/uxtheme/uxthemep.h +++ b/reactos/dll/win32/uxtheme/uxthemep.h @@ -1,10 +1,14 @@ -#include +#include #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #include #include +#include #include #include #include From 2815ad982d927f42db27b572e7f28ba4688f242f Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 25 Jan 2014 23:51:04 +0000 Subject: [PATCH 055/124] [CRYPTLIB] MSVC doesn't define __BYTE_ORDER__, so simply assume it is LE. svn path=/trunk/; revision=61823 --- reactos/lib/cryptlib/util.c | 4 ++-- reactos/lib/cryptlib/util.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/reactos/lib/cryptlib/util.c b/reactos/lib/cryptlib/util.c index 9858ec78528..7416faab2de 100644 --- a/reactos/lib/cryptlib/util.c +++ b/reactos/lib/cryptlib/util.c @@ -1,6 +1,6 @@ -#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +#if !defined(_MSC_VER) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) #include #include @@ -22,5 +22,5 @@ byteReverse(unsigned char *buf, unsigned longs) } while (--longs); } -#endif // (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +#endif // !defined(_MSC_VER) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) diff --git a/reactos/lib/cryptlib/util.h b/reactos/lib/cryptlib/util.h index f2e2cf526af..c3c864f428d 100644 --- a/reactos/lib/cryptlib/util.h +++ b/reactos/lib/cryptlib/util.h @@ -1,8 +1,7 @@ #pragma once - -#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +#if defined(_MSC_VER) || (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #define byteReverse(buf, long)((void)(buf, long)) #else void From 70283bee866ad857dd71705f6516f6f95ea5c777 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 26 Jan 2014 02:34:59 +0000 Subject: [PATCH 056/124] [SAMSRV] Implement SamIFreeVoid. svn path=/trunk/; revision=61824 --- reactos/dll/win32/samsrv/samsrv.c | 8 ++++++++ reactos/dll/win32/samsrv/samsrv.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c index 201d116a57f..a67865e8ada 100644 --- a/reactos/dll/win32/samsrv/samsrv.c +++ b/reactos/dll/win32/samsrv/samsrv.c @@ -141,6 +141,14 @@ SampInitializeRegistry(VOID) } +VOID +NTAPI +SamIFreeVoid(PVOID Ptr) +{ + MIDL_user_free(Ptr); +} + + VOID NTAPI SamIFree_SAMPR_ENUMERATION_BUFFER(PSAMPR_ENUMERATION_BUFFER Ptr) diff --git a/reactos/dll/win32/samsrv/samsrv.spec b/reactos/dll/win32/samsrv/samsrv.spec index fbacd355a87..f28eacb563b 100644 --- a/reactos/dll/win32/samsrv/samsrv.spec +++ b/reactos/dll/win32/samsrv/samsrv.spec @@ -16,7 +16,7 @@ @ stub SamIFloatingSingleMasterOpEx @ stub SamIFreeSidAndAttributesList @ stub SamIFreeSidArray -@ stub SamIFreeVoid +@ stdcall SamIFreeVoid(ptr) @ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER From 36e095ec6e016df6e74a00d4b8dcd3f52fb2ade1 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 10:42:07 +0000 Subject: [PATCH 057/124] [VBSCRIPT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61825 --- reactos/dll/win32/vbscript/global.c | 1 + reactos/dll/win32/vbscript/vbscript.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/vbscript/global.c b/reactos/dll/win32/vbscript/global.c index 40439a421a3..d171f5668a8 100644 --- a/reactos/dll/win32/vbscript/global.c +++ b/reactos/dll/win32/vbscript/global.c @@ -19,6 +19,7 @@ #include "vbscript.h" #include +#include #define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5)) diff --git a/reactos/dll/win32/vbscript/vbscript.h b/reactos/dll/win32/vbscript/vbscript.h index a1208af6f83..1f94db22635 100644 --- a/reactos/dll/win32/vbscript/vbscript.h +++ b/reactos/dll/win32/vbscript/vbscript.h @@ -27,16 +27,16 @@ #include #include -#include +#include +#include #include #include #include -#include +#include #include #include -#include WINE_DEFAULT_DEBUG_CHANNEL(vbscript); typedef struct { From 7c1ecee60156b84cb6c7955a2eef3b38dbb53669 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 26 Jan 2014 10:43:58 +0000 Subject: [PATCH 058/124] [MSV1_0] MsvpChangePassword: Open the SAM domain and user objects that represent the logon domain and user account. svn path=/trunk/; revision=61826 --- reactos/dll/win32/msv1_0/msv1_0.c | 116 +++++++++++++++++++++++++++++- reactos/dll/win32/msv1_0/msv1_0.h | 10 +++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/msv1_0/msv1_0.c b/reactos/dll/win32/msv1_0/msv1_0.c index 4c080fb5575..13eed474cf7 100644 --- a/reactos/dll/win32/msv1_0/msv1_0.c +++ b/reactos/dll/win32/msv1_0/msv1_0.c @@ -428,6 +428,15 @@ MsvpChangePassword(IN PLSA_CLIENT_REQUEST ClientRequest, PMSV1_0_CHANGEPASSWORD_REQUEST RequestBuffer; ULONG_PTR PtrOffset; + SAMPR_HANDLE ServerHandle = NULL; + SAMPR_HANDLE DomainHandle = NULL; + SAMPR_HANDLE UserHandle = NULL; + PRPC_SID DomainSid = NULL; + RPC_UNICODE_STRING Names[1]; + SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; + SAMPR_ULONG_ARRAY Use = {0, NULL}; + NTSTATUS Status; + TRACE("()\n"); RequestBuffer = (PMSV1_0_CHANGEPASSWORD_REQUEST)ProtocolSubmitBuffer; @@ -445,8 +454,113 @@ MsvpChangePassword(IN PLSA_CLIENT_REQUEST ClientRequest, TRACE("Old Password: %S\n", RequestBuffer->OldPassword.Buffer); TRACE("New Password: %S\n", RequestBuffer->NewPassword.Buffer); + /* Connect to the SAM server */ + Status = SamIConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + TRUE); + if (!NT_SUCCESS(Status)) + { + TRACE("SamIConnect() failed (Status 0x%08lx)\n", Status); + goto done; + } - return STATUS_SUCCESS; + /* Get the domain SID */ + Status = SamrLookupDomainInSamServer(ServerHandle, + (PRPC_UNICODE_STRING)&RequestBuffer->DomainName, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrLookupDomainInSamServer failed (Status %08lx)\n", Status); + goto done; + } + + /* Open the domain */ + Status = SamrOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenDomain failed (Status %08lx)\n", Status); + goto done; + } + + Names[0].Length = RequestBuffer->AccountName.Length; + Names[0].MaximumLength = RequestBuffer->AccountName.MaximumLength; + Names[0].Buffer = RequestBuffer->AccountName.Buffer; + + /* Try to get the RID for the user name */ + Status = SamrLookupNamesInDomain(DomainHandle, + 1, + Names, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrLookupNamesInDomain failed (Status %08lx)\n", Status); + Status = STATUS_NO_SUCH_USER; + goto done; + } + + /* Fail, if it is not a user account */ + if (Use.Element[0] != SidTypeUser) + { + TRACE("Account is not a user account!\n"); + Status = STATUS_NO_SUCH_USER; + goto done; + } + + /* Open the user object */ + Status = SamrOpenUser(DomainHandle, + USER_CHANGE_PASSWORD, + RelativeIds.Element[0], + &UserHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenUser failed (Status %08lx)\n", Status); + goto done; + } + + + +#if 0 + /* Change the password */ + Status = SamrChangePasswordUser(UserHandle, + IN unsigned char LmPresent, + IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, + IN unsigned char NtPresent, + IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, + IN unsigned char NtCrossEncryptionPresent, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, + IN unsigned char LmCrossEncryptionPresent, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt) + if (!NT_SUCCESS(Status)) + { + TRACE("SamrChangePasswordUser failed (Status %08lx)\n", Status); + goto done; + } +#endif + +done: + if (UserHandle != NULL) + SamrCloseHandle(&UserHandle); + + SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); + SamIFree_SAMPR_ULONG_ARRAY(&Use); + + if (DomainHandle != NULL) + SamrCloseHandle(&DomainHandle); + + if (DomainSid != NULL) + SamIFreeVoid(DomainSid); + + if (ServerHandle != NULL) + SamrCloseHandle(&ServerHandle); + + return Status; } diff --git a/reactos/dll/win32/msv1_0/msv1_0.h b/reactos/dll/win32/msv1_0/msv1_0.h index dd0be5abddb..643c21151a0 100644 --- a/reactos/dll/win32/msv1_0/msv1_0.h +++ b/reactos/dll/win32/msv1_0/msv1_0.h @@ -171,6 +171,10 @@ SamIConnect(IN PSAMPR_SERVER_NAME ServerName, IN ACCESS_MASK DesiredAccess, IN BOOLEAN Trusted); +VOID +NTAPI +SamIFreeVoid(PVOID Ptr); + VOID NTAPI SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr); @@ -184,6 +188,12 @@ NTSTATUS NTAPI SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle); +NTSTATUS +NTAPI +SamrLookupDomainInSamServer(IN SAMPR_HANDLE ServerHandle, + IN PRPC_UNICODE_STRING Name, + OUT PRPC_SID *DomainId); + NTSTATUS NTAPI SamrLookupNamesInDomain(IN SAMPR_HANDLE DomainHandle, From a70f7bf4a0eaeb732fa7efbcd01dba0e11a81ac7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 11:45:40 +0000 Subject: [PATCH 059/124] [WDMAUD.DRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61827 --- reactos/dll/win32/wdmaud.drv/mixer.c | 3 +++ reactos/dll/win32/wdmaud.drv/mmixer.c | 4 ++++ reactos/dll/win32/wdmaud.drv/wdmaud.h | 19 +++++++++---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/reactos/dll/win32/wdmaud.drv/mixer.c b/reactos/dll/win32/wdmaud.drv/mixer.c index 147dca06b4c..e71846428bb 100644 --- a/reactos/dll/win32/wdmaud.drv/mixer.c +++ b/reactos/dll/win32/wdmaud.drv/mixer.c @@ -9,6 +9,9 @@ #include "wdmaud.h" +#include +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/wdmaud.drv/mmixer.c b/reactos/dll/win32/wdmaud.drv/mmixer.c index f2f54bc7ddb..076c78cefa6 100644 --- a/reactos/dll/win32/wdmaud.drv/mmixer.c +++ b/reactos/dll/win32/wdmaud.drv/mmixer.c @@ -9,6 +9,10 @@ #include "wdmaud.h" +#include +#include +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.h b/reactos/dll/win32/wdmaud.drv/wdmaud.h index d0a86862506..415fa1aee48 100644 --- a/reactos/dll/win32/wdmaud.drv/wdmaud.h +++ b/reactos/dll/win32/wdmaud.drv/wdmaud.h @@ -1,20 +1,19 @@ -#ifndef WDMAUD_H__ -#define WDMAUD_H__ +#ifndef __WDMAUD_H__ +#define __WDMAUD_H__ -#include #include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include #include -#include -#include #include #include #include -#include -#include #include -#include +#include BOOL WdmAudInitUserModeMixer(VOID); @@ -238,4 +237,4 @@ WINAPI MixerEventThreadRoutine( LPVOID Parameter); -#endif +#endif /* __WDMAUD_H__ */ From 2d1bffa08b0fb3969834895ded1580edeacaeab7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 12:05:45 +0000 Subject: [PATCH 060/124] [WINDOWSCODECS] * Move some inclusions to the main header. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61828 --- reactos/dll/win32/windowscodecs/bmpdecode.c | 1 - reactos/dll/win32/windowscodecs/clsfactory.c | 3 --- reactos/dll/win32/windowscodecs/gifformat.c | 2 -- reactos/dll/win32/windowscodecs/guid.c | 2 +- reactos/dll/win32/windowscodecs/icoformat.c | 2 -- reactos/dll/win32/windowscodecs/imgfactory.c | 3 --- reactos/dll/win32/windowscodecs/info.c | 4 ---- reactos/dll/win32/windowscodecs/jpegformat.c | 5 ----- reactos/dll/win32/windowscodecs/metadatahandler.c | 1 - reactos/dll/win32/windowscodecs/pngformat.c | 4 ---- reactos/dll/win32/windowscodecs/propertybag.c | 3 --- reactos/dll/win32/windowscodecs/proxy.c | 2 -- reactos/dll/win32/windowscodecs/regsvr.c | 6 ------ reactos/dll/win32/windowscodecs/stream.c | 1 - reactos/dll/win32/windowscodecs/tiffformat.c | 5 ----- reactos/dll/win32/windowscodecs/wincodecs_private.h | 8 +++++++- 16 files changed, 8 insertions(+), 44 deletions(-) diff --git a/reactos/dll/win32/windowscodecs/bmpdecode.c b/reactos/dll/win32/windowscodecs/bmpdecode.c index bc6c4181dcd..dffd4bc2220 100644 --- a/reactos/dll/win32/windowscodecs/bmpdecode.c +++ b/reactos/dll/win32/windowscodecs/bmpdecode.c @@ -19,7 +19,6 @@ #include "wincodecs_private.h" #include -#include typedef struct { DWORD bc2Size; diff --git a/reactos/dll/win32/windowscodecs/clsfactory.c b/reactos/dll/win32/windowscodecs/clsfactory.c index 54a0b4ef6a4..0a986c8ce6c 100644 --- a/reactos/dll/win32/windowscodecs/clsfactory.c +++ b/reactos/dll/win32/windowscodecs/clsfactory.c @@ -18,9 +18,6 @@ #include "wincodecs_private.h" -#include -#include - extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; typedef struct { diff --git a/reactos/dll/win32/windowscodecs/gifformat.c b/reactos/dll/win32/windowscodecs/gifformat.c index 8e05244b77a..d0cf1a771da 100644 --- a/reactos/dll/win32/windowscodecs/gifformat.c +++ b/reactos/dll/win32/windowscodecs/gifformat.c @@ -19,9 +19,7 @@ #include "wincodecs_private.h" -#include #include -#include #include "ungif.h" diff --git a/reactos/dll/win32/windowscodecs/guid.c b/reactos/dll/win32/windowscodecs/guid.c index 32c409fb774..98c8e344554 100644 --- a/reactos/dll/win32/windowscodecs/guid.c +++ b/reactos/dll/win32/windowscodecs/guid.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); diff --git a/reactos/dll/win32/windowscodecs/icoformat.c b/reactos/dll/win32/windowscodecs/icoformat.c index e864c217d51..ac6fdc70ae8 100644 --- a/reactos/dll/win32/windowscodecs/icoformat.c +++ b/reactos/dll/win32/windowscodecs/icoformat.c @@ -18,8 +18,6 @@ #include "wincodecs_private.h" -#include - #include typedef struct { diff --git a/reactos/dll/win32/windowscodecs/imgfactory.c b/reactos/dll/win32/windowscodecs/imgfactory.c index 91240a6d004..af9aabc9100 100644 --- a/reactos/dll/win32/windowscodecs/imgfactory.c +++ b/reactos/dll/win32/windowscodecs/imgfactory.c @@ -19,9 +19,6 @@ #include "wincodecs_private.h" -#include -#include - typedef struct { IWICComponentFactory IWICComponentFactory_iface; LONG ref; diff --git a/reactos/dll/win32/windowscodecs/info.c b/reactos/dll/win32/windowscodecs/info.c index bb12d7ec956..22c62821a23 100644 --- a/reactos/dll/win32/windowscodecs/info.c +++ b/reactos/dll/win32/windowscodecs/info.c @@ -19,10 +19,6 @@ #include "wincodecs_private.h" -#include -#include - -#include #include static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; diff --git a/reactos/dll/win32/windowscodecs/jpegformat.c b/reactos/dll/win32/windowscodecs/jpegformat.c index 323e77cc33d..9ecc25b13f3 100644 --- a/reactos/dll/win32/windowscodecs/jpegformat.c +++ b/reactos/dll/win32/windowscodecs/jpegformat.c @@ -22,9 +22,6 @@ # include #endif -#include -#include - #ifdef SONAME_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ #define XMD_H @@ -40,8 +37,6 @@ #undef boolean #endif -#include - #ifdef SONAME_LIBJPEG WINE_DECLARE_DEBUG_CHANNEL(jpeg); diff --git a/reactos/dll/win32/windowscodecs/metadatahandler.c b/reactos/dll/win32/windowscodecs/metadatahandler.c index f5a9fdcd19c..66dd2ed84f7 100644 --- a/reactos/dll/win32/windowscodecs/metadatahandler.c +++ b/reactos/dll/win32/windowscodecs/metadatahandler.c @@ -21,7 +21,6 @@ #include #include -#include typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface; diff --git a/reactos/dll/win32/windowscodecs/pngformat.c b/reactos/dll/win32/windowscodecs/pngformat.c index b70cbf7f20c..025eff4af11 100644 --- a/reactos/dll/win32/windowscodecs/pngformat.c +++ b/reactos/dll/win32/windowscodecs/pngformat.c @@ -22,10 +22,6 @@ #include #endif -#include - -#include - static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { BYTE header[8]; diff --git a/reactos/dll/win32/windowscodecs/propertybag.c b/reactos/dll/win32/windowscodecs/propertybag.c index 3d59755a920..48fd3d85305 100644 --- a/reactos/dll/win32/windowscodecs/propertybag.c +++ b/reactos/dll/win32/windowscodecs/propertybag.c @@ -19,9 +19,6 @@ #include "wincodecs_private.h" -#include -#include - typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface; LONG ref; diff --git a/reactos/dll/win32/windowscodecs/proxy.c b/reactos/dll/win32/windowscodecs/proxy.c index 27217946b28..0a2378397e0 100644 --- a/reactos/dll/win32/windowscodecs/proxy.c +++ b/reactos/dll/win32/windowscodecs/proxy.c @@ -20,8 +20,6 @@ #include "wincodecs_private.h" -#include - HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface, IWICBitmapSource *pISource, const WICRect *prc) { diff --git a/reactos/dll/win32/windowscodecs/regsvr.c b/reactos/dll/win32/windowscodecs/regsvr.c index 1d139fc399d..da90f1f4d5d 100644 --- a/reactos/dll/win32/windowscodecs/regsvr.c +++ b/reactos/dll/win32/windowscodecs/regsvr.c @@ -18,12 +18,6 @@ #include "wincodecs_private.h" -#include -#include -#include - -#include - /*********************************************************************** * interface for self-registering */ diff --git a/reactos/dll/win32/windowscodecs/stream.c b/reactos/dll/win32/windowscodecs/stream.c index 2650e1174ff..e0ec3f13417 100644 --- a/reactos/dll/win32/windowscodecs/stream.c +++ b/reactos/dll/win32/windowscodecs/stream.c @@ -18,7 +18,6 @@ #include "wincodecs_private.h" -#include #include /****************************************** diff --git a/reactos/dll/win32/windowscodecs/tiffformat.c b/reactos/dll/win32/windowscodecs/tiffformat.c index e4f29567437..03771662fec 100644 --- a/reactos/dll/win32/windowscodecs/tiffformat.c +++ b/reactos/dll/win32/windowscodecs/tiffformat.c @@ -25,11 +25,6 @@ #include #endif -#include -#include - -#include - #ifdef SONAME_LIBTIFF /* Workaround for broken libtiff 4.x headers on some 64-bit hosts which diff --git a/reactos/dll/win32/windowscodecs/wincodecs_private.h b/reactos/dll/win32/windowscodecs/wincodecs_private.h index dac4b4f835c..7d4d198b191 100644 --- a/reactos/dll/win32/windowscodecs/wincodecs_private.h +++ b/reactos/dll/win32/windowscodecs/wincodecs_private.h @@ -34,10 +34,16 @@ #include #include +#include +#include #include -#include +#include +#include #include +#include +#include + WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); From 52a16187fbc66837c75d875e2a65052a2f759f27 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 13:23:06 +0000 Subject: [PATCH 061/124] [WININET] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61829 --- reactos/dll/win32/wininet/internet.h | 11 ++++------- reactos/dll/win32/wininet/netconnection.c | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/wininet/internet.h b/reactos/dll/win32/wininet/internet.h index eb2bf6b9958..85d4652aeb1 100644 --- a/reactos/dll/win32/wininet/internet.h +++ b/reactos/dll/win32/wininet/internet.h @@ -26,7 +26,6 @@ #include #include -#include #include #define _INC_WINDOWS @@ -45,10 +44,9 @@ #define NO_SHLWAPI_GDI #include -#include #include - -#include +#include +#include #ifdef HAVE_ARPA_INET_H # include @@ -85,11 +83,10 @@ #include -#include -WINE_DEFAULT_DEBUG_CHANNEL(wininet); - #include "resource.h" +WINE_DEFAULT_DEBUG_CHANNEL(wininet); + extern HMODULE WININET_hModule DECLSPEC_HIDDEN; #ifndef INET6_ADDRSTRLEN diff --git a/reactos/dll/win32/wininet/netconnection.c b/reactos/dll/win32/wininet/netconnection.c index de61b088574..d7c6c613ba3 100644 --- a/reactos/dll/win32/wininet/netconnection.c +++ b/reactos/dll/win32/wininet/netconnection.c @@ -30,7 +30,6 @@ #ifdef HAVE_SYS_FILIO_H # include #endif -#include #ifdef HAVE_NETINET_TCP_H # include #endif From e44ba580bea0c255031771e56aa7918534c4694c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 14:53:32 +0000 Subject: [PATCH 062/124] [WINMM] * Improve redundant inclusion. CORE-7716 svn path=/trunk/; revision=61830 --- reactos/dll/win32/winmm/winemm.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/reactos/dll/win32/winmm/winemm.h b/reactos/dll/win32/winmm/winemm.h index 1da6c68471d..23351f8841f 100644 --- a/reactos/dll/win32/winmm/winemm.h +++ b/reactos/dll/win32/winmm/winemm.h @@ -19,10 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include -#include #include #define _INC_WINDOWS From 1e1bd36010671a90cd538e3b77c0d8a9941c6b64 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 14:55:05 +0000 Subject: [PATCH 063/124] [WINSPOOL.DRV] * Create a main header and move some inclusions to it. CORE-7716 svn path=/trunk/; revision=61831 --- reactos/dll/win32/winspool/info.c | 25 ++++--------------------- reactos/dll/win32/winspool/precomp.h | 17 +++++++++++++++++ reactos/dll/win32/winspool/stubs.c | 7 ++----- 3 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 reactos/dll/win32/winspool/precomp.h diff --git a/reactos/dll/win32/winspool/info.c b/reactos/dll/win32/winspool/info.c index 2928b8f252c..55b5c23d249 100644 --- a/reactos/dll/win32/winspool/info.c +++ b/reactos/dll/win32/winspool/info.c @@ -22,30 +22,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -#include -//#include "wine/port.h" - -#include -//#include -//#include -//#include -//#include -//#include - -#include -#include -//#include "winerror.h" -#include #include -#include -#include -//#include "wine/unicode.h" -#include #include +#include + +#include WINE_DEFAULT_DEBUG_CHANNEL(winspool); diff --git a/reactos/dll/win32/winspool/precomp.h b/reactos/dll/win32/winspool/precomp.h new file mode 100644 index 00000000000..ef6c1bd2ebc --- /dev/null +++ b/reactos/dll/win32/winspool/precomp.h @@ -0,0 +1,17 @@ +#ifndef _WINSPOOL_DRV_PCH_ +#define _WINSPOOL_DRV_PCH_ + +#include + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +#include + +#endif /* _WINSPOOL_DRV_PCH_ */ diff --git a/reactos/dll/win32/winspool/stubs.c b/reactos/dll/win32/winspool/stubs.c index 621e33b800e..435b5551d09 100644 --- a/reactos/dll/win32/winspool/stubs.c +++ b/reactos/dll/win32/winspool/stubs.c @@ -7,12 +7,9 @@ * REVISIONS: */ -#include -#include -#include +#include "precomp.h" + #include -#include -#include /* * @unimplemented From 6ad9377d2d8cbc3fd7e1fb3891c7041da9163f65 Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Sun, 26 Jan 2014 15:46:34 +0000 Subject: [PATCH 064/124] [RAPPS] - Replace URLDownloadToFileW download routine by InternetOpenW, InternetOpenUrlW, InternetReadFile download routine. This makes it possible to set the user agent which allows us to use http://download.sourceforge.net URLs and not needing any hard coded mirrors anymore. (Thx goes to Usurp for that idea.) - Replace CreateProcessW by ShellExecute. This reenables the question for elevated rights in Windows and allows RApps to open any file format the shell knows about. Big thx goes out to AmineKhaldi, Christoph_vW, gigaherz and ThFabba for helping a rusted Java coder to get things in a resonable shape. ^^ svn path=/trunk/; revision=61832 --- .../base/applications/rapps/CMakeLists.txt | 2 +- reactos/base/applications/rapps/loaddlg.c | 55 ++++++++++++++----- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/reactos/base/applications/rapps/CMakeLists.txt b/reactos/base/applications/rapps/CMakeLists.txt index ee33a605284..0484d12732e 100644 --- a/reactos/base/applications/rapps/CMakeLists.txt +++ b/reactos/base/applications/rapps/CMakeLists.txt @@ -25,7 +25,7 @@ add_executable(rapps ${SOURCE}) add_pch(rapps rapps.h) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 urlmon wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/rapps/loaddlg.c b/reactos/base/applications/rapps/loaddlg.c index c4c17ffcab2..2687448f0db 100644 --- a/reactos/base/applications/rapps/loaddlg.c +++ b/reactos/base/applications/rapps/loaddlg.c @@ -26,6 +26,8 @@ */ #include "rapps.h" +#include +#include static PAPPLICATION_INFO AppInfo; static HICON hIcon = NULL; @@ -206,13 +208,17 @@ ThreadFunc(LPVOID Context) IBindStatusCallback *dl; WCHAR path[MAX_PATH]; LPWSTR p; - STARTUPINFOW si; - PROCESS_INFORMATION pi; HWND Dlg = (HWND) Context; - DWORD r, len; + DWORD len, dwContentLen, dwBytesWritten, dwBytesRead, dwCurrentBytesRead; + DWORD dwBufLen = sizeof(dwContentLen); BOOL bCancelled = FALSE; BOOL bTempfile = FALSE; BOOL bCab = FALSE; + HINTERNET hOpen = NULL; + HINTERNET hFile = NULL; + HANDLE hOut = NULL; + unsigned char lpBuffer[4096]; + const LPWSTR lpszAgent = L"RApps/1.0"; /* built the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); @@ -255,24 +261,43 @@ ThreadFunc(LPVOID Context) /* download it */ bTempfile = TRUE; dl = CreateDl(Context, &bCancelled); - r = URLDownloadToFileW(NULL, AppInfo->szUrlDownload, path, 0, dl); + + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + if (!hOpen) goto end; + + hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); + if(!hFile) goto end; + + hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + if (hOut == INVALID_HANDLE_VALUE) goto end; + + HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0); + + do + { + if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) goto end; + if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) goto end; + dwCurrentBytesRead += dwBytesRead; + IBindStatusCallback_OnProgress(dl, dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); + } + while (dwBytesRead); + + CloseHandle(hOut); if (dl) IBindStatusCallback_Release(dl); - if (S_OK != r) goto end; - else if (bCancelled) goto end; + if (bCancelled) goto end; ShowWindow(Dlg, SW_HIDE); /* run it */ - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - r = CreateProcessW(path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi); - if (0 == r) goto end; - - CloseHandle(pi.hThread); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); - + if (!bCab) + { + ShellExecute( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); + } end: + CloseHandle(hOut); + InternetCloseHandle(hFile); + InternetCloseHandle(hOpen); + if (bTempfile) { if (bCancelled || (SettingsInfo.bDelInstaller && !bCab)) From 9606fd0fa3c874e721968789692da0c66836cef9 Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Sun, 26 Jan 2014 15:49:23 +0000 Subject: [PATCH 065/124] [RAPPS] rapps: (for database) Many Improvements and Many Fixes CORE-7710 #resolve #comment Fixed a few things like missing sizes for your edited ff2, ff3 and ff3.6 files. Thx for your help. Added universal download links for sf.net linked files. svn path=/trunk/; revision=61833 --- .../base/applications/rapps/rapps/7zip.txt | 1 + .../base/applications/rapps/rapps/abiword.txt | 1 + .../applications/rapps/rapps/abiword26.txt | 1 + .../base/applications/rapps/rapps/abyss.txt | 1 + .../rapps/rapps/ac97forvirtualbox.txt | 1 + .../applications/rapps/rapps/alreader.txt | 1 + .../base/applications/rapps/rapps/ants.txt | 1 + .../applications/rapps/rapps/audiograbber.txt | 1 + .../applications/rapps/rapps/bittorrent.txt | 1 + .../base/applications/rapps/rapps/bochs.txt | 3 +- .../base/applications/rapps/rapps/boswars.txt | 1 + .../applications/rapps/rapps/chromium.txt | 1 + reactos/base/applications/rapps/rapps/cnt.txt | 1 + .../applications/rapps/rapps/comctl32ocx.txt | 1 + .../base/applications/rapps/rapps/diablo2.txt | 1 + .../applications/rapps/rapps/dosblaster.txt | 3 +- .../base/applications/rapps/rapps/dosbox.txt | 3 +- .../rapps/rapps/doublecommander.txt | 4 +- .../applications/rapps/rapps/dvdwritenow.txt | 1 + reactos/base/applications/rapps/rapps/fap.txt | 1 + .../base/applications/rapps/rapps/fira.txt | 6 ++ .../base/applications/rapps/rapps/firefox.txt | 23 ++++---- .../applications/rapps/rapps/firefox2.txt | 58 +++++++++++++------ .../applications/rapps/rapps/firefox3.txt | 58 +++++++++++++------ .../applications/rapps/rapps/firefox36.txt | 54 ++++++++++++----- .../applications/rapps/rapps/freebasic.txt | 3 +- .../rapps/rapps/glidewrapzbag.txt | 1 + .../applications/rapps/rapps/globulation2.txt | 1 + .../base/applications/rapps/rapps/hover.txt | 1 + reactos/base/applications/rapps/rapps/hxd.txt | 17 ++++-- .../applications/rapps/rapps/indiftpd.txt | 2 + .../applications/rapps/rapps/irfanview.txt | 1 + .../rapps/rapps/irfanviewplugins.txt | 1 + .../base/applications/rapps/rapps/kdewin.txt | 1 + .../base/applications/rapps/rapps/kyodai.txt | 1 + .../applications/rapps/rapps/lazaruside.txt | 2 +- .../applications/rapps/rapps/lbreakout2.txt | 3 +- .../applications/rapps/rapps/lgeneral.txt | 3 +- .../applications/rapps/rapps/libreoffice.txt | 1 + .../applications/rapps/rapps/lmarbles.txt | 3 +- .../base/applications/rapps/rapps/mfc40.txt | 1 + .../applications/rapps/rapps/mirandaim.txt | 1 + .../base/applications/rapps/rapps/mirc.txt | 1 + .../base/applications/rapps/rapps/mirc6.txt | 1 + .../base/applications/rapps/rapps/mono2.txt | 1 + reactos/base/applications/rapps/rapps/mpc.txt | 3 +- .../base/applications/rapps/rapps/mpxplay.txt | 6 +- .../base/applications/rapps/rapps/msxml3.txt | 1 + .../base/applications/rapps/rapps/net11.txt | 1 + .../base/applications/rapps/rapps/net20.txt | 1 + .../applications/rapps/rapps/net20sp2.txt | 1 + reactos/base/applications/rapps/rapps/npp.txt | 1 + .../applications/rapps/rapps/offbyone.txt | 1 + .../applications/rapps/rapps/opencodecs.txt | 1 + .../applications/rapps/rapps/openoffice.txt | 37 ++++++------ .../rapps/rapps/openoffice2.4.txt | 25 ++++---- .../base/applications/rapps/rapps/openttd.txt | 1 + .../base/applications/rapps/rapps/opera.txt | 1 + .../base/applications/rapps/rapps/opera9.txt | 1 + .../applications/rapps/rapps/pengupop.txt | 1 + .../applications/rapps/rapps/photofiltre.txt | 1 + .../base/applications/rapps/rapps/pingus.txt | 1 + .../base/applications/rapps/rapps/pspad.txt | 1 + .../base/applications/rapps/rapps/ptanks.txt | 1 + .../base/applications/rapps/rapps/putty.txt | 1 + .../base/applications/rapps/rapps/python.txt | 1 + .../base/applications/rapps/rapps/python2.txt | 1 + .../base/applications/rapps/rapps/qb64sdl.txt | 5 +- .../base/applications/rapps/rapps/qmmp.txt | 5 ++ .../base/applications/rapps/rapps/remood.txt | 3 +- .../base/applications/rapps/rapps/reshack.txt | 1 + .../base/applications/rapps/rapps/rocks.txt | 1 + .../base/applications/rapps/rapps/rosbe.txt | 3 +- .../applications/rapps/rapps/rosbeamd64.txt | 3 +- .../applications/rapps/rapps/rosbearm.txt | 3 +- .../applications/rapps/rapps/sambatng.txt | 1 + .../applications/rapps/rapps/sbforvmware.txt | 1 + .../base/applications/rapps/rapps/scite.txt | 3 +- .../base/applications/rapps/rapps/scummvm.txt | 3 +- .../applications/rapps/rapps/sdl_mixer.txt | 1 + .../applications/rapps/rapps/sdl_runtime.txt | 1 + .../applications/rapps/rapps/seamonkey.txt | 2 +- .../applications/rapps/rapps/smplayer.txt | 21 ++++--- .../base/applications/rapps/rapps/stamina.txt | 1 + .../base/applications/rapps/rapps/steam.txt | 1 + .../applications/rapps/rapps/sumatrapdf.txt | 1 + .../applications/rapps/rapps/superdxb.txt | 1 + .../applications/rapps/rapps/superfinder.txt | 1 + .../applications/rapps/rapps/supertux.txt | 1 + .../base/applications/rapps/rapps/tahoma.txt | 1 + .../applications/rapps/rapps/thunderbird.txt | 22 +++---- .../applications/rapps/rapps/thunderbird3.txt | 49 +++++++++++----- .../applications/rapps/rapps/tileworld.txt | 1 + .../rapps/rapps/totalcommander.txt | 1 + .../applications/rapps/rapps/tuxpaint.txt | 3 +- .../applications/rapps/rapps/ultravnc.txt | 1 + .../applications/rapps/rapps/utorrent.txt | 1 + .../base/applications/rapps/rapps/vb5run.txt | 1 + .../base/applications/rapps/rapps/vb6run.txt | 1 + .../applications/rapps/rapps/vc2005sp1run.txt | 1 + .../applications/rapps/rapps/vc2008sp1run.txt | 1 + .../applications/rapps/rapps/vc2010run.txt | 1 + .../base/applications/rapps/rapps/vc6run.txt | 1 + reactos/base/applications/rapps/rapps/vlc.txt | 1 + .../applications/rapps/rapps/winboard.txt | 1 + .../base/applications/rapps/rapps/wme9.txt | 1 + reactos/base/applications/rapps/rapps/zaz.txt | 3 +- 107 files changed, 361 insertions(+), 156 deletions(-) diff --git a/reactos/base/applications/rapps/rapps/7zip.txt b/reactos/base/applications/rapps/rapps/7zip.txt index 4136c17f64f..dd94abccc8e 100644 --- a/reactos/base/applications/rapps/rapps/7zip.txt +++ b/reactos/base/applications/rapps/rapps/7zip.txt @@ -36,6 +36,7 @@ Size = 1,1 Mo [Section.041f] Description = 7z, zip, tar, rar ve diÄŸer birçok sıkıştırma biçimini destekleyen bir araç. +Size = 1,1 MB [Section.0422] Description = Утиліта Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚Ð° Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ 7zip, zip, tar, rar та інших архівних файлів. diff --git a/reactos/base/applications/rapps/rapps/abiword.txt b/reactos/base/applications/rapps/rapps/abiword.txt index 15479c38706..356a10f4b24 100644 --- a/reactos/base/applications/rapps/rapps/abiword.txt +++ b/reactos/base/applications/rapps/rapps/abiword.txt @@ -36,6 +36,7 @@ Size = 9,4 Mo [Section.041f] Description = Bir kelime iÅŸlemci. +Size = 9,4 MB [Section.0422] Description = ТекÑтовий процеÑор. diff --git a/reactos/base/applications/rapps/rapps/abiword26.txt b/reactos/base/applications/rapps/rapps/abiword26.txt index 56437ab5336..eb45f14f9b1 100644 --- a/reactos/base/applications/rapps/rapps/abiword26.txt +++ b/reactos/base/applications/rapps/rapps/abiword26.txt @@ -36,6 +36,7 @@ Size = 5,64 Mo [Section.041f] Description = Bir kelime iÅŸlemci. +Size = 5,64 MB [Section.0422] Description = ТекÑтовий процеÑор. diff --git a/reactos/base/applications/rapps/rapps/abyss.txt b/reactos/base/applications/rapps/rapps/abyss.txt index 5bd38809ff6..2fb03a2cd95 100644 --- a/reactos/base/applications/rapps/rapps/abyss.txt +++ b/reactos/base/applications/rapps/rapps/abyss.txt @@ -41,6 +41,7 @@ Size = 2,1 Mo Name = Abyss ÖrütbaÄŸ Sunucusu X1 Licence = Ãœcretsiz Description = Abyss ÖrütbaÄŸ Sunucusu, bilgisayarda örütbaÄŸ sitelerinin yayınlanmasını saÄŸlar. Abyss ÖrütbaÄŸ Sunucusu, güvenli SSL/TLS baÄŸlantılarını (HTTPS), örütbaÄŸ teknikbiliminin geniÅŸ yelpâzesiyle destekler. Abyss ÖrütbaÄŸ Sunucusu; MySQL, SQLite, MS SQL Server, MS Access, ve Oracle gibi veritabanlarını destekleyen geliÅŸmiÅŸ PHP, Perl, Python, ASP, ASP.NET ve Rails üzerinde Ruby örütbaÄŸ uygulamalarını çalıştırabilir. +Size = 2,1 MB [Section.0422] Description = Abyss Web Server дозволить вам утримувати веб-Ñайти на вашому комп'ютері. Від підтримує безпечні SSL/TLS з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (HTTPS) та великий Ñ€Ñд веб-технологій. Він також запуÑкає PHP, Perl, Python, ASP, ASP.NET, та Ruby on Rails веб-додатки, Ñкі можуть підтримуватиÑÑŒ такими базами даних, Ñк MySQL, SQLite, MS SQL Server, MS Access, чи Oracle. diff --git a/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt b/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt index 68e60a516d3..b760df4ab22 100644 --- a/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt +++ b/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt @@ -61,6 +61,7 @@ Description = Pазархивируйте Ñодержимое в папку "Re Name = VirtualBox için AC97 Sürücüsü Licence = Bilinmiyor Description = Bunu ReactOS'un dizinine çıkartıp bilgisayarı iki kez yeniden baÅŸlatınız. +Size = 185,5 KB [Section.0422] Name = Драйвер AC97 Ð´Ð»Ñ VirtualBox diff --git a/reactos/base/applications/rapps/rapps/alreader.txt b/reactos/base/applications/rapps/rapps/alreader.txt index 7b9de55755f..5eecbc543c8 100644 --- a/reactos/base/applications/rapps/rapps/alreader.txt +++ b/reactos/base/applications/rapps/rapps/alreader.txt @@ -21,3 +21,4 @@ Size = 4,6 Mo [Section.041f] Description = Bir FB2 e-Kitap ouyucusu. +Size = 4,6 MB diff --git a/reactos/base/applications/rapps/rapps/ants.txt b/reactos/base/applications/rapps/rapps/ants.txt index 6aff220bac3..29c27704643 100644 --- a/reactos/base/applications/rapps/rapps/ants.txt +++ b/reactos/base/applications/rapps/rapps/ants.txt @@ -23,3 +23,4 @@ Size = 632 ko Name = Karıncalar Licence = Ãœcretsiz Description = Bir kartlarla izlem oyunu. Kalenizi bitirmeye veyâ rakip kaleyi yıkmaya çalışın. Yazılımı kurmak için ZIP biçiminde çıkartma yeteneÄŸi olan bir yazılım gerekir. +Size = 632 KB diff --git a/reactos/base/applications/rapps/rapps/audiograbber.txt b/reactos/base/applications/rapps/rapps/audiograbber.txt index 24c1ade8235..7081db56330 100644 --- a/reactos/base/applications/rapps/rapps/audiograbber.txt +++ b/reactos/base/applications/rapps/rapps/audiograbber.txt @@ -39,6 +39,7 @@ Size = 4,35 Mo Name = Ses Yakalayıcısı Licence = Ãœcretsiz Description = Çok iyi bir CD ripleyicisi ve ses biçimi dönüştürücüsü. +Size = 4,35 MB [Section.0422] Description = Чудовий CD Ріппер/Конвертер аудіо файлів. diff --git a/reactos/base/applications/rapps/rapps/bittorrent.txt b/reactos/base/applications/rapps/rapps/bittorrent.txt index 6b266a3bba8..59fa4fc5ab0 100644 --- a/reactos/base/applications/rapps/rapps/bittorrent.txt +++ b/reactos/base/applications/rapps/rapps/bittorrent.txt @@ -30,3 +30,4 @@ Size = 1,07 Mo [Section.041f] Licence = Ticârî olmayan kullanımlarda ücretsiz. Description = Özgün BitTorrent istemcisi. +Size = 1,07 MB diff --git a/reactos/base/applications/rapps/rapps/bochs.txt b/reactos/base/applications/rapps/rapps/bochs.txt index ee4291f9ac2..4073d999e42 100644 --- a/reactos/base/applications/rapps/rapps/bochs.txt +++ b/reactos/base/applications/rapps/rapps/bochs.txt @@ -8,7 +8,7 @@ Description = Bochs is a highly portable open source IA-32 (x86) PC emulator wri Size = 4.7 MB Category = 15 URLSite = http://bochs.sourceforge.net/ -URLDownload = http://heanet.dl.sourceforge.net/project/bochs/bochs/2.6.2/Bochs-2.6.2.exe +URLDownload = http://download.sourceforge.net/project/bochs/bochs/2.6.2/Bochs-2.6.2.exe CDPath = none [Section.0407] @@ -20,3 +20,4 @@ Size = 4,7 Mo [Section.041f] Description = Bochs; son derece taşınabilir, C++ ile yazılmış, en bilinen platformlarda çalışan, açık kaynak bir IA-32 (x86) PC öykünücüsüdür. +Size = 4,7 MB diff --git a/reactos/base/applications/rapps/rapps/boswars.txt b/reactos/base/applications/rapps/rapps/boswars.txt index 5ada823e61a..a0375716540 100644 --- a/reactos/base/applications/rapps/rapps/boswars.txt +++ b/reactos/base/applications/rapps/rapps/boswars.txt @@ -24,3 +24,4 @@ Size = 62,3 Mo [Section.041f] Name = Bos SavaÅŸları Description = Bos SavaÅŸları, gelecekçi ve gerçek zamanlı bir izlem oyunudur. Oyunu baÅŸlatmak için Mikroyazılım Basarî C++ 2008 Yürütücüsü'nü kurunuz. +Size = 62,3 MB diff --git a/reactos/base/applications/rapps/rapps/chromium.txt b/reactos/base/applications/rapps/rapps/chromium.txt index 41c014bd13e..c6b3cf070a1 100644 --- a/reactos/base/applications/rapps/rapps/chromium.txt +++ b/reactos/base/applications/rapps/rapps/chromium.txt @@ -23,3 +23,4 @@ Size = 2,3 Mo [Section.041f] Description = Chromium B.S.U., atari salonu oyunu türünde, üst kaydırmalı bir uzay niÅŸancısıdır. +Size = 2,3 MB diff --git a/reactos/base/applications/rapps/rapps/cnt.txt b/reactos/base/applications/rapps/rapps/cnt.txt index f0f366890b6..cb13c1f8b51 100644 --- a/reactos/base/applications/rapps/rapps/cnt.txt +++ b/reactos/base/applications/rapps/rapps/cnt.txt @@ -30,3 +30,4 @@ Size = 1,3 Mo Name = Click-N-Type Farazî Düğme Takımı Licence = Ãœcretsiz Description = Ãœcretsiz bir farazî düğme takımı uygulaması. +Size = 1,3 MB diff --git a/reactos/base/applications/rapps/rapps/comctl32ocx.txt b/reactos/base/applications/rapps/rapps/comctl32ocx.txt index 07fc30dfa84..3002d2efcd6 100644 --- a/reactos/base/applications/rapps/rapps/comctl32ocx.txt +++ b/reactos/base/applications/rapps/rapps/comctl32ocx.txt @@ -45,6 +45,7 @@ Size = 913,73 ko Name = Mikroyazılım Basarî Basic 6.0 Ortak Denetimler Licence = Bilinmiyor Description = Birtakım uygulamalar için gereklidir. Åžunları içerir: comctl32.ocx, mscomctl.ocx, advpack.dll. +Size = 913,73 KB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/diablo2.txt b/reactos/base/applications/rapps/rapps/diablo2.txt index 870a509295e..3c2e3007cb3 100644 --- a/reactos/base/applications/rapps/rapps/diablo2.txt +++ b/reactos/base/applications/rapps/rapps/diablo2.txt @@ -39,6 +39,7 @@ Size = 131,9 Mo Name = Åžeytan II Licence = Kısıtlı Description = Åžeytan 2'nin kısıtlısı. Çalıştırmak için zeckensack'ın glide çeviricisi gereklidir. +Size = 131,9 MB [Section.0422] Description = Diablo 2 Shareware. Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑку потрібен zeckensack's glide wrapper. diff --git a/reactos/base/applications/rapps/rapps/dosblaster.txt b/reactos/base/applications/rapps/rapps/dosblaster.txt index 1918daece56..51bb21dfbab 100644 --- a/reactos/base/applications/rapps/rapps/dosblaster.txt +++ b/reactos/base/applications/rapps/rapps/dosblaster.txt @@ -8,7 +8,7 @@ Description = DosBlaster is a Shell extension which makes it possible to open an Size = 2.05 MB Category = 15 URLSite = http://dosblaster.sourceforge.net/ -URLDownload = http://surfnet.dl.sourceforge.net/project/dosblaster/DosBlaster%202.5%20%28x86%29/Downloads/DosbasterSetup_2_5.exe +URLDownload = http://download.sourceforge.net/project/dosblaster/DosBlaster%202.5%20%28x86%29/Downloads/DosbasterSetup_2_5.exe CDPath = none [Section.0407] @@ -36,6 +36,7 @@ Size = 2,05 Mo [Section.041f] Description = DosBlaster, bir DOS uygulamasını saÄŸ tıklamayla DOSBox'ta çalıştırabilmesini saÄŸlayan bir kabuk uzantısıdır. Bu sürüm, DOSBox 0.70 içerir ancak daha yeni bir DOSBox'u DosBlaster dizinlerinin içine kurarak bunu kolayca yükseltebilirsiniz. +Size = 2,05 MB [Section.0422] Description = DosBlaster це Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ¸, Ñке дозволÑÑ” запуÑтити будь-Ñкий виконавчий файл DOS в DOSBox через правий клік. Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ Ð¼Ñ–Ñтить DOSBox 0.70, але може бути оновлена вÑтановленнÑм новішої верÑÑ–Ñ— DOSBox в теки DosBlaster. diff --git a/reactos/base/applications/rapps/rapps/dosbox.txt b/reactos/base/applications/rapps/rapps/dosbox.txt index 4248978cf29..9c5e275c5a1 100644 --- a/reactos/base/applications/rapps/rapps/dosbox.txt +++ b/reactos/base/applications/rapps/rapps/dosbox.txt @@ -8,7 +8,7 @@ Description = DOSBox is a DOS emulator. Size = 1.38 MB Category = 15 URLSite = http://www.dosbox.com/ -URLDownload = http://garr.dl.sourceforge.net/project/dosbox/dosbox/0.74/DOSBox0.74-win32-installer.exe +URLDownload = http://download.sourceforge.net/project/dosbox/dosbox/0.74/DOSBox0.74-win32-installer.exe CDPath = none [Section.0407] @@ -33,6 +33,7 @@ Size = 1,38 Mo [Section.041f] Description = DOSBox, bir DOS öykünücüsüdür. +Size = 1,38 MB [Section.0422] Description = DOSBox - емулÑтор DOSу. diff --git a/reactos/base/applications/rapps/rapps/doublecommander.txt b/reactos/base/applications/rapps/rapps/doublecommander.txt index 3779e6e47fa..3aa43ec9b74 100644 --- a/reactos/base/applications/rapps/rapps/doublecommander.txt +++ b/reactos/base/applications/rapps/rapps/doublecommander.txt @@ -8,7 +8,7 @@ Description = Double Commander is an open source file manager with two panels si Size = 7.5 MB Category = 12 URLSite = http://doublecmd.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%20bit/Double%20Commander%200.5.8%20beta/doublecmd-0.5.8.i386-win32.exe +URLDownload = http://download.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%20bit/Double%20Commander%200.5.8%20beta/doublecmd-0.5.8.i386-win32.exe CDPath = none [Section.0407] @@ -32,7 +32,9 @@ Description = Double Commander - Ñто открытый двухпанельн [Section.041f] Name = Ä°kili Komutan +Version = 0.5.8 GeliÅŸme Description = Ä°kili Komutan, yan yana duran iki bölmenin bulunduÄŸu bir açık kaynak kütük yöneticisidir. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir. +Size = 7,5 MB [Section.0422] Description = Double Commander - це відкритий двопанельний файловий менеджер. Вам потрібен 7-Zip або подібна утиліта щоб розпакувати його. diff --git a/reactos/base/applications/rapps/rapps/dvdwritenow.txt b/reactos/base/applications/rapps/rapps/dvdwritenow.txt index 838209b2640..aba9a65cdcb 100644 --- a/reactos/base/applications/rapps/rapps/dvdwritenow.txt +++ b/reactos/base/applications/rapps/rapps/dvdwritenow.txt @@ -30,3 +30,4 @@ URLSite = http://dwn.alter.org.ua/ru/ Name = DVD Åžimdi Yaz Licence = Ãœcretsiz Description = Ãœcretsiz bir doÄŸrudan CD/DVD kaydedicisi. Kurulur kurulmaz CD/DVD RW'leri çıkartılabilir disk olarak kullanabilirsiniz. Bununla birlikte CD/DVD RW'leri UDF kütük dizgesiyle kaydedebilirsiniz. Ayrıca, Mikroyazılım DVD−ROM'ları, Ahead InCD ile kaydedilen RW diskleri gibi diÄŸer yazılımlarla oluÅŸturulan UDF diskleri okutabilirsiniz. Yazılımı kurmak için ZIP biçiminde çıkartma yeteneÄŸi olan bir yazılım gerekir. +Size = 1,2 MB diff --git a/reactos/base/applications/rapps/rapps/fap.txt b/reactos/base/applications/rapps/rapps/fap.txt index feede833140..601ca9a06ce 100644 --- a/reactos/base/applications/rapps/rapps/fap.txt +++ b/reactos/base/applications/rapps/rapps/fap.txt @@ -37,6 +37,7 @@ Size = 1,89 Mo [Section.041f] Name = Tilki Ses Oynatıcısı Description = Bayağı ve yeÄŸni bir ses oynatıcısı. +Size = 1,89 MB [Section.0422] Description = ПроÑтий та маленький програвач аудіо файлів. diff --git a/reactos/base/applications/rapps/rapps/fira.txt b/reactos/base/applications/rapps/rapps/fira.txt index b51e205db39..465b1ab9b1e 100644 --- a/reactos/base/applications/rapps/rapps/fira.txt +++ b/reactos/base/applications/rapps/rapps/fira.txt @@ -19,3 +19,9 @@ Description = Mozilla Fira Font Pack, Beinhaltet Mono und Sans Schriften. Bitte Licence = Nespecificată Description = Pachetul Mozilla Fira Font, include fonturile Mono È™i Sans. DezarhivaÈ›i în dosarul „ReactOSâ€. Size = 543 ko + +[Section.041f] +Name = Mozilla Fira Yazı Türü +Licence = Bilinmiyor +Description = Mozilla Fira Yazı Türü Paketi, Mono ve Sans yazı türlerini kapsar. ReactOS'un "Fonts" dizinine çıkartınız. +Size = 543 KB diff --git a/reactos/base/applications/rapps/rapps/firefox.txt b/reactos/base/applications/rapps/rapps/firefox.txt index 55c3ff89657..4e75115d041 100644 --- a/reactos/base/applications/rapps/rapps/firefox.txt +++ b/reactos/base/applications/rapps/rapps/firefox.txt @@ -14,72 +14,71 @@ CDPath = none [Section.0407] Description = Der populärste und einer der besten freien Webbrowser. Size = 22.8 MB -URLSite = http://www.mozilla-europe.org/de/ +URLSite = http://www.mozilla.org/de/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/de/Firefox%20Setup%2026.0.exe [Section.040a] Description = El más popular y uno de los mejores navegadores web gratuitos que hay. Size = 22.7 MB -URLSite = http://www.mozilla-europe.org/es/ +URLSite = http://www.mozilla.org/es-ES/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/es-ES/Firefox%20Setup%2026.0.exe [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 23,0 Mo -URLSite = http://www.mozilla-europe.org/fr/ +URLSite = http://www.mozilla.org/fr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/fr/Firefox%20Setup%2026.0.exe [Section.0410] Description = Il più popolare e uno dei migliori web browser gratuiti. Size = 22.7 MB -URLSite = http://www.mozilla-europe.org/it/ +URLSite = http://www.mozilla.org/it/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/it/Firefox%20Setup%2026.0.exe [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. Size = 23.4 MB -URLSite = http://www.mozilla-europe.org/nl/ +URLSite = http://www.mozilla.org/nl/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/nl/Firefox%20Setup%2026.0.exe [Section.0414] Description = Mest populære og best ogsÃ¥ gratis nettleserene der ute. Size = 22.8 MB -URLSite = http://www.mozilla-europe.org/no/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/nb-NO/Firefox%20Setup%2026.0.exe [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄ…darek internetowych. Size = 23.7 MB -URLSite = http://www.mozilla-europe.org/pl/ +URLSite = http://www.mozilla.org/pl/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/pl/Firefox%20Setup%2026.0.exe [Section.0418] Description = Cel mai popular È™i unul dintre cele mai bune navigatoare web gratuite existente. Size = 23,3 Mo -URLSite = http://www.mozilla-europe.org/ro/ +URLSite = http://www.mozilla.org/ro/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/ro/Firefox%20Setup%2026.0.exe [Section.0419] Description = Один из Ñамых популÑрных и лучших беÑплатных браузеров. Size = 23,2 MB -URLSite = http://www.mozilla-europe.org/ru/ +URLSite = http://www.mozilla.org/ru/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/ru/Firefox%20Setup%2026.0.exe [Section.041b] Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadaÄov. Size = 23,4 MB -URLSite = http://www.mozilla-europe.org/sk/ +URLSite = http://www.mozilla.org/sk/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/sk/Firefox%20Setup%2026.0.exe [Section.041f] Name = Mozilla AteÅŸtilkisi 26 Description = Özgür örütbaÄŸ tarayıcıları arasında en tutulanı ve en iyisi. Size = 22,8 MB -URLSite = http://www.mozilla.org/tr/firefox/new/ +URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/tr/Firefox%20Setup%2026.0.exe [Section.0422] Description = ÐайпопулÑрніший та один з кращих безплатних веб-браузерів. Size = 23,2 MB -URLSite = http://www.mozilla-europe.org/uk/ +URLSite = http://www.mozilla.org/uk/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/uk/Firefox%20Setup%2026.0.exe diff --git a/reactos/base/applications/rapps/rapps/firefox2.txt b/reactos/base/applications/rapps/rapps/firefox2.txt index 5e5415027ea..86f1e790f61 100644 --- a/reactos/base/applications/rapps/rapps/firefox2.txt +++ b/reactos/base/applications/rapps/rapps/firefox2.txt @@ -8,65 +8,89 @@ Description = The most popular and one of the best free Web Browsers out there. Size = 5.77 MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/en-US/Firefox%20Setup%202.0.0.20.exe CDPath = none [Section.0405] Description = NejpopulárnÄ›jší a jeden z nejlepších svobodných webových prohlížeÄů. -URLSite = http://www.mozilla-europe.org/cs/ +Size = 5.59 MB +URLSite = http://www.mozilla.org/cs/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/cs/Firefox%20Setup%202.0.0.20.exe [Section.0407] Description = Der populärste und einer der besten freien Webbrowser. -URLSite = http://www.mozilla-europe.org/de/ +Size = 5.58 MB +URLSite = http://www.mozilla.org/de/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/de/Firefox%20Setup%202.0.0.20.exe [Section.040a] Description = El más popular y uno de los mejores navegadores web gratuitos que hay. -URLSite = http://www.mozilla-europe.org/es/ +Size = 5.57 MB +URLSite = http://www.mozilla.org/es-ES/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/es-ES/Firefox%20Setup%202.0.0.20.exe [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 5,77 Mo -URLSite = http://www.mozilla-europe.org/fr/ +Size = 5,85 Mo +URLSite = http://www.mozilla.org/fr/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/fr/Firefox%20Setup%202.0.0.20.exe [Section.0410] Description = Il più popolare e uno dei migliori web browser gratuiti. -URLSite = http://www.mozilla-europe.org/it/ +Size = 5.57 MB +URLSite = http://www.mozilla.org/it/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/it/Firefox%20Setup%202.0.0.20.exe [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. -URLSite = http://www.mozilla-europe.org/nl/ +Size = 5.59 MB +URLSite = http://www.mozilla.org/nl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/nl/Firefox%20Setup%202.0.0.20.exe [Section.0414] Description = Mest populære og best ogsÃ¥ gratis nettleserene der ute. -URLSite = http://www.mozilla-europe.org/no/ +Size = 5.59 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/nb-NO/Firefox%20Setup%202.0.0.20.exe [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄ…darek internetowych. -URLSite = http://www.mozilla-europe.org/pl/ +Size = 6.39 MB +URLSite = http://www.mozilla.org/pl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/pl/Firefox%20Setup%202.0.0.20.exe [Section.0418] Description = Cel mai popular È™i unul dintre cele mai bune navigatoare web gratuite existente. -Size = 5,77 Mo -URLSite = http://www.mozilla-europe.org/ro/ +Size = 5,58 Mo +URLSite = http://www.mozilla.org/ro/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/ro/Firefox%20Setup%202.0.0.20.exe [Section.0419] Description = Один из Ñамых популÑрных и лучших беÑплатных браузеров. -URLSite = http://www.mozilla-europe.org/ru/ +Size = 6.37 MB +URLSite = http://www.mozilla.org/ru/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/ru/Firefox%20Setup%202.0.0.20.exe [Section.041b] Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadaÄov. -URLSite = http://www.mozilla-europe.org/sk/ +Size = 6.06 MB +URLSite = http://www.mozilla.org/sk/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/sk/Firefox%20Setup%202.0.0.20.exe [Section.041f] Name = Mozilla AteÅŸtilkisi 2.0 Description = Özgür örütbaÄŸ tarayıcıları arasında en tutulanı ve en iyisi. -URLSite = http://www.mozilla.org/tr/firefox/new/ +Size = 5,58 MB +URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/tr/Firefox%20Setup%202.0.0.20.exe [Section.0422] Description = ÐайпопулÑрніший та один з кращих безплатних веб-браузерів. -URLSite = http://www.mozilla-europe.org/uk/ +Size = 5.86 MB +URLSite = http://www.mozilla.org/uk/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/uk/Firefox%20Setup%202.0.0.20.exe [Section.0813] Description = De meest populaire en een van de beste gratis Web browsers. -URLSite = http://www.mozilla-europe.org/nl/ +Size = 5.59 MB +URLSite = http://www.mozilla.org/nl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/nl/Firefox%20Setup%202.0.0.20.exe diff --git a/reactos/base/applications/rapps/rapps/firefox3.txt b/reactos/base/applications/rapps/rapps/firefox3.txt index a626b0f52c6..40651a50cb0 100644 --- a/reactos/base/applications/rapps/rapps/firefox3.txt +++ b/reactos/base/applications/rapps/rapps/firefox3.txt @@ -8,65 +8,89 @@ Description = The most popular and one of the best free Web Browsers out there. Size = 7.16 MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%203.0.19.exe +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/en-US/Firefox%20Setup%203.0.19.exe CDPath = none [Section.0405] Description = NejpopulárnÄ›jší a jeden z nejlepších svobodných webových prohlížeÄů. -URLSite = http://www.mozilla-europe.org/cs/ +Size = 7.00 MB +URLSite = http://www.mozilla.org/cs/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/cs/Firefox%20Setup%203.0.19.exe [Section.0407] Description = Der populärste und einer der besten freien Webbrowser. -URLSite = http://www.mozilla-europe.org/de/ +Size = 7.00 MB +URLSite = http://www.mozilla.org/de/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/de/Firefox%20Setup%203.0.19.exe [Section.040a] Description = El más popular y uno de los mejores navegadores web gratuitos que hay. -URLSite = http://www.mozilla-europe.org/es/ +Size = 6.99 MB +URLSite = http://www.mozilla.org/es-ES/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/es-ES/Firefox%20Setup%203.0.19.exe [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 7,16 Mo -URLSite = http://www.mozilla-europe.org/fr/ +Size = 7,25 Mo +URLSite = http://www.mozilla.org/fr/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/fr/Firefox%20Setup%203.0.19.exe [Section.0410] Description = Il più popolare e uno dei migliori web browser gratuiti. -URLSite = http://www.mozilla-europe.org/it/ +Size = 6.99 MB +URLSite = http://www.mozilla.org/it/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/it/Firefox%20Setup%203.0.19.exe [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. -URLSite = http://www.mozilla-europe.org/nl/ +Size = 7.76 MB +URLSite = http://www.mozilla.org/nl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/nl/Firefox%20Setup%203.0.19.exe [Section.0414] Description = Mest populære og best ogsÃ¥ gratis nettleserene der ute. -URLSite = http://www.mozilla-europe.org/no/ +Size = 7.00 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/nb-NO/Firefox%20Setup%203.0.19.exe [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄ…darek internetowych. -URLSite = http://www.mozilla-europe.org/pl/ +Size = 7.83 MB +URLSite = http://www.mozilla.org/pl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/pl/Firefox%20Setup%203.0.19.exe [Section.0418] Description = Cel mai popular È™i unul dintre cele mai bune navigatoare web gratuite existente. -Size = 7,16 Mo -URLSite = http://www.mozilla-europe.org/ro/ +Size = 7,38 Mo +URLSite = http://www.mozilla.org/ro/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/ro/Firefox%20Setup%203.0.19.exe [Section.0419] Description = Один из Ñамых популÑрных и лучших беÑплатных браузеров. -URLSite = http://www.mozilla-europe.org/ru/ +Size = 7.40 MB +URLSite = http://www.mozilla.org/ru/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/ru/Firefox%20Setup%203.0.19.exe [Section.041b] Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadaÄov. -URLSite = http://www.mozilla-europe.org/sk/ +Size = 7.47 MB +URLSite = http://www.mozilla.org/sk/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/sk/Firefox%20Setup%203.0.19.exe [Section.041f] Name = Mozilla AteÅŸtilkisi 3.0 Description = Özgür örütbaÄŸ tarayıcıları arasında en tutulanı ve en iyisi. -URLSite = http://www.mozilla.org/tr/firefox/new/ +Size = 7,00 MB +URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/tr/Firefox%20Setup%203.0.19.exe [Section.0422] Description = ÐайпопулÑрніший та один з кращих безплатних веб-браузерів. -URLSite = http://www.mozilla-europe.org/uk/ +Size = 7.33 MB +URLSite = http://www.mozilla.org/uk/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/uk/Firefox%20Setup%203.0.19.exe [Section.0813] Description = De meest populaire en een van de beste gratis Web browsers. -URLSite = http://www.mozilla-europe.org/nl/ +Size = 7.76 MB +URLSite = http://www.mozilla.org/nl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/nl/Firefox%20Setup%203.0.19.exe diff --git a/reactos/base/applications/rapps/rapps/firefox36.txt b/reactos/base/applications/rapps/rapps/firefox36.txt index def222a68fe..5e787924f77 100644 --- a/reactos/base/applications/rapps/rapps/firefox36.txt +++ b/reactos/base/applications/rapps/rapps/firefox36.txt @@ -8,61 +8,83 @@ Description = The most popular and one of the best free Web Browsers out there. Size = 8.22 MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%203.6.28.exe +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/en-US/Firefox%20Setup%203.6.28.exe CDPath = none [Section.0407] Description = Der populärste und einer der besten freien Webbrowser. -URLSite = http://www.mozilla-europe.org/de/ +Size = 8.22 MB +URLSite = http://www.mozilla.org/de/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/de/Firefox%20Setup%203.6.28.exe [Section.040a] Description = El más popular y uno de los mejores navegadores web gratuitos que hay. -URLSite = http://www.mozilla-europe.org/es/ +Size = 8.05 MB +URLSite = http://www.mozilla.org/es-ES/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/es-ES/Firefox%20Setup%203.6.28.exe [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 8,22 Mo -URLSite = http://www.mozilla-europe.org/fr/ +Size = 8,28 Mo +URLSite = http://www.mozilla.org/fr/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/fr/Firefox%20Setup%203.6.28.exe [Section.0410] Description = Il più popolare e uno dei migliori web browser gratuiti. -URLSite = http://www.mozilla-europe.org/it/ +Size = 8.05 MB +URLSite = http://www.mozilla.org/it/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/it/Firefox%20Setup%203.6.28.exe [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. -URLSite = http://www.mozilla-europe.org/nl/ +Size = 8.87 MB +URLSite = http://www.mozilla.org/nl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/nl/Firefox%20Setup%203.6.28.exe [Section.0414] Description = Mest populære og best ogsÃ¥ gratis nettleserene der ute. -URLSite = http://www.mozilla-europe.org/no/ +Size = 8.06 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/nb-NO/Firefox%20Setup%203.6.28.exe [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄ…darek internetowych. -URLSite = http://www.mozilla-europe.org/pl/ +Size = 8.90 MB +URLSite = http://www.mozilla.org/pl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/pl/Firefox%20Setup%203.6.28.exe [Section.0418] Description = Cel mai popular È™i unul dintre cele mai bune navigatoare web gratuite existente. -Size = 8,22 Mo -URLSite = http://www.mozilla-europe.org/ro/ +Size = 8,46 Mo +URLSite = http://www.mozilla.org/ro/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/ro/Firefox%20Setup%203.6.28.exe [Section.0419] Description = Один из Ñамых популÑрных и лучших беÑплатных браузеров. -URLSite = http://www.mozilla-europe.org/ru/ +Size = 8.46 MB +URLSite = http://www.mozilla.org/ru/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/ru/Firefox%20Setup%203.6.28.exe [Section.041b] Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadaÄov. -URLSite = http://www.mozilla-europe.org/sk/ +Size = 8.53 MB +URLSite = http://www.mozilla.org/sk/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/sk/Firefox%20Setup%203.6.28.exe [Section.041f] Name = Mozilla AteÅŸtilkisi 3.6 Description = Özgür örütbaÄŸ tarayıcıları arasında en tutulanı ve en iyisi. -URLSite = http://www.mozilla.org/tr/firefox/new/ +Size = 8,07 MB +URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/tr/Firefox%20Setup%203.6.28.exe [Section.0422] Description = ÐайпопулÑрніший та один з кращих безплатних веб-браузерів. -URLSite = http://www.mozilla-europe.org/uk/ +Size = 8.45 MB +URLSite = http://www.mozilla.org/uk/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/uk/Firefox%20Setup%203.6.28.exe [Section.0813] Description = De meest populaire en een van de beste gratis Web browsers. -URLSite = http://www.mozilla-europe.org/nl/ +Size = 8.87 MB +URLSite = http://www.mozilla.org/nl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/nl/Firefox%20Setup%203.6.28.exe diff --git a/reactos/base/applications/rapps/rapps/freebasic.txt b/reactos/base/applications/rapps/rapps/freebasic.txt index faba829297c..bf5a22cdaad 100644 --- a/reactos/base/applications/rapps/rapps/freebasic.txt +++ b/reactos/base/applications/rapps/rapps/freebasic.txt @@ -8,7 +8,7 @@ Description = Open Source BASIC Compiler. The BASIC syntax is compatible to QBAS Size = 7.4 MB Category = 7 URLSite = http://www.freebasic.net/ -URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC-0.90.1-win32.exe +URLDownload = http://download.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC-0.90.1-win32.exe CDPath = none [Section.0407] @@ -33,6 +33,7 @@ Size = 7,4 Mo [Section.041f] Description = Açık kaynak bir BASIC derleyicisi. Bu BASIC türevi, QBASIC ile uyumludur. +Size = 7,4 MB [Section.0422] Description = Відкритий компілÑтор BASIC. СинтакÑÐ¸Ñ ÑуміÑний з QBASIC. diff --git a/reactos/base/applications/rapps/rapps/glidewrapzbag.txt b/reactos/base/applications/rapps/rapps/glidewrapzbag.txt index 4b5a8273cfc..f9f977b04e4 100644 --- a/reactos/base/applications/rapps/rapps/glidewrapzbag.txt +++ b/reactos/base/applications/rapps/rapps/glidewrapzbag.txt @@ -38,6 +38,7 @@ Size = 249,02 ko [Section.041f] Licence = Ãœcretsiz Description = glidewrapper, ReactOS'ta Åžeytan 2'yi çalıştırmak için gereklidir. +Size = 249,02 KB [Section.0422] Description = glidewrapper необхідний Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку Diablo2 в ReactOS. diff --git a/reactos/base/applications/rapps/rapps/globulation2.txt b/reactos/base/applications/rapps/rapps/globulation2.txt index 4006ffdb537..1beb181b9d8 100644 --- a/reactos/base/applications/rapps/rapps/globulation2.txt +++ b/reactos/base/applications/rapps/rapps/globulation2.txt @@ -23,3 +23,4 @@ Size = 13,5 Mo [Section.041f] Description = Globulation 2, gerçek zamanlı bir izlem oyunudur. Bu oyun, birimlere kendiliÄŸinden görevler atayarak oyun mikroyönetimini en aza indirir. +Size = 13,5 MB diff --git a/reactos/base/applications/rapps/rapps/hover.txt b/reactos/base/applications/rapps/rapps/hover.txt index cf119f1afab..dba58628637 100644 --- a/reactos/base/applications/rapps/rapps/hover.txt +++ b/reactos/base/applications/rapps/rapps/hover.txt @@ -22,3 +22,4 @@ Size = 6,2 Mo [Section.041f] Description = Pencereler 95 CD'sinde bulunan bir bayrak kapmaca oyunu. +Size = 6,2 MB diff --git a/reactos/base/applications/rapps/rapps/hxd.txt b/reactos/base/applications/rapps/rapps/hxd.txt index 1918c697754..f98ce350f0b 100644 --- a/reactos/base/applications/rapps/rapps/hxd.txt +++ b/reactos/base/applications/rapps/rapps/hxd.txt @@ -4,7 +4,7 @@ Name = HxD Version = 1.7.7.0 Licence = Freeware -Description = A good hex editor. +Description = A good hex editor. You need 7-Zip or a similar Utility to extract it. Size = 852 kB Category = 7 URLSite = http://mh-nexus.de/en/ @@ -12,14 +12,19 @@ URLDownload = http://mh-nexus.de/downloads/HxDSetupEN.zip CDPath = none [Section.0407] -Description = Ein guter HEX Editor. +Description = Ein guter HEX Editor. Zum extrahieren wird 7-Zip oder ein ähnliches Tool benötigt. +Size = 854 kB +URLSite = http://mh-nexus.de/de/ +URLDownload = http://mh-nexus.de/downloads/HxDSetupDE.zip [Section.0418] Licence = Gratuită -Description = Un bun editor hexazecimal. -Licence = Gratuită -Size = 852 ko +Description = Un bun editor hexazecimal. E necesar un utilitar de dezarhivare de tip ZIP. +Size = 859 ko +URLDownload = http://mh-nexus.de/downloads/HxDSetupROM.zip [Section.041f] Licence = Ãœcretsiz -Description = Ä°yi bir onaltılık düzenleyici. +Description = Ä°yi bir onaltılık düzenleyici. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir. +Size = 853 KB +URLDownload = http://mh-nexus.de/downloads/HxDSetupTR.zip diff --git a/reactos/base/applications/rapps/rapps/indiftpd.txt b/reactos/base/applications/rapps/rapps/indiftpd.txt index 39e10f45e46..a53d9b78773 100644 --- a/reactos/base/applications/rapps/rapps/indiftpd.txt +++ b/reactos/base/applications/rapps/rapps/indiftpd.txt @@ -22,4 +22,6 @@ Description = IndiFTPD este un server FTP de sine stătător, într-un singur ex Size = 556 ko [Section.041f] +Version = 1.0.9 GeliÅŸme Description = IndiFTPD, bağımsız (bir tek çalıştırılabilir kütükten oluÅŸan) bir FTP sunucusudur. Bu yazılım, çabucak çalışan bir sunucuya iye olmak isteyen, ancak dizgesinde bir sunucu kurmak/ayarlamak istemeyen veyâ dizgesine bir sunucu kuramayan/ayarlayamayan kullanıcılar için tasarlanmıştır. +Size = 556 KB diff --git a/reactos/base/applications/rapps/rapps/irfanview.txt b/reactos/base/applications/rapps/rapps/irfanview.txt index 34793ece0c3..0d89c199e16 100644 --- a/reactos/base/applications/rapps/rapps/irfanview.txt +++ b/reactos/base/applications/rapps/rapps/irfanview.txt @@ -44,6 +44,7 @@ Size = 1,8 Mo [Section.041f] Licence = Åžahsî kullanımlar için ücretsiz. Description = Çizge, ses ve vidyo kütükleri görüntüleyicisi. +Size = 1,8 MB [Section.0422] Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÑŒÐ¾Ð³Ð¾ викориÑтаннÑ) diff --git a/reactos/base/applications/rapps/rapps/irfanviewplugins.txt b/reactos/base/applications/rapps/rapps/irfanviewplugins.txt index 19a5b407f57..7ba442e2c50 100644 --- a/reactos/base/applications/rapps/rapps/irfanviewplugins.txt +++ b/reactos/base/applications/rapps/rapps/irfanviewplugins.txt @@ -45,6 +45,7 @@ Size = 10,2 Mo Name = IrfanView Eklentileri Licence = Åžahsî kullanımlar için ücretsiz. Description = Daha çok kütük türünü desteklemeye yarayan eklentiler. +Size = 10,2 MB [Section.0422] Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÑŒÐ¾Ð³Ð¾ викориÑтаннÑ) diff --git a/reactos/base/applications/rapps/rapps/kdewin.txt b/reactos/base/applications/rapps/rapps/kdewin.txt index 57ac0c9eb3e..e1f234cd9e7 100644 --- a/reactos/base/applications/rapps/rapps/kdewin.txt +++ b/reactos/base/applications/rapps/rapps/kdewin.txt @@ -37,6 +37,7 @@ Size = 2,16 Mo [Section.041f] Name = K Masaüstü Ortamı Description = Pencereler için KDE. +Size = 2,16 MB [Section.0422] Description = KDE Ð´Ð»Ñ Windows. diff --git a/reactos/base/applications/rapps/rapps/kyodai.txt b/reactos/base/applications/rapps/rapps/kyodai.txt index 199fe0089f7..9779a6508f9 100644 --- a/reactos/base/applications/rapps/rapps/kyodai.txt +++ b/reactos/base/applications/rapps/rapps/kyodai.txt @@ -25,3 +25,4 @@ Size = 13,8 Mo Name = Kyodai Çin Dominosu Licence = Kısıtlı Description = Çin dominosu türündeki solitaire oyunları arasında en iyisi. +Size = 13,8 MB diff --git a/reactos/base/applications/rapps/rapps/lazaruside.txt b/reactos/base/applications/rapps/rapps/lazaruside.txt index 88edf67d93a..3c881a465ae 100644 --- a/reactos/base/applications/rapps/rapps/lazaruside.txt +++ b/reactos/base/applications/rapps/rapps/lazaruside.txt @@ -8,7 +8,7 @@ Description = A cross-platform integrated development environment (IDE) that let Size = 111 MB Category = 7 URLSite = http://www.lazarus.freepascal.org/ -URLDownload = http://garr.dl.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bits/Lazarus%201.0.14/lazarus-1.0.14-fpc-2.6.2-win32.exe +URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bits/Lazarus%201.0.14/lazarus-1.0.14-fpc-2.6.2-win32.exe CDPath = none [Section.0407] diff --git a/reactos/base/applications/rapps/rapps/lbreakout2.txt b/reactos/base/applications/rapps/rapps/lbreakout2.txt index ef44c465b84..19c6e54d935 100644 --- a/reactos/base/applications/rapps/rapps/lbreakout2.txt +++ b/reactos/base/applications/rapps/rapps/lbreakout2.txt @@ -8,7 +8,7 @@ Description = Breakout Clone using SDL libs. Size = 3.03 MB Category = 4 URLSite = http://lgames.sourceforge.net/index.php?project=LBreakout2 -URLDownload = http://garr.dl.sourceforge.net/project/lgames/binaries/lbreakout2-2.4.1-win32.exe +URLDownload = http://download.sourceforge.net/project/lgames/binaries/lbreakout2-2.4.1-win32.exe CDPath = none [Section.0407] @@ -36,6 +36,7 @@ Size = 3,03 Mo [Section.041f] Description = SDL kitaplıklarını kullanan bir Breakout taklidi. +Size = 3,03 MB [Section.0422] Description = Клон Breakouta/Arkanoida, що викориÑтовує бібліотеки SDL. diff --git a/reactos/base/applications/rapps/rapps/lgeneral.txt b/reactos/base/applications/rapps/rapps/lgeneral.txt index 8af26d96f6b..6b25b9112cc 100644 --- a/reactos/base/applications/rapps/rapps/lgeneral.txt +++ b/reactos/base/applications/rapps/rapps/lgeneral.txt @@ -8,7 +8,7 @@ Description = Panzer General Clone using SDL libs. Size = 1.92 MB Category = 4 URLSite = http://lgames.sourceforge.net/index.php?project=LGeneral -URLDownload = http://garr.dl.sourceforge.net/project/lgames/binaries/lgeneral-1.1-win32.exe +URLDownload = http://download.sourceforge.net/project/lgames/binaries/lgeneral-1.1-win32.exe CDPath = none [Section.0407] @@ -36,6 +36,7 @@ Size = 1,92 Mo [Section.041f] Description = SDL kitaplıklarını kullanan bir Panzer General taklidi. +Size = 1,92 MB [Section.0422] Description = Клон гри Panzer General, що викориÑтовує бібліотеки SDL. diff --git a/reactos/base/applications/rapps/rapps/libreoffice.txt b/reactos/base/applications/rapps/rapps/libreoffice.txt index 14fc408d33a..12359386821 100644 --- a/reactos/base/applications/rapps/rapps/libreoffice.txt +++ b/reactos/base/applications/rapps/rapps/libreoffice.txt @@ -36,6 +36,7 @@ Size = 205,9 Mo [Section.041f] Description = OpenOffice gibi bir açık kaynak büro takımı. +Size = 205,9 MB [Section.0422] Description = Відкритий офіÑний пакет. diff --git a/reactos/base/applications/rapps/rapps/lmarbles.txt b/reactos/base/applications/rapps/rapps/lmarbles.txt index 793ed19a810..be06d7c1c91 100644 --- a/reactos/base/applications/rapps/rapps/lmarbles.txt +++ b/reactos/base/applications/rapps/rapps/lmarbles.txt @@ -8,7 +8,7 @@ Description = Atomix Clone using SDL libs. Size = 1.39 MB Category = 4 URLSite = http://lgames.sourceforge.net/index.php?project=LMarbles -URLDownload = http://garr.dl.sourceforge.net/project/lgames/binaries/lmarbles-1.0.6-win32.exe +URLDownload = http://download.sourceforge.net/project/lgames/binaries/lmarbles-1.0.6-win32.exe CDPath = none [Section.0407] @@ -36,6 +36,7 @@ Size = 1,39 Mo [Section.041f] Description = SDL kitaplıklarını kullanan bir Atomix taklidi. +Size = 1,39 MB [Section.0422] Description = Клон гри Atomix, що викориÑтовує бібліотеки SDL. diff --git a/reactos/base/applications/rapps/rapps/mfc40.txt b/reactos/base/applications/rapps/rapps/mfc40.txt index 090bd87badb..6bb813a3aae 100644 --- a/reactos/base/applications/rapps/rapps/mfc40.txt +++ b/reactos/base/applications/rapps/rapps/mfc40.txt @@ -49,6 +49,7 @@ Size = 865,04 ko Name = OLE Görüntüleyicisi ve Mikroyazılım Ana Sınıfları (MFC) Sürüm 4 Licence = Bilinmiyor Description = Birtakım uygulamalar için gereklidir. Åžunları içerir: mfc40.dll, msvcrt40.dll. +Size = 865,04 KB [Section.0422] Name = ПереглÑдач OLE та MFC (Microsoft Foundation Classes) верÑÑ–Ñ 4 diff --git a/reactos/base/applications/rapps/rapps/mirandaim.txt b/reactos/base/applications/rapps/rapps/mirandaim.txt index 72e3d7836a6..983de88a861 100644 --- a/reactos/base/applications/rapps/rapps/mirandaim.txt +++ b/reactos/base/applications/rapps/rapps/mirandaim.txt @@ -36,6 +36,7 @@ Size = 2,82 Mo [Section.041f] Description = Bir açık kaynak, çoklu iletiÅŸim kurallı ve evgin iletileÅŸme yazılımı. Eksiksiz olarak çalışmayabilir. +Size = 2,82 MB [Section.0422] Description = Відкрита мультипротокольна програма миттєвих повідомлень - може не працювати повніÑÑ‚ÑŽ. diff --git a/reactos/base/applications/rapps/rapps/mirc.txt b/reactos/base/applications/rapps/rapps/mirc.txt index 2c61974914d..1a68d8d72e4 100644 --- a/reactos/base/applications/rapps/rapps/mirc.txt +++ b/reactos/base/applications/rapps/rapps/mirc.txt @@ -38,6 +38,7 @@ Size = 1,85 Mo [Section.041f] Licence = Kısıtlı Description = ÖrütbaÄŸ EÅŸzamanlı SöyleÅŸi (IRC) istemcileri arasında en tutulanı. +Size = 1,85 MB [Section.0422] Description = ÐайпопулÑрніший клієнт IRC (Internet Relay Chat). diff --git a/reactos/base/applications/rapps/rapps/mirc6.txt b/reactos/base/applications/rapps/rapps/mirc6.txt index e36df3e1c22..066732fa237 100644 --- a/reactos/base/applications/rapps/rapps/mirc6.txt +++ b/reactos/base/applications/rapps/rapps/mirc6.txt @@ -38,6 +38,7 @@ Size = 1,67 Mo [Section.041f] Licence = Kısıtlı Description = ÖrütbaÄŸ EÅŸzamanlı SöyleÅŸi (IRC) istemcileri arasında en tutulanı. +Size = 1,67 MB [Section.0422] Description = ÐайпопулÑрніший клієнт IRC (Internet Relay Chat). diff --git a/reactos/base/applications/rapps/rapps/mono2.txt b/reactos/base/applications/rapps/rapps/mono2.txt index 60cbf4ec4d8..b0112acfa8f 100644 --- a/reactos/base/applications/rapps/rapps/mono2.txt +++ b/reactos/base/applications/rapps/rapps/mono2.txt @@ -36,6 +36,7 @@ Size = 91,93 Mo Name = Mono .NET GeliÅŸtirme Çatısı Licence = Bilinmiyor Description = Bir açık kaynak .NET çatısı. +Size = 91,93 MB [Section.0422] Description = Відкритий .net Фреймворк. diff --git a/reactos/base/applications/rapps/rapps/mpc.txt b/reactos/base/applications/rapps/rapps/mpc.txt index 7e0b75531f5..d34223602c9 100644 --- a/reactos/base/applications/rapps/rapps/mpc.txt +++ b/reactos/base/applications/rapps/rapps/mpc.txt @@ -8,7 +8,7 @@ Description = A media player. Size = 9.8 MB Category = 2 URLSite = http://mpc-hc.org/ -URLDownload = http://garr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.1_x86/MPC-HC.1.7.1.x86.exe +URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.1_x86/MPC-HC.1.7.1.x86.exe CDPath = none [Section.0407] @@ -42,6 +42,7 @@ Description = Multimediálny prehrávaÄ. [Section.041f] Description = Bir ortam oynatıcısı. +Size = 9,8 MB [Section.0422] Description = Мультимедійний програвач. diff --git a/reactos/base/applications/rapps/rapps/mpxplay.txt b/reactos/base/applications/rapps/rapps/mpxplay.txt index b7201871989..46f0a11b4e0 100644 --- a/reactos/base/applications/rapps/rapps/mpxplay.txt +++ b/reactos/base/applications/rapps/rapps/mpxplay.txt @@ -8,7 +8,7 @@ Description = Mpxplay is a 32-bit console audio player for Windows. You need 7-Z Size = 520 kB Category = 1 URLSite = http://mpxplay.sourceforge.net/ -URLDownload = http://garr.dl.sourceforge.net/project/mpxplay/Mpxplay/Mpxplay%20v1.60%20final/mpxp160w.zip +URLDownload = http://download.sourceforge.net/project/mpxplay/Mpxplay/Mpxplay%20v1.60%20final/mpxp160w.zip CDPath = none [Section.0407] @@ -20,3 +20,7 @@ Size = 520 ko [Section.0419] Description = Mpxplay - 32-разрÑдный конÑольный аудиоплеер Ð´Ð»Ñ Windows. Вам нужен 7-Zip или Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð°Ñ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ð° Ð´Ð»Ñ ÐµÐ³Ð¾ раÑпаковки. + +[Section.041f] +Description = Mpxplay, Pencereler için 32 ikillik, konsolluk bir ses oynatıcısıdır. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir. +Size = 520 KB diff --git a/reactos/base/applications/rapps/rapps/msxml3.txt b/reactos/base/applications/rapps/rapps/msxml3.txt index 7fbb7494cd2..9666ac34a4a 100644 --- a/reactos/base/applications/rapps/rapps/msxml3.txt +++ b/reactos/base/applications/rapps/rapps/msxml3.txt @@ -44,6 +44,7 @@ Size = 1,85 Mo [Section.041f] Licence = Bilinmiyor Description = Birtakım Mikroyazılım Yükleyicileri için gereklidir. Åžunları içerir: msxml3.dll, msxml3a.dll, msxml3r.dll. +Size = 1,85 MB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/net11.txt b/reactos/base/applications/rapps/rapps/net11.txt index 9cd7435d817..101d6c1b10d 100644 --- a/reactos/base/applications/rapps/rapps/net11.txt +++ b/reactos/base/applications/rapps/rapps/net11.txt @@ -36,3 +36,4 @@ Size = 23,14 Mo Name = Mikroyazılım .NET Çatısı Sürüm 1.1 Yeniden Dağıtılabilir Paket Licence = Bilinmiyor Description = Mikroyazılım .NET Çatısı Sürüm 1.1 - Yeniden Dağıtılabilir Paket +Size = 23,14 MB diff --git a/reactos/base/applications/rapps/rapps/net20.txt b/reactos/base/applications/rapps/rapps/net20.txt index c420d0ccafe..74a8e2dee5a 100644 --- a/reactos/base/applications/rapps/rapps/net20.txt +++ b/reactos/base/applications/rapps/rapps/net20.txt @@ -33,3 +33,4 @@ Size = 22,42 Mo Name = Mikroyazılım .NET Çatısı Sürüm 2.0 Yeniden Dağıtılabilir Paket Licence = Bilinmiyor Description = Mikroyazılım .NET Çatısı Sürüm 2.0 - Yeniden Dağıtılabilir Paket +Size = 22,42 MB diff --git a/reactos/base/applications/rapps/rapps/net20sp2.txt b/reactos/base/applications/rapps/rapps/net20sp2.txt index f7b9800b800..7c4f2fb8fd7 100644 --- a/reactos/base/applications/rapps/rapps/net20sp2.txt +++ b/reactos/base/applications/rapps/rapps/net20sp2.txt @@ -33,3 +33,4 @@ Size = 23,84 Mo Name = Mikroyazılım .NET Çatısı Sürüm 2.0 Hizmet Paketi 2 Licence = Bilinmiyor Description = Mikroyazılım .NET Çatısı Sürüm 2.0 - Hizmet Paketi 2 +Size = 23,84 MB diff --git a/reactos/base/applications/rapps/rapps/npp.txt b/reactos/base/applications/rapps/rapps/npp.txt index 323b4bbebd3..71fcf0bb734 100644 --- a/reactos/base/applications/rapps/rapps/npp.txt +++ b/reactos/base/applications/rapps/rapps/npp.txt @@ -42,6 +42,7 @@ Description = Textový editor. [Section.041f] Description = Bir metin düzenleyicisi. +Size = 7,25 MB [Section.0422] Description = ТекÑтовый редактор. diff --git a/reactos/base/applications/rapps/rapps/offbyone.txt b/reactos/base/applications/rapps/rapps/offbyone.txt index 11e687e34b5..e25a216d5bc 100644 --- a/reactos/base/applications/rapps/rapps/offbyone.txt +++ b/reactos/base/applications/rapps/rapps/offbyone.txt @@ -42,6 +42,7 @@ Size = 1010,89 ko Name = Off By One Tarayıcısı Licence = Ãœcretsiz Description = Off By One Tarayıcısı, HTML 3.2 desteÄŸiyle çok küçük ve hızlı bir tarayıcıdır. +Size = 1010,89 KB [Section.0422] Description = Дуже малий та швидкий веб-браузер з повною підтримкою HTML 3.2. diff --git a/reactos/base/applications/rapps/rapps/opencodecs.txt b/reactos/base/applications/rapps/rapps/opencodecs.txt index 9ce211ecb29..d44e219e61b 100644 --- a/reactos/base/applications/rapps/rapps/opencodecs.txt +++ b/reactos/base/applications/rapps/rapps/opencodecs.txt @@ -23,3 +23,4 @@ Size = 2,53 Mo [Section.041f] Description = Ogg Vorbis, Speex, Theora, FLAC ve WebM kütük türleri için DirectShow süzgeçleri. +Size = 2,53 MB diff --git a/reactos/base/applications/rapps/rapps/openoffice.txt b/reactos/base/applications/rapps/rapps/openoffice.txt index 0224c618c82..63ae76581f4 100644 --- a/reactos/base/applications/rapps/rapps/openoffice.txt +++ b/reactos/base/applications/rapps/rapps/openoffice.txt @@ -8,42 +8,43 @@ Description = THE Open Source Office Suite. Size = 136.79 MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/en-US/Apache_OpenOffice_4.0.1_Win_x86_install_en-US.exe +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/en-US/Apache_OpenOffice_4.0.1_Win_x86_install_en-US.exe CDPath = none [Section.0407] Description = DIE Open Source Office Suite. -URLSite = http://de.openoffice.org/ +URLSite = http://www.openoffice.org/de/ Size = 154.88 MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/de/Apache_OpenOffice_4.0.1_Win_x86_install_de.exe +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/de/Apache_OpenOffice_4.0.1_Win_x86_install_de.exe [Section.040a] Description = La suite de ofimática de código abierto. -URLSite = http://es.openoffice.org/ +URLSite = http://www.openoffice.org/es/ Size = 126.29 MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/es/Apache_OpenOffice_4.0.1_Win_x86_install_es.exe +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/es/Apache_OpenOffice_4.0.1_Win_x86_install_es.exe [Section.040c] Description = LA suite bureautique open source. -URLSite = http://fr.openoffice.org/ +URLSite = http://www.openoffice.org/fr/ Size = 127,22 Mo -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/fr/Apache_OpenOffice_4.0.1_Win_x86_install_fr.exe +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/fr/Apache_OpenOffice_4.0.1_Win_x86_install_fr.exe [Section.0410] -URLSite = http://it.openoffice.org/ +URLSite = http://www.openoffice.org/it/ Size = 132.39 MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/it/Apache_OpenOffice_4.0.1_Win_x86_install_it.exe +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/it/Apache_OpenOffice_4.0.1_Win_x86_install_it.exe [Section.0413] Description = Open-bron Office Pakket. -URLSite = http://nl.openoffice.org/ +URLSite = http://www.openoffice.org/nl/ Size = 132.11 MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/nl/Apache_OpenOffice_4.0.1_Win_x86_install_nl.exe +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/nl/Apache_OpenOffice_4.0.1_Win_x86_install_nl.exe [Section.0415] Description = Otwarty pakiet biurowy. -URLSite = http://pl.openoffice.org/ -Size = 136.79 MB +URLSite = http://www.openoffice.org/pl/ +Size = 127.47 MB +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/pl/Apache_OpenOffice_4.0.1_Win_x86_install_pl.exe [Section.0418] Description = Suita de aplicaÈ›ii de birotică open-source. @@ -52,15 +53,17 @@ URLSite = http://www.openoffice.org/ro/ [Section.041f] Description = Bir açık kaynak büro takımı. -URLSite = http://tr.openoffice.org/ +Size = 124,36 MB +URLSite = http://www.openoffice.org/tr/ +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/tr/Apache_OpenOffice_4.0.1_Win_x86_install_tr.exe [Section.0422] Description = Відкритий офіÑний пакет. -URLSite = http://ua.openoffice.org/ +URLSite = http://www.openoffice.org/ua/ Size = 136.79 MB [Section.0813] Description = Open-bron Office Pakket. -URLSite = http://nl.openoffice.org/ +URLSite = http://www.openoffice.org/nl/ Size = 132.11 MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/nl/Apache_OpenOffice_4.0.1_Win_x86_install_nl.exe +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries/nl/Apache_OpenOffice_4.0.1_Win_x86_install_nl.exe diff --git a/reactos/base/applications/rapps/rapps/openoffice2.4.txt b/reactos/base/applications/rapps/rapps/openoffice2.4.txt index 2437bea1f4d..2021f27d423 100644 --- a/reactos/base/applications/rapps/rapps/openoffice2.4.txt +++ b/reactos/base/applications/rapps/rapps/openoffice2.4.txt @@ -13,59 +13,60 @@ CDPath = none [Section.0407] Description = DIE Open Source Office Suite. -URLSite = http://de.openoffice.org/ Size = 114.25 MB +URLSite = http://www.openoffice.org/de/ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/de/2.4.3/OOo_2.4.3_Win32Intel_install_de.exe [Section.040a] Description = La suite de ofimática de código abierto. -URLSite = http://es.openoffice.org/ Size = 113.87 MB +URLSite = http://www.openoffice.org/es/ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/es/2.4.3/OOo_2.4.3_Win32Intel_install_es.exe [Section.040c] Version = 2.4.2 Description = LA suite bureautique open source. -URLSite = http://fr.openoffice.org/ Size = 114 Mo +URLSite = http://www.openoffice.org/fr/ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/2.4.2/OOo_2.4.2_Win32Intel_install_fr.exe [Section.0410] -URLSite = http://it.openoffice.org/ Size = 113.79 MB +URLSite = http://www.openoffice.org/it/ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/it/2.4.3/OOo_2.4.3_Win32Intel_install_it.exe [Section.0413] Version = 2.4.2 -URLSite = http://nl.openoffice.org/ Description = Open-bron Office Pakket. -URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/2.4.2/OOo_2.4.2_Win32Intel_install_nl.exe Size = 113.8 MB +URLSite = http://www.openoffice.org/nl/ +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/2.4.2/OOo_2.4.2_Win32Intel_install_nl.exe [Section.0415] Version = 2.4.2 -URLSite = http://pl.openoffice.org/ Description = Otwarty pakiet biurowy. -URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2.4.2/OOo_2.4.2_Win32Intel_install_pl.exe Size = 113.92 MB +URLSite = http://www.openoffice.org/pl/ +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2.4.2/OOo_2.4.2_Win32Intel_install_pl.exe [Section.0418] Description = Suita de aplicaÈ›ii de birotică open-source. Size = 113 Mo +URLSite = http://www.openoffice.org/ro/ [Section.041f] Description = Bir açık kaynak büro takımı. -URLSite = http://tr.openoffice.org/ +URLSite = http://www.openoffice.org/tr/ [Section.0422] -URLSite = http://ua.openoffice.org/ +URLSite = http://www.openoffice.org/ua/ Description = Відкритий офіÑний пакет. URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/2.4.3/OOo_2.4.3_Win32Intel_install_ru.exe Size = 114.76 MB [Section.0813] Version = 2.4.2 -URLSite = http://nl.openoffice.org/ Description = Open-bron Office Pakket. -URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/2.4.2/OOo_2.4.2_Win32Intel_install_nl.exe Size = 113.8 MB +URLSite = http://www.openoffice.org/nl/ +URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/2.4.2/OOo_2.4.2_Win32Intel_install_nl.exe diff --git a/reactos/base/applications/rapps/rapps/openttd.txt b/reactos/base/applications/rapps/rapps/openttd.txt index 1c7358ae04d..4652b1bd887 100644 --- a/reactos/base/applications/rapps/rapps/openttd.txt +++ b/reactos/base/applications/rapps/rapps/openttd.txt @@ -36,6 +36,7 @@ Size = 6,75 Mo [Section.041f] Description = Transport Tycoon Deluxe oyun motorunun bir açık kaynak taklidi. Transport Tycoon'un bir sûreti gerekir. +Size = 6,75 MB [Section.0422] Description = Відкритий клон двигуна гри "Transport Tycoon Deluxe". Вам потрібна ÐºÐ¾Ð¿Ñ–Ñ Ð³Ñ€Ð¸ Transport Tycoon. diff --git a/reactos/base/applications/rapps/rapps/opera.txt b/reactos/base/applications/rapps/rapps/opera.txt index a462c1a6d74..c31b64d2130 100644 --- a/reactos/base/applications/rapps/rapps/opera.txt +++ b/reactos/base/applications/rapps/rapps/opera.txt @@ -44,6 +44,7 @@ Description = ПопулÑрный браузер Ñо многими допол [Section.041f] Licence = Ãœcretsiz Description = Tutulan Opera Tarayıcı, birçok geliÅŸmiÅŸ husûsiyetle ve kendi mail ve BitTorrent istemcileriyle birlikte gelir. +Size = 12,56 MB [Section.0422] Description = ПопулÑрний браузер з багатьма додатковими можливоÑÑ‚Ñми, Ñкий включає в Ñебе поштовий та BitTorrent клієнти. diff --git a/reactos/base/applications/rapps/rapps/opera9.txt b/reactos/base/applications/rapps/rapps/opera9.txt index 92b9094959d..4378e545246 100644 --- a/reactos/base/applications/rapps/rapps/opera9.txt +++ b/reactos/base/applications/rapps/rapps/opera9.txt @@ -41,6 +41,7 @@ Description = ПопулÑрный браузер Ñо многими допол [Section.041f] Licence = Ãœcretsiz Description = Tutulan Opera Tarayıcı, birçok geliÅŸmiÅŸ husûsiyetle ve kendi mail ve BitTorrent istemcileriyle birlikte gelir. +Size = 7,21 MB [Section.0422] Description = ПопулÑрний браузер з багатьма додатковими можливоÑÑ‚Ñми, Ñкий включає в Ñебе поштовий та BitTorrent клієнти. diff --git a/reactos/base/applications/rapps/rapps/pengupop.txt b/reactos/base/applications/rapps/rapps/pengupop.txt index 95a1617ff94..f69ab6eb7d3 100644 --- a/reactos/base/applications/rapps/rapps/pengupop.txt +++ b/reactos/base/applications/rapps/rapps/pengupop.txt @@ -22,3 +22,4 @@ Size = 384 ko [Section.041f] Description = Oyunun amacı, oyun alanınızda üç ya da daha çok takımdan oluÅŸan renkli küreleri vurmaktır. +Size = 384 KB diff --git a/reactos/base/applications/rapps/rapps/photofiltre.txt b/reactos/base/applications/rapps/rapps/photofiltre.txt index 72d201f0ce6..9de00912f13 100644 --- a/reactos/base/applications/rapps/rapps/photofiltre.txt +++ b/reactos/base/applications/rapps/rapps/photofiltre.txt @@ -22,3 +22,4 @@ Size = 4,99 Mo [Section.041f] Licence = Ãœcretsiz Description = Bu sürüm, katmanlarla gelmektedir ancak Stüdyo X sürümünden daha kısıtlıdır. PhotoFiltre Stüdyo, eksiksiz bir resim düzeltme yazılımıdır. +Size = 4,99 MB diff --git a/reactos/base/applications/rapps/rapps/pingus.txt b/reactos/base/applications/rapps/rapps/pingus.txt index ac3c9107a48..85bdcaf95c5 100644 --- a/reactos/base/applications/rapps/rapps/pingus.txt +++ b/reactos/base/applications/rapps/rapps/pingus.txt @@ -23,3 +23,4 @@ Size = 16,0 Mo [Section.041f] Description = Pingus, ücretsiz, Yaban Sıçanları gibi bir bulmaca oyunudur. +Size = 16,0 MB diff --git a/reactos/base/applications/rapps/rapps/pspad.txt b/reactos/base/applications/rapps/rapps/pspad.txt index eb98e684608..82588542615 100644 --- a/reactos/base/applications/rapps/rapps/pspad.txt +++ b/reactos/base/applications/rapps/rapps/pspad.txt @@ -44,6 +44,7 @@ Description = Textový editor. [Section.041f] Licence = Ãœcretsiz Description = Bir metin düzenleyicisi. +Size = 4,46 MB [Section.0422] Description = ТекÑтовый редактор. diff --git a/reactos/base/applications/rapps/rapps/ptanks.txt b/reactos/base/applications/rapps/rapps/ptanks.txt index d3fae1e3654..491157b55b2 100644 --- a/reactos/base/applications/rapps/rapps/ptanks.txt +++ b/reactos/base/applications/rapps/rapps/ptanks.txt @@ -23,3 +23,4 @@ Size = 2,86 Mo Name = Küçük Tanklar Licence = Kısıtlı Description = Bu güne kadar oynadığınız en hızlı topçu oyunu. +Size = 2,86 MB diff --git a/reactos/base/applications/rapps/rapps/putty.txt b/reactos/base/applications/rapps/rapps/putty.txt index 07cae93fc51..7284a2e2fbf 100644 --- a/reactos/base/applications/rapps/rapps/putty.txt +++ b/reactos/base/applications/rapps/rapps/putty.txt @@ -36,6 +36,7 @@ Size = 1,78 Mo [Section.041f] Description = Özgür bir SSH, Telnet, rlogin ve ham TCP istemcisi. +Size = 1,78 MB [Section.0422] Description = Безплатний SSH, Telnet, rlogin та raw TCP клієнт. diff --git a/reactos/base/applications/rapps/rapps/python.txt b/reactos/base/applications/rapps/rapps/python.txt index 1e737da2b30..d5878b1b9b4 100644 --- a/reactos/base/applications/rapps/rapps/python.txt +++ b/reactos/base/applications/rapps/rapps/python.txt @@ -37,6 +37,7 @@ Size = 19,6 Mo [Section.041f] Name = Piton 3 Description = Ä°lgi çekici, güçlü ve devingen bir çizeylemleme dili. +Size = 19,6 MB [Section.0422] Description = Дуже потужна динамічна мова програмуваннÑ. diff --git a/reactos/base/applications/rapps/rapps/python2.txt b/reactos/base/applications/rapps/rapps/python2.txt index da1209200c6..754428707ed 100644 --- a/reactos/base/applications/rapps/rapps/python2.txt +++ b/reactos/base/applications/rapps/rapps/python2.txt @@ -37,6 +37,7 @@ Size = 15,48 Mo [Section.041f] Name = Piton 2 Description = Ä°lgi çekici, güçlü ve devingen bir çizeylemleme dili. +Size = 15,48 MB [Section.0422] Description = Дуже потужна динамічна мова програмуваннÑ. diff --git a/reactos/base/applications/rapps/rapps/qb64sdl.txt b/reactos/base/applications/rapps/rapps/qb64sdl.txt index 2d13be09774..090bf8a8b66 100644 --- a/reactos/base/applications/rapps/rapps/qb64sdl.txt +++ b/reactos/base/applications/rapps/rapps/qb64sdl.txt @@ -4,7 +4,7 @@ Name = QB64 (SDL version) Version = 0.954 Licence = Freeware -Description = QB64 is a self-hosting BASIC compiler for Microsoft Windows, Linux and Mac OS X, designed to be compatible with Microsoft QBasic and Microsoft QuickBASIC. You need 7-Zip or a similar Utility to extract it. +Description = QB64 is a self-hosting BASIC compiler for Microsoft Windows, Linux and Mac OS X, designed to be compatible with Microsoft QBasic and Microsoft QuickBASIC. You need 7-Zip or a similar utility to extract it. Size = 33.1 MB Category = 7 URLSite = http://www.qb64.net/ @@ -20,6 +20,7 @@ Description = QB64 este un compilator BASIC auto-compilabil pentru Windows, Linu Size = 33,1 Mo [Section.041f] -Name = QB64 (SDL sürümü) +Name = QB64 (SDL Sürümü) Licence = Ãœcretsiz Description = QB64; Mikroyazılım Pencereler, Linux ve Mac OS X için yapılmış, Mikroyazılım QBasic ve Mikroyazılım QuickBASIC ile uyumlu olarak tasarlanan, kendi kendini derleyen bir BASIC derleyicisidir. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir. +Size = 33,1 MB diff --git a/reactos/base/applications/rapps/rapps/qmmp.txt b/reactos/base/applications/rapps/rapps/qmmp.txt index 0f4d5fe3a0e..22287f43813 100644 --- a/reactos/base/applications/rapps/rapps/qmmp.txt +++ b/reactos/base/applications/rapps/rapps/qmmp.txt @@ -20,3 +20,8 @@ Size = 16,0 Mo [Section.0419] Description = Ðудиоплеер Qmmp (Qt-based Multimedia Player). + +[Section.041f] +Name = Qt Tabanlı Çokluortam Oynatıcısı +Description = Qmmp, Qt kitaplığının yardımıyla yazılan bir ses oynatıcısıdır. Kullanıcı arayüzüsü WinAMP'ınkine ve XMMS'ninkine benzer. Ayrıca deÄŸiÅŸik kullanıcı arayüzleri de vardır. +Size = 16,0 MB diff --git a/reactos/base/applications/rapps/rapps/remood.txt b/reactos/base/applications/rapps/rapps/remood.txt index 701ad16141f..80301db70bc 100644 --- a/reactos/base/applications/rapps/rapps/remood.txt +++ b/reactos/base/applications/rapps/rapps/remood.txt @@ -8,7 +8,7 @@ Description = ReMooD is a source port of Doom Legacy. It aims to provide the cla Size = 1.15 MB Category = 4 URLSite = http://remood.sourceforge.net/ -URLDownload = http://garr.dl.sourceforge.net/project/remood/ReMooD/0.8a/remoodsetup-win32_08a.exe +URLDownload = http://download.sourceforge.net/project/remood/ReMooD/0.8a/remoodsetup-win32_08a.exe CDPath = none [Section.0407] @@ -36,6 +36,7 @@ Size = 1,15 Mo [Section.041f] Description = ReMooD, Doom Legacy'in kaynak düzgülerinin bir uyarlamasıdır. Bilindik Legacy deneyimiyle yeni husûsiyetler ve daha fazla kararlılık saÄŸlamayı amaçlar. +Size = 1,15 MB [Section.0422] Description = ReMooD Ñ ÐŸÐ¾Ñ€Ñ‚Ð¾Ð¼ вихідних кодів Doom Legacy. Його метою Ñ” додати нові можливоÑÑ‚Ñ– та ÑтабільніÑÑ‚ÑŒ до доÑвіду клаÑичного Legacy. diff --git a/reactos/base/applications/rapps/rapps/reshack.txt b/reactos/base/applications/rapps/rapps/reshack.txt index b8e6e775957..edbd5350c8e 100644 --- a/reactos/base/applications/rapps/rapps/reshack.txt +++ b/reactos/base/applications/rapps/rapps/reshack.txt @@ -23,3 +23,4 @@ Size = 730 ko Name = Kaynak Korsancısı Licence = Ãœcretsiz Description = Kaynak Korsancısı, 32 ya da 64 ikillik Pencereler çaılÅŸtırabilirlerini ve .res uzantılı kaynak kütüklerindeki kaynakları görüntüleyen, deÄŸiÅŸtiren, yeniden adlandıran, ekleyen, silen ve çıkartan ücretsiz bir araçtır. +Size = 730 KB diff --git a/reactos/base/applications/rapps/rapps/rocks.txt b/reactos/base/applications/rapps/rapps/rocks.txt index 176202c2a5e..9eeeed89b0e 100644 --- a/reactos/base/applications/rapps/rapps/rocks.txt +++ b/reactos/base/applications/rapps/rapps/rocks.txt @@ -20,3 +20,4 @@ Size = 2,42 Mo [Section.041f] Description = UNIX, Mac OS X, Pencereler ve DOS için yapılmış, atari oyun salonu türünde bir oyun. Åžu gelenekleri içerir: "Boulder Dash" (C64), "Zümrüt Mâdeni" (Amiga), "Supaplex" (Amiga ve PC), "Sokoban" (PC). Yazılımı kurmak için ZIP biçiminde çıkartma yeteneÄŸi olan bir yazılım gerekir. +Size = 2,42 MB diff --git a/reactos/base/applications/rapps/rapps/rosbe.txt b/reactos/base/applications/rapps/rapps/rosbe.txt index 8a3abfc9191..2043f96b99e 100644 --- a/reactos/base/applications/rapps/rapps/rosbe.txt +++ b/reactos/base/applications/rapps/rapps/rosbe.txt @@ -8,7 +8,7 @@ Description = Allows you to build the ReactOS Source. For more instructions see Size = 31.6 MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://heanet.dl.sourceforge.net/project/reactos/RosBE-Windows/i386/2.1/RosBE-2.1.exe +URLDownload = http://download.sourceforge.net/project/reactos/RosBE-Windows/i386/2.1/RosBE-2.1.exe CDPath = none [Section.0405] @@ -40,6 +40,7 @@ Size = 31,6 Mo [Section.041f] Name = ReactOS Derleme Ortamı Description = ReactOS Kaynak Kodları'nı derlettirir. Daha çok açıklama için ReactOS Wiki'ye bakınız. +Size = 31,6 MB [Section.0422] Description = ДозволÑÑ” зібрати ReactOS з вихідних кодів. За детальною інформацією дивітьÑÑ Ð² ReactOS Вікі. diff --git a/reactos/base/applications/rapps/rapps/rosbeamd64.txt b/reactos/base/applications/rapps/rapps/rosbeamd64.txt index 76a3755d710..3fcba8b18fa 100644 --- a/reactos/base/applications/rapps/rapps/rosbeamd64.txt +++ b/reactos/base/applications/rapps/rapps/rosbeamd64.txt @@ -8,7 +8,7 @@ Description = Allows you to build the ReactOS AMD64 Source. For more instruction Size = 15.83 MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment/ -URLDownload = http://sunet.dl.sourceforge.net/project/reactos/RosBE-Windows/amd64/1.3/RosBE64-1.3.exe +URLDownload = http://download.sourceforge.net/project/reactos/RosBE-Windows/amd64/1.3/RosBE64-1.3.exe CDPath = none [Section.0405] @@ -40,6 +40,7 @@ Size = 15,83 Mo [Section.041f] Name = ReactOS Derleme Ortamı Description = ReactOS AMD64 Kaynak Kodları'nı derlettirir. Daha çok açıklama için ReactOS Wiki'ye bakınız. +Size = 15,83 MB [Section.0422] Description = ДозволÑÑ” зібрати ReactOS AMD64 з вихідних кодів. За детальною інформацією дивітьÑÑ Ð² ReactOS Вікі. diff --git a/reactos/base/applications/rapps/rapps/rosbearm.txt b/reactos/base/applications/rapps/rapps/rosbearm.txt index aa9c0282eb7..f74fb5bff4b 100644 --- a/reactos/base/applications/rapps/rapps/rosbearm.txt +++ b/reactos/base/applications/rapps/rapps/rosbearm.txt @@ -8,7 +8,7 @@ Description = Allows you to build the ReactOS ARM Source. For more instructions Size = 11.15 MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment/ -URLDownload = http://garr.dl.sourceforge.net/project/reactos/RosBE-Windows/arm/1.0/RosBE-ARM-1.0.exe +URLDownload = http://download.sourceforge.net/project/reactos/RosBE-Windows/arm/1.0/RosBE-ARM-1.0.exe CDPath = none [Section.0407] @@ -37,6 +37,7 @@ Size = 11,15 Mo [Section.041f] Name = ReactOS Derleme Ortamı Description = ReactOS ARM Kaynak Kodları'nı derlettirir. Daha çok açıklama için ReactOS Wiki'ye bakınız. +Size = 11,15 MB [Section.0422] Description = ДозволÑÑ” зібрати ReactOS ARM з вихідних кодів. За детальною інформацією дивітьÑÑ Ð² ReactOS Вікі. diff --git a/reactos/base/applications/rapps/rapps/sambatng.txt b/reactos/base/applications/rapps/rapps/sambatng.txt index 755e621b0c0..a2e430cd731 100644 --- a/reactos/base/applications/rapps/rapps/sambatng.txt +++ b/reactos/base/applications/rapps/rapps/sambatng.txt @@ -36,6 +36,7 @@ Size = 2,13 Mo [Section.041f] Description = Bu araç, ReactOS'ta Pencereler'in paylaşılan yazıcılarıyla paylaşılan dizinlerine eriÅŸimi saÄŸlar. +Size = 2,13 MB [Section.0422] Description = Цей інÑтрумент дозволÑÑ” отримати доÑтуп до Ñпільних тек/принтерів Windows з ReactOSа. diff --git a/reactos/base/applications/rapps/rapps/sbforvmware.txt b/reactos/base/applications/rapps/rapps/sbforvmware.txt index f47d83fe21b..4d610352543 100644 --- a/reactos/base/applications/rapps/rapps/sbforvmware.txt +++ b/reactos/base/applications/rapps/rapps/sbforvmware.txt @@ -61,6 +61,7 @@ Description = Pазархивируйте Ñодержимое в папку "Re Name = VMWare için SoundBlaster Sürücüsü Licence = Bilinmiyor Description = Bunu, ReactOS'un dizinine çıkartıp bilgisayarı iki kez yeniden baÅŸlatınız. +Size = 2,22 MB [Section.0422] Name = Драйвер SoundBlaster Ð´Ð»Ñ VMWare diff --git a/reactos/base/applications/rapps/rapps/scite.txt b/reactos/base/applications/rapps/rapps/scite.txt index 1fe5fd90630..a469b5e4a46 100644 --- a/reactos/base/applications/rapps/rapps/scite.txt +++ b/reactos/base/applications/rapps/rapps/scite.txt @@ -8,7 +8,7 @@ Description = SciTE is a SCIntilla based Text Editor. Originally built to demons Size = 722 kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.3.7/Sc337.exe +URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.3.7/Sc337.exe CDPath = none [Section.0407] @@ -38,6 +38,7 @@ Size = 722 ko [Section.041f] Licence = Ãœcretsiz Description = SciTE, Scintilla tabanlı bir metin düzenleyicisidir. BaÅŸlangıçta, Scintilla'yı göstermek için yapılmıştır ancak umûmiyetle çizeylemleri yapmak ve çalıştırmak yetenekleriyle birlikte kullanışlı bir düzenleyici olarak geliÅŸtirilmiÅŸtir. +Size = 722 KB [Section.0422] Description = ТекÑтовий редактор на оÑнові SCIntilla. Був зібраний Ñк Ð¿Ñ€ÐµÐ·ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ Scintilla, але Ð²Ð¸Ñ€Ñ–Ñ Ð´Ð¾ редактора загального кориÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð· заÑобами Ð·Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ñ‚Ð° запуÑку програм. diff --git a/reactos/base/applications/rapps/rapps/scummvm.txt b/reactos/base/applications/rapps/rapps/scummvm.txt index 875e01dbece..920b62f84eb 100644 --- a/reactos/base/applications/rapps/rapps/scummvm.txt +++ b/reactos/base/applications/rapps/rapps/scummvm.txt @@ -8,7 +8,7 @@ Description = Sam and Max, Day of the Tentacle, etc on ReactOS. Size = 6.28 MB Category = 4 URLSite = http://scummvm.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scummvm/scummvm/1.6.0/scummvm-1.6.0-win32.exe +URLDownload = http://download.sourceforge.net/project/scummvm/scummvm/1.6.0/scummvm-1.6.0-win32.exe CDPath = none [Section.0407] @@ -36,6 +36,7 @@ Size = 6,28 Mo [Section.041f] Description = ReactOS üzerinde Sam ve Max, Dokunaç Günü vb. +Size = 6,28 MB [Section.0422] Description = Дозволить грати Sam and Max, Day of the Tentacle та інші клаÑичні ігри в ReactOS. diff --git a/reactos/base/applications/rapps/rapps/sdl_mixer.txt b/reactos/base/applications/rapps/rapps/sdl_mixer.txt index e291ece2d7b..d21327c07f3 100644 --- a/reactos/base/applications/rapps/rapps/sdl_mixer.txt +++ b/reactos/base/applications/rapps/rapps/sdl_mixer.txt @@ -40,6 +40,7 @@ Size = 548,02 ko [Section.041f] Name = Bayağı DoÄŸrudan Ortam Katmanı (SDL) Karıştırıcısı Description = Birtakım açık kaynak uygulamalar için gereklidir. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir. +Size = 548,02 KB [Section.0422] Description = Ðеобхідний Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ декотрих відкритих ігор. Вам потрібен 7-Zip або подібна утиліта щоб розпакувати його. diff --git a/reactos/base/applications/rapps/rapps/sdl_runtime.txt b/reactos/base/applications/rapps/rapps/sdl_runtime.txt index efd877e21f1..5b5a21c9608 100644 --- a/reactos/base/applications/rapps/rapps/sdl_runtime.txt +++ b/reactos/base/applications/rapps/rapps/sdl_runtime.txt @@ -41,6 +41,7 @@ Size = 136,67 ko [Section.041f] Name = Bayağı DoÄŸrudan Ortam Katmanı (SDL) Yürütücüsü Description = Birtakım açık kaynak uygulamalar için gereklidir. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir. +Size = 136,67 KB [Section.0422] Name = Бібліотека Simple Direct Media Layer (SDL) diff --git a/reactos/base/applications/rapps/rapps/seamonkey.txt b/reactos/base/applications/rapps/rapps/seamonkey.txt index 153b6f48815..14b2a6b83d7 100644 --- a/reactos/base/applications/rapps/rapps/seamonkey.txt +++ b/reactos/base/applications/rapps/rapps/seamonkey.txt @@ -52,7 +52,7 @@ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win [Section.041f] Description = Bu; yalnızca Tarayıcı, Mail, SöyleÅŸi ve Yazar'dan oluÅŸan, hiç gereksinim duymayacağınız bir bohçadır. -Size = 23.83 MB +Size = 23,83 MB URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/tr/SeaMonkey%20Setup%202.23.exe [Section.0422] diff --git a/reactos/base/applications/rapps/rapps/smplayer.txt b/reactos/base/applications/rapps/rapps/smplayer.txt index f44922728f3..8a3f6faf271 100644 --- a/reactos/base/applications/rapps/rapps/smplayer.txt +++ b/reactos/base/applications/rapps/rapps/smplayer.txt @@ -7,45 +7,44 @@ Licence = GPL Description = Graphical Frontend for MPlayer. Size = 16.98 MB Category = 2 -URLSite = http://smplayer.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/smplayer/SMPlayer/0.8.6/smplayer-0.8.6-win32.exe +URLSite = http://smplayer.sourceforge.net/en/info +URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/0.8.6/smplayer-0.8.6-win32.exe CDPath = none [Section.0407] Description = Grafische Oberfläche für MPlayer. -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=de +URLSite = http://smplayer.sourceforge.net/de/info [Section.040a] -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=es +URLSite = http://smplayer.sourceforge.net/es/info Description = Interfaz gráfico para Mplayer (reproductor multimedia). [Section.040c] Size = 16,98 Mo -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=fr +URLSite = http://smplayer.sourceforge.net/fr/info [Section.0410] -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=it +URLSite = http://smplayer.sourceforge.net/it/info [Section.0413] -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=nl Description = Mediaspeler, grafische interface voor MPlayer. [Section.0415] -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=pl +URLSite = http://smplayer.sourceforge.net/pl/info Description = Graficzna nakÅ‚adka na MPlayer, otwarty odtwarzacz filmów. [Section.0418] Description = Lector multimedia (interfață pentru MPlayer). Size = 16,98 Mo -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=ro [Section.041f] Description = MPlayer için çizgelik önyüz. +Size = 16,98 MB +URLSite = http://smplayer.sourceforge.net/tr/info [Section.0422] -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=uk +URLSite = http://smplayer.sourceforge.net/uk/info Description = Графічний Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð´Ð»Ñ MPlayer (мультимедійний плеєр). [Section.0813] -URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=nl Description = Mediaspeler, grafische interface voor MPlayer. diff --git a/reactos/base/applications/rapps/rapps/stamina.txt b/reactos/base/applications/rapps/rapps/stamina.txt index 8b68bf181d2..1de6923ec91 100644 --- a/reactos/base/applications/rapps/rapps/stamina.txt +++ b/reactos/base/applications/rapps/rapps/stamina.txt @@ -18,3 +18,4 @@ Size = 4,7 Mo [Section.041f] Description = Ãœcretsiz bir düğme takımında yazma öğreticisi. +Size = 4,7 MB diff --git a/reactos/base/applications/rapps/rapps/steam.txt b/reactos/base/applications/rapps/rapps/steam.txt index 99a3ca30e10..61894754cc3 100644 --- a/reactos/base/applications/rapps/rapps/steam.txt +++ b/reactos/base/applications/rapps/rapps/steam.txt @@ -39,6 +39,7 @@ URLSite = http://store.steampowered.com/?l=romanian [Section.041f] Licence = Ãœcretsiz Description = Bu günlerde STEAM oyun platformu, birçok oyun tarafından kullanılmaktadır. +Size = 1,59 MB [Section.0422] Description = Ігрова платформа, що викориÑтовуєтьÑÑ Ð±Ð°Ð³Ð°Ñ‚ÑŒÐ¼Ð° іграми. diff --git a/reactos/base/applications/rapps/rapps/sumatrapdf.txt b/reactos/base/applications/rapps/rapps/sumatrapdf.txt index e42c2548812..af1fd201847 100644 --- a/reactos/base/applications/rapps/rapps/sumatrapdf.txt +++ b/reactos/base/applications/rapps/rapps/sumatrapdf.txt @@ -37,6 +37,7 @@ URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-ro.html [Section.041f] Description = SumatraPDF; yeÄŸni, ücretsiz ve açık kaynak bir PDF okuyucusudur. Taşınabilirdir. +Size = 4,0 MB [Section.0813] Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer. diff --git a/reactos/base/applications/rapps/rapps/superdxb.txt b/reactos/base/applications/rapps/rapps/superdxb.txt index 588015799aa..8c51970b5f5 100644 --- a/reactos/base/applications/rapps/rapps/superdxb.txt +++ b/reactos/base/applications/rapps/rapps/superdxb.txt @@ -23,3 +23,4 @@ Size = 3,8 Mo Name = Süper DX-Ball Licence = Kısıtlı Description = Süper DX-Ball, canlı ve renkli bir tuÄŸla kırma oyunudur. +Size = 3,8 MB diff --git a/reactos/base/applications/rapps/rapps/superfinder.txt b/reactos/base/applications/rapps/rapps/superfinder.txt index 9c1bdd7afd9..1dcc2cde4b3 100644 --- a/reactos/base/applications/rapps/rapps/superfinder.txt +++ b/reactos/base/applications/rapps/rapps/superfinder.txt @@ -39,6 +39,7 @@ Size = 4,94 Mo Name = Süper Bulucu XT Licence = Ãœcretsiz Description = Hızlı ve husûsiyet zengini bir arama uygulaması. +Size = 4,94 MB [Section.0422] Description = Швидка та потужна програма пошуку. diff --git a/reactos/base/applications/rapps/rapps/supertux.txt b/reactos/base/applications/rapps/rapps/supertux.txt index cfb8cfdec26..41c0589ff07 100644 --- a/reactos/base/applications/rapps/rapps/supertux.txt +++ b/reactos/base/applications/rapps/rapps/supertux.txt @@ -23,3 +23,4 @@ Size = 7,3 Mo [Section.041f] Description = SuperTux, ücretsiz, iki boyutlu ve açık kaynak bir platform oyunudur. +Size = 7,3 MB diff --git a/reactos/base/applications/rapps/rapps/tahoma.txt b/reactos/base/applications/rapps/rapps/tahoma.txt index 2ef5721c04a..ff9123d1585 100644 --- a/reactos/base/applications/rapps/rapps/tahoma.txt +++ b/reactos/base/applications/rapps/rapps/tahoma.txt @@ -43,6 +43,7 @@ Size = 305,12 ko Name = Mikroyazılım Tahoma Yazı Türü Licence = Bilinmiyor Description = Tahoma Yazı Türleri. Steam gibi birtakım yazılımlar için gereklidir. Åžunları içerir: Tahoma.ttf, Tahomabd.ttf. +Size = 305,12 KB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/thunderbird.txt b/reactos/base/applications/rapps/rapps/thunderbird.txt index f0e9c7cac28..1171b496f39 100644 --- a/reactos/base/applications/rapps/rapps/thunderbird.txt +++ b/reactos/base/applications/rapps/rapps/thunderbird.txt @@ -7,67 +7,67 @@ Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 21.12 MB Category = 5 -URLSite = http://www.mozilla.org/en/thunderbird/ +URLSite = https://www.mozilla.org/en-US/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/en-US/Thunderbird%20Setup%2024.2.0.exe CDPath = none [Section.0407] Description = Der populärste und einer der besten freien Mail-Clients. Size = 20.96 MB -URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ +URLSite = https://www.mozilla.org/de/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/de/Thunderbird%20Setup%2024.2.0.exe [Section.040a] Description = El más popular y uno de los mejores clientes mail que hay. Size = 20.92 MB -URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ +URLSite = https://www.mozilla.org/es-ES/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/es-ES/Thunderbird%20Setup%2024.2.0.exe [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 21,27 Mo -URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ +URLSite = https://www.mozilla.org/fr/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/fr/Thunderbird%20Setup%2024.2.0.exe [Section.0410] Description = Il più popolare e il migliore Clients mail gratuito. Size = 20.91 MB -URLSite = http://www.mozilla-europe.org/it/products/thunderbird/ +URLSite = https://www.mozilla.org/it/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/it/Thunderbird%20Setup%2024.2.0.exe [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 21.61 MB -URLSite = http://www.mozilla-europe.org/nl/products/thunderbird/ +URLSite = https://www.mozilla.org/nl/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/nl/Thunderbird%20Setup%2024.2.0.exe [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty. Size = 21.80 MB -URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ +URLSite = https://www.mozilla.org/pl/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/pl/Thunderbird%20Setup%2024.2.0.exe [Section.0418] Description = Cel mai popular È™i unul dintre cele mai bune clientele gratuite de poÈ™tă electronică. Size = 21,48 Mo -URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ +URLSite = https://www.mozilla.org/ro/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/ro/Thunderbird%20Setup%2024.2.0.exe [Section.0419] Description = Один из Ñамых популÑрных и лучших беÑплатных почтовых клиентов. Size = 21.38 MB -URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ +URLSite = https://www.mozilla.org/ru/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/ru/Thunderbird%20Setup%2024.2.0.exe [Section.041f] Name = Mozilla YıldırımkuÅŸu Description = Özgür mail istemcileri arasında en tutulanı ve en iyisi. Size = 20,99 MB -URLSite = https://www.mozilla.org/tr/products/thunderbird/ +URLSite = https://www.mozilla.org/tr/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/tr/Thunderbird%20Setup%2024.2.0.exe [Section.0422] Description = ÐайпопулÑрніший та один з кращих поштових клієнтів. Size = 21.41 MB -URLSite = http://www.mozillamessaging.com/uk/thunderbird/ +URLSite = https://www.mozilla.org/uk/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/uk/Thunderbird%20Setup%2024.2.0.exe diff --git a/reactos/base/applications/rapps/rapps/thunderbird3.txt b/reactos/base/applications/rapps/rapps/thunderbird3.txt index d329ccba321..d97583b0fcc 100644 --- a/reactos/base/applications/rapps/rapps/thunderbird3.txt +++ b/reactos/base/applications/rapps/rapps/thunderbird3.txt @@ -7,54 +7,73 @@ Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.06 MB Category = 5 -URLSite = http://www.mozilla.org/en/thunderbird/ -URLDownload = http://svn.reactos.org/packages/Thunderbird%20Setup%203.1.20.exe +URLSite = http://www.mozilla.org/en-US/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/en-US/Thunderbird%20Setup%203.1.20.exe CDPath = none [Section.0407] Description = Der populärste und einer der besten freien Mail-Clients. -URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ +Size = 8.91 MB +URLSite = https://www.mozilla.org/de/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/de/Thunderbird%20Setup%203.1.20.exe [Section.040a] Description = El más popular y uno de los mejores clientes mail que hay. -URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ +Size = 8.88 MB +URLSite = https://www.mozilla.org/es-ES/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/es-ES/Thunderbird%20Setup%203.1.20.exe [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. -Size = 9,06 Mo -URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ +Size = 9,13 Mo +URLSite = https://www.mozilla.org/fr/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/fr/Thunderbird%20Setup%203.1.20.exe [Section.0410] Description = Il più popolare e il migliore Clients mail gratuito. -URLSite = http://www.mozilla-europe.org/it/products/thunderbird/ +Size = 8.88 MB +URLSite = https://www.mozilla.org/it/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/it/Thunderbird%20Setup%203.1.20.exe [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. -URLSite = http://www.mozilla-europe.org/nl/products/thunderbird/ +Size = 9.71 MB +URLSite = https://www.mozilla.org/nl/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/nl/Thunderbird%20Setup%203.1.20.exe [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty. -URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ +Size = 9.73 MB +URLSite = https://www.mozilla.org/pl/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/pl/Thunderbird%20Setup%203.1.20.exe [Section.0418] Description = Cel mai popular È™i unul dintre cele mai bune clientele gratuite de poÈ™tă electronică. -Size = 9,06 Mo -URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ +Size = 9,31 Mo +URLSite = https://www.mozilla.org/ro/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/ro/Thunderbird%20Setup%203.1.20.exe [Section.0419] Description = Один из Ñамых популÑрных и лучших беÑплатных почтовых клиентов. -URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ +Size = 9.29 MB +URLSite = https://www.mozilla.org/ru/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/ru/Thunderbird%20Setup%203.1.20.exe [Section.041f] Name = Mozilla YıldırımkuÅŸu Description = Özgür mail istemcileri arasında en tutulanı ve en iyisi. -URLSite = https://www.mozilla.org/tr/products/thunderbird/ +Size = 8,91 MB +URLSite = https://www.mozilla.org/tr/thunderbird/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/tr/Thunderbird%20Setup%203.1.20.exe [Section.0422] Description = ÐайпопулÑрніший та один з кращих поштових клієнтів. -URLSite = http://www.mozillamessaging.com/uk/thunderbird/ +Size = 9.29 MB +URLSite = https://www.mozilla.org/uk/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/uk/Thunderbird%20Setup%203.1.20.exe [Section.0813] Description = De meest populaire en een van de beste gratis e-mail-programma's. -URLSite = http://www.mozilla-europe.org/nl/products/thunderbird/ +Size = 9.71 MB +URLSite = https://www.mozilla.org/nl/thunderbird/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/nl/Thunderbird%20Setup%203.1.20.exe diff --git a/reactos/base/applications/rapps/rapps/tileworld.txt b/reactos/base/applications/rapps/rapps/tileworld.txt index 39adafdd6cd..2cea96d2a5f 100644 --- a/reactos/base/applications/rapps/rapps/tileworld.txt +++ b/reactos/base/applications/rapps/rapps/tileworld.txt @@ -37,6 +37,7 @@ Size = 1,16 Mo [Section.041f] Name = Karolu Dünyâ Description = BaÅŸlangıçta Atari Lynx için yapılan Çip'in Düellosu adlı oyunun iyi bir taklidi. Ãœcretsiz CCLP2 Çizge Paketi'ni de kapsadığından bunun ruhsatlı özgününe gerek yoktur. +Size = 1,16 MB [Section.0422] Description = Чудовий клон гри Chip's Challenge Ð´Ð»Ñ Atari Lynx. Включено безплатний графічний пакет CCLP2, тому вам не потрібен оригінальний. diff --git a/reactos/base/applications/rapps/rapps/totalcommander.txt b/reactos/base/applications/rapps/rapps/totalcommander.txt index b8b3c1e1eed..98acbb3d891 100644 --- a/reactos/base/applications/rapps/rapps/totalcommander.txt +++ b/reactos/base/applications/rapps/rapps/totalcommander.txt @@ -32,6 +32,7 @@ Size = 3,3 Mo Name = Eksiksiz Komutan Licence = Kısıtlı Description = Eksiksiz Komutan, yan yana iki bölmenin bulunduÄŸu bir kütük yöneticisidir. +Size = 3,3 MB [Section.0813] Description = Total Commander is een bestandsbeheerder met twee panelen zij aan zij. diff --git a/reactos/base/applications/rapps/rapps/tuxpaint.txt b/reactos/base/applications/rapps/rapps/tuxpaint.txt index 5612fb08a5b..9417f43c32d 100644 --- a/reactos/base/applications/rapps/rapps/tuxpaint.txt +++ b/reactos/base/applications/rapps/rapps/tuxpaint.txt @@ -8,7 +8,7 @@ Description = An Open Source bitmap graphics editor geared towards young childre Size = 10.42 MB Category = 3 URLSite = http://tuxpaint.org/ -URLDownload = http://garr.dl.sourceforge.net/project/tuxpaint/tuxpaint/0.9.21c/tuxpaint-0.9.21c-win32-installer.exe +URLDownload = http://download.sourceforge.net/project/tuxpaint/tuxpaint/0.9.21c/tuxpaint-0.9.21c-win32-installer.exe CDPath = none [Section.0405] @@ -39,6 +39,7 @@ Size = 10,42 Mo [Section.041f] Description = Çocuklar için açık kaynak ikil eÅŸlem çizge düzenleyicisi. +Size = 10,42 MB [Section.0422] Description = Відкритий графічний редактор Ð´Ð»Ñ Ð¼Ð°Ð»Ð¸Ñ… дітей. diff --git a/reactos/base/applications/rapps/rapps/ultravnc.txt b/reactos/base/applications/rapps/rapps/ultravnc.txt index cdda4cd2320..3a9954b4b96 100644 --- a/reactos/base/applications/rapps/rapps/ultravnc.txt +++ b/reactos/base/applications/rapps/rapps/ultravnc.txt @@ -36,6 +36,7 @@ Size = 3,27 Mo [Section.041f] Description = Açık kaynak bir VNC istemcisi ve bir VNC sunucusu. +Size = 3,27 MB [Section.0422] Description = Відкритий VNC клієнт/Ñервер. diff --git a/reactos/base/applications/rapps/rapps/utorrent.txt b/reactos/base/applications/rapps/rapps/utorrent.txt index a7cd4b01f71..8d179d9f8d8 100644 --- a/reactos/base/applications/rapps/rapps/utorrent.txt +++ b/reactos/base/applications/rapps/rapps/utorrent.txt @@ -52,6 +52,7 @@ Description = Маленький и быÑтрый клиент BitTorrent. [Section.041f] Licence = Ticârî olmayan kullanımlarda ücretsiz. Description = Küçük ve hızlı bir BitTorrent istemcisi. +Size = 1020,58 KB [Section.0422] Licence = Безплатна Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼ÐµÑ€Ñ†Ñ–Ð¹Ð½Ð¾Ð³Ð¾ викориÑÑ‚Ð°Ð½Ð½Ñ diff --git a/reactos/base/applications/rapps/rapps/vb5run.txt b/reactos/base/applications/rapps/rapps/vb5run.txt index 4f0002d7bb8..2d50e14e8c6 100644 --- a/reactos/base/applications/rapps/rapps/vb5run.txt +++ b/reactos/base/applications/rapps/rapps/vb5run.txt @@ -45,6 +45,7 @@ Size = 969,59 ko Name = Basarî Basic 5 Yürütücüsü Licence = Bilinmiyor Description = Basarî Basic 5 Yürütücüsü. Åžunları içerir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Size = 969,59 KB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/vb6run.txt b/reactos/base/applications/rapps/rapps/vb6run.txt index e2f8467a6c2..0eeb5e92a0a 100644 --- a/reactos/base/applications/rapps/rapps/vb6run.txt +++ b/reactos/base/applications/rapps/rapps/vb6run.txt @@ -45,6 +45,7 @@ Size = 1,02 Mo Name = Basarî Basic 6 Yürütücüsü Licence = Bilinmiyor Description = Basarî Basic 6 Yürütücüsü. Åžunları içerir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Size = 1,02 MB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/vc2005sp1run.txt b/reactos/base/applications/rapps/rapps/vc2005sp1run.txt index a85ed400f59..8e15cf3e9c3 100644 --- a/reactos/base/applications/rapps/rapps/vc2005sp1run.txt +++ b/reactos/base/applications/rapps/rapps/vc2005sp1run.txt @@ -45,6 +45,7 @@ Size = 2,6 Mo Name = Mikroyazılım Basarî C++ 2005 SP1 Yeniden Dağıtılabilir Paket Licence = Bilinmiyor Description = Basarî Stüdyo 2005 SP1 Yürütücüsü. Åžunları içerir: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Size = 2,6 MB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/vc2008sp1run.txt b/reactos/base/applications/rapps/rapps/vc2008sp1run.txt index 7ccdbb2d249..1e2ae5a0b71 100644 --- a/reactos/base/applications/rapps/rapps/vc2008sp1run.txt +++ b/reactos/base/applications/rapps/rapps/vc2008sp1run.txt @@ -45,6 +45,7 @@ Size = 4,02 Mo Name = Mikroyazılım Basarî C++ 2008 SP1 Yeniden Dağıtılabilir Paket Licence = Bilinmiyor Description = Basarî Stüdyo 2008 SP1 Yürütücüsü. Åžunları içerir: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Size = 4,02 MB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/vc2010run.txt b/reactos/base/applications/rapps/rapps/vc2010run.txt index f894eb474a5..acab1a71a60 100644 --- a/reactos/base/applications/rapps/rapps/vc2010run.txt +++ b/reactos/base/applications/rapps/rapps/vc2010run.txt @@ -45,6 +45,7 @@ Size = 4,8 Mo Name = Mikroyazılım Basarî C++ 2010 Yeniden Dağıtılabilir Paket Licence = Bilinmiyor Description = Basarî Stüdyo 2010 Yürütücüsü. Åžunları içerir: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Size = 4,8 MB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/vc6run.txt b/reactos/base/applications/rapps/rapps/vc6run.txt index c252105baa3..5a75d5223ab 100644 --- a/reactos/base/applications/rapps/rapps/vc6run.txt +++ b/reactos/base/applications/rapps/rapps/vc6run.txt @@ -45,6 +45,7 @@ Size = 1,75 Mo Name = Mikroyazılım Basarî C++ 6 Yeniden Dağıtılabilir Paket Licence = Bilinmiyor Description = Basarî Stüdyo 6 Yürütücüsü. Åžunları içerir: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Size = 1,75 MB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/vlc.txt b/reactos/base/applications/rapps/rapps/vlc.txt index eaf22be7b6d..cf1f9023d80 100644 --- a/reactos/base/applications/rapps/rapps/vlc.txt +++ b/reactos/base/applications/rapps/rapps/vlc.txt @@ -43,6 +43,7 @@ Description = Multimediálny prehrávaÄ. [Section.041f] Name = VLC Ortam Oynatıcısı Description = Bir ortam oynatıcısı. +Size = 23,0 MB [Section.0422] Description = Мультимедійний програвач. diff --git a/reactos/base/applications/rapps/rapps/winboard.txt b/reactos/base/applications/rapps/rapps/winboard.txt index 473db5eaabc..771db62df32 100644 --- a/reactos/base/applications/rapps/rapps/winboard.txt +++ b/reactos/base/applications/rapps/rapps/winboard.txt @@ -36,6 +36,7 @@ Size = 5,93 Mo [Section.041f] Description = WinBoard; GNU Satranç, Crafty ve diÄŸer satranç motorlarını örütbaÄŸ satranç sunucuları ve maille yazışmalı satranç için bir arayüz olarak sunan, Pencereler/ReactOS için bir çizgelik satranç tahtasıdır. +Size = 5,93 MB [Section.0422] Description = Графічна шахматна дошка Ð´Ð»Ñ Windows/ReactOS, що може Ñлугувати графічним інтерфейÑом Ð´Ð»Ñ GNU Chess, Crafty, та інших шахматних двигунів, Ð´Ð»Ñ Ñерверів інтернет-шахмат та Ð´Ð»Ñ ÑˆÐ°Ñ…Ð¼Ð°Ñ‚Ð½Ð¾Ñ— перепиÑки по е-мейл. diff --git a/reactos/base/applications/rapps/rapps/wme9.txt b/reactos/base/applications/rapps/rapps/wme9.txt index b09a45ff172..e9f7e30e9bc 100644 --- a/reactos/base/applications/rapps/rapps/wme9.txt +++ b/reactos/base/applications/rapps/rapps/wme9.txt @@ -41,6 +41,7 @@ Description = Neznáma Name = Pencereler Ortam Düzgüleyicisi 9 Licence = Bilinmiyor Description = Pencereler Ortam Düzgüleyicisi 9 +Size = 9,46 MB [Section.0422] Licence = Ðевідома diff --git a/reactos/base/applications/rapps/rapps/zaz.txt b/reactos/base/applications/rapps/rapps/zaz.txt index 1f97db481f2..6685b5bdee6 100644 --- a/reactos/base/applications/rapps/rapps/zaz.txt +++ b/reactos/base/applications/rapps/rapps/zaz.txt @@ -22,4 +22,5 @@ Description = Zaz este un joc de acÈ›iune de tip enigmă/arcadă, asemănător c Size = 21,0 Mo [Section.041f] -Description = Zaz, atari salonu oyunu türünde, geliÅŸimli bir bulmaca oyunudur. Bir nebze DonmuÅŸ Kabarcıklar'a benzemektedir. \ No newline at end of file +Description = Zaz, atari salonu oyunu türünde, geliÅŸimli bir bulmaca oyunudur. Bir nebze DonmuÅŸ Kabarcıklar'a benzemektedir. +Size = 21,0 MB From be52242977845225c2c7f715aa60c643833ff5e6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 16:02:28 +0000 Subject: [PATCH 066/124] [RAPPS] * Fix MSVC build. svn path=/trunk/; revision=61834 --- reactos/base/applications/rapps/loaddlg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reactos/base/applications/rapps/loaddlg.c b/reactos/base/applications/rapps/loaddlg.c index 2687448f0db..03ad39ccf93 100644 --- a/reactos/base/applications/rapps/loaddlg.c +++ b/reactos/base/applications/rapps/loaddlg.c @@ -209,7 +209,8 @@ ThreadFunc(LPVOID Context) WCHAR path[MAX_PATH]; LPWSTR p; HWND Dlg = (HWND) Context; - DWORD len, dwContentLen, dwBytesWritten, dwBytesRead, dwCurrentBytesRead; + DWORD len, dwContentLen, dwBytesWritten, dwBytesRead; + DWORD dwCurrentBytesRead = 0; DWORD dwBufLen = sizeof(dwContentLen); BOOL bCancelled = FALSE; BOOL bTempfile = FALSE; From 658bdd0a4f2628c376d22e508ce7678b75700e0b Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Sun, 26 Jan 2014 17:08:43 +0000 Subject: [PATCH 067/124] Small correction... svn path=/trunk/; revision=61835 --- reactos/base/applications/rapps/loaddlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/base/applications/rapps/loaddlg.c b/reactos/base/applications/rapps/loaddlg.c index 03ad39ccf93..316c86b4f5d 100644 --- a/reactos/base/applications/rapps/loaddlg.c +++ b/reactos/base/applications/rapps/loaddlg.c @@ -292,7 +292,7 @@ ThreadFunc(LPVOID Context) /* run it */ if (!bCab) { - ShellExecute( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); + ShellExecuteW( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); } end: CloseHandle(hOut); From 1eec99d721f5f7a137770519b6e431da729da620 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 17:46:23 +0000 Subject: [PATCH 068/124] [WINTRUST] * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61836 --- reactos/dll/win32/wintrust/wintrust_priv.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/wintrust/wintrust_priv.h b/reactos/dll/win32/wintrust/wintrust_priv.h index aa34ed4b327..ef8decb3d97 100644 --- a/reactos/dll/win32/wintrust/wintrust_priv.h +++ b/reactos/dll/win32/wintrust/wintrust_priv.h @@ -15,12 +15,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -#include +#include -#include #include #define _INC_WINDOWS @@ -33,10 +33,8 @@ #include #include #include -#include #include #include -#include #include #include @@ -51,4 +49,4 @@ BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN; -#endif /* ndef __WINTRUST_PRIV_H__ */ +#endif /* __WINTRUST_PRIV_H__ */ From 1d30ac9d19f255376a782d1193be1776378a0c72 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 17:48:17 +0000 Subject: [PATCH 069/124] [WS2_32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61837 --- reactos/dll/win32/ws2_32/include/catalog.h | 3 +-- reactos/dll/win32/ws2_32/include/debug.h | 3 +-- reactos/dll/win32/ws2_32/include/handle.h | 5 +---- reactos/dll/win32/ws2_32/include/upcall.h | 3 +-- reactos/dll/win32/ws2_32/include/ws2_32.h | 11 +++-------- reactos/dll/win32/ws2_32/misc/async.c | 3 --- reactos/dll/win32/ws2_32/misc/ns.c | 4 ++++ reactos/dll/win32/ws2_32/misc/stubs.c | 2 ++ 8 files changed, 13 insertions(+), 21 deletions(-) diff --git a/reactos/dll/win32/ws2_32/include/catalog.h b/reactos/dll/win32/ws2_32/include/catalog.h index f36513e3a86..19ed0d25e3e 100644 --- a/reactos/dll/win32/ws2_32/include/catalog.h +++ b/reactos/dll/win32/ws2_32/include/catalog.h @@ -4,6 +4,7 @@ * FILE: include/catalog.h * PURPOSE: Service Provider Catalog definitions */ + #ifndef __CATALOG_H #define __CATALOG_H @@ -54,5 +55,3 @@ VOID CreateCatalog(VOID); VOID DestroyCatalog(VOID); #endif /* __CATALOG_H */ - -/* EOF */ diff --git a/reactos/dll/win32/ws2_32/include/debug.h b/reactos/dll/win32/ws2_32/include/debug.h index 369aa289d94..aa6d9704fac 100644 --- a/reactos/dll/win32/ws2_32/include/debug.h +++ b/reactos/dll/win32/ws2_32/include/debug.h @@ -6,6 +6,7 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ + #ifndef __DEBUG_H #define __DEBUG_H @@ -62,5 +63,3 @@ extern DWORD DebugTraceLevel; #define CP CHECKPOINT #endif /* __DEBUG_H */ - -/* EOF */ diff --git a/reactos/dll/win32/ws2_32/include/handle.h b/reactos/dll/win32/ws2_32/include/handle.h index 28818d7d862..52ed0d160cb 100644 --- a/reactos/dll/win32/ws2_32/include/handle.h +++ b/reactos/dll/win32/ws2_32/include/handle.h @@ -4,11 +4,10 @@ * FILE: include/handle.h * PURPOSE: Provider handle definitions */ + #ifndef __HANDLE_H #define __HANDLE_H -//#include - typedef struct _PROVIDER_HANDLE { HANDLE Handle; @@ -44,5 +43,3 @@ VOID FreeProviderHandleTable(VOID); #endif /* __HANDLE_H */ - -/* EOF */ diff --git a/reactos/dll/win32/ws2_32/include/upcall.h b/reactos/dll/win32/ws2_32/include/upcall.h index 25404f4b9e5..ede3051ec79 100644 --- a/reactos/dll/win32/ws2_32/include/upcall.h +++ b/reactos/dll/win32/ws2_32/include/upcall.h @@ -4,6 +4,7 @@ * FILE: include/upcall.h * PURPOSE: Upcall function defintions */ + #ifndef __UPCALL_H #define __UPCALL_H @@ -100,5 +101,3 @@ WPUSetEvent( OUT LPINT lpErrno); #endif /* __UPCALL_H */ - -/* EOF */ diff --git a/reactos/dll/win32/ws2_32/include/ws2_32.h b/reactos/dll/win32/ws2_32/include/ws2_32.h index 43edf3079ff..149a0e852f9 100644 --- a/reactos/dll/win32/ws2_32/include/ws2_32.h +++ b/reactos/dll/win32/ws2_32/include/ws2_32.h @@ -4,22 +4,20 @@ * FILE: include/ws2_32.h * PURPOSE: WinSock 2 DLL header */ + #ifndef __WS2_32_H #define __WS2_32_H -#include -#include +#include #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include + #include #include -#include #include #include -#include #define NTOS_MODE_USER #include @@ -31,7 +29,6 @@ #include "catalog.h" #include "handle.h" -//#include "upcall.h" #define EXPORT WINAPI @@ -129,5 +126,3 @@ void free_servent(struct servent* s); #endif /* LE */ #endif /* __WS2_32_H */ - -/* EOF */ diff --git a/reactos/dll/win32/ws2_32/misc/async.c b/reactos/dll/win32/ws2_32/misc/async.c index 6a37cb81c68..40fa6356f24 100644 --- a/reactos/dll/win32/ws2_32/misc/async.c +++ b/reactos/dll/win32/ws2_32/misc/async.c @@ -39,15 +39,12 @@ #define COM_NO_WINDOWS_H #include -//#include "wine/port.h" #include #include #include -//#include "wingdi.h" #include #include -//#include "ws2spi.h" #include diff --git a/reactos/dll/win32/ws2_32/misc/ns.c b/reactos/dll/win32/ws2_32/misc/ns.c index 3fbcc871c4c..7d18341d21f 100644 --- a/reactos/dll/win32/ws2_32/misc/ns.c +++ b/reactos/dll/win32/ws2_32/misc/ns.c @@ -10,6 +10,10 @@ #include "ws2_32.h" +#include +#include +#include + #ifndef BUFSIZ #define BUFSIZ 1024 #endif/*BUFSIZ*/ diff --git a/reactos/dll/win32/ws2_32/misc/stubs.c b/reactos/dll/win32/ws2_32/misc/stubs.c index 1d2b3f49d10..de16a1c2125 100644 --- a/reactos/dll/win32/ws2_32/misc/stubs.c +++ b/reactos/dll/win32/ws2_32/misc/stubs.c @@ -10,6 +10,8 @@ #include "ws2_32.h" +#include + /* * @implemented */ From cf5fded0684519c2763ef7f960663706331a3a80 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 19:40:58 +0000 Subject: [PATCH 070/124] [WS2_32_NEW] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61839 --- reactos/dll/win32/ws2_32_new/inc/ws2_32.h | 3 --- reactos/dll/win32/ws2_32_new/src/addrconv.c | 3 ++- reactos/dll/win32/ws2_32_new/src/addrinfo.c | 3 +++ reactos/dll/win32/ws2_32_new/src/async.c | 2 ++ reactos/dll/win32/ws2_32_new/src/bhook.c | 3 +-- reactos/dll/win32/ws2_32_new/src/dcatalog.c | 1 + reactos/dll/win32/ws2_32_new/src/dcatitem.c | 3 +-- reactos/dll/win32/ws2_32_new/src/dllmain.c | 1 + reactos/dll/win32/ws2_32_new/src/dprocess.c | 2 ++ reactos/dll/win32/ws2_32_new/src/dprovide.c | 1 + reactos/dll/win32/ws2_32_new/src/dsocket.c | 1 + reactos/dll/win32/ws2_32_new/src/dthread.c | 1 + reactos/dll/win32/ws2_32_new/src/dupsock.c | 3 +-- reactos/dll/win32/ws2_32_new/src/enumprot.c | 3 +-- reactos/dll/win32/ws2_32_new/src/event.c | 3 ++- reactos/dll/win32/ws2_32_new/src/getproto.c | 3 +-- reactos/dll/win32/ws2_32_new/src/getxbyxx.c | 1 + reactos/dll/win32/ws2_32_new/src/ioctl.c | 3 +-- reactos/dll/win32/ws2_32_new/src/nscatalo.c | 1 + reactos/dll/win32/ws2_32_new/src/nscatent.c | 3 +-- reactos/dll/win32/ws2_32_new/src/nspinstl.c | 3 +-- reactos/dll/win32/ws2_32_new/src/nsprovid.c | 1 + reactos/dll/win32/ws2_32_new/src/nsquery.c | 1 + reactos/dll/win32/ws2_32_new/src/qos.c | 3 +-- reactos/dll/win32/ws2_32_new/src/qshelpr.c | 3 +-- reactos/dll/win32/ws2_32_new/src/rasdial.c | 1 + reactos/dll/win32/ws2_32_new/src/recv.c | 3 +-- reactos/dll/win32/ws2_32_new/src/rnr.c | 3 +-- reactos/dll/win32/ws2_32_new/src/scihlpr.c | 1 + reactos/dll/win32/ws2_32_new/src/select.c | 3 +-- reactos/dll/win32/ws2_32_new/src/send.c | 3 +-- reactos/dll/win32/ws2_32_new/src/sockctrl.c | 3 +-- reactos/dll/win32/ws2_32_new/src/socklife.c | 3 +-- reactos/dll/win32/ws2_32_new/src/spinstal.c | 3 +-- reactos/dll/win32/ws2_32_new/src/sputil.c | 3 +-- reactos/dll/win32/ws2_32_new/src/startup.c | 1 + reactos/dll/win32/ws2_32_new/src/wsautil.c | 3 +-- 37 files changed, 42 insertions(+), 43 deletions(-) diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h index 008eef1b5a3..90e50c6b17e 100644 --- a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h +++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h @@ -23,11 +23,8 @@ #include #include #include -#include #include -//#include #include -//#include /* Winsock Helper Header */ #include diff --git a/reactos/dll/win32/ws2_32_new/src/addrconv.c b/reactos/dll/win32/ws2_32_new/src/addrconv.c index 4e6d269edfc..7e111a10453 100644 --- a/reactos/dll/win32/ws2_32_new/src/addrconv.c +++ b/reactos/dll/win32/ws2_32_new/src/addrconv.c @@ -7,11 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include - + /* DEFINES *******************************************************************/ #ifndef BE diff --git a/reactos/dll/win32/ws2_32_new/src/addrinfo.c b/reactos/dll/win32/ws2_32_new/src/addrinfo.c index 8e0b3aa3505..1ee48fbd849 100644 --- a/reactos/dll/win32/ws2_32_new/src/addrinfo.c +++ b/reactos/dll/win32/ws2_32_new/src/addrinfo.c @@ -7,8 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include +#include + //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/async.c b/reactos/dll/win32/ws2_32_new/src/async.c index dff4f40c446..9aa9742c049 100644 --- a/reactos/dll/win32/ws2_32_new/src/async.c +++ b/reactos/dll/win32/ws2_32_new/src/async.c @@ -7,9 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include /* DATA **********************************************************************/ + BOOLEAN WsAsyncThreadInitialized; LONG WsAsyncTaskHandle; PLIST_ENTRY WsAsyncQueue; diff --git a/reactos/dll/win32/ws2_32_new/src/bhook.c b/reactos/dll/win32/ws2_32_new/src/bhook.c index eeaf740610d..9e0458de855 100644 --- a/reactos/dll/win32/ws2_32_new/src/bhook.c +++ b/reactos/dll/win32/ws2_32_new/src/bhook.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/dcatalog.c b/reactos/dll/win32/ws2_32_new/src/dcatalog.c index 4722958ddec..d163a139f56 100644 --- a/reactos/dll/win32/ws2_32_new/src/dcatalog.c +++ b/reactos/dll/win32/ws2_32_new/src/dcatalog.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dcatitem.c b/reactos/dll/win32/ws2_32_new/src/dcatitem.c index eca447016ee..c85e0a6004d 100644 --- a/reactos/dll/win32/ws2_32_new/src/dcatitem.c +++ b/reactos/dll/win32/ws2_32_new/src/dcatitem.c @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ -#include -/* DATA **********************************************************************/ +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dllmain.c b/reactos/dll/win32/ws2_32_new/src/dllmain.c index 369d88f9c0c..884b4fb0fe3 100644 --- a/reactos/dll/win32/ws2_32_new/src/dllmain.c +++ b/reactos/dll/win32/ws2_32_new/src/dllmain.c @@ -13,6 +13,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dprocess.c b/reactos/dll/win32/ws2_32_new/src/dprocess.c index 745db5e8137..06b9fac7a08 100644 --- a/reactos/dll/win32/ws2_32_new/src/dprocess.c +++ b/reactos/dll/win32/ws2_32_new/src/dprocess.c @@ -7,9 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include /* DATA **********************************************************************/ + PWSPROCESS CurrentWsProcess; #define WsProcLock() EnterCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock); diff --git a/reactos/dll/win32/ws2_32_new/src/dprovide.c b/reactos/dll/win32/ws2_32_new/src/dprovide.c index ae64aaf59aa..729d7bf2e77 100644 --- a/reactos/dll/win32/ws2_32_new/src/dprovide.c +++ b/reactos/dll/win32/ws2_32_new/src/dprovide.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dsocket.c b/reactos/dll/win32/ws2_32_new/src/dsocket.c index d8418d0257d..04dabe7211a 100644 --- a/reactos/dll/win32/ws2_32_new/src/dsocket.c +++ b/reactos/dll/win32/ws2_32_new/src/dsocket.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dthread.c b/reactos/dll/win32/ws2_32_new/src/dthread.c index 62718c0c604..5e8a3bc53aa 100644 --- a/reactos/dll/win32/ws2_32_new/src/dthread.c +++ b/reactos/dll/win32/ws2_32_new/src/dthread.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dupsock.c b/reactos/dll/win32/ws2_32_new/src/dupsock.c index c22f44bec1a..3f59f172c6a 100644 --- a/reactos/dll/win32/ws2_32_new/src/dupsock.c +++ b/reactos/dll/win32/ws2_32_new/src/dupsock.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/enumprot.c b/reactos/dll/win32/ws2_32_new/src/enumprot.c index 88fffba422f..a2584e5074d 100644 --- a/reactos/dll/win32/ws2_32_new/src/enumprot.c +++ b/reactos/dll/win32/ws2_32_new/src/enumprot.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ BOOL diff --git a/reactos/dll/win32/ws2_32_new/src/event.c b/reactos/dll/win32/ws2_32_new/src/event.c index 6b96bfbe220..46a1fc1a40a 100644 --- a/reactos/dll/win32/ws2_32_new/src/event.c +++ b/reactos/dll/win32/ws2_32_new/src/event.c @@ -7,11 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include - + /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/getproto.c b/reactos/dll/win32/ws2_32_new/src/getproto.c index ed21acbd122..48b41c144ce 100644 --- a/reactos/dll/win32/ws2_32_new/src/getproto.c +++ b/reactos/dll/win32/ws2_32_new/src/getproto.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ HANDLE diff --git a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c index dcf9bac73fc..32557b8315e 100644 --- a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c +++ b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG diff --git a/reactos/dll/win32/ws2_32_new/src/ioctl.c b/reactos/dll/win32/ws2_32_new/src/ioctl.c index 8399feed442..1c2be2d5035 100644 --- a/reactos/dll/win32/ws2_32_new/src/ioctl.c +++ b/reactos/dll/win32/ws2_32_new/src/ioctl.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/nscatalo.c b/reactos/dll/win32/ws2_32_new/src/nscatalo.c index ce82efb530d..769d0260c36 100644 --- a/reactos/dll/win32/ws2_32_new/src/nscatalo.c +++ b/reactos/dll/win32/ws2_32_new/src/nscatalo.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/nscatent.c b/reactos/dll/win32/ws2_32_new/src/nscatent.c index ebb74a18758..8c1b0750fc0 100644 --- a/reactos/dll/win32/ws2_32_new/src/nscatent.c +++ b/reactos/dll/win32/ws2_32_new/src/nscatent.c @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ -#include -/* DATA **********************************************************************/ +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/nspinstl.c b/reactos/dll/win32/ws2_32_new/src/nspinstl.c index ef75f7c4316..846dde6c926 100644 --- a/reactos/dll/win32/ws2_32_new/src/nspinstl.c +++ b/reactos/dll/win32/ws2_32_new/src/nspinstl.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/nsprovid.c b/reactos/dll/win32/ws2_32_new/src/nsprovid.c index 2d5ef48a32d..6a4762b1e5e 100644 --- a/reactos/dll/win32/ws2_32_new/src/nsprovid.c +++ b/reactos/dll/win32/ws2_32_new/src/nsprovid.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/nsquery.c b/reactos/dll/win32/ws2_32_new/src/nsquery.c index 788fa29e4b6..3c7811d1ce0 100644 --- a/reactos/dll/win32/ws2_32_new/src/nsquery.c +++ b/reactos/dll/win32/ws2_32_new/src/nsquery.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/qos.c b/reactos/dll/win32/ws2_32_new/src/qos.c index 24a28f53304..29866a6fdd1 100644 --- a/reactos/dll/win32/ws2_32_new/src/qos.c +++ b/reactos/dll/win32/ws2_32_new/src/qos.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/qshelpr.c b/reactos/dll/win32/ws2_32_new/src/qshelpr.c index 07292c7ce70..35e36ddb792 100644 --- a/reactos/dll/win32/ws2_32_new/src/qshelpr.c +++ b/reactos/dll/win32/ws2_32_new/src/qshelpr.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ LPSTR diff --git a/reactos/dll/win32/ws2_32_new/src/rasdial.c b/reactos/dll/win32/ws2_32_new/src/rasdial.c index c856e6f6f3f..b664db70c90 100644 --- a/reactos/dll/win32/ws2_32_new/src/rasdial.c +++ b/reactos/dll/win32/ws2_32_new/src/rasdial.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG diff --git a/reactos/dll/win32/ws2_32_new/src/recv.c b/reactos/dll/win32/ws2_32_new/src/recv.c index 9c4467b3dfb..013c5755ba2 100644 --- a/reactos/dll/win32/ws2_32_new/src/recv.c +++ b/reactos/dll/win32/ws2_32_new/src/recv.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/rnr.c b/reactos/dll/win32/ws2_32_new/src/rnr.c index 9a8c081fe6c..228858fd0ac 100644 --- a/reactos/dll/win32/ws2_32_new/src/rnr.c +++ b/reactos/dll/win32/ws2_32_new/src/rnr.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/scihlpr.c b/reactos/dll/win32/ws2_32_new/src/scihlpr.c index f16f1108726..244d77733c5 100644 --- a/reactos/dll/win32/ws2_32_new/src/scihlpr.c +++ b/reactos/dll/win32/ws2_32_new/src/scihlpr.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG diff --git a/reactos/dll/win32/ws2_32_new/src/select.c b/reactos/dll/win32/ws2_32_new/src/select.c index 54c8128994c..be389c7987d 100644 --- a/reactos/dll/win32/ws2_32_new/src/select.c +++ b/reactos/dll/win32/ws2_32_new/src/select.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/send.c b/reactos/dll/win32/ws2_32_new/src/send.c index f4a32c79776..52d3d122d98 100644 --- a/reactos/dll/win32/ws2_32_new/src/send.c +++ b/reactos/dll/win32/ws2_32_new/src/send.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/sockctrl.c b/reactos/dll/win32/ws2_32_new/src/sockctrl.c index 76441a9bd8d..9f81cca7e1d 100644 --- a/reactos/dll/win32/ws2_32_new/src/sockctrl.c +++ b/reactos/dll/win32/ws2_32_new/src/sockctrl.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/socklife.c b/reactos/dll/win32/ws2_32_new/src/socklife.c index c393a6cd661..999d334d550 100644 --- a/reactos/dll/win32/ws2_32_new/src/socklife.c +++ b/reactos/dll/win32/ws2_32_new/src/socklife.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/spinstal.c b/reactos/dll/win32/ws2_32_new/src/spinstal.c index d0cfb6d2d55..ed593ff25bd 100644 --- a/reactos/dll/win32/ws2_32_new/src/spinstal.c +++ b/reactos/dll/win32/ws2_32_new/src/spinstal.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/sputil.c b/reactos/dll/win32/ws2_32_new/src/sputil.c index 7f840183234..82cb4368151 100644 --- a/reactos/dll/win32/ws2_32_new/src/sputil.c +++ b/reactos/dll/win32/ws2_32_new/src/sputil.c @@ -7,13 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG #include -/* DATA **********************************************************************/ - /* FUNCTIONS *****************************************************************/ /* diff --git a/reactos/dll/win32/ws2_32_new/src/startup.c b/reactos/dll/win32/ws2_32_new/src/startup.c index 5aa72f769f3..32de9484c1b 100644 --- a/reactos/dll/win32/ws2_32_new/src/startup.c +++ b/reactos/dll/win32/ws2_32_new/src/startup.c @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include //#define NDEBUG diff --git a/reactos/dll/win32/ws2_32_new/src/wsautil.c b/reactos/dll/win32/ws2_32_new/src/wsautil.c index e2d14c0be0d..4d7b1ebdbc8 100644 --- a/reactos/dll/win32/ws2_32_new/src/wsautil.c +++ b/reactos/dll/win32/ws2_32_new/src/wsautil.c @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ -#include -/* DATA **********************************************************************/ +#include /* FUNCTIONS *****************************************************************/ From 88daaeca464b22a0ac97fba33389cc299ccbff2a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 19:57:03 +0000 Subject: [PATCH 071/124] [WS2HELP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61840 --- reactos/dll/win32/ws2help/context.c | 2 ++ reactos/dll/win32/ws2help/handle.c | 4 ++++ reactos/dll/win32/ws2help/precomp.h | 13 ++++--------- reactos/dll/win32/ws2help/wshdrv.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/reactos/dll/win32/ws2help/context.c b/reactos/dll/win32/ws2help/context.c index 7e4037fc0e9..876446e344d 100644 --- a/reactos/dll/win32/ws2help/context.c +++ b/reactos/dll/win32/ws2help/context.c @@ -9,6 +9,8 @@ #include "precomp.h" +#include + /* DATA **********************************************************************/ CRITICAL_SECTION WshHandleTableLock; diff --git a/reactos/dll/win32/ws2help/handle.c b/reactos/dll/win32/ws2help/handle.c index e34de902760..3064bd4e481 100644 --- a/reactos/dll/win32/ws2help/handle.c +++ b/reactos/dll/win32/ws2help/handle.c @@ -9,6 +9,10 @@ #include "precomp.h" +#include + +#include "wshdrv.h" + /* DATA **********************************************************************/ typedef struct _WSH_HELPER_CONTEXT diff --git a/reactos/dll/win32/ws2help/precomp.h b/reactos/dll/win32/ws2help/precomp.h index d1b8d3a9e59..394a71a009e 100644 --- a/reactos/dll/win32/ws2help/precomp.h +++ b/reactos/dll/win32/ws2help/precomp.h @@ -4,6 +4,7 @@ * FILE: lib/ws2help/precomp.h * PURPOSE: WinSock 2 Helper DLL */ + #ifndef __PRECOMP_H #define __PRECOMP_H @@ -16,6 +17,7 @@ #define INCL_WINSOCK_API_TYPEDEFS 1 #include + #include #include #include @@ -23,12 +25,7 @@ #include /* NDK Headers */ -#include -#include - -/* Shared Winsock Helper headers */ -#include -#include "wshdrv.h" +#include /* Missing definition */ #define SO_OPENTYPE 0x20 @@ -50,6 +47,4 @@ Ws2helpInitialize(VOID); #define WS2HELP_PROLOG() \ (Ws2helpInitialized? ERROR_SUCCESS : Ws2helpInitialize()) -#endif /* __WS2HELP_H */ - -/* EOF */ +#endif /* __PRECOMP_H */ diff --git a/reactos/dll/win32/ws2help/wshdrv.h b/reactos/dll/win32/ws2help/wshdrv.h index ad983fc3410..44b67721204 100644 --- a/reactos/dll/win32/ws2help/wshdrv.h +++ b/reactos/dll/win32/ws2help/wshdrv.h @@ -25,4 +25,4 @@ typedef struct _WAH_EA_DATA2 #define IOCTL_WS2IFSL_SET_HANDLE 0x12B00 -#endif +#endif /* __WSHDRV_H */ From ae7c4bf21d7aa83c1e80ebb463f4255a3e1675d0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Jan 2014 20:24:59 +0000 Subject: [PATCH 072/124] [BOOTVID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61841 --- reactos/drivers/base/bootvid/arm/bootvid.c | 3 ++- reactos/drivers/base/bootvid/i386/bootvid.c | 4 +++- reactos/drivers/base/bootvid/i386/vga.c | 1 - reactos/drivers/base/bootvid/precomp.h | 20 +++++--------------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/reactos/drivers/base/bootvid/arm/bootvid.c b/reactos/drivers/base/bootvid/arm/bootvid.c index 488550d1450..925c58bc96d 100644 --- a/reactos/drivers/base/bootvid/arm/bootvid.c +++ b/reactos/drivers/base/bootvid/arm/bootvid.c @@ -1,6 +1,7 @@ #include "precomp.h" + #define NDEBUG -#include "debug.h" +#include #define LCDTIMING0_PPL(x) ((((x) / 16 - 1) & 0x3f) << 2) #define LCDTIMING1_LPP(x) (((x) & 0x3ff) - 1) diff --git a/reactos/drivers/base/bootvid/i386/bootvid.c b/reactos/drivers/base/bootvid/i386/bootvid.c index 08d0dc10b8e..59f28c617f8 100644 --- a/reactos/drivers/base/bootvid/i386/bootvid.c +++ b/reactos/drivers/base/bootvid/i386/bootvid.c @@ -1,5 +1,8 @@ #include "precomp.h" +#include +#include + /* PRIVATE FUNCTIONS *********************************************************/ BOOLEAN @@ -472,4 +475,3 @@ VidResetDisplay(IN BOOLEAN HalReset) InitializePalette(); VidSolidColorFill(0, 0, 639, 479, 0); } - diff --git a/reactos/drivers/base/bootvid/i386/vga.c b/reactos/drivers/base/bootvid/i386/vga.c index ae66001bc89..add073fd76d 100644 --- a/reactos/drivers/base/bootvid/i386/vga.c +++ b/reactos/drivers/base/bootvid/i386/vga.c @@ -1152,4 +1152,3 @@ VidSolidColorFill(IN ULONG Left, } } } - diff --git a/reactos/drivers/base/bootvid/precomp.h b/reactos/drivers/base/bootvid/precomp.h index 1a7d4a6b6e3..8b7677582cf 100644 --- a/reactos/drivers/base/bootvid/precomp.h +++ b/reactos/drivers/base/bootvid/precomp.h @@ -1,26 +1,18 @@ -#include "ntddk.h" -#include "ntifs.h" -#include "arc/arc.h" -#include "halfuncs.h" -#include "drivers/bootvid/bootvid.h" -#include "ioaccess.h" +#include +#include /* Define if FontData has upside down characters */ #undef CHAR_GEN_UPSIDE_DOWN #define BOOTCHAR_HEIGHT 13 -// -// Command Stream Definitions -// +/* Command Stream Definitions */ #define CMD_STREAM_WRITE 0x0 #define CMD_STREAM_WRITE_ARRAY 0x2 #define CMD_STREAM_USHORT 0x4 #define CMD_STREAM_READ 0x8 -// -// Bitmap Header -// +/* Bitmap Header */ typedef struct tagBITMAPINFOHEADER { ULONG biSize; @@ -42,9 +34,7 @@ InitializePalette( VOID ); -// -// Globals -// +/* Globals */ extern USHORT AT_Initialization[]; extern ULONG curr_x; extern ULONG curr_y; From 518460d44c4f862f50e45847ca3c501d55c1e5d5 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 26 Jan 2014 20:30:06 +0000 Subject: [PATCH 073/124] [KSECDD] - Fix a typo in KsecQueryVolumeInformation, noticed by Michael Fritscher - Implement KsecGatherEntropyData, which will be used in generation of cryptographically secure random numbers according to FIPS 186-2. Based on information from http://blogs.msdn.com/b/michael_howard/archive/2005/01/14/353379.aspx svn path=/trunk/; revision=61842 --- reactos/drivers/crypto/ksecdd/CMakeLists.txt | 5 + reactos/drivers/crypto/ksecdd/dispatch.c | 2 +- reactos/drivers/crypto/ksecdd/ksecdd.h | 32 ++++ reactos/drivers/crypto/ksecdd/random.c | 155 +++++++++++++++++++ 4 files changed, 193 insertions(+), 1 deletion(-) diff --git a/reactos/drivers/crypto/ksecdd/CMakeLists.txt b/reactos/drivers/crypto/ksecdd/CMakeLists.txt index 070f9278223..eb8a3184701 100644 --- a/reactos/drivers/crypto/ksecdd/CMakeLists.txt +++ b/reactos/drivers/crypto/ksecdd/CMakeLists.txt @@ -1,6 +1,10 @@ spec2def(ksecdd.sys ksecdd.spec) + +include_directories( + ${REACTOS_SOURCE_DIR}/lib/cryptlib) + list(APPEND SOURCE ksecdd.c dispatch.c @@ -9,6 +13,7 @@ list(APPEND SOURCE ksecdd.rc) add_library(ksecdd SHARED ${SOURCE}) +target_link_libraries(ksecdd cryptlib pseh) set_module_type(ksecdd kernelmodedriver) add_importlibs(ksecdd ntoskrnl hal) add_cd_file(TARGET ksecdd DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/crypto/ksecdd/dispatch.c b/reactos/drivers/crypto/ksecdd/dispatch.c index fe6be34331e..34be2fbf974 100644 --- a/reactos/drivers/crypto/ksecdd/dispatch.c +++ b/reactos/drivers/crypto/ksecdd/dispatch.c @@ -60,7 +60,7 @@ KsecQueryVolumeInformation( PFILE_FS_DEVICE_INFORMATION DeviceInformation; /* Only FileFsDeviceInformation is supported */ - if (FsInformationClass == FileFsDeviceInformation) + if (FsInformationClass != FileFsDeviceInformation) { return STATUS_INVALID_INFO_CLASS; } diff --git a/reactos/drivers/crypto/ksecdd/ksecdd.h b/reactos/drivers/crypto/ksecdd/ksecdd.h index 934152d9b91..86eebb4d592 100644 --- a/reactos/drivers/crypto/ksecdd/ksecdd.h +++ b/reactos/drivers/crypto/ksecdd/ksecdd.h @@ -8,11 +8,43 @@ #define _NO_KSECDD_IMPORT_ #include +#include // 0x390004 #define IOCTL_KSEC_GEN_RANDOM \ CTL_CODE(FILE_DEVICE_KSEC, 0x01, METHOD_BUFFERED, FILE_ANY_ACCESS) +#if defined(_M_IX86) || defined(_M_AMD64) +typedef struct _KSEC_MACHINE_SPECIFIC_COUNTERS +{ + ULONG64 Tsc; + ULONG64 Pmc0; + ULONG64 Pmc1; + ULONG64 Ctr0; + ULONG64 Ctr1; +} KSEC_MACHINE_SPECIFIC_COUNTERS, *PKSEC_MACHINE_SPECIFIC_COUNTERS; +#else +typedef ULONG KSEC_MACHINE_SPECIFIC_COUNTERS; +#endif + +typedef struct _KSEC_ENTROPY_DATA +{ + HANDLE CurrentProcessId; + HANDLE CurrentThreadId; + LARGE_INTEGER TickCount; + LARGE_INTEGER SystemTime; + LARGE_INTEGER PerformanceCounter; + LARGE_INTEGER PerformanceFrequency; + UCHAR EnvironmentHash[16]; + KSEC_MACHINE_SPECIFIC_COUNTERS MachineSpecificCounters; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorPerformanceInformation; + SYSTEM_PERFORMANCE_INFORMATION SystemPerformanceInformation; + SYSTEM_EXCEPTION_INFORMATION SystemExceptionInformation; + SYSTEM_LOOKASIDE_INFORMATION SystemLookasideInformation; + SYSTEM_INTERRUPT_INFORMATION SystemInterruptInformation; + SYSTEM_PROCESS_INFORMATION SystemProcessInformation; +} KSEC_ENTROPY_DATA, *PKSEC_ENTROPY_DATA; + NTSTATUS NTAPI KsecDdDispatch( diff --git a/reactos/drivers/crypto/ksecdd/random.c b/reactos/drivers/crypto/ksecdd/random.c index fdf724d48db..392ad0f70ca 100644 --- a/reactos/drivers/crypto/ksecdd/random.c +++ b/reactos/drivers/crypto/ksecdd/random.c @@ -9,6 +9,10 @@ /* INCLUDES *******************************************************************/ #include "ksecdd.h" +#include +#include +#include +#include #define NDEBUG #include @@ -48,3 +52,154 @@ KsecGenRandom( return STATUS_SUCCESS; } + +VOID +NTAPI +KsecReadMachineSpecificCounters( + _Out_ PKSEC_MACHINE_SPECIFIC_COUNTERS MachineSpecificCounters) +{ +#if defined(_M_IX86) || defined(_M_AMD64) + /* Check if RDTSC is available */ + if (ExIsProcessorFeaturePresent(PF_RDTSC_INSTRUCTION_AVAILABLE)) + { + /* Read the TSC value */ + MachineSpecificCounters->Tsc = __rdtsc(); + } + + /* Read the CPU event counter MSRs */ + MachineSpecificCounters->Ctr0 = __readmsr(0x12); + MachineSpecificCounters->Ctr1 = __readmsr(0x13); + + /* Check if this is an MMX capable CPU */ + if (ExIsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) + { + /* Read the CPU performance counters 0 and 1 */ + MachineSpecificCounters->Pmc0 = __readpmc(0); + MachineSpecificCounters->Pmc1 = __readpmc(1); + } +#else + #error Implement me! +#endif +} + +/*! + * \see http://blogs.msdn.com/b/michael_howard/archive/2005/01/14/353379.aspx + */ +NTSTATUS +NTAPI +KsecGatherEntropyData( + PKSEC_ENTROPY_DATA EntropyData) +{ + MD4_CTX Md4Context; + PTEB Teb; + PPEB Peb; + PWSTR String; + ULONG ReturnLength; + NTSTATUS Status; + + /* Query some generic values */ + EntropyData->CurrentProcessId = PsGetCurrentProcessId(); + EntropyData->CurrentThreadId = PsGetCurrentThreadId(); + KeQueryTickCount(&EntropyData->TickCount); + KeQuerySystemTime(&EntropyData->SystemTime); + EntropyData->PerformanceCounter = KeQueryPerformanceCounter( + &EntropyData->PerformanceFrequency); + + /* Check if we have a TEB/PEB for the process environment */ + Teb = PsGetCurrentThread()->Tcb.Teb; + if (Teb != NULL) + { + Peb = Teb->ProcessEnvironmentBlock; + + /* Initialize the MD4 context */ + MD4Init(&Md4Context); + _SEH2_TRY + { + /* Get the end of the environment */ + String = Peb->ProcessParameters->Environment; + while (*String) + { + String += wcslen(String) + 1; + } + + /* Update the MD4 context from the environment data */ + MD4Update(&Md4Context, + (PUCHAR)Peb->ProcessParameters->Environment, + (PUCHAR)String - (PUCHAR)Peb->ProcessParameters->Environment); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Simply ignore the exception */ + } + _SEH2_END; + + /* Finalize and copy the MD4 hash */ + MD4Final(&Md4Context); + RtlCopyMemory(&EntropyData->EnvironmentHash, Md4Context.digest, 16); + } + + /* Read some machine specific hardware counters */ + KsecReadMachineSpecificCounters(&EntropyData->MachineSpecificCounters); + + /* Query processor performance information */ + Status = ZwQuerySystemInformation(SystemProcessorPerformanceInformation, + &EntropyData->SystemProcessorPerformanceInformation, + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query system performance information */ + Status = ZwQuerySystemInformation(SystemPerformanceInformation, + &EntropyData->SystemPerformanceInformation, + sizeof(SYSTEM_PERFORMANCE_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query exception information */ + Status = ZwQuerySystemInformation(SystemExceptionInformation, + &EntropyData->SystemExceptionInformation, + sizeof(SYSTEM_EXCEPTION_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query lookaside information */ + Status = ZwQuerySystemInformation(SystemLookasideInformation, + &EntropyData->SystemLookasideInformation, + sizeof(SYSTEM_LOOKASIDE_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query interrupt information */ + Status = ZwQuerySystemInformation(SystemInterruptInformation, + &EntropyData->SystemInterruptInformation, + sizeof(SYSTEM_INTERRUPT_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query process information */ + Status = ZwQuerySystemInformation(SystemProcessInformation, + &EntropyData->SystemProcessInformation, + sizeof(SYSTEM_PROCESS_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + return STATUS_SUCCESS; +} From 275f6e83606ce47b4183a146608ba75d7a2d2d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sun, 26 Jan 2014 20:53:31 +0000 Subject: [PATCH 074/124] [DIRECT3D] - Update d3d9, d3d8, ddraw and wined3d to wine 1.7.11 CORE-7796 CORE-7803 #resolve #comment Fixed with wine sync. Thanks. svn path=/trunk/; revision=61843 --- reactos/dll/directx/wine/d3d8/d3d8_main.c | 7 +- reactos/dll/directx/wine/d3d8/d3d8_private.h | 11 +- reactos/dll/directx/wine/d3d8/device.c | 111 +- reactos/dll/directx/wine/d3d8/shader.c | 2 +- reactos/dll/directx/wine/d3d8/surface.c | 42 +- reactos/dll/directx/wine/d3d8/texture.c | 9 +- reactos/dll/directx/wine/d3d8/volume.c | 18 +- reactos/dll/directx/wine/d3d9/d3d9_main.c | 23 +- reactos/dll/directx/wine/d3d9/d3d9_private.h | 18 +- reactos/dll/directx/wine/d3d9/device.c | 253 +- reactos/dll/directx/wine/d3d9/surface.c | 39 +- reactos/dll/directx/wine/d3d9/swapchain.c | 125 +- reactos/dll/directx/wine/d3d9/texture.c | 9 +- reactos/dll/directx/wine/d3d9/volume.c | 19 +- reactos/dll/directx/wine/ddraw/CMakeLists.txt | 2 +- reactos/dll/directx/wine/ddraw/ddraw.c | 1185 +++----- .../dll/directx/wine/ddraw/ddraw_classes.idl | 2 + .../dll/directx/wine/ddraw/ddraw_private.h | 51 +- reactos/dll/directx/wine/ddraw/device.c | 324 +- reactos/dll/directx/wine/ddraw/main.c | 142 +- reactos/dll/directx/wine/ddraw/palette.c | 61 +- reactos/dll/directx/wine/ddraw/surface.c | 1126 ++++--- .../dll/directx/wine/wined3d/CMakeLists.txt | 3 +- .../directx/wine/wined3d/arb_program_shader.c | 361 +-- .../wine/wined3d/ati_fragment_shader.c | 6 +- reactos/dll/directx/wine/wined3d/buffer.c | 167 +- reactos/dll/directx/wine/wined3d/context.c | 604 +++- reactos/dll/directx/wine/wined3d/cs.c | 941 ++++++ reactos/dll/directx/wine/wined3d/device.c | 1382 ++------- reactos/dll/directx/wine/wined3d/directx.c | 89 +- reactos/dll/directx/wine/wined3d/drawprim.c | 81 +- .../dll/directx/wine/wined3d/glsl_shader.c | 479 ++- .../wine/wined3d/nvidia_texture_shader.c | 54 +- reactos/dll/directx/wine/wined3d/palette.c | 60 +- reactos/dll/directx/wine/wined3d/query.c | 1 + reactos/dll/directx/wine/wined3d/resource.c | 61 +- reactos/dll/directx/wine/wined3d/shader.c | 24 +- reactos/dll/directx/wine/wined3d/state.c | 171 +- reactos/dll/directx/wine/wined3d/stateblock.c | 215 +- reactos/dll/directx/wine/wined3d/surface.c | 2631 +++++++---------- reactos/dll/directx/wine/wined3d/swapchain.c | 173 +- reactos/dll/directx/wine/wined3d/texture.c | 675 ++--- reactos/dll/directx/wine/wined3d/utils.c | 508 ++-- reactos/dll/directx/wine/wined3d/volume.c | 377 ++- reactos/dll/directx/wine/wined3d/wined3d.spec | 17 +- reactos/dll/directx/wine/wined3d/wined3d_gl.h | 2 + .../dll/directx/wine/wined3d/wined3d_main.c | 18 +- .../directx/wine/wined3d/wined3d_private.h | 368 ++- reactos/include/psdk/d3d9.h | 65 + reactos/include/psdk/d3d9types.h | 10 + reactos/include/reactos/wine/wgl.h | 504 +++- reactos/include/reactos/wine/wined3d.h | 56 +- 52 files changed, 7050 insertions(+), 6632 deletions(-) create mode 100644 reactos/dll/directx/wine/wined3d/cs.c diff --git a/reactos/dll/directx/wine/d3d8/d3d8_main.c b/reactos/dll/directx/wine/d3d8/d3d8_main.c index 13e3d354e0e..51e59915d40 100644 --- a/reactos/dll/directx/wine/d3d8/d3d8_main.c +++ b/reactos/dll/directx/wine/d3d8/d3d8_main.c @@ -52,11 +52,10 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) } /* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason=%d\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hInstDLL); + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(inst); return TRUE; } diff --git a/reactos/dll/directx/wine/d3d8/d3d8_private.h b/reactos/dll/directx/wine/d3d8/d3d8_private.h index 6fb7296b9ec..9f4c224ab93 100644 --- a/reactos/dll/directx/wine/d3d8/d3d8_private.h +++ b/reactos/dll/directx/wine/d3d8/d3d8_private.h @@ -35,7 +35,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS - #include #include #include @@ -193,9 +192,8 @@ struct d3d8_volume IUnknown *forwardReference; }; -HRESULT volume_init(struct d3d8_volume *volume, struct d3d8_device *device, UINT width, UINT height, - UINT depth, UINT level, DWORD usage, enum wined3d_format_id format, - enum wined3d_pool pool) DECLSPEC_HIDDEN; +void volume_init(struct d3d8_volume *volume, struct wined3d_volume *wined3d_volume, + const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_swapchain { @@ -222,9 +220,8 @@ struct d3d8_surface IUnknown *forwardReference; }; -HRESULT surface_init(struct d3d8_surface *surface, struct d3d8_device *device, UINT width, UINT height, - D3DFORMAT format, DWORD flags, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, - DWORD multisample_quality) DECLSPEC_HIDDEN; +void surface_init(struct d3d8_surface *surface, struct wined3d_surface *wined3d_surface, + struct d3d8_device *device, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) DECLSPEC_HIDDEN; struct d3d8_vertexbuffer diff --git a/reactos/dll/directx/wine/d3d8/device.c b/reactos/dll/directx/wine/d3d8/device.c index fd0661f8c27..3737a74b2df 100644 --- a/reactos/dll/directx/wine/d3d8/device.c +++ b/reactos/dll/directx/wine/d3d8/device.c @@ -728,6 +728,7 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, levels, usage, format, pool, texture); + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return D3DERR_OUTOFVIDEOMEMORY; @@ -757,6 +758,7 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, depth %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, depth, levels, usage, format, pool, texture); + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return D3DERR_OUTOFVIDEOMEMORY; @@ -785,6 +787,7 @@ static HRESULT WINAPI d3d8_device_CreateCubeTexture(IDirect3DDevice8 *iface, UIN TRACE("iface %p, edge_length %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, edge_length, levels, usage, format, pool, texture); + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return D3DERR_OUTOFVIDEOMEMORY; @@ -887,7 +890,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width wined3d_mutex_lock(); - if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &desc, 1, flags, NULL, &d3d8_null_wined3d_parent_ops, &texture))) { wined3d_mutex_unlock(); @@ -918,6 +921,7 @@ static HRESULT WINAPI d3d8_device_CreateRenderTarget(IDirect3DDevice8 *iface, UI TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, lockable %#x, surface %p.\n", iface, width, height, format, multisample_type, lockable, surface); + *surface = NULL; if (lockable) flags |= WINED3D_SURFACE_MAPPABLE; @@ -934,6 +938,8 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n", iface, width, height, format, multisample_type, surface); + *surface = NULL; + /* TODO: Verify that Discard is false */ return d3d8_device_create_surface(device, width, height, format, WINED3D_SURFACE_MAPPABLE, surface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, 0); @@ -948,6 +954,8 @@ static HRESULT WINAPI d3d8_device_CreateImageSurface(IDirect3DDevice8 *iface, UI TRACE("iface %p, width %u, height %u, format %#x, surface %p.\n", iface, width, height, format, surface); + *surface = NULL; + return d3d8_device_create_surface(device, width, height, format, WINED3D_SURFACE_MAPPABLE, surface, 0, D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0); } @@ -1005,7 +1013,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, { TRACE("Converting destination surface from WINED3DFMT_UNKNOWN to the source format.\n"); if (FAILED(hr = wined3d_surface_update_desc(dst->wined3d_surface, wined3d_desc.width, wined3d_desc.height, - src_format, wined3d_desc.multisample_type, wined3d_desc.multisample_quality))) + src_format, wined3d_desc.multisample_type, wined3d_desc.multisample_quality, NULL, 0))) { WARN("Failed to update surface desc, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -2898,16 +2906,15 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } -static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, - void *container_parent, const struct wined3d_resource_desc *desc, UINT sub_resource_idx, - DWORD flags, struct wined3d_surface **surface) +static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, + void *container_parent, struct wined3d_surface *surface, void **parent, + const struct wined3d_parent_ops **parent_ops) { struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_surface *d3d_surface; - HRESULT hr; - TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", - device_parent, container_parent, desc, sub_resource_idx, flags, surface); + TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", + device_parent, container_parent, surface, parent, parent_ops); if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { @@ -2915,20 +2922,10 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ return D3DERR_OUTOFVIDEOMEMORY; } - if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, - desc->multisample_type, desc->multisample_quality))) - { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, d3d_surface); - return hr; - } - + surface_init(d3d_surface, surface, device, parent_ops); + *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); - *surface = d3d_surface->wined3d_surface; - wined3d_surface_incref(*surface); - d3d_surface->container = container_parent; IDirect3DDevice8_Release(d3d_surface->parent_device); d3d_surface->parent_device = NULL; @@ -2936,7 +2933,31 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); d3d_surface->forwardReference = container_parent; - return hr; + return D3D_OK; +} + +static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, + void *container_parent, struct wined3d_volume *volume, void **parent, + const struct wined3d_parent_ops **parent_ops) +{ + struct d3d8_volume *d3d_volume; + + TRACE("device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.\n", + device_parent, container_parent, volume, parent, parent_ops); + + if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) + return E_OUTOFMEMORY; + + volume_init(d3d_volume, volume, parent_ops); + *parent = d3d_volume; + TRACE("Created volume %p.\n", d3d_volume); + + d3d_volume->container = container_parent; + + IDirect3DVolume8_Release(&d3d_volume->IDirect3DVolume8_iface); + d3d_volume->forwardReference = container_parent; + + return D3D_OK; } static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_device_parent *device_parent, @@ -2953,7 +2974,7 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic texture_desc = *desc; texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; - if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &texture_desc, 1, + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &texture_desc, 1, WINED3D_SURFACE_MAPPABLE, &device->IDirect3DDevice8_iface, &d3d8_null_wined3d_parent_ops, &texture))) { WARN("Failed to create texture, hr %#x.\n", hr); @@ -2971,48 +2992,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic return hr; } -static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *device_parent, - void *container_parent, UINT width, UINT height, UINT depth, UINT level, - enum wined3d_format_id format, enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume) -{ - struct d3d8_device *device = device_from_device_parent(device_parent); - struct d3d8_volume *object; - HRESULT hr; - - TRACE("device_parent %p, container_parent %p, width %u, height %u, depth %u, " - "format %#x, pool %#x, usage %#x, volume %p.\n", - device_parent, container_parent, width, height, depth, - format, pool, usage, volume); - - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - FIXME("Allocation of memory failed\n"); - *volume = NULL; - return D3DERR_OUTOFVIDEOMEMORY; - } - - hr = volume_init(object, device, width, height, depth, level, usage, format, pool); - if (FAILED(hr)) - { - WARN("Failed to initialize volume, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - *volume = object->wined3d_volume; - wined3d_volume_incref(*volume); - IDirect3DVolume8_Release(&object->IDirect3DVolume8_iface); - - object->container = container_parent; - object->forwardReference = container_parent; - - TRACE("Created volume %p.\n", object); - - return hr; -} - static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) { @@ -3040,9 +3019,9 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_surface_created, + device_parent_volume_created, device_parent_create_swapchain_surface, - device_parent_create_texture_surface, - device_parent_create_volume, device_parent_create_swapchain, }; diff --git a/reactos/dll/directx/wine/d3d8/shader.c b/reactos/dll/directx/wine/d3d8/shader.c index 540a4c08014..7453e01799c 100644 --- a/reactos/dll/directx/wine/d3d8/shader.c +++ b/reactos/dll/directx/wine/d3d8/shader.c @@ -92,7 +92,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d if (reg == D3DVSDE_NORMAL && type != D3DVSDT_FLOAT3 && !byte_code) { - WARN("Attempt to use a non-FLOAT3 normal with the fixed function function\n"); + WARN("Attempt to use a non-FLOAT3 normal with the fixed-function function\n"); return D3DERR_INVALIDCALL; } } diff --git a/reactos/dll/directx/wine/d3d8/surface.c b/reactos/dll/directx/wine/d3d8/surface.c index 8295a36ceee..10abee875b0 100644 --- a/reactos/dll/directx/wine/d3d8/surface.c +++ b/reactos/dll/directx/wine/d3d8/surface.c @@ -270,8 +270,16 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } + else + { + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; + } return hr; } @@ -322,37 +330,17 @@ static const struct wined3d_parent_ops d3d8_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -HRESULT surface_init(struct d3d8_surface *surface, struct d3d8_device *device, UINT width, UINT height, - D3DFORMAT format, DWORD flags, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, - DWORD multisample_quality) +void surface_init(struct d3d8_surface *surface, struct wined3d_surface *wined3d_surface, + struct d3d8_device *device, const struct wined3d_parent_ops **parent_ops) { - HRESULT hr; - surface->IDirect3DSurface8_iface.lpVtbl = &d3d8_surface_vtbl; surface->refcount = 1; - - /* FIXME: Check MAX bounds of MultisampleQuality. */ - if (multisample_quality > 0) - { - FIXME("Multisample quality set to %u, substituting 0.\n", multisample_quality); - multisample_quality = 0; - } - - wined3d_mutex_lock(); - hr = wined3d_surface_create(device->wined3d_device, width, height, wined3dformat_from_d3dformat(format), - usage & WINED3DUSAGE_MASK, (enum wined3d_pool)pool, multisample_type, multisample_quality, - flags, surface, &d3d8_surface_wined3d_parent_ops, &surface->wined3d_surface); - wined3d_mutex_unlock(); - if (FAILED(hr)) - { - WARN("Failed to create wined3d surface, hr %#x.\n", hr); - return hr; - } - + wined3d_surface_incref(wined3d_surface); + surface->wined3d_surface = wined3d_surface; surface->parent_device = &device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(surface->parent_device); - return D3D_OK; + *parent_ops = &d3d8_surface_wined3d_parent_ops; } struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) diff --git a/reactos/dll/directx/wine/d3d8/texture.c b/reactos/dll/directx/wine/d3d8/texture.c index e954ddc3587..9ea83e7d938 100644 --- a/reactos/dll/directx/wine/d3d8/texture.c +++ b/reactos/dll/directx/wine/d3d8/texture.c @@ -1194,6 +1194,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1204,7 +1205,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, surface_flags |= WINED3D_SURFACE_MAPPABLE; wined3d_mutex_lock(); - hr = wined3d_texture_create_2d(device->wined3d_device, &desc, levels, surface_flags, + hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) @@ -1234,6 +1235,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1244,7 +1246,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic surface_flags |= WINED3D_SURFACE_MAPPABLE; wined3d_mutex_lock(); - hr = wined3d_texture_create_cube(device->wined3d_device, &desc, levels, surface_flags, + hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) @@ -1273,6 +1275,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1280,7 +1283,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.size = 0; wined3d_mutex_lock(); - hr = wined3d_texture_create_3d(device->wined3d_device, &desc, levels, + hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/reactos/dll/directx/wine/d3d8/volume.c b/reactos/dll/directx/wine/d3d8/volume.c index 5e3a8a485a0..d2399d51e4b 100644 --- a/reactos/dll/directx/wine/d3d8/volume.c +++ b/reactos/dll/directx/wine/d3d8/volume.c @@ -280,21 +280,13 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops = volume_wined3d_object_destroyed, }; -HRESULT volume_init(struct d3d8_volume *volume, struct d3d8_device *device, UINT width, UINT height, - UINT depth, UINT level, DWORD usage, enum wined3d_format_id format, enum wined3d_pool pool) +void volume_init(struct d3d8_volume *volume, struct wined3d_volume *wined3d_volume, + const struct wined3d_parent_ops **parent_ops) { - HRESULT hr; - volume->IDirect3DVolume8_iface.lpVtbl = &d3d8_volume_vtbl; volume->refcount = 1; + wined3d_volume_incref(wined3d_volume); + volume->wined3d_volume = wined3d_volume; - hr = wined3d_volume_create(device->wined3d_device, width, height, depth, level, usage, - format, pool, volume, &d3d8_volume_wined3d_parent_ops, &volume->wined3d_volume); - if (FAILED(hr)) - { - WARN("Failed to create wined3d volume, hr %#x.\n", hr); - return hr; - } - - return D3D_OK; + *parent_ops = &d3d8_volume_wined3d_parent_ops; } diff --git a/reactos/dll/directx/wine/d3d9/d3d9_main.c b/reactos/dll/directx/wine/d3d9/d3d9_main.c index 01d6b216236..b2a1c68a7f6 100644 --- a/reactos/dll/directx/wine/d3d9/d3d9_main.c +++ b/reactos/dll/directx/wine/d3d9/d3d9_main.c @@ -89,12 +89,10 @@ void* WINAPI Direct3DShaderValidatorCreate9(void) /******************************************************************* * DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - /* At process attach */ - TRACE("fdwReason=%d\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hInstDLL); + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(inst); return TRUE; } @@ -102,8 +100,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) /*********************************************************************** * D3DPERF_BeginEvent (D3D9.@) */ -int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) { - TRACE("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name) +{ + TRACE("color 0x%08x, name %s.\n", color, debugstr_w(name)); return D3DPERF_event_level++; } @@ -147,13 +146,15 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) { /*********************************************************************** * D3DPERF_SetMarker (D3D9.@) */ -void WINAPI D3DPERF_SetMarker(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } /*********************************************************************** * D3DPERF_SetRegion (D3D9.@) */ -void WINAPI D3DPERF_SetRegion(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } diff --git a/reactos/dll/directx/wine/d3d9/d3d9_private.h b/reactos/dll/directx/wine/d3d9/d3d9_private.h index 6ae0c4d56ae..e896c280c41 100644 --- a/reactos/dll/directx/wine/d3d9/d3d9_private.h +++ b/reactos/dll/directx/wine/d3d9/d3d9_private.h @@ -35,7 +35,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS - #include #include #include @@ -182,13 +181,12 @@ struct d3d9_volume IUnknown *forwardReference; }; -HRESULT volume_init(struct d3d9_volume *volume, struct d3d9_device *device, UINT width, UINT height, - UINT depth, UINT level, DWORD usage, enum wined3d_format_id format, - enum wined3d_pool pool) DECLSPEC_HIDDEN; +void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, + const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_swapchain { - IDirect3DSwapChain9 IDirect3DSwapChain9_iface; + IDirect3DSwapChain9Ex IDirect3DSwapChain9Ex_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; IDirect3DDevice9Ex *parent_device; @@ -208,9 +206,8 @@ struct d3d9_surface BOOL getdc_supported; }; -HRESULT surface_init(struct d3d9_surface *surface, struct d3d9_device *device, UINT width, UINT height, - D3DFORMAT format, DWORD flags, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, - DWORD multisample_quality) DECLSPEC_HIDDEN; +void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface, + struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; struct d3d9_vertexbuffer @@ -319,4 +316,9 @@ struct d3d9_query HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; +static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9Ex *iface) +{ + return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); +} + #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/reactos/dll/directx/wine/d3d9/device.c b/reactos/dll/directx/wine/d3d9/device.c index 6bcc65bc03b..efff993cfac 100644 --- a/reactos/dll/directx/wine/d3d9/device.c +++ b/reactos/dll/directx/wine/d3d9/device.c @@ -226,11 +226,6 @@ static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->auto_restore_display_mode = TRUE; } -static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9Ex *iface) -{ - return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); -} - static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -504,7 +499,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) - *swapchain = &object->IDirect3DSwapChain9_iface; + *swapchain = (IDirect3DSwapChain9 *)&object->IDirect3DSwapChain9Ex_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); return hr; @@ -524,8 +519,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_GetSwapChain(IDirect3DDevice if ((wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, swapchain_idx))) { swapchain_impl = wined3d_swapchain_get_parent(wined3d_swapchain); - *swapchain = &swapchain_impl->IDirect3DSwapChain9_iface; - IDirect3DSwapChain9_AddRef(*swapchain); + *swapchain = (IDirect3DSwapChain9 *)&swapchain_impl->IDirect3DSwapChain9Ex_iface; + IDirect3DSwapChain9Ex_AddRef(*swapchain); hr = D3D_OK; } else @@ -739,8 +734,15 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", iface, width, height, levels, usage, format, pool, texture, shared_handle); + *texture = NULL; if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared or user memory texture on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool == D3DPOOL_SYSTEMMEM) { if (levels != 1) @@ -748,7 +750,14 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, set_mem = TRUE; } else + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -770,7 +779,9 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, resource = wined3d_texture_get_sub_resource(object->wined3d_texture, 0); surface = wined3d_resource_get_parent(resource); - wined3d_surface_set_mem(surface->wined3d_surface, *shared_handle, 0); + wined3d_surface_update_desc(surface->wined3d_surface, width, height, + wined3dformat_from_d3dformat(format), WINED3D_MULTISAMPLE_NONE, 0, + *shared_handle, 0); } TRACE("Created texture %p.\n", object); @@ -792,8 +803,22 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, TRACE("usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", usage, format, pool, texture, shared_handle); + *texture = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared volume texture on a non-ex device.\n"); + return E_NOTIMPL; + } + + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared volume texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -824,8 +849,22 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, TRACE("iface %p, edge_length %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", iface, edge_length, levels, usage, format, pool, texture, shared_handle); + *texture = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared cube texture on a non-ex device.\n"); + return E_NOTIMPL; + } + + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared cube texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -857,7 +896,20 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, iface, size, usage, fvf, pool, buffer, shared_handle); if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared vertex buffer on a non-ex device.\n"); + return E_NOTIMPL; + } + + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared vertex buffer in pool %#x.\n", pool); + return D3DERR_NOTAVAILABLE; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -889,7 +941,20 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U iface, size, usage, format, pool, buffer, shared_handle); if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared index buffer on a non-ex device.\n"); + return E_NOTIMPL; + } + + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared index buffer in pool %#x.\n", pool); + return D3DERR_NOTAVAILABLE; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -911,7 +976,7 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width, UINT height, D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, - D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) + D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, void *user_mem) { struct wined3d_resource *sub_resource; struct wined3d_resource_desc desc; @@ -937,7 +1002,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width wined3d_mutex_lock(); - if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &desc, 1, flags, NULL, &d3d9_null_wined3d_parent_ops, &texture))) { wined3d_mutex_unlock(); @@ -953,6 +1018,10 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width IDirect3DSurface9_AddRef(*surface); wined3d_texture_decref(texture); + if (user_mem) + wined3d_surface_update_desc(surface_impl->wined3d_surface, width, height, + desc.format, multisample_type, multisample_quality, user_mem, 0); + wined3d_mutex_unlock(); return D3D_OK; @@ -970,14 +1039,23 @@ static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle); + *surface = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared render target on a non-ex device.\n"); + return E_NOTIMPL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } if (lockable) flags |= WINED3D_SURFACE_MAPPABLE; return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality); + D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex *iface, UINT width, UINT height, @@ -992,14 +1070,23 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle); + *surface = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared depth stencil on a non-ex device.\n"); + return E_NOTIMPL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } if (discard) flags |= WINED3D_SURFACE_DISCARD; return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality); + D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } @@ -1184,23 +1271,44 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex HANDLE *shared_handle) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + void *user_mem = NULL; TRACE("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p.\n", iface, width, height, format, pool, surface, shared_handle); - if (shared_handle) - FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - + *surface = NULL; if (pool == D3DPOOL_MANAGED) { WARN("Attempting to create a managed offscreen plain surface.\n"); return D3DERR_INVALIDCALL; } + + if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared or user memory surface on a non-ex device.\n"); + return E_NOTIMPL; + } + + if (pool == D3DPOOL_SYSTEMMEM) + user_mem = *shared_handle; + else + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared surface in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } + } + /* FIXME: Offscreen surfaces are supposed to be always lockable, * regardless of the pool they're created in. Should we set dynamic usage * here? */ return d3d9_device_create_surface(device, width, height, format, - WINED3D_SURFACE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0); + WINED3D_SURFACE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem); } static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWORD idx, IDirect3DSurface9 *surface) @@ -1217,6 +1325,12 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO return D3DERR_INVALIDCALL; } + if (!idx && !surface_impl) + { + WARN("Trying to set render target 0 to NULL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); hr = wined3d_device_set_render_target(device->wined3d_device, idx, surface_impl ? surface_impl->wined3d_surface : NULL, TRUE); @@ -2363,7 +2477,7 @@ static struct wined3d_vertex_declaration *device_get_fvf_declaration(struct d3d9 fvf_decls[low].fvf = fvf; ++device->fvf_decl_count; - TRACE("Returning %p. %u declatations in array.\n", wined3d_declaration, device->fvf_decl_count); + TRACE("Returning %p. %u declarations in array.\n", wined3d_declaration, device->fvf_decl_count); return wined3d_declaration; } @@ -3035,6 +3149,7 @@ static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); + *surface = NULL; if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); @@ -3060,6 +3175,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); + *surface = NULL; if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); @@ -3295,16 +3411,15 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } -static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, - void *container_parent, const struct wined3d_resource_desc *desc, UINT sub_resource_idx, - DWORD flags, struct wined3d_surface **surface) +static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, + void *container_parent, struct wined3d_surface *surface, void **parent, + const struct wined3d_parent_ops **parent_ops) { struct d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; - HRESULT hr; - TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", - device_parent, container_parent, desc, sub_resource_idx, flags, surface); + TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", + device_parent, container_parent, surface, parent, parent_ops); if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { @@ -3312,20 +3427,10 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ return D3DERR_OUTOFVIDEOMEMORY; } - if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, - desc->multisample_type, desc->multisample_quality))) - { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, d3d_surface); - return hr; - } - + surface_init(d3d_surface, surface, device, parent_ops); + *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); - *surface = d3d_surface->wined3d_surface; - wined3d_surface_incref(*surface); - d3d_surface->container = container_parent; IDirect3DDevice9Ex_Release(d3d_surface->parent_device); d3d_surface->parent_device = NULL; @@ -3333,7 +3438,31 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface); d3d_surface->forwardReference = container_parent; - return hr; + return D3D_OK; +} + +static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, + void *container_parent, struct wined3d_volume *volume, void **parent, + const struct wined3d_parent_ops **parent_ops) +{ + struct d3d9_volume *d3d_volume; + + TRACE("device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.\n", + device_parent, container_parent, volume, parent, parent_ops); + + if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) + return E_OUTOFMEMORY; + + volume_init(d3d_volume, volume, parent_ops); + *parent = d3d_volume; + TRACE("Created volume %p.\n", d3d_volume); + + d3d_volume->container = container_parent; + + IDirect3DVolume9_Release(&d3d_volume->IDirect3DVolume9_iface); + d3d_volume->forwardReference = container_parent; + + return D3D_OK; } static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_device_parent *device_parent, @@ -3353,7 +3482,7 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic texture_desc = *desc; texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; - if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &texture_desc, 1, + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &texture_desc, 1, WINED3D_SURFACE_MAPPABLE, container_parent, &d3d9_null_wined3d_parent_ops, &texture))) { WARN("Failed to create texture, hr %#x.\n", hr); @@ -3371,48 +3500,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic return hr; } -static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *device_parent, - void *container_parent, UINT width, UINT height, UINT depth, UINT level, - enum wined3d_format_id format, enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume) -{ - struct d3d9_device *device = device_from_device_parent(device_parent); - struct d3d9_volume *object; - HRESULT hr; - - TRACE("device_parent %p, container_parent %p, width %u, height %u, depth %u, " - "format %#x, pool %#x, usage %#x, volume %p\n", - device_parent, container_parent, width, height, depth, - format, pool, usage, volume); - - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - FIXME("Allocation of memory failed\n"); - *volume = NULL; - return D3DERR_OUTOFVIDEOMEMORY; - } - - hr = volume_init(object, device, width, height, depth, level, usage, format, pool); - if (FAILED(hr)) - { - WARN("Failed to initialize volume, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - *volume = object->wined3d_volume; - wined3d_volume_incref(*volume); - IDirect3DVolume9_Release(&object->IDirect3DVolume9_iface); - - object->container = container_parent; - object->forwardReference = container_parent; - - TRACE("Created volume %p.\n", object); - - return hr; -} - static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) { @@ -3432,7 +3519,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *swapchain = d3d_swapchain->wined3d_swapchain; wined3d_swapchain_incref(*swapchain); - IDirect3DSwapChain9_Release(&d3d_swapchain->IDirect3DSwapChain9_iface); + IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); return hr; } @@ -3441,9 +3528,9 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_surface_created, + device_parent_volume_created, device_parent_create_swapchain_surface, - device_parent_create_texture_surface, - device_parent_create_volume, device_parent_create_swapchain, }; diff --git a/reactos/dll/directx/wine/d3d9/surface.c b/reactos/dll/directx/wine/d3d9/surface.c index c86d05d093f..27e6744c80f 100644 --- a/reactos/dll/directx/wine/d3d9/surface.c +++ b/reactos/dll/directx/wine/d3d9/surface.c @@ -290,8 +290,11 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } return hr; } @@ -387,16 +390,16 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -HRESULT surface_init(struct d3d9_surface *surface, struct d3d9_device *device, UINT width, UINT height, - D3DFORMAT format, DWORD flags, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, - DWORD multisample_quality) +void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface, + struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops) { - HRESULT hr; + struct wined3d_resource_desc desc; surface->IDirect3DSurface9_iface.lpVtbl = &d3d9_surface_vtbl; surface->refcount = 1; - switch (format) + wined3d_resource_get_desc(wined3d_surface_get_resource(wined3d_surface), &desc); + switch (d3dformat_from_wined3dformat(desc.format)) { case D3DFMT_A8R8G8B8: case D3DFMT_X8R8G8B8: @@ -412,28 +415,12 @@ HRESULT surface_init(struct d3d9_surface *surface, struct d3d9_device *device, U break; } - /* FIXME: Check MAX bounds of MultisampleQuality. */ - if (multisample_quality > 0) - { - FIXME("Multisample quality set to %u, substituting 0.\n", multisample_quality); - multisample_quality = 0; - } - - wined3d_mutex_lock(); - hr = wined3d_surface_create(device->wined3d_device, width, height, wined3dformat_from_d3dformat(format), - usage & WINED3DUSAGE_MASK, (enum wined3d_pool)pool, multisample_type, multisample_quality, - flags, surface, &d3d9_surface_wined3d_parent_ops, &surface->wined3d_surface); - wined3d_mutex_unlock(); - if (FAILED(hr)) - { - WARN("Failed to create wined3d surface, hr %#x.\n", hr); - return hr; - } - + wined3d_surface_incref(wined3d_surface); + surface->wined3d_surface = wined3d_surface; surface->parent_device = &device->IDirect3DDevice9Ex_iface; IDirect3DDevice9Ex_AddRef(surface->parent_device); - return D3D_OK; + *parent_ops = &d3d9_surface_wined3d_parent_ops; } struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) diff --git a/reactos/dll/directx/wine/d3d9/swapchain.c b/reactos/dll/directx/wine/d3d9/swapchain.c index c1be78f44b9..f5ec38307aa 100644 --- a/reactos/dll/directx/wine/d3d9/swapchain.c +++ b/reactos/dll/directx/wine/d3d9/swapchain.c @@ -22,19 +22,38 @@ #include "d3d9_private.h" -static inline struct d3d9_swapchain *impl_from_IDirect3DSwapChain9(IDirect3DSwapChain9 *iface) +static inline struct d3d9_swapchain *impl_from_IDirect3DSwapChain9Ex(IDirect3DSwapChain9Ex *iface) { - return CONTAINING_RECORD(iface, struct d3d9_swapchain, IDirect3DSwapChain9_iface); + return CONTAINING_RECORD(iface, struct d3d9_swapchain, IDirect3DSwapChain9Ex_iface); } -static HRESULT WINAPI d3d9_swapchain_QueryInterface(IDirect3DSwapChain9 *iface, REFIID riid, void **out) +static HRESULT WINAPI d3d9_swapchain_QueryInterface(IDirect3DSwapChain9Ex *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) || IsEqualGUID(riid, &IID_IUnknown)) { - IDirect3DSwapChain9_AddRef(iface); + IDirect3DSwapChain9Ex_AddRef(iface); + *out = iface; + return S_OK; + } + + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9Ex)) + { + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); + + /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. + * It doesn't matter with which function the device was created. */ + if (!device->d3d_parent->extended) + { + WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE.\n"); + *out = NULL; + return E_NOINTERFACE; + } + + IDirect3DSwapChain9Ex_AddRef(iface); *out = iface; return S_OK; } @@ -45,9 +64,9 @@ static HRESULT WINAPI d3d9_swapchain_QueryInterface(IDirect3DSwapChain9 *iface, return E_NOINTERFACE; } -static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9 *iface) +static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); ULONG refcount = InterlockedIncrement(&swapchain->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -65,9 +84,9 @@ static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9 *iface) return refcount; } -static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9 *iface) +static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); ULONG refcount = InterlockedDecrement(&swapchain->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -88,11 +107,11 @@ static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9 *iface) return refcount; } -static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChain9 *iface, +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChain9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", @@ -107,9 +126,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai return hr; } -static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9 *iface, IDirect3DSurface9 *surface) +static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9Ex *iface, IDirect3DSurface9 *surface) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(surface); HRESULT hr; @@ -122,10 +141,10 @@ static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9 *ifa return hr; } -static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9 *iface, +static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct wined3d_surface *wined3d_surface = NULL; struct d3d9_surface *surface_impl; HRESULT hr = D3D_OK; @@ -150,9 +169,9 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9 *iface, return hr; } -static HRESULT WINAPI d3d9_swapchain_GetRasterStatus(IDirect3DSwapChain9 *iface, D3DRASTER_STATUS *raster_status) +static HRESULT WINAPI d3d9_swapchain_GetRasterStatus(IDirect3DSwapChain9Ex *iface, D3DRASTER_STATUS *raster_status) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); HRESULT hr; TRACE("iface %p, raster_status %p.\n", iface, raster_status); @@ -165,9 +184,9 @@ static HRESULT WINAPI d3d9_swapchain_GetRasterStatus(IDirect3DSwapChain9 *iface, return hr; } -static HRESULT WINAPI d3d9_swapchain_GetDisplayMode(IDirect3DSwapChain9 *iface, D3DDISPLAYMODE *mode) +static HRESULT WINAPI d3d9_swapchain_GetDisplayMode(IDirect3DSwapChain9Ex *iface, D3DDISPLAYMODE *mode) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -188,9 +207,9 @@ static HRESULT WINAPI d3d9_swapchain_GetDisplayMode(IDirect3DSwapChain9 *iface, return hr; } -static HRESULT WINAPI d3d9_swapchain_GetDevice(IDirect3DSwapChain9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_swapchain_GetDevice(IDirect3DSwapChain9Ex *iface, IDirect3DDevice9 **device) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -202,10 +221,10 @@ static HRESULT WINAPI d3d9_swapchain_GetDevice(IDirect3DSwapChain9 *iface, IDire return D3D_OK; } -static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *iface, +static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9Ex *iface, D3DPRESENT_PARAMETERS *parameters) { - struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct wined3d_swapchain_desc desc; TRACE("iface %p, parameters %p.\n", iface, parameters); @@ -218,12 +237,64 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i return D3D_OK; } - -static const struct IDirect3DSwapChain9Vtbl d3d9_swapchain_vtbl = +static HRESULT WINAPI d3d9_swapchain_GetLastPresentCount(IDirect3DSwapChain9Ex *iface, + UINT *last_present_count) { + FIXME("iface %p, last_present_count %p, stub!\n", iface, last_present_count); + + if (last_present_count) + *last_present_count = 0; + + return D3D_OK; +} + +static HRESULT WINAPI d3d9_swapchain_GetPresentStatistics(IDirect3DSwapChain9Ex *iface, + D3DPRESENTSTATS *present_stats) +{ + FIXME("iface %p, present_stats %p, stub!\n", iface, present_stats); + + if (present_stats) + memset(present_stats, 0, sizeof(*present_stats)); + + return D3D_OK; +} + +static HRESULT WINAPI d3d9_swapchain_GetDisplayModeEx(IDirect3DSwapChain9Ex *iface, + D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) +{ + struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); + struct wined3d_display_mode wined3d_mode; + HRESULT hr; + + TRACE("iface %p, mode %p, rotation %p.\n", iface, mode, rotation); + + if (mode->Size != sizeof(*mode)) + return D3DERR_INVALIDCALL; + + wined3d_mutex_lock(); + hr = wined3d_swapchain_get_display_mode(swapchain->wined3d_swapchain, &wined3d_mode, + (enum wined3d_display_rotation *)rotation); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + { + mode->Width = wined3d_mode.width; + mode->Height = wined3d_mode.height; + mode->RefreshRate = wined3d_mode.refresh_rate; + mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); + mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + } + + return hr; +} + +static const struct IDirect3DSwapChain9ExVtbl d3d9_swapchain_vtbl = +{ + /* IUnknown */ d3d9_swapchain_QueryInterface, d3d9_swapchain_AddRef, d3d9_swapchain_Release, + /* IDirect3DSwapChain9 */ d3d9_swapchain_Present, d3d9_swapchain_GetFrontBufferData, d3d9_swapchain_GetBackBuffer, @@ -231,6 +302,10 @@ static const struct IDirect3DSwapChain9Vtbl d3d9_swapchain_vtbl = d3d9_swapchain_GetDisplayMode, d3d9_swapchain_GetDevice, d3d9_swapchain_GetPresentParameters, + /* IDirect3DSwapChain9Ex */ + d3d9_swapchain_GetLastPresentCount, + d3d9_swapchain_GetPresentStatistics, + d3d9_swapchain_GetDisplayModeEx }; static void STDMETHODCALLTYPE d3d9_swapchain_wined3d_object_released(void *parent) @@ -249,7 +324,7 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi HRESULT hr; swapchain->refcount = 1; - swapchain->IDirect3DSwapChain9_iface.lpVtbl = &d3d9_swapchain_vtbl; + swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; wined3d_mutex_lock(); hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, diff --git a/reactos/dll/directx/wine/d3d9/texture.c b/reactos/dll/directx/wine/d3d9/texture.c index 74ff5d9261a..2cddc57e09a 100644 --- a/reactos/dll/directx/wine/d3d9/texture.c +++ b/reactos/dll/directx/wine/d3d9/texture.c @@ -1318,6 +1318,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1328,7 +1329,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, surface_flags |= WINED3D_SURFACE_MAPPABLE; wined3d_mutex_lock(); - hr = wined3d_texture_create_2d(device->wined3d_device, &desc, levels, surface_flags, + hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) @@ -1358,6 +1359,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1368,7 +1370,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic surface_flags |= WINED3D_SURFACE_MAPPABLE; wined3d_mutex_lock(); - hr = wined3d_texture_create_cube(device->wined3d_device, &desc, levels, surface_flags, + hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) @@ -1397,6 +1399,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1404,7 +1407,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.size = 0; wined3d_mutex_lock(); - hr = wined3d_texture_create_3d(device->wined3d_device, &desc, levels, + hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/reactos/dll/directx/wine/d3d9/volume.c b/reactos/dll/directx/wine/d3d9/volume.c index ef54a56b680..b0a629080bc 100644 --- a/reactos/dll/directx/wine/d3d9/volume.c +++ b/reactos/dll/directx/wine/d3d9/volume.c @@ -271,22 +271,13 @@ static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops = volume_wined3d_object_destroyed, }; -HRESULT volume_init(struct d3d9_volume *volume, struct d3d9_device *device, UINT width, UINT height, - UINT depth, UINT level, DWORD usage, enum wined3d_format_id format, enum wined3d_pool pool) +void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, + const struct wined3d_parent_ops **parent_ops) { - HRESULT hr; - volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl; volume->refcount = 1; + wined3d_volume_incref(wined3d_volume); + volume->wined3d_volume = wined3d_volume; - hr = wined3d_volume_create(device->wined3d_device, width, height, depth, level, - usage & WINED3DUSAGE_MASK, format, pool, volume, &d3d9_volume_wined3d_parent_ops, - &volume->wined3d_volume); - if (FAILED(hr)) - { - WARN("Failed to create wined3d volume, hr %#x.\n", hr); - return hr; - } - - return D3D_OK; + *parent_ops = &d3d9_volume_wined3d_parent_ops; } diff --git a/reactos/dll/directx/wine/ddraw/CMakeLists.txt b/reactos/dll/directx/wine/ddraw/CMakeLists.txt index 19f87562fbd..5872db063de 100644 --- a/reactos/dll/directx/wine/ddraw/CMakeLists.txt +++ b/reactos/dll/directx/wine/ddraw/CMakeLists.txt @@ -32,7 +32,7 @@ endif() add_library(ddraw SHARED ${SOURCE} ddraw.rc) set_module_type(ddraw win32dll) target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB}) -add_importlibs(ddraw advapi32 gdi32 ole32 user32 wined3d msvcrt kernel32 ntdll) +add_importlibs(ddraw advapi32 gdi32 user32 wined3d msvcrt kernel32 ntdll) add_dependencies(ddraw wineheaders) add_pch(ddraw ddraw_private.h) add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/directx/wine/ddraw/ddraw.c b/reactos/dll/directx/wine/ddraw/ddraw.c index e1587a4e23a..272e10969a9 100644 --- a/reactos/dll/directx/wine/ddraw/ddraw.c +++ b/reactos/dll/directx/wine/ddraw/ddraw.c @@ -773,21 +773,29 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, wined3d_mutex_lock(); + if (ddraw->flags & DDRAW_SCL_RECURSIVE) + { + WARN("Recursive call, returning DD_OK.\n"); + hr = DD_OK; + goto done; + } + ddraw->flags |= DDRAW_SCL_RECURSIVE; + /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | DDSCL_NORMAL | DDSCL_EXCLUSIVE ))) { TRACE("Incorrect cooplevel flags, returning DDERR_INVALIDPARAMS\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } if ((cooplevel & DDSCL_CREATEDEVICEWINDOW) && !(cooplevel & DDSCL_EXCLUSIVE)) { WARN("DDSCL_CREATEDEVICEWINDOW requires DDSCL_EXCLUSIVE.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } /* Handle those levels first which set various hwnds */ @@ -805,13 +813,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, | DDSCL_FULLSCREEN)) { WARN("Called with incompatible flags, returning DDERR_INVALIDPARAMS.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } hr = ddraw_set_focus_window(ddraw, window); - wined3d_mutex_unlock(); - return hr; + goto done; } if (cooplevel & DDSCL_EXCLUSIVE) @@ -819,8 +826,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!(cooplevel & DDSCL_FULLSCREEN) || !(window || (cooplevel & DDSCL_CREATEDEVICEWINDOW))) { WARN("DDSCL_EXCLUSIVE requires DDSCL_FULLSCREEN and a window.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } if (cooplevel & DDSCL_CREATEDEVICEWINDOW) @@ -830,8 +837,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!ddraw->focuswindow && !(cooplevel & DDSCL_SETFOCUSWINDOW)) { WARN("No focus window set.\n"); - wined3d_mutex_unlock(); - return DDERR_NOFOCUSWINDOW; + hr = DDERR_NOFOCUSWINDOW; + goto done; } device_window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DirectDrawDeviceWnd", @@ -840,8 +847,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!device_window) { ERR("Failed to create window, last error %#x.\n", GetLastError()); - wined3d_mutex_unlock(); - return E_FAIL; + hr = E_FAIL; + goto done; } ShowWindow(device_window, SW_SHOW); @@ -856,15 +863,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, { if (!window) { - wined3d_mutex_unlock(); - return DDERR_NOHWND; + hr = DDERR_NOHWND; + goto done; } if (FAILED(hr = ddraw_set_focus_window(ddraw, window))) - { - wined3d_mutex_unlock(); - return hr; - } + goto done; } window = device_window; @@ -905,8 +909,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (FAILED(hr = wined3d_stateblock_create(ddraw->wined3d_device, WINED3D_SBT_ALL, &stateblock))) { ERR("Failed to create stateblock, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; + goto done; } wined3d_stateblock_capture(stateblock); @@ -963,8 +966,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (FAILED(hr)) { ERR("Failed to acquire focus window, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; + goto done; } } @@ -986,9 +988,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw->dest_window = window; TRACE("SetCooperativeLevel retuning DD_OK\n"); + hr = DD_OK; +done: + ddraw->flags &= ~DDRAW_SCL_RECURSIVE; wined3d_mutex_unlock(); - return DD_OK; + return hr; } static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND window, DWORD flags) @@ -1155,6 +1160,269 @@ static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWO return ddraw7_SetDisplayMode(&ddraw->IDirectDraw7_iface, width, height, bpp, 0, 0); } +void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7) +{ + memset(caps1, 0, sizeof(*caps1)); + caps1->dwSize = sizeof(*caps1); + caps1->dwFlags = D3DDD_COLORMODEL + | D3DDD_DEVCAPS + | D3DDD_TRANSFORMCAPS + | D3DDD_BCLIPPING + | D3DDD_LIGHTINGCAPS + | D3DDD_LINECAPS + | D3DDD_TRICAPS + | D3DDD_DEVICERENDERBITDEPTH + | D3DDD_DEVICEZBUFFERBITDEPTH + | D3DDD_MAXBUFFERSIZE + | D3DDD_MAXVERTEXCOUNT; + caps1->dcmColorModel = D3DCOLOR_RGB; + caps1->dwDevCaps = caps7->dwDevCaps; + caps1->dtcTransformCaps.dwSize = sizeof(caps1->dtcTransformCaps); + caps1->dtcTransformCaps.dwCaps = D3DTRANSFORMCAPS_CLIP; + caps1->bClipping = TRUE; + caps1->dlcLightingCaps.dwSize = sizeof(caps1->dlcLightingCaps); + caps1->dlcLightingCaps.dwCaps = D3DLIGHTCAPS_DIRECTIONAL + | D3DLIGHTCAPS_PARALLELPOINT + | D3DLIGHTCAPS_POINT + | D3DLIGHTCAPS_SPOT; + caps1->dlcLightingCaps.dwLightingModel = D3DLIGHTINGMODEL_RGB; + caps1->dlcLightingCaps.dwNumLights = caps7->dwMaxActiveLights; + caps1->dpcLineCaps = caps7->dpcLineCaps; + caps1->dpcTriCaps = caps7->dpcTriCaps; + caps1->dwDeviceRenderBitDepth = caps7->dwDeviceRenderBitDepth; + caps1->dwDeviceZBufferBitDepth = caps7->dwDeviceZBufferBitDepth; + caps1->dwMaxBufferSize = 0; + caps1->dwMaxVertexCount = 65536; + caps1->dwMinTextureWidth = caps7->dwMinTextureWidth; + caps1->dwMinTextureHeight = caps7->dwMinTextureHeight; + caps1->dwMaxTextureWidth = caps7->dwMaxTextureWidth; + caps1->dwMaxTextureHeight = caps7->dwMaxTextureHeight; + caps1->dwMinStippleWidth = 1; + caps1->dwMinStippleHeight = 1; + caps1->dwMaxStippleWidth = 32; + caps1->dwMaxStippleHeight = 32; + caps1->dwMaxTextureRepeat = caps7->dwMaxTextureRepeat; + caps1->dwMaxTextureAspectRatio = caps7->dwMaxTextureAspectRatio; + caps1->dwMaxAnisotropy = caps7->dwMaxAnisotropy; + caps1->dvGuardBandLeft = caps7->dvGuardBandLeft; + caps1->dvGuardBandTop = caps7->dvGuardBandTop; + caps1->dvGuardBandRight = caps7->dvGuardBandRight; + caps1->dvGuardBandBottom = caps7->dvGuardBandBottom; + caps1->dvExtentsAdjust = caps7->dvExtentsAdjust; + caps1->dwStencilCaps = caps7->dwStencilCaps; + caps1->dwFVFCaps = caps7->dwFVFCaps; + caps1->dwTextureOpCaps = caps7->dwTextureOpCaps; + caps1->wMaxTextureBlendStages = caps7->wMaxTextureBlendStages; + caps1->wMaxSimultaneousTextures = caps7->wMaxSimultaneousTextures; +} + +HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) +{ + WINED3DCAPS wined3d_caps; + HRESULT hr; + + TRACE("ddraw %p, caps %p.\n", ddraw, caps); + + memset(&wined3d_caps, 0, sizeof(wined3d_caps)); + + wined3d_mutex_lock(); + hr = wined3d_get_device_caps(ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + caps->dwDevCaps = wined3d_caps.DevCaps; + caps->dpcLineCaps.dwMiscCaps = wined3d_caps.PrimitiveMiscCaps; + caps->dpcLineCaps.dwRasterCaps = wined3d_caps.RasterCaps; + caps->dpcLineCaps.dwZCmpCaps = wined3d_caps.ZCmpCaps; + caps->dpcLineCaps.dwSrcBlendCaps = wined3d_caps.SrcBlendCaps; + caps->dpcLineCaps.dwDestBlendCaps = wined3d_caps.DestBlendCaps; + caps->dpcLineCaps.dwAlphaCmpCaps = wined3d_caps.AlphaCmpCaps; + caps->dpcLineCaps.dwShadeCaps = wined3d_caps.ShadeCaps; + caps->dpcLineCaps.dwTextureCaps = wined3d_caps.TextureCaps; + caps->dpcLineCaps.dwTextureFilterCaps = wined3d_caps.TextureFilterCaps; + caps->dpcLineCaps.dwTextureAddressCaps = wined3d_caps.TextureAddressCaps; + + caps->dwMaxTextureWidth = wined3d_caps.MaxTextureWidth; + caps->dwMaxTextureHeight = wined3d_caps.MaxTextureHeight; + + caps->dwMaxTextureRepeat = wined3d_caps.MaxTextureRepeat; + caps->dwMaxTextureAspectRatio = wined3d_caps.MaxTextureAspectRatio; + caps->dwMaxAnisotropy = wined3d_caps.MaxAnisotropy; + caps->dvMaxVertexW = wined3d_caps.MaxVertexW; + + caps->dvGuardBandLeft = wined3d_caps.GuardBandLeft; + caps->dvGuardBandTop = wined3d_caps.GuardBandTop; + caps->dvGuardBandRight = wined3d_caps.GuardBandRight; + caps->dvGuardBandBottom = wined3d_caps.GuardBandBottom; + + caps->dvExtentsAdjust = wined3d_caps.ExtentsAdjust; + caps->dwStencilCaps = wined3d_caps.StencilCaps; + + caps->dwFVFCaps = wined3d_caps.FVFCaps; + caps->dwTextureOpCaps = wined3d_caps.TextureOpCaps; + + caps->dwVertexProcessingCaps = wined3d_caps.VertexProcessingCaps; + caps->dwMaxActiveLights = wined3d_caps.MaxActiveLights; + + /* Remove all non-d3d7 caps */ + caps->dwDevCaps &= ( + D3DDEVCAPS_FLOATTLVERTEX | D3DDEVCAPS_SORTINCREASINGZ | D3DDEVCAPS_SORTDECREASINGZ | + D3DDEVCAPS_SORTEXACT | D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | + D3DDEVCAPS_TLVERTEXSYSTEMMEMORY | D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY | + D3DDEVCAPS_TEXTUREVIDEOMEMORY | D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | + D3DDEVCAPS_TEXTURENONLOCALVIDMEM | D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES | + D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_CANBLTSYSTONONLOCAL | + D3DDEVCAPS_HWRASTERIZATION); + + caps->dwStencilCaps &= ( + D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE | + D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT | + D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR); + + /* FVF caps ?*/ + + caps->dwTextureOpCaps &= ( + D3DTEXOPCAPS_DISABLE | D3DTEXOPCAPS_SELECTARG1 | D3DTEXOPCAPS_SELECTARG2 | + D3DTEXOPCAPS_MODULATE | D3DTEXOPCAPS_MODULATE2X | D3DTEXOPCAPS_MODULATE4X | + D3DTEXOPCAPS_ADD | D3DTEXOPCAPS_ADDSIGNED | D3DTEXOPCAPS_ADDSIGNED2X | + D3DTEXOPCAPS_SUBTRACT | D3DTEXOPCAPS_ADDSMOOTH | D3DTEXOPCAPS_BLENDTEXTUREALPHA | + D3DTEXOPCAPS_BLENDFACTORALPHA | D3DTEXOPCAPS_BLENDTEXTUREALPHAPM | D3DTEXOPCAPS_BLENDCURRENTALPHA | + D3DTEXOPCAPS_PREMODULATE | D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR | D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA | + D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA | D3DTEXOPCAPS_BUMPENVMAP | + D3DTEXOPCAPS_BUMPENVMAPLUMINANCE | D3DTEXOPCAPS_DOTPRODUCT3); + + caps->dwVertexProcessingCaps &= ( + D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_VERTEXFOG | + D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER); + + caps->dpcLineCaps.dwMiscCaps &= ( + D3DPMISCCAPS_MASKPLANES | D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP | + D3DPMISCCAPS_CONFORMANT | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | + D3DPMISCCAPS_CULLCCW); + + caps->dpcLineCaps.dwRasterCaps &= ( + D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ROP2 | D3DPRASTERCAPS_XOR | + D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST | D3DPRASTERCAPS_SUBPIXEL | + D3DPRASTERCAPS_SUBPIXELX | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | + D3DPRASTERCAPS_STIPPLE | D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT | D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT | + D3DPRASTERCAPS_ANTIALIASEDGES | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | + D3DPRASTERCAPS_ZBUFFERLESSHSR | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | + D3DPRASTERCAPS_WBUFFER | D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT | D3DPRASTERCAPS_WFOG | + D3DPRASTERCAPS_ZFOG); + + caps->dpcLineCaps.dwZCmpCaps &= ( + D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | + D3DPCMPCAPS_LESSEQUAL | D3DPCMPCAPS_GREATER | D3DPCMPCAPS_NOTEQUAL | + D3DPCMPCAPS_GREATEREQUAL | D3DPCMPCAPS_ALWAYS); + + caps->dpcLineCaps.dwSrcBlendCaps &= ( + D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR | + D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA | + D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR | + D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA | + D3DPBLENDCAPS_BOTHINVSRCALPHA); + + caps->dpcLineCaps.dwDestBlendCaps &= ( + D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR | + D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA | + D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR | + D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA | + D3DPBLENDCAPS_BOTHINVSRCALPHA); + + caps->dpcLineCaps.dwAlphaCmpCaps &= ( + D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | + D3DPCMPCAPS_LESSEQUAL | D3DPCMPCAPS_GREATER | D3DPCMPCAPS_NOTEQUAL | + D3DPCMPCAPS_GREATEREQUAL | D3DPCMPCAPS_ALWAYS); + + caps->dpcLineCaps.dwShadeCaps &= ( + D3DPSHADECAPS_COLORFLATMONO | D3DPSHADECAPS_COLORFLATRGB | D3DPSHADECAPS_COLORGOURAUDMONO | + D3DPSHADECAPS_COLORGOURAUDRGB | D3DPSHADECAPS_COLORPHONGMONO | D3DPSHADECAPS_COLORPHONGRGB | + D3DPSHADECAPS_SPECULARFLATMONO | D3DPSHADECAPS_SPECULARFLATRGB | D3DPSHADECAPS_SPECULARGOURAUDMONO | + D3DPSHADECAPS_SPECULARGOURAUDRGB | D3DPSHADECAPS_SPECULARPHONGMONO | D3DPSHADECAPS_SPECULARPHONGRGB | + D3DPSHADECAPS_ALPHAFLATBLEND | D3DPSHADECAPS_ALPHAFLATSTIPPLED | D3DPSHADECAPS_ALPHAGOURAUDBLEND | + D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED | D3DPSHADECAPS_ALPHAPHONGBLEND | D3DPSHADECAPS_ALPHAPHONGSTIPPLED | + D3DPSHADECAPS_FOGFLAT | D3DPSHADECAPS_FOGGOURAUD | D3DPSHADECAPS_FOGPHONG); + + caps->dpcLineCaps.dwTextureCaps &= ( + D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_ALPHA | + D3DPTEXTURECAPS_TRANSPARENCY | D3DPTEXTURECAPS_BORDER | D3DPTEXTURECAPS_SQUAREONLY | + D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE| D3DPTEXTURECAPS_NONPOW2CONDITIONAL | + D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_COLORKEYBLEND); + + caps->dpcLineCaps.dwTextureFilterCaps &= ( + D3DPTFILTERCAPS_NEAREST | D3DPTFILTERCAPS_LINEAR | D3DPTFILTERCAPS_MIPNEAREST | + D3DPTFILTERCAPS_MIPLINEAR | D3DPTFILTERCAPS_LINEARMIPNEAREST | D3DPTFILTERCAPS_LINEARMIPLINEAR | + D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR | D3DPTFILTERCAPS_MINFANISOTROPIC | + D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | + D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | + D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC); + + caps->dpcLineCaps.dwTextureAddressCaps &= ( + D3DPTADDRESSCAPS_WRAP | D3DPTADDRESSCAPS_MIRROR | D3DPTADDRESSCAPS_CLAMP | + D3DPTADDRESSCAPS_BORDER | D3DPTADDRESSCAPS_INDEPENDENTUV); + + if (!(caps->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_POW2)) + { + /* DirectX7 always has the np2 flag set, no matter what the card + * supports. Some old games (Rollcage) check the caps incorrectly. + * If wined3d supports nonpow2 textures it also has np2 conditional + * support. */ + caps->dpcLineCaps.dwTextureCaps |= D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL; + } + + /* Fill the missing members, and do some fixup */ + caps->dpcLineCaps.dwSize = sizeof(caps->dpcLineCaps); + caps->dpcLineCaps.dwTextureBlendCaps = D3DPTBLENDCAPS_ADD + | D3DPTBLENDCAPS_MODULATEMASK + | D3DPTBLENDCAPS_COPY + | D3DPTBLENDCAPS_DECAL + | D3DPTBLENDCAPS_DECALALPHA + | D3DPTBLENDCAPS_DECALMASK + | D3DPTBLENDCAPS_MODULATE + | D3DPTBLENDCAPS_MODULATEALPHA; + caps->dpcLineCaps.dwStippleWidth = 32; + caps->dpcLineCaps.dwStippleHeight = 32; + /* Use the same for the TriCaps */ + caps->dpcTriCaps = caps->dpcLineCaps; + + caps->dwDeviceRenderBitDepth = DDBD_16 | DDBD_24 | DDBD_32; + caps->dwDeviceZBufferBitDepth = DDBD_16 | DDBD_24; + caps->dwMinTextureWidth = 1; + caps->dwMinTextureHeight = 1; + + /* Convert DWORDs safely to WORDs */ + if (wined3d_caps.MaxTextureBlendStages > 0xffff) + caps->wMaxTextureBlendStages = 0xffff; + else + caps->wMaxTextureBlendStages = (WORD)wined3d_caps.MaxTextureBlendStages; + if (wined3d_caps.MaxSimultaneousTextures > 0xffff) + caps->wMaxSimultaneousTextures = 0xffff; + else + caps->wMaxSimultaneousTextures = (WORD)wined3d_caps.MaxSimultaneousTextures; + + if (wined3d_caps.MaxUserClipPlanes > 0xffff) + caps->wMaxUserClipPlanes = 0xffff; + else + caps->wMaxUserClipPlanes = (WORD)wined3d_caps.MaxUserClipPlanes; + if (wined3d_caps.MaxVertexBlendMatrices > 0xffff) + caps->wMaxVertexBlendMatrices = 0xffff; + else + caps->wMaxVertexBlendMatrices = (WORD)wined3d_caps.MaxVertexBlendMatrices; + + caps->deviceGUID = IID_IDirect3DTnLHalDevice; + + caps->dwReserved1 = 0; + caps->dwReserved2 = 0; + caps->dwReserved3 = 0; + caps->dwReserved4 = 0; + + return DD_OK; +} + /***************************************************************************** * IDirectDraw7::GetCaps * @@ -1201,9 +1469,18 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD } hr = IDirectDraw7_GetAvailableVidMem(iface, &ddscaps, &caps.dwVidMemTotal, &caps.dwVidMemFree); - wined3d_mutex_unlock(); - if(FAILED(hr)) { + if (FAILED(hr)) + { WARN("IDirectDraw7::GetAvailableVidMem failed\n"); + wined3d_mutex_unlock(); + return hr; + } + + hr = IDirectDraw7_GetFourCCCodes(iface, &caps.dwNumFourCCCodes, NULL); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("IDirectDraw7::GetFourCCCodes failed\n"); return hr; } @@ -1211,7 +1488,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps2 = winecaps.ddraw_caps.caps2; caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps; caps.dwFXCaps = winecaps.ddraw_caps.fx_caps; - caps.dwPalCaps = winecaps.ddraw_caps.pal_caps; + caps.dwPalCaps = DDPCAPS_8BIT | DDPCAPS_PRIMARYSURFACE; caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps; caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps; caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps; @@ -2449,420 +2726,6 @@ static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWO return DD_OK; } -/***************************************************************************** - * ddraw_create_surface - * - * A helper function for IDirectDraw7::CreateSurface. It creates a new surface - * with the passed parameters. - * - * Params: - * DDSD: Description of the surface to create - * Surf: Address to store the interface pointer at - * - * Returns: - * DD_OK on success - * - *****************************************************************************/ -static HRESULT ddraw_create_surface(struct ddraw *ddraw, DDSURFACEDESC2 *desc, - DWORD flags, struct ddraw_surface **surface, UINT version) -{ - HRESULT hr; - - TRACE("ddraw %p, desc %p, flags %#x, surface %p.\n", ddraw, desc, flags, surface); - - if (TRACE_ON(ddraw)) - { - TRACE("Requesting surface desc:\n"); - DDRAW_dump_surface_desc(desc); - } - - if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && (ddraw->flags & DDRAW_NO3D)) - { - WARN("The application requests a 3D capable surface, but the ddraw object was created without 3D support.\n"); - /* Do not fail surface creation, only fail 3D device creation. */ - } - - /* Create the Surface object */ - *surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**surface)); - if (!*surface) - { - ERR("Failed to allocate surface memory.\n"); - return DDERR_OUTOFVIDEOMEMORY; - } - - if (FAILED(hr = ddraw_surface_init(*surface, ddraw, desc, flags, version))) - { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, *surface); - return hr; - } - - /* Increase the surface counter, and attach the surface */ - list_add_head(&ddraw->surface_list, &(*surface)->surface_list_entry); - - TRACE("Created surface %p.\n", *surface); - - return DD_OK; -} - -static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource) -{ - return DD_OK; -} - -/***************************************************************************** - * IDirectDraw7::CreateSurface - * - * Creates a new IDirectDrawSurface object and returns its interface. - * - * The surface connections with wined3d are a bit tricky. Basically it works - * like this: - * - * |------------------------| |-----------------| - * | DDraw surface | | WineD3DSurface | - * | | | | - * | WineD3DSurface |-------------->| | - * | Child |<------------->| Parent | - * |------------------------| |-----------------| - * - * The DDraw surface is the parent of the wined3d surface, and it releases - * the WineD3DSurface when the ddraw surface is destroyed. - * - * However, for all surfaces which can be in a container in WineD3D, - * we have to do this. These surfaces are usually complex surfaces, - * so this concerns primary surfaces with a front and a back buffer, - * and textures. - * - * |------------------------| |-----------------| - * | DDraw surface | | Container | - * | | | | - * | Child |<------------->| Parent | - * | Texture |<------------->| | - * | WineD3DSurface |<----| | Levels |<--| - * | Complex connection | | | | | - * |------------------------| | |-----------------| | - * ^ | | - * | | | - * | | | - * | |------------------| | |-----------------| | - * | | IParent | |-------->| WineD3DSurface | | - * | | | | | | - * | | Child |<------------->| Parent | | - * | | | | Container |<--| - * | |------------------| |-----------------| | - * | | - * | |----------------------| | - * | | DDraw surface 2 | | - * | | | | - * |<->| Complex root Child | | - * | | Texture | | - * | | WineD3DSurface |<----| | - * | |----------------------| | | - * | | | - * | |---------------------| | |-----------------| | - * | | IParent | |----->| WineD3DSurface | | - * | | | | | | - * | | Child |<---------->| Parent | | - * | |---------------------| | Container |<--| - * | |-----------------| | - * | | - * | ---More surfaces can follow--- | - * - * The reason is that the IWineD3DSwapchain(render target container) - * and the IWineD3DTexure(Texture container) release the parents - * of their surface's children, but by releasing the complex root - * the surfaces which are complexly attached to it are destroyed - * too. See IDirectDrawSurface::Release for a more detailed - * explanation. - * - * Params: - * DDSD: Description of the surface to create - * Surf: Address to store the interface pointer at - * UnkOuter: Basically for aggregation support, but ddraw doesn't support - * aggregation, so it has to be NULL - * - * Returns: - * DD_OK on success - * CLASS_E_NOAGGREGATION if UnkOuter != NULL - * DDERR_* if an error occurs - * - *****************************************************************************/ -static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, - struct ddraw_surface **surface, IUnknown *UnkOuter, UINT version) -{ - struct ddraw_surface *object = NULL; - struct wined3d_display_mode mode; - HRESULT hr; - DDSURFACEDESC2 desc2; - const DWORD sysvidmem = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; - /* Some applications assume surfaces will always be mapped at the same - * address. Some of those also assume that this address is valid even when - * the surface isn't mapped, and that updates done this way will be - * visible on the screen. The game Nox is such an application, - * Commandos: Behind Enemy Lines is another. */ - const DWORD flags = WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_PIN_SYSMEM; - - TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); - - /* Some checks before we start */ - if (TRACE_ON(ddraw)) - { - TRACE(" (%p) Requesting surface desc :\n", ddraw); - DDRAW_dump_surface_desc(DDSD); - } - - if (UnkOuter != NULL) - { - FIXME("(%p) : outer != NULL?\n", ddraw); - return CLASS_E_NOAGGREGATION; /* unchecked */ - } - - if (!surface) - { - FIXME("(%p) You want to get back a surface? Don't give NULL ptrs!\n", ddraw); - return E_POINTER; /* unchecked */ - } - - if (!(DDSD->dwFlags & DDSD_CAPS)) - { - /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */ - DDSD->dwFlags |= DDSD_CAPS; - } - - if (DDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) - { - /* If the surface is of the 'alloconload' type, ignore the LPSURFACE field */ - DDSD->dwFlags &= ~DDSD_LPSURFACE; - } - - if ((DDSD->dwFlags & DDSD_LPSURFACE) && (DDSD->lpSurface == NULL)) - { - /* Frank Herbert's Dune specifies a null pointer for the surface, ignore the LPSURFACE field */ - WARN("(%p) Null surface pointer specified, ignore it!\n", ddraw); - DDSD->dwFlags &= ~DDSD_LPSURFACE; - } - - if((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) && - !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) - { - TRACE("(%p): Attempt to create a flipable primary surface without DDSCL_EXCLUSIVE set\n", - ddraw); - *surface = NULL; - return DDERR_NOEXCLUSIVEMODE; - } - - if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) - { - WARN("Application wanted to create back buffer primary surface\n"); - return DDERR_INVALIDCAPS; - } - - if((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem) - { - /* This is a special switch in ddrawex.dll, but not allowed in ddraw.dll */ - WARN("Application tries to put the surface in both system and video memory\n"); - *surface = NULL; - return DDERR_INVALIDCAPS; - } - - /* Check cube maps but only if the size includes them */ - if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) - { - if(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES && - !(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) - { - WARN("Cube map faces requested without cube map flag\n"); - return DDERR_INVALIDCAPS; - } - if(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP && - (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) == 0) - { - WARN("Cube map without faces requested\n"); - return DDERR_INVALIDPARAMS; - } - - /* Quick tests confirm those can be created, but we don't do that yet */ - if(DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP && - (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) != DDSCAPS2_CUBEMAP_ALLFACES) - { - FIXME("Partial cube maps not supported yet\n"); - } - } - - /* According to the msdn this flag is ignored by CreateSurface */ - if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) - DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; - - /* Modify some flags */ - copy_to_surfacedesc2(&desc2, DDSD); - desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */ - - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - return hr; - } - - /* No pixelformat given? Use the current screen format */ - if(!(desc2.dwFlags & DDSD_PIXELFORMAT)) - { - desc2.dwFlags |= DDSD_PIXELFORMAT; - desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); - - ddrawformat_from_wined3dformat(&desc2.u4.ddpfPixelFormat, mode.format_id); - } - - /* No Width or no Height? Use the original screen size - */ - if(!(desc2.dwFlags & DDSD_WIDTH) || - !(desc2.dwFlags & DDSD_HEIGHT) ) - { - /* Invalid for non-render targets */ - if(!(desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - { - WARN("Creating a non-Primary surface without Width or Height info, returning DDERR_INVALIDPARAMS\n"); - *surface = NULL; - return DDERR_INVALIDPARAMS; - } - - desc2.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; - desc2.dwWidth = mode.width; - desc2.dwHeight = mode.height; - } - - if (!desc2.dwWidth || !desc2.dwHeight) - return DDERR_INVALIDPARAMS; - - /* Mipmap count fixes */ - if(desc2.ddsCaps.dwCaps & DDSCAPS_MIPMAP) - { - if(desc2.ddsCaps.dwCaps & DDSCAPS_COMPLEX) - { - if(desc2.dwFlags & DDSD_MIPMAPCOUNT) - { - /* Mipmap count is given, should not be 0 */ - if( desc2.u2.dwMipMapCount == 0 ) - return DDERR_INVALIDPARAMS; - } - else - { - /* Undocumented feature: Create sublevels until - * either the width or the height is 1 - */ - DWORD min = desc2.dwWidth < desc2.dwHeight ? - desc2.dwWidth : desc2.dwHeight; - desc2.u2.dwMipMapCount = 0; - while( min ) - { - desc2.u2.dwMipMapCount += 1; - min >>= 1; - } - } - } - else - { - /* Not-complex mipmap -> Mipmapcount = 1 */ - desc2.u2.dwMipMapCount = 1; - } - - /* There's a mipmap count in the created surface in any case */ - desc2.dwFlags |= DDSD_MIPMAPCOUNT; - } - /* If no mipmap is given, the texture has only one level */ - - /* The first surface is a front buffer, the back buffer is created afterwards */ - if( (desc2.dwFlags & DDSD_CAPS) && (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ) - { - desc2.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; - } - - /* The root surface in a cube map is positive x */ - if(desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { - desc2.ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; - desc2.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; - } - - if ((desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) - { - struct wined3d_swapchain_desc swapchain_desc; - - wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); - swapchain_desc.backbuffer_width = mode.width; - swapchain_desc.backbuffer_height = mode.height; - swapchain_desc.backbuffer_format = mode.format_id; - - hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE); - if (FAILED(hr)) - { - ERR("Failed to reset device.\n"); - return hr; - } - } - - /* Create the first surface */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object, version))) - { - WARN("ddraw_create_surface failed, hr %#x.\n", hr); - return hr; - } - object->is_complex_root = TRUE; - - *surface = object; - - /* Create Additional surfaces if necessary - * This applies to Primary surfaces which have a back buffer count - * set, but not to mipmap textures. In case of Mipmap textures, - * wineD3D takes care of the creation of additional surfaces - */ - if(DDSD->dwFlags & DDSD_BACKBUFFERCOUNT) - { - struct ddraw_surface *last = object; - UINT i; - - desc2.ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; /* It's not a front buffer */ - desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; - desc2.u5.dwBackBufferCount = 0; - - for (i = 0; i < DDSD->u5.dwBackBufferCount; ++i) - { - struct ddraw_surface *object2 = NULL; - - if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object2, version))) - { - if (version == 7) - IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface); - else if (version == 4) - IDirectDrawSurface4_Release(&object->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&object->IDirectDrawSurface_iface); - - return hr; - } - - /* Add the new surface to the complex attachment array. */ - last->complex_array[0] = object2; - last = object2; - - /* Remove the (possible) back buffer cap from the new surface - * description, because only one surface in the flipping chain is a - * back buffer, one is a front buffer, the others are just primary - * surfaces. */ - desc2.ddsCaps.dwCaps &= ~DDSCAPS_BACKBUFFER; - } - } - - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - ddraw->primary = object; - - /* Create a WineD3DTexture if a texture was requested */ - if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - ddraw_surface_create_texture(object, flags); - - return hr; -} - static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *surface_desc, IDirectDrawSurface7 **surface, IUnknown *outer_unknown) { @@ -2902,7 +2765,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDCAPS; } - hr = CreateSurface(ddraw, surface_desc, &impl, outer_unknown, 7); + hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -2956,7 +2819,7 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(ddraw, surface_desc, &impl, outer_unknown, 4); + hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -3012,7 +2875,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(ddraw, &surface_desc2, &impl, outer_unknown, 2); + hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -3053,11 +2916,18 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return DDERR_INVALIDPARAMS; } - /* Remove front buffer flag, this causes failure in v7, and its added to normal - * primaries anyway. */ - surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; + if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER) + || (surface_desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER)) + == ((DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER))) + { + WARN("Application tried to create an explicit front or back buffer.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + DDSD_to_DDSD2(surface_desc, &surface_desc2); - hr = CreateSurface(ddraw, &surface_desc2, &impl, outer_unknown, 1); + hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -3682,7 +3552,6 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA { struct ddraw *ddraw = impl_from_IDirect3D7(iface); D3DDEVICEDESC7 device_desc7; - D3DDEVICEDESC device_desc1; HRESULT hr; size_t i; @@ -3693,8 +3562,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA wined3d_mutex_lock(); - hr = IDirect3DImpl_GetCaps(ddraw->wined3d, &device_desc1, &device_desc7); - if (hr != D3D_OK) + if (FAILED(hr = ddraw_get_d3dcaps(ddraw, &device_desc7))) { wined3d_mutex_unlock(); return hr; @@ -3760,12 +3628,12 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA wined3d_mutex_lock(); - hr = IDirect3DImpl_GetCaps(ddraw->wined3d, &device_desc1, &device_desc7); - if (hr != D3D_OK) + if (FAILED(hr = ddraw_get_d3dcaps(ddraw, &device_desc7))) { wined3d_mutex_unlock(); return hr; } + ddraw_d3dcaps1_from_7(&device_desc1, &device_desc7); /* Do I have to enumerate the reference id? Note from old d3d7: * "It seems that enumerating the reference IID on Direct3D 1 games @@ -4124,10 +3992,11 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd } /* Get the caps */ - hr = IDirect3DImpl_GetCaps(ddraw->wined3d, &desc1, &desc7); - if (hr != D3D_OK) return hr; + if (FAILED(hr = ddraw_get_d3dcaps(ddraw, &desc7))) + return hr; /* Now return our own GUID */ + ddraw_d3dcaps1_from_7(&desc1, &desc7); fdr->guid = IID_D3DDEVICE_WineD3D; fdr->ddHwDesc = desc1; fdr->ddSwDesc = desc1; @@ -4187,9 +4056,10 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - hr = d3d_device_create(ddraw, target, 7, &object, NULL); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL))) + { *device = &object->IDirect3DDevice7_iface; + } else { WARN("Failed to create device, hr %#x.\n", hr); @@ -4215,9 +4085,10 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); - hr = d3d_device_create(ddraw, surface_impl, 3, &device_impl, NULL); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) + { *device = &device_impl->IDirect3DDevice3_iface; + } else { WARN("Failed to create device, hr %#x.\n", hr); @@ -4240,9 +4111,10 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - hr = d3d_device_create(ddraw, surface_impl, 2, &device_impl, NULL); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) + { *device = &device_impl->IDirect3DDevice2_iface; + } else { WARN("Failed to create device, hr %#x.\n", hr); @@ -4502,301 +4374,6 @@ static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface) return d3d7_EvictManagedTextures(&ddraw->IDirect3D7_iface); } -/***************************************************************************** - * IDirect3DImpl_GetCaps - * - * This function retrieves the device caps from wined3d - * and converts it into a D3D7 and D3D - D3D3 structure - * This is a helper function called from various places in ddraw - * - * Params: - * wined3d: The interface to get the caps from - * desc1: Old D3D <3 structure to fill (needed) - * desc7: D3D7 device desc structure to fill (needed) - * - * Returns - * D3D_OK on success, or the return value of IWineD3D::GetCaps - * - *****************************************************************************/ -HRESULT IDirect3DImpl_GetCaps(const struct wined3d *wined3d, D3DDEVICEDESC *desc1, D3DDEVICEDESC7 *desc7) -{ - WINED3DCAPS wined3d_caps; - HRESULT hr; - - TRACE("wined3d %p, desc1 %p, desc7 %p.\n", wined3d, desc1, desc7); - - memset(&wined3d_caps, 0, sizeof(wined3d_caps)); - - wined3d_mutex_lock(); - hr = wined3d_get_device_caps(wined3d, 0, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); - wined3d_mutex_unlock(); - if (FAILED(hr)) - { - WARN("Failed to get device caps, hr %#x.\n", hr); - return hr; - } - - /* Copy the results into the d3d7 and d3d3 structures */ - desc7->dwDevCaps = wined3d_caps.DevCaps; - desc7->dpcLineCaps.dwMiscCaps = wined3d_caps.PrimitiveMiscCaps; - desc7->dpcLineCaps.dwRasterCaps = wined3d_caps.RasterCaps; - desc7->dpcLineCaps.dwZCmpCaps = wined3d_caps.ZCmpCaps; - desc7->dpcLineCaps.dwSrcBlendCaps = wined3d_caps.SrcBlendCaps; - desc7->dpcLineCaps.dwDestBlendCaps = wined3d_caps.DestBlendCaps; - desc7->dpcLineCaps.dwAlphaCmpCaps = wined3d_caps.AlphaCmpCaps; - desc7->dpcLineCaps.dwShadeCaps = wined3d_caps.ShadeCaps; - desc7->dpcLineCaps.dwTextureCaps = wined3d_caps.TextureCaps; - desc7->dpcLineCaps.dwTextureFilterCaps = wined3d_caps.TextureFilterCaps; - desc7->dpcLineCaps.dwTextureAddressCaps = wined3d_caps.TextureAddressCaps; - - desc7->dwMaxTextureWidth = wined3d_caps.MaxTextureWidth; - desc7->dwMaxTextureHeight = wined3d_caps.MaxTextureHeight; - - desc7->dwMaxTextureRepeat = wined3d_caps.MaxTextureRepeat; - desc7->dwMaxTextureAspectRatio = wined3d_caps.MaxTextureAspectRatio; - desc7->dwMaxAnisotropy = wined3d_caps.MaxAnisotropy; - desc7->dvMaxVertexW = wined3d_caps.MaxVertexW; - - desc7->dvGuardBandLeft = wined3d_caps.GuardBandLeft; - desc7->dvGuardBandTop = wined3d_caps.GuardBandTop; - desc7->dvGuardBandRight = wined3d_caps.GuardBandRight; - desc7->dvGuardBandBottom = wined3d_caps.GuardBandBottom; - - desc7->dvExtentsAdjust = wined3d_caps.ExtentsAdjust; - desc7->dwStencilCaps = wined3d_caps.StencilCaps; - - desc7->dwFVFCaps = wined3d_caps.FVFCaps; - desc7->dwTextureOpCaps = wined3d_caps.TextureOpCaps; - - desc7->dwVertexProcessingCaps = wined3d_caps.VertexProcessingCaps; - desc7->dwMaxActiveLights = wined3d_caps.MaxActiveLights; - - /* Remove all non-d3d7 caps */ - desc7->dwDevCaps &= ( - D3DDEVCAPS_FLOATTLVERTEX | D3DDEVCAPS_SORTINCREASINGZ | D3DDEVCAPS_SORTDECREASINGZ | - D3DDEVCAPS_SORTEXACT | D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | - D3DDEVCAPS_TLVERTEXSYSTEMMEMORY | D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY | - D3DDEVCAPS_TEXTUREVIDEOMEMORY | D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | - D3DDEVCAPS_TEXTURENONLOCALVIDMEM | D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES | - D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_CANBLTSYSTONONLOCAL | - D3DDEVCAPS_HWRASTERIZATION); - - desc7->dwStencilCaps &= ( - D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE | - D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT | - D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR); - - /* FVF caps ?*/ - - desc7->dwTextureOpCaps &= ( - D3DTEXOPCAPS_DISABLE | D3DTEXOPCAPS_SELECTARG1 | D3DTEXOPCAPS_SELECTARG2 | - D3DTEXOPCAPS_MODULATE | D3DTEXOPCAPS_MODULATE2X | D3DTEXOPCAPS_MODULATE4X | - D3DTEXOPCAPS_ADD | D3DTEXOPCAPS_ADDSIGNED | D3DTEXOPCAPS_ADDSIGNED2X | - D3DTEXOPCAPS_SUBTRACT | D3DTEXOPCAPS_ADDSMOOTH | D3DTEXOPCAPS_BLENDTEXTUREALPHA | - D3DTEXOPCAPS_BLENDFACTORALPHA | D3DTEXOPCAPS_BLENDTEXTUREALPHAPM | D3DTEXOPCAPS_BLENDCURRENTALPHA | - D3DTEXOPCAPS_PREMODULATE | D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR | D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA | - D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA | D3DTEXOPCAPS_BUMPENVMAP | - D3DTEXOPCAPS_BUMPENVMAPLUMINANCE | D3DTEXOPCAPS_DOTPRODUCT3); - - desc7->dwVertexProcessingCaps &= ( - D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_VERTEXFOG | - D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER); - - desc7->dpcLineCaps.dwMiscCaps &= ( - D3DPMISCCAPS_MASKPLANES | D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP | - D3DPMISCCAPS_CONFORMANT | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | - D3DPMISCCAPS_CULLCCW); - - desc7->dpcLineCaps.dwRasterCaps &= ( - D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ROP2 | D3DPRASTERCAPS_XOR | - D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST | D3DPRASTERCAPS_SUBPIXEL | - D3DPRASTERCAPS_SUBPIXELX | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | - D3DPRASTERCAPS_STIPPLE | D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT | D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT | - D3DPRASTERCAPS_ANTIALIASEDGES | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | - D3DPRASTERCAPS_ZBUFFERLESSHSR | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | - D3DPRASTERCAPS_WBUFFER | D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT | D3DPRASTERCAPS_WFOG | - D3DPRASTERCAPS_ZFOG); - - desc7->dpcLineCaps.dwZCmpCaps &= ( - D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | - D3DPCMPCAPS_LESSEQUAL | D3DPCMPCAPS_GREATER | D3DPCMPCAPS_NOTEQUAL | - D3DPCMPCAPS_GREATEREQUAL | D3DPCMPCAPS_ALWAYS); - - desc7->dpcLineCaps.dwSrcBlendCaps &= ( - D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR | - D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA | - D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR | - D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA | - D3DPBLENDCAPS_BOTHINVSRCALPHA); - - desc7->dpcLineCaps.dwDestBlendCaps &= ( - D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR | - D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA | - D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR | - D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA | - D3DPBLENDCAPS_BOTHINVSRCALPHA); - - desc7->dpcLineCaps.dwAlphaCmpCaps &= ( - D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | - D3DPCMPCAPS_LESSEQUAL | D3DPCMPCAPS_GREATER | D3DPCMPCAPS_NOTEQUAL | - D3DPCMPCAPS_GREATEREQUAL | D3DPCMPCAPS_ALWAYS); - - desc7->dpcLineCaps.dwShadeCaps &= ( - D3DPSHADECAPS_COLORFLATMONO | D3DPSHADECAPS_COLORFLATRGB | D3DPSHADECAPS_COLORGOURAUDMONO | - D3DPSHADECAPS_COLORGOURAUDRGB | D3DPSHADECAPS_COLORPHONGMONO | D3DPSHADECAPS_COLORPHONGRGB | - D3DPSHADECAPS_SPECULARFLATMONO | D3DPSHADECAPS_SPECULARFLATRGB | D3DPSHADECAPS_SPECULARGOURAUDMONO | - D3DPSHADECAPS_SPECULARGOURAUDRGB | D3DPSHADECAPS_SPECULARPHONGMONO | D3DPSHADECAPS_SPECULARPHONGRGB | - D3DPSHADECAPS_ALPHAFLATBLEND | D3DPSHADECAPS_ALPHAFLATSTIPPLED | D3DPSHADECAPS_ALPHAGOURAUDBLEND | - D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED | D3DPSHADECAPS_ALPHAPHONGBLEND | D3DPSHADECAPS_ALPHAPHONGSTIPPLED | - D3DPSHADECAPS_FOGFLAT | D3DPSHADECAPS_FOGGOURAUD | D3DPSHADECAPS_FOGPHONG); - - desc7->dpcLineCaps.dwTextureCaps &= ( - D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_ALPHA | - D3DPTEXTURECAPS_TRANSPARENCY | D3DPTEXTURECAPS_BORDER | D3DPTEXTURECAPS_SQUAREONLY | - D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE| D3DPTEXTURECAPS_NONPOW2CONDITIONAL | - D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_COLORKEYBLEND); - - desc7->dpcLineCaps.dwTextureFilterCaps &= ( - D3DPTFILTERCAPS_NEAREST | D3DPTFILTERCAPS_LINEAR | D3DPTFILTERCAPS_MIPNEAREST | - D3DPTFILTERCAPS_MIPLINEAR | D3DPTFILTERCAPS_LINEARMIPNEAREST | D3DPTFILTERCAPS_LINEARMIPLINEAR | - D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR | D3DPTFILTERCAPS_MINFANISOTROPIC | - D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | - D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | - D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC); - - desc7->dpcLineCaps.dwTextureAddressCaps &= ( - D3DPTADDRESSCAPS_WRAP | D3DPTADDRESSCAPS_MIRROR | D3DPTADDRESSCAPS_CLAMP | - D3DPTADDRESSCAPS_BORDER | D3DPTADDRESSCAPS_INDEPENDENTUV); - - if (!(desc7->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_POW2)) - { - /* DirectX7 always has the np2 flag set, no matter what the card - * supports. Some old games (Rollcage) check the caps incorrectly. - * If wined3d supports nonpow2 textures it also has np2 conditional - * support. */ - desc7->dpcLineCaps.dwTextureCaps |= D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL; - } - - /* Fill the missing members, and do some fixup */ - desc7->dpcLineCaps.dwSize = sizeof(desc7->dpcLineCaps); - desc7->dpcLineCaps.dwTextureBlendCaps = D3DPTBLENDCAPS_ADD | D3DPTBLENDCAPS_MODULATEMASK | - D3DPTBLENDCAPS_COPY | D3DPTBLENDCAPS_DECAL | - D3DPTBLENDCAPS_DECALALPHA | D3DPTBLENDCAPS_DECALMASK | - D3DPTBLENDCAPS_MODULATE | D3DPTBLENDCAPS_MODULATEALPHA; - desc7->dpcLineCaps.dwStippleWidth = 32; - desc7->dpcLineCaps.dwStippleHeight = 32; - /* Use the same for the TriCaps */ - desc7->dpcTriCaps = desc7->dpcLineCaps; - - desc7->dwDeviceRenderBitDepth = DDBD_16 | DDBD_24 | DDBD_32; - desc7->dwDeviceZBufferBitDepth = DDBD_16 | DDBD_24; - desc7->dwMinTextureWidth = 1; - desc7->dwMinTextureHeight = 1; - - /* Convert DWORDs safely to WORDs */ - if (wined3d_caps.MaxTextureBlendStages > 0xffff) desc7->wMaxTextureBlendStages = 0xffff; - else desc7->wMaxTextureBlendStages = (WORD)wined3d_caps.MaxTextureBlendStages; - if (wined3d_caps.MaxSimultaneousTextures > 0xffff) desc7->wMaxSimultaneousTextures = 0xffff; - else desc7->wMaxSimultaneousTextures = (WORD)wined3d_caps.MaxSimultaneousTextures; - - if (wined3d_caps.MaxUserClipPlanes > 0xffff) desc7->wMaxUserClipPlanes = 0xffff; - else desc7->wMaxUserClipPlanes = (WORD)wined3d_caps.MaxUserClipPlanes; - if (wined3d_caps.MaxVertexBlendMatrices > 0xffff) desc7->wMaxVertexBlendMatrices = 0xffff; - else desc7->wMaxVertexBlendMatrices = (WORD)wined3d_caps.MaxVertexBlendMatrices; - - desc7->deviceGUID = IID_IDirect3DTnLHalDevice; - - desc7->dwReserved1 = 0; - desc7->dwReserved2 = 0; - desc7->dwReserved3 = 0; - desc7->dwReserved4 = 0; - - /* Fill the old structure */ - memset(desc1, 0, sizeof(*desc1)); - desc1->dwSize = sizeof(D3DDEVICEDESC); - desc1->dwFlags = D3DDD_COLORMODEL - | D3DDD_DEVCAPS - | D3DDD_TRANSFORMCAPS - | D3DDD_BCLIPPING - | D3DDD_LIGHTINGCAPS - | D3DDD_LINECAPS - | D3DDD_TRICAPS - | D3DDD_DEVICERENDERBITDEPTH - | D3DDD_DEVICEZBUFFERBITDEPTH - | D3DDD_MAXBUFFERSIZE - | D3DDD_MAXVERTEXCOUNT; - - desc1->dcmColorModel = D3DCOLOR_RGB; - desc1->dwDevCaps = desc7->dwDevCaps; - desc1->dtcTransformCaps.dwSize = sizeof(D3DTRANSFORMCAPS); - desc1->dtcTransformCaps.dwCaps = D3DTRANSFORMCAPS_CLIP; - desc1->bClipping = TRUE; - desc1->dlcLightingCaps.dwSize = sizeof(D3DLIGHTINGCAPS); - desc1->dlcLightingCaps.dwCaps = D3DLIGHTCAPS_DIRECTIONAL - | D3DLIGHTCAPS_PARALLELPOINT - | D3DLIGHTCAPS_POINT - | D3DLIGHTCAPS_SPOT; - - desc1->dlcLightingCaps.dwLightingModel = D3DLIGHTINGMODEL_RGB; - desc1->dlcLightingCaps.dwNumLights = desc7->dwMaxActiveLights; - - desc1->dpcLineCaps.dwSize = sizeof(D3DPRIMCAPS); - desc1->dpcLineCaps.dwMiscCaps = desc7->dpcLineCaps.dwMiscCaps; - desc1->dpcLineCaps.dwRasterCaps = desc7->dpcLineCaps.dwRasterCaps; - desc1->dpcLineCaps.dwZCmpCaps = desc7->dpcLineCaps.dwZCmpCaps; - desc1->dpcLineCaps.dwSrcBlendCaps = desc7->dpcLineCaps.dwSrcBlendCaps; - desc1->dpcLineCaps.dwDestBlendCaps = desc7->dpcLineCaps.dwDestBlendCaps; - desc1->dpcLineCaps.dwShadeCaps = desc7->dpcLineCaps.dwShadeCaps; - desc1->dpcLineCaps.dwTextureCaps = desc7->dpcLineCaps.dwTextureCaps; - desc1->dpcLineCaps.dwTextureFilterCaps = desc7->dpcLineCaps.dwTextureFilterCaps; - desc1->dpcLineCaps.dwTextureBlendCaps = desc7->dpcLineCaps.dwTextureBlendCaps; - desc1->dpcLineCaps.dwTextureAddressCaps = desc7->dpcLineCaps.dwTextureAddressCaps; - desc1->dpcLineCaps.dwStippleWidth = desc7->dpcLineCaps.dwStippleWidth; - desc1->dpcLineCaps.dwAlphaCmpCaps = desc7->dpcLineCaps.dwAlphaCmpCaps; - - desc1->dpcTriCaps.dwSize = sizeof(D3DPRIMCAPS); - desc1->dpcTriCaps.dwMiscCaps = desc7->dpcTriCaps.dwMiscCaps; - desc1->dpcTriCaps.dwRasterCaps = desc7->dpcTriCaps.dwRasterCaps; - desc1->dpcTriCaps.dwZCmpCaps = desc7->dpcTriCaps.dwZCmpCaps; - desc1->dpcTriCaps.dwSrcBlendCaps = desc7->dpcTriCaps.dwSrcBlendCaps; - desc1->dpcTriCaps.dwDestBlendCaps = desc7->dpcTriCaps.dwDestBlendCaps; - desc1->dpcTriCaps.dwShadeCaps = desc7->dpcTriCaps.dwShadeCaps; - desc1->dpcTriCaps.dwTextureCaps = desc7->dpcTriCaps.dwTextureCaps; - desc1->dpcTriCaps.dwTextureFilterCaps = desc7->dpcTriCaps.dwTextureFilterCaps; - desc1->dpcTriCaps.dwTextureBlendCaps = desc7->dpcTriCaps.dwTextureBlendCaps; - desc1->dpcTriCaps.dwTextureAddressCaps = desc7->dpcTriCaps.dwTextureAddressCaps; - desc1->dpcTriCaps.dwStippleWidth = desc7->dpcTriCaps.dwStippleWidth; - desc1->dpcTriCaps.dwAlphaCmpCaps = desc7->dpcTriCaps.dwAlphaCmpCaps; - - desc1->dwDeviceRenderBitDepth = desc7->dwDeviceRenderBitDepth; - desc1->dwDeviceZBufferBitDepth = desc7->dwDeviceZBufferBitDepth; - desc1->dwMaxBufferSize = 0; - desc1->dwMaxVertexCount = 65536; - desc1->dwMinTextureWidth = desc7->dwMinTextureWidth; - desc1->dwMinTextureHeight = desc7->dwMinTextureHeight; - desc1->dwMaxTextureWidth = desc7->dwMaxTextureWidth; - desc1->dwMaxTextureHeight = desc7->dwMaxTextureHeight; - desc1->dwMinStippleWidth = 1; - desc1->dwMinStippleHeight = 1; - desc1->dwMaxStippleWidth = 32; - desc1->dwMaxStippleHeight = 32; - desc1->dwMaxTextureRepeat = desc7->dwMaxTextureRepeat; - desc1->dwMaxTextureAspectRatio = desc7->dwMaxTextureAspectRatio; - desc1->dwMaxAnisotropy = desc7->dwMaxAnisotropy; - desc1->dvGuardBandLeft = desc7->dvGuardBandLeft; - desc1->dvGuardBandRight = desc7->dvGuardBandRight; - desc1->dvGuardBandTop = desc7->dvGuardBandTop; - desc1->dvGuardBandBottom = desc7->dvGuardBandBottom; - desc1->dvExtentsAdjust = desc7->dvExtentsAdjust; - desc1->dwStencilCaps = desc7->dwStencilCaps; - desc1->dwFVFCaps = desc7->dwFVFCaps; - desc1->dwTextureOpCaps = desc7->dwTextureOpCaps; - desc1->wMaxTextureBlendStages = desc7->wMaxTextureBlendStages; - desc1->wMaxSimultaneousTextures = desc7->wMaxSimultaneousTextures; - - return DD_OK; -} - /***************************************************************************** * IDirectDraw7 VTable *****************************************************************************/ @@ -5113,36 +4690,56 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic ERR("Failed to resize window.\n"); } -static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, - void *container_parent, const struct wined3d_resource_desc *wined3d_desc, UINT sub_resource_idx, - DWORD flags, struct wined3d_surface **surface) +static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, + void *container_parent, struct wined3d_surface *surface, + void **parent, const struct wined3d_parent_ops **parent_ops) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - struct ddraw_surface *tex_root = container_parent; - DDSURFACEDESC2 desc = tex_root->surface_desc; struct ddraw_surface *ddraw_surface; HRESULT hr; - TRACE("device_parent %p, container_parent %p, wined3d_desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", - device_parent, container_parent, wined3d_desc, sub_resource_idx, flags, surface); + TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", + device_parent, container_parent, surface, parent, parent_ops); - /* The ddraw root surface is created before the wined3d texture. */ - if (!sub_resource_idx) + /* We have a swapchain texture. */ + if (container_parent == ddraw) { - ddraw_surface = tex_root; - goto done; + *parent = NULL; + *parent_ops = &ddraw_null_wined3d_parent_ops; + + return DD_OK; } - desc.dwWidth = wined3d_desc->width; - desc.dwHeight = wined3d_desc->height; + if (!(ddraw_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ddraw_surface)))) + { + ERR("Failed to allocate surface memory.\n"); + return DDERR_OUTOFVIDEOMEMORY; + } - /* FIXME: Validate that format, usage, pool, etc. really make sense. */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc, flags, &ddraw_surface, tex_root->version))) + if (FAILED(hr = ddraw_surface_init(ddraw_surface, ddraw, container_parent, surface, parent_ops))) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, ddraw_surface); return hr; + } -done: - *surface = ddraw_surface->wined3d_surface; - wined3d_surface_incref(*surface); + *parent = ddraw_surface; + list_add_head(&ddraw->surface_list, &ddraw_surface->surface_list_entry); + + TRACE("Created ddraw surface %p.\n", ddraw_surface); + + return DD_OK; +} + +static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, + void *container_parent, struct wined3d_volume *volume, + void **parent, const struct wined3d_parent_ops **parent_ops) +{ + TRACE("device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.\n", + device_parent, container_parent, volume, parent, parent_ops); + + *parent = NULL; + *parent_ops = &ddraw_null_wined3d_parent_ops; return DD_OK; } @@ -5162,6 +4759,8 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); + struct wined3d_resource_desc texture_desc; + struct wined3d_texture *texture; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n", @@ -5173,29 +4772,23 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic return E_FAIL; } - if (SUCCEEDED(hr = wined3d_surface_create(ddraw->wined3d_device, desc->width, desc->height, desc->format, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality, WINED3D_SURFACE_MAPPABLE, - ddraw, &ddraw_frontbuffer_parent_ops, surface))) - ddraw->wined3d_frontbuffer = *surface; + texture_desc = *desc; + texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; + if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, &texture_desc, 1, + WINED3D_SURFACE_MAPPABLE, ddraw, &ddraw_frontbuffer_parent_ops, &texture))) + { + WARN("Failed to create texture, hr %#x.\n", hr); + return hr; + } + + *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); + ddraw->wined3d_frontbuffer = *surface; + wined3d_surface_incref(*surface); + wined3d_texture_decref(texture); return hr; } -static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *device_parent, - void *container_parent, UINT width, UINT height, UINT depth, UINT level, - enum wined3d_format_id format, enum wined3d_pool pool, DWORD usage, - struct wined3d_volume **volume) -{ - TRACE("device_parent %p, container_parent %p, width %u, height %u, depth %u, " - "format %#x, pool %#x, usage %#x, volume %p.\n", - device_parent, container_parent, width, height, depth, - format, pool, usage, volume); - - ERR("Not implemented!\n"); - - return E_NOTIMPL; -} - static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) { @@ -5221,9 +4814,9 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_surface_created, + device_parent_volume_created, device_parent_create_swapchain_surface, - device_parent_create_texture_surface, - device_parent_create_volume, device_parent_create_swapchain, }; diff --git a/reactos/dll/directx/wine/ddraw/ddraw_classes.idl b/reactos/dll/directx/wine/ddraw/ddraw_classes.idl index d8247003441..6e33253ad4e 100644 --- a/reactos/dll/directx/wine/ddraw/ddraw_classes.idl +++ b/reactos/dll/directx/wine/ddraw/ddraw_classes.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep register + [ helpstring("DirectDraw Object"), threading(both), diff --git a/reactos/dll/directx/wine/ddraw/ddraw_private.h b/reactos/dll/directx/wine/ddraw/ddraw_private.h index 6fb960894ea..a312ed7dad2 100644 --- a/reactos/dll/directx/wine/ddraw/ddraw_private.h +++ b/reactos/dll/directx/wine/ddraw/ddraw_private.h @@ -26,7 +26,7 @@ #include #define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#define COM_NO_WINDOW_H #define COBJMACROS #define NONAMELESSSTRUCT @@ -61,6 +61,7 @@ struct FvfToDecl #define DDRAW_RESTORE_MODE 0x00000004 #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 +#define DDRAW_SCL_RECURSIVE 0x00000020 #define DDRAW_STRIDE_ALIGNMENT 8 @@ -118,7 +119,9 @@ struct ddraw #define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; +void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7) DECLSPEC_HIDDEN; void ddraw_destroy_swapchain(struct ddraw *ddraw) DECLSPEC_HIDDEN; +HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) DECLSPEC_HIDDEN; static inline void ddraw_set_swapchain_window(struct ddraw *ddraw, HWND window) { @@ -182,6 +185,7 @@ struct ddraw_surface /* Clipper objects */ struct ddraw_clipper *clipper; + struct ddraw_palette *palette; /* For the ddraw surface list */ struct list surface_list_entry; @@ -189,9 +193,18 @@ struct ddraw_surface DWORD Handle; }; -HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) DECLSPEC_HIDDEN; -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, - DDSURFACEDESC2 *desc, DWORD flags, UINT version) DECLSPEC_HIDDEN; +struct ddraw_texture +{ + unsigned int version; + DDSURFACEDESC2 surface_desc; + + struct ddraw_surface *root; +}; + +HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, + struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) DECLSPEC_HIDDEN; +HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; static inline struct ddraw_surface *impl_from_IDirect3DTexture(IDirect3DTexture *iface) @@ -281,7 +294,7 @@ struct d3d_device IUnknown *outer_unknown; struct wined3d_device *wined3d_device; struct ddraw *ddraw; - struct ddraw_surface *target; + IUnknown *rt_iface; struct wined3d_buffer *index_buffer; UINT index_buffer_size; @@ -310,7 +323,7 @@ struct d3d_device DWORD vertex_type; DWORD render_flags; DWORD nb_vertices; - LPBYTE sysmem_vertex_buffer; + BYTE *sysmem_vertex_buffer; DWORD vertex_size; DWORD buffer_size; @@ -319,17 +332,13 @@ struct d3d_device D3DMATRIXHANDLE world, proj, view; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, +HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; /* The IID */ extern const GUID IID_D3DDEVICE_WineD3D DECLSPEC_HIDDEN; -/* Helper functions */ -HRESULT IDirect3DImpl_GetCaps(const struct wined3d *wined3d, - D3DDEVICEDESC *Desc123, D3DDEVICEDESC7 *Desc7) DECLSPEC_HIDDEN; - static inline struct d3d_device *impl_from_IDirect3DDevice(IDirect3DDevice *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice_iface); @@ -377,9 +386,9 @@ struct ddraw_palette LONG ref; struct wined3d_palette *wineD3DPalette; - - /* IDirectDrawPalette fields */ - IUnknown *ifaceToRelease; + struct ddraw *ddraw; + IUnknown *ifaceToRelease; + DWORD flags; }; static inline struct ddraw_palette *impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) @@ -607,18 +616,6 @@ struct member_info #define DD_STRUCT_COPY_BYSIZE(to,from) DD_STRUCT_COPY_BYSIZE_(to,from,(from)->dwSize) -#define SIZEOF_END_PADDING(type, last_field) \ - (sizeof(type) - offsetof(type, last_field) - sizeof(((type *)0)->last_field)) - -static inline void copy_to_surfacedesc2(DDSURFACEDESC2 *to, DDSURFACEDESC2 *from) -{ - DWORD from_size = from->dwSize; - if (from_size == sizeof(DDSURFACEDESC)) - from_size -= SIZEOF_END_PADDING(DDSURFACEDESC, ddsCaps); - to->dwSize = sizeof(DDSURFACEDESC2); /* for struct copy */ - DD_STRUCT_COPY_BYSIZE_(to, from, from_size); -} - HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; -#endif /* __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H */ +#endif diff --git a/reactos/dll/directx/wine/ddraw/device.c b/reactos/dll/directx/wine/ddraw/device.c index baa0b774ada..cfad802e46d 100644 --- a/reactos/dll/directx/wine/ddraw/device.c +++ b/reactos/dll/directx/wine/ddraw/device.c @@ -220,6 +220,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) { struct d3d_device *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); + IUnknown *rt_iface; TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -241,10 +242,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) if (This->vertex_buffer) wined3d_buffer_decref(This->vertex_buffer); - /* Set the device up to render to the front buffer since the back - * buffer will vanish soon. */ - wined3d_device_set_render_target(This->wined3d_device, 0, - This->ddraw->wined3d_frontbuffer, TRUE); + wined3d_device_set_render_target(This->wined3d_device, 0, NULL, FALSE); /* Release the wined3d device. This won't destroy it. */ if (!wined3d_device_decref(This->wined3d_device)) @@ -307,11 +305,12 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) IDirect3DDevice3_DeleteViewport(&This->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface); } - TRACE("Releasing target %p.\n", This->target); - /* Release the render target. */ + TRACE("Releasing render target %p.\n", This->rt_iface); + rt_iface = This->rt_iface; + This->rt_iface = NULL; if (This->version != 1) - IDirectDrawSurface7_Release(&This->target->IDirectDrawSurface7_iface); - TRACE("Target release done\n"); + IUnknown_Release(rt_iface); + TRACE("Render target release done.\n"); This->ddraw->d3ddevice = NULL; @@ -389,37 +388,20 @@ static HRESULT WINAPI d3d_device1_Initialize(IDirect3DDevice *iface, return D3D_OK; } -/***************************************************************************** - * IDirect3DDevice7::GetCaps - * - * Retrieves the device's capabilities - * - * This implementation is used for Version 7 only, the older versions have - * their own implementation. - * - * Parameters: - * Desc: Pointer to a D3DDEVICEDESC7 structure to fill - * - * Returns: - * D3D_OK on success - * D3DERR_* if a problem occurs. See WineD3D - * - *****************************************************************************/ -static HRESULT d3d_device7_GetCaps(IDirect3DDevice7 *iface, D3DDEVICEDESC7 *Desc) +static HRESULT d3d_device7_GetCaps(IDirect3DDevice7 *iface, D3DDEVICEDESC7 *device_desc) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - D3DDEVICEDESC OldDesc; - TRACE("iface %p, device_desc %p.\n", iface, Desc); + TRACE("iface %p, device_desc %p.\n", iface, device_desc); - if (!Desc) + if (!device_desc) { - WARN("Desc is NULL, returning DDERR_INVALIDPARAMS.\n"); + WARN("device_desc is NULL, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } /* Call the same function used by IDirect3D, this saves code */ - return IDirect3DImpl_GetCaps(device->ddraw->wined3d, &OldDesc, Desc); + return ddraw_get_d3dcaps(device->ddraw, device_desc); } static HRESULT WINAPI d3d_device7_GetCaps_FPUSetup(IDirect3DDevice7 *iface, D3DDEVICEDESC7 *desc) @@ -481,8 +463,8 @@ static HRESULT WINAPI d3d_device3_GetCaps(IDirect3DDevice3 *iface, D3DDEVICEDESC *HWDesc, D3DDEVICEDESC *HelDesc) { struct d3d_device *device = impl_from_IDirect3DDevice3(iface); - D3DDEVICEDESC oldDesc; - D3DDEVICEDESC7 newDesc; + D3DDEVICEDESC7 desc7; + D3DDEVICEDESC desc1; HRESULT hr; TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, HWDesc, HelDesc); @@ -508,12 +490,12 @@ static HRESULT WINAPI d3d_device3_GetCaps(IDirect3DDevice3 *iface, return DDERR_INVALIDPARAMS; } - hr = IDirect3DImpl_GetCaps(device->ddraw->wined3d, &oldDesc, &newDesc); - if (hr != D3D_OK) + if (FAILED(hr = ddraw_get_d3dcaps(device->ddraw, &desc7))) return hr; - DD_STRUCT_COPY_BYSIZE(HWDesc, &oldDesc); - DD_STRUCT_COPY_BYSIZE(HelDesc, &oldDesc); + ddraw_d3dcaps1_from_7(&desc1, &desc7); + DD_STRUCT_COPY_BYSIZE(HWDesc, &desc1); + DD_STRUCT_COPY_BYSIZE(HelDesc, &desc1); return D3D_OK; } @@ -1069,7 +1051,9 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_P8_UINT, /* FOURCC codes */ WINED3DFMT_DXT1, + WINED3DFMT_DXT2, WINED3DFMT_DXT3, + WINED3DFMT_DXT4, WINED3DFMT_DXT5, }; @@ -1808,62 +1792,88 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID (IDirect3DViewport3 **)viewport); } -/***************************************************************************** - * IDirect3DDevice7::SetRenderTarget - * - * Sets the render target for the Direct3DDevice. - * For the thunks note that IDirectDrawSurface7 == IDirectDrawSurface4 and - * IDirectDrawSurface3 == IDirectDrawSurface - * - * Version 2, 3 and 7 - * - * Params: - * NewTarget: Pointer to an IDirectDrawSurface7 interface to set as the new - * render target - * Flags: Some flags - * - * Returns: - * D3D_OK on success, for details see IWineD3DDevice::SetRenderTarget - * - *****************************************************************************/ -static HRESULT d3d_device_set_render_target(struct d3d_device *device, struct ddraw_surface *target) +static BOOL validate_surface_palette(struct ddraw_surface *surface) +{ + return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags + & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 + | DDPF_PALETTEINDEXEDTO8)) + || wined3d_surface_get_palette(surface->wined3d_surface); +} + +static HRESULT d3d_device_set_render_target(struct d3d_device *device, + struct ddraw_surface *target, IUnknown *rt_iface) { HRESULT hr; - wined3d_mutex_lock(); - - if (device->target == target) + if (device->rt_iface == rt_iface) { TRACE("No-op SetRenderTarget operation, not doing anything\n"); - wined3d_mutex_unlock(); return D3D_OK; } - device->target = target; - hr = wined3d_device_set_render_target(device->wined3d_device, 0, - target ? target->wined3d_surface : NULL, FALSE); - if(hr != D3D_OK) + if (!target) { - wined3d_mutex_unlock(); - return hr; + WARN("Trying to set render target to NULL.\n"); + return DDERR_INVALIDPARAMS; } - d3d_device_update_depth_stencil(device); - wined3d_mutex_unlock(); + if (FAILED(hr = wined3d_device_set_render_target(device->wined3d_device, + 0, target->wined3d_surface, FALSE))) + return hr; + + IUnknown_AddRef(rt_iface); + IUnknown_Release(device->rt_iface); + device->rt_iface = rt_iface; + d3d_device_update_depth_stencil(device); return D3D_OK; } static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, - IDirectDrawSurface7 *NewTarget, DWORD flags) + IDirectDrawSurface7 *target, DWORD flags) { + struct ddraw_surface *target_impl = unsafe_impl_from_IDirectDrawSurface7(target); struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - struct ddraw_surface *target = unsafe_impl_from_IDirectDrawSurface7(NewTarget); + HRESULT hr; - TRACE("iface %p, target %p, flags %#x.\n", iface, NewTarget, flags); + TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags); - IDirectDrawSurface7_AddRef(NewTarget); - IDirectDrawSurface7_Release(&device->target->IDirectDrawSurface7_iface); - return d3d_device_set_render_target(device, target); + wined3d_mutex_lock(); + + if (!validate_surface_palette(target_impl)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) + { + WARN("Surface %p is not a render target.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + + if (target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + WARN("Surface %p is a depth buffer.\n", target_impl); + IDirectDrawSurface7_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return DDERR_INVALIDPIXELFORMAT; + } + + hr = d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_unlock(); + return hr; } static HRESULT WINAPI d3d_device7_SetRenderTarget_FPUSetup(IDirect3DDevice7 *iface, @@ -1886,29 +1896,102 @@ static HRESULT WINAPI d3d_device7_SetRenderTarget_FPUPreserve(IDirect3DDevice7 * } static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, - IDirectDrawSurface4 *NewRenderTarget, DWORD flags) + IDirectDrawSurface4 *target, DWORD flags) { + struct ddraw_surface *target_impl = unsafe_impl_from_IDirectDrawSurface4(target); struct d3d_device *device = impl_from_IDirect3DDevice3(iface); - struct ddraw_surface *target = unsafe_impl_from_IDirectDrawSurface4(NewRenderTarget); + HRESULT hr; - TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, flags); + TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags); - IDirectDrawSurface4_AddRef(NewRenderTarget); - IDirectDrawSurface4_Release(&device->target->IDirectDrawSurface4_iface); - return d3d_device_set_render_target(device, target); + wined3d_mutex_lock(); + + if (!validate_surface_palette(target_impl)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) + { + WARN("Surface %p is not a render target.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + WARN("Surface %p is a depth buffer.\n", target_impl); + IDirectDrawSurface4_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return DDERR_INVALIDPIXELFORMAT; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target_impl); + IDirectDrawSurface4_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return D3D_OK; + } + + hr = d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_unlock(); + return hr; } static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, - IDirectDrawSurface *NewRenderTarget, DWORD flags) + IDirectDrawSurface *target, DWORD flags) { + struct ddraw_surface *target_impl = unsafe_impl_from_IDirectDrawSurface(target); struct d3d_device *device = impl_from_IDirect3DDevice2(iface); - struct ddraw_surface *target = unsafe_impl_from_IDirectDrawSurface(NewRenderTarget); + HRESULT hr; - TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, flags); + TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags); - IDirectDrawSurface_AddRef(NewRenderTarget); - IDirectDrawSurface_Release(&device->target->IDirectDrawSurface_iface); - return d3d_device_set_render_target(device, target); + wined3d_mutex_lock(); + + if (!validate_surface_palette(target_impl)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) + { + WARN("Surface %p is not a render target.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + WARN("Surface %p is a depth buffer.\n", target_impl); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return DDERR_INVALIDPIXELFORMAT; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target_impl); + IDirectDrawSurface_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return D3D_OK; + } + + hr = d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_unlock(); + return hr; } /***************************************************************************** @@ -1931,6 +2014,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, static HRESULT WINAPI d3d_device7_GetRenderTarget(IDirect3DDevice7 *iface, IDirectDrawSurface7 **RenderTarget) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + HRESULT hr; TRACE("iface %p, target %p.\n", iface, RenderTarget); @@ -1938,11 +2022,10 @@ static HRESULT WINAPI d3d_device7_GetRenderTarget(IDirect3DDevice7 *iface, IDire return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - *RenderTarget = &device->target->IDirectDrawSurface7_iface; - IDirectDrawSurface7_AddRef(*RenderTarget); + hr = IUnknown_QueryInterface(device->rt_iface, &IID_IDirectDrawSurface7, (void **)RenderTarget); wined3d_mutex_unlock(); - return D3D_OK; + return hr; } static HRESULT WINAPI d3d_device3_GetRenderTarget(IDirect3DDevice3 *iface, IDirectDrawSurface4 **RenderTarget) @@ -2367,9 +2450,9 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, { /* The parent of the texture is the IDirectDrawSurface7 * interface of the ddraw surface. */ - struct ddraw_surface *parent = wined3d_texture_get_parent(tex); + struct ddraw_texture *parent = wined3d_texture_get_parent(tex); if (parent) - *value = parent->Handle; + *value = parent->root->Handle; } wined3d_mutex_unlock(); @@ -4499,7 +4582,7 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_texture *wined3d_texture; - struct ddraw_surface *surface; + struct ddraw_texture *ddraw_texture; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); @@ -4514,8 +4597,8 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, return D3D_OK; } - surface = wined3d_texture_get_parent(wined3d_texture); - *texture = &surface->IDirectDrawSurface7_iface; + ddraw_texture = wined3d_texture_get_parent(wined3d_texture); + *texture = &ddraw_texture->root->IDirectDrawSurface7_iface; IDirectDrawSurface7_AddRef(*texture); wined3d_mutex_unlock(); @@ -4581,14 +4664,16 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture); + struct wined3d_texture *wined3d_texture = NULL; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); - /* Texture may be NULL here */ + if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + wined3d_texture = surf->wined3d_texture; + wined3d_mutex_lock(); - hr = wined3d_device_set_texture(device->wined3d_device, - stage, surf ? surf->wined3d_texture : NULL); + hr = wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); wined3d_mutex_unlock(); return hr; @@ -6667,10 +6752,16 @@ struct d3d_device *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) { IDirectDrawSurface7 *depthStencil = NULL; + IDirectDrawSurface7 *render_target; static DDSCAPS2 depthcaps = { DDSCAPS_ZBUFFER, 0, 0, {0} }; struct ddraw_surface *dsi; - IDirectDrawSurface7_GetAttachedSurface(&device->target->IDirectDrawSurface7_iface, &depthcaps, &depthStencil); + if (device->rt_iface && SUCCEEDED(IUnknown_QueryInterface(device->rt_iface, + &IID_IDirectDrawSurface7, (void **)&render_target))) + { + IDirectDrawSurface7_GetAttachedSurface(render_target, &depthcaps, &depthStencil); + IDirectDrawSurface7_Release(render_target); + } if (!depthStencil) { TRACE("Setting wined3d depth stencil to NULL\n"); @@ -6687,7 +6778,7 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device } static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, - struct ddraw_surface *target, UINT version, IUnknown *outer_unknown) + struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const D3DMATRIX ident = { @@ -6716,7 +6807,6 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->outer_unknown = &device->IUnknown_inner; device->ddraw = ddraw; - device->target = target; list_init(&device->viewport_list); if (!ddraw_handle_table_init(&device->handle_table, 64)) @@ -6742,17 +6832,9 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return hr; } - /* FIXME: This is broken. The target AddRef() makes some sense, because - * we store a pointer during initialization, but then that's also where - * the AddRef() should be. We don't store ddraw->d3d_target anywhere. */ - /* AddRef the render target. Also AddRef the render target from ddraw, - * because if it is released before the app releases the D3D device, the - * D3D capabilities of wined3d will be uninitialized, which has bad effects. - * - * In most cases, those surfaces are the same anyway, but this will simply - * add another ref which is released when the device is destroyed. */ + device->rt_iface = rt_iface; if (version != 1) - IDirectDrawSurface7_AddRef(&target->IDirectDrawSurface7_iface); + IUnknown_AddRef(device->rt_iface); ddraw->d3ddevice = device; @@ -6766,7 +6848,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, +HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) { struct d3d_device *object; @@ -6775,6 +6857,25 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", ddraw, target, version, device, outer_unknown); + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + WARN("Surface %p is not a render target.\n", target); + return DDERR_INVALIDCAPS; + } + + if (!validate_surface_palette(target)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target); + return DDERR_NOPALETTEATTACHED; + } + + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target); + return D3DERR_SURFACENOTINVIDMEM; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, " @@ -6796,8 +6897,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, return DDERR_OUTOFMEMORY; } - hr = d3d_device_init(object, ddraw, target, version, outer_unknown); - if (FAILED(hr)) + if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown))) { WARN("Failed to initialize device, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/reactos/dll/directx/wine/ddraw/main.c b/reactos/dll/directx/wine/ddraw/main.c index 8a9801185cf..d9665d008f7 100644 --- a/reactos/dll/directx/wine/ddraw/main.c +++ b/reactos/dll/directx/wine/ddraw/main.c @@ -25,11 +25,10 @@ */ #include "ddraw_private.h" - #include #include -#include +#include "wine/exception.h" static struct list global_ddraw_list = LIST_INIT(global_ddraw_list); @@ -54,6 +53,37 @@ static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *drive return info->callback(guid, description, driver_name, info->context); } +static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback, + void *context) +{ + struct wined3d_adapter_identifier adapter_id; + BOOL cont_enum = TRUE; + HRESULT hr = S_OK; + UINT adapter = 0; + + for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + { + char DriverName[512] = "", DriverDescription[512] = ""; + + /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the + * Driver Name, so obtain the DeviceName and GUID from D3D. */ + memset(&adapter_id, 0x0, sizeof(adapter_id)); + adapter_id.device_name = DriverName; + adapter_id.device_name_size = sizeof(DriverName); + adapter_id.description = DriverDescription; + adapter_id.description_size = sizeof(DriverDescription); + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); + wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, + adapter_id.device_name, context, wined3d_get_adapter_monitor(wined3d, adapter)); + } + } +} + /* Handle table functions */ BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) { @@ -291,28 +321,25 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreate(GUID *driver_guid, IDirectDraw * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI DECLSPEC_HOTPATCH -DirectDrawCreateEx(GUID *guid, - LPVOID *dd, - REFIID iid, - IUnknown *UnkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreateEx(GUID *driver_guid, + void **ddraw, REFIID interface_iid, IUnknown *outer) { HRESULT hr; - TRACE("driver_guid %s, ddraw %p, interface_iid %s, outer_unknown %p.\n", - debugstr_guid(guid), dd, debugstr_guid(iid), UnkOuter); + TRACE("driver_guid %s, ddraw %p, interface_iid %s, outer %p.\n", + debugstr_guid(driver_guid), ddraw, debugstr_guid(interface_iid), outer); - if (!IsEqualGUID(iid, &IID_IDirectDraw7)) + if (!IsEqualGUID(interface_iid, &IID_IDirectDraw7)) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - hr = DDRAW_Create(guid, dd, UnkOuter, iid); + hr = DDRAW_Create(driver_guid, ddraw, outer, interface_iid); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) { - IDirectDraw7 *ddraw7 = *(IDirectDraw7 **)dd; - hr = IDirectDraw7_Initialize(ddraw7, guid); + IDirectDraw7 *ddraw7 = *(IDirectDraw7 **)ddraw; + hr = IDirectDraw7_Initialize(ddraw7, driver_guid); if (FAILED(hr)) IDirectDraw7_Release(ddraw7); } @@ -371,8 +398,8 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex DDENUM_NONDISPLAYDEVICES)) return DDERR_INVALIDPARAMS; - if (flags) - FIXME("flags 0x%08x not handled\n", flags); + if (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES) + FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) @@ -391,33 +418,14 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex /* QuickTime expects the description "DirectDraw HAL" */ static CHAR driver_desc[] = "DirectDraw HAL", driver_name[] = "display"; - struct wined3d_adapter_identifier adapter_id; - HRESULT hr = S_OK; - UINT adapter = 0; BOOL cont_enum; - /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ TRACE("Default interface: DirectDraw HAL\n"); cont_enum = callback(NULL, driver_desc, driver_name, context, 0); - for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) - { - char DriverName[512] = ""; - /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the - * Driver Name, so obtain the DeviceName and GUID from D3D. */ - memset(&adapter_id, 0x0, sizeof(adapter_id)); - adapter_id.device_name = DriverName; - adapter_id.device_name_size = sizeof(DriverName); - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); - wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); - cont_enum = callback(&adapter_id.device_identifier, driver_desc, - adapter_id.device_name, context, 0); - } - } + /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ + if (cont_enum && (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES)) + ddraw_enumerate_secondary_devices(wined3d, callback, context); } __EXCEPT_PAGE_FAULT { @@ -546,7 +554,7 @@ struct ddraw_class_factory IClassFactory IClassFactory_iface; LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); + HRESULT (*pfnCreateInstance)(IUnknown *outer, REFIID iid, void **out); }; static inline struct ddraw_class_factory *impl_from_IClassFactory(IClassFactory *iface) @@ -682,30 +690,13 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = ddraw_class_factory_LockServer }; -/******************************************************************************* - * DllGetClassObject [DDRAW.@] - * Retrieves class object from a DLL object - * - * NOTES - * Docs say returns STDAPI - * - * PARAMS - * rclsid [I] CLSID for the class object - * riid [I] Reference to identifier of interface for class object - * ppv [O] Address of variable to receive interface pointer for riid - * - * RETURNS - * Success: S_OK - * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, - * E_UNEXPECTED - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) { struct ddraw_class_factory *factory; unsigned int i; - TRACE("rclsid %s, riid %s, object %p.\n", - debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("rclsid %s, riid %s, out %p.\n", + debugstr_guid(rclsid), debugstr_guid(riid), out); if (!IsEqualGUID(&IID_IClassFactory, riid) && !IsEqualGUID(&IID_IUnknown, riid)) @@ -731,7 +722,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = factory; + *out = factory; return S_OK; } @@ -813,19 +804,6 @@ DestroyCallback(IDirectDrawSurface7 *surf, return DDENUMRET_OK; } -/*********************************************************************** - * get_config_key - * - * Reads a config key from the registry. Taken from WineD3D - * - ***********************************************************************/ -static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, char* buffer, DWORD size) -{ - if (0 != appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; - if (0 != defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; - return ERROR_FILE_NOT_FOUND; -} - /*********************************************************************** * DllMain (DDRAW.0) * @@ -834,9 +812,8 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c * app didn't release them properly(Gothic 2, Diablo 2, Moto racer, ...) * ***********************************************************************/ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("(%p,%x,%p)\n", hInstDLL, reason, reserved); switch (reason) { case DLL_PROCESS_ATTACH: @@ -852,7 +829,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved) wc.lpfnWndProc = DefWindowProcA; wc.cbClsExtra = 0; wc.cbWndExtra = 0; - wc.hInstance = hInstDLL; + wc.hInstance = inst; wc.hIcon = 0; wc.hCursor = 0; wc.hbrBackground = GetStockObject(BLACK_BRUSH); @@ -889,7 +866,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved) DWORD type, data, size; size = sizeof(data); - if (!RegQueryValueExA( hkey, "ForceRefreshRate", NULL, &type, (LPBYTE)&data, &size ) && type == REG_DWORD) + if (!RegQueryValueExA(hkey, "ForceRefreshRate", NULL, &type, (BYTE *)&data, &size) && type == REG_DWORD) { TRACE("ForceRefreshRate set; overriding refresh rate to %d Hz\n", data); force_refresh_rate = data; @@ -901,14 +878,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved) * exclusive mode, we replace the window proc of the ddraw window. If * an application would unload ddraw from the WM_DESTROY handler for * that window, it would return to unmapped memory and die. Apparently - * this is supposed to work on Windows. We should probably use - * GET_MODULE_HANDLE_EX_FLAG_PIN for this, but that's not currently - * implemented. */ - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&ddraw_self, &ddraw_self)) + * this is supposed to work on Windows. */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (const WCHAR *)&ddraw_self, &ddraw_self)) ERR("Failed to get own module handle.\n"); - instance = hInstDLL; - DisableThreadLibraryCalls(hInstDLL); + instance = inst; + DisableThreadLibraryCalls(inst); break; } @@ -977,7 +953,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved) } if (reserved) break; - UnregisterClassA(DDRAW_WINDOW_CLASS_NAME, hInstDLL); + UnregisterClassA(DDRAW_WINDOW_CLASS_NAME, inst); } return TRUE; diff --git a/reactos/dll/directx/wine/ddraw/palette.c b/reactos/dll/directx/wine/ddraw/palette.c index cd43e82812a..fca27068547 100644 --- a/reactos/dll/directx/wine/ddraw/palette.c +++ b/reactos/dll/directx/wine/ddraw/palette.c @@ -89,10 +89,10 @@ static ULONG WINAPI ddraw_palette_Release(IDirectDrawPalette *iface) { wined3d_mutex_lock(); wined3d_palette_decref(This->wineD3DPalette); - if(This->ifaceToRelease) - { + if ((This->flags & DDPCAPS_PRIMARYSURFACE) && This->ddraw->primary) + This->ddraw->primary->palette = NULL; + if (This->ifaceToRelease) IUnknown_Release(This->ifaceToRelease); - } wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, This); @@ -125,20 +125,6 @@ static HRESULT WINAPI ddraw_palette_Initialize(IDirectDrawPalette *iface, return DDERR_ALREADYINITIALIZED; } -/***************************************************************************** - * IDirectDrawPalette::GetCaps - * - * Returns the palette description - * - * Params: - * Caps: Address to store the caps at - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Caps is NULL - * For more details, see IWineD3DPalette::GetCaps - * - *****************************************************************************/ static HRESULT WINAPI ddraw_palette_GetCaps(IDirectDrawPalette *iface, DWORD *caps) { struct ddraw_palette *palette = impl_from_IDirectDrawPalette(iface); @@ -146,7 +132,7 @@ static HRESULT WINAPI ddraw_palette_GetCaps(IDirectDrawPalette *iface, DWORD *ca TRACE("iface %p, caps %p.\n", iface, caps); wined3d_mutex_lock(); - *caps = wined3d_palette_get_flags(palette->wineD3DPalette); + *caps = palette->flags; wined3d_mutex_unlock(); return D3D_OK; @@ -245,22 +231,55 @@ struct ddraw_palette *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *if return CONTAINING_RECORD(iface, struct ddraw_palette, IDirectDrawPalette_iface); } +static unsigned int palette_size(DWORD flags) +{ + switch (flags & (DDPCAPS_1BIT | DDPCAPS_2BIT | DDPCAPS_4BIT | DDPCAPS_8BIT)) + { + case DDPCAPS_1BIT: + return 2; + case DDPCAPS_2BIT: + return 4; + case DDPCAPS_4BIT: + return 16; + case DDPCAPS_8BIT: + return 256; + default: + return ~0u; + } +} + HRESULT ddraw_palette_init(struct ddraw_palette *palette, struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) { + unsigned int entry_count; + DWORD wined3d_flags = 0; HRESULT hr; + if ((entry_count = palette_size(flags)) == ~0u) + { + WARN("Invalid flags %#x.\n", flags); + return DDERR_INVALIDPARAMS; + } + + if (flags & DDPCAPS_8BITENTRIES) + wined3d_flags |= WINED3D_PALETTE_8BIT_ENTRIES; + if (flags & DDPCAPS_ALLOW256) + wined3d_flags |= WINED3D_PALETTE_ALLOW_256; + if (flags & DDPCAPS_ALPHA) + wined3d_flags |= WINED3D_PALETTE_ALPHA; + palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; + palette->flags = flags; - hr = wined3d_palette_create(ddraw->wined3d_device, flags, - entries, palette, &palette->wineD3DPalette); - if (FAILED(hr)) + if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, + wined3d_flags, entry_count, entries, &palette->wineD3DPalette))) { WARN("Failed to create wined3d palette, hr %#x.\n", hr); return hr; } + palette->ddraw = ddraw; palette->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface; IUnknown_AddRef(palette->ifaceToRelease); diff --git a/reactos/dll/directx/wine/ddraw/surface.c b/reactos/dll/directx/wine/ddraw/surface.c index b13708d8d19..9a35b1ad452 100644 --- a/reactos/dll/directx/wine/ddraw/surface.c +++ b/reactos/dll/directx/wine/ddraw/surface.c @@ -202,9 +202,10 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, wined3d_mutex_lock(); if (!This->device1) { - HRESULT hr = d3d_device_create(This->ddraw, This, 1, &This->device1, - (IUnknown *)&This->IDirectDrawSurface_iface); - if (FAILED(hr)) + HRESULT hr; + + if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface, + 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; wined3d_mutex_unlock(); @@ -463,7 +464,8 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; - ddraw_surface_cleanup(surf); + if (!surf->is_complex_root) + ddraw_surface_cleanup(surf); } if (surface->device1) @@ -478,6 +480,8 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); } + if (surface->wined3d_texture) + wined3d_texture_decref(surface->wined3d_texture); if (surface->wined3d_surface) wined3d_surface_decref(surface->wined3d_surface); } @@ -499,10 +503,7 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) wined3d_mutex_unlock(); return iface_count; } - if (This->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ - wined3d_texture_decref(This->wined3d_texture); - else - ddraw_surface_cleanup(This); + ddraw_surface_cleanup(This); wined3d_mutex_unlock(); if (release_iface) @@ -934,7 +935,7 @@ static HRESULT surface_lock(struct ddraw_surface *This, } } - if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(This, Rect, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_map(This->wined3d_surface, &map_desc, Rect, Flags); @@ -954,7 +955,7 @@ static HRESULT surface_lock(struct ddraw_surface *This, } } - if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { if (Flags & DDLOCK_READONLY) memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); @@ -1116,7 +1117,7 @@ static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pR hr = wined3d_surface_unmap(surface->wined3d_surface); if (SUCCEEDED(hr)) { - if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE); surface->surface_desc.lpSurface = NULL; } @@ -1164,64 +1165,109 @@ static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *dat return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); } -/***************************************************************************** - * IDirectDrawSurface7::Flip - * - * Flips a surface with the DDSCAPS_FLIP flag. The flip is relayed to - * IWineD3DSurface::Flip. Because WineD3D doesn't handle attached surfaces, - * the flip target is passed to WineD3D, even if the app didn't specify one - * - * Params: - * DestOverride: Specifies the surface that will become the new front - * buffer. If NULL, the current back buffer is used - * Flags: some DirectDraw flags, see include/ddraw.h - * - * Returns: - * DD_OK on success - * DDERR_NOTFLIPPABLE if no flip target could be found - * DDERR_INVALIDOBJECT if the surface isn't a front buffer - * For more details, see IWineD3DSurface::Flip - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *DestOverride, DWORD Flags) +static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *Override = unsafe_impl_from_IDirectDrawSurface7(DestOverride); - IDirectDrawSurface7 *Override7; + struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); + struct ddraw_texture *ddraw_texture, *prev_ddraw_texture; + DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; + struct wined3d_surface *tmp, *rt; + struct wined3d_texture *texture; + IDirectDrawSurface7 *current; HRESULT hr; - TRACE("iface %p, dst %p, flags %#x.\n", iface, DestOverride, Flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); - /* Flip has to be called from a front buffer - * What about overlay surfaces, AFAIK they can flip too? */ - if (!(surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) - return DDERR_INVALIDOBJECT; /* Unchecked */ + if (src == iface || !(dst_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) + return DDERR_NOTFLIPPABLE; wined3d_mutex_lock(); - /* WineD3D doesn't keep track of attached surface, so find the target */ - if(!Override) + tmp = dst_impl->wined3d_surface; + texture = dst_impl->wined3d_texture; + rt = wined3d_device_get_render_target(dst_impl->ddraw->wined3d_device, 0); + ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); + + if (src_impl) { - DDSCAPS2 Caps; - - memset(&Caps, 0, sizeof(Caps)); - Caps.dwCaps |= DDSCAPS_BACKBUFFER; - hr = ddraw_surface7_GetAttachedSurface(iface, &Caps, &Override7); - if(hr != DD_OK) + for (current = iface; current != src;) { - ERR("Can't find a flip target\n"); - wined3d_mutex_unlock(); - return DDERR_NOTFLIPPABLE; /* Unchecked */ + if (FAILED(hr = ddraw_surface7_GetAttachedSurface(current, &caps, ¤t))) + { + WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); + wined3d_mutex_unlock(); + return DDERR_NOTFLIPPABLE; + } + ddraw_surface7_Release(current); + if (current == iface) + { + WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); + wined3d_mutex_unlock(); + return DDERR_NOTFLIPPABLE; + } } - Override = impl_from_IDirectDrawSurface7(Override7); - /* For the GetAttachedSurface */ - ddraw_surface7_Release(Override7); + if (rt == dst_impl->wined3d_surface) + wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, src_impl->wined3d_surface, FALSE); + wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); + dst_impl->wined3d_surface = src_impl->wined3d_surface; + prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + dst_impl->wined3d_texture = src_impl->wined3d_texture; + ddraw_texture = prev_ddraw_texture; + } + else + { + for (current = iface;;) + { + if (FAILED(hr = ddraw_surface7_GetAttachedSurface(current, &caps, ¤t))) + { + ERR("Can't find a flip target\n"); + wined3d_mutex_unlock(); + return DDERR_NOTFLIPPABLE; /* Unchecked */ + } + ddraw_surface7_Release(current); + if (current == iface) + { + dst_impl = impl_from_IDirectDrawSurface7(iface); + break; + } + + src_impl = impl_from_IDirectDrawSurface7(current); + if (rt == dst_impl->wined3d_surface) + wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, src_impl->wined3d_surface, FALSE); + wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); + dst_impl->wined3d_surface = src_impl->wined3d_surface; + prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + ddraw_texture = prev_ddraw_texture; + dst_impl->wined3d_texture = src_impl->wined3d_texture; + dst_impl = src_impl; + } } - hr = wined3d_surface_flip(surface->wined3d_surface, Override->wined3d_surface, Flags); - if (SUCCEEDED(hr) && surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + /* We don't have to worry about potential texture bindings, since + * flippable surfaces can never be textures. */ + if (rt == src_impl->wined3d_surface) + wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, tmp, FALSE); + wined3d_resource_set_parent(wined3d_surface_get_resource(tmp), src_impl); + src_impl->wined3d_surface = tmp; + wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); + src_impl->wined3d_texture = texture; + + if (flags) + { + static UINT once; + if (!once++) + FIXME("Ignoring flags %#x.\n", flags); + else + WARN("Ignoring flags %#x.\n", flags); + } + + if (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE); + else + hr = DD_OK; wined3d_mutex_unlock(); @@ -1287,12 +1333,12 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (!dst_surface->clipper) { - if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(src_surface, src_rect_in, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_blt(dst_surface->wined3d_surface, dst_rect_in, wined3d_src_surface, src_rect_in, flags, fx, filter); - if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(dst_surface, dst_rect_in, FALSE); return hr; @@ -1371,7 +1417,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons src_rect_clipped.right -= (LONG)((dst_rect.right - clip_rect[i].right) * scale_x); src_rect_clipped.bottom -= (LONG)((dst_rect.bottom - clip_rect[i].bottom) * scale_y); - if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE))) break; @@ -1382,7 +1428,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons wined3d_src_surface, &src_rect_clipped, flags, fx, filter))) break; - if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE))) break; @@ -1930,7 +1976,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_getdc(surface->wined3d_surface, hdc); @@ -2006,7 +2052,7 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h wined3d_mutex_lock(); hr = wined3d_surface_releasedc(surface->wined3d_surface, hdc); - if (SUCCEEDED(hr) && (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + if (SUCCEEDED(hr) && (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); wined3d_mutex_unlock(); @@ -3965,12 +4011,12 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d return DDERR_BLTFASTCANTCLIP; } - if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(src, rsrc, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_blt(This->wined3d_surface, &dst_rect, src->wined3d_surface, rsrc, flags, NULL, WINED3D_TEXF_POINT); - if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(This, &dst_rect, FALSE); wined3d_mutex_unlock(); @@ -4227,7 +4273,6 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, const DWORD allowed_flags = DDSD_LPSURFACE | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS; enum wined3d_format_id format_id; - BOOL update_wined3d = FALSE; UINT pitch, width, height; TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags); @@ -4242,7 +4287,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("Flags is %x, returning DDERR_INVALIDPARAMS\n", Flags); return DDERR_INVALIDPARAMS; } - if (!(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) + if (!(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + || This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE + || This->surface_desc.ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { WARN("Surface is not in system memory, returning DDERR_INVALIDSURFACETYPE.\n"); return DDERR_INVALIDSURFACETYPE; @@ -4255,12 +4302,12 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags); return DDERR_INVALIDPARAMS; } - if (!(DDSD->dwFlags & DDSD_LPSURFACE)) + if (!(DDSD->dwFlags & DDSD_LPSURFACE) || !DDSD->lpSurface) { - WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); + WARN("DDSD_LPSURFACE is not set or lpSurface is NULL, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } - if (DDSD->dwFlags & DDSD_CAPS) + if ((DDSD->dwFlags & DDSD_CAPS) && DDSD->ddsCaps.dwCaps) { WARN("DDSD_CAPS is set, returning DDERR_INVALIDCAPS.\n"); return DDERR_INVALIDCAPS; @@ -4279,15 +4326,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwWidth != This->surface_desc.dwWidth) - { TRACE("Surface width changed from %u to %u.\n", This->surface_desc.dwWidth, DDSD->dwWidth); - update_wined3d = TRUE; - } if (DDSD->u1.lPitch != This->surface_desc.u1.lPitch) - { TRACE("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch); - update_wined3d = TRUE; - } pitch = DDSD->u1.lPitch; width = DDSD->dwWidth; } @@ -4310,10 +4351,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwHeight != This->surface_desc.dwHeight) - { TRACE("Surface height changed from %u to %u.\n", This->surface_desc.dwHeight, DDSD->dwHeight); - update_wined3d = TRUE; - } height = DDSD->dwHeight; } else @@ -4335,52 +4373,29 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } current_format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); if (format_id != current_format_id) - { TRACE("Surface format changed from %#x to %#x.\n", current_format_id, format_id); - update_wined3d = TRUE; - } } else { format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); } - if (update_wined3d) + if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, + format_id, WINED3D_MULTISAMPLE_NONE, 0, DDSD->lpSurface, pitch))) { - if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, - format_id, WINED3D_MULTISAMPLE_NONE, 0))) - { - WARN("Failed to update surface desc, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - if (DDSD->dwFlags & DDSD_WIDTH) - This->surface_desc.dwWidth = width; - if (DDSD->dwFlags & DDSD_PITCH) - This->surface_desc.u1.lPitch = DDSD->u1.lPitch; - if (DDSD->dwFlags & DDSD_HEIGHT) - This->surface_desc.dwHeight = height; - if (DDSD->dwFlags & DDSD_PIXELFORMAT) - This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + WARN("Failed to update surface desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr_ddraw_from_wined3d(hr); } - if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) - { - if (FAILED(hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface, pitch))) - { - /* No need for a trace here, wined3d does that for us */ - switch(hr) - { - case WINED3DERR_INVALIDCALL: - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - default: - break; /* Go on */ - } - } - /* DDSD->lpSurface is set by Lock() */ - } + if (DDSD->dwFlags & DDSD_WIDTH) + This->surface_desc.dwWidth = width; + if (DDSD->dwFlags & DDSD_PITCH) + This->surface_desc.u1.lPitch = DDSD->u1.lPitch; + if (DDSD->dwFlags & DDSD_HEIGHT) + This->surface_desc.dwHeight = height; + if (DDSD->dwFlags & DDSD_PIXELFORMAT) + This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; wined3d_mutex_unlock(); @@ -4411,46 +4426,28 @@ static HRESULT WINAPI ddraw_surface3_SetSurfaceDesc(IDirectDrawSurface3 *iface, surface_desc ? &surface_desc2 : NULL, flags); } -/***************************************************************************** - * IDirectDrawSurface7::GetPalette - * - * Returns the IDirectDrawPalette interface of the palette currently assigned - * to the surface - * - * Params: - * Pal: Address to write the interface pointer to - * - * Returns: - * DD_OK on success - * DDERR_INVALIDPARAMS if Pal is NULL - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette **Pal) +static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette **palette) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct wined3d_palette *wined3d_palette; struct ddraw_palette *palette_impl; HRESULT hr = DD_OK; - TRACE("iface %p, palette %p.\n", iface, Pal); + TRACE("iface %p, palette %p.\n", iface, palette); - if(!Pal) + if (!palette) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_palette = wined3d_surface_get_palette(surface->wined3d_surface); - if (wined3d_palette) + if ((palette_impl = surface->palette)) { - palette_impl = wined3d_palette_get_parent(wined3d_palette); - *Pal = &palette_impl->IDirectDrawPalette_iface; - IDirectDrawPalette_AddRef(*Pal); + *palette = &palette_impl->IDirectDrawPalette_iface; + IDirectDrawPalette_AddRef(*palette); } else { - *Pal = NULL; + *palette = NULL; hr = DDERR_NOPALETTEATTACHED; } - wined3d_mutex_unlock(); return hr; @@ -4492,132 +4489,97 @@ static HRESULT WINAPI ddraw_surface1_GetPalette(IDirectDrawSurface *iface, IDire return ddraw_surface7_GetPalette(&surface->IDirectDrawSurface7_iface, palette); } -/***************************************************************************** - * SetColorKeyEnum - * - * EnumAttachedSurface callback for SetColorKey. Used to set color keys - * recursively in the surface tree - * - *****************************************************************************/ -struct SCKContext +static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD flags, DDCOLORKEY *color_key) { - HRESULT ret; - struct wined3d_color_key *color_key; - DWORD Flags; -}; - -static HRESULT WINAPI SetColorKeyEnum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) -{ - struct ddraw_surface *surface_impl = impl_from_IDirectDrawSurface7(surface); - struct SCKContext *ctx = context; - HRESULT hr; - - hr = wined3d_surface_set_color_key(surface_impl->wined3d_surface, ctx->Flags, ctx->color_key); - if (FAILED(hr)) - { - WARN("IWineD3DSurface_SetColorKey failed, hr = %08x\n", hr); - ctx->ret = hr; - } - - ddraw_surface7_EnumAttachedSurfaces(surface, context, SetColorKeyEnum); - ddraw_surface7_Release(surface); - - return DDENUMRET_OK; -} - -/***************************************************************************** - * IDirectDrawSurface7::SetColorKey - * - * Sets the color keying options for the surface. Observations showed that - * in case of complex surfaces the color key has to be assigned to all - * sublevels. - * - * Params: - * Flags: DDCKEY_* - * CKey: The new color key - * - * Returns: - * DD_OK on success - * See IWineD3DSurface::SetColorKey for details - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey) -{ - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); - DDCOLORKEY FixedCKey; - struct SCKContext ctx = { DD_OK, (struct wined3d_color_key *)(CKey ? &FixedCKey : NULL), Flags }; - - TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey); + DDCOLORKEY fixed_color_key; + HRESULT hr = WINED3D_OK; wined3d_mutex_lock(); - if (CKey) + + if (color_key) { - FixedCKey = *CKey; + fixed_color_key = *color_key; /* Handle case where dwColorSpaceHighValue < dwColorSpaceLowValue */ - if (FixedCKey.dwColorSpaceHighValue < FixedCKey.dwColorSpaceLowValue) - FixedCKey.dwColorSpaceHighValue = FixedCKey.dwColorSpaceLowValue; + if (fixed_color_key.dwColorSpaceHighValue < fixed_color_key.dwColorSpaceLowValue) + fixed_color_key.dwColorSpaceHighValue = fixed_color_key.dwColorSpaceLowValue; - switch (Flags & ~DDCKEY_COLORSPACE) + switch (flags & ~DDCKEY_COLORSPACE) { - case DDCKEY_DESTBLT: - This->surface_desc.ddckCKDestBlt = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKDESTBLT; - break; + case DDCKEY_DESTBLT: + surface->surface_desc.ddckCKDestBlt = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKDESTBLT; + break; - case DDCKEY_DESTOVERLAY: - This->surface_desc.u3.ddckCKDestOverlay = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; - break; + case DDCKEY_DESTOVERLAY: + surface->surface_desc.u3.ddckCKDestOverlay = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; + break; - case DDCKEY_SRCOVERLAY: - This->surface_desc.ddckCKSrcOverlay = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; - break; + case DDCKEY_SRCOVERLAY: + surface->surface_desc.ddckCKSrcOverlay = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; + break; - case DDCKEY_SRCBLT: - This->surface_desc.ddckCKSrcBlt = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKSRCBLT; - break; + case DDCKEY_SRCBLT: + surface->surface_desc.ddckCKSrcBlt = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKSRCBLT; + break; - default: - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + default: + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } } else { - switch (Flags & ~DDCKEY_COLORSPACE) + switch (flags & ~DDCKEY_COLORSPACE) { - case DDCKEY_DESTBLT: - This->surface_desc.dwFlags &= ~DDSD_CKDESTBLT; - break; + case DDCKEY_DESTBLT: + surface->surface_desc.dwFlags &= ~DDSD_CKDESTBLT; + break; - case DDCKEY_DESTOVERLAY: - This->surface_desc.dwFlags &= ~DDSD_CKDESTOVERLAY; - break; + case DDCKEY_DESTOVERLAY: + surface->surface_desc.dwFlags &= ~DDSD_CKDESTOVERLAY; + break; - case DDCKEY_SRCOVERLAY: - This->surface_desc.dwFlags &= ~DDSD_CKSRCOVERLAY; - break; + case DDCKEY_SRCOVERLAY: + surface->surface_desc.dwFlags &= ~DDSD_CKSRCOVERLAY; + break; - case DDCKEY_SRCBLT: - This->surface_desc.dwFlags &= ~DDSD_CKSRCBLT; - break; + case DDCKEY_SRCBLT: + surface->surface_desc.dwFlags &= ~DDSD_CKSRCBLT; + break; - default: - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + default: + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } } - ctx.ret = wined3d_surface_set_color_key(This->wined3d_surface, Flags, ctx.color_key); - ddraw_surface7_EnumAttachedSurfaces(iface, &ctx, SetColorKeyEnum); + + if (surface->wined3d_texture) + hr = wined3d_texture_set_color_key(surface->wined3d_texture, flags, + color_key ? (struct wined3d_color_key *)&fixed_color_key : NULL); + wined3d_mutex_unlock(); - switch(ctx.ret) + return hr_ddraw_from_wined3d(hr); +} + +static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD flags, DDCOLORKEY *color_key) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + + TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); + + wined3d_mutex_lock(); + if (!surface->wined3d_texture) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return ctx.ret; + wined3d_mutex_unlock(); + return DDERR_NOTONMIPMAPSUBLEVEL; } + wined3d_mutex_unlock(); + + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4626,7 +4588,7 @@ static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface3_SetColorKey(IDirectDrawSurface3 *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4635,7 +4597,7 @@ static HRESULT WINAPI ddraw_surface3_SetColorKey(IDirectDrawSurface3 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface2_SetColorKey(IDirectDrawSurface2 *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4644,7 +4606,7 @@ static HRESULT WINAPI ddraw_surface2_SetColorKey(IDirectDrawSurface2 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4653,89 +4615,44 @@ static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWOR TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } -/***************************************************************************** - * IDirectDrawSurface7::SetPalette - * - * Assigns a DirectDrawPalette object to the surface - * - * Params: - * Pal: Interface to the palette to set - * - * Returns: - * DD_OK on success - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette *Pal) +static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette *palette) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); - struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(Pal); - IDirectDrawPalette *oldPal; - struct ddraw_surface *surf; - HRESULT hr; + struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); + struct ddraw_palette *prev; - TRACE("iface %p, palette %p.\n", iface, Pal); + TRACE("iface %p, palette %p.\n", iface, palette); - if (!(This->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | - DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) { + if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) return DDERR_INVALIDPIXELFORMAT; - } - if (This->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) - { + if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - } - /* Find the old palette */ wined3d_mutex_lock(); - hr = IDirectDrawSurface_GetPalette(iface, &oldPal); - if(hr != DD_OK && hr != DDERR_NOPALETTEATTACHED) + + prev = surface->palette; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - wined3d_mutex_unlock(); - return hr; - } - if(oldPal) IDirectDrawPalette_Release(oldPal); /* For the GetPalette */ - - /* Set the new Palette */ - wined3d_surface_set_palette(This->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); - /* AddRef the Palette */ - if(Pal) IDirectDrawPalette_AddRef(Pal); - - /* Release the old palette */ - if(oldPal) IDirectDrawPalette_Release(oldPal); - - /* Update the wined3d frontbuffer if this is the frontbuffer. */ - if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) && This->ddraw->wined3d_frontbuffer) - wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, - palette_impl ? palette_impl->wineD3DPalette : NULL); - - /* If this is a front buffer, also update the back buffers - * TODO: How do things work for palettized cube textures? - */ - if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - { - /* For primary surfaces the tree is just a list, so the simpler scheme fits too */ - DDSCAPS2 caps2 = { DDSCAPS_PRIMARYSURFACE, 0, 0, {0} }; - - surf = This; - while(1) - { - IDirectDrawSurface7 *attach; - HRESULT hr; - hr = ddraw_surface7_GetAttachedSurface(&surf->IDirectDrawSurface7_iface, &caps2, &attach); - if(hr != DD_OK) - { - break; - } - - TRACE("Setting palette on %p\n", attach); - ddraw_surface7_SetPalette(attach, Pal); - surf = impl_from_IDirectDrawSurface7(attach); - ddraw_surface7_Release(attach); - } + if (prev) + prev->flags &= ~DDPCAPS_PRIMARYSURFACE; + if (palette_impl) + palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; + /* Update the wined3d frontbuffer if this is the primary. */ + if (surface->ddraw->wined3d_frontbuffer) + wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); } + if (palette_impl) + IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); + if (prev) + IDirectDrawPalette_Release(&prev->IDirectDrawPalette_iface); + surface->palette = palette_impl; + wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); wined3d_mutex_unlock(); @@ -4995,7 +4912,7 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface) * Loads a texture created with the DDSCAPS_ALLOCONLOAD * * This function isn't relayed to WineD3D because the whole interface is - * implemented in DDraw only. For speed improvements a implementation which + * implemented in DDraw only. For speed improvements an implementation which * takes OpenGL more into account could be placed into WineD3D. * * Params: @@ -5569,11 +5486,9 @@ static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *parent) { - struct ddraw_surface *surface = parent; + TRACE("parent %p.\n", parent); - TRACE("surface %p.\n", surface); - - ddraw_surface_cleanup(surface); + HeapFree(GetProcessHeap(), 0, parent); } static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = @@ -5581,75 +5496,388 @@ static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = ddraw_texture_wined3d_object_destroyed, }; -HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) +static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource) { - const DDSURFACEDESC2 *desc = &surface->surface_desc; + return DD_OK; +} + +HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, + struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) +{ + struct ddraw_surface *root, *mip, **attach; struct wined3d_resource_desc wined3d_desc; - struct ddraw_surface *mip, **attach; + struct wined3d_texture *wined3d_texture; struct wined3d_resource *resource; + struct wined3d_display_mode mode; + DDSURFACEDESC2 *desc, *mip_desc; + struct ddraw_texture *texture; UINT layers, levels, i, j; - DDSURFACEDESC2 *mip_desc; - enum wined3d_pool pool; HRESULT hr; - if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) - levels = desc->u2.dwMipMapCount; - else - levels = 1; + TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p, version %u.\n", + ddraw, surface_desc, surface, outer_unknown, version); + if (TRACE_ON(ddraw)) + { + TRACE("Requesting surface desc:\n"); + DDRAW_dump_surface_desc(surface_desc); + } - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - layers = 6; - else - layers = 1; + if (outer_unknown) + return CLASS_E_NOAGGREGATION; - /* DDSCAPS_SYSTEMMEMORY textures are in WINED3D_POOL_SYSTEM_MEM. - * Should I forward the MANAGED cap to the managed pool? */ - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) - pool = WINED3D_POOL_SYSTEM_MEM; - else - pool = WINED3D_POOL_DEFAULT; + if (!surface) + return E_POINTER; + + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) + return E_OUTOFMEMORY; + + texture->version = version; + texture->surface_desc = *surface_desc; + desc = &texture->surface_desc; + + /* Ensure DDSD_CAPS is always set. */ + desc->dwFlags |= DDSD_CAPS; + + /* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE + * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ + if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) + desc->dwFlags &= ~DDSD_LPSURFACE; + + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + DWORD flippable = desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_COMPLEX); + + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + WARN("Tried to create a primary surface with DDSCAPS_TEXTURE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if (flippable) + { + if (flippable != (DDSCAPS_FLIP | DDSCAPS_COMPLEX)) + { + WARN("Tried to create a flippable primary surface without both DDSCAPS_FLIP and DDSCAPS_COMPLEX.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->u5.dwBackBufferCount) + { + WARN("Tried to create a flippable primary surface without any back buffers.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_NOEXCLUSIVEMODE; + } + } + } + + /* This is a special case in ddrawex, but not allowed in ddraw. */ + if ((desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + == (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("Tried to create a surface in both system and video memory.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) + && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) + { + WARN("Cube map faces requested without cube map flag.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES)) + { + WARN("Cube map without faces requested.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } + + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + && (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) != DDSCAPS2_CUBEMAP_ALLFACES) + FIXME("Partial cube maps not implemented.\n"); + + if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) + { + if (!(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY " + "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + } + + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, texture); + return hr_ddraw_from_wined3d(hr); + } + + /* No pixelformat given? Use the current screen format. */ + if (!(desc->dwFlags & DDSD_PIXELFORMAT)) + { + desc->dwFlags |= DDSD_PIXELFORMAT; + desc->u4.ddpfPixelFormat.dwSize = sizeof(desc->u4.ddpfPixelFormat); + ddrawformat_from_wined3dformat(&desc->u4.ddpfPixelFormat, mode.format_id); + } + + wined3d_desc.format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); + if (wined3d_desc.format == WINED3DFMT_UNKNOWN) + { + WARN("Unsupported / unknown pixelformat.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPIXELFORMAT; + } + + /* No width or no height? Use the screen size. */ + if (!(desc->dwFlags & DDSD_WIDTH) || !(desc->dwFlags & DDSD_HEIGHT)) + { + if (!(desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + { + WARN("No width / height specified.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } + + desc->dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc->dwWidth = mode.width; + desc->dwHeight = mode.height; + } + + if (!desc->dwWidth || !desc->dwHeight) + { + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } + + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + /* The first surface is a front buffer, the back buffers are created + * afterwards. */ + if (desc->ddsCaps.dwCaps & DDSCAPS_FLIP) + desc->ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; + desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; + if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) + { + struct wined3d_swapchain_desc swapchain_desc; + + wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); + swapchain_desc.backbuffer_width = mode.width; + swapchain_desc.backbuffer_height = mode.height; + swapchain_desc.backbuffer_format = mode.format_id; + + if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, + &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) + { + ERR("Failed to reset device.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return hr_ddraw_from_wined3d(hr); + } + } + } - wined3d_desc.format = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = 0; - wined3d_desc.pool = pool; + wined3d_desc.pool = WINED3D_POOL_DEFAULT; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; wined3d_desc.depth = 1; wined3d_desc.size = 0; + if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && (ddraw->flags & DDRAW_NO3D)) + { + WARN("The application requests a 3D capable surface, but the ddraw object was created without 3D support.\n"); + /* Do not fail surface creation, only fail 3D device creation. */ + } + + /* Mipmap count fixes */ + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + if (desc->ddsCaps.dwCaps & DDSCAPS_COMPLEX) + { + if (desc->dwFlags & DDSD_MIPMAPCOUNT) + { + /* Mipmap count is given, should not be 0. */ + if (!desc->u2.dwMipMapCount) + { + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } + } + else + { + /* Undocumented feature: Create sublevels until either the + * width or the height is 1. */ + DWORD min = desc->dwWidth < desc->dwHeight ? desc->dwWidth : desc->dwHeight; + + desc->u2.dwMipMapCount = 0; + while (min) + { + ++desc->u2.dwMipMapCount; + min >>= 1; + } + } + } + else + { + desc->u2.dwMipMapCount = 1; + } + + desc->dwFlags |= DDSD_MIPMAPCOUNT; + levels = desc->u2.dwMipMapCount; + } + else + { + levels = 1; + } + + if (!(desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY))) + { + if (!(desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) + { + enum wined3d_resource_type rtype; + DWORD usage = 0; + + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + rtype = WINED3D_RTYPE_CUBE_TEXTURE; + else if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + rtype = WINED3D_RTYPE_TEXTURE; + else + rtype = WINED3D_RTYPE_SURFACE; + + if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + usage = WINED3DUSAGE_DEPTHSTENCIL; + else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + usage = WINED3DUSAGE_RENDERTARGET; + + if (SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + WINED3D_DEVICE_TYPE_HAL, mode.format_id, usage, rtype, wined3d_desc.format))) + desc->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; + else + desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + } + else if (!(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + /* Tests show surfaces without memory flags get these flags added + * right after creation. */ + desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + } + } + + if ((desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY | DDSCAPS_SYSTEMMEMORY)) + == (DDSCAPS_OVERLAY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("System memory overlays are not allowed.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_NOOVERLAYHW; + } + + if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + { + wined3d_desc.pool = WINED3D_POOL_SYSTEM_MEM; + } + else + { + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + wined3d_desc.usage |= WINED3DUSAGE_TEXTURE; + if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL; + else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; + + if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) + { + wined3d_desc.pool = WINED3D_POOL_MANAGED; + /* Managed textures have the system memory flag set. */ + desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + } + else if (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + { + /* Videomemory adds localvidmem. This is mutually exclusive with + * systemmemory and texturemanage. */ + desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; + wined3d_desc.usage |= WINED3DUSAGE_DYNAMIC; + } + } + + if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) + wined3d_desc.usage |= WINED3DUSAGE_OVERLAY; + + if (desc->ddsCaps.dwCaps & DDSCAPS_OWNDC) + wined3d_desc.usage |= WINED3DUSAGE_OWNDC; + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) { wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; - hr = wined3d_texture_create_cube(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + layers = 6; } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; - hr = wined3d_texture_create_2d(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + layers = 1; } - if (FAILED(hr)) + /* Some applications assume surfaces will always be mapped at the same + * address. Some of those also assume that this address is valid even when + * the surface isn't mapped, and that updates done this way will be + * visible on the screen. The game Nox is such an application, + * Commandos: Behind Enemy Lines is another. We set + * WINED3D_SURFACE_PIN_SYSMEM because of this. */ + if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, &wined3d_desc, levels, + WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); - return hr; + HeapFree(GetProcessHeap(), 0, texture); + return hr_ddraw_from_wined3d(hr); } + resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + root = wined3d_resource_get_parent(resource); + root->wined3d_texture = wined3d_texture; + root->is_complex_root = TRUE; + texture->root = root; + + if (desc->dwFlags & DDSD_CKDESTOVERLAY) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTOVERLAY, + (struct wined3d_color_key *)&desc->u3.ddckCKDestOverlay); + if (desc->dwFlags & DDSD_CKDESTBLT) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTBLT, + (struct wined3d_color_key *)&desc->ddckCKDestBlt); + if (desc->dwFlags & DDSD_CKSRCOVERLAY) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_SRCOVERLAY, + (struct wined3d_color_key *)&desc->ddckCKSrcOverlay); + if (desc->dwFlags & DDSD_CKSRCBLT) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_SRCBLT, + (struct wined3d_color_key *)&desc->ddckCKSrcBlt); + for (i = 0; i < layers; ++i) { - attach = &surface->complex_array[layers - 1 - i]; + attach = &root->complex_array[layers - 1 - i]; for (j = 0; j < levels; ++j) { - resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, i * levels + j); + resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); mip = wined3d_resource_get_parent(resource); - - if (mip == surface) - continue; - mip_desc = &mip->surface_desc; if (j) @@ -5685,77 +5913,97 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac } + if (mip == root) + continue; + *attach = mip; attach = &mip->complex_array[0]; } } + if (desc->dwFlags & DDSD_BACKBUFFERCOUNT) + { + unsigned int count = desc->u5.dwBackBufferCount; + struct ddraw_surface *last = root; + + attach = &last->complex_array[0]; + for (i = 0; i < count; ++i) + { + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + texture->version = version; + texture->surface_desc = root->surface_desc; + desc = &texture->surface_desc; + + /* Only one surface in the flipping chain is a back buffer, one is + * a front buffer, the others are just flippable surfaces. */ + desc->ddsCaps.dwCaps &= ~(DDSCAPS_VISIBLE | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER + | DDSCAPS_BACKBUFFER); + if (!i) + desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; + desc->u5.dwBackBufferCount = 0; + + if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, &wined3d_desc, 1, + WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) + { + HeapFree(GetProcessHeap(), 0, texture); + hr = hr_ddraw_from_wined3d(hr); + goto fail; + } + + resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + last = wined3d_resource_get_parent(resource); + last->wined3d_texture = wined3d_texture; + texture->root = last; + + if (desc->dwFlags & DDSD_CKDESTOVERLAY) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTOVERLAY, + (struct wined3d_color_key *)&desc->u3.ddckCKDestOverlay); + if (desc->dwFlags & DDSD_CKDESTBLT) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTBLT, + (struct wined3d_color_key *)&desc->ddckCKDestBlt); + if (desc->dwFlags & DDSD_CKSRCOVERLAY) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_SRCOVERLAY, + (struct wined3d_color_key *)&desc->ddckCKSrcOverlay); + if (desc->dwFlags & DDSD_CKSRCBLT) + wined3d_texture_set_color_key(wined3d_texture, DDCKEY_SRCBLT, + (struct wined3d_color_key *)&desc->ddckCKSrcBlt); + + *attach = last; + attach = &last->complex_array[0]; + } + *attach = root; + } + + if (surface_desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + ddraw->primary = root; + *surface = root; + return DD_OK; + +fail: + if (version == 7) + IDirectDrawSurface7_Release(&root->IDirectDrawSurface7_iface); + else if (version == 4) + IDirectDrawSurface4_Release(&root->IDirectDrawSurface4_iface); + else + IDirectDrawSurface_Release(&root->IDirectDrawSurface_iface); + + return hr; } -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, - DDSURFACEDESC2 *desc, DWORD flags, UINT version) +HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { - enum wined3d_pool pool = WINED3D_POOL_DEFAULT; - enum wined3d_format_id format; - DWORD usage = 0; + DDSURFACEDESC2 *desc = &surface->surface_desc; + struct wined3d_resource_desc wined3d_desc; + unsigned int version = texture->version; HRESULT hr; - if (!(desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) - && !((desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - && (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE))) - { - /* Tests show surfaces without memory flags get these flags added - * right after creation. */ - desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - } - - if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - usage |= WINED3DUSAGE_RENDERTARGET; - desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; - } - - if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && !(desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) - { - usage |= WINED3DUSAGE_RENDERTARGET; - } - - if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) - { - usage |= WINED3DUSAGE_OVERLAY; - } - - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - usage |= WINED3DUSAGE_DEPTHSTENCIL; - - if (desc->ddsCaps.dwCaps & DDSCAPS_OWNDC) - usage |= WINED3DUSAGE_OWNDC; - - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) - { - pool = WINED3D_POOL_SYSTEM_MEM; - } - else if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) - { - pool = WINED3D_POOL_MANAGED; - /* Managed textures have the system memory flag set. */ - desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; - } - else if (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) - { - /* Videomemory adds localvidmem. This is mutually exclusive with - * systemmemory and texturemanage. */ - desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; - } - - format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); - if (format == WINED3DFMT_UNKNOWN) - { - WARN("Unsupported / unknown pixelformat.\n"); - return DDERR_INVALIDPIXELFORMAT; - } - surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl; surface->IDirectDrawSurface3_iface.lpVtbl = &ddraw_surface3_vtbl; @@ -5784,59 +6032,30 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface; } - copy_to_surfacedesc2(&surface->surface_desc, desc); - + *desc = texture->surface_desc; + wined3d_resource_get_desc(wined3d_surface_get_resource(wined3d_surface), &wined3d_desc); + desc->dwWidth = wined3d_desc.width; + desc->dwHeight = wined3d_desc.height; surface->first_attached = surface; - if (FAILED(hr = wined3d_surface_create(ddraw->wined3d_device, desc->dwWidth, desc->dwHeight, format, - usage, pool, WINED3D_MULTISAMPLE_NONE, 0, flags, surface, - &ddraw_surface_wined3d_parent_ops, &surface->wined3d_surface))) - { - WARN("Failed to create wined3d surface, hr %#x.\n", hr); - return hr; - } - /* Anno 1602 stores the pitch right after surface creation, so make sure * it's there. TODO: Test other fourcc formats. */ - if (format == WINED3DFMT_DXT1 || format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 - || format == WINED3DFMT_DXT4 || format == WINED3DFMT_DXT5) + if (wined3d_desc.format == WINED3DFMT_DXT1 || wined3d_desc.format == WINED3DFMT_DXT2 + || wined3d_desc.format == WINED3DFMT_DXT3 || wined3d_desc.format == WINED3DFMT_DXT4 + || wined3d_desc.format == WINED3DFMT_DXT5) { surface->surface_desc.dwFlags |= DDSD_LINEARSIZE; - if (format == WINED3DFMT_DXT1) - { + if (wined3d_desc.format == WINED3DFMT_DXT1) surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; - } else - { surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); - } } else { surface->surface_desc.dwFlags |= DDSD_PITCH; - surface->surface_desc.u1.lPitch = wined3d_surface_get_pitch(surface->wined3d_surface); + surface->surface_desc.u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } - if (desc->dwFlags & DDSD_CKDESTOVERLAY) - { - wined3d_surface_set_color_key(surface->wined3d_surface, DDCKEY_DESTOVERLAY, - (struct wined3d_color_key *)&desc->u3.ddckCKDestOverlay); - } - if (desc->dwFlags & DDSD_CKDESTBLT) - { - wined3d_surface_set_color_key(surface->wined3d_surface, DDCKEY_DESTBLT, - (struct wined3d_color_key *)&desc->ddckCKDestBlt); - } - if (desc->dwFlags & DDSD_CKSRCOVERLAY) - { - wined3d_surface_set_color_key(surface->wined3d_surface, DDCKEY_SRCOVERLAY, - (struct wined3d_color_key *)&desc->ddckCKSrcOverlay); - } - if (desc->dwFlags & DDSD_CKSRCBLT) - { - wined3d_surface_set_color_key(surface->wined3d_surface, DDCKEY_SRCBLT, - (struct wined3d_color_key *)&desc->ddckCKSrcBlt); - } if (desc->dwFlags & DDSD_LPSURFACE) { UINT pitch = 0; @@ -5847,13 +6066,18 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, surface->surface_desc.u1.lPitch = pitch; } - if (FAILED(hr = wined3d_surface_set_mem(surface->wined3d_surface, desc->lpSurface, pitch))) + if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, + wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, + desc->lpSurface, pitch))) { ERR("Failed to set surface memory, hr %#x.\n", hr); - wined3d_surface_decref(surface->wined3d_surface); return hr; } } + wined3d_surface_incref(wined3d_surface); + surface->wined3d_surface = wined3d_surface; + *parent_ops = &ddraw_surface_wined3d_parent_ops; + return DD_OK; } diff --git a/reactos/dll/directx/wine/wined3d/CMakeLists.txt b/reactos/dll/directx/wine/wined3d/CMakeLists.txt index ad4913c3db5..a504e2bed86 100644 --- a/reactos/dll/directx/wine/wined3d/CMakeLists.txt +++ b/reactos/dll/directx/wine/wined3d/CMakeLists.txt @@ -9,10 +9,11 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wined3d.dll wined3d.spec ADD_IMPORTLIB) list(APPEND SOURCE - ati_fragment_shader.c arb_program_shader.c + ati_fragment_shader.c buffer.c context.c + cs.c device.c directx.c drawprim.c diff --git a/reactos/dll/directx/wine/wined3d/arb_program_shader.c b/reactos/dll/directx/wine/wined3d/arb_program_shader.c index 66c4640a12c..2d30dd2d5f5 100644 --- a/reactos/dll/directx/wine/wined3d/arb_program_shader.c +++ b/reactos/dll/directx/wine/wined3d/arb_program_shader.c @@ -33,13 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); -/* sRGB correction constants */ -static const float srgb_cmp = 0.0031308f; -static const float srgb_mul_low = 12.92f; -static const float srgb_pow = 0.41666f; -static const float srgb_mul_high = 1.055f; -static const float srgb_sub_high = 0.055f; - static BOOL shader_is_pshader_version(enum wined3d_shader_type type) { return type == WINED3D_SHADER_TYPE_PIXEL; @@ -145,9 +138,9 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar } } -static inline BOOL ffp_clip_emul(const struct wined3d_state *state) +static inline BOOL ffp_clip_emul(const struct wined3d_context *context) { - return state->lowest_disabled_stage < 7; + return context->lowest_disabled_stage < 7; } /* ARB_program_shader private data */ @@ -176,7 +169,7 @@ struct control_frame struct arb_ps_np2fixup_info { struct ps_np2fixup_info super; - /* For ARB we need a offset value: + /* For ARB we need an offset value: * With both GLSL and ARB mode the NP2 fixup information (the texture dimensions) are stored in a * consecutive way (GLSL uses a uniform array). Since ARB doesn't know the notion of a "standalone" * array we need an offset to the index inside the program local parameter array. */ @@ -658,7 +651,9 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, if (!from_shader_select) { - const struct wined3d_shader *vshader = state->vertex_shader, *pshader = state->pixel_shader; + const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; + if (vshader && (vshader->reg_maps.boolean_constants || (!gl_info->supported[NV_VERTEX_PROGRAM2_OPTION] @@ -692,7 +687,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, if (useVertexShader) { - struct wined3d_shader *vshader = state->vertex_shader; + const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; /* Load DirectX 9 float constants for vertex shader */ @@ -703,7 +698,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, if (usePixelShader) { - struct wined3d_shader *pshader = state->pixel_shader; + const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; UINT rt_height = state->fb->render_targets[0]->resource.height; @@ -764,6 +759,17 @@ static void shader_arb_update_float_pixel_constants(struct wined3d_device *devic priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, start + count); } +static void shader_arb_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) +{ + char str[4][17]; + + wined3d_ftoa(values[0], str[0]); + wined3d_ftoa(values[1], str[1]); + wined3d_ftoa(values[2], str[2]); + wined3d_ftoa(values[3], str[3]); + shader_addline(buffer, "{%s, %s, %s, %s}", str[0], str[1], str[2], str[3]); +} + /* Generate the variable & register declarations for the ARB_vertex_program output target */ static void shader_generate_arb_declarations(const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, @@ -868,8 +874,9 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader { const float *value; value = (const float *)lconst->value; - shader_addline(buffer, "PARAM C%u = {%.8e, %.8e, %.8e, %.8e};\n", lconst->idx, - value[0], value[1], value[2], value[3]); + shader_addline(buffer, "PARAM C%u = ", lconst->idx); + shader_arb_append_imm_vec4(buffer, value); + shader_addline(buffer, ";\n"); } } @@ -1106,7 +1113,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction if (!pshader && reg->idx[0].rel_addr) { const struct arb_vshader_private *shader_data = shader->backend_data; - UINT rel_offset = shader_data->rel_offset; + UINT rel_offset = ctx->target_version == ARB ? shader_data->rel_offset : 0; BOOL aL = FALSE; char rel_reg[50]; if (reg_maps->shader_version.major < 2) @@ -1493,17 +1500,16 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr) { /* Generate a line that does the input modifier computation and return the input register to use */ - BOOL is_color = FALSE; + BOOL is_color = FALSE, insert_line; char regstr[256]; char swzstr[20]; - int insert_line; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; const char *one = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ONE); const char *two = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_TWO); /* Assume a new line will be added */ - insert_line = 1; + insert_line = TRUE; /* Get register name */ shader_arb_get_register_name(ins, &src->reg, regstr, &is_color); @@ -1513,11 +1519,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in { case WINED3DSPSM_NONE: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_NEG: sprintf(outregstr, "-%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_BIAS: shader_addline(buffer, "ADD T%c, %s, -coefdiv.x;\n", 'A' + tmpreg, regstr); @@ -1551,7 +1557,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in case WINED3DSPSM_ABS: if(ctx->target_version >= NV2) { sprintf(outregstr, "|%s%s|", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } else { shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); } @@ -1563,11 +1569,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); sprintf(outregstr, "-T%c%s", 'A' + tmpreg, swzstr); } - insert_line = 0; + insert_line = FALSE; break; default: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } /* Return modified or original register, with swizzle */ @@ -1837,7 +1843,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) const struct arb_vshader_private *shader_data = shader->backend_data; src0_param[0] = '\0'; - if (shader_data->rel_offset) + if (shader_data->rel_offset && ctx->target_version == ARB) { const char *offset = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_VS_REL_OFFSET); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param); @@ -3442,29 +3448,29 @@ static void arbfp_add_sRGB_correction(struct wined3d_shader_buffer *buffer, cons if(condcode) { /* Sigh. MOVC CC doesn't work, so use one of the temps as dummy dest */ - shader_addline(buffer, "SUBC %s, %s.x, srgb_consts1.y;\n", tmp1, fragcolor); + shader_addline(buffer, "SUBC %s, %s.x, srgb_consts1.x;\n", tmp1, fragcolor); /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW %s.x (GE), %s.x, srgb_consts1.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "POW %s.y (GE), %s.y, srgb_consts1.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "POW %s.z (GE), %s.z, srgb_consts1.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "MUL %s.xyz (GE), %s, srgb_consts1.w;\n", fragcolor, fragcolor); - shader_addline(buffer, "SUB %s.xyz (GE), %s, srgb_consts2.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.x (GE), %s.x, srgb_consts0.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.y (GE), %s.y, srgb_consts0.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.z (GE), %s.z, srgb_consts0.x;\n", fragcolor, fragcolor); + shader_addline(buffer, "MUL %s.xyz (GE), %s, srgb_consts0.y;\n", fragcolor, fragcolor); + shader_addline(buffer, "SUB %s.xyz (GE), %s, srgb_consts0.z;\n", fragcolor, fragcolor); /* Calculate the < case */ - shader_addline(buffer, "MUL %s.xyz (LT), srgb_consts1.x, %s;\n", fragcolor, fragcolor); + shader_addline(buffer, "MUL %s.xyz (LT), srgb_consts0.w, %s;\n", fragcolor, fragcolor); } else { /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW %s.x, %s.x, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.y, %s.y, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.z, %s.z, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "MUL %s, %s, srgb_consts1.w;\n", tmp1, tmp1); - shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); + shader_addline(buffer, "POW %s.x, %s.x, srgb_consts0.x;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.y, %s.y, srgb_consts0.x;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.z, %s.z, srgb_consts0.x;\n", tmp1, fragcolor); + shader_addline(buffer, "MUL %s, %s, srgb_consts0.y;\n", tmp1, tmp1); + shader_addline(buffer, "SUB %s, %s, srgb_consts0.z;\n", tmp1, tmp1); /* Calculate the < case */ - shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); + shader_addline(buffer, "MUL %s, srgb_consts0.w, %s;\n", tmp2, fragcolor); /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); - shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); + shader_addline(buffer, "SLT %s, srgb_consts1.x, %s;\n", tmp3, fragcolor); + shader_addline(buffer, "SGE %s, srgb_consts1.x, %s;\n", tmp4, fragcolor); /* Store the components > 0.0031308 in the destination */ shader_addline(buffer, "MUL %s.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); /* Add the components that are < 0.0031308 */ @@ -3593,6 +3599,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, BOOL custom_linear_fog = FALSE; char srgbtmp[4][4]; + char ftoa_tmp[17]; unsigned int i, found = 0; for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) @@ -3718,7 +3725,8 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */ shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); - shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, %1.10f, 0.0 };\n", eps); + wined3d_ftoa(eps, ftoa_tmp); + shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, %s, 0.0 };\n", ftoa_tmp); if (reg_maps->shader_version.major < 2) { @@ -3742,11 +3750,14 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, } } - if(args->super.srgb_correction) { - shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", - srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); - shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", - srgb_sub_high, 0.0, 0.0, 0.0); + if (args->super.srgb_correction) + { + shader_addline(buffer, "PARAM srgb_consts0 = "); + shader_arb_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "PARAM srgb_consts1 = "); + shader_arb_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_addline(buffer, ";\n"); } /* Base Declarations */ @@ -3972,7 +3983,7 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win TRACE("Found existing signature %u\n", found_sig->idx); return found_sig->idx; } - found_sig = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sig)); + found_sig = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*found_sig)); found_sig->sig = clone_sig(sig); found_sig->idx = priv->ps_sig_number++; TRACE("New signature stored and assigned number %u\n", found_sig->idx); @@ -4203,7 +4214,9 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, shader_addline(buffer, "TEMP TMP_FOGCOORD;\n"); if (need_helper_const(shader_data, reg_maps, gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); + char ftoa_tmp[17]; + wined3d_ftoa(eps, ftoa_tmp); + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %s};\n", ftoa_tmp); } if (need_rel_addr_const(shader_data, reg_maps, gl_info)) { @@ -4412,12 +4425,9 @@ static inline BOOL vs_args_equal(const struct arb_vs_compile_args *stored, const } static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *shader, - const struct arb_vs_compile_args *args, + const struct wined3d_gl_info *gl_info, DWORD use_map, const struct arb_vs_compile_args *args, const struct wined3d_shader_signature_element *ps_input_sig) { - struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - DWORD use_map = device->stream_info.use_map; UINT i; DWORD new_size; struct arb_vs_compiled_shader *new_array; @@ -4508,7 +4518,7 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, int i; WORD int_skip; - find_ps_compile_args(state, shader, &args->super); + find_ps_compile_args(state, shader, context->stream_info.position_transformed, &args->super, gl_info); /* This forces all local boolean constants to 1 to make them stateblock independent */ args->bools = shader->reg_maps.local_bool_consts; @@ -4559,19 +4569,19 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, const struct wined3d_context *context, const struct wined3d_shader *shader, struct arb_vs_compile_args *args) { - struct wined3d_device *device = shader->device; + const struct wined3d_device *device = shader->device; const struct wined3d_adapter *adapter = device->adapter; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; - find_vs_compile_args(state, shader, &args->super); + find_vs_compile_args(state, shader, context->stream_info.swizzle_map, &args->super); args->clip.boolclip_compare = 0; if (use_ps(state)) { - const struct wined3d_shader *ps = state->pixel_shader; + const struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct arb_pshader_private *shader_priv = ps->backend_data; args->ps_signature = shader_priv->input_signature_idx; @@ -4581,9 +4591,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, { args->ps_signature = ~0; if (!d3d_info->vs_clipping && adapter->fragment_pipe == &arbfp_fragment_pipeline) - { - args->clip.boolclip.clip_texcoord = ffp_clip_emul(state) ? d3d_info->limits.ffp_blend_stages : 0; - } + args->clip.boolclip.clip_texcoord = ffp_clip_emul(context) ? d3d_info->limits.ffp_blend_stages : 0; /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } @@ -4603,9 +4611,9 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, args->clip.boolclip.bools |= ( 1 << i); } - args->vertex.samplers[0] = device->texUnitMap[MAX_FRAGMENT_SAMPLERS + 0]; - args->vertex.samplers[1] = device->texUnitMap[MAX_FRAGMENT_SAMPLERS + 1]; - args->vertex.samplers[2] = device->texUnitMap[MAX_FRAGMENT_SAMPLERS + 2]; + args->vertex.samplers[0] = context->tex_unit_map[MAX_FRAGMENT_SAMPLERS + 0]; + args->vertex.samplers[1] = context->tex_unit_map[MAX_FRAGMENT_SAMPLERS + 1]; + args->vertex.samplers[2] = context->tex_unit_map[MAX_FRAGMENT_SAMPLERS + 2]; args->vertex.samplers[3] = 0; /* Skip if unused or local */ @@ -4645,7 +4653,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context /* Deal with pixel shaders first so the vertex shader arg function has the input signature ready */ if (use_ps(state)) { - struct wined3d_shader *ps = state->pixel_shader; + struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; struct arb_ps_compile_args compile_args; struct arb_ps_compiled_shader *compiled; @@ -4712,7 +4720,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context if (use_vs(state)) { - struct wined3d_shader *vs = state->vertex_shader; + struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; struct arb_vs_compile_args compile_args; struct arb_vs_compiled_shader *compiled; const struct wined3d_shader_signature_element *ps_input_sig; @@ -4726,9 +4734,10 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context if (compile_args.ps_signature == ~0U) ps_input_sig = NULL; else - ps_input_sig = state->pixel_shader->input_signature; + ps_input_sig = state->shader[WINED3D_SHADER_TYPE_PIXEL]->input_signature; - compiled = find_arb_vshader(vs, &compile_args, ps_input_sig); + compiled = find_arb_vshader(vs, context->gl_info, context->stream_info.use_map, + &compile_args, ps_input_sig); priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled; @@ -5300,7 +5309,7 @@ static BOOL get_bool_const(const struct wined3d_shader_instruction *ins, if (reg_maps->local_bool_consts & flag) { - /* What good is a if(bool) with a hardcoded local constant? I don't know, but handle it */ + /* What good is an if(bool) with a hardcoded local constant? I don't know, but handle it */ LIST_FOR_EACH_ENTRY(constant, &shader->constantsB, struct wined3d_shader_lconst, entry) { if (constant->idx == idx) @@ -6170,7 +6179,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; UINT lowest_disabled_stage; const char *textype; - const char *instr, *sat; + const char *instr; char colorcor_dst[8]; GLuint ret; DWORD arg0, arg1, arg2; @@ -6285,11 +6294,14 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); - if(settings->sRGB_write) { - shader_addline(&buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", - srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); - shader_addline(&buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", - srgb_sub_high, 0.0, 0.0, 0.0); + if (settings->sRGB_write) + { + shader_addline(&buffer, "PARAM srgb_consts0 = "); + shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const0); + shader_addline(&buffer, ";\n"); + shader_addline(&buffer, "PARAM srgb_consts1 = "); + shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const1); + shader_addline(&buffer, ";\n"); } if (lowest_disabled_stage < 7 && settings->emul_clipplanes) @@ -6310,12 +6322,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con default: textype = "unexpected_textype"; break; } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - sat = ""; - else - sat = "_SAT"; - if(settings->op[stage].projected == proj_none) { instr = "TEX"; } else if(settings->op[stage].projected == proj_count4 || @@ -6350,8 +6356,8 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); } - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) { shader_addline(&buffer, "MAD_SAT ret.x, tex%u.z, luminance%u.x, luminance%u.y;\n", @@ -6361,11 +6367,11 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } else if(settings->op[stage].projected == proj_count3) { shader_addline(&buffer, "MOV ret, fragment.texcoord[%u];\n", stage); shader_addline(&buffer, "MOV ret.w, ret.z;\n"); - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); } else { - shader_addline(&buffer, "%s%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", - instr, sat, stage, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", + instr, stage, stage, stage, textype); } sprintf(colorcor_dst, "tex%u", stage); @@ -6564,7 +6570,7 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (!isStateDirty(context, STATE_PIXELSHADER)) + if (!isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL))) fragment_prog_arbfp(context, state, state_id); if (!state->render_states[WINED3D_RS_FOGENABLE]) @@ -6598,141 +6604,141 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 static void textransform(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (!isStateDirty(context, STATE_PIXELSHADER)) + if (!isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL))) fragment_prog_arbfp(context, state, state_id); } static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_OP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG1), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG2), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG0), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG0), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT00), set_bumpmat_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_LSCALE), { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_LSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_LOFFSET), { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_LSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_PIXELSHADER, { STATE_PIXELSHADER, fragment_prog_arbfp }, WINED3D_GL_EXT_NONE }, + {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), fragment_prog_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGENABLE), { STATE_RENDER(WINED3D_RS_FOGENABLE), state_arbfp_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), { STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), { STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGSTART), { STATE_RENDER(WINED3D_RS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGEND), { STATE_RENDER(WINED3D_RS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), state_srgbwrite }, ARB_FRAMEBUFFER_SRGB }, - {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGCOLOR), { STATE_RENDER(WINED3D_RS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGDENSITY), { STATE_RENDER(WINED3D_RS_FOGDENSITY), state_fogdensity }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), textransform }, WINED3D_GL_EXT_NONE }, @@ -6888,6 +6894,8 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum compl static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, char *luminance) { const char *tex; + static const float yv12_coef[] + = {2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f}; switch(textype) { case GL_TEXTURE_2D: tex = "2D"; break; @@ -6935,8 +6943,9 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, * When reading from rectangle textures, keep in mind that the input y coordinates * go from 0 to d3d_height, whereas the opengl texture height is 1.5 * d3d_height */ - shader_addline(buffer, "PARAM yv12_coef = {%f, %f, %f, %f};\n", - 2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f); + shader_addline(buffer, "PARAM yv12_coef = "); + shader_arb_append_imm_vec4(buffer, yv12_coef); + shader_addline(buffer, ";\n"); shader_addline(buffer, "MOV texcrd, fragment.texcoord[0];\n"); /* the chroma planes have only half the width */ @@ -7101,7 +7110,7 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; - BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) != 0; + BOOL colorkey = !!(surface->container->color_key_flags & WINEDDSD_CKSRCBLT); d3dfmt_p8_init_palette(surface, table, colorkey); @@ -7286,12 +7295,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum textype; - - if (surface->container) - textype = surface->container->target; - else - textype = surface->texture_target; + GLenum textype = surface->container->target; if (surface->flags & SFLAG_CONVERTED) { @@ -7439,9 +7443,14 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; + /* Activate the destination context, set it up for blitting */ + context = context_acquire(device, dst_surface); + /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) + && (src_surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DRAWABLE)) + == WINED3D_LOCATION_DRAWABLE + && !surface_is_offscreen(src_surface)) { /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can @@ -7454,10 +7463,8 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - surface_internal_preload(src_surface, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); - /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); context_apply_blit_state(context, device); if (!surface_is_offscreen(dst_surface)) @@ -7477,11 +7484,12 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, context_release(context); - surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); + surface_validate_location(dst_surface, dst_surface->draw_binding); + surface_invalidate_location(dst_surface, ~dst_surface->draw_binding); + return WINED3D_OK; } -/* Do not call while under the GL lock. */ static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color *color) { @@ -7489,7 +7497,6 @@ static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined return WINED3DERR_INVALIDCALL; } -/* Do not call while under the GL lock. */ static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, float depth) { diff --git a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c index 0dd577441b1..92c25dbe27b 100644 --- a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c +++ b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c @@ -868,7 +868,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined */ for (i = 0; i < desc->num_textures_used; ++i) { - mapped_stage = device->texUnitMap[i]; + mapped_stage = context->tex_unit_map[i]; if (mapped_stage != WINED3D_UNMAPPED_STAGE) { context_active_texture(context, gl_info, mapped_stage); @@ -916,7 +916,7 @@ static void set_bumpmat(struct wined3d_context *context, const struct wined3d_st static void textransform(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (!isStateDirty(context, STATE_PIXELSHADER)) + if (!isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL))) set_tex_op_atifs(context, state, state_id); } @@ -1075,7 +1075,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_TEXTURESTAGE(5,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(5, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), textransform }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(6, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), textransform }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(7, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), textransform }, WINED3D_GL_EXT_NONE }, - {STATE_PIXELSHADER, { STATE_PIXELSHADER, atifs_apply_pixelshader }, WINED3D_GL_EXT_NONE }, + {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), atifs_apply_pixelshader }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; diff --git a/reactos/dll/directx/wine/wined3d/buffer.c b/reactos/dll/directx/wine/wined3d/buffer.c index 5a0f0abc8aa..6a6fbcf2776 100644 --- a/reactos/dll/directx/wine/wined3d/buffer.c +++ b/reactos/dll/directx/wine/wined3d/buffer.c @@ -3,7 +3,7 @@ * Copyright 2002-2005 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2007-2011, 2013 Stefan Dösinger for CodeWeavers + * Copyright 2007-2011, 2013-2014 Stefan Dösinger for CodeWeavers * Copyright 2009-2010 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -115,10 +115,11 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g } /* Context activation is done by the caller. */ -static void buffer_create_buffer_object(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) +static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) { GLenum gl_usage = GL_STATIC_DRAW_ARB; GLenum error; + const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", This, debug_d3dusage(This->resource.usage)); @@ -145,7 +146,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc } if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(This->resource.device, STATE_INDEXBUFFER); + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) @@ -177,7 +178,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc * calling glBufferSubData on updates. Upload the actual data in case * we're not double buffering, so we can release the heap mem afterwards */ - GL_EXTCALL(glBufferDataARB(This->buffer_type_hint, This->resource.size, This->resource.allocatedMemory, gl_usage)); + GL_EXTCALL(glBufferDataARB(This->buffer_type_hint, This->resource.size, This->resource.heap_memory, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -185,19 +186,12 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc goto fail; } - This->buffer_object_size = This->resource.size; This->buffer_object_usage = gl_usage; if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) - { buffer_invalidate_bo_range(This, 0, 0); - } else - { - wined3d_resource_free_sysmem(This->resource.heap_memory); - This->resource.allocatedMemory = NULL; - This->resource.heap_memory = NULL; - } + wined3d_resource_free_sysmem(&This->resource); return; @@ -265,9 +259,11 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, return ret; } +#define WINED3D_BUFFER_FIXUP_D3DCOLOR 0x01 +#define WINED3D_BUFFER_FIXUP_XYZRHW 0x02 + static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, const BOOL check_d3dcolor, const BOOL check_position, const BOOL is_ffp_color, - DWORD *stride_this_run) + UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; enum wined3d_format_id format; @@ -282,13 +278,11 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win format = attrib->format->id; /* Look for newly appeared conversion */ - if (check_d3dcolor && format == WINED3DFMT_B8G8R8A8_UNORM) + if (fixup_flags & WINED3D_BUFFER_FIXUP_D3DCOLOR && format == WINED3DFMT_B8G8R8A8_UNORM) { ret = buffer_process_converted_attribute(This, CONV_D3DCOLOR, attrib, stride_this_run); - - if (!is_ffp_color) FIXME("Test for non-color fixed function WINED3DFMT_B8G8R8A8_UNORM format\n"); } - else if (check_position && si->position_transformed) + else if (fixup_flags & WINED3D_BUFFER_FIXUP_XYZRHW && si->position_transformed) { if (format != WINED3DFMT_R32G32B32A32_FLOAT) { @@ -306,14 +300,9 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win return ret; } -static BOOL buffer_find_decl(struct wined3d_buffer *This) +static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_stream_info *si, + DWORD fixup_flags) { - struct wined3d_device *device = This->resource.device; - const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_stream_info *si = &device->stream_info; - const struct wined3d_state *state = &device->state; - BOOL support_d3dcolor = adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA]; - BOOL support_xyzrhw = adapter->d3d_info.xyzrhw; UINT stride_this_run = 0; BOOL ret = FALSE; @@ -326,9 +315,9 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) if(This->resource.usage & WINED3DUSAGE_STATICDECL) return FALSE; } - if (use_vs(state)) + if (!fixup_flags) { - TRACE("Vertex shaders used, no VBO conversion is needed\n"); + TRACE("No fixup required.\n"); if(This->conversion_map) { HeapFree(GetProcessHeap(), 0, This->conversion_map); @@ -387,29 +376,31 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) */ ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, - TRUE, !support_xyzrhw, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; + fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; + ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, - !support_d3dcolor, FALSE, TRUE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_SPECULAR, - !support_d3dcolor, FALSE, TRUE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD0, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD1, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD2, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD3, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD4, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD5, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD6, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD7, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; if (!stride_this_run && This->conversion_map) { @@ -457,7 +448,7 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) { data->buffer_object = buffer->buffer_object; @@ -465,7 +456,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_in { if ((buffer->flags & WINED3D_BUFFER_CREATEBO) && !buffer->resource.map_count) { - buffer_create_buffer_object(buffer, gl_info); + buffer_create_buffer_object(buffer, context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->buffer_object) { @@ -474,7 +465,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_in return; } } - data->addr = buffer->resource.allocatedMemory; + data->addr = buffer->resource.heap_memory; } else { @@ -492,25 +483,27 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) +BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) { - /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ - if(This->resource.allocatedMemory) return This->resource.allocatedMemory; + const struct wined3d_gl_info *gl_info = context->gl_info; - This->resource.heap_memory = wined3d_resource_allocate_sysmem(This->resource.size); - This->resource.allocatedMemory = This->resource.heap_memory; + /* Heap_memory exists if the buffer is double buffered or has no buffer object at all. */ + if (This->resource.heap_memory) + return This->resource.heap_memory; + + if (!wined3d_resource_allocate_sysmem(&This->resource)) + ERR("Failed to allocate system memory.\n"); if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(This->resource.device, STATE_INDEXBUFFER); + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); - GL_EXTCALL(glGetBufferSubDataARB(This->buffer_type_hint, 0, This->resource.size, This->resource.allocatedMemory)); + GL_EXTCALL(glGetBufferSubDataARB(This->buffer_type_hint, 0, This->resource.size, This->resource.heap_memory)); This->flags |= WINED3D_BUFFER_DOUBLEBUFFER; - return This->resource.allocatedMemory; + return This->resource.heap_memory; } -/* Do not call while under the GL lock. */ static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); @@ -527,7 +520,7 @@ static void buffer_unload(struct wined3d_resource *resource) /* Download the buffer, but don't permanently enable double buffering */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { - buffer_get_sysmem(buffer, context->gl_info); + buffer_get_sysmem(buffer, context); buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } @@ -547,7 +540,6 @@ static void buffer_unload(struct wined3d_resource *resource) resource_unload(resource); } -/* Do not call while under the GL lock. */ ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); @@ -709,7 +701,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined start = This->maps[This->modified_areas].offset; len = This->maps[This->modified_areas].size; - memcpy(map + start, This->resource.allocatedMemory + start, len); + memcpy(map + start, (BYTE *)This->resource.heap_memory + start, len); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -726,14 +718,14 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined checkGLcall("glUnmapBufferARB"); } -/* Do not call while under the GL lock. */ -void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) +/* Context activation is done by the caller. */ +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; UINT start = 0, end = 0, len = 0, vertices; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; BOOL decl_changed = FALSE; unsigned int i, j; BYTE *data; @@ -753,9 +745,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) /* TODO: Make converting independent from VBOs */ if (buffer->flags & WINED3D_BUFFER_CREATEBO) { - context = context_acquire(device, NULL); - buffer_create_buffer_object(buffer, context->gl_info); - context_release(context); + buffer_create_buffer_object(buffer, context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } else @@ -765,10 +755,21 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } } - /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if (device->isInDraw && buffer->resource.bind_count > 0) + /* Reading the declaration makes only sense if we have valid state information + * (i.e., if this function is called during draws). */ + if (state) { - decl_changed = buffer_find_decl(buffer); + DWORD fixup_flags = 0; + + if (!use_vs(state)) + { + if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; + if (!context->d3d_info->xyzrhw) + fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; + } + + decl_changed = buffer_find_decl(buffer, &context->stream_info, fixup_flags); buffer->flags |= WINED3D_BUFFER_HASDESC; } @@ -852,7 +853,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) if (!buffer->conversion_map) { /* That means that there is nothing to fixup. Just upload from - * buffer->resource.allocatedMemory directly into the vbo. Do not + * buffer->resource.heap_memory directly into the vbo. Do not * free the system memory copy because drawPrimitive may need it if * the stride is 0, for instancing emulation, vertex blending * emulation or shader emulation. */ @@ -864,19 +865,16 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) return; } - context = context_acquire(device, NULL); buffer_direct_upload(buffer, context->gl_info, flags); - context_release(context); return; } - context = context_acquire(device, NULL); gl_info = context->gl_info; if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { - buffer_get_sysmem(buffer, gl_info); + buffer_get_sysmem(buffer, context); } /* Now for each vertex in the buffer that needs conversion */ @@ -891,7 +889,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) len = buffer->maps[buffer->modified_areas].size; end = start + len; - memcpy(data + start, buffer->resource.allocatedMemory + start, end - start); + memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertices); ++i) { for (j = 0; j < buffer->stride; ++j) @@ -924,6 +922,13 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } HeapFree(GetProcessHeap(), 0, data); +} + +void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) +{ + struct wined3d_context *context; + context = context_acquire(buffer->resource.device, NULL); + buffer_internal_preload(buffer, context, NULL); context_release(context); } @@ -938,6 +943,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN { BOOL dirty = buffer_is_dirty(buffer); LONG count; + BYTE *base; TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); @@ -973,7 +979,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); - buffer->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(buffer->buffer_type_hint, + buffer->map_ptr = GL_EXTCALL(glMapBufferRange(buffer->buffer_type_hint, 0, buffer->resource.size, mapflags)); checkGLcall("glMapBufferRange"); } @@ -981,18 +987,18 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN { if (buffer->flags & WINED3D_BUFFER_APPLESYNC) buffer_sync_apple(buffer, flags, gl_info); - buffer->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(buffer->buffer_type_hint, + buffer->map_ptr = GL_EXTCALL(glMapBufferARB(buffer->buffer_type_hint, GL_READ_WRITE_ARB)); checkGLcall("glMapBufferARB"); } - if (((DWORD_PTR)buffer->resource.allocatedMemory) & (RESOURCE_ALIGNMENT - 1)) + if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - WARN("Pointer %p is not %u byte aligned.\n", buffer->resource.allocatedMemory, RESOURCE_ALIGNMENT); + WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); GL_EXTCALL(glUnmapBufferARB(buffer->buffer_type_hint)); checkGLcall("glUnmapBufferARB"); - buffer->resource.allocatedMemory = NULL; + buffer->map_ptr = NULL; if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) { @@ -1009,9 +1015,10 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN else { TRACE("Falling back to doublebuffered operation\n"); - buffer_get_sysmem(buffer, gl_info); + buffer_get_sysmem(buffer, context); } - TRACE("New pointer is %p.\n", buffer->resource.allocatedMemory); + TRACE("New pointer is %p.\n", buffer->resource.heap_memory); + buffer->map_ptr = NULL; } context_release(context); } @@ -1037,9 +1044,10 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN } } - *data = buffer->resource.allocatedMemory + offset; + base = buffer->map_ptr ? buffer->map_ptr : buffer->resource.heap_memory; + *data = base + offset; - TRACE("Returning memory at %p (base %p, offset %u).\n", *data, buffer->resource.allocatedMemory, offset); + TRACE("Returning memory at %p (base %p, offset %u).\n", *data, base, offset); /* TODO: check Flags compatibility with buffer->currentDesc.Usage (see MSDN) */ return WINED3D_OK; @@ -1105,7 +1113,6 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); - buffer->resource.allocatedMemory = NULL; buffer_clear_dirty_areas(buffer); } else if (buffer->flags & WINED3D_BUFFER_HASDESC) @@ -1145,7 +1152,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->buffer_type_hint = bind_hint; TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, - debug_d3dformat(buffer->resource.format->id), buffer->resource.allocatedMemory, buffer); + debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory, buffer); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING) { diff --git a/reactos/dll/directx/wine/wined3d/context.c b/reactos/dll/directx/wine/wined3d/context.c index cfa5974216c..b9afbe1f8b4 100644 --- a/reactos/dll/directx/wine/wined3d/context.c +++ b/reactos/dll/directx/wine/wined3d/context.c @@ -131,14 +131,14 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, { switch (location) { - case SFLAG_INTEXTURE: - case SFLAG_INSRGBTEX: + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_TEXTURE_SRGB: surface_prepare_texture(depth_stencil, context, FALSE); if (format_flags & WINED3DFMT_FLAG_DEPTH) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, - depth_stencil->texture_target, depth_stencil->texture_name, + depth_stencil->texture_target, depth_stencil->container->texture_rgb.name, depth_stencil->texture_level); checkGLcall("glFramebufferTexture2D()"); } @@ -146,26 +146,26 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, if (format_flags & WINED3DFMT_FLAG_STENCIL) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, - depth_stencil->texture_target, depth_stencil->texture_name, + depth_stencil->texture_target, depth_stencil->container->texture_rgb.name, depth_stencil->texture_level); checkGLcall("glFramebufferTexture2D()"); } break; - case SFLAG_INRB_MULTISAMPLE: + case WINED3D_LOCATION_RB_MULTISAMPLE: surface_prepare_rb(depth_stencil, gl_info, TRUE); context_attach_depth_stencil_rb(gl_info, fbo_target, format_flags, depth_stencil->rb_multisample); break; - case SFLAG_INRB_RESOLVED: + case WINED3D_LOCATION_RB_RESOLVED: surface_prepare_rb(depth_stencil, gl_info, FALSE); context_attach_depth_stencil_rb(gl_info, fbo_target, format_flags, depth_stencil->rb_resolved); break; default: - ERR("Unsupported location %s (%#x).\n", debug_surflocation(location), location); + ERR("Unsupported location %s (%#x).\n", wined3d_debug_location(location), location); break; } } @@ -206,9 +206,9 @@ static void context_attach_surface_fbo(struct wined3d_context *context, switch (location) { - case SFLAG_INTEXTURE: - case SFLAG_INSRGBTEX: - srgb = location == SFLAG_INSRGBTEX; + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_TEXTURE_SRGB: + srgb = location == WINED3D_LOCATION_TEXTURE_SRGB; surface_prepare_texture(surface, context, srgb); gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, surface->texture_target, surface_get_texture_name(surface, gl_info, srgb), @@ -216,14 +216,14 @@ static void context_attach_surface_fbo(struct wined3d_context *context, checkGLcall("glFramebufferTexture2D()"); break; - case SFLAG_INRB_MULTISAMPLE: + case WINED3D_LOCATION_RB_MULTISAMPLE: surface_prepare_rb(surface, gl_info, TRUE); gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_COLOR_ATTACHMENT0 + idx, GL_RENDERBUFFER, surface->rb_multisample); checkGLcall("glFramebufferRenderbuffer()"); break; - case SFLAG_INRB_RESOLVED: + case WINED3D_LOCATION_RB_RESOLVED: surface_prepare_rb(surface, gl_info, FALSE); gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_COLOR_ATTACHMENT0 + idx, GL_RENDERBUFFER, surface->rb_resolved); @@ -231,7 +231,7 @@ static void context_attach_surface_fbo(struct wined3d_context *context, break; default: - ERR("Unsupported location %s (%#x).\n", debug_surflocation(location), location); + ERR("Unsupported location %s (%#x).\n", wined3d_debug_location(location), location); break; } } @@ -268,7 +268,7 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ return; } - FIXME("\tLocation %s (%#x).\n", debug_surflocation(context->current_fbo->location), + FIXME("\tLocation %s (%#x).\n", wined3d_debug_location(context->current_fbo->location), context->current_fbo->location); /* Dump the FBO attachments */ @@ -459,7 +459,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context->rebind_fbo = FALSE; } - if (location == SFLAG_INDRAWABLE) + if (location == WINED3D_LOCATION_DRAWABLE) { context->current_fbo = NULL; context_bind_fbo(context, target, 0); @@ -806,6 +806,8 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) context_set_current(NULL); return FALSE; } + + ctx->valid = 1; } return TRUE; } @@ -836,25 +838,9 @@ static void context_update_window(struct wined3d_context *context) context, context->win_handle, context->swapchain->win_handle); if (context->valid) - { - /* You'd figure ReleaseDC() would fail if the DC doesn't match the - * window. However, that's not what actually happens, and there are - * user32 tests that confirm ReleaseDC() with the wrong window is - * supposed to succeed. So explicitly check that the DC belongs to - * the window, since we want to avoid releasing a DC that belongs to - * some other window if the original window was already destroyed. */ - if (WindowFromDC(context->hdc) != context->win_handle) - { - WARN("DC %p does not belong to window %p.\n", - context->hdc, context->win_handle); - } - else if (!ReleaseDC(context->win_handle, context->hdc)) - { - ERR("Failed to release device context %p, last error %#x.\n", - context->hdc, GetLastError()); - } - } - else context->valid = 1; + wined3d_release_dc(context->win_handle, context->hdc); + else + context->valid = 1; context->win_handle = context->swapchain->win_handle; @@ -879,7 +865,6 @@ err: context->valid = 0; } -/* Do not call while under the GL lock. */ static void context_destroy_gl_resources(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -980,7 +965,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) ERR("Failed to disable GL context.\n"); } - ReleaseDC(context->win_handle, context->hdc); + wined3d_release_dc(context->win_handle, context->hdc); if (!wglDeleteContext(context->glCtx)) { @@ -1004,7 +989,6 @@ struct wined3d_context *context_get_current(void) return TlsGetValue(wined3d_context_tls_idx); } -/* Do not call while under the GL lock. */ BOOL context_set_current(struct wined3d_context *ctx) { struct wined3d_context *old = context_get_current(); @@ -1289,7 +1273,6 @@ static void WINE_GLAPI wined3d_debug_callback(GLenum source, GLenum type, GLuint } } -/* Do not call while under the GL lock. */ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) { @@ -1345,6 +1328,21 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } + /* Initialize the texture unit mapping to a 1:1 mapping */ + for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) + { + if (s < gl_info->limits.fragment_samplers) + { + ret->tex_unit_map[s] = s; + ret->rev_tex_unit_map[s] = s; + } + else + { + ret->tex_unit_map[s] = WINED3D_UNMAPPED_STAGE; + ret->rev_tex_unit_map[s] = WINED3D_UNMAPPED_STAGE; + } + } + if (!(hdc = GetDC(swapchain->win_handle))) { WARN("Failed to retireve device context, trying swapchain backup.\n"); @@ -1648,7 +1646,6 @@ out: return NULL; } -/* Do not call while under the GL lock. */ void context_destroy(struct wined3d_device *device, struct wined3d_context *context) { BOOL destroy; @@ -1768,7 +1765,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con */ for (i = gl_info->limits.textures - 1; i > 0 ; --i) { - sampler = device->rev_tex_unit_map[i]; + sampler = context->rev_tex_unit_map[i]; context_active_texture(context, gl_info, i); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) @@ -1798,7 +1795,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con } context_active_texture(context, gl_info, 0); - sampler = device->rev_tex_unit_map[0]; + sampler = context->rev_tex_unit_map[0]; if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { @@ -2091,7 +2088,7 @@ static void context_validate_onscreen_formats(struct wined3d_context *context, WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ - surface_load_location(context->current_rt, SFLAG_INTEXTURE, NULL); + surface_load_location(context->current_rt, WINED3D_LOCATION_TEXTURE_RGB); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); context_set_render_offscreen(context, TRUE); @@ -2119,7 +2116,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->render_offscreen) { - surface_internal_preload(rt, SRGB_RGB); + wined3d_texture_load(rt->container, context, FALSE); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) @@ -2206,11 +2203,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win ++i; } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, fb->depth_stencil, - rt_count ? rts[0]->draw_binding : SFLAG_INTEXTURE); + rt_count ? rts[0]->draw_binding : WINED3D_LOCATION_TEXTURE_RGB); } else { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, WINED3D_LOCATION_DRAWABLE); rt_mask = context_generate_rt_mask_from_surface(rts[0]); } @@ -2272,7 +2269,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const { const struct wined3d_state *state = &device->state; struct wined3d_surface **rts = state->fb->render_targets; - struct wined3d_shader *ps = state->pixel_shader; + struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; DWORD rt_mask, rt_mask_bits; unsigned int i; @@ -2307,7 +2304,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat { if (!context->render_offscreen) { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, WINED3D_LOCATION_DRAWABLE); } else { @@ -2324,6 +2321,238 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } } +static void context_map_stage(struct wined3d_context *context, DWORD stage, DWORD unit) +{ + DWORD i = context->rev_tex_unit_map[unit]; + DWORD j = context->tex_unit_map[stage]; + + context->tex_unit_map[stage] = unit; + if (i != WINED3D_UNMAPPED_STAGE && i != stage) + context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + + context->rev_tex_unit_map[unit] = stage; + if (j != WINED3D_UNMAPPED_STAGE && j != unit) + context->rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; +} + +static void context_invalidate_texture_stage(struct wined3d_context *context, DWORD stage) +{ + DWORD i; + + for (i = 0; i <= WINED3D_HIGHEST_TEXTURE_STATE; ++i) + context_invalidate_state(context, STATE_TEXTURESTAGE(stage, i)); +} + +static void context_update_fixed_function_usage_map(struct wined3d_context *context, + const struct wined3d_state *state) +{ + UINT i, start, end; + + context->fixed_function_usage_map = 0; + for (i = 0; i < MAX_TEXTURES; ++i) + { + enum wined3d_texture_op color_op = state->texture_states[i][WINED3D_TSS_COLOR_OP]; + enum wined3d_texture_op alpha_op = state->texture_states[i][WINED3D_TSS_ALPHA_OP]; + DWORD color_arg1 = state->texture_states[i][WINED3D_TSS_COLOR_ARG1] & WINED3DTA_SELECTMASK; + DWORD color_arg2 = state->texture_states[i][WINED3D_TSS_COLOR_ARG2] & WINED3DTA_SELECTMASK; + DWORD color_arg3 = state->texture_states[i][WINED3D_TSS_COLOR_ARG0] & WINED3DTA_SELECTMASK; + DWORD alpha_arg1 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG1] & WINED3DTA_SELECTMASK; + DWORD alpha_arg2 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG2] & WINED3DTA_SELECTMASK; + DWORD alpha_arg3 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] & WINED3DTA_SELECTMASK; + + /* Not used, and disable higher stages. */ + if (color_op == WINED3D_TOP_DISABLE) + break; + + if (((color_arg1 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG2) + || ((color_arg2 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG1) + || ((color_arg3 == WINED3DTA_TEXTURE) + && (color_op == WINED3D_TOP_MULTIPLY_ADD || color_op == WINED3D_TOP_LERP)) + || ((alpha_arg1 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG2) + || ((alpha_arg2 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG1) + || ((alpha_arg3 == WINED3DTA_TEXTURE) + && (alpha_op == WINED3D_TOP_MULTIPLY_ADD || alpha_op == WINED3D_TOP_LERP))) + context->fixed_function_usage_map |= (1 << i); + + if ((color_op == WINED3D_TOP_BUMPENVMAP || color_op == WINED3D_TOP_BUMPENVMAP_LUMINANCE) + && i < MAX_TEXTURES - 1) + context->fixed_function_usage_map |= (1 << (i + 1)); + } + + if (i < context->lowest_disabled_stage) + { + start = i; + end = context->lowest_disabled_stage; + } + else + { + start = context->lowest_disabled_stage; + end = i; + } + + context->lowest_disabled_stage = i; + for (i = start + 1; i < end; ++i) + { + context_invalidate_state(context, STATE_TEXTURESTAGE(i, WINED3D_TSS_COLOR_OP)); + } +} + +static void context_map_fixed_function_samplers(struct wined3d_context *context, + const struct wined3d_state *state) +{ + unsigned int i, tex; + WORD ffu_map; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + + context_update_fixed_function_usage_map(context, state); + ffu_map = context->fixed_function_usage_map; + + if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages + || context->lowest_disabled_stage <= d3d_info->limits.ffp_textures) + { + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (!(ffu_map & 1)) + continue; + + if (context->tex_unit_map[i] != i) + { + context_map_stage(context, i, i); + context_invalidate_state(context, STATE_SAMPLER(i)); + context_invalidate_texture_stage(context, i); + } + } + return; + } + + /* Now work out the mapping */ + tex = 0; + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (!(ffu_map & 1)) + continue; + + if (context->tex_unit_map[i] != tex) + { + context_map_stage(context, i, tex); + context_invalidate_state(context, STATE_SAMPLER(i)); + context_invalidate_texture_stage(context, i); + } + + ++tex; + } +} + +static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) +{ + const enum wined3d_sampler_texture_type *sampler_type = + state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.sampler_type; + unsigned int i; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (sampler_type[i] && context->tex_unit_map[i] != i) + { + context_map_stage(context, i, i); + context_invalidate_state(context, STATE_SAMPLER(i)); + if (i < d3d_info->limits.ffp_blend_stages) + context_invalidate_texture_stage(context, i); + } + } +} + +static BOOL context_unit_free_for_vs(const struct wined3d_context *context, + const enum wined3d_sampler_texture_type *pshader_sampler_tokens, + const enum wined3d_sampler_texture_type *vshader_sampler_tokens, DWORD unit) +{ + DWORD current_mapping = context->rev_tex_unit_map[unit]; + + /* Not currently used */ + if (current_mapping == WINED3D_UNMAPPED_STAGE) + return TRUE; + + if (current_mapping < MAX_FRAGMENT_SAMPLERS) + { + /* Used by a fragment sampler */ + + if (!pshader_sampler_tokens) + { + /* No pixel shader, check fixed function */ + return current_mapping >= MAX_TEXTURES || !(context->fixed_function_usage_map & (1 << current_mapping)); + } + + /* Pixel shader, check the shader's sampler map */ + return !pshader_sampler_tokens[current_mapping]; + } + + /* Used by a vertex sampler */ + return !vshader_sampler_tokens[current_mapping - MAX_FRAGMENT_SAMPLERS]; +} + +static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, const struct wined3d_state *state) +{ + const enum wined3d_sampler_texture_type *vshader_sampler_type = + state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.sampler_type; + const enum wined3d_sampler_texture_type *pshader_sampler_type = NULL; + const struct wined3d_gl_info *gl_info = context->gl_info; + int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; + int i; + + if (ps) + { + /* Note that we only care if a sampler is sampled or not, not the sampler's specific type. + * Otherwise we'd need to call shader_update_samplers() here for 1.x pixelshaders. */ + pshader_sampler_type = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.sampler_type; + } + + for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) { + DWORD vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; + if (vshader_sampler_type[i]) + { + if (context->tex_unit_map[vsampler_idx] != WINED3D_UNMAPPED_STAGE) + { + /* Already mapped somewhere */ + continue; + } + + while (start >= 0) + { + if (context_unit_free_for_vs(context, pshader_sampler_type, vshader_sampler_type, start)) + { + context_map_stage(context, vsampler_idx, start); + context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + + --start; + break; + } + + --start; + } + } + } +} + +static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) +{ + BOOL vs = use_vs(state); + BOOL ps = use_ps(state); + /* + * Rules are: + * -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but + * that would be really messy and require shader recompilation + * -> When the mapping of a stage is changed, sampler and ALL texture stage states have + * to be reset. Because of that try to work with a 1:1 mapping as much as possible + */ + if (ps) + context_map_psamplers(context, state); + else + context_map_fixed_function_samplers(context, state); + + if (vs) + context_map_vsamplers(context, ps, state); +} + /* Context activation is done by the caller. */ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -2341,6 +2570,260 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d } } +static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) +{ + if ((usage == WINED3D_DECL_USAGE_POSITION || usage == WINED3D_DECL_USAGE_POSITIONT) && !usage_idx) + *regnum = WINED3D_FFP_POSITION; + else if (usage == WINED3D_DECL_USAGE_BLEND_WEIGHT && !usage_idx) + *regnum = WINED3D_FFP_BLENDWEIGHT; + else if (usage == WINED3D_DECL_USAGE_BLEND_INDICES && !usage_idx) + *regnum = WINED3D_FFP_BLENDINDICES; + else if (usage == WINED3D_DECL_USAGE_NORMAL && !usage_idx) + *regnum = WINED3D_FFP_NORMAL; + else if (usage == WINED3D_DECL_USAGE_PSIZE && !usage_idx) + *regnum = WINED3D_FFP_PSIZE; + else if (usage == WINED3D_DECL_USAGE_COLOR && !usage_idx) + *regnum = WINED3D_FFP_DIFFUSE; + else if (usage == WINED3D_DECL_USAGE_COLOR && usage_idx == 1) + *regnum = WINED3D_FFP_SPECULAR; + else if (usage == WINED3D_DECL_USAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) + *regnum = WINED3D_FFP_TEXCOORD0 + usage_idx; + else + { + FIXME("Unsupported input stream [usage=%s, usage_idx=%u].\n", debug_d3ddeclusage(usage), usage_idx); + *regnum = ~0U; + return FALSE; + } + + return TRUE; +} + +/* FIXME: Separate buffer loading from declaration decoding */ +/* Context activation is done by the caller. */ +void context_stream_info_from_declaration(struct wined3d_context *context, + const struct wined3d_state *state, struct wined3d_stream_info *stream_info) +{ + /* We need to deal with frequency data! */ + struct wined3d_vertex_declaration *declaration = state->vertex_declaration; + BOOL use_vshader = use_vs(state); + unsigned int i; + WORD map; + + stream_info->use_map = 0; + stream_info->swizzle_map = 0; + stream_info->all_vbo = 1; + stream_info->position_transformed = declaration->position_transformed; + + /* Translate the declaration into strided data. */ + for (i = 0; i < declaration->element_count; ++i) + { + const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; + const struct wined3d_stream_state *stream = &state->streams[element->input_slot]; + struct wined3d_buffer *buffer = stream->buffer; + struct wined3d_bo_address data; + BOOL stride_used; + unsigned int idx; + DWORD stride; + + TRACE("%p Element %p (%u of %u).\n", declaration->elements, + element, i + 1, declaration->element_count); + + if (!buffer) continue; + + stride = stream->stride; + TRACE("Stream %u in buffer %p.\n", element->input_slot, buffer); + buffer_get_memory(buffer, context, &data); + + /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets + * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory + * sources. In most sane cases the pointer - offset will still be > 0, otherwise it will wrap + * around to some big value. Hope that with the indices, the driver wraps it back internally. If + * not, drawStridedSlow is needed, including a vertex buffer path. */ + if (state->load_base_vertex_index < 0) + { + WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", + state->load_base_vertex_index); + data.buffer_object = 0; + data.addr = buffer_get_sysmem(buffer, context); + if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) + { + FIXME("System memory vertex data load offset is negative!\n"); + } + } + data.addr += element->offset; + + TRACE("offset %u input_slot %u usage_idx %d.\n", element->offset, element->input_slot, element->usage_idx); + + if (use_vshader) + { + if (element->output_slot == ~0U) + { + /* TODO: Assuming vertexdeclarations are usually used with the + * same or a similar shader, it might be worth it to store the + * last used output slot and try that one first. */ + stride_used = vshader_get_input(state->shader[WINED3D_SHADER_TYPE_VERTEX], + element->usage, element->usage_idx, &idx); + } + else + { + idx = element->output_slot; + stride_used = TRUE; + } + } + else + { + if (!element->ffp_valid) + { + WARN("Skipping unsupported fixed function element of format %s and usage %s.\n", + debug_d3dformat(element->format->id), debug_d3ddeclusage(element->usage)); + stride_used = FALSE; + } + else + { + stride_used = fixed_get_input(element->usage, element->usage_idx, &idx); + } + } + + if (stride_used) + { + TRACE("Load %s array %u [usage %s, usage_idx %u, " + "input_slot %u, offset %u, stride %u, format %s, buffer_object %u].\n", + use_vshader ? "shader": "fixed function", idx, + debug_d3ddeclusage(element->usage), element->usage_idx, element->input_slot, + element->offset, stride, debug_d3dformat(element->format->id), data.buffer_object); + + data.addr += stream->offset; + + stream_info->elements[idx].format = element->format; + stream_info->elements[idx].data = data; + stream_info->elements[idx].stride = stride; + stream_info->elements[idx].stream_idx = element->input_slot; + + if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA] + && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) + { + stream_info->swizzle_map |= 1 << idx; + } + stream_info->use_map |= 1 << idx; + } + } + + /* Preload the vertex buffers. */ + context->num_buffer_queries = 0; + for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) + { + struct wined3d_stream_info_element *element; + struct wined3d_buffer *buffer; + + if (!(map & 1)) + continue; + + element = &stream_info->elements[i]; + buffer = state->streams[element->stream_idx].buffer; + buffer_internal_preload(buffer, context, state); + + /* If the preload dropped the buffer object, update the stream info. */ + if (buffer->buffer_object != element->data.buffer_object) + { + element->data.buffer_object = 0; + element->data.addr = buffer_get_sysmem(buffer, context) + + (ptrdiff_t)element->data.addr; + } + + if (!buffer->buffer_object) + stream_info->all_vbo = 0; + + if (buffer->query) + context->buffer_queries[context->num_buffer_queries++] = buffer->query; + } +} + +/* Context activation is done by the caller. */ +static void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + struct wined3d_stream_info *stream_info = &context->stream_info; + DWORD prev_all_vbo = stream_info->all_vbo; + + TRACE("============================= Vertex Declaration =============================\n"); + context_stream_info_from_declaration(context, state, stream_info); + + if (use_vs(state)) + { + if (state->vertex_declaration->half_float_conv_needed && !stream_info->all_vbo) + { + TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); + context->use_immediate_mode_draw = TRUE; + } + else + { + context->use_immediate_mode_draw = FALSE; + } + } + else + { + WORD slow_mask = (1 << WINED3D_FFP_PSIZE); + slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] + & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); + + if (((stream_info->position_transformed && !d3d_info->xyzrhw) + || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) + context->use_immediate_mode_draw = TRUE; + else + context->use_immediate_mode_draw = FALSE; + } + + if (prev_all_vbo != stream_info->all_vbo) + context_invalidate_state(context, STATE_INDEXBUFFER); +} + +/* Context activation is done by the caller. */ +static void context_preload_texture(struct wined3d_context *context, + const struct wined3d_state *state, unsigned int idx) +{ + struct wined3d_texture *texture; + + if (!(texture = state->textures[idx])) + return; + + wined3d_texture_load(texture, context, state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE]); +} + +/* Context activation is done by the caller. */ +static void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) +{ + unsigned int i; + + if (use_vs(state)) + { + for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + { + if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.sampler_type[i]) + context_preload_texture(context, state, MAX_FRAGMENT_SAMPLERS + i); + } + } + + if (use_ps(state)) + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.sampler_type[i]) + context_preload_texture(context, state, i); + } + } + else + { + WORD ffu_map = context->fixed_function_usage_map; + + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (ffu_map & 1) + context_preload_texture(context, state, i); + } + } +} + /* Context activation is done by the caller. */ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) { @@ -2361,16 +2844,16 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ - device_update_tex_unit_map(device); - device_preload_textures(device); + context_update_tex_unit_map(context, state); + context_preload_textures(context, state); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) - device_update_stream_info(device, context->gl_info); + context_update_stream_info(context, state); if (state->index_buffer) { - if (device->stream_info.all_vbo) - wined3d_buffer_preload(state->index_buffer); + if (context->stream_info.all_vbo) + buffer_internal_preload(state->index_buffer, context, state); else - buffer_get_sysmem(state->index_buffer, context->gl_info); + buffer_get_sysmem(state->index_buffer, context); } for (i = 0; i < context->numDirtyEntries; ++i) @@ -2437,19 +2920,21 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d /* When switching away from an offscreen render target, and we're not * using FBOs, we have to read the drawable into the texture. This is - * done via PreLoad (and SFLAG_INDRAWABLE set on the surface). There - * are some things that need care though. PreLoad needs a GL context, + * done via PreLoad (and WINED3D_LOCATION_DRAWABLE set on the surface). + * There are some things that need care though. PreLoad needs a GL context, * and FindContext is called before the context is activated. It also * has to be called with the old rendertarget active, otherwise a * wrong drawable is read. */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && old_render_offscreen && context->current_rt != target) { + struct wined3d_texture *texture = context->current_rt->container; + /* Read the back buffer of the old drawable into the destination texture. */ - if (context->current_rt->texture_name_srgb) - surface_internal_preload(context->current_rt, SRGB_SRGB); - surface_internal_preload(context->current_rt, SRGB_RGB); - surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE); + if (texture->texture_srgb.name) + wined3d_texture_load(texture, context, TRUE); + wined3d_texture_load(texture, context, FALSE); + surface_invalidate_location(context->current_rt, WINED3D_LOCATION_DRAWABLE); } } @@ -2457,7 +2942,6 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d context_set_render_offscreen(context, render_offscreen); } -/* Do not call while under the GL lock. */ struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_surface *target) { struct wined3d_context *current_context = context_get_current(); diff --git a/reactos/dll/directx/wine/wined3d/cs.c b/reactos/dll/directx/wine/wined3d/cs.c new file mode 100644 index 00000000000..338a3e13971 --- /dev/null +++ b/reactos/dll/directx/wine/wined3d/cs.c @@ -0,0 +1,941 @@ +/* + * Copyright 2013 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +#define WINED3D_INITIAL_CS_SIZE 4096 + +enum wined3d_cs_op +{ + WINED3D_CS_OP_PRESENT, + WINED3D_CS_OP_CLEAR, + WINED3D_CS_OP_DRAW, + WINED3D_CS_OP_SET_VIEWPORT, + WINED3D_CS_OP_SET_SCISSOR_RECT, + WINED3D_CS_OP_SET_RENDER_TARGET, + WINED3D_CS_OP_SET_DEPTH_STENCIL, + WINED3D_CS_OP_SET_VERTEX_DECLARATION, + WINED3D_CS_OP_SET_STREAM_SOURCE, + WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, + WINED3D_CS_OP_SET_STREAM_OUTPUT, + WINED3D_CS_OP_SET_INDEX_BUFFER, + WINED3D_CS_OP_SET_CONSTANT_BUFFER, + WINED3D_CS_OP_SET_TEXTURE, + WINED3D_CS_OP_SET_SAMPLER, + WINED3D_CS_OP_SET_SHADER, + WINED3D_CS_OP_SET_RENDER_STATE, + WINED3D_CS_OP_SET_TEXTURE_STATE, + WINED3D_CS_OP_SET_SAMPLER_STATE, + WINED3D_CS_OP_SET_TRANSFORM, + WINED3D_CS_OP_SET_CLIP_PLANE, + WINED3D_CS_OP_SET_MATERIAL, + WINED3D_CS_OP_RESET_STATE, +}; + +struct wined3d_cs_present +{ + enum wined3d_cs_op opcode; + HWND dst_window_override; + struct wined3d_swapchain *swapchain; + const RECT *src_rect; + const RECT *dst_rect; + const RGNDATA *dirty_region; + DWORD flags; +}; + +struct wined3d_cs_clear +{ + enum wined3d_cs_op opcode; + DWORD rect_count; + const RECT *rects; + DWORD flags; + const struct wined3d_color *color; + float depth; + DWORD stencil; +}; + +struct wined3d_cs_draw +{ + enum wined3d_cs_op opcode; + UINT start_idx; + UINT index_count; + UINT start_instance; + UINT instance_count; + BOOL indexed; +}; + +struct wined3d_cs_set_viewport +{ + enum wined3d_cs_op opcode; + const struct wined3d_viewport *viewport; +}; + +struct wined3d_cs_set_scissor_rect +{ + enum wined3d_cs_op opcode; + const RECT *rect; +}; + +struct wined3d_cs_set_render_target +{ + enum wined3d_cs_op opcode; + UINT render_target_idx; + struct wined3d_surface *render_target; +}; + +struct wined3d_cs_set_depth_stencil +{ + enum wined3d_cs_op opcode; + struct wined3d_surface *depth_stencil; +}; + +struct wined3d_cs_set_vertex_declaration +{ + enum wined3d_cs_op opcode; + struct wined3d_vertex_declaration *declaration; +}; + +struct wined3d_cs_set_stream_source +{ + enum wined3d_cs_op opcode; + UINT stream_idx; + struct wined3d_buffer *buffer; + UINT offset; + UINT stride; +}; + +struct wined3d_cs_set_stream_source_freq +{ + enum wined3d_cs_op opcode; + UINT stream_idx; + UINT frequency; + UINT flags; +}; + +struct wined3d_cs_set_stream_output +{ + enum wined3d_cs_op opcode; + UINT stream_idx; + struct wined3d_buffer *buffer; + UINT offset; +}; + +struct wined3d_cs_set_index_buffer +{ + enum wined3d_cs_op opcode; + struct wined3d_buffer *buffer; + enum wined3d_format_id format_id; +}; + +struct wined3d_cs_set_constant_buffer +{ + enum wined3d_cs_op opcode; + enum wined3d_shader_type type; + UINT cb_idx; + struct wined3d_buffer *buffer; +}; + +struct wined3d_cs_set_texture +{ + enum wined3d_cs_op opcode; + UINT stage; + struct wined3d_texture *texture; +}; + +struct wined3d_cs_set_sampler +{ + enum wined3d_cs_op opcode; + enum wined3d_shader_type type; + UINT sampler_idx; + struct wined3d_sampler *sampler; +}; + +struct wined3d_cs_set_shader +{ + enum wined3d_cs_op opcode; + enum wined3d_shader_type type; + struct wined3d_shader *shader; +}; + +struct wined3d_cs_set_render_state +{ + enum wined3d_cs_op opcode; + enum wined3d_render_state state; + DWORD value; +}; + +struct wined3d_cs_set_texture_state +{ + enum wined3d_cs_op opcode; + UINT stage; + enum wined3d_texture_stage_state state; + DWORD value; +}; + +struct wined3d_cs_set_sampler_state +{ + enum wined3d_cs_op opcode; + UINT sampler_idx; + enum wined3d_sampler_state state; + DWORD value; +}; + +struct wined3d_cs_set_transform +{ + enum wined3d_cs_op opcode; + enum wined3d_transform_state state; + const struct wined3d_matrix *matrix; +}; + +struct wined3d_cs_set_clip_plane +{ + enum wined3d_cs_op opcode; + UINT plane_idx; + const struct wined3d_vec4 *plane; +}; + +struct wined3d_cs_set_material +{ + enum wined3d_cs_op opcode; + const struct wined3d_material *material; +}; + +struct wined3d_cs_reset_state +{ + enum wined3d_cs_op opcode; +}; + +static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_present *op = data; + struct wined3d_swapchain *swapchain; + + swapchain = op->swapchain; + wined3d_swapchain_set_window(swapchain, op->dst_window_override); + + swapchain->swapchain_ops->swapchain_present(swapchain, + op->src_rect, op->dst_rect, op->dirty_region, op->flags); +} + +void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) +{ + struct wined3d_cs_present *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_PRESENT; + op->dst_window_override = dst_window_override; + op->swapchain = swapchain; + op->src_rect = src_rect; + op->dst_rect = dst_rect; + op->dirty_region = dirty_region; + op->flags = flags; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_clear *op = data; + struct wined3d_device *device; + RECT draw_rect; + + device = cs->device; + wined3d_get_draw_rect(&device->state, &draw_rect); + device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, + &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, + op->color, op->depth, op->stencil); +} + +void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, + DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) +{ + struct wined3d_cs_clear *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_CLEAR; + op->rect_count = rect_count; + op->rects = rects; + op->flags = flags; + op->color = color; + op->depth = depth; + op->stencil = stencil; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_draw *op = data; + + draw_primitive(cs->device, op->start_idx, op->index_count, + op->start_instance, op->instance_count, op->indexed); +} + +void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_count, + UINT start_instance, UINT instance_count, BOOL indexed) +{ + struct wined3d_cs_draw *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_DRAW; + op->start_idx = start_idx; + op->index_count = index_count; + op->start_instance = start_instance; + op->instance_count = instance_count; + op->indexed = indexed; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_viewport(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_viewport *op = data; + + cs->state.viewport = *op->viewport; + device_invalidate_state(cs->device, STATE_VIEWPORT); +} + +void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) +{ + struct wined3d_cs_set_viewport *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_VIEWPORT; + op->viewport = viewport; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_scissor_rect *op = data; + + cs->state.scissor_rect = *op->rect; + device_invalidate_state(cs->device, STATE_SCISSORRECT); +} + +void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) +{ + struct wined3d_cs_set_scissor_rect *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; + op->rect = rect; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_render_target(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_render_target *op = data; + + cs->state.fb->render_targets[op->render_target_idx] = op->render_target; + device_invalidate_state(cs->device, STATE_FRAMEBUFFER); +} + +void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, + struct wined3d_surface *render_target) +{ + struct wined3d_cs_set_render_target *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_RENDER_TARGET; + op->render_target_idx = render_target_idx; + op->render_target = render_target; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_depth_stencil(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_depth_stencil *op = data; + struct wined3d_device *device = cs->device; + struct wined3d_surface *prev; + + if ((prev = cs->state.fb->depth_stencil)) + { + if (device->swapchains[0]->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL + || prev->flags & SFLAG_DISCARD) + { + surface_modify_ds_location(prev, WINED3D_LOCATION_DISCARDED, + prev->resource.width, prev->resource.height); + if (prev == device->onscreen_depth_stencil) + { + wined3d_surface_decref(device->onscreen_depth_stencil); + device->onscreen_depth_stencil = NULL; + } + } + } + + cs->fb.depth_stencil = op->depth_stencil; + + if (!prev != !op->depth_stencil) + { + /* Swapping NULL / non NULL depth stencil affects the depth and tests */ + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_ZENABLE)); + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILENABLE)); + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + } + else if (prev && prev->resource.format->depth_size != op->depth_stencil->resource.format->depth_size) + { + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + } + + device_invalidate_state(device, STATE_FRAMEBUFFER); +} + +void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) +{ + struct wined3d_cs_set_depth_stencil *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL; + op->depth_stencil = depth_stencil; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_vertex_declaration *op = data; + + cs->state.vertex_declaration = op->declaration; + device_invalidate_state(cs->device, STATE_VDECL); +} + +void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) +{ + struct wined3d_cs_set_vertex_declaration *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; + op->declaration = declaration; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_stream_source *op = data; + struct wined3d_stream_state *stream; + struct wined3d_buffer *prev; + + stream = &cs->state.streams[op->stream_idx]; + prev = stream->buffer; + stream->buffer = op->buffer; + stream->offset = op->offset; + stream->stride = op->stride; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + + device_invalidate_state(cs->device, STATE_STREAMSRC); +} + +void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset, UINT stride) +{ + struct wined3d_cs_set_stream_source *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; + op->stream_idx = stream_idx; + op->buffer = buffer; + op->offset = offset; + op->stride = stride; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_stream_source_freq *op = data; + struct wined3d_stream_state *stream; + + stream = &cs->state.streams[op->stream_idx]; + stream->frequency = op->frequency; + stream->flags = op->flags; + + device_invalidate_state(cs->device, STATE_STREAMSRC); +} + +void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) +{ + struct wined3d_cs_set_stream_source_freq *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ; + op->stream_idx = stream_idx; + op->frequency = frequency; + op->flags = flags; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_stream_output *op = data; + struct wined3d_stream_output *stream; + struct wined3d_buffer *prev; + + stream = &cs->state.stream_output[op->stream_idx]; + prev = stream->buffer; + stream->buffer = op->buffer; + stream->offset = op->offset; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); +} + +void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset) +{ + struct wined3d_cs_set_stream_output *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUT; + op->stream_idx = stream_idx; + op->buffer = buffer; + op->offset = offset; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_index_buffer *op = data; + struct wined3d_buffer *prev; + + prev = cs->state.index_buffer; + cs->state.index_buffer = op->buffer; + cs->state.index_format = op->format_id; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + + device_invalidate_state(cs->device, STATE_INDEXBUFFER); +} + +void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, + enum wined3d_format_id format_id) +{ + struct wined3d_cs_set_index_buffer *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_INDEX_BUFFER; + op->buffer = buffer; + op->format_id = format_id; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_constant_buffer *op = data; + struct wined3d_buffer *prev; + + prev = cs->state.cb[op->type][op->cb_idx]; + cs->state.cb[op->type][op->cb_idx] = op->buffer; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); +} + +void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT cb_idx, struct wined3d_buffer *buffer) +{ + struct wined3d_cs_set_constant_buffer *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; + op->type = type; + op->cb_idx = cb_idx; + op->buffer = buffer; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; + const struct wined3d_cs_set_texture *op = data; + struct wined3d_texture *prev; + + prev = cs->state.textures[op->stage]; + cs->state.textures[op->stage] = op->texture; + + if (op->texture) + { + if (InterlockedIncrement(&op->texture->resource.bind_count) == 1) + op->texture->sampler = op->stage; + + if (!prev || op->texture->target != prev->target) + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + + if (!prev && op->stage < d3d_info->limits.ffp_blend_stages) + { + /* The source arguments for color and alpha ops have different + * meanings when a NULL texture is bound, so the COLOR_OP and + * ALPHA_OP have to be dirtified. */ + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_COLOR_OP)); + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_ALPHA_OP)); + } + } + + if (prev) + { + if (InterlockedDecrement(&prev->resource.bind_count) && prev->sampler == op->stage) + { + unsigned int i; + + /* Search for other stages the texture is bound to. Shouldn't + * happen if applications bind textures to a single stage only. */ + TRACE("Searching for other stages the texture is bound to.\n"); + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (cs->state.textures[i] == prev) + { + TRACE("Texture is also bound to stage %u.\n", i); + prev->sampler = i; + break; + } + } + } + + if (!op->texture && op->stage < d3d_info->limits.ffp_blend_stages) + { + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_COLOR_OP)); + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_ALPHA_OP)); + } + } + + device_invalidate_state(cs->device, STATE_SAMPLER(op->stage)); +} + +void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) +{ + struct wined3d_cs_set_texture *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TEXTURE; + op->stage = stage; + op->texture = texture; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_sampler(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_sampler *op = data; + + cs->state.sampler[op->type][op->sampler_idx] = op->sampler; +} + +void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT sampler_idx, struct wined3d_sampler *sampler) +{ + struct wined3d_cs_set_sampler *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SAMPLER; + op->type = type; + op->sampler_idx = sampler_idx; + op->sampler = sampler; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_shader *op = data; + + cs->state.shader[op->type] = op->shader; + device_invalidate_state(cs->device, STATE_SHADER(op->type)); +} + +void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) +{ + struct wined3d_cs_set_shader *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SHADER; + op->type = type; + op->shader = shader; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_render_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_render_state *op = data; + + cs->state.render_states[op->state] = op->value; + device_invalidate_state(cs->device, STATE_RENDER(op->state)); +} + +void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) +{ + struct wined3d_cs_set_render_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_RENDER_STATE; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_texture_state *op = data; + + cs->state.texture_states[op->stage][op->state] = op->value; + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, op->state)); +} + +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) +{ + struct wined3d_cs_set_texture_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TEXTURE_STATE; + op->stage = stage; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_sampler_state *op = data; + + cs->state.sampler_states[op->sampler_idx][op->state] = op->value; + device_invalidate_state(cs->device, STATE_SAMPLER(op->sampler_idx)); +} + +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) +{ + struct wined3d_cs_set_sampler_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE; + op->sampler_idx = sampler_idx; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_transform *op = data; + + cs->state.transforms[op->state] = *op->matrix; + if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->gl_info.limits.blends)) + device_invalidate_state(cs->device, STATE_TRANSFORM(op->state)); +} + +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) +{ + struct wined3d_cs_set_transform *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TRANSFORM; + op->state = state; + op->matrix = matrix; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_clip_plane *op = data; + + cs->state.clip_planes[op->plane_idx] = *op->plane; + device_invalidate_state(cs->device, STATE_CLIPPLANE(op->plane_idx)); +} + +void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) +{ + struct wined3d_cs_set_clip_plane *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_CLIP_PLANE; + op->plane_idx = plane_idx; + op->plane = plane; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_material *op = data; + + cs->state.material = *op->material; + device_invalidate_state(cs->device, STATE_MATERIAL); +} + +void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) +{ + struct wined3d_cs_set_material *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_MATERIAL; + op->material = material; + + cs->ops->submit(cs); +} + +static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_adapter *adapter = cs->device->adapter; + HRESULT hr; + + state_cleanup(&cs->state); + memset(&cs->state, 0, sizeof(cs->state)); + if (FAILED(hr = state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, + WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT))) + ERR("Failed to initialize CS state, hr %#x.\n", hr); +} + +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) +{ + struct wined3d_cs_reset_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_RESET_STATE; + + cs->ops->submit(cs); +} + +static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = +{ + /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, + /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, + /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, + /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, + /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, + /* WINED3D_CS_OP_SET_RENDER_TARGET */ wined3d_cs_exec_set_render_target, + /* WINED3D_CS_OP_SET_DEPTH_STENCIL */ wined3d_cs_exec_set_depth_stencil, + /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, + /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, + /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, + /* WINED3D_CS_OP_SET_STREAM_OUTPUT */ wined3d_cs_exec_set_stream_output, + /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, + /* WINED3D_CS_OP_SET_CONSTANT_BUFFER */ wined3d_cs_exec_set_constant_buffer, + /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, + /* WINED3D_CS_OP_SET_SAMPLER */ wined3d_cs_exec_set_sampler, + /* WINED3D_CS_OP_SET_SHADER */ wined3d_cs_exec_set_shader, + /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, + /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, + /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, + /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, + /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, + /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, + /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, +}; + +static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) +{ + if (size > cs->data_size) + { + void *new_data; + + size = max( size, cs->data_size * 2 ); + if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, size))) + return NULL; + + cs->data_size = size; + cs->data = new_data; + } + + return cs->data; +} + +static void wined3d_cs_st_submit(struct wined3d_cs *cs) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)cs->data; + + wined3d_cs_op_handlers[opcode](cs, cs->data); +} + +static const struct wined3d_cs_ops wined3d_cs_st_ops = +{ + wined3d_cs_st_require_space, + wined3d_cs_st_submit, +}; + +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_cs *cs; + + if (!(cs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cs)))) + return NULL; + + if (!(cs->fb.render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*cs->fb.render_targets) * gl_info->limits.buffers))) + { + HeapFree(GetProcessHeap(), 0, cs); + return NULL; + } + + if (FAILED(state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, + WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT))) + { + HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); + HeapFree(GetProcessHeap(), 0, cs); + return NULL; + } + + cs->ops = &wined3d_cs_st_ops; + cs->device = device; + + cs->data_size = WINED3D_INITIAL_CS_SIZE; + if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size))) + { + HeapFree(GetProcessHeap(), 0, cs); + return NULL; + } + + return cs; +} + +void wined3d_cs_destroy(struct wined3d_cs *cs) +{ + state_cleanup(&cs->state); + HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); + HeapFree(GetProcessHeap(), 0, cs); +} diff --git a/reactos/dll/directx/wine/wined3d/device.c b/reactos/dll/directx/wine/wined3d/device.c index 84c4200dab4..7e60fe3b7ec 100644 --- a/reactos/dll/directx/wine/wined3d/device.c +++ b/reactos/dll/directx/wine/wined3d/device.c @@ -27,7 +27,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); /* Define the default light parameters as specified by MSDN. */ const struct wined3d_light WINED3D_default_light = @@ -127,258 +126,6 @@ static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_t } } -static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) -{ - if ((usage == WINED3D_DECL_USAGE_POSITION || usage == WINED3D_DECL_USAGE_POSITIONT) && !usage_idx) - *regnum = WINED3D_FFP_POSITION; - else if (usage == WINED3D_DECL_USAGE_BLEND_WEIGHT && !usage_idx) - *regnum = WINED3D_FFP_BLENDWEIGHT; - else if (usage == WINED3D_DECL_USAGE_BLEND_INDICES && !usage_idx) - *regnum = WINED3D_FFP_BLENDINDICES; - else if (usage == WINED3D_DECL_USAGE_NORMAL && !usage_idx) - *regnum = WINED3D_FFP_NORMAL; - else if (usage == WINED3D_DECL_USAGE_PSIZE && !usage_idx) - *regnum = WINED3D_FFP_PSIZE; - else if (usage == WINED3D_DECL_USAGE_COLOR && !usage_idx) - *regnum = WINED3D_FFP_DIFFUSE; - else if (usage == WINED3D_DECL_USAGE_COLOR && usage_idx == 1) - *regnum = WINED3D_FFP_SPECULAR; - else if (usage == WINED3D_DECL_USAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) - *regnum = WINED3D_FFP_TEXCOORD0 + usage_idx; - else - { - FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n", debug_d3ddeclusage(usage), usage_idx); - *regnum = ~0U; - return FALSE; - } - - return TRUE; -} - -/* Context activation is done by the caller. */ -static void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info) -{ - const struct wined3d_state *state = &device->state; - /* We need to deal with frequency data! */ - struct wined3d_vertex_declaration *declaration = state->vertex_declaration; - BOOL use_vshader; - unsigned int i; - WORD map; - - stream_info->use_map = 0; - stream_info->swizzle_map = 0; - stream_info->all_vbo = 1; - - /* Check for transformed vertices, disable vertex shader if present. */ - stream_info->position_transformed = declaration->position_transformed; - use_vshader = state->vertex_shader && !declaration->position_transformed; - - /* Translate the declaration into strided data. */ - for (i = 0; i < declaration->element_count; ++i) - { - const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; - const struct wined3d_stream_state *stream = &state->streams[element->input_slot]; - struct wined3d_buffer *buffer = stream->buffer; - struct wined3d_bo_address data; - BOOL stride_used; - unsigned int idx; - DWORD stride; - - TRACE("%p Element %p (%u of %u)\n", declaration->elements, - element, i + 1, declaration->element_count); - - if (!buffer) continue; - - stride = stream->stride; - - TRACE("Stream %u, buffer %p.\n", element->input_slot, buffer); - buffer_get_memory(buffer, &device->adapter->gl_info, &data); - - /* We can't use VBOs if the base vertex index is negative. OpenGL - * doesn't accept negative offsets (or rather offsets bigger than the - * VBO, because the pointer is unsigned), so use system memory - * sources. In most sane cases the pointer - offset will still be > 0, - * otherwise it will wrap around to some big value. Hope that with the - * indices, the driver wraps it back internally. If not, - * drawStridedSlow() is needed, including a vertex buffer path. */ - if (state->load_base_vertex_index < 0) - { - WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); - data.buffer_object = 0; - data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); - if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) - FIXME("System memory vertex data load offset is negative!\n"); - } - data.addr += element->offset; - - TRACE("offset %u input_slot %u usage_idx %d\n", element->offset, element->input_slot, element->usage_idx); - - if (use_vshader) - { - if (element->output_slot == ~0U) - { - /* TODO: Assuming vertexdeclarations are usually used with the - * same or a similar shader, it might be worth it to store the - * last used output slot and try that one first. */ - stride_used = vshader_get_input(state->vertex_shader, - element->usage, element->usage_idx, &idx); - } - else - { - idx = element->output_slot; - stride_used = TRUE; - } - } - else - { - if (!element->ffp_valid) - { - WARN("Skipping unsupported fixed function element of format %s and usage %s\n", - debug_d3dformat(element->format->id), debug_d3ddeclusage(element->usage)); - stride_used = FALSE; - } - else - { - stride_used = fixed_get_input(element->usage, element->usage_idx, &idx); - } - } - - if (stride_used) - { - TRACE("Load %s array %u [usage %s, usage_idx %u, " - "input_slot %u, offset %u, stride %u, format %s, buffer_object %u]\n", - use_vshader ? "shader": "fixed function", idx, - debug_d3ddeclusage(element->usage), element->usage_idx, element->input_slot, - element->offset, stride, debug_d3dformat(element->format->id), data.buffer_object); - - data.addr += stream->offset; - - stream_info->elements[idx].format = element->format; - stream_info->elements[idx].data = data; - stream_info->elements[idx].stride = stride; - stream_info->elements[idx].stream_idx = element->input_slot; - - if (!device->adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA] - && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) - { - stream_info->swizzle_map |= 1 << idx; - } - stream_info->use_map |= 1 << idx; - } - } - - /* Preload the vertex buffers. */ - device->num_buffer_queries = 0; - for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) - { - struct wined3d_stream_info_element *element; - struct wined3d_buffer *buffer; - - if (!(map & 1)) - continue; - - element = &stream_info->elements[i]; - buffer = state->streams[element->stream_idx].buffer; - wined3d_buffer_preload(buffer); - - /* If the preload dropped the buffer object, update the stream info. */ - if (buffer->buffer_object != element->data.buffer_object) - { - element->data.buffer_object = 0; - element->data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info) + (ptrdiff_t)element->data.addr; - } - - if (!buffer->buffer_object) - stream_info->all_vbo = 0; - - if (buffer->query) - device->buffer_queries[device->num_buffer_queries++] = buffer->query; - } -} - -/* Context activation is done by the caller. */ -void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) -{ - struct wined3d_stream_info *stream_info = &device->stream_info; - const struct wined3d_state *state = &device->state; - DWORD prev_all_vbo = stream_info->all_vbo; - - TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, stream_info); - - if (state->vertex_shader && !stream_info->position_transformed) - { - if (state->vertex_declaration->half_float_conv_needed && !stream_info->all_vbo) - { - TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); - device->useDrawStridedSlow = TRUE; - } - else - { - device->useDrawStridedSlow = FALSE; - } - } - else - { - WORD slow_mask = (1 << WINED3D_FFP_PSIZE); - slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] - & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); - - if (((stream_info->position_transformed && !device->adapter->d3d_info.xyzrhw) - || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) - device->useDrawStridedSlow = TRUE; - else - device->useDrawStridedSlow = FALSE; - } - - if (prev_all_vbo != stream_info->all_vbo) - device_invalidate_state(device, STATE_INDEXBUFFER); -} - -static void device_preload_texture(const struct wined3d_state *state, unsigned int idx) -{ - struct wined3d_texture *texture; - enum WINED3DSRGB srgb; - - if (!(texture = state->textures[idx])) return; - srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; - texture->texture_ops->texture_preload(texture, srgb); -} - -void device_preload_textures(const struct wined3d_device *device) -{ - const struct wined3d_state *state = &device->state; - unsigned int i; - - if (use_vs(state)) - { - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) - { - if (state->vertex_shader->reg_maps.sampler_type[i]) - device_preload_texture(state, MAX_FRAGMENT_SAMPLERS + i); - } - } - - if (use_ps(state)) - { - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) - { - if (state->pixel_shader->reg_maps.sampler_type[i]) - device_preload_texture(state, i); - } - } - else - { - WORD ffu_map = device->fixed_function_usage_map; - - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (ffu_map & 1) - device_preload_texture(state, i); - } - } -} - BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_context **new_array; @@ -441,15 +188,14 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context device->contexts = new_array; } -/* Do not call while under the GL lock. */ void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) { if (device->onscreen_depth_stencil) { - surface_load_ds_location(device->onscreen_depth_stencil, context, SFLAG_INTEXTURE); + surface_load_ds_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); - surface_modify_ds_location(device->onscreen_depth_stencil, SFLAG_INTEXTURE, + surface_modify_ds_location(device->onscreen_depth_stencil, WINED3D_LOCATION_TEXTURE_RGB, device->onscreen_depth_stencil->ds_current_size.cx, device->onscreen_depth_stencil->ds_current_size.cy); wined3d_surface_decref(device->onscreen_depth_stencil); @@ -480,7 +226,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context { RECT current_rect, r; - if (ds->flags & SFLAG_DISCARDED) + if (ds->locations & WINED3D_LOCATION_DISCARDED) { /* Depth buffer was discarded, make it entirely current in its new location since * there is no other place where we would get data anyway. */ @@ -488,7 +234,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context return; } - if (ds->flags & location) + if (ds->locations & location) SetRect(¤t_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); @@ -528,7 +274,6 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); } -/* Do not call while under the GL lock. */ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) @@ -557,7 +302,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { struct wined3d_surface *rt = fb->render_targets[i]; if (rt) - surface_load_location(rt, rt->draw_binding, NULL); + surface_load_location(rt, rt->draw_binding); } } @@ -584,7 +329,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : SFLAG_INDRAWABLE; + DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : WINED3D_LOCATION_DRAWABLE; if (!render_offscreen && fb->depth_stencil != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, fb->depth_stencil); @@ -616,7 +361,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : SFLAG_INDRAWABLE; + DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : WINED3D_LOCATION_DRAWABLE; surface_modify_ds_location(fb->depth_stencil, location, ds_rect.right, ds_rect.bottom); @@ -634,7 +379,10 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_surface *rt = fb->render_targets[i]; if (rt) - surface_modify_location(rt, rt->draw_binding, TRUE); + { + surface_validate_location(rt, rt->draw_binding); + surface_invalidate_location(rt, ~rt->draw_binding); + } } gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); @@ -729,6 +477,8 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { UINT i; + wined3d_cs_destroy(device->cs); + if (device->recording && wined3d_stateblock_decref(device->recording)) FIXME("Something's still holding the recording stateblock.\n"); device->recording = NULL; @@ -793,6 +543,8 @@ struct wined3d_swapchain * CDECL wined3d_device_get_swapchain(const struct wined static void device_load_logo(struct wined3d_device *device, const char *filename) { struct wined3d_color_key color_key; + struct wined3d_resource_desc desc; + struct wined3d_surface *surface; HBITMAP hbm; BITMAP bm; HRESULT hr; @@ -816,31 +568,40 @@ static void device_load_logo(struct wined3d_device *device, const char *filename bm.bmHeight = 32; } - hr = wined3d_surface_create(device, bm.bmWidth, bm.bmHeight, WINED3DFMT_B5G6R5_UNORM, 0, - WINED3D_POOL_SYSTEM_MEM, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_MAPPABLE, - NULL, &wined3d_null_parent_ops, &device->logo_surface); - if (FAILED(hr)) + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = WINED3DFMT_B5G6R5_UNORM; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; + desc.width = bm.bmWidth; + desc.height = bm.bmHeight; + desc.depth = 1; + desc.size = 0; + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, + NULL, &wined3d_null_parent_ops, &device->logo_texture))) { - ERR("Wine logo requested, but failed to create surface, hr %#x.\n", hr); + ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr); goto out; } + surface = surface_from_resource(wined3d_texture_get_sub_resource(device->logo_texture, 0)); if (dcb) { - if (FAILED(hr = wined3d_surface_getdc(device->logo_surface, &dcs))) + if (FAILED(hr = wined3d_surface_getdc(surface, &dcs))) goto out; BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); - wined3d_surface_releasedc(device->logo_surface, dcs); + wined3d_surface_releasedc(surface, dcs); color_key.color_space_low_value = 0; color_key.color_space_high_value = 0; - wined3d_surface_set_color_key(device->logo_surface, WINEDDCKEY_SRCBLT, &color_key); + wined3d_texture_set_color_key(device->logo_texture, WINEDDCKEY_SRCBLT, &color_key); } else { const struct wined3d_color c = {1.0f, 1.0f, 1.0f, 1.0f}; /* Fill the surface with a white color to show that wined3d is there */ - wined3d_device_color_fill(device, device->logo_surface, NULL, &c); + wined3d_device_color_fill(device, surface, NULL, &c); } out: @@ -1071,6 +832,25 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) InterlockedExchangePointer((void **)&device->focus_window, NULL); } +static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) +{ + BOOL ds_enable = !!swapchain->desc.enable_auto_depth_stencil; + unsigned int i; + + if (device->fb.render_targets) + { + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + { + wined3d_device_set_render_target(device, i, NULL, FALSE); + } + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], TRUE); + } + + wined3d_device_set_depth_stencil(device, ds_enable ? device->auto_depth_stencil : NULL); + wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); +} + HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { @@ -1078,8 +858,8 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; + DWORD clear_flags = 0; HRESULT hr; - DWORD state; TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); @@ -1091,21 +871,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->fb.render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device->fb.render_targets) * gl_info->limits.buffers); - /* Initialize the texture unit mapping to a 1:1 mapping */ - for (state = 0; state < MAX_COMBINED_SAMPLERS; ++state) - { - if (state < gl_info->limits.fragment_samplers) - { - device->texUnitMap[state] = state; - device->rev_tex_unit_map[state] = state; - } - else - { - device->texUnitMap[state] = WINED3D_UNMAPPED_STAGE; - device->rev_tex_unit_map[state] = WINED3D_UNMAPPED_STAGE; - } - } - if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { @@ -1136,28 +901,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, goto err_out; } device->swapchains[0] = swapchain; - - if (swapchain->back_buffers && swapchain->back_buffers[0]) - { - TRACE("Setting rendertarget to %p.\n", swapchain->back_buffers); - device->fb.render_targets[0] = swapchain->back_buffers[0]; - } - else - { - TRACE("Setting rendertarget to %p.\n", swapchain->front_buffer); - device->fb.render_targets[0] = swapchain->front_buffer; - } - wined3d_surface_incref(device->fb.render_targets[0]); - - /* Depth Stencil support */ - device->fb.depth_stencil = device->auto_depth_stencil; - if (device->fb.depth_stencil) - wined3d_surface_incref(device->fb.depth_stencil); - - /* Set up some starting GL setup */ - - /* Setup all the devices defaults */ - state_init_default(&device->state, device); + device_init_swapchain_state(device, swapchain); context = context_acquire(device, swapchain->front_buffer); @@ -1191,9 +935,12 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context_release(context); /* Clear the screen */ - wined3d_device_clear(device, 0, NULL, WINED3DCLEAR_TARGET - | (swapchain_desc->enable_auto_depth_stencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0), - &black, 1.0f, 0); + if (swapchain->back_buffers && swapchain->back_buffers[0]) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); device->d3d_initialized = TRUE; @@ -1270,8 +1017,10 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (device->logo_surface) - wined3d_surface_decref(device->logo_surface); + if (device->logo_texture) + wined3d_texture_decref(device->logo_texture); + if (device->cursor_texture) + wined3d_texture_decref(device->cursor_texture); state_unbind_resources(&device->state); @@ -1283,13 +1032,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) resource->resource_ops->resource_unload(resource); } - /* Delete the mouse cursor texture */ - if (device->cursorTexture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->cursorTexture); - device->cursorTexture = 0; - } - /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader * private data, it might contain opengl pointers */ @@ -1330,17 +1072,11 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) FIXME("Something's still holding the auto depth stencil buffer (%p).\n", surface); } - for (i = 1; i < gl_info->limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } - surface = device->fb.render_targets[0]; - TRACE("Setting rendertarget 0 to NULL\n"); - device->fb.render_targets[0] = NULL; - TRACE("Releasing the render target at %p\n", surface); - wined3d_surface_decref(surface); - context_release(context); for (i = 0; i < device->swapchain_count; ++i) @@ -1407,6 +1143,7 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset) { + struct wined3d_stream_output *stream; struct wined3d_buffer *prev_buffer; TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); @@ -1417,32 +1154,17 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT return; } - prev_buffer = device->update_state->stream_output[idx].buffer; - device->update_state->stream_output[idx].buffer = buffer; - device->update_state->stream_output[idx].offset = offset; + stream = &device->update_state->stream_output[idx]; + prev_buffer = stream->buffer; - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); - return; - } - - if (prev_buffer != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev_buffer) - { - InterlockedDecrement(&prev_buffer->resource.bind_count); - wined3d_buffer_decref(prev_buffer); - } - } + if (buffer) + wined3d_buffer_incref(buffer); + stream->buffer = buffer; + stream->offset = offset; + if (!device->recording) + wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); } struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, @@ -1501,29 +1223,12 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI stream->offset = offset; } - /* Handle recording of state blocks. */ - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); - if (buffer) - wined3d_buffer_incref(buffer); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); - return WINED3D_OK; - } - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); - } + if (!device->recording) + wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); if (prev_buffer) - { - InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); - } - - device_invalidate_state(device, STATE_STREAMSRC); return WINED3D_OK; } @@ -1587,7 +1292,7 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic if (device->recording) device->recording->changed.streamFreq |= 1 << stream_idx; else if (stream->frequency != old_freq || stream->flags != old_flags) - device_invalidate_state(device, STATE_STREAMSRC); + wined3d_cs_emit_set_stream_source_freq(device->cs, stream_idx, stream->frequency, stream->flags); return WINED3D_OK; } @@ -1639,9 +1344,7 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, } device->state.transforms[d3dts] = *matrix; - - if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) - device_invalidate_state(device, STATE_TRANSFORM(d3dts)); + wined3d_cs_emit_set_transform(device->cs, d3dts, matrix); } void CDECL wined3d_device_get_transform(const struct wined3d_device *device, @@ -2015,14 +1718,8 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, device->update_state->clip_planes[plane_idx] = *plane; - /* Handle recording of state blocks. */ - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; - } - - device_invalidate_state(device, STATE_CLIPPLANE(plane_idx)); + if (!device->recording) + wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); return WINED3D_OK; } @@ -2072,15 +1769,10 @@ void CDECL wined3d_device_set_material(struct wined3d_device *device, const stru device->update_state->material = *material; - /* Handle recording of state blocks */ if (device->recording) - { device->recording->changed.material = TRUE; - TRACE("Recording... not performing anything.\n"); - return; - } - - device_invalidate_state(device, STATE_MATERIAL); + else + wined3d_cs_emit_set_material(device->cs, material); } void CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) @@ -2107,42 +1799,30 @@ void CDECL wined3d_device_get_material(const struct wined3d_device *device, stru void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) { + enum wined3d_format_id prev_format; struct wined3d_buffer *prev_buffer; TRACE("device %p, buffer %p, format %s.\n", device, buffer, debug_d3dformat(format_id)); prev_buffer = device->update_state->index_buffer; + prev_format = device->update_state->index_format; device->update_state->index_buffer = buffer; device->update_state->index_format = format_id; - /* Handle recording of state blocks. */ if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.indices = TRUE; - if (buffer) - wined3d_buffer_incref(buffer); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); - return; - } - if (prev_buffer != buffer) - { - device_invalidate_state(device, STATE_INDEXBUFFER); - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev_buffer) - { - InterlockedDecrement(&prev_buffer->resource.bind_count); - wined3d_buffer_decref(prev_buffer); - } - } + if (prev_buffer == buffer && prev_format == format_id) + return; + + if (buffer) + wined3d_buffer_incref(buffer); + if (!device->recording) + wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); } struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, @@ -2184,7 +1864,7 @@ void CDECL wined3d_device_set_viewport(struct wined3d_device *device, const stru return; } - device_invalidate_state(device, STATE_VIEWPORT); + wined3d_cs_emit_set_viewport(device->cs, viewport); } void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) @@ -2231,7 +1911,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (value == old_value) TRACE("Application is setting the old value over, nothing to do.\n"); else - device_invalidate_state(device, STATE_RENDER(state)); + wined3d_cs_emit_set_render_state(device->cs, state, value); if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { @@ -2281,7 +1961,7 @@ void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, return; } - device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); + wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value); } DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, @@ -2322,7 +2002,7 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const return; } - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, rect); } void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) @@ -2340,28 +2020,19 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, TRACE("device %p, declaration %p.\n", device, declaration); - if (declaration) - wined3d_vertex_declaration_incref(declaration); - if (prev) - wined3d_vertex_declaration_decref(prev); - - device->update_state->vertex_declaration = declaration; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.vertexDecl = TRUE; - return; - } if (declaration == prev) - { - /* Checked after the assignment to allow proper stateblock recording. */ - TRACE("Application is setting the old declaration over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_VDECL); + if (declaration) + wined3d_vertex_declaration_incref(declaration); + device->update_state->vertex_declaration = declaration; + if (!device->recording) + wined3d_cs_emit_set_vertex_declaration(device->cs, declaration); + if (prev) + wined3d_vertex_declaration_decref(prev); } struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) @@ -2373,77 +2044,61 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->vertex_shader; + struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX]; TRACE("device %p, shader %p.\n", device, shader); - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - - device->update_state->vertex_shader = shader; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.vertexShader = TRUE; - return; - } if (shader == prev) - { - TRACE("Application is setting the old shader over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_VSHADER); + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; + if (!device->recording) + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); + if (prev) + wined3d_shader_decref(prev); } struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) { TRACE("device %p.\n", device); - return device->state.vertex_shader; + return device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; } -void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +static void wined3d_device_set_constant_buffer(struct wined3d_device *device, + enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) { struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); return; } - prev = device->update_state->vs_cb[idx]; - device->update_state->vs_cb[idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); + prev = device->update_state->cb[type][idx]; + if (buffer == prev) return; - } - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + if (buffer) + wined3d_buffer_incref(buffer); + device->update_state->cb[type][idx] = buffer; + if (!device->recording) + wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + if (prev) + wined3d_buffer_decref(prev); +} + +void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx, buffer); } struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) @@ -2456,30 +2111,40 @@ struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_devi return NULL; } - return device->state.vs_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_VERTEX][idx]; } -void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +static void wined3d_device_set_sampler(struct wined3d_device *device, + enum wined3d_shader_type type, UINT idx, struct wined3d_sampler *sampler) { struct wined3d_sampler *prev; - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - if (idx >= MAX_SAMPLER_OBJECTS) { WARN("Invalid sampler index %u.\n", idx); return; } - prev = device->update_state->vs_sampler[idx]; - device->update_state->vs_sampler[idx] = sampler; + prev = device->update_state->sampler[type][idx]; + if (sampler == prev) + return; if (sampler) wined3d_sampler_incref(sampler); + device->update_state->sampler[type][idx] = sampler; + if (!device->recording) + wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler); if (prev) wined3d_sampler_decref(prev); } +void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); +} + struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) { TRACE("device %p, idx %u.\n", device, idx); @@ -2490,10 +2155,10 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return NULL; } - return device->state.vs_sampler[idx]; + return device->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; } -void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) +static void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) { UINT i; @@ -2647,290 +2312,39 @@ HRESULT CDECL wined3d_device_get_vs_consts_f(const struct wined3d_device *device return WINED3D_OK; } -static void device_invalidate_texture_stage(const struct wined3d_device *device, DWORD stage) -{ - DWORD i; - - for (i = 0; i <= WINED3D_HIGHEST_TEXTURE_STATE; ++i) - { - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, i)); - } -} - -static void device_map_stage(struct wined3d_device *device, DWORD stage, DWORD unit) -{ - DWORD i = device->rev_tex_unit_map[unit]; - DWORD j = device->texUnitMap[stage]; - - device->texUnitMap[stage] = unit; - if (i != WINED3D_UNMAPPED_STAGE && i != stage) - device->texUnitMap[i] = WINED3D_UNMAPPED_STAGE; - - device->rev_tex_unit_map[unit] = stage; - if (j != WINED3D_UNMAPPED_STAGE && j != unit) - device->rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; -} - -static void device_update_fixed_function_usage_map(struct wined3d_device *device) -{ - UINT i; - - device->fixed_function_usage_map = 0; - for (i = 0; i < MAX_TEXTURES; ++i) - { - const struct wined3d_state *state = &device->state; - enum wined3d_texture_op color_op = state->texture_states[i][WINED3D_TSS_COLOR_OP]; - enum wined3d_texture_op alpha_op = state->texture_states[i][WINED3D_TSS_ALPHA_OP]; - DWORD color_arg1 = state->texture_states[i][WINED3D_TSS_COLOR_ARG1] & WINED3DTA_SELECTMASK; - DWORD color_arg2 = state->texture_states[i][WINED3D_TSS_COLOR_ARG2] & WINED3DTA_SELECTMASK; - DWORD color_arg3 = state->texture_states[i][WINED3D_TSS_COLOR_ARG0] & WINED3DTA_SELECTMASK; - DWORD alpha_arg1 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG1] & WINED3DTA_SELECTMASK; - DWORD alpha_arg2 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG2] & WINED3DTA_SELECTMASK; - DWORD alpha_arg3 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] & WINED3DTA_SELECTMASK; - - /* Not used, and disable higher stages. */ - if (color_op == WINED3D_TOP_DISABLE) - break; - - if (((color_arg1 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG2) - || ((color_arg2 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG1) - || ((color_arg3 == WINED3DTA_TEXTURE) - && (color_op == WINED3D_TOP_MULTIPLY_ADD || color_op == WINED3D_TOP_LERP)) - || ((alpha_arg1 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG2) - || ((alpha_arg2 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG1) - || ((alpha_arg3 == WINED3DTA_TEXTURE) - && (alpha_op == WINED3D_TOP_MULTIPLY_ADD || alpha_op == WINED3D_TOP_LERP))) - device->fixed_function_usage_map |= (1 << i); - - if ((color_op == WINED3D_TOP_BUMPENVMAP || color_op == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - && i < MAX_TEXTURES - 1) - device->fixed_function_usage_map |= (1 << (i + 1)); - } -} - -static void device_map_fixed_function_samplers(struct wined3d_device *device, const struct wined3d_d3d_info *d3d_info) -{ - unsigned int i, tex; - WORD ffu_map; - - device_update_fixed_function_usage_map(device); - ffu_map = device->fixed_function_usage_map; - - if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages - || device->state.lowest_disabled_stage <= d3d_info->limits.ffp_textures) - { - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (!(ffu_map & 1)) continue; - - if (device->texUnitMap[i] != i) - { - device_map_stage(device, i, i); - device_invalidate_state(device, STATE_SAMPLER(i)); - device_invalidate_texture_stage(device, i); - } - } - return; - } - - /* Now work out the mapping */ - tex = 0; - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (!(ffu_map & 1)) continue; - - if (device->texUnitMap[i] != tex) - { - device_map_stage(device, i, tex); - device_invalidate_state(device, STATE_SAMPLER(i)); - device_invalidate_texture_stage(device, i); - } - - ++tex; - } -} - -static void device_map_psamplers(struct wined3d_device *device, const struct wined3d_d3d_info *d3d_info) -{ - const enum wined3d_sampler_texture_type *sampler_type = - device->state.pixel_shader->reg_maps.sampler_type; - unsigned int i; - - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) - { - if (sampler_type[i] && device->texUnitMap[i] != i) - { - device_map_stage(device, i, i); - device_invalidate_state(device, STATE_SAMPLER(i)); - if (i < d3d_info->limits.ffp_blend_stages) - device_invalidate_texture_stage(device, i); - } - } -} - -static BOOL device_unit_free_for_vs(const struct wined3d_device *device, - const enum wined3d_sampler_texture_type *pshader_sampler_tokens, - const enum wined3d_sampler_texture_type *vshader_sampler_tokens, DWORD unit) -{ - DWORD current_mapping = device->rev_tex_unit_map[unit]; - - /* Not currently used */ - if (current_mapping == WINED3D_UNMAPPED_STAGE) return TRUE; - - if (current_mapping < MAX_FRAGMENT_SAMPLERS) { - /* Used by a fragment sampler */ - - if (!pshader_sampler_tokens) { - /* No pixel shader, check fixed function */ - return current_mapping >= MAX_TEXTURES || !(device->fixed_function_usage_map & (1 << current_mapping)); - } - - /* Pixel shader, check the shader's sampler map */ - return !pshader_sampler_tokens[current_mapping]; - } - - /* Used by a vertex sampler */ - return !vshader_sampler_tokens[current_mapping - MAX_FRAGMENT_SAMPLERS]; -} - -static void device_map_vsamplers(struct wined3d_device *device, BOOL ps, const struct wined3d_gl_info *gl_info) -{ - const enum wined3d_sampler_texture_type *vshader_sampler_type = - device->state.vertex_shader->reg_maps.sampler_type; - const enum wined3d_sampler_texture_type *pshader_sampler_type = NULL; - int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; - int i; - - if (ps) - { - /* Note that we only care if a sampler is sampled or not, not the sampler's specific type. - * Otherwise we'd need to call shader_update_samplers() here for 1.x pixelshaders. */ - pshader_sampler_type = device->state.pixel_shader->reg_maps.sampler_type; - } - - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) { - DWORD vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; - if (vshader_sampler_type[i]) - { - if (device->texUnitMap[vsampler_idx] != WINED3D_UNMAPPED_STAGE) - { - /* Already mapped somewhere */ - continue; - } - - while (start >= 0) - { - if (device_unit_free_for_vs(device, pshader_sampler_type, vshader_sampler_type, start)) - { - device_map_stage(device, vsampler_idx, start); - device_invalidate_state(device, STATE_SAMPLER(vsampler_idx)); - - --start; - break; - } - - --start; - } - } - } -} - -void device_update_tex_unit_map(struct wined3d_device *device) -{ - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - const struct wined3d_state *state = &device->state; - BOOL vs = use_vs(state); - BOOL ps = use_ps(state); - /* - * Rules are: - * -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but - * that would be really messy and require shader recompilation - * -> When the mapping of a stage is changed, sampler and ALL texture stage states have - * to be reset. Because of that try to work with a 1:1 mapping as much as possible - */ - if (ps) - device_map_psamplers(device, d3d_info); - else - device_map_fixed_function_samplers(device, d3d_info); - - if (vs) - device_map_vsamplers(device, ps, gl_info); -} - void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->pixel_shader; + struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_PIXEL]; TRACE("device %p, shader %p.\n", device, shader); - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - - device->update_state->pixel_shader = shader; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.pixelShader = TRUE; - return; - } if (shader == prev) - { - TRACE("Application is setting the old shader over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_PIXELSHADER); + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader; + if (!device->recording) + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); + if (prev) + wined3d_shader_decref(prev); } struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) { TRACE("device %p.\n", device); - return device->state.pixel_shader; + return device->state.shader[WINED3D_SHADER_TYPE_PIXEL]; } void CDECL wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) { - struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return; - } - - prev = device->update_state->ps_cb[idx]; - device->update_state->ps_cb[idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); - return; - } - - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_PIXEL, idx, buffer); } struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx) @@ -2943,28 +2357,14 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi return NULL; } - return device->state.ps_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_PIXEL][idx]; } void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) { - struct wined3d_sampler *prev; - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return; - } - - prev = device->update_state->ps_sampler[idx]; - device->update_state->ps_sampler[idx] = sampler; - - if (sampler) - wined3d_sampler_incref(sampler); - if (prev) - wined3d_sampler_decref(prev); + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx, sampler); } struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx) @@ -2977,7 +2377,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 return NULL; } - return device->state.ps_sampler[idx]; + return device->state.sampler[WINED3D_SHADER_TYPE_PIXEL][idx]; } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, @@ -3126,67 +2526,32 @@ HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->geometry_shader; + struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; TRACE("device %p, shader %p.\n", device, shader); - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - - device->update_state->geometry_shader = shader; - if (device->recording || shader == prev) return; - - device_invalidate_state(device, STATE_GEOMETRY_SHADER); + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_GEOMETRY, shader); + if (prev) + wined3d_shader_decref(prev); } struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device) { TRACE("device %p.\n", device); - return device->state.geometry_shader; + return device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY]; } void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) { - struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return; - } - - prev = device->update_state->gs_cb[idx]; - device->update_state->gs_cb[idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); - return; - } - - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, buffer); } struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx) @@ -3199,28 +2564,14 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi return NULL; } - return device->state.gs_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) { - struct wined3d_sampler *prev; - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return; - } - - prev = device->update_state->gs_sampler[idx]; - device->update_state->gs_sampler[idx] = sampler; - - if (sampler) - wined3d_sampler_incref(sampler); - if (prev) - wined3d_sampler_decref(prev); + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, sampler); } struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx) @@ -3233,11 +2584,10 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 return NULL; } - return device->state.gs_sampler[idx]; + return device->state.sampler[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } /* Context activation is done by the caller. */ -/* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD flags, @@ -3504,7 +2854,6 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO } #undef copy_and_next -/* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf) @@ -3529,10 +2878,10 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, context = context_acquire(device, NULL); gl_info = context->gl_info; - vs = state->vertex_shader; - state->vertex_shader = NULL; - device_stream_info_from_declaration(device, &stream_info); - state->vertex_shader = vs; + vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + state->shader[WINED3D_SHADER_TYPE_VERTEX] = NULL; + context_stream_info_from_declaration(context, state, &stream_info); + state->shader[WINED3D_SHADER_TYPE_VERTEX] = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into * process_vertices() are unlikely to ever be used for drawing. Release @@ -3551,7 +2900,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, { struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); + e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, context)); GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); vb->buffer_object = 0; } @@ -3606,57 +2955,7 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, return; } - if (stage > device->state.lowest_disabled_stage - && device->StateTable[STATE_TEXTURESTAGE(0, state)].representative - == STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP)) - { - /* Colorop change above lowest disabled stage? That won't change - * anything in the GL setup. Changes in other states are important on - * disabled stages too. */ - return; - } - - if (state == WINED3D_TSS_COLOR_OP) - { - unsigned int i; - - if (value == WINED3D_TOP_DISABLE && old_value != WINED3D_TOP_DISABLE) - { - /* Previously enabled stage disabled now. Make sure to dirtify - * all enabled stages above stage, they have to be disabled. - * - * The current stage is dirtified below. */ - for (i = stage + 1; i < device->state.lowest_disabled_stage; ++i) - { - TRACE("Additionally dirtifying stage %u.\n", i); - device_invalidate_state(device, STATE_TEXTURESTAGE(i, WINED3D_TSS_COLOR_OP)); - } - device->state.lowest_disabled_stage = stage; - TRACE("New lowest disabled: %u.\n", stage); - } - else if (value != WINED3D_TOP_DISABLE && old_value == WINED3D_TOP_DISABLE) - { - /* Previously disabled stage enabled. Stages above it may need - * enabling. Stage must be lowest_disabled_stage here, if it's - * bigger success is returned above, and stages below the lowest - * disabled stage can't be enabled (because they are enabled - * already). - * - * Again stage stage doesn't need to be dirtified here, it is - * handled below. */ - for (i = stage + 1; i < d3d_info->limits.ffp_blend_stages; ++i) - { - if (device->update_state->texture_states[i][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_DISABLE) - break; - TRACE("Additionally dirtifying stage %u due to enable.\n", i); - device_invalidate_state(device, STATE_TEXTURESTAGE(i, WINED3D_TSS_COLOR_OP)); - } - device->state.lowest_disabled_stage = i; - TRACE("New lowest disabled: %u.\n", i); - } - } - - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state)); + wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); } DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, @@ -3677,7 +2976,6 @@ DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device * HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_texture *prev; TRACE("device %p, stage %u, texture %p.\n", device, stage, texture); @@ -3713,70 +3011,12 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, TRACE("Setting new texture to %p.\n", texture); device->update_state->textures[stage] = texture; - if (device->recording) - { - TRACE("Recording... not performing anything\n"); - - if (texture) wined3d_texture_incref(texture); - if (prev) wined3d_texture_decref(prev); - - return WINED3D_OK; - } - if (texture) - { - LONG bind_count = InterlockedIncrement(&texture->resource.bind_count); - wined3d_texture_incref(texture); - - if (!prev || texture->target != prev->target) - device_invalidate_state(device, STATE_PIXELSHADER); - - if (!prev && stage < d3d_info->limits.ffp_blend_stages) - { - /* The source arguments for color and alpha ops have different - * meanings when a NULL texture is bound, so the COLOR_OP and - * ALPHA_OP have to be dirtified. */ - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP)); - } - - if (bind_count == 1) - texture->sampler = stage; - } - + if (!device->recording) + wined3d_cs_emit_set_texture(device->cs, stage, texture); if (prev) - { - LONG bind_count = InterlockedDecrement(&prev->resource.bind_count); - - if (!texture && stage < d3d_info->limits.ffp_blend_stages) - { - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP)); - } - - if (bind_count && prev->sampler == stage) - { - unsigned int i; - - /* Search for other stages the texture is bound to. Shouldn't - * happen if applications bind textures to a single stage only. */ - TRACE("Searching for other stages the texture is bound to.\n"); - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - if (device->update_state->textures[i] == prev) - { - TRACE("Texture is also bound to stage %u.\n", i); - prev->sampler = i; - break; - } - } - } - wined3d_texture_decref(prev); - } - - device_invalidate_state(device, STATE_SAMPLER(stage)); return WINED3D_OK; } @@ -3938,12 +3178,9 @@ HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const return WINED3D_OK; } -/* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - RECT draw_rect; - TRACE("device %p, rect_count %u, rects %p, flags %#x, color {%.8e, %.8e, %.8e, %.8e}, depth %.8e, stencil %u.\n", device, rect_count, rects, flags, color->r, color->g, color->b, color->a, depth, stencil); @@ -3973,9 +3210,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } } - wined3d_get_draw_rect(&device->state, &draw_rect); - device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - &device->fb, rect_count, rects, &draw_rect, flags, color, depth, stencil); + wined3d_cs_emit_clear(device->cs, rect_count, rects, flags, color, depth, stencil); return WINED3D_OK; } @@ -4022,9 +3257,8 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - /* Account for the loading offset due to index buffers. Instead of - * reloading all sources correct it with the startvertex parameter. */ - draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE); + wined3d_cs_emit_draw(device->cs, start_vertex, vertex_count, 0, 0, FALSE); + return WINED3D_OK; } @@ -4057,7 +3291,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - draw_primitive(device, start_idx, index_count, 0, 0, TRUE); + wined3d_cs_emit_draw(device->cs, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK; } @@ -4067,7 +3301,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device { TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE); + wined3d_cs_emit_draw(device->cs, start_idx, index_count, start_instance, instance_count, TRUE); } /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ @@ -4120,6 +3354,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, enum wined3d_resource_type type; unsigned int level_count, i; HRESULT hr; + struct wined3d_context *context; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -4158,7 +3393,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } /* Make sure that the destination texture is loaded. */ - dst_texture->texture_ops->texture_preload(dst_texture, SRGB_RGB); + context = context_acquire(device, NULL); + wined3d_texture_load(dst_texture, context, FALSE); + context_release(context); /* Update every surface level of the texture. */ switch (type) @@ -4396,7 +3633,6 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, return surface_upload_from_surface(dst_surface, dst_point, src_surface, src_rect); } -/* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, const struct wined3d_color *color) { @@ -4421,7 +3657,6 @@ HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, return surface_color_fill(surface, rect, color); } -/* Do not call while under the GL lock. */ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color) { @@ -4476,16 +3711,9 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Render target 0 can't be set to NULL. */ - if (!render_target && !render_target_idx) - { - WARN("Trying to set render target 0 to NULL.\n"); - return WINED3DERR_INVALIDCALL; - } - if (render_target && !(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - FIXME("Surface %p doesn't have render target usage.\n", render_target); + WARN("Surface %p doesn't have render target usage.\n", render_target); return WINED3DERR_INVALIDCALL; } @@ -4502,13 +3730,13 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, state->viewport.height = render_target->resource.height; state->viewport.min_z = 0.0f; state->viewport.max_z = 1.0f; - device_invalidate_state(device, STATE_VIEWPORT); + wined3d_cs_emit_set_viewport(device->cs, &state->viewport); state->scissor_rect.top = 0; state->scissor_rect.left = 0; state->scissor_rect.right = render_target->resource.width; state->scissor_rect.bottom = render_target->resource.height; - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } @@ -4519,13 +3747,12 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (render_target) wined3d_surface_incref(render_target); device->fb.render_targets[render_target_idx] = render_target; + wined3d_cs_emit_set_render_target(device->cs, render_target_idx, render_target); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ if (prev) wined3d_surface_decref(prev); - device_invalidate_state(device, STATE_FRAMEBUFFER); - return WINED3D_OK; } @@ -4542,43 +3769,71 @@ void CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struc return; } - if (prev) - { - if (device->swapchains[0]->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL - || prev->flags & SFLAG_DISCARD) - { - surface_modify_ds_location(prev, SFLAG_DISCARDED, - prev->resource.width, prev->resource.height); - if (prev == device->onscreen_depth_stencil) - { - wined3d_surface_decref(device->onscreen_depth_stencil); - device->onscreen_depth_stencil = NULL; - } - } - } - device->fb.depth_stencil = depth_stencil; if (depth_stencil) wined3d_surface_incref(depth_stencil); - - if (!prev != !depth_stencil) - { - /* Swapping NULL / non NULL depth stencil affects the depth and tests */ - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_ZENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); - } - else if (prev && prev->resource.format->depth_size != depth_stencil->resource.format->depth_size) - { - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); - } + wined3d_cs_emit_set_depth_stencil(device->cs, depth_stencil); if (prev) wined3d_surface_decref(prev); +} - device_invalidate_state(device, STATE_FRAMEBUFFER); +static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, + struct wined3d_surface *cursor_image) +{ + struct wined3d_resource_desc desc; + struct wined3d_map_desc map_desc; + struct wined3d_texture *texture; + struct wined3d_surface *surface; + BYTE *src_data, *dst_data; + unsigned int src_pitch; + unsigned int i; - return; + if (FAILED(wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_READONLY))) + { + ERR("Failed to map source surface.\n"); + return NULL; + } + + src_pitch = map_desc.row_pitch; + src_data = map_desc.data; + + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = WINED3DFMT_B8G8R8A8_UNORM; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; + desc.width = cursor_image->resource.width; + desc.height = cursor_image->resource.height; + desc.depth = 1; + desc.size = 0; + + if (FAILED(wined3d_texture_create(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, + NULL, &wined3d_null_parent_ops, &texture))) + { + ERR("Failed to create cursor texture.\n"); + wined3d_surface_unmap(cursor_image); + return NULL; + } + + surface = surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); + if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, WINED3D_MAP_DISCARD))) + { + ERR("Failed to map destination surface.\n"); + wined3d_texture_decref(texture); + wined3d_surface_unmap(cursor_image); + return NULL; + } + + dst_data = map_desc.data; + + for (i = 0; i < desc.height; ++i) + memcpy(&dst_data[map_desc.row_pitch * i], &src_data[src_pitch * i], desc.width * 4); + + wined3d_surface_unmap(surface); + wined3d_surface_unmap(cursor_image); + + return texture; } HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, @@ -4587,13 +3842,10 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device TRACE("device %p, x_hotspot %u, y_hotspot %u, cursor_image %p.\n", device, x_hotspot, y_hotspot, cursor_image); - /* some basic validation checks */ - if (device->cursorTexture) + if (device->cursor_texture) { - struct wined3d_context *context = context_acquire(device, NULL); - context->gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->cursorTexture); - context_release(context); - device->cursorTexture = 0; + wined3d_texture_decref(device->cursor_texture); + device->cursor_texture = NULL; } if (cursor_image) @@ -4629,50 +3881,15 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device /* Do not store the surface's pointer because the application may * release it after setting the cursor image. Windows doesn't * addref the set surface, so we can't do this either without - * creating circular refcount dependencies. Copy out the gl texture - * instead. */ + * creating circular refcount dependencies. */ + if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, cursor_image))) + { + ERR("Failed to create cursor texture.\n"); + return WINED3DERR_INVALIDCALL; + } + device->cursorWidth = cursor_image->resource.width; device->cursorHeight = cursor_image->resource.height; - if (SUCCEEDED(wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_READONLY))) - { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); - struct wined3d_context *context; - char *mem, *bits = map_desc.data; - GLint intfmt = format->glInternal; - GLint gl_format = format->glFormat; - GLint type = format->glType; - INT height = device->cursorHeight; - INT width = device->cursorWidth; - INT bpp = format->byte_count; - INT i; - - /* Reformat the texture memory (pitch and width can be - * different) */ - mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); - for (i = 0; i < height; ++i) - memcpy(&mem[width * bpp * i], &bits[map_desc.row_pitch * i], width * bpp); - wined3d_surface_unmap(cursor_image); - - context = context_acquire(device, NULL); - - invalidate_active_texture(device, context); - /* Create a new cursor texture */ - gl_info->gl_ops.gl.p_glGenTextures(1, &device->cursorTexture); - checkGLcall("glGenTextures"); - context_bind_texture(context, GL_TEXTURE_2D, device->cursorTexture); - /* Copy the bitmap memory into the cursor texture */ - gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, intfmt, width, height, 0, gl_format, type, mem); - checkGLcall("glTexImage2D"); - HeapFree(GetProcessHeap(), 0, mem); - - context_release(context); - } - else - { - FIXME("A cursor texture was not returned.\n"); - device->cursorTexture = 0; - } if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) { @@ -4769,10 +3986,9 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) else SetCursor(NULL); } - else + else if (device->cursor_texture) { - if (device->cursorTexture) - device->bCursorVisible = show; + device->bCursorVisible = show; } return oldVisible; @@ -4799,7 +4015,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) device_invalidate_state(device, STATE_STREAMSRC); } -/* Do not call while under the GL lock. */ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_resource *resource, *cursor; @@ -4827,11 +4042,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture); device->depth_blt_texture = 0; } - if (device->cursorTexture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->cursorTexture); - device->cursorTexture = 0; - } device->blitter->free_private(device); device->shader_backend->shader_free_private(device); @@ -4848,7 +4058,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d swapchain->context = NULL; } -/* Do not call while under the GL lock. */ static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_context *context; @@ -4897,7 +4106,6 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru return WINED3D_OK; } -/* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) @@ -4925,14 +4133,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->fb.render_targets) { - if (swapchain->back_buffers && swapchain->back_buffers[0]) - wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); - else - wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); - for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); } wined3d_device_set_depth_stencil(device, NULL); @@ -4979,9 +4185,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; + swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; + swapchain->desc.auto_depth_stencil_format = swapchain_desc->auto_depth_stencil_format; swapchain->desc.flags = swapchain_desc->flags; - swapchain->desc.swap_interval = swapchain_desc->swap_interval; swapchain->desc.refresh_rate = swapchain_desc->refresh_rate; + swapchain->desc.swap_interval = swapchain_desc->swap_interval; + swapchain->desc.auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; /* What to do about these? */ if (swapchain_desc->backbuffer_count @@ -5101,21 +4310,21 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = wined3d_surface_update_desc(swapchain->front_buffer, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, - swapchain->desc.multisample_type, swapchain->desc.multisample_quality))) + swapchain->desc.multisample_type, swapchain->desc.multisample_quality, NULL, 0))) return hr; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { if (FAILED(hr = wined3d_surface_update_desc(swapchain->back_buffers[i], swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, - swapchain->desc.multisample_type, swapchain->desc.multisample_quality))) + swapchain->desc.multisample_type, swapchain->desc.multisample_quality, NULL, 0))) return hr; } if (device->auto_depth_stencil) { if (FAILED(hr = wined3d_surface_update_desc(device->auto_depth_stencil, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, device->auto_depth_stencil->resource.format->id, - swapchain->desc.multisample_type, swapchain->desc.multisample_quality))) + swapchain->desc.multisample_type, swapchain->desc.multisample_quality, NULL, 0))) return hr; } } @@ -5189,15 +4398,18 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_stateblock_decref(device->recording); device->recording = NULL; } + wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); if (device->d3d_initialized) delete_opengl_contexts(device, swapchain); - if (FAILED(hr = state_init(&device->state, &device->adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->gl_info, + &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT))) ERR("Failed to initialize device state, hr %#x.\n", hr); - state_init_default(&device->state, device); device->update_state = &device->state; + + device_init_swapchain_state(device, swapchain); } else { @@ -5209,13 +4421,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->viewport.y = 0; state->viewport.width = rt->resource.width; state->viewport.height = rt->resource.height; - device_invalidate_state(device, STATE_VIEWPORT); + wined3d_cs_emit_set_viewport(device->cs, &state->viewport); state->scissor_rect.top = 0; state->scissor_rect.left = 0; state->scissor_rect.right = rt->resource.width; state->scissor_rect.bottom = rt->resource.height; - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } swapchain_update_render_to_fbo(swapchain); @@ -5456,19 +4668,31 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->blitter = adapter->blitter; - if (FAILED(hr = state_init(&device->state, &adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->gl_info, + &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT))) { ERR("Failed to initialize device state, hr %#x.\n", hr); - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) - { - HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); - } - wined3d_decref(device->wined3d); - return hr; + goto err; } device->update_state = &device->state; + if (!(device->cs = wined3d_cs_create(device))) + { + WARN("Failed to create command stream.\n"); + state_cleanup(&device->state); + hr = E_FAIL; + goto err; + } + return WINED3D_OK; + +err: + for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + { + HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); + } + wined3d_decref(device->wined3d); + return hr; } diff --git a/reactos/dll/directx/wine/wined3d/directx.c b/reactos/dll/directx/wine/wined3d/directx.c index 420de71d486..ffdcc664e6d 100644 --- a/reactos/dll/directx/wine/wined3d/directx.c +++ b/reactos/dll/directx/wine/wined3d/directx.c @@ -22,6 +22,8 @@ */ #include "wined3d_private.h" +#include +#include #include @@ -130,6 +132,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, + {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, @@ -174,6 +177,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, + {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, @@ -251,7 +255,7 @@ const GLenum magLookup_noFilter[] = GL_NEAREST, GL_NEAREST, GL_NEAREST, }; -struct wined3d_fake_gl_ctx +struct wined3d_caps_gl_ctx { HDC dc; HWND wnd; @@ -260,12 +264,12 @@ struct wined3d_fake_gl_ctx HGLRC restore_gl_ctx; }; -static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) +static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx) { - TRACE("Destroying fake GL context.\n"); + TRACE("Destroying caps GL context.\n"); if (!wglMakeCurrent(NULL, NULL)) - ERR("Failed to disable fake GL context.\n"); + ERR("Failed to disable caps GL context.\n"); if (!wglDeleteContext(ctx->gl_ctx)) { @@ -273,14 +277,14 @@ static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); } - ReleaseDC(ctx->wnd, ctx->dc); + wined3d_release_dc(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); if (ctx->restore_gl_ctx && !wglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) ERR("Failed to restore previous GL context.\n"); } -static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *fake_gl_ctx, +static void wined3d_caps_gl_ctx_create_attribs(struct wined3d_caps_gl_ctx *caps_gl_ctx, struct wined3d_gl_info *gl_info, const GLint *ctx_attribs) { HGLRC new_ctx; @@ -288,14 +292,14 @@ static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *f if (!(gl_info->p_wglCreateContextAttribsARB = (void *)wglGetProcAddress("wglCreateContextAttribsARB"))) return; - if (!(new_ctx = gl_info->p_wglCreateContextAttribsARB(fake_gl_ctx->dc, NULL, ctx_attribs))) + if (!(new_ctx = gl_info->p_wglCreateContextAttribsARB(caps_gl_ctx->dc, NULL, ctx_attribs))) { ERR("Failed to create a context using wglCreateContextAttribsARB(), last error %#x.\n", GetLastError()); gl_info->p_wglCreateContextAttribsARB = NULL; return; } - if (!wglMakeCurrent(fake_gl_ctx->dc, new_ctx)) + if (!wglMakeCurrent(caps_gl_ctx->dc, new_ctx)) { ERR("Failed to make new context current, last error %#x.\n", GetLastError()); if (!wglDeleteContext(new_ctx)) @@ -304,13 +308,12 @@ static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *f return; } - if (!wglDeleteContext(fake_gl_ctx->gl_ctx)) + if (!wglDeleteContext(caps_gl_ctx->gl_ctx)) ERR("Failed to delete old context, last error %#x.\n", GetLastError()); - fake_gl_ctx->gl_ctx = new_ctx; + caps_gl_ctx->gl_ctx = new_ctx; } -/* Do not call while under the GL lock. */ -static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +static BOOL wined3d_caps_gl_ctx_create(struct wined3d_caps_gl_ctx *ctx) { PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; @@ -364,7 +367,7 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) /* Make it the current GL context. */ if (!wglMakeCurrent(ctx->dc, ctx->gl_ctx)) { - ERR("Failed to make fake GL context current.\n"); + ERR("Failed to make caps GL context current.\n"); goto fail; } @@ -1248,10 +1251,12 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650, "NVIDIA GeForce GTX 650", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650TI, "NVIDIA GeForce GTX 650 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660M, "NVIDIA GeForce GTX 660M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1324,6 +1329,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) Ivybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) Ivybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) Ivybridge Server", DRIVER_INTEL_GMA3000, 1024}, + {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) Haswell Mobile", DRIVER_INTEL_GMA3000, 1024}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -1658,10 +1664,12 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ + {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ + {"GTX 660M", CARD_NVIDIA_GEFORCE_GTX660M}, /* Geforce 600 - midend high mobile */ {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend high */ {"GTX 650 Ti", CARD_NVIDIA_GEFORCE_GTX650TI}, /* Geforce 600 - lowend */ {"GTX 650", CARD_NVIDIA_GEFORCE_GTX650}, /* Geforce 600 - lowend */ @@ -1984,6 +1992,8 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g } cards[] = { + /* Haswell */ + {"Haswell Mobile", CARD_INTEL_HWM}, /* Ivybridge */ {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM}, @@ -2371,7 +2381,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * size of the database can be made quite small because when you know what * type of 3d functionality a card has, you know to which GPU family the * GPU must belong. Because of this you only have to check a small part of - * the renderer string to distinguishes between different models from that + * the renderer string to distinguish between different models from that * family. * * The code also selects a default amount of video memory which we will @@ -2927,6 +2937,16 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) + { + TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); + gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] = TRUE; + } + if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + { + TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; + } wined3d_adapter_init_limits(gl_info); @@ -3044,7 +3064,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_BORDER - WINED3D_TADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] ? GL_MIRROR_CLAMP_TO_EDGE : GL_REPEAT; adapter->d3d_info.valid_rt_mask = 0; for (i = 0; i < gl_info->limits.buffers; ++i) @@ -3871,18 +3891,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - /* Filter formats that need conversion; For one part, this - * conversion is unimplemented, and volume textures are huge, so - * it would be a big performance hit. Unless we hit an application - * needing one of those formats, don't advertize them to avoid - * leading applications into temptation. The windows drivers don't - * support most of those formats on volumes anyway. */ - if (format->convert) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* The GL_EXT_texture_compression_s3tc spec requires that loading * an s3tc compressed texture results in an error. While the D3D * refrast does support s3tc volumes, at least the nvidia Windows @@ -4095,7 +4103,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte struct shader_caps shader_caps; struct fragment_caps fragment_caps; struct wined3d_vertex_caps vertex_caps; - DWORD ckey_caps, blit_caps, fx_caps, pal_caps; + DWORD ckey_caps, blit_caps, fx_caps; TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); @@ -4356,7 +4364,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } @@ -4374,7 +4382,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } @@ -4619,8 +4627,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDCAPS_COLORKEY | WINEDDCAPS_COLORKEYHWASSIST | WINEDDCAPS_ALIGNBOUNDARYSRC; - pal_caps = WINEDDPCAPS_8BIT | - WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ caps->ddraw_caps.caps = WINEDDCAPS_GDI | @@ -4633,7 +4639,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDCAPS2_CANRENDERWINDOWED; caps->ddraw_caps.color_key_caps = ckey_caps; caps->ddraw_caps.fx_caps = fx_caps; - caps->ddraw_caps.pal_caps = pal_caps; caps->ddraw_caps.svb_caps = blit_caps; caps->ddraw_caps.svb_color_key_caps = ckey_caps; caps->ddraw_caps.svb_fx_caps = fx_caps; @@ -5027,11 +5032,10 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } -/* Do not call while under the GL lock. */ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) { struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; + struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; unsigned int ctx_attrib_idx = 0; DISPLAY_DEVICEW display_device; GLint ctx_attribs[3]; @@ -5074,7 +5078,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); - if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) + if (!wined3d_caps_gl_ctx_create(&caps_gl_ctx)) { ERR("Failed to get a GL context for adapter %p.\n", adapter); return FALSE; @@ -5086,22 +5090,22 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_DEBUG_BIT_ARB; } ctx_attribs[ctx_attrib_idx] = 0; - wined3d_create_fake_gl_context_attribs(&fake_gl_ctx, gl_info, ctx_attribs); + wined3d_caps_gl_ctx_create_attribs(&caps_gl_ctx, gl_info, ctx_attribs); if (!wined3d_adapter_init_gl_caps(adapter)) { ERR("Failed to initialize GL caps for adapter %p.\n", adapter); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); return FALSE; } - wined3d_adapter_init_fb_cfgs(adapter, fake_gl_ctx.dc); + wined3d_adapter_init_fb_cfgs(adapter, caps_gl_ctx.dc); /* We haven't found any suitable formats. This should only happen in * case of GDI software rendering, which is pretty useless anyway. */ if (!adapter->cfg_count) { WARN("No suitable pixel formats found.\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); return FALSE; } @@ -5109,7 +5113,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) if (!wined3d_adapter_init_format_info(adapter)) { ERR("Failed to initialize GL format info.\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); return FALSE; } @@ -5123,7 +5127,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); @@ -5166,7 +5170,6 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = wined3d_null_wined3d_object_destroyed, }; -/* Do not call while under the GL lock. */ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) { wined3d->dxVersion = version; diff --git a/reactos/dll/directx/wine/wined3d/drawprim.c b/reactos/dll/directx/wine/wined3d/drawprim.c index 4d0f59bd61d..e2f087c8323 100644 --- a/reactos/dll/directx/wine/wined3d/drawprim.c +++ b/reactos/dll/directx/wine/wined3d/drawprim.c @@ -29,9 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -//#include -//#include - /* Context activation is done by the caller. */ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primitive_type, UINT count, UINT idx_size, const void *idx_data, UINT start_idx, INT base_vertex_index, UINT start_instance, UINT instance_count) @@ -41,7 +38,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED]) + if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) { FIXME("Instanced drawing not supported.\n"); } @@ -49,9 +46,18 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit { if (start_instance) FIXME("Start instance (%u) not supported.\n", start_instance); - GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); - checkGLcall("glDrawElementsInstancedBaseVertex"); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { + GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); + checkGLcall("glDrawElementsInstancedBaseVertex"); + } + else + { + GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstancedARB"); + } } } else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) @@ -80,7 +86,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit */ /* Context activation is done by the caller. */ -static void drawStridedSlow(const struct wined3d_device *device, const struct wined3d_context *context, +static void drawStridedSlow(const struct wined3d_device *device, struct wined3d_context *context, const struct wined3d_stream_info *si, UINT NumVertexes, GLenum glPrimType, const void *idxData, UINT idxSize, UINT startIdx) { @@ -112,7 +118,7 @@ static void drawStridedSlow(const struct wined3d_device *device, const struct wi * supported or other reason), or with user pointer drawing idxData * will be non-NULL. */ if (!idxData) - idxData = buffer_get_sysmem(state->index_buffer, gl_info); + idxData = buffer_get_sysmem(state->index_buffer, context); if (idxSize == 2) pIdxBufS = idxData; else pIdxBufL = idxData; @@ -191,7 +197,7 @@ static void drawStridedSlow(const struct wined3d_device *device, const struct wi for (textureNo = 0; textureNo < texture_stages; ++textureNo) { int coordIdx = state->texture_states[textureNo][WINED3D_TSS_TEXCOORD_INDEX]; - DWORD texture_idx = device->texUnitMap[textureNo]; + DWORD texture_idx = context->tex_unit_map[textureNo]; if (!gl_info->supported[ARB_MULTITEXTURE] && textureNo > 0) { @@ -263,7 +269,7 @@ static void drawStridedSlow(const struct wined3d_device *device, const struct wi coord_idx = state->texture_states[texture][WINED3D_TSS_TEXCOORD_INDEX]; ptr = texCoords[coord_idx] + (SkipnStrides * si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].stride); - texture_idx = device->texUnitMap[texture]; + texture_idx = context->tex_unit_map[texture]; ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( GL_TEXTURE0_ARB + texture_idx, ptr); } @@ -438,10 +444,11 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, +static void drawStridedSlowVs(struct wined3d_context *context, const struct wined3d_state *state, const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, UINT idxSize, UINT startIdx) { + const struct wined3d_gl_info *gl_info = context->gl_info; LONG SkipnStrides = startIdx + state->load_base_vertex_index; const DWORD *pIdxBufL = NULL; const WORD *pIdxBufS = NULL; @@ -456,7 +463,7 @@ static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struc * supported or other reason), or with user pointer drawing idxData * will be non-NULL. */ if (!idxData) - idxData = buffer_get_sysmem(state->index_buffer, gl_info); + idxData = buffer_get_sysmem(state->index_buffer, context); if (idxSize == 2) pIdxBufS = idxData; else pIdxBufL = idxData; @@ -494,10 +501,11 @@ static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struc } /* Context activation is done by the caller. */ -static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, +static void drawStridedInstanced(struct wined3d_context *context, const struct wined3d_state *state, const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, UINT idxSize, UINT startIdx, UINT base_vertex_index, UINT instance_count) { + const struct wined3d_gl_info *gl_info = context->gl_info; int numInstancedAttribs = 0, j; UINT instancedData[sizeof(si->elements) / sizeof(*si->elements) /* 16 */]; GLenum idxtype = idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; @@ -535,7 +543,7 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st if (si->elements[instancedData[j]].data.buffer_object) { struct wined3d_buffer *vb = state->streams[si->elements[instancedData[j]].stream_idx].buffer; - ptr += (ULONG_PTR)buffer_get_sysmem(vb, gl_info); + ptr += (ULONG_PTR)buffer_get_sysmem(vb, context); } send_attribute(gl_info, si->elements[instancedData[j]].format->id, instancedData[j], ptr); @@ -556,7 +564,7 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st } } -static void remove_vbos(const struct wined3d_gl_info *gl_info, +static void remove_vbos(struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_stream_info *s) { unsigned int i; @@ -572,7 +580,7 @@ static void remove_vbos(const struct wined3d_gl_info *gl_info, { struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); + e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, context)); } } } @@ -602,15 +610,12 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co struct wined3d_surface *target = device->fb.render_targets[i]; if (target) { - surface_load_location(target, target->draw_binding, NULL); - surface_modify_location(target, target->draw_binding, TRUE); + surface_load_location(target, target->draw_binding); + surface_invalidate_location(target, ~target->draw_binding); } } } - /* Signals other modules that a drawing is in progress and the stateblock finalized */ - device->isInDraw = TRUE; - context = context_acquire(device, device->fb.render_targets[0]); if (!context->valid) { @@ -627,7 +632,8 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co * Z-compare function into account, but we could skip loading the * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note * that we never copy the stencil data.*/ - DWORD location = context->render_offscreen ? device->fb.depth_stencil->draw_binding : SFLAG_INDRAWABLE; + DWORD location = context->render_offscreen ? + device->fb.depth_stencil->draw_binding : WINED3D_LOCATION_DRAWABLE; if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) { struct wined3d_surface *ds = device->fb.depth_stencil; @@ -636,7 +642,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (!context->render_offscreen && ds != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, ds); - if (ds->flags & location) + if (ds->locations & location) SetRect(¤t_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); else SetRectEmpty(¤t_rect); @@ -659,7 +665,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (device->fb.depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) { struct wined3d_surface *ds = device->fb.depth_stencil; - DWORD location = context->render_offscreen ? ds->draw_binding : SFLAG_INDRAWABLE; + DWORD location = context->render_offscreen ? ds->draw_binding : WINED3D_LOCATION_DRAWABLE; surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); } @@ -673,15 +679,15 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co FIXME("Point sprite coordinate origin switching not supported.\n"); } - stream_info = &device->stream_info; - if (device->instance_count) - instance_count = device->instance_count; + stream_info = &context->stream_info; + if (context->instance_count) + instance_count = context->instance_count; if (indexed) { struct wined3d_buffer *index_buffer = state->index_buffer; if (!index_buffer->buffer_object || !stream_info->all_vbo) - idx_data = index_buffer->resource.allocatedMemory; + idx_data = index_buffer->resource.heap_memory; else { ib_query = index_buffer->query; @@ -723,13 +729,13 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (emulation) { - si_emulated = device->stream_info; - remove_vbos(gl_info, state, &si_emulated); + si_emulated = context->stream_info; + remove_vbos(context, state, &si_emulated); stream_info = &si_emulated; } } - if (device->useDrawStridedSlow || emulation) + if (context->use_immediate_mode_draw || emulation) { /* Immediate mode drawing. */ if (use_vs(state)) @@ -741,7 +747,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co else WARN_(d3d_perf)("Using immediate mode with vertex shaders for half float emulation.\n"); - drawStridedSlowVs(gl_info, state, stream_info, index_count, + drawStridedSlowVs(context, state, stream_info, index_count, state->gl_primitive_type, idx_data, idx_size, start_idx); } else @@ -753,7 +759,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co else if (!gl_info->supported[ARB_INSTANCED_ARRAYS] && instance_count) { /* Instancing emulation by mixing immediate mode and arrays. */ - drawStridedInstanced(gl_info, state, stream_info, index_count, state->gl_primitive_type, + drawStridedInstanced(context, state, stream_info, index_count, state->gl_primitive_type, idx_data, idx_size, start_idx, state->base_vertex_index, instance_count); } else @@ -764,9 +770,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (ib_query) wined3d_event_query_issue(ib_query, device); - for (i = 0; i < device->num_buffer_queries; ++i) + for (i = 0; i < context->num_buffer_queries; ++i) { - wined3d_event_query_issue(device->buffer_queries[i], device); + wined3d_event_query_issue(context->buffer_queries[i], device); } if (wined3d_settings.strict_draw_ordering) @@ -775,7 +781,4 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co context_release(context); TRACE("Done all gl drawing\n"); - - /* Control goes back to the device, stateblock values may change again */ - device->isInDraw = FALSE; } diff --git a/reactos/dll/directx/wine/wined3d/glsl_shader.c b/reactos/dll/directx/wine/wined3d/glsl_shader.c index f2ec1d797ae..2a18b8fa0bf 100644 --- a/reactos/dll/directx/wine/wined3d/glsl_shader.c +++ b/reactos/dll/directx/wine/wined3d/glsl_shader.c @@ -36,18 +36,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); -#ifdef _MSC_VER -#define copysignf(x, y) ((x) < 0.0f ? -fabsf(y) : fabsf(y)) -#endif - #define WINED3D_GLSL_SAMPLE_PROJECTED 0x1 #define WINED3D_GLSL_SAMPLE_NPOT 0x2 #define WINED3D_GLSL_SAMPLE_LOD 0x4 #define WINED3D_GLSL_SAMPLE_GRAD 0x8 -static const float srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; /* pow, mul_high, sub_high, mul_low */ -static const float srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; /* cmp */ - struct glsl_dst_param { char reg_name[150]; @@ -249,61 +242,14 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } -/* This should be equivalent to using the %.8e format specifier, but always - * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since - * the GLSL parser wouldn't be able to handle those anyway. */ -static void shader_glsl_ftoa(float value, char *s) -{ - int x, frac, exponent; - const char *sign = ""; - double d; - - d = value; - if (copysignf(1.0f, value) < 0.0f) - { - d = -d; - sign = "-"; - } - - if (d == 0.0f) - { - x = 0; - frac = 0; - exponent = 0; - } - else - { - double t, diff; - - exponent = floorf(log10f(d)); - d /= pow(10.0, exponent); - - x = d; - t = (d - x) * 100000000; - frac = t; - diff = t - frac; - - if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) - { - if (++frac >= 100000000) - { - frac = 0; - ++x; - } - } - } - - sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); -} - static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) { - char str[4][16]; + char str[4][17]; - shader_glsl_ftoa(values[0], str[0]); - shader_glsl_ftoa(values[1], str[1]); - shader_glsl_ftoa(values[2], str[2]); - shader_glsl_ftoa(values[3], str[3]); + wined3d_ftoa(values[0], str[0]); + wined3d_ftoa(values[1], str[1]); + wined3d_ftoa(values[2], str[2]); + wined3d_ftoa(values[3], str[3]); shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } @@ -809,8 +755,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_state *state) { const struct glsl_context_data *ctx_data = context->shader_backend_data; - const struct wined3d_shader *vshader = state->vertex_shader; - const struct wined3d_shader *pshader = state->pixel_shader; + const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; float position_fixup[4]; @@ -1273,10 +1219,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (ps_args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) @@ -1463,7 +1409,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; - char imm_str[4][16]; + char imm_str[4][17]; if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); @@ -1659,7 +1605,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - shader_glsl_ftoa(*(const float *)reg->immconst_data, register_name); + wined3d_ftoa(*(const float *)reg->immconst_data, register_name); break; case WINED3D_DATA_INT: sprintf(register_name, "%#x", reg->immconst_data[0]); @@ -1679,10 +1625,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - shader_glsl_ftoa(*(const float *)®->immconst_data[0], imm_str[0]); - shader_glsl_ftoa(*(const float *)®->immconst_data[1], imm_str[1]); - shader_glsl_ftoa(*(const float *)®->immconst_data[2], imm_str[2]); - shader_glsl_ftoa(*(const float *)®->immconst_data[3], imm_str[3]); + wined3d_ftoa(*(const float *)®->immconst_data[0], imm_str[0]); + wined3d_ftoa(*(const float *)®->immconst_data[1], imm_str[1]); + wined3d_ftoa(*(const float *)®->immconst_data[2], imm_str[2]); + wined3d_ftoa(*(const float *)®->immconst_data[3], imm_str[3]); sprintf(register_name, "vec4(%s, %s, %s, %s)", imm_str[0], imm_str[1], imm_str[2], imm_str[3]); break; @@ -2636,33 +2582,6 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) } } -/* Process the WINED3DSIO_LOG instruction in GLSL (dst = log2(|src0|)) - * Src0 is a scalar. Note that D3D uses the absolute of src0, while - * GLSL uses the value as-is. */ -static void shader_glsl_log(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src0_param; - DWORD dst_write_mask; - unsigned int dst_size; - - dst_write_mask = shader_glsl_append_dst(buffer, ins); - dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - - if (dst_size > 1) - { - shader_addline(buffer, "vec%u(log2(abs(%s))));\n", - dst_size, src0_param.param_str); - } - else - { - shader_addline(buffer, "log2(abs(%s)));\n", - src0_param.param_str); - } -} - /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { @@ -2680,7 +2599,6 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_ABS: instruction = "abs"; break; case WINED3DSIH_FRC: instruction = "fract"; break; - case WINED3DSIH_EXP: instruction = "exp2"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; @@ -2737,6 +2655,56 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_scalar_op(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src0_param; + const char *prefix, *suffix; + unsigned int dst_size; + DWORD dst_write_mask; + + dst_write_mask = shader_glsl_append_dst(buffer, ins); + dst_size = shader_glsl_get_write_mask_size(dst_write_mask); + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); + + switch (ins->handler_idx) + { + case WINED3DSIH_EXP: + case WINED3DSIH_EXPP: + prefix = "exp2("; + suffix = ")"; + break; + + case WINED3DSIH_LOG: + case WINED3DSIH_LOGP: + prefix = "log2(abs("; + suffix = "))"; + break; + + case WINED3DSIH_RCP: + prefix = "1.0 / "; + suffix = ""; + break; + + case WINED3DSIH_RSQ: + prefix = "inversesqrt(abs("; + suffix = "))"; + break; + + default: + prefix = ""; + suffix = ""; + FIXME("Unhandled instruction %#x.\n", ins->handler_idx); + break; + } + + if (dst_size > 1) + shader_addline(buffer, "vec%u(%s%s%s));\n", dst_size, prefix, src0_param.param_str, suffix); + else + shader_addline(buffer, "%s%s%s);\n", prefix, src0_param.param_str, suffix); +} + /** Process the WINED3DSIO_EXPP instruction in GLSL: * For shader model 1.x, do the following (and honor the writemask, so use a temporary variable): * dst.x = 2^(floor(src)) @@ -2748,14 +2716,13 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) */ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) { - struct glsl_src_param src_param; - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - if (ins->ctx->reg_maps->shader_version.major < 2) { + struct glsl_src_param src_param; char dst_mask[6]; + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); + shader_addline(ins->ctx->buffer, "tmp0.x = exp2(floor(%s));\n", src_param.param_str); shader_addline(ins->ctx->buffer, "tmp0.y = %s - floor(%s);\n", src_param.param_str, src_param.param_str); shader_addline(ins->ctx->buffer, "tmp0.z = exp2(%s);\n", src_param.param_str); @@ -2764,19 +2731,10 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) shader_glsl_append_dst(ins->ctx->buffer, ins); shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(ins->ctx->buffer, "tmp0%s);\n", dst_mask); - } else { - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - - if (mask_size > 1) { - shader_addline(ins->ctx->buffer, "vec%d(exp2(%s)));\n", mask_size, src_param.param_str); - } else { - shader_addline(ins->ctx->buffer, "exp2(%s));\n", src_param.param_str); - } + return; } + + shader_glsl_scalar_op(ins); } static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) @@ -2813,53 +2771,6 @@ static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "float(%s));\n", src_param.param_str); } -/** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ -static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) -{ - struct glsl_src_param src_param; - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - - if (mask_size > 1) - { - shader_addline(ins->ctx->buffer, "vec%u(1.0 / %s));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(ins->ctx->buffer, "1.0 / %s);\n", - src_param.param_str); - } -} - -static void shader_glsl_rsq(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - - if (mask_size > 1) - { - shader_addline(buffer, "vec%u(inversesqrt(abs(%s))));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(buffer, "inversesqrt(abs(%s)));\n", - src_param.param_str); - } -} - /** Process signed comparison opcodes in GLSL. */ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) { @@ -4783,7 +4694,7 @@ static GLhandleARB find_glsl_vshader(const struct wined3d_context *context, { UINT i; DWORD new_size; - DWORD use_map = shader->device->stream_info.use_map; + DWORD use_map = context->stream_info.use_map; struct glsl_vs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; GLhandleARB ret; @@ -4938,7 +4849,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (!settings->normal) break; shader_addline(buffer, "dir = normalize(dir);\n"); - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) / att;\n", i); if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); @@ -4963,7 +4874,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer shader_addline(buffer, "ambient += gl_LightSource[%u].ambient.xyz * att;\n", i); if (!settings->normal) break; - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) * att;\n", i); if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); @@ -4978,7 +4889,8 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (!settings->normal) break; shader_addline(buffer, "dir = normalize(gl_LightSource[%u].position.xyz);\n", i); - shader_addline(buffer, "diffuse += max(0.0, dot(dir, normal)) * gl_LightSource[%u].diffuse.xyz;\n", i); + shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" + " * gl_LightSource[%u].diffuse.xyz;\n", i); shader_addline(buffer, "t = dot(normal, gl_LightSource[%u].halfVector.xyz);\n", i); shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular;\n", i); @@ -5488,10 +5400,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf if (settings->sRGB_write) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); shader_addline(buffer, ";\n"); } @@ -5505,7 +5417,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf { const char *texture_function, *coord_mask; char tex_reg_name[8]; - BOOL proj, clamp; + BOOL proj; if (!(tex_map & (1 << stage))) continue; @@ -5525,12 +5437,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf proj = TRUE; } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - clamp = FALSE; - else - clamp = TRUE; - switch (settings->op[stage].tex_type) { case tex_1d: @@ -5622,12 +5528,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf shader_addline(buffer, "ret = gl_TexCoord[%u] + ret.xyxy;\n", stage); } - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, ret.%s), 0.0, 1.0);\n", - stage, texture_function, stage, coord_mask); - else - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", - stage, texture_function, stage, coord_mask); + shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", + stage, texture_function, stage, coord_mask); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", @@ -5635,21 +5537,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf } else if (settings->op[stage].projected == proj_count3) { - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, gl_TexCoord[%u].xyz), 0.0, 1.0);\n", - stage, texture_function, stage, stage); - else - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].xyz);\n", - stage, texture_function, stage, stage); + shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].xyz);\n", + stage, texture_function, stage, stage); } else { - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, gl_TexCoord[%u].%s), 0.0, 1.0);\n", - stage, texture_function, stage, stage, coord_mask); - else - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].%s);\n", - stage, texture_function, stage, stage, coord_mask); + shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].%s);\n", + stage, texture_function, stage, stage, coord_mask); } sprintf(tex_reg_name, "tex%u", stage); @@ -5769,18 +5663,20 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_vs_program *vs) + GLhandleARB program_id, struct glsl_vs_program *vs, unsigned int vs_c_count) { unsigned int i; char name[32]; vs->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); - for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) + for (i = 0; i < vs_c_count; ++i) { snprintf(name, sizeof(name), "vs_c[%u]", i); vs->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&vs->uniform_f_locations[vs_c_count], 0xff, + (gl_info->limits.glsl_vs_float_constants - vs_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -5792,18 +5688,20 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * } static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_ps_program *ps) + GLhandleARB program_id, struct glsl_ps_program *ps, unsigned int ps_c_count) { unsigned int i; char name[32]; ps->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); - for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) + for (i = 0; i < ps_c_count; ++i) { snprintf(name, sizeof(name), "ps_c[%u]", i); ps->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&ps->uniform_f_locations[ps_c_count], 0xff, + (gl_info->limits.glsl_ps_float_constants - ps_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -5844,7 +5742,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GLhandleARB gs_id = 0; GLhandleARB ps_id = 0; struct list *ps_list, *vs_list; - struct wined3d_device *device = context->swapchain->device; if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX))) { @@ -5853,8 +5750,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (use_vs(state)) { - vshader = state->vertex_shader; - gshader = state->geometry_shader; + vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program->gs.id) @@ -5866,13 +5763,13 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const else if (use_vs(state)) { struct vs_compile_args vs_compile_args; - vshader = state->vertex_shader; + vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; - find_vs_compile_args(state, vshader, &vs_compile_args); + find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args); vs_id = find_glsl_vshader(context, &priv->shader_buffer, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; - if ((gshader = state->geometry_shader)) + if ((gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) gs_id = find_glsl_geometry_shader(context, &priv->shader_buffer, gshader); } else if (priv->vertex_pipe == &glsl_vertex_pipe) @@ -5880,7 +5777,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_vertex_shader *ffp_shader; struct wined3d_ffp_vs_settings settings; - wined3d_ffp_get_vs_settings(state, &device->stream_info, &settings); + wined3d_ffp_get_vs_settings(state, &context->stream_info, &settings); ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); vs_id = ffp_shader->id; vs_list = &ffp_shader->linked_programs; @@ -5892,13 +5789,13 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const ps_list = &ctx_data->glsl_program->ps.shader_entry; if (use_ps(state)) - pshader = state->pixel_shader; + pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; } else if (use_ps(state)) { struct ps_compile_args ps_compile_args; - pshader = state->pixel_shader; - find_ps_compile_args(state, pshader, &ps_compile_args); + pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; + find_ps_compile_args(state, pshader, context->stream_info.position_transformed, &ps_compile_args, gl_info); ps_id = find_glsl_pshader(context, &priv->shader_buffer, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; @@ -6017,8 +5914,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); - shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps); + shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs, + vshader ? vshader->limits.constant_float : 0); + shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps, + pshader ? pshader->limits.constant_float : 0); checkGLcall("Find glsl program uniform locations"); if (pshader && pshader->reg_maps.shader_version.major >= 3 @@ -6044,8 +5943,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const * fixed function fragment processing setups. So once the program is linked these samplers * won't change. */ - shader_glsl_load_vsamplers(gl_info, device->texUnitMap, programId); - shader_glsl_load_psamplers(gl_info, device->texUnitMap, programId); + shader_glsl_load_vsamplers(gl_info, context->tex_unit_map, programId); + shader_glsl_load_psamplers(gl_info, context->tex_unit_map, programId); entry->constant_update_mask = 0; if (vshader) @@ -6731,7 +6630,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, - /* WINED3DSIH_EXP */ shader_glsl_map2gl, + /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, @@ -6746,8 +6645,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, - /* WINED3DSIH_LOG */ shader_glsl_log, - /* WINED3DSIH_LOGP */ shader_glsl_log, + /* WINED3DSIH_LOG */ shader_glsl_scalar_op, + /* WINED3DSIH_LOGP */ shader_glsl_scalar_op, /* WINED3DSIH_LOOP */ shader_glsl_loop, /* WINED3DSIH_LRP */ shader_glsl_lrp, /* WINED3DSIH_LT */ shader_glsl_relop, @@ -6767,11 +6666,11 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_POW */ shader_glsl_pow, - /* WINED3DSIH_RCP */ shader_glsl_rcp, + /* WINED3DSIH_RCP */ shader_glsl_scalar_op, /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, - /* WINED3DSIH_RSQ */ shader_glsl_rsq, + /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, @@ -6867,7 +6766,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, { caps->xyzrhw = TRUE; caps->max_active_lights = gl_info->limits.lights; - caps->max_vertex_blend_matrices = 0; + caps->max_vertex_blend_matrices = 1; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN | WINED3DVTXPCAPS_MATERIALSOURCE7 @@ -6949,7 +6848,7 @@ static void glsl_vertex_pipe_projection(struct wined3d_context *context, static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, - {STATE_VSHADER, {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_MATERIAL, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_specularenable }, WINED3D_GL_EXT_NONE }, /* Clip planes */ @@ -7258,86 +7157,86 @@ static void glsl_fragment_pipe_invalidate_constants(struct wined3d_context *cont static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), glsl_fragment_pipe_invalidate_constants}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_OP), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG1), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG2), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG0), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - {STATE_PIXELSHADER, {STATE_PIXELSHADER, glsl_fragment_pipe_shader }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG0), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), glsl_fragment_pipe_shader }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGENABLE), {STATE_RENDER(WINED3D_RS_FOGENABLE), glsl_fragment_pipe_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGSTART), {STATE_RENDER(WINED3D_RS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGEND), {STATE_RENDER(WINED3D_RS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), state_srgbwrite }, ARB_FRAMEBUFFER_SRGB}, - {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), {STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGCOLOR), {STATE_RENDER(WINED3D_RS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGDENSITY), {STATE_RENDER(WINED3D_RS_FOGDENSITY), state_fogdensity }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_fragment_pipe_tex_transform }, WINED3D_GL_EXT_NONE }, diff --git a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c index 7028c44921d..05c2d461c6a 100644 --- a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c +++ b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c @@ -167,7 +167,6 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d output = GL_SPARE0_NV; } - /* This is called by a state handler which has the gl lock held and a context for the thread */ switch (op) { case WINED3D_TOP_DISABLE: @@ -473,9 +472,8 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - const struct wined3d_device *device = context->swapchain->device; - BOOL tex_used = device->fixed_function_usage_map & (1 << stage); - DWORD mapped_stage = device->texUnitMap[stage]; + BOOL tex_used = context->fixed_function_usage_map & (1 << stage); + DWORD mapped_stage = context->tex_unit_map[stage]; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Setting color op for stage %u.\n", stage); @@ -495,16 +493,16 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s context_active_texture(context, gl_info, mapped_stage); } - if (state->lowest_disabled_stage > 0) + if (context->lowest_disabled_stage > 0) { gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); - GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, state->lowest_disabled_stage)); + GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, context->lowest_disabled_stage)); } else { gl_info->gl_ops.gl.p_glDisable(GL_REGISTER_COMBINERS_NV); } - if (stage >= state->lowest_disabled_stage) + if (stage >= context->lowest_disabled_stage) { TRACE("Stage disabled\n"); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -577,17 +575,33 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s } } +static void nvrc_resultarg(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + + TRACE("Setting result arg for stage %u.\n", stage); + + if (!isStateDirty(context, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP))) + { + context_apply_state(context, state, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); + } + if (!isStateDirty(context, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP))) + { + context_apply_state(context, state, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP)); + } +} + static void nvts_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD sampler = state_id - STATE_SAMPLER(0); - DWORD mapped_stage = context->swapchain->device->texUnitMap[sampler]; + DWORD mapped_stage = context->tex_unit_map[sampler]; /* No need to enable / disable anything here for unused samplers. The tex_colorop * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop * will take care of this business. */ if (mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= context->gl_info->limits.textures) return; - if (sampler >= state->lowest_disabled_stage) + if (sampler >= context->lowest_disabled_stage) return; if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) return; @@ -598,7 +612,7 @@ static void nvts_texdim(struct wined3d_context *context, const struct wined3d_st static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - DWORD mapped_stage = context->swapchain->device->texUnitMap[stage + 1]; + DWORD mapped_stage = context->tex_unit_map[stage + 1]; const struct wined3d_gl_info *gl_info = context->gl_info; float mat[2][2]; @@ -766,7 +780,7 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(0, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -779,7 +793,7 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(1, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(1, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(1, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(1, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -792,7 +806,7 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(2, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(2, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(2, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(2, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -805,7 +819,7 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(3, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(3, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(3, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(3, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -818,7 +832,7 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(4, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(4, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(4, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(4, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -831,7 +845,7 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(5, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(5, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(5, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(5, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -844,7 +858,7 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(6, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(6, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(6, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(6, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -857,9 +871,9 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT11), { STATE_TEXTURESTAGE(7, WINED3D_TSS_BUMPENV_MAT00), NULL }, NV_TEXTURE_SHADER2 }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_ARG0), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_PIXELSHADER, { STATE_PIXELSHADER, apply_pixelshader }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + { STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), nvrc_resultarg }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), apply_pixelshader }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), nvrc_texfactor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGCOLOR), { STATE_RENDER(WINED3D_RS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGDENSITY), { STATE_RENDER(WINED3D_RS_FOGDENSITY), state_fogdensity }, WINED3D_GL_EXT_NONE }, diff --git a/reactos/dll/directx/wine/wined3d/palette.c b/reactos/dll/directx/wine/wined3d/palette.c index 1239b15ca3b..b78249a6aff 100644 --- a/reactos/dll/directx/wine/wined3d/palette.c +++ b/reactos/dll/directx/wine/wined3d/palette.c @@ -23,8 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define SIZE_BITS (WINEDDPCAPS_1BIT | WINEDDPCAPS_2BIT | WINEDDPCAPS_4BIT | WINEDDPCAPS_8BIT) - ULONG CDECL wined3d_palette_incref(struct wined3d_palette *palette) { ULONG refcount = InterlockedIncrement(&palette->ref); @@ -49,31 +47,18 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) return refcount; } -static WORD wined3d_palette_size(DWORD flags) -{ - switch (flags & SIZE_BITS) - { - case WINEDDPCAPS_1BIT: return 2; - case WINEDDPCAPS_2BIT: return 4; - case WINEDDPCAPS_4BIT: return 16; - case WINEDDPCAPS_8BIT: return 256; - default: - FIXME("Unhandled size bits %#x.\n", flags & SIZE_BITS); - return 256; - } -} - HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries) { TRACE("palette %p, flags %#x, start %u, count %u, entries %p.\n", palette, flags, start, count, entries); - if (flags) return WINED3DERR_INVALIDCALL; /* unchecked */ - if (start + count > wined3d_palette_size(palette->flags)) + if (flags) + return WINED3DERR_INVALIDCALL; /* unchecked */ + if (start > palette->palNumEntries || count > palette->palNumEntries - start) return WINED3DERR_INVALIDCALL; - if (palette->flags & WINEDDPCAPS_8BITENTRIES) + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { BYTE *entry = (BYTE *)entries; unsigned int i; @@ -96,7 +81,7 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette, flags, start, count, entries); TRACE("Palette flags: %#x.\n", palette->flags); - if (palette->flags & WINEDDPCAPS_8BITENTRIES) + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { const BYTE *entry = (const BYTE *)entries; unsigned int i; @@ -109,9 +94,9 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, memcpy(palette->palents + start, entries, count * sizeof(*palette->palents)); /* When WINEDDCAPS_ALLOW256 isn't set we need to override entry 0 with black and 255 with white */ - if (!(palette->flags & WINEDDPCAPS_ALLOW256)) + if (!(palette->flags & WINED3D_PALETTE_ALLOW_256)) { - TRACE("WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white\n"); + TRACE("WINED3D_PALETTE_ALLOW_256 not set, overriding palette entry 0 with black and 255 with white.\n"); palette->palents[0].peRed = 0; palette->palents[0].peGreen = 0; palette->palents[0].peBlue = 0; @@ -139,31 +124,16 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, return WINED3D_OK; } -DWORD CDECL wined3d_palette_get_flags(const struct wined3d_palette *palette) -{ - TRACE("palette %p.\n", palette); - - return palette->flags; -} - -void * CDECL wined3d_palette_get_parent(const struct wined3d_palette *palette) -{ - TRACE("palette %p.\n", palette); - - return palette->parent; -} - static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wined3d_device *device, - DWORD flags, const PALETTEENTRY *entries, void *parent) + DWORD flags, unsigned int entry_count, const PALETTEENTRY *entries) { HRESULT hr; palette->ref = 1; - palette->parent = parent; palette->device = device; palette->flags = flags; - palette->palNumEntries = wined3d_palette_size(flags); + palette->palNumEntries = entry_count; palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); if (!palette->hpal) { @@ -171,8 +141,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine return E_FAIL; } - hr = wined3d_palette_set_entries(palette, 0, 0, wined3d_palette_size(flags), entries); - if (FAILED(hr)) + if (FAILED(hr = wined3d_palette_set_entries(palette, 0, 0, entry_count, entries))) { WARN("Failed to set palette entries, hr %#x.\n", hr); DeleteObject(palette->hpal); @@ -183,20 +152,19 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine } HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, - const PALETTEENTRY *entries, void *parent, struct wined3d_palette **palette) + unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette) { struct wined3d_palette *object; HRESULT hr; - TRACE("device %p, flags %#x, entries %p, palette %p, parent %p.\n", - device, flags, entries, palette, parent); + TRACE("device %p, flags %#x, entries %p, palette %p.\n", + device, flags, entries, palette); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - hr = wined3d_palette_init(object, device, flags, entries, parent); - if (FAILED(hr)) + if (FAILED(hr = wined3d_palette_init(object, device, flags, entry_count, entries))) { WARN("Failed to initialize palette, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/reactos/dll/directx/wine/wined3d/query.c b/reactos/dll/directx/wine/wined3d/query.c index 8806c9a4e9d..becea1b76f8 100644 --- a/reactos/dll/directx/wine/wined3d/query.c +++ b/reactos/dll/directx/wine/wined3d/query.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/resource.c b/reactos/dll/directx/wine/wined3d/resource.c index a3fc9d00638..5c7bc8178e9 100644 --- a/reactos/dll/directx/wine/wined3d/resource.c +++ b/reactos/dll/directx/wine/wined3d/resource.c @@ -68,7 +68,8 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL - | WINED3DUSAGE_OVERLAY; + | WINED3DUSAGE_OVERLAY + | WINED3DUSAGE_TEXTURE; if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); @@ -83,6 +84,17 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * { const struct wined3d *d3d = device->wined3d; + resource_check_usage(usage); + if (pool != WINED3D_POOL_SCRATCH) + { + if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) + return WINED3DERR_INVALIDCALL; + if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + return WINED3DERR_INVALIDCALL; + if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags & WINED3DFMT_FLAG_TEXTURE)) + return WINED3DERR_INVALIDCALL; + } + resource->ref = 1; resource->device = device; resource->type = type; @@ -104,22 +116,18 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; list_init(&resource->privateData); - resource_check_usage(usage); - if (size) { - resource->heap_memory = wined3d_resource_allocate_sysmem(size); - if (!resource->heap_memory) + if (!wined3d_resource_allocate_sysmem(resource)) { - ERR("Out of memory!\n"); - return WINED3DERR_OUTOFVIDEOMEMORY; + ERR("Failed to allocate system memory.\n"); + return E_OUTOFMEMORY; } } else { resource->heap_memory = NULL; } - resource->allocatedMemory = resource->heap_memory; /* Check that we have enough video ram left */ if (pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) @@ -127,7 +135,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (size > wined3d_device_get_available_texture_mem(device)) { ERR("Out of adapter memory\n"); - wined3d_resource_free_sysmem(resource->heap_memory); + wined3d_resource_free_sysmem(resource); return WINED3DERR_OUTOFVIDEOMEMORY; } adapter_adjust_memory(device->adapter, size); @@ -161,9 +169,7 @@ void resource_cleanup(struct wined3d_resource *resource) ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } - wined3d_resource_free_sysmem(resource->heap_memory); - resource->allocatedMemory = NULL; - resource->heap_memory = NULL; + wined3d_resource_free_sysmem(resource); device_resource_released(resource->device, resource); } @@ -318,6 +324,11 @@ void * CDECL wined3d_resource_get_parent(const struct wined3d_resource *resource return resource->parent; } +void CDECL wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent) +{ + resource->parent = parent; +} + void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc) { desc->resource_type = resource->type; @@ -332,29 +343,32 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st desc->size = resource->size; } -void *wined3d_resource_allocate_sysmem(SIZE_T size) +BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) { void **p; SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p); void *mem; - if (!(mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + align))) - return NULL; + if (!(mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, resource->size + align))) + return FALSE; p = (void **)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)) - 1; *p = mem; - return ++p; + resource->heap_memory = ++p; + + return TRUE; } -void wined3d_resource_free_sysmem(void *mem) +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) { - void **p = mem; + void **p = resource->heap_memory; - if (!mem) + if (!p) return; HeapFree(GetProcessHeap(), 0, *(--p)); + resource->heap_memory = NULL; } DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) @@ -406,3 +420,12 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) return ret; } + +GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) +{ + if (d3d_flags & WINED3D_MAP_READONLY) + return GL_READ_ONLY_ARB; + if (d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + return GL_WRITE_ONLY_ARB; + return GL_READ_WRITE_ARB; +} diff --git a/reactos/dll/directx/wine/wined3d/shader.c b/reactos/dll/directx/wine/wined3d/shader.c index de86bc1f138..eb6264a15b1 100644 --- a/reactos/dll/directx/wine/wined3d/shader.c +++ b/reactos/dll/directx/wine/wined3d/shader.c @@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +/* pow, mul_high, sub_high, mul_low */ +const float wined3d_srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; +/* cmp */ +const float wined3d_srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; + static const char * const shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", @@ -1720,7 +1725,6 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) return refcount; } -/* Do not call while under the GL lock. */ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) { ULONG refcount = InterlockedDecrement(&shader->ref); @@ -1806,14 +1810,14 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh return WINED3D_OK; } -void find_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct vs_compile_args *args) +void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + WORD swizzle_map, struct vs_compile_args *args) { args->fog_src = state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z; args->clip_enabled = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - args->swizzle_map = shader->device->stream_info.swizzle_map; + args->swizzle_map = swizzle_map; } static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) @@ -2014,11 +2018,9 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d return WINED3D_OK; } -void find_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct ps_compile_args *args) +void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_gl_info *gl_info) { - struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_texture *texture; UINT i; @@ -2048,7 +2050,7 @@ void find_ps_compile_args(const struct wined3d_state *state, { DWORD tex_transform = flags & ~WINED3D_TTFF_PROJECTED; - if (!state->vertex_shader) + if (!state->shader[WINED3D_SHADER_TYPE_VERTEX]) { unsigned int j; unsigned int index = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; @@ -2147,7 +2149,7 @@ void find_ps_compile_args(const struct wined3d_state *state, } if (shader->reg_maps.shader_version.major >= 3) { - if (device->stream_info.position_transformed) + if (position_transformed) args->vp_mode = pretransformed; else if (use_vs(state)) args->vp_mode = vertexshader; @@ -2163,7 +2165,7 @@ void find_ps_compile_args(const struct wined3d_state *state, switch (state->render_states[WINED3D_RS_FOGTABLEMODE]) { case WINED3D_FOG_NONE: - if (device->stream_info.position_transformed || use_vs(state)) + if (position_transformed || use_vs(state)) { args->fog = WINED3D_FFP_PS_FOG_LINEAR; break; diff --git a/reactos/dll/directx/wine/wined3d/state.c b/reactos/dll/directx/wine/wined3d/state.c index 784907a72f9..327f153bb2b 100644 --- a/reactos/dll/directx/wine/wined3d/state.c +++ b/reactos/dll/directx/wine/wined3d/state.c @@ -79,7 +79,7 @@ static void state_lighting(struct wined3d_context *context, const struct wined3d return; if (state->render_states[WINED3D_RS_LIGHTING] - && !context->swapchain->device->stream_info.position_transformed) + && !context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glEnable(GL_LIGHTING); checkGLcall("glEnable GL_LIGHTING"); @@ -126,7 +126,7 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ if (context->gl_info->supported[ARB_DEPTH_CLAMP]) { - if (!zenable && context->swapchain->device->stream_info.position_transformed) + if (!zenable && context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); checkGLcall("glEnable(GL_DEPTH_CLAMP)"); @@ -523,19 +523,15 @@ static void state_alpha(struct wined3d_context *context, const struct wined3d_st TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - /* Find out if the texture on the first stage has a ckey set - * The alpha state func reads the texture settings, even though alpha and texture are not grouped - * together. This is to avoid making a huge alpha+texture+texture stage+ckey block due to the hardly - * used WINED3D_RS_COLORKEYENABLE state(which is d3d <= 3 only). The texture function will call alpha - * in case it finds some texture+colorkeyenable combination which needs extra care. - */ - if (state->textures[0]) - { - struct wined3d_surface *surface = surface_from_resource(state->textures[0]->sub_resources[0]); - - if (surface->CKeyFlags & WINEDDSD_CKSRCBLT) - enable_ckey = TRUE; - } + /* Find out if the texture on the first stage has a ckey set. The alpha + * state func reads the texture settings, even though alpha and texture + * are not grouped together. This is to avoid making a huge alpha + + * texture + texture stage + ckey block due to the hardly used + * WINED3D_RS_COLORKEYENABLE state(which is d3d <= 3 only). The texture + * function will call alpha in case it finds some texture + colorkeyenable + * combination which needs extra care. */ + if (state->textures[0] && (state->textures[0]->color_key_flags & WINEDDSD_CKSRCBLT)) + enable_ckey = TRUE; if (enable_ckey || context->last_was_ckey) context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); @@ -811,18 +807,18 @@ static GLenum gl_stencil_op(enum wined3d_stencil_op op) static void state_stencil(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - DWORD onesided_enable = FALSE; - DWORD twosided_enable = FALSE; - GLint func = GL_ALWAYS; - GLint func_ccw = GL_ALWAYS; - GLint ref = 0; - GLuint mask = 0; - GLint stencilFail = GL_KEEP; - GLint depthFail = GL_KEEP; - GLint stencilPass = GL_KEEP; - GLint stencilFail_ccw = GL_KEEP; - GLint depthFail_ccw = GL_KEEP; - GLint stencilPass_ccw = GL_KEEP; + DWORD onesided_enable; + DWORD twosided_enable; + GLint func; + GLint func_ccw; + GLint ref; + GLuint mask; + GLint stencilFail; + GLint stencilFail_ccw; + GLint stencilPass; + GLint stencilPass_ccw; + GLint depthFail; + GLint depthFail_ccw; /* No stencil test without a stencil buffer. */ if (!state->fb->depth_stencil) @@ -1242,7 +1238,6 @@ void state_fogdensity(struct wined3d_context *context, const struct wined3d_stat static void state_colormat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLenum Parm = 0; @@ -1255,7 +1250,7 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d } context->num_untracked_materials = 0; - if ((device->stream_info.use_map & (1 << WINED3D_FFP_DIFFUSE)) + if ((context->stream_info.use_map & (1 << WINED3D_FFP_DIFFUSE)) && state->render_states[WINED3D_RS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", @@ -1408,7 +1403,7 @@ static void state_normalize(struct wined3d_context *context, const struct wined3 * by zero and is not properly defined in opengl, so avoid it */ if (state->render_states[WINED3D_RS_NORMALIZENORMALS] - && (context->swapchain->device->stream_info.use_map & (1 << WINED3D_FFP_NORMAL))) + && (context->stream_info.use_map & (1 << WINED3D_FFP_NORMAL))) { gl_info->gl_ops.gl.p_glEnable(GL_NORMALIZE); checkGLcall("glEnable(GL_NORMALIZE);"); @@ -2083,18 +2078,17 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%d), a2(%d), a3(%d)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3); - /* This is called by a state handler which has the gl lock held and a context for the thread */ - - /* Note: Operations usually involve two ars, src0 and src1 and are operations of - the form (a1 a2). However, some of the more complex operations - take 3 parameters. Instead of the (sensible) addition of a3, Microsoft added - in a third parameter called a0. Therefore these are operations of the form - a0 a1 a2, i.e., the new parameter goes to the front. - - However, below we treat the new (a0) parameter as src2/opr2, so in the actual - functions below, expect their syntax to differ slightly to those listed in the - manuals, i.e., replace arg1 with arg3, arg2 with arg1 and arg3 with arg2 - This affects WINED3DTOP_MULTIPLYADD and WINED3DTOP_LERP */ + /* Operations usually involve two args, src0 and src1 and are operations + * of the form (a1 a2). However, some of the more complex + * operations take 3 parameters. Instead of the (sensible) addition of a3, + * Microsoft added in a third parameter called a0. Therefore these are + * operations of the form a0 a1 a2. I.e., the new + * parameter goes to the front. + * + * However, below we treat the new (a0) parameter as src2/opr2, so in the + * actual functions below, expect their syntax to differ slightly to those + * listed in the manuals. I.e., replace arg1 with arg3, arg2 with arg1 and + * arg3 with arg2. This affects WINED3DTOP_MULTIPLYADD and WINED3DTOP_LERP. */ if (isAlpha) { @@ -3124,9 +3118,8 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined static void tex_colorop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - const struct wined3d_device *device = context->swapchain->device; - BOOL tex_used = device->fixed_function_usage_map & (1 << stage); - DWORD mapped_stage = device->texUnitMap[stage]; + BOOL tex_used = context->fixed_function_usage_map & (1 << stage); + DWORD mapped_stage = context->tex_unit_map[stage]; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Setting color op for stage %d\n", stage); @@ -3146,7 +3139,7 @@ static void tex_colorop(struct wined3d_context *context, const struct wined3d_st context_active_texture(context, gl_info, mapped_stage); } - if (stage >= state->lowest_disabled_stage) + if (stage >= context->lowest_disabled_stage) { TRACE("Stage disabled\n"); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -3186,9 +3179,8 @@ static void tex_colorop(struct wined3d_context *context, const struct wined3d_st void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - const struct wined3d_device *device = context->swapchain->device; - BOOL tex_used = device->fixed_function_usage_map & (1 << stage); - DWORD mapped_stage = device->texUnitMap[stage]; + BOOL tex_used = context->fixed_function_usage_map & (1 << stage); + DWORD mapped_stage = context->tex_unit_map[stage]; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD op, arg1, arg2, arg0; @@ -3216,9 +3208,7 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) { - struct wined3d_surface *surf = surface_from_resource(texture->sub_resources[0]); - - if (surf->CKeyFlags & WINEDDSD_CKSRCBLT && !surf->resource.format->alpha_size) + if (texture->color_key_flags & WINEDDSD_CKSRCBLT && !texture->resource.format->alpha_size) { /* Color keying needs to pass alpha values from the texture through to have the alpha test work * properly. On the other hand applications can still use texture combiners apparently. This code @@ -3289,7 +3279,7 @@ void transform_texture(struct wined3d_context *context, const struct wined3d_sta DWORD texUnit = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); const struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; - DWORD mapped_stage = device->texUnitMap[texUnit]; + DWORD mapped_stage = context->tex_unit_map[texUnit]; BOOL generated; int coordIdx; @@ -3310,8 +3300,8 @@ void transform_texture(struct wined3d_context *context, const struct wined3d_sta set_texture_matrix(gl_info, &state->transforms[WINED3D_TS_TEXTURE0 + texUnit].u.m[0][0], state->texture_states[texUnit][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], generated, context->last_was_rhw, - device->stream_info.use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)) - ? device->stream_info.elements[WINED3D_FFP_TEXCOORD0 + coordIdx].format->id + context->stream_info.use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)) + ? context->stream_info.elements[WINED3D_FFP_TEXCOORD0 + coordIdx].format->id : WINED3DFMT_UNKNOWN, device->shader_backend->shader_has_ffp_proj_control(device->shader_priv)); @@ -3345,7 +3335,6 @@ static void unload_tex_coords(const struct wined3d_gl_info *gl_info) static void load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, GLuint *curVBO, const struct wined3d_state *state) { - const struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int mapped_stage = 0; unsigned int textureNo = 0; @@ -3354,7 +3343,7 @@ static void load_tex_coords(const struct wined3d_context *context, const struct { int coordIdx = state->texture_states[textureNo][WINED3D_TSS_TEXCOORD_INDEX]; - mapped_stage = device->texUnitMap[textureNo]; + mapped_stage = context->tex_unit_map[textureNo]; if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue; if (mapped_stage >= gl_info->limits.texture_coords) @@ -3405,13 +3394,12 @@ static void load_tex_coords(const struct wined3d_context *context, const struct static void tex_coordindex(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - const struct wined3d_device *device = context->swapchain->device; static const GLfloat s_plane[] = { 1.0f, 0.0f, 0.0f, 0.0f }; static const GLfloat t_plane[] = { 0.0f, 1.0f, 0.0f, 0.0f }; static const GLfloat r_plane[] = { 0.0f, 0.0f, 1.0f, 0.0f }; static const GLfloat q_plane[] = { 0.0f, 0.0f, 0.0f, 1.0f }; const struct wined3d_gl_info *gl_info = context->gl_info; - DWORD mapped_stage = device->texUnitMap[stage]; + DWORD mapped_stage = context->tex_unit_map[stage]; if (mapped_stage == WINED3D_UNMAPPED_STAGE) { @@ -3574,7 +3562,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; unload_tex_coords(gl_info); - load_tex_coords(context, &device->stream_info, &curVBO, state); + load_tex_coords(context, &context->stream_info, &curVBO, state); } } @@ -3599,24 +3587,21 @@ void sampler_texmatrix(struct wined3d_context *context, const struct wined3d_sta if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) { - const struct wined3d_device *device = context->swapchain->device; - if (texIsPow2) context->lastWasPow2Texture |= 1 << sampler; else context->lastWasPow2Texture &= ~(1 << sampler); transform_texture(context, state, - STATE_TEXTURESTAGE(device->texUnitMap[sampler], WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); + STATE_TEXTURESTAGE(context->tex_unit_map[sampler], WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); } } } static void sampler(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_device *device = context->swapchain->device; DWORD sampler = state_id - STATE_SAMPLER(0); - DWORD mapped_stage = device->texUnitMap[sampler]; + DWORD mapped_stage = context->tex_unit_map[sampler]; const struct wined3d_gl_info *gl_info = context->gl_info; union { float f; @@ -3645,7 +3630,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state struct wined3d_texture *texture = state->textures[sampler]; BOOL srgb = state->sampler_states[sampler][WINED3D_SAMP_SRGB_TEXTURE]; - texture->texture_ops->texture_bind(texture, context, srgb); + wined3d_texture_bind(texture, context, srgb); wined3d_texture_apply_state_changes(texture, state->sampler_states[sampler], gl_info); if (gl_info->supported[EXT_TEXTURE_LOD_BIAS]) @@ -3656,7 +3641,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state checkGLcall("glTexEnvf(GL_TEXTURE_LOD_BIAS_EXT, ...)"); } - if (!use_ps(state) && sampler < state->lowest_disabled_stage) + if (!use_ps(state) && sampler < context->lowest_disabled_stage) { if (state->render_states[WINED3D_RS_COLORKEYENABLE] && !sampler) { @@ -3672,7 +3657,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } else { - if (sampler < state->lowest_disabled_stage) + if (sampler < context->lowest_disabled_stage) { /* TODO: What should I do with pixel shaders here ??? */ if (state->render_states[WINED3D_RS_COLORKEYENABLE] && !sampler) @@ -4061,13 +4046,12 @@ static void unload_numbered_arrays(struct wined3d_context *context) static void load_numbered_arrays(struct wined3d_context *context, const struct wined3d_stream_info *stream_info, const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; int i; /* Default to no instancing */ - device->instance_count = 0; + context->instance_count = 0; for (i = 0; i < MAX_ATTRIBS; i++) { @@ -4077,7 +4061,7 @@ static void load_numbered_arrays(struct wined3d_context *context, { if (context->numbered_array_mask & (1 << i)) unload_numbered_array(context, i); - if (state->vertex_shader->reg_maps.input_registers & (1 << i)) + if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.input_registers & (1 << i)) GL_EXTCALL(glVertexAttrib4fARB(i, 0.0f, 0.0f, 0.0f, 0.0f)); continue; } @@ -4086,8 +4070,8 @@ static void load_numbered_arrays(struct wined3d_context *context, if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { - if (!device->instance_count) - device->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; + if (!context->instance_count) + context->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; if (!gl_info->supported[ARB_INSTANCED_ARRAYS]) { @@ -4140,7 +4124,7 @@ static void load_numbered_arrays(struct wined3d_context *context, const BYTE *ptr = stream_info->elements[i].data.addr; if (stream_info->elements[i].data.buffer_object) { - ptr += (ULONG_PTR)buffer_get_sysmem(stream->buffer, gl_info); + ptr += (ULONG_PTR)buffer_get_sysmem(stream->buffer, context); } if (context->numbered_array_mask & (1 << i)) unload_numbered_array(context, i); @@ -4233,10 +4217,9 @@ static void load_numbered_arrays(struct wined3d_context *context, checkGLcall("Loading numbered arrays"); } -static void load_vertex_data(const struct wined3d_context *context, +static void load_vertex_data(struct wined3d_context *context, const struct wined3d_stream_info *si, const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; const struct wined3d_stream_info_element *e; @@ -4244,7 +4227,7 @@ static void load_vertex_data(const struct wined3d_context *context, TRACE("Using fast vertex array code\n"); /* This is fixed function pipeline only, and the fixed function pipeline doesn't do instancing */ - device->instance_count = 0; + context->instance_count = 0; /* Blend Data ---------------------------------------------- */ if ((si->use_map & (1 << WINED3D_FFP_BLENDWEIGHT)) @@ -4471,9 +4454,8 @@ static void load_vertex_data(const struct wined3d_context *context, static void streamsrc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_device *device = context->swapchain->device; - BOOL load_numbered = use_vs(state) && !device->useDrawStridedSlow; - BOOL load_named = !use_vs(state) && !device->useDrawStridedSlow; + BOOL load_numbered = use_vs(state) && !context->use_immediate_mode_draw; + BOOL load_named = !use_vs(state) && !context->use_immediate_mode_draw; if (isStateDirty(context, STATE_VDECL)) return; if (context->numberedArraysLoaded && !load_numbered) @@ -4491,13 +4473,13 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat if (load_numbered) { TRACE("Loading numbered arrays\n"); - load_numbered_arrays(context, &device->stream_info, state); + load_numbered_arrays(context, &context->stream_info, state); context->numberedArraysLoaded = TRUE; } else if (load_named) { TRACE("Loading vertex data\n"); - load_vertex_data(context, &device->stream_info, state); + load_vertex_data(context, &context->stream_info, state); context->namedArraysLoaded = TRUE; } } @@ -4511,7 +4493,6 @@ static void vdecl_miscpart(struct wined3d_context *context, const struct wined3d void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; BOOL useVertexShaderFunction = use_vs(state); BOOL updateFog = FALSE; @@ -4519,7 +4500,7 @@ void vertexdeclaration(struct wined3d_context *context, const struct wined3d_sta BOOL wasrhw = context->last_was_rhw; unsigned int i; - transformed = device->stream_info.position_transformed; + transformed = context->stream_info.position_transformed; if (transformed != context->last_was_rhw && !useVertexShaderFunction) updateFog = TRUE; @@ -4637,8 +4618,8 @@ void vertexdeclaration(struct wined3d_context *context, const struct wined3d_sta transform_texture(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); } - if (use_ps(state) && state->pixel_shader->reg_maps.shader_version.major == 1 - && state->pixel_shader->reg_maps.shader_version.minor <= 3) + if (use_ps(state) && state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.shader_version.major == 1 + && state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.shader_version.minor <= 3) context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_PIXEL; } @@ -4840,7 +4821,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st static void indexbuffer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_stream_info *stream_info = &context->swapchain->device->stream_info; + const struct wined3d_stream_info *stream_info = &context->stream_info; const struct wined3d_gl_info *gl_info = context->gl_info; if (!state->index_buffer || !stream_info->all_vbo) @@ -5097,15 +5078,15 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_BASEVERTEXINDEX, { STATE_BASEVERTEXINDEX, state_nop, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, - { STATE_PIXELSHADER, { STATE_PIXELSHADER, context_state_drawbuf},WINED3D_GL_EXT_NONE }, - { STATE_GEOMETRY_SHADER, { STATE_GEOMETRY_SHADER, state_geometry_shader}, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_geometry_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; const struct StateEntryTemplate vp_ffp_states[] = { { STATE_VDECL, { STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, - { STATE_VSHADER, { STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), { STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_MATERIAL, { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SPECULARENABLE), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_specularenable}, WINED3D_GL_EXT_NONE }, /* Clip planes */ @@ -5583,8 +5564,8 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_ARG0), { STATE_TEXTURESTAGE(7, WINED3D_TSS_ALPHA_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_RESULT_ARG), { STATE_TEXTURESTAGE(7, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(7, WINED3D_TSS_CONSTANT), { 0 /* As long as we don't support D3DTA_CONSTANT */, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_PIXELSHADER, { STATE_PIXELSHADER, apply_pixelshader }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), apply_pixelshader }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_texfactor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGCOLOR), { STATE_RENDER(WINED3D_RS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGDENSITY), { STATE_RENDER(WINED3D_RS_FOGDENSITY), state_fogdensity }, WINED3D_GL_EXT_NONE }, @@ -5833,9 +5814,9 @@ static void validate_state_table(struct StateEntry *state_table) STATE_VDECL, STATE_STREAMSRC, STATE_INDEXBUFFER, - STATE_VSHADER, - STATE_GEOMETRY_SHADER, - STATE_PIXELSHADER, + STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), + STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), + STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), STATE_VIEWPORT, STATE_LIGHT_TYPE, STATE_SCISSORRECT, diff --git a/reactos/dll/directx/wine/wined3d/stateblock.c b/reactos/dll/directx/wine/wined3d/stateblock.c index 9cb336d5f1e..d76f6d6d6b7 100644 --- a/reactos/dll/directx/wine/wined3d/stateblock.c +++ b/reactos/dll/directx/wine/wined3d/stateblock.c @@ -461,7 +461,7 @@ void state_unbind_resources(struct wined3d_state *state) struct wined3d_texture *texture; struct wined3d_buffer *buffer; struct wined3d_shader *shader; - unsigned int i; + unsigned int i, j; if ((decl = state->vertex_declaration)) { @@ -502,75 +502,30 @@ void state_unbind_resources(struct wined3d_state *state) wined3d_buffer_decref(buffer); } - if ((shader = state->vertex_shader)) + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { - state->vertex_shader = NULL; - wined3d_shader_decref(shader); - } - - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->vs_cb[i])) + if ((shader = state->shader[i])) { - state->vs_cb[i] = NULL; - wined3d_buffer_decref(buffer); + state->shader[i] = NULL; + wined3d_shader_decref(shader); } - } - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) - { - if ((sampler = state->vs_sampler[i])) + for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) { - state->vs_sampler[i] = NULL; - wined3d_sampler_decref(sampler); + if ((buffer = state->cb[i][j])) + { + state->cb[i][j] = NULL; + wined3d_buffer_decref(buffer); + } } - } - if ((shader = state->geometry_shader)) - { - state->geometry_shader = NULL; - wined3d_shader_decref(shader); - } - - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->gs_cb[i])) + for (j = 0; j < MAX_SAMPLER_OBJECTS; ++j) { - state->gs_cb[i] = NULL; - wined3d_buffer_decref(buffer); - } - } - - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) - { - if ((sampler = state->gs_sampler[i])) - { - state->gs_sampler[i] = NULL; - wined3d_sampler_decref(sampler); - } - } - - if ((shader = state->pixel_shader)) - { - state->pixel_shader = NULL; - wined3d_shader_decref(shader); - } - - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) - { - if ((sampler = state->ps_sampler[i])) - { - state->ps_sampler[i] = NULL; - wined3d_sampler_decref(sampler); - } - } - - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->ps_cb[i])) - { - state->ps_cb[i] = NULL; - wined3d_buffer_decref(buffer); + if ((sampler = state->sampler[i][j])) + { + state->sampler[i][j] = NULL; + wined3d_sampler_decref(sampler); + } } } } @@ -579,7 +534,8 @@ void state_cleanup(struct wined3d_state *state) { unsigned int counter; - state_unbind_resources(state); + if (!(state->flags & WINED3D_STATE_NO_REF)) + state_unbind_resources(state); for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { @@ -596,29 +552,6 @@ void state_cleanup(struct wined3d_state *state) HeapFree(GetProcessHeap(), 0, state->ps_consts_f); } -HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) -{ - unsigned int i; - - for (i = 0; i < LIGHTMAP_SIZE; i++) - { - list_init(&state->light_map[i]); - } - - if (!(state->vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - 4 * sizeof(float) * d3d_info->limits.vs_uniform_count))) - return E_OUTOFMEMORY; - - if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - 4 * sizeof(float) * d3d_info->limits.ps_uniform_count))) - { - HeapFree(GetProcessHeap(), 0, state->vs_consts_f); - return E_OUTOFMEMORY; - } - - return WINED3D_OK; -} - ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { ULONG refcount = InterlockedDecrement(&stateblock->ref); @@ -706,16 +639,18 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Capturing state %p.\n", src_state); - if (stateblock->changed.vertexShader && stateblock->state.vertex_shader != src_state->vertex_shader) + if (stateblock->changed.vertexShader && stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] + != src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) { TRACE("Updating vertex shader from %p to %p\n", - stateblock->state.vertex_shader, src_state->vertex_shader); + stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX], + src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); - if (src_state->vertex_shader) - wined3d_shader_incref(src_state->vertex_shader); - if (stateblock->state.vertex_shader) - wined3d_shader_decref(stateblock->state.vertex_shader); - stateblock->state.vertex_shader = src_state->vertex_shader; + if (src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) + wined3d_shader_incref(src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); + if (stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]) + wined3d_shader_decref(stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); + stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] = src_state->shader[WINED3D_SHADER_TYPE_VERTEX]; } /* Vertex shader float constants. */ @@ -970,13 +905,14 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->state.sampler_states[stage][state] = src_state->sampler_states[stage][state]; } - if (stateblock->changed.pixelShader && stateblock->state.pixel_shader != src_state->pixel_shader) + if (stateblock->changed.pixelShader && stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL] + != src_state->shader[WINED3D_SHADER_TYPE_PIXEL]) { - if (src_state->pixel_shader) - wined3d_shader_incref(src_state->pixel_shader); - if (stateblock->state.pixel_shader) - wined3d_shader_decref(stateblock->state.pixel_shader); - stateblock->state.pixel_shader = src_state->pixel_shader; + if (src_state->shader[WINED3D_SHADER_TYPE_PIXEL]) + wined3d_shader_incref(src_state->shader[WINED3D_SHADER_TYPE_PIXEL]); + if (stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]) + wined3d_shader_decref(stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]); + stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL] = src_state->shader[WINED3D_SHADER_TYPE_PIXEL]; } wined3d_state_record_lights(&stateblock->state, src_state); @@ -1011,7 +947,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applying stateblock %p to device %p.\n", stateblock, device); if (stateblock->changed.vertexShader) - wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader); + wined3d_device_set_vertex_shader(device, stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) @@ -1033,7 +969,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) apply_lights(device, &stateblock->state); if (stateblock->changed.pixelShader) - wined3d_device_set_pixel_shader(device, stateblock->state.pixel_shader); + wined3d_device_set_pixel_shader(device, stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]); /* Pixel Shader Constants. */ for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) @@ -1153,22 +1089,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_clip_plane(device, i, &stateblock->state.clip_planes[i]); } - stateblock->device->state.lowest_disabled_stage = MAX_TEXTURES - 1; - for (i = 0; i < MAX_TEXTURES - 1; ++i) - { - if (stateblock->device->state.texture_states[i][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_DISABLE) - { - stateblock->device->state.lowest_disabled_stage = i; - break; - } - } - TRACE("Applied stateblock %p.\n", stateblock); } -void state_init_default(struct wined3d_state *state, struct wined3d_device *device) +static void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; union { struct wined3d_line_pattern lp; @@ -1179,8 +1104,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi DWORD d; } tmpfloat; unsigned int i; - struct wined3d_swapchain *swapchain; - struct wined3d_surface *backbuffer; static const struct wined3d_matrix identity = {{{ 1.0f, 0.0f, 0.0f, 0.0f, @@ -1189,7 +1112,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi 0.0f, 0.0f, 0.0f, 1.0f, }}}; - TRACE("state %p, device %p.\n", state, device); + TRACE("state %p, gl_info %p.\n", state, gl_info); /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; @@ -1199,14 +1122,9 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; } - state->fb = &device->fb; - TRACE("Render states\n"); /* Render states: */ - if (device->auto_depth_stencil) - state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; - else - state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; + state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; state->render_states[WINED3D_RS_FILLMODE] = WINED3D_FILL_SOLID; state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0; @@ -1356,9 +1274,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] = WINED3DTA_CURRENT; state->texture_states[i][WINED3D_TSS_RESULT_ARG] = WINED3DTA_CURRENT; } - state->lowest_disabled_stage = 1; - /* Sampler states*/ for (i = 0 ; i < MAX_COMBINED_SAMPLERS; ++i) { TRACE("Setting up default samplers states for sampler %u.\n", i); @@ -1378,38 +1294,37 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi /* TODO: Vertex offset in the presampled displacement map. */ state->sampler_states[i][WINED3D_SAMP_DMAP_OFFSET] = 0; } +} - for (i = 0; i < gl_info->limits.textures; ++i) +HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, + const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + DWORD flags) +{ + unsigned int i; + + state->flags = flags; + state->fb = fb; + + for (i = 0; i < LIGHTMAP_SIZE; i++) { - state->textures[i] = NULL; + list_init(&state->light_map[i]); } - /* check the return values, because the GetBackBuffer call isn't valid for ddraw */ - if ((swapchain = wined3d_device_get_swapchain(device, 0))) + if (!(state->vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.vs_uniform_count))) + return E_OUTOFMEMORY; + + if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.ps_uniform_count))) { - if ((backbuffer = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3D_BACKBUFFER_TYPE_MONO))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(&backbuffer->resource, &desc); - - /* Set the default scissor rect values */ - state->scissor_rect.left = 0; - state->scissor_rect.right = desc.width; - state->scissor_rect.top = 0; - state->scissor_rect.bottom = desc.height; - } - - /* Set the default viewport */ - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = swapchain->desc.backbuffer_width; - state->viewport.height = swapchain->desc.backbuffer_height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; + HeapFree(GetProcessHeap(), 0, state->vs_consts_f); + return E_OUTOFMEMORY; } - TRACE("Done.\n"); + if (flags & WINED3D_STATE_INIT_DEFAULT) + state_init_default(state, gl_info); + + return WINED3D_OK; } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1421,7 +1336,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - if (FAILED(hr = state_init(&stateblock->state, d3d_info))) + if (FAILED(hr = state_init(&stateblock->state, NULL, &device->adapter->gl_info, d3d_info, 0))) return hr; if (FAILED(hr = stateblock_allocate_shader_constants(stateblock))) diff --git a/reactos/dll/directx/wine/wined3d/surface.c b/reactos/dll/directx/wine/wined3d/surface.c index ddf4cbf74f0..aea626d7c1c 100644 --- a/reactos/dll/directx/wine/wined3d/surface.c +++ b/reactos/dll/directx/wine/wined3d/surface.c @@ -6,7 +6,7 @@ * Copyright 2002-2003 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2006-2011, 2013 Stefan Dösinger for CodeWeavers + * Copyright 2006-2011, 2013-2014 Stefan Dösinger for CodeWeavers * Copyright 2007-2008 Henri Verbeet * Copyright 2006-2008 Roderick Colenbrander * Copyright 2009-2011 Henri Verbeet for CodeWeavers @@ -32,12 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d); -static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, - const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter); -static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, - enum wined3d_texture_filter_type filter); +#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ + +static const DWORD surface_simple_locations = + WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_USER_MEMORY + | WINED3D_LOCATION_DIB | WINED3D_LOCATION_BUFFER; static void surface_cleanup(struct wined3d_surface *surface) { @@ -45,9 +44,8 @@ static void surface_cleanup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (surface->texture_name || (surface->flags & SFLAG_PBO) - || surface->rb_multisample || surface->rb_resolved - || !list_empty(&surface->renderbuffers)) + if (surface->pbo || surface->rb_multisample + || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; @@ -56,13 +54,7 @@ static void surface_cleanup(struct wined3d_surface *surface) context = context_acquire(surface->resource.device, NULL); gl_info = context->gl_info; - if (surface->texture_name) - { - TRACE("Deleting texture %u.\n", surface->texture_name); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name); - } - - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { TRACE("Deleting PBO %u.\n", surface->pbo); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); @@ -95,11 +87,8 @@ static void surface_cleanup(struct wined3d_surface *surface) DeleteDC(surface->hDC); DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; } - if (surface->flags & SFLAG_USERPTR) - wined3d_surface_set_mem(surface, NULL, 0); if (surface->overlay_dest) list_remove(&surface->overlay_entry); @@ -115,11 +104,11 @@ static void surface_cleanup(struct wined3d_surface *surface) void surface_update_draw_binding(struct wined3d_surface *surface) { if (!surface_is_offscreen(surface) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) - surface->draw_binding = SFLAG_INDRAWABLE; + surface->draw_binding = WINED3D_LOCATION_DRAWABLE; else if (surface->resource.multisample_type) - surface->draw_binding = SFLAG_INRB_MULTISAMPLE; + surface->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; else - surface->draw_binding = SFLAG_INTEXTURE; + surface->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapchain *swapchain) @@ -335,6 +324,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_texture *texture = src_surface->container; struct blt_info info; surface_get_blt_info(src_surface->texture_target, src_rect, src_surface->pow2Width, src_surface->pow2Height, &info); @@ -342,7 +332,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); - context_bind_texture(context, info.bind_target, src_surface->texture_name); + context_bind_texture(context, info.bind_target, texture->texture_rgb.name); /* Filtering for StretchRect */ gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAG_FILTER, @@ -378,14 +368,10 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 /* We changed the filtering settings on the texture. Inform the * container about this to get the filters reset properly next draw. */ - if (src_surface->container) - { - struct wined3d_texture *texture = src_surface->container; - texture->texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_POINT; - texture->texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; - texture->texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; - texture->texture_rgb.states[WINED3DTEXSTA_SRGBTEXTURE] = FALSE; - } + texture->texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_POINT; + texture->texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; + texture->texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; + texture->texture_rgb.states[WINED3DTEXSTA_SRGBTEXTURE] = FALSE; } /* Works correctly only for <= 4 bpp formats. */ @@ -503,17 +489,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) } TRACE("DIBSection at %p.\n", surface->dib.bitmap_data); - /* Copy the existing surface to the dib section. */ - if (surface->resource.allocatedMemory) - { - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, - surface->resource.height * wined3d_surface_get_pitch(surface)); - } - else - { - /* This is to make maps read the GL texture although memory is allocated. */ - surface->flags &= ~SFLAG_INSYSMEM; - } surface->dib.bitmap_size = b_info->bmiHeader.biSizeImage; HeapFree(GetProcessHeap(), 0, b_info); @@ -529,26 +504,50 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) return WINED3D_OK; } -static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data, + DWORD location) { - if (surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) - return FALSE; - if (!(surface->flags & SFLAG_DYNLOCK)) - return FALSE; - if (surface->flags & (SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) - return FALSE; - if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) - return FALSE; + if (location & WINED3D_LOCATION_BUFFER) + { + data->addr = NULL; + data->buffer_object = surface->pbo; + return; + } + if (location & WINED3D_LOCATION_USER_MEMORY) + { + data->addr = surface->user_memory; + data->buffer_object = 0; + return; + } + if (location & WINED3D_LOCATION_DIB) + { + data->addr = surface->dib.bitmap_data; + data->buffer_object = 0; + return; + } + if (location & WINED3D_LOCATION_SYSMEM) + { + data->addr = surface->resource.heap_memory; + data->buffer_object = 0; + return; + } - return TRUE; + ERR("Unexpected locations %s.\n", wined3d_debug_location(location)); + data->addr = NULL; + data->buffer_object = 0; } -static void surface_load_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +static void surface_prepare_buffer(struct wined3d_surface *surface) { struct wined3d_context *context; GLenum error; + const struct wined3d_gl_info *gl_info; + + if (surface->pbo) + return; context = context_acquire(surface->resource.device, NULL); + gl_info = context->gl_info; GL_EXTCALL(glGenBuffersARB(1, &surface->pbo)); error = gl_info->gl_ops.gl.p_glGetError(); @@ -561,124 +560,65 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined checkGLcall("glBindBufferARB"); GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4, - surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB)); + NULL, GL_STREAM_DRAW_ARB)); checkGLcall("glBufferDataARB"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); - /* We don't need the system memory anymore and we can't even use it for PBOs. */ - if (!(surface->flags & SFLAG_CLIENT)) - { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - } - surface->resource.allocatedMemory = NULL; - surface->flags |= SFLAG_PBO; context_release(context); } static void surface_prepare_system_memory(struct wined3d_surface *surface) { - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - TRACE("surface %p.\n", surface); - if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) + if (surface->resource.heap_memory) + return; + + /* Whatever surface we have, make sure that there is memory allocated + * for the downloaded copy, or a PBO to map. */ + if (!wined3d_resource_allocate_sysmem(&surface->resource)) + ERR("Failed to allocate system memory.\n"); + + if (surface->locations & WINED3D_LOCATION_SYSMEM) + ERR("Surface without system memory has WINED3D_LOCATION_SYSMEM set.\n"); +} + +void surface_prepare_map_memory(struct wined3d_surface *surface) +{ + switch (surface->map_binding) { - /* Whatever surface we have, make sure that there is memory allocated - * for the downloaded copy, or a PBO to map. */ - if (!surface->resource.heap_memory) - surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size); + case WINED3D_LOCATION_SYSMEM: + surface_prepare_system_memory(surface); + break; - surface->resource.allocatedMemory = surface->resource.heap_memory; + case WINED3D_LOCATION_USER_MEMORY: + if (!surface->user_memory) + ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); + break; - if (surface->flags & SFLAG_INSYSMEM) - ERR("Surface without memory or PBO has SFLAG_INSYSMEM set.\n"); + case WINED3D_LOCATION_DIB: + if (!surface->dib.bitmap_data) + ERR("Map binding is set to WINED3D_LOCATION_DIB but surface->dib.bitmap_data is NULL.\n"); + break; + + case WINED3D_LOCATION_BUFFER: + surface_prepare_buffer(surface); + break; + + default: + ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->map_binding)); } } static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) + if (surface->resource.map_count || surface->flags & SFLAG_DONOTFREE) return; - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.allocatedMemory = NULL; - surface->resource.heap_memory = NULL; - surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); -} - -/* Context activation is done by the caller. */ -static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - - if (surface->container) - { - struct wined3d_texture *texture = surface->container; - - TRACE("Passing to container (%p).\n", texture); - texture->texture_ops->texture_bind(texture, context, srgb); - } - else - { - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (surface->texture_level) - { - ERR("Standalone surface %p is non-zero texture level %u.\n", - surface, surface->texture_level); - } - - if (srgb) - ERR("Trying to bind standalone surface %p as sRGB.\n", surface); - - if (!surface->texture_name) - { - gl_info->gl_ops.gl.p_glGenTextures(1, &surface->texture_name); - checkGLcall("glGenTextures"); - - TRACE("Surface %p given name %u.\n", surface, surface->texture_name); - - context_bind_texture(context, surface->texture_target, surface->texture_name); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri"); - } - else - { - context_bind_texture(context, surface->texture_target, surface->texture_name); - } - } -} - -/* Context activation is done by the caller. */ -static void surface_bind_and_dirtify(struct wined3d_surface *surface, - struct wined3d_context *context, BOOL srgb) -{ - struct wined3d_device *device = surface->resource.device; - DWORD active_sampler; - - /* We don't need a specific texture unit, but after binding the texture - * the current unit is dirty. Read the unit back instead of switching to - * 0, this avoids messing around with the state manager's GL states. The - * current texture unit should always be a valid one. - * - * To be more specific, this is tricky because we can implicitly be - * called from sampler() in state.c. This means we can't touch anything - * other than whatever happens to be the currently active texture, or we - * would risk marking already applied sampler states dirty again. */ - active_sampler = device->rev_tex_unit_map[context->active_texture]; - - if (active_sampler != WINED3D_UNMAPPED_STAGE) - device_invalidate_state(device, STATE_SAMPLER(active_sampler)); - surface_bind(surface, context, srgb); + wined3d_resource_free_sysmem(&surface->resource); + surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); } static void surface_force_reload(struct wined3d_surface *surface) @@ -691,26 +631,36 @@ static void surface_release_client_storage(struct wined3d_surface *surface) struct wined3d_context *context = context_acquire(surface->resource.device, NULL); const struct wined3d_gl_info *gl_info = context->gl_info; - if (surface->texture_name) + if (surface->container->texture_rgb.name) { - surface_bind_and_dirtify(surface, context, FALSE); + wined3d_texture_bind_and_dirtify(surface->container, context, FALSE); gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } - if (surface->texture_name_srgb) + if (surface->container->texture_srgb.name) { - surface_bind_and_dirtify(surface, context, TRUE); + wined3d_texture_bind_and_dirtify(surface->container, context, TRUE); gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } context_release(context); - surface_modify_location(surface, SFLAG_INSRGBTEX, FALSE); - surface_modify_location(surface, SFLAG_INTEXTURE, FALSE); + surface_invalidate_location(surface, WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); surface_force_reload(surface); } +static BOOL surface_use_pbo(const struct wined3d_surface *surface) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + + return surface->resource.pool == WINED3D_POOL_DEFAULT + && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !surface->resource.format->convert + && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); +} + static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ @@ -719,7 +669,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - surface->texture_name = 0; surface->texture_target = GL_TEXTURE_2D; /* Non-power2 support */ @@ -797,7 +746,10 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - surface->flags |= SFLAG_DISCARDED; + surface->locations = WINED3D_LOCATION_DISCARDED; + + if (surface_use_pbo(surface)) + surface->map_binding = WINED3D_LOCATION_BUFFER; return WINED3D_OK; } @@ -817,20 +769,21 @@ static void surface_realize_palette(struct wined3d_surface *surface) { /* Make sure the texture is up to date. This call doesn't do * anything if the texture is already up to date. */ - surface_load_location(surface, SFLAG_INTEXTURE, NULL); + surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB); /* We want to force a palette refresh, so mark the drawable as not being up to date */ if (!surface_is_offscreen(surface)) - surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); + surface_invalidate_location(surface, WINED3D_LOCATION_DRAWABLE); } else { - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->locations & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); - surface_load_location(surface, SFLAG_INSYSMEM, NULL); + surface_prepare_map_memory(surface); + surface_load_location(surface, surface->map_binding); } - surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); + surface_invalidate_location(surface, ~surface->map_binding); } } @@ -853,184 +806,51 @@ static void surface_realize_palette(struct wined3d_surface *surface) /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - surface_load_location(surface, surface->draw_binding, NULL); -} - -static HRESULT surface_draw_overlay(struct wined3d_surface *surface) -{ - HRESULT hr; - - /* If there's no destination surface there is nothing to do. */ - if (!surface->overlay_dest) - return WINED3D_OK; - - /* Blt calls ModifyLocation on the dest surface, which in turn calls - * DrawOverlay to update the overlay. Prevent an endless recursion. */ - if (surface->overlay_dest->flags & SFLAG_INOVERLAYDRAW) - return WINED3D_OK; - - surface->overlay_dest->flags |= SFLAG_INOVERLAYDRAW; - hr = wined3d_surface_blt(surface->overlay_dest, &surface->overlay_destrect, surface, - &surface->overlay_srcrect, WINEDDBLT_WAIT, NULL, WINED3D_TEXF_LINEAR); - surface->overlay_dest->flags &= ~SFLAG_INOVERLAYDRAW; - - return hr; -} - -static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - struct wined3d_device *device = surface->resource.device; - const RECT *pass_rect = rect; - - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - if (flags & WINED3D_MAP_DISCARD) - { - TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); - surface_prepare_system_memory(surface); - surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); - } - else - { - if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) - WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); - - /* surface_load_location() does not check if the rectangle specifies - * the full surface. Most callers don't need that, so do it here. */ - if (rect && !rect->top && !rect->left - && rect->right == surface->resource.width - && rect->bottom == surface->resource.height) - pass_rect = NULL; - surface_load_location(surface, SFLAG_INSYSMEM, pass_rect); - } - - if (surface->flags & SFLAG_PBO) - { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); - - /* This shouldn't happen but could occur if some other function - * didn't handle the PBO properly. */ - if (surface->resource.allocatedMemory) - ERR("The surface already has PBO memory allocated.\n"); - - surface->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - checkGLcall("glMapBufferARB"); - - /* Make sure the PBO isn't set anymore in order not to break non-PBO - * calls. */ - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - - context_release(context); - } - - if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - { - if (!rect) - surface_add_dirty_rect(surface, NULL); - else - { - struct wined3d_box b; - - b.left = rect->left; - b.top = rect->top; - b.right = rect->right; - b.bottom = rect->bottom; - b.front = 0; - b.back = 1; - surface_add_dirty_rect(surface, &b); - } - } + surface_load_location(surface, surface->draw_binding); } static void surface_unmap(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; - BOOL fullsurface; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; TRACE("surface %p.\n", surface); memset(&surface->lockedRect, 0, sizeof(surface->lockedRect)); - if (surface->flags & SFLAG_PBO) + switch (surface->map_binding) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_DIB: + break; - TRACE("Freeing PBO memory.\n"); + case WINED3D_LOCATION_BUFFER: + context = context_acquire(device, NULL); + gl_info = context->gl_info; - context = context_acquire(device, NULL); - gl_info = context->gl_info; + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glUnmapBufferARB"); + context_release(context); + break; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glUnmapBufferARB"); - context_release(context); - - surface->resource.allocatedMemory = NULL; + default: + ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->map_binding)); } - TRACE("dirtyfied %u.\n", surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE) ? 0 : 1); - - if (surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE)) + if (surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB)) { TRACE("Not dirtified, nothing to do.\n"); - goto done; + return; } if (surface->swapchain && surface->swapchain->front_buffer == surface) - { - if (!surface->dirtyRect.left && !surface->dirtyRect.top - && surface->dirtyRect.right == surface->resource.width - && surface->dirtyRect.bottom == surface->resource.height) - { - fullsurface = TRUE; - } - else - { - /* TODO: Proper partial rectangle tracking. */ - fullsurface = FALSE; - surface->flags |= SFLAG_INSYSMEM; - } - - surface_load_location(surface, surface->draw_binding, fullsurface ? NULL : &surface->dirtyRect); - - /* Partial rectangle tracking is not commonly implemented, it is only - * done for render targets. INSYSMEM was set before to tell - * surface_load_location() where to read the rectangle from. - * Indrawable is set because all modifications from the partial - * sysmem copy are written back to the drawable, thus the surface is - * merged again in the drawable. The sysmem copy is not fully up to - * date because only a subrectangle was read in Map(). */ - if (!fullsurface) - { - surface_modify_location(surface, surface->draw_binding, TRUE); - surface_evict_sysmem(surface); - } - - surface->dirtyRect.left = surface->resource.width; - surface->dirtyRect.top = surface->resource.height; - surface->dirtyRect.right = 0; - surface->dirtyRect.bottom = 0; - } + surface_load_location(surface, surface->draw_binding); else if (surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - { FIXME("Depth / stencil buffer locking is not implemented.\n"); - } - -done: - /* Overlays have to be redrawn manually after changes with the GL implementation */ - if (surface->overlay_dest) - surface_draw_overlay(surface); } static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) @@ -1053,9 +873,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, TRACE("device %p\n", device); TRACE("src_surface %p, src_location %s, src_rect %s,\n", - src_surface, debug_surflocation(src_location), wine_dbgstr_rect(src_rect)); + src_surface, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect)); TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", - dst_surface, debug_surflocation(dst_location), wine_dbgstr_rect(dst_rect)); + dst_surface, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); src_mask = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -1083,9 +903,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ - surface_load_location(src_surface, src_location, NULL); + surface_load_location(src_surface, src_location); if (!surface_is_full_rect(dst_surface, dst_rect)) - surface_load_location(dst_surface, dst_location, NULL); + surface_load_location(dst_surface, dst_location); context = context_acquire(device, NULL); if (!context->valid) @@ -1148,9 +968,9 @@ static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_te TRACE("device %p, filter %s,\n", device, debug_d3dtexturefiltertype(filter)); TRACE("src_surface %p, src_location %s, src_rect %s,\n", - src_surface, debug_surflocation(src_location), wine_dbgstr_rect(src_rect_in)); + src_surface, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect_in)); TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", - dst_surface, debug_surflocation(dst_location), wine_dbgstr_rect(dst_rect_in)); + dst_surface, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect_in)); src_rect = *src_rect_in; dst_rect = *dst_rect_in; @@ -1170,22 +990,22 @@ static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_te } /* Resolve the source surface first if needed. */ - if (src_location == SFLAG_INRB_MULTISAMPLE + if (src_location == WINED3D_LOCATION_RB_MULTISAMPLE && (src_surface->resource.format->id != dst_surface->resource.format->id || abs(src_rect.bottom - src_rect.top) != abs(dst_rect.bottom - dst_rect.top) || abs(src_rect.right - src_rect.left) != abs(dst_rect.right - dst_rect.left))) - src_location = SFLAG_INRB_RESOLVED; + src_location = WINED3D_LOCATION_RB_RESOLVED; /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. (And is * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ - surface_load_location(src_surface, src_location, NULL); + surface_load_location(src_surface, src_location); if (!surface_is_full_rect(dst_surface, &dst_rect)) - surface_load_location(dst_surface, dst_location, NULL); + surface_load_location(dst_surface, dst_location); - if (src_location == SFLAG_INDRAWABLE) context = context_acquire(device, src_surface); - else if (dst_location == SFLAG_INDRAWABLE) context = context_acquire(device, dst_surface); + if (src_location == WINED3D_LOCATION_DRAWABLE) context = context_acquire(device, src_surface); + else if (dst_location == WINED3D_LOCATION_DRAWABLE) context = context_acquire(device, dst_surface); else context = context_acquire(device, NULL); if (!context->valid) @@ -1197,7 +1017,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_te gl_info = context->gl_info; - if (src_location == SFLAG_INDRAWABLE) + if (src_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Source surface %p is onscreen.\n", src_surface); buffer = surface_get_gl_buffer(src_surface); @@ -1214,7 +1034,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_te checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - if (dst_location == SFLAG_INDRAWABLE) + if (dst_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Destination surface %p is onscreen.\n", dst_surface); buffer = surface_get_gl_buffer(dst_surface); @@ -1245,7 +1065,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_te checkGLcall("glBlitFramebuffer()"); if (wined3d_settings.strict_draw_ordering - || (dst_location == SFLAG_INDRAWABLE + || (dst_location == WINED3D_LOCATION_DRAWABLE && dst_surface->swapchain->front_buffer == dst_surface)) gl_info->gl_ops.gl.p_glFlush(); @@ -1291,19 +1111,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -/* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(const struct wined3d_device *device) -{ - if (device->fb.render_targets && device->fb.render_targets[0]) - { - const struct wined3d_surface *render_target = device->fb.render_targets[0]; - if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) - && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) - return TRUE; - } - return FALSE; -} - static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, DWORD color, struct wined3d_color *float_color) { @@ -1325,7 +1132,7 @@ static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface float_color->g = 0.0f; float_color->b = 0.0f; } - float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; + float_color->a = swapchain_is_p8(device->swapchains[0]) ? color / 255.0f : 1.0f; break; case WINED3DFMT_B5G6R5_UNORM: @@ -1389,7 +1196,6 @@ static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface return TRUE; } -/* Do not call while under the GL lock. */ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const RECT *rect, float depth) { const struct wined3d_resource *resource = &surface->resource; @@ -1425,316 +1231,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW return WINED3D_OK; } -/* Do not call while under the GL lock. */ -HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect_in, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags, - const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) -{ - struct wined3d_swapchain *src_swapchain, *dst_swapchain; - struct wined3d_device *device = dst_surface->resource.device; - DWORD src_ds_flags, dst_ds_flags; - RECT src_rect, dst_rect; - BOOL scale, convert; - - static const DWORD simple_blit = WINEDDBLT_ASYNC - | WINEDDBLT_COLORFILL - | WINEDDBLT_WAIT - | WINEDDBLT_DEPTHFILL - | WINEDDBLT_DONOTWAIT; - - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), - flags, fx, debug_d3dtexturefiltertype(filter)); - TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); - - if (fx) - { - TRACE("dwSize %#x.\n", fx->dwSize); - TRACE("dwDDFX %#x.\n", fx->dwDDFX); - TRACE("dwROP %#x.\n", fx->dwROP); - TRACE("dwDDROP %#x.\n", fx->dwDDROP); - TRACE("dwRotationAngle %#x.\n", fx->dwRotationAngle); - TRACE("dwZBufferOpCode %#x.\n", fx->dwZBufferOpCode); - TRACE("dwZBufferLow %#x.\n", fx->dwZBufferLow); - TRACE("dwZBufferHigh %#x.\n", fx->dwZBufferHigh); - TRACE("dwZBufferBaseDest %#x.\n", fx->dwZBufferBaseDest); - TRACE("dwZDestConstBitDepth %#x.\n", fx->dwZDestConstBitDepth); - TRACE("lpDDSZBufferDest %p.\n", fx->u1.lpDDSZBufferDest); - TRACE("dwZSrcConstBitDepth %#x.\n", fx->dwZSrcConstBitDepth); - TRACE("lpDDSZBufferSrc %p.\n", fx->u2.lpDDSZBufferSrc); - TRACE("dwAlphaEdgeBlendBitDepth %#x.\n", fx->dwAlphaEdgeBlendBitDepth); - TRACE("dwAlphaEdgeBlend %#x.\n", fx->dwAlphaEdgeBlend); - TRACE("dwReserved %#x.\n", fx->dwReserved); - TRACE("dwAlphaDestConstBitDepth %#x.\n", fx->dwAlphaDestConstBitDepth); - TRACE("lpDDSAlphaDest %p.\n", fx->u3.lpDDSAlphaDest); - TRACE("dwAlphaSrcConstBitDepth %#x.\n", fx->dwAlphaSrcConstBitDepth); - TRACE("lpDDSAlphaSrc %p.\n", fx->u4.lpDDSAlphaSrc); - TRACE("lpDDSPattern %p.\n", fx->u5.lpDDSPattern); - TRACE("ddckDestColorkey {%#x, %#x}.\n", - fx->ddckDestColorkey.color_space_low_value, - fx->ddckDestColorkey.color_space_high_value); - TRACE("ddckSrcColorkey {%#x, %#x}.\n", - fx->ddckSrcColorkey.color_space_low_value, - fx->ddckSrcColorkey.color_space_high_value); - } - - if (dst_surface->resource.map_count || (src_surface && src_surface->resource.map_count)) - { - WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); - return WINEDDERR_SURFACEBUSY; - } - - surface_get_rect(dst_surface, dst_rect_in, &dst_rect); - - if (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom - || dst_rect.left > dst_surface->resource.width || dst_rect.left < 0 - || dst_rect.top > dst_surface->resource.height || dst_rect.top < 0 - || dst_rect.right > dst_surface->resource.width || dst_rect.right < 0 - || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0) - { - WARN("The application gave us a bad destination rectangle.\n"); - return WINEDDERR_INVALIDRECT; - } - - if (src_surface) - { - surface_get_rect(src_surface, src_rect_in, &src_rect); - - if (src_rect.left >= src_rect.right || src_rect.top >= src_rect.bottom - || src_rect.left > src_surface->resource.width || src_rect.left < 0 - || src_rect.top > src_surface->resource.height || src_rect.top < 0 - || src_rect.right > src_surface->resource.width || src_rect.right < 0 - || src_rect.bottom > src_surface->resource.height || src_rect.bottom < 0) - { - WARN("Application gave us bad source rectangle for Blt.\n"); - return WINEDDERR_INVALIDRECT; - } - } - else - { - memset(&src_rect, 0, sizeof(src_rect)); - } - - if (!fx || !(fx->dwDDFX)) - flags &= ~WINEDDBLT_DDFX; - - if (flags & WINEDDBLT_WAIT) - flags &= ~WINEDDBLT_WAIT; - - if (flags & WINEDDBLT_ASYNC) - { - static unsigned int once; - - if (!once++) - FIXME("Can't handle WINEDDBLT_ASYNC flag.\n"); - flags &= ~WINEDDBLT_ASYNC; - } - - /* WINEDDBLT_DONOTWAIT appeared in DX7. */ - if (flags & WINEDDBLT_DONOTWAIT) - { - static unsigned int once; - - if (!once++) - FIXME("Can't handle WINEDDBLT_DONOTWAIT flag.\n"); - flags &= ~WINEDDBLT_DONOTWAIT; - } - - if (!device->d3d_initialized) - { - WARN("D3D not initialized, using fallback.\n"); - goto cpu; - } - - /* We want to avoid invalidating the sysmem location for converted - * surfaces, since otherwise we'd have to convert the data back when - * locking them. */ - if (dst_surface->flags & SFLAG_CONVERTED) - { - WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); - return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); - } - - if (flags & ~simple_blit) - { - WARN_(d3d_perf)("Using fallback for complex blit (%#x).\n", flags); - goto fallback; - } - - if (src_surface) - src_swapchain = src_surface->swapchain; - else - src_swapchain = NULL; - - dst_swapchain = dst_surface->swapchain; - - /* This isn't strictly needed. FBO blits for example could deal with - * cross-swapchain blits by first downloading the source to a texture - * before switching to the destination context. We just have this here to - * not have to deal with the issue, since cross-swapchain blits should be - * rare. */ - if (src_swapchain && dst_swapchain && src_swapchain != dst_swapchain) - { - FIXME("Using fallback for cross-swapchain blit.\n"); - goto fallback; - } - - scale = src_surface - && (src_rect.right - src_rect.left != dst_rect.right - dst_rect.left - || src_rect.bottom - src_rect.top != dst_rect.bottom - dst_rect.top); - convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id; - - dst_ds_flags = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - if (src_surface) - src_ds_flags = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - else - src_ds_flags = 0; - - if (src_ds_flags || dst_ds_flags) - { - if (flags & WINEDDBLT_DEPTHFILL) - { - float depth; - - TRACE("Depth fill.\n"); - - if (!surface_convert_depth_to_float(dst_surface, fx->u5.dwFillDepth, &depth)) - return WINED3DERR_INVALIDCALL; - - if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, &dst_rect, depth))) - return WINED3D_OK; - } - else - { - if (src_ds_flags != dst_ds_flags) - { - WARN("Rejecting depth / stencil blit between incompatible formats.\n"); - return WINED3DERR_INVALIDCALL; - } - - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->draw_binding, &src_rect, - dst_surface, dst_surface->draw_binding, &dst_rect))) - return WINED3D_OK; - } - } - else - { - /* In principle this would apply to depth blits as well, but we don't - * implement those in the CPU blitter at the moment. */ - if ((dst_surface->flags & SFLAG_INSYSMEM) - && (!src_surface || (src_surface->flags & SFLAG_INSYSMEM))) - { - if (scale) - TRACE("Not doing sysmem blit because of scaling.\n"); - else if (convert) - TRACE("Not doing sysmem blit because of format conversion.\n"); - else - return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); - } - - if (flags & WINEDDBLT_COLORFILL) - { - struct wined3d_color color; - - TRACE("Color fill.\n"); - - if (!surface_convert_color_to_float(dst_surface, fx->u5.dwFillColor, &color)) - goto fallback; - - if (SUCCEEDED(surface_color_fill(dst_surface, &dst_rect, &color))) - return WINED3D_OK; - } - else - { - TRACE("Color blit.\n"); - - /* Upload */ - if ((src_surface->flags & SFLAG_INSYSMEM) && !(dst_surface->flags & SFLAG_INSYSMEM)) - { - if (scale) - TRACE("Not doing upload because of scaling.\n"); - else if (convert) - TRACE("Not doing upload because of format conversion.\n"); - else - { - POINT dst_point = {dst_rect.left, dst_rect.top}; - - if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, &src_rect))) - { - if (!surface_is_offscreen(dst_surface)) - surface_load_location(dst_surface, dst_surface->draw_binding, NULL); - return WINED3D_OK; - } - } - } - - /* Use present for back -> front blits. The idea behind this is - * that present is potentially faster than a blit, in particular - * when FBO blits aren't available. Some ddraw applications like - * Half-Life and Prince of Persia 3D use Blt() from the backbuffer - * to the frontbuffer instead of doing a Flip(). D3D8 and D3D9 - * applications can't blit directly to the frontbuffer. */ - if (dst_swapchain && dst_swapchain->back_buffers - && dst_surface == dst_swapchain->front_buffer - && src_surface == dst_swapchain->back_buffers[0]) - { - enum wined3d_swap_effect swap_effect = dst_swapchain->desc.swap_effect; - - TRACE("Using present for backbuffer -> frontbuffer blit.\n"); - - /* Set the swap effect to COPY, we don't want the backbuffer - * to become undefined. */ - dst_swapchain->desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; - wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, NULL, 0); - dst_swapchain->desc.swap_effect = swap_effect; - - return WINED3D_OK; - } - - if (fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) - { - TRACE("Using FBO blit.\n"); - - surface_blt_fbo(device, filter, - src_surface, src_surface->draw_binding, &src_rect, - dst_surface, dst_surface->draw_binding, &dst_rect); - surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); - return WINED3D_OK; - } - - if (arbfp_blit.blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) - { - TRACE("Using arbfp blit.\n"); - - if (SUCCEEDED(arbfp_blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect))) - return WINED3D_OK; - } - } - } - -fallback: - - /* Special cases for render targets. */ - if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET))) - { - if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(dst_surface, &dst_rect, - src_surface, &src_rect, flags, fx, filter))) - return WINED3D_OK; - } - -cpu: - - /* For the rest call the X11 surface implementation. For render targets - * this should be implemented OpenGL accelerated in BltOverride, other - * blits are rather rare. */ - return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); -} - HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *surface, struct wined3d_surface *render_target) { @@ -1751,65 +1247,13 @@ HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *sur /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - if (surface->flags & SFLAG_DIBSECTION) - { - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } - else - { - if (!surface->resource.heap_memory) - surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size); - else if (!(surface->flags & SFLAG_CLIENT)) - ERR("Surface %p has heap_memory %p and flags %#x.\n", - surface, surface->resource.heap_memory, surface->flags); - - surface->resource.allocatedMemory = surface->resource.heap_memory; - } - - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, surface->pbo)"); - GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, - surface->resource.size, surface->resource.allocatedMemory)); - checkGLcall("glGetBufferSubDataARB"); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); - checkGLcall("glDeleteBuffersARB"); + checkGLcall("glDeleteBuffersARB(1, &surface->pbo)"); surface->pbo = 0; - surface->flags &= ~SFLAG_PBO; + surface_invalidate_location(surface, WINED3D_LOCATION_BUFFER); } -static BOOL surface_init_sysmem(struct wined3d_surface *surface) -{ - if (!surface->resource.allocatedMemory) - { - if (!surface->resource.heap_memory) - { - surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size); - if (!surface->resource.heap_memory) - { - ERR("Failed to allocate memory.\n"); - return FALSE; - } - } - else if (!(surface->flags & SFLAG_CLIENT)) - { - ERR("Surface %p has heap_memory %p and flags %#x.\n", - surface, surface->resource.heap_memory, surface->flags); - } - - surface->resource.allocatedMemory = surface->resource.heap_memory; - } - else - { - memset(surface->resource.allocatedMemory, 0, surface->resource.size); - } - - surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); - - return TRUE; -} - -/* Do not call while under the GL lock. */ static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1830,10 +1274,12 @@ static void surface_unload(struct wined3d_resource *resource) * Put the surfaces into sysmem, and reset the content. The D3D content is undefined, * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain * or the depth stencil into an FBO the texture or render buffer will be removed - * and all flags get lost - */ - if (!(surface->flags & SFLAG_PBO)) - surface_init_sysmem(surface); + * and all flags get lost */ + surface_prepare_system_memory(surface); + memset(surface->resource.heap_memory, 0, surface->resource.size); + surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); + surface_invalidate_location(surface, ~WINED3D_LOCATION_SYSMEM); + /* We also get here when the ddraw swapchain is destroyed, for example * for a mode switch. In this case this surface won't necessarily be * an implicit surface. We have to mark it lost so that the @@ -1842,19 +1288,17 @@ static void surface_unload(struct wined3d_resource *resource) } else { - /* Load the surface into system memory */ - surface_load_location(surface, SFLAG_INSYSMEM, NULL); - surface_modify_location(surface, surface->draw_binding, FALSE); + surface_prepare_map_memory(surface); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); } - surface_modify_location(surface, SFLAG_INTEXTURE, FALSE); - surface_modify_location(surface, SFLAG_INSRGBTEX, FALSE); surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); context = context_acquire(device, NULL); gl_info = context->gl_info; /* Destroy PBOs, but load them into real sysmem before */ - if (surface->flags & SFLAG_PBO) + if (surface->pbo) surface_remove_pbo(surface, gl_info); /* Destroy fbo render buffers. This is needed for implicit render targets, for @@ -1870,15 +1314,6 @@ static void surface_unload(struct wined3d_resource *resource) list_init(&surface->renderbuffers); surface->current_renderbuffer = NULL; - /* If we're in a texture, the texture name belongs to the texture. - * Otherwise, destroy it. */ - if (!surface->container) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name); - surface->texture_name = 0; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name_srgb); - surface->texture_name_srgb = 0; - } if (surface->rb_multisample) { gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_multisample); @@ -1904,7 +1339,6 @@ static const struct wined3d_surface_ops surface_ops = { surface_private_setup, surface_realize_palette, - surface_map, surface_unmap, }; @@ -1938,12 +1372,9 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) /* Sysmem textures have memory already allocated - release it, * this avoids an unnecessary memcpy. */ hr = surface_create_dib_section(surface); - if (SUCCEEDED(hr)) - { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } + if (FAILED(hr)) + return hr; + surface->map_binding = WINED3D_LOCATION_DIB; /* We don't mind the nonpow2 stuff in GDI. */ surface->pow2Width = surface->resource.width; @@ -1984,28 +1415,6 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) x11_copy_to_screen(surface->swapchain, NULL); } -static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - if (!(surface->flags & SFLAG_DIBSECTION)) - { - HRESULT hr; - - /* This happens on gdi surfaces if the application set a user pointer - * and resets it. Recreate the DIB section. */ - if (FAILED(hr = surface_create_dib_section(surface))) - { - ERR("Failed to create dib section, hr %#x.\n", hr); - return; - } - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } -} - static void gdi_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); @@ -2021,43 +1430,9 @@ static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, gdi_surface_realize_palette, - gdi_surface_map, gdi_surface_unmap, }; -void surface_set_texture_name(struct wined3d_surface *surface, GLuint new_name, BOOL srgb) -{ - GLuint *name; - DWORD flag; - - TRACE("surface %p, new_name %u, srgb %#x.\n", surface, new_name, srgb); - - if(srgb) - { - name = &surface->texture_name_srgb; - flag = SFLAG_INSRGBTEX; - } - else - { - name = &surface->texture_name; - flag = SFLAG_INTEXTURE; - } - - if (!*name && new_name) - { - /* FIXME: We shouldn't need to remove SFLAG_INTEXTURE if the - * surface has no texture name yet. See if we can get rid of this. */ - if (surface->flags & flag) - { - ERR("Surface has %s set, but no texture name.\n", debug_surflocation(flag)); - surface_modify_location(surface, flag, FALSE); - } - } - - *name = new_name; - surface_force_reload(surface); -} - void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) { TRACE("surface %p, target %#x.\n", surface, target); @@ -2081,9 +1456,11 @@ void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, + DWORD dst_location) { const struct wined3d_format *format = surface->resource.format; + struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) @@ -2092,15 +1469,16 @@ static void surface_download_data(struct wined3d_surface *surface, const struct return; } + surface_get_memory(surface, &data, dst_location); + if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", - surface, surface->texture_level, format->glFormat, format->glType, - surface->resource.allocatedMemory); + surface, surface->texture_level, format->glFormat, format->glType, data.addr); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, surface->texture_level, NULL)); checkGLcall("glGetCompressedTexImageARB"); @@ -2110,7 +1488,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct else { GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, - surface->texture_level, surface->resource.allocatedMemory)); + surface->texture_level, data.addr)); checkGLcall("glGetCompressedTexImageARB"); } } @@ -2123,7 +1501,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct int dst_pitch = 0; /* In case of P8 the index is stored in the alpha component if the primary render target uses P8. */ - if (format->id == WINED3DFMT_P8_UINT && primary_render_target_is_p8(surface->resource.device)) + if (format->id == WINED3DFMT_P8_UINT && swapchain_is_p8(surface->resource.device->swapchains[0])) { gl_format = GL_ALPHA; gl_type = GL_UNSIGNED_BYTE; @@ -2139,15 +1517,15 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - mem = surface->resource.allocatedMemory; + mem = data.addr; } TRACE("(%p) : Calling glGetTexImage level %d, format %#x, type %#x, data %p\n", surface, surface->texture_level, gl_format, gl_type, mem); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level, @@ -2209,8 +1587,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * |444444444444444444| \/ * -------------------- * - * this also means that any references to allocatedMemory should work with the data as if were a - * standard texture with a non-power2 width instead of texture boxed up to be a power2 texture. + * This also means that any references to surface memory should work with the data as if it were a + * standard texture with a non-power2 width instead of a texture boxed up to be a power2 texture. * * internally the texture is still stored in a boxed format so any references to textureName will * get a boxed texture with width pow2width and not a texture of width resource.width. @@ -2219,7 +1597,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * rendering. If an app does, the SFLAG_DYNLOCK flag will kick in and the memory copy won't be released, * and doesn't have to be re-read. */ src_data = mem; - dst_data = surface->resource.allocatedMemory; + dst_data = data.addr; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); for (y = 0; y < surface->resource.height; ++y) { @@ -2231,9 +1609,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct HeapFree(GetProcessHeap(), 0, mem); } } - - /* Surface has now been downloaded */ - surface->flags |= SFLAG_INSYSMEM; } /* This call just uploads data, the caller is responsible for binding the @@ -2352,7 +1727,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) { - BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT); + BOOL colorkey_active = need_alpha_ck && (surface->container->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; @@ -2387,7 +1762,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which * conflicts with this. */ - if (!((blit_supported && device->fb.render_targets && surface == device->fb.render_targets[0])) + if (!((blit_supported && surface->swapchain && surface == surface->swapchain->front_buffer)) || colorkey_active || !use_texturing) { format->glFormat = GL_RGBA; @@ -2594,20 +1969,21 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P if (update_w == dst_w && update_h == dst_h) surface_prepare_texture(dst_surface, context, FALSE); else - surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); - surface_bind(dst_surface, context, FALSE); + surface_load_location(dst_surface, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_bind(dst_surface->container, context, FALSE); - data.buffer_object = src_surface->pbo; - data.addr = src_surface->resource.allocatedMemory; + surface_get_memory(src_surface, &data, src_surface->locations); src_pitch = wined3d_surface_get_pitch(src_surface); surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_pitch, dst_point, FALSE, &data); - invalidate_active_texture(dst_surface->resource.device, context); + context_invalidate_active_texture(context); context_release(context); - surface_modify_location(dst_surface, SFLAG_INTEXTURE, TRUE); + surface_validate_location(dst_surface, WINED3D_LOCATION_TEXTURE_RGB); + surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB); + return WINED3D_OK; } @@ -2652,23 +2028,19 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru if (gl_info->supported[APPLE_CLIENT_STORAGE]) { if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION | SFLAG_CONVERTED) - || !surface->resource.allocatedMemory) + || !surface->resource.heap_memory) { /* In some cases we want to disable client storage. * SFLAG_NONPOW2 has a bigger opengl texture than the client memory, and different pitches * SFLAG_DIBSECTION: Dibsections may have read / write protections on the memory. Avoid issues... * SFLAG_CONVERTED: The conversion destination memory is freed after loading the surface - * allocatedMemory == NULL: Not defined in the extension. Seems to disable client storage effectively + * heap_memory == NULL: Not defined in the extension. Seems to disable client storage effectively */ surface->flags &= ~SFLAG_CLIENT; } else { surface->flags |= SFLAG_CLIENT; - - /* Point OpenGL to our allocated texture memory. Do not use - * resource.allocatedMemory here because it might point into a - * PBO. Instead use heap_memory. */ mem = surface->resource.heap_memory; gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); @@ -2796,88 +2168,49 @@ GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) return GL_BACK; } -/* Slightly inefficient way to handle multiple dirty rects but it works :) */ -void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3d_box *dirty_rect) +void surface_load(struct wined3d_surface *surface, BOOL srgb) { - TRACE("surface %p, dirty_rect %p.\n", surface, dirty_rect); - - if (!(surface->flags & SFLAG_INSYSMEM) && (surface->flags & SFLAG_INTEXTURE)) - /* No partial locking for textures yet. */ - surface_load_location(surface, SFLAG_INSYSMEM, NULL); - - surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); - if (dirty_rect) - { - surface->dirtyRect.left = min(surface->dirtyRect.left, dirty_rect->left); - surface->dirtyRect.top = min(surface->dirtyRect.top, dirty_rect->top); - surface->dirtyRect.right = max(surface->dirtyRect.right, dirty_rect->right); - surface->dirtyRect.bottom = max(surface->dirtyRect.bottom, dirty_rect->bottom); - } - else - { - surface->dirtyRect.left = 0; - surface->dirtyRect.top = 0; - surface->dirtyRect.right = surface->resource.width; - surface->dirtyRect.bottom = surface->resource.height; - } - - /* if the container is a texture then mark it dirty. */ - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); - } -} - -HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) -{ - DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; + DWORD location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; BOOL ck_changed; TRACE("surface %p, srgb %#x.\n", surface, srgb); if (surface->resource.pool == WINED3D_POOL_SCRATCH) - { ERR("Not supported on scratch surfaces.\n"); - return WINED3DERR_INVALIDCALL; - } - ck_changed = !(surface->flags & SFLAG_GLCKEY) != !(surface->CKeyFlags & WINEDDSD_CKSRCBLT); + ck_changed = !(surface->flags & SFLAG_GLCKEY) != !(surface->container->color_key_flags & WINEDDSD_CKSRCBLT); /* Reload if either the texture and sysmem have different ideas about the * color key, or the actual key values changed. */ - if (ck_changed || ((surface->CKeyFlags & WINEDDSD_CKSRCBLT) - && (surface->gl_color_key.color_space_low_value != surface->src_blt_color_key.color_space_low_value - || surface->gl_color_key.color_space_high_value != surface->src_blt_color_key.color_space_high_value))) + if (ck_changed || ((surface->container->color_key_flags & WINEDDSD_CKSRCBLT) + && (surface->gl_color_key.color_space_low_value + != surface->container->src_blt_color_key.color_space_low_value + || surface->gl_color_key.color_space_high_value + != surface->container->src_blt_color_key.color_space_high_value))) { TRACE("Reloading because of color keying\n"); /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ - surface_load_location(surface, SFLAG_INSYSMEM, NULL); - /* Make sure the texture is reloaded because of the color key change, - * this kills performance though :( */ - /* TODO: This is not necessarily needed with hw palettized texture support. */ - surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); + surface_prepare_map_memory(surface); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ if (ck_changed) surface_force_reload(surface); } - else if (!(surface->flags & flag)) + else if (!(surface->locations & location)) { TRACE("Reloading because surface is dirty.\n"); } else { TRACE("surface is already in texture\n"); - return WINED3D_OK; + return; } - /* No partial locking for textures yet. */ - surface_load_location(surface, flag, NULL); + surface_load_location(surface, location); surface_evict_sysmem(surface); - - return WINED3D_OK; } /* See also float_16_to_32() in wined3d_private.h */ @@ -2962,7 +2295,6 @@ ULONG CDECL wined3d_surface_incref(struct wined3d_surface *surface) return refcount; } -/* Do not call while under the GL lock. */ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) { ULONG refcount; @@ -3011,7 +2343,7 @@ void CDECL wined3d_surface_preload(struct wined3d_surface *surface) return; } - surface_internal_preload(surface, SRGB_ANY); + wined3d_texture_preload(surface->container); } void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) @@ -3086,80 +2418,9 @@ void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct w return; } - if (surface->palette && (surface->resource.usage & WINED3DUSAGE_RENDERTARGET)) - surface->palette->flags &= ~WINEDDPCAPS_PRIMARYSURFACE; - surface->palette = palette; - if (palette) - { - if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - palette->flags |= WINEDDPCAPS_PRIMARYSURFACE; - surface->surface_ops->surface_realize_palette(surface); - } -} - -HRESULT CDECL wined3d_surface_set_color_key(struct wined3d_surface *surface, - DWORD flags, const struct wined3d_color_key *color_key) -{ - TRACE("surface %p, flags %#x, color_key %p.\n", surface, flags, color_key); - - if (flags & WINEDDCKEY_COLORSPACE) - { - FIXME(" colorkey value not supported (%08x) !\n", flags); - return WINED3DERR_INVALIDCALL; - } - - /* Dirtify the surface, but only if a key was changed. */ - if (color_key) - { - switch (flags & ~WINEDDCKEY_COLORSPACE) - { - case WINEDDCKEY_DESTBLT: - surface->dst_blt_color_key = *color_key; - surface->CKeyFlags |= WINEDDSD_CKDESTBLT; - break; - - case WINEDDCKEY_DESTOVERLAY: - surface->dst_overlay_color_key = *color_key; - surface->CKeyFlags |= WINEDDSD_CKDESTOVERLAY; - break; - - case WINEDDCKEY_SRCOVERLAY: - surface->src_overlay_color_key = *color_key; - surface->CKeyFlags |= WINEDDSD_CKSRCOVERLAY; - break; - - case WINEDDCKEY_SRCBLT: - surface->src_blt_color_key = *color_key; - surface->CKeyFlags |= WINEDDSD_CKSRCBLT; - break; - } - } - else - { - switch (flags & ~WINEDDCKEY_COLORSPACE) - { - case WINEDDCKEY_DESTBLT: - surface->CKeyFlags &= ~WINEDDSD_CKDESTBLT; - break; - - case WINEDDCKEY_DESTOVERLAY: - surface->CKeyFlags &= ~WINEDDSD_CKDESTOVERLAY; - break; - - case WINEDDCKEY_SRCOVERLAY: - surface->CKeyFlags &= ~WINEDDSD_CKSRCOVERLAY; - break; - - case WINEDDCKEY_SRCBLT: - surface->CKeyFlags &= ~WINEDDSD_CKSRCBLT; - break; - } - } - - return WINED3D_OK; } struct wined3d_palette * CDECL wined3d_surface_get_palette(const struct wined3d_surface *surface) @@ -3198,80 +2459,6 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem, UINT pitch) -{ - TRACE("surface %p, mem %p.\n", surface, mem); - - if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) - { - WARN("Surface is mapped or the DC is in use.\n"); - return WINED3DERR_INVALIDCALL; - } - - /* Render targets depend on their hdc, and we can't create an hdc on a user pointer. */ - if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - { - ERR("Not supported on render targets.\n"); - return WINED3DERR_INVALIDCALL; - } - - if (mem && mem != surface->resource.allocatedMemory) - { - void *release = NULL; - - /* Do I have to copy the old surface content? */ - if (surface->flags & SFLAG_DIBSECTION) - { - DeleteDC(surface->hDC); - DeleteObject(surface->dib.DIBsection); - surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; - surface->hDC = NULL; - surface->flags &= ~SFLAG_DIBSECTION; - } - else if (!(surface->flags & SFLAG_USERPTR)) - { - release = surface->resource.heap_memory; - surface->resource.heap_memory = NULL; - } - surface->resource.allocatedMemory = mem; - surface->flags |= SFLAG_USERPTR; - - /* Now the surface memory is most up do date. Invalidate drawable and texture. */ - surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); - - /* For client textures OpenGL has to be notified. */ - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); - - /* Now free the old memory if any. */ - wined3d_resource_free_sysmem(release); - } - else if (surface->flags & SFLAG_USERPTR) - { - /* heap_memory should be NULL already. */ - if (surface->resource.heap_memory) - ERR("User pointer surface has heap memory allocated.\n"); - - if (!mem) - { - surface->resource.allocatedMemory = NULL; - surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); - - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); - - surface_prepare_system_memory(surface); - } - - surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); - } - - surface->pitch = pitch; - - return WINED3D_OK; -} - HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y) { LONG w, h; @@ -3291,8 +2478,6 @@ HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surfa surface->overlay_destrect.right = x + w; surface->overlay_destrect.bottom = y + h; - surface_draw_overlay(surface); - return WINED3D_OK; } @@ -3401,19 +2586,21 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co surface->overlay_dest = NULL; } - surface_draw_overlay(surface); - return WINED3D_OK; } HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, UINT width, UINT height, enum wined3d_format_id format_id, - enum wined3d_multisample_type multisample_type, UINT multisample_quality) + enum wined3d_multisample_type multisample_type, UINT multisample_quality, + void *mem, UINT pitch) { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + BOOL create_dib = FALSE; + HRESULT hr; + DWORD valid_location = 0; TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); @@ -3421,6 +2608,12 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, if (!resource_size) return WINED3DERR_INVALIDCALL; + if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) + { + WARN("Surface is mapped or the DC is in use.\n"); + return WINED3DERR_INVALIDCALL; + } + if (device->d3d_initialized) surface->resource.resource_ops->resource_unload(&surface->resource); @@ -3430,12 +2623,11 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->flags &= ~SFLAG_DIBSECTION; + create_dib = TRUE; } - surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); - surface->resource.allocatedMemory = NULL; - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + surface->locations = 0; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.width = width; surface->resource.height = height; @@ -3459,13 +2651,46 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->flags &= ~SFLAG_NONPOW2; + surface->user_memory = mem; + if (surface->user_memory) + { + surface->map_binding = WINED3D_LOCATION_USER_MEMORY; + valid_location = WINED3D_LOCATION_USER_MEMORY; + } + surface->pitch = pitch; surface->resource.format = format; surface->resource.multisample_type = multisample_type; surface->resource.multisample_quality = multisample_quality; - surface->resource.size = resource_size; + if (surface->pitch) + surface->resource.size = height * surface->pitch; + else + surface->resource.size = resource_size; - if (!surface_init_sysmem(surface)) - return E_OUTOFMEMORY; + /* The format might be changed to a format that needs conversion. + * If the surface didn't use PBOs previously but could now, don't + * change it - whatever made us not use PBOs might come back, e.g. + * color keys. */ + if (surface->map_binding == WINED3D_LOCATION_BUFFER && !surface_use_pbo(surface)) + surface->map_binding = create_dib ? WINED3D_LOCATION_DIB : WINED3D_LOCATION_SYSMEM; + + if (create_dib) + { + if (FAILED(hr = surface_create_dib_section(surface))) + { + ERR("Failed to create dib section, hr %#x.\n", hr); + return hr; + } + if (!valid_location) + valid_location = WINED3D_LOCATION_DIB; + } + + if (!valid_location) + { + surface_prepare_system_memory(surface); + valid_location = WINED3D_LOCATION_SYSMEM; + } + + surface_validate_location(surface, valid_location); return WINED3D_OK; } @@ -3669,23 +2894,13 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo return NULL; } -/***************************************************************************** - * surface_convert_format - * - * Creates a duplicate of a surface in a different format. Is used by Blt to - * blit between surfaces with different formats. - * - * Parameters - * source: Source surface - * fmt: Requested destination format - * - *****************************************************************************/ -static struct wined3d_surface *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) +static struct wined3d_texture *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) { struct wined3d_map_desc src_map, dst_map; const struct d3dfmt_converter_desc *conv; - struct wined3d_surface *ret = NULL; - HRESULT hr; + struct wined3d_texture *ret = NULL; + struct wined3d_resource_desc desc; + struct wined3d_surface *dst; conv = find_converter(source->resource.format->id, to_fmt); if (!conv) @@ -3696,35 +2911,40 @@ static struct wined3d_surface *surface_convert_format(struct wined3d_surface *so } /* FIXME: Multisampled conversion? */ - if (FAILED(hr = wined3d_surface_create(source->resource.device, source->resource.width, source->resource.height, - to_fmt, 0, WINED3D_POOL_SCRATCH, WINED3D_MULTISAMPLE_NONE, 0, + wined3d_resource_get_desc(&source->resource, &desc); + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = to_fmt; + desc.usage = 0; + desc.pool = WINED3D_POOL_SCRATCH; + if (FAILED(wined3d_texture_create(source->resource.device, &desc, 1, WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_DISCARD, NULL, &wined3d_null_parent_ops, &ret))) { ERR("Failed to create a destination surface for conversion.\n"); return NULL; } + dst = surface_from_resource(wined3d_texture_get_sub_resource(ret, 0)); memset(&src_map, 0, sizeof(src_map)); memset(&dst_map, 0, sizeof(dst_map)); - if (FAILED(hr = wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) { ERR("Failed to lock the source surface.\n"); - wined3d_surface_decref(ret); + wined3d_texture_decref(ret); return NULL; } - if (FAILED(hr = wined3d_surface_map(ret, &dst_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, 0))) { ERR("Failed to lock the destination surface.\n"); wined3d_surface_unmap(source); - wined3d_surface_decref(ret); + wined3d_texture_decref(ret); return NULL; } conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, source->resource.width, source->resource.height); - wined3d_surface_unmap(ret); + wined3d_surface_unmap(dst); wined3d_surface_unmap(source); return ret; @@ -3813,6 +3033,10 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; + struct wined3d_device *device = surface->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; + BYTE *base_memory; TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", surface, map_desc, wine_dbgstr_rect(rect), flags); @@ -3835,14 +3059,14 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, ++surface->resource.map_count; - if (!(surface->flags & SFLAG_LOCKABLE)) + if (!(surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) WARN("Trying to lock unlockable surface.\n"); /* Performance optimization: Count how often a surface is mapped, if it is * mapped regularly do not throw away the system memory copy. This avoids * the need to download the surface from OpenGL all the time. The surface * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK)) + if (!(surface->flags & SFLAG_DYNLOCK) && surface->map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) { @@ -3851,7 +3075,54 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } - surface->surface_ops->surface_map(surface, rect, flags); + surface_prepare_map_memory(surface); + if (flags & WINED3D_MAP_DISCARD) + { + TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", + wined3d_debug_location(surface->map_binding)); + surface_validate_location(surface, surface->map_binding); + } + else + { + if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); + + surface_load_location(surface, surface->map_binding); + } + + if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + surface_invalidate_location(surface, ~surface->map_binding); + + switch (surface->map_binding) + { + case WINED3D_LOCATION_SYSMEM: + base_memory = surface->resource.heap_memory; + break; + + case WINED3D_LOCATION_USER_MEMORY: + base_memory = surface->user_memory; + break; + + case WINED3D_LOCATION_DIB: + base_memory = surface->dib.bitmap_data; + break; + + case WINED3D_LOCATION_BUFFER: + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("map PBO"); + + context_release(context); + break; + + default: + ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->map_binding)); + base_memory = NULL; + } if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) map_desc->row_pitch = surface->resource.width * format->byte_count; @@ -3861,7 +3132,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!rect) { - map_desc->data = surface->resource.allocatedMemory; + map_desc->data = base_memory; surface->lockedRect.left = 0; surface->lockedRect.top = 0; surface->lockedRect.right = surface->resource.width; @@ -3873,13 +3144,13 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, { /* Compressed textures are block based, so calculate the offset of * the block that contains the top-left pixel of the locked rectangle. */ - map_desc->data = surface->resource.allocatedMemory + map_desc->data = base_memory + ((rect->top / format->block_height) * map_desc->row_pitch) + ((rect->left / format->block_width) * format->block_byte_count); } else { - map_desc->data = surface->resource.allocatedMemory + map_desc->data = base_memory + (map_desc->row_pitch * rect->top) + (rect->left * format->byte_count); } @@ -3897,17 +3168,10 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) { - struct wined3d_map_desc map; HRESULT hr; TRACE("surface %p, dc %p.\n", surface, dc); - if (surface->flags & SFLAG_USERPTR) - { - ERR("Not supported on surfaces with application-provided memory.\n"); - return WINEDDERR_NODC; - } - /* Give more detailed info for ddraw. */ if (surface->flags & SFLAG_DCINUSE) return WINEDDERR_DCALREADYCREATED; @@ -3921,34 +3185,20 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) { if (surface->flags & SFLAG_CLIENT) { - surface_load_location(surface, SFLAG_INSYSMEM, NULL); + surface_load_location(surface, WINED3D_LOCATION_SYSMEM); surface_release_client_storage(surface); } hr = surface_create_dib_section(surface); if (FAILED(hr)) return WINED3DERR_INVALIDCALL; - - /* Use the DIB section from now on if we are not using a PBO. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) - { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } + if (!(surface->map_binding == WINED3D_LOCATION_USER_MEMORY + || surface->flags & SFLAG_PIN_SYSMEM + || surface->pbo)) + surface->map_binding = WINED3D_LOCATION_DIB; } - /* Map the surface. */ - hr = wined3d_surface_map(surface, &map, NULL, 0); - if (FAILED(hr)) - { - ERR("Map failed, hr %#x.\n", hr); - return hr; - } - - /* Sync the DIB with the PBO. This can't be done earlier because Map() - * activates the allocatedMemory. */ - if (surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); + surface_load_location(surface, WINED3D_LOCATION_DIB); + surface_invalidate_location(surface, ~WINED3D_LOCATION_DIB); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3988,6 +3238,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) } surface->flags |= SFLAG_DCINUSE; + surface->resource.map_count++; *dc = surface->hDC; TRACE("Returning dc %p.\n", *dc); @@ -4009,92 +3260,16 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - /* Copy the contents of the DIB over to the PBO. */ - if ((surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) && surface->resource.allocatedMemory) - memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->resource.size); - - /* We locked first, so unlock now. */ - wined3d_surface_unmap(surface); - + surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; - return WINED3D_OK; -} - -HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined3d_surface *override, DWORD flags) -{ - TRACE("surface %p, override %p, flags %#x.\n", surface, override, flags); - - if (flags) - { - static UINT once; - if (!once++) - FIXME("Ignoring flags %#x.\n", flags); - else - WARN("Ignoring flags %#x.\n", flags); - } - - if (surface->swapchain) - { - ERR("Not supported on swapchain surfaces.\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - /* Flipping is only supported on render targets and overlays. */ - if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY))) - { - WARN("Tried to flip a non-render target, non-overlay surface.\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - flip_surface(surface, override); - - /* Update overlays if they're visible. */ - if ((surface->resource.usage & WINED3DUSAGE_OVERLAY) && surface->overlay_dest) - return surface_draw_overlay(surface); + if (surface->map_binding == WINED3D_LOCATION_USER_MEMORY) + surface_load_location(surface, WINED3D_LOCATION_USER_MEMORY); return WINED3D_OK; } -/* Do not call while under the GL lock. */ -void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) -{ - struct wined3d_device *device = surface->resource.device; - - TRACE("iface %p, srgb %#x.\n", surface, srgb); - - if (surface->container) - { - struct wined3d_texture *texture = surface->container; - - TRACE("Passing to container (%p).\n", texture); - texture->texture_ops->texture_preload(texture, srgb); - } - else - { - struct wined3d_context *context; - - TRACE("(%p) : About to load surface\n", surface); - - /* TODO: Use already acquired context when possible. */ - context = context_acquire(device, NULL); - - surface_load(surface, srgb == SRGB_SRGB); - - if (surface->resource.pool == WINED3D_POOL_DEFAULT) - { - /* Tell opengl to try and keep this texture in video ram (well mostly) */ - GLclampf tmp; - tmp = 0.9f; - context->gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &surface->texture_name, &tmp); - } - - context_release(context); - } -} - -/* Read the framebuffer back into the surface */ -static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *rect, void *dest, UINT pitch) +static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_location) { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info; @@ -4105,11 +3280,11 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r BYTE *row, *top, *bottom; int i; BOOL bpp; - RECT local_rect; BOOL srcIsUpsideDown; - GLint rowLen = 0; - GLint skipPix = 0; - GLint skipRow = 0; + struct wined3d_bo_address data; + UINT pitch = wined3d_surface_get_pitch(surface); + + surface_get_memory(surface, &data, dst_location); context = context_acquire(device, surface); context_apply_blit_state(context, device); @@ -4137,30 +3312,16 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r srcIsUpsideDown = FALSE; } - /* TODO: Get rid of the extra rectangle comparison and construction of a full surface rectangle */ - if (!rect) - { - local_rect.left = 0; - local_rect.top = 0; - local_rect.right = surface->resource.width; - local_rect.bottom = surface->resource.height; - } - else - { - local_rect = *rect; - } - /* TODO: Get rid of the extra GetPitch call, LockRect does that too. Cache the pitch */ - switch (surface->resource.format->id) { case WINED3DFMT_P8_UINT: { - if (primary_render_target_is_p8(device)) + if (swapchain_is_p8(context->swapchain)) { /* In case of P8 render targets the index is stored in the alpha component */ fmt = GL_ALPHA; type = GL_UNSIGNED_BYTE; - mem = dest; + mem = data.addr; bpp = surface->resource.format->byte_count; } else @@ -4189,106 +3350,80 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r break; default: - mem = dest; + mem = data.addr; fmt = surface->resource.format->glFormat; type = surface->resource.format->glType; bpp = surface->resource.format->byte_count; } - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); if (mem) - { ERR("mem not null for pbo -- unexpected\n"); - mem = NULL; - } } - /* Save old pixel store pack state */ - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PACK_ROW_LENGTH, &rowLen); - checkGLcall("glGetIntegerv"); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PACK_SKIP_PIXELS, &skipPix); - checkGLcall("glGetIntegerv"); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PACK_SKIP_ROWS, &skipRow); - checkGLcall("glGetIntegerv"); - /* Setup pixel store pack state -- to glReadPixels into the correct place */ gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, surface->resource.width); checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_PIXELS, local_rect.left); - checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_ROWS, local_rect.top); - checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glReadPixels(local_rect.left, - !srcIsUpsideDown ? (surface->resource.height - local_rect.bottom) : local_rect.top, - local_rect.right - local_rect.left, - local_rect.bottom - local_rect.top, + gl_info->gl_ops.gl.p_glReadPixels(0, 0, + surface->resource.width, surface->resource.height, fmt, type, mem); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, rowLen); - checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_PIXELS, skipPix); - checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_ROWS, skipRow); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, 0); checkGLcall("glPixelStorei"); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object && !srcIsUpsideDown) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - /* Check if we need to flip the image. If we need to flip use glMapBufferARB * to get a pointer to it and perform the flipping in software. This is a lot * faster than calling glReadPixels for each line. In case we want more speed * we should rerender it flipped in a FBO and read the data back from the FBO. */ - if (!srcIsUpsideDown) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); - - mem = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - checkGLcall("glMapBufferARB"); - } + mem = GL_EXTCALL(glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + checkGLcall("glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB)"); } /* TODO: Merge this with the palettization loop below for P8 targets */ - if(!srcIsUpsideDown) { - UINT len, off; + if (!srcIsUpsideDown) + { + UINT len; /* glReadPixels returns the image upside down, and there is no way to prevent this. Flip the lines in software */ - len = (local_rect.right - local_rect.left) * bpp; - off = local_rect.left * bpp; + len = surface->resource.width * bpp; row = HeapAlloc(GetProcessHeap(), 0, len); - if(!row) { + if (!row) + { ERR("Out of memory\n"); if (surface->resource.format->id == WINED3DFMT_P8_UINT) HeapFree(GetProcessHeap(), 0, mem); return; } - top = mem + pitch * local_rect.top; - bottom = mem + pitch * (local_rect.bottom - 1); - for(i = 0; i < (local_rect.bottom - local_rect.top) / 2; i++) { - memcpy(row, top + off, len); - memcpy(top + off, bottom + off, len); - memcpy(bottom + off, row, len); + top = mem; + bottom = mem + pitch * (surface->resource.height - 1); + for (i = 0; i < surface->resource.height / 2; i++) + { + memcpy(row, top, len); + memcpy(top, bottom, len); + memcpy(bottom, row, len); top += pitch; bottom -= pitch; } HeapFree(GetProcessHeap(), 0, row); + } - /* Unmap the temp PBO buffer */ - if (surface->flags & SFLAG_PBO) - { - GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - } + if (data.buffer_object) + { + if (!srcIsUpsideDown) + GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB)); + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)"); } context_release(context); @@ -4298,7 +3433,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r * Note this isn't guaranteed to work when there are multiple entries for * the same color but we have no choice. In case of P8 render targets, * the index is stored in the alpha component so no conversion is needed. */ - if (surface->resource.format->id == WINED3DFMT_P8_UINT && !primary_render_target_is_p8(device)) + if (surface->resource.format->id == WINED3DFMT_P8_UINT && !swapchain_is_p8(context->swapchain)) { const PALETTEENTRY *pal = NULL; DWORD width = pitch / 3; @@ -4315,19 +3450,22 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r return; } - for(y = local_rect.top; y < local_rect.bottom; y++) { - for(x = local_rect.left; x < local_rect.right; x++) { + for (y = 0; y < surface->resource.height; y++) + { + for (x = 0; x < surface->resource.width; x++) + { /* start lines pixels */ const BYTE *blue = mem + y * pitch + x * (sizeof(BYTE) * 3); const BYTE *green = blue + 1; const BYTE *red = green + 1; - for(c = 0; c < 256; c++) { - if(*red == pal[c].peRed && - *green == pal[c].peGreen && - *blue == pal[c].peBlue) + for (c = 0; c < 256; c++) + { + if (*red == pal[c].peRed + && *green == pal[c].peGreen + && *blue == pal[c].peBlue) { - *((BYTE *) dest + y * width + x) = c; + *((BYTE *)data.addr + y * width + x) = c; break; } } @@ -4351,7 +3489,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) device_invalidate_state(device, STATE_FRAMEBUFFER); surface_prepare_texture(surface, context, srgb); - surface_bind_and_dirtify(surface, context, srgb); + wined3d_texture_bind_and_dirtify(surface->container, context, srgb); TRACE("Reading back offscreen render target %p.\n", surface); @@ -4383,7 +3521,7 @@ static void surface_prepare_texture_internal(struct wined3d_surface *surface, surface->flags |= SFLAG_CONVERTED; else surface->flags &= ~SFLAG_CONVERTED; - surface_bind_and_dirtify(surface, context, srgb); + wined3d_texture_bind_and_dirtify(surface->container, context, srgb); surface_allocate_surface(surface, context->gl_info, &format, srgb); surface->flags |= alloc_flag; } @@ -4391,24 +3529,19 @@ static void surface_prepare_texture_internal(struct wined3d_surface *surface, /* Context activation is done by the caller. */ void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - if (surface->container) + struct wined3d_texture *texture = surface->container; + UINT sub_count = texture->level_count * texture->layer_count; + UINT i; + + TRACE("surface %p is a subresource of texture %p.\n", surface, texture); + + for (i = 0; i < sub_count; ++i) { - struct wined3d_texture *texture = surface->container; - UINT sub_count = texture->level_count * texture->layer_count; - UINT i; - - TRACE("surface %p is a subresource of texture %p.\n", surface, texture); - - for (i = 0; i < sub_count; ++i) - { - struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); - surface_prepare_texture_internal(s, context, srgb); - } - - return; + struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); + surface_prepare_texture_internal(s, context, srgb); } - surface_prepare_texture_internal(surface, context, srgb); + return; } void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample) @@ -4457,7 +3590,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 * is slow. Further RGB->P8 conversion is not possible because palettes can have * duplicate entries. Store the color key in the unused alpha component to speed the * download up and to make conversion unneeded. */ - index_in_alpha = primary_render_target_is_p8(device); + index_in_alpha = swapchain_is_p8(device->swapchains[0]); if (!pal) { @@ -4481,15 +3614,15 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 /* When index_in_alpha is set the palette index is stored in the * alpha component. In case of a readback we can then read - * GL_ALPHA. Color keying is handled in BltOverride using a + * GL_ALPHA. Color keying is handled in surface_blt_special() using a * GL_ALPHA_TEST using GL_NOT_EQUAL. In case of index_in_alpha the * color key itself is passed to glAlphaFunc in other cases the * alpha component of pixels that should be masked away is set to 0. */ if (index_in_alpha) table[i][3] = i; - else if (colorkey && color_in_range(&surface->src_blt_color_key, i)) + else if (colorkey && color_in_range(&surface->container->src_blt_color_key, i)) table[i][3] = 0x00; - else if (pal->flags & WINEDDPCAPS_ALPHA) + else if (pal->flags & WINED3D_PALETTE_ALPHA) table[i][3] = pal->palents[i].peFlags; else table[i][3] = 0xff; @@ -4562,7 +3695,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = ((color & 0xffc0) | ((color & 0x1f) << 1)); - if (!color_in_range(&surface->src_blt_color_key, color)) + if (!color_in_range(&surface->container->src_blt_color_key, color)) *Dest |= 0x0001; Dest++; } @@ -4583,7 +3716,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = color; - if (!color_in_range(&surface->src_blt_color_key, color)) + if (!color_in_range(&surface->container->src_blt_color_key, color)) *Dest |= (1 << 15); else *Dest &= ~(1 << 15); @@ -4604,7 +3737,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { DWORD color = ((DWORD)source[0] << 16) + ((DWORD)source[1] << 8) + (DWORD)source[2] ; DWORD dstcolor = color << 8; - if (!color_in_range(&surface->src_blt_color_key, color)) + if (!color_in_range(&surface->container->src_blt_color_key, color)) dstcolor |= 0xff; *(DWORD*)dest = dstcolor; source += 3; @@ -4625,7 +3758,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { DWORD color = 0xffffff & *(const DWORD*)source; DWORD dstcolor = color << 8; - if (!color_in_range(&surface->src_blt_color_key, color)) + if (!color_in_range(&surface->container->src_blt_color_key, color)) dstcolor |= 0xff; *(DWORD*)dest = dstcolor; source += 4; @@ -4645,7 +3778,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = *(const DWORD *)source; - if (color_in_range(&surface->src_blt_color_key, color)) + if (color_in_range(&surface->container->src_blt_color_key, color)) color &= ~0xff000000; *(DWORD*)dest = color; source += 4; @@ -4663,6 +3796,10 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) { + if (front->container->level_count != 1 || front->container->layer_count != 1 + || back->container->level_count != 1 || back->container->layer_count != 1) + ERR("Flip between surfaces %p and %p not supported.\n", front, back); + /* Flip the surface contents */ /* Flip the DC */ { @@ -4687,10 +3824,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) front->dib.bitmap_data = back->dib.bitmap_data; back->dib.bitmap_data = tmp; - tmp = front->resource.allocatedMemory; - front->resource.allocatedMemory = back->resource.allocatedMemory; - back->resource.allocatedMemory = tmp; - tmp = front->resource.heap_memory; front->resource.heap_memory = back->resource.heap_memory; back->resource.heap_memory = tmp; @@ -4707,13 +3840,13 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) { GLuint tmp; - tmp = back->texture_name; - back->texture_name = front->texture_name; - front->texture_name = tmp; + tmp = back->container->texture_rgb.name; + back->container->texture_rgb.name = front->container->texture_rgb.name; + front->container->texture_rgb.name = tmp; - tmp = back->texture_name_srgb; - back->texture_name_srgb = front->texture_name_srgb; - front->texture_name_srgb = tmp; + tmp = back->container->texture_srgb.name; + back->container->texture_srgb.name = front->container->texture_srgb.name; + front->container->texture_srgb.name = tmp; tmp = back->rb_multisample; back->rb_multisample = front->rb_multisample; @@ -4731,6 +3864,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) DWORD tmp_flags = back->flags; back->flags = front->flags; front->flags = tmp_flags; + + tmp_flags = back->locations; + back->locations = front->locations; + front->locations = tmp_flags; } } @@ -4745,12 +3882,6 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; - GLenum dst_target; - - if (dst_surface->container) - dst_target = dst_surface->container->target; - else - dst_target = dst_surface->texture_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -4765,10 +3896,10 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, FALSE); /* Bind the target texture */ - context_bind_texture(context, dst_target, dst_surface->texture_name); + context_bind_texture(context, dst_surface->container->target, dst_surface->container->texture_rgb.name); if (surface_is_offscreen(src_surface)) { TRACE("Reading from an offscreen target\n"); @@ -4844,10 +3975,10 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context_release(context); - /* The texture is now most up to date - If the surface is a render target and has a drawable, this - * path is never entered - */ - surface_modify_location(dst_surface, SFLAG_INTEXTURE, TRUE); + /* The texture is now most up to date - If the surface is a render target + * and has a drawable, this path is never entered. */ + surface_validate_location(dst_surface, WINED3D_LOCATION_TEXTURE_RGB); + surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB); } /* Uses the hardware to stretch and flip the image */ @@ -4873,14 +4004,14 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, SRGB_RGB); + wined3d_texture_load(dst_surface->container, context, FALSE); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; - if (!noBackBufferBackup && !src_surface->texture_name) + if (!noBackBufferBackup && !src_surface->container->texture_rgb.name) { /* Get it a description */ - surface_internal_preload(src_surface, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -4910,12 +4041,12 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st * we are reading from the back buffer, the backup can be used as source texture */ texture_target = src_surface->texture_target; - context_bind_texture(context, texture_target, src_surface->texture_name); + context_bind_texture(context, texture_target, src_surface->container->texture_rgb.name); gl_info->gl_ops.gl.p_glEnable(texture_target); checkGLcall("glEnable(texture_target)"); /* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */ - src_surface->flags &= ~SFLAG_INTEXTURE; + src_surface->locations &= ~WINED3D_LOCATION_TEXTURE_RGB; } /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag @@ -4954,7 +4085,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st if (!src_surface->swapchain || src_surface == src_surface->swapchain->back_buffers[0]) { - src = backup ? backup : src_surface->texture_name; + src = backup ? backup : src_surface->container->texture_rgb.name; } else { @@ -5046,7 +4177,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } /* Now read the stretched and upside down image into the destination texture */ - context_bind_texture(context, texture_target, dst_surface->texture_name); + context_bind_texture(context, texture_target, dst_surface->container->texture_rgb.name); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, dst_rect.left, dst_rect.top, /* xoffset, yoffset */ @@ -5075,7 +4206,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glEnable(src_surface->texture_target); texture_target = src_surface->texture_target; } - context_bind_texture(context, src_surface->texture_target, src_surface->texture_name); + context_bind_texture(context, src_surface->texture_target, src_surface->container->texture_rgb.name); } gl_info->gl_ops.gl.p_glBegin(GL_QUADS); @@ -5101,7 +4232,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st checkGLcall("glDisable(texture_target)"); /* Cleanup */ - if (src != src_surface->texture_name && src != backup) + if (src != src_surface->container->texture_rgb.name && src != backup) { gl_info->gl_ops.gl.p_glDeleteTextures(1, &src); checkGLcall("glDeleteTextures(1, &src)"); @@ -5117,10 +4248,10 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context_release(context); - /* The texture is now most up to date - If the surface is a render target and has a drawable, this - * path is never entered - */ - surface_modify_location(dst_surface, SFLAG_INTEXTURE, TRUE); + /* The texture is now most up to date - If the surface is a render target + * and has a drawable, this path is never entered. */ + surface_validate_location(dst_surface, WINED3D_LOCATION_TEXTURE_RGB); + surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB); } /* Front buffer coordinates are always full screen coordinates, but our GL @@ -5152,7 +4283,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } static void surface_blt_to_drawable(const struct wined3d_device *device, - enum wined3d_texture_filter_type filter, BOOL color_key, + enum wined3d_texture_filter_type filter, BOOL alpha_test, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { @@ -5163,14 +4294,15 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, src_rect = *src_rect_in; dst_rect = *dst_rect_in; + context = context_acquire(device, dst_surface); + gl_info = context->gl_info; + /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - surface_internal_preload(src_surface, SRGB_RGB); + wined3d_texture_load(src_surface->container, context, FALSE); /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); - gl_info = context->gl_info; context_apply_blit_state(context, device); if (!surface_is_offscreen(dst_surface)) @@ -5178,7 +4310,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->set_shader(device->blit_priv, context, src_surface); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); checkGLcall("glEnable(GL_ALPHA_TEST)"); @@ -5187,9 +4319,9 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, * contains the palette index. Which means that the colorkey is one of * the palette entries. In other cases pixels that should be masked * away have alpha set to 0. */ - if (primary_render_target_is_p8(device)) + if (swapchain_is_p8(context->swapchain)) gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, - (float)src_surface->src_blt_color_key.color_space_low_value / 256.0f); + (float)src_surface->container->src_blt_color_key.color_space_low_value / 256.0f); else gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); checkGLcall("glAlphaFunc"); @@ -5202,7 +4334,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); checkGLcall("glDisable(GL_ALPHA_TEST)"); @@ -5218,7 +4350,6 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, context_release(context); } -/* Do not call while under the GL lock. */ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) { struct wined3d_device *device = s->resource.device; @@ -5235,8 +4366,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st return blitter->color_fill(device, s, rect, color); } -/* Do not call while under the GL lock. */ -static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surface, const RECT *dst_rect, +static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *DDBltFx, enum wined3d_texture_filter_type filter) { @@ -5341,9 +4471,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa /* Blt is a pretty powerful call, while glCopyTexSubImage2D is not. glCopyTexSubImage cannot * flip the image nor scale it. * - * -> If the app asks for a unscaled, upside down copy, just perform one glCopyTexSubImage2D call - * -> If the app wants a image width an unscaled width, copy it line per line - * -> If the app wants a image that is scaled on the x axis, and the destination rectangle is smaller + * -> If the app asks for an unscaled, upside down copy, just perform one glCopyTexSubImage2D call + * -> If the app wants an image width an unscaled width, copy it line per line + * -> If the app wants an image that is scaled on the x axis, and the destination rectangle is smaller * than the frame buffer, draw an upside down scaled image onto the fb, read it back and restore the * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied @@ -5360,24 +4490,15 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); } - if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) - { - wined3d_resource_free_sysmem(dst_surface->resource.heap_memory); - dst_surface->resource.allocatedMemory = NULL; - dst_surface->resource.heap_memory = NULL; - } - else - { - dst_surface->flags &= ~SFLAG_INSYSMEM; - } + surface_evict_sysmem(dst_surface); return WINED3D_OK; } else if (src_surface) { /* Blit from offscreen surface to render target */ - struct wined3d_color_key old_blt_key = src_surface->src_blt_color_key; - DWORD oldCKeyFlags = src_surface->CKeyFlags; + struct wined3d_color_key old_blt_key = src_surface->container->src_blt_color_key; + DWORD old_color_key_flags = src_surface->container->color_key_flags; TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); @@ -5403,23 +4524,25 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa else if (flags & WINEDDBLT_KEYSRCOVERRIDE) { /* Use color key from DDBltFx */ - src_surface->CKeyFlags |= WINEDDSD_CKSRCBLT; - src_surface->src_blt_color_key = DDBltFx->ddckSrcColorkey; + src_surface->container->color_key_flags |= WINEDDSD_CKSRCBLT; + src_surface->container->src_blt_color_key = DDBltFx->ddckSrcColorkey; } else { /* Do not use color key */ - src_surface->CKeyFlags &= ~WINEDDSD_CKSRCBLT; + src_surface->container->color_key_flags &= ~WINEDDSD_CKSRCBLT; } - surface_blt_to_drawable(device, filter, flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE), + surface_blt_to_drawable(device, filter, + flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_ALPHATEST), src_surface, src_rect, dst_surface, dst_rect); /* Restore the color key parameters */ - src_surface->CKeyFlags = oldCKeyFlags; - src_surface->src_blt_color_key = old_blt_key; + src_surface->container->color_key_flags = old_color_key_flags; + src_surface->container->src_blt_color_key = old_blt_key; - surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); + surface_validate_location(dst_surface, dst_surface->draw_binding); + surface_invalidate_location(dst_surface, ~dst_surface->draw_binding); return WINED3D_OK; } @@ -5494,23 +4617,13 @@ void surface_modify_ds_location(struct wined3d_surface *surface, { TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h); - if (location & ~(SFLAG_LOCATIONS | SFLAG_DISCARDED)) - FIXME("Invalid location (%#x) specified.\n", location); - - if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) - || (!(surface->flags & SFLAG_INTEXTURE) && (location & SFLAG_INTEXTURE))) - { - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); - } - } + if (((surface->locations & WINED3D_LOCATION_TEXTURE_RGB) && !(location & WINED3D_LOCATION_TEXTURE_RGB)) + || (!(surface->locations & WINED3D_LOCATION_TEXTURE_RGB) && (location & WINED3D_LOCATION_TEXTURE_RGB))) + wined3d_texture_set_dirty(surface->container); surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; - surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_DISCARDED); - surface->flags |= location; + surface->locations = location; } /* Context activation is done by the caller. */ @@ -5525,7 +4638,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co /* TODO: Make this work for modes other than FBO */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; - if (!(surface->flags & location)) + if (!(surface->locations & location)) { w = surface->ds_current_size.cx; h = surface->ds_current_size.cy; @@ -5551,40 +4664,40 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co return; } - if (surface->flags & SFLAG_DISCARDED) + if (surface->locations & WINED3D_LOCATION_DISCARDED) { TRACE("Surface was discarded, no need copy data.\n"); switch (location) { - case SFLAG_INTEXTURE: + case WINED3D_LOCATION_TEXTURE_RGB: surface_prepare_texture(surface, context, FALSE); break; - case SFLAG_INRB_MULTISAMPLE: + case WINED3D_LOCATION_RB_MULTISAMPLE: surface_prepare_rb(surface, gl_info, TRUE); break; - case SFLAG_INDRAWABLE: + case WINED3D_LOCATION_DRAWABLE: /* Nothing to do */ break; default: FIXME("Unhandled location %#x\n", location); } - surface->flags &= ~SFLAG_DISCARDED; - surface->flags |= location; + surface->locations &= ~WINED3D_LOCATION_DISCARDED; + surface->locations |= location; surface->ds_current_size.cx = surface->resource.width; surface->ds_current_size.cy = surface->resource.height; return; } - if (!(surface->flags & SFLAG_LOCATIONS)) + if (!surface->locations) { FIXME("No up to date depth stencil location.\n"); - surface->flags |= location; + surface->locations |= location; surface->ds_current_size.cx = surface->resource.width; surface->ds_current_size.cy = surface->resource.height; return; } - if (location == SFLAG_INTEXTURE) + if (location == WINED3D_LOCATION_TEXTURE_RGB) { GLint old_binding = 0; GLenum bind_target; @@ -5604,7 +4717,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - context->swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); + context->swapchain->front_buffer, NULL, WINED3D_LOCATION_DRAWABLE); if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); @@ -5633,7 +4746,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co gl_info->gl_ops.gl.p_glBindTexture(bind_target, old_binding); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - NULL, surface, SFLAG_INTEXTURE); + NULL, surface, WINED3D_LOCATION_TEXTURE_RGB); context_set_draw_buffer(context, GL_NONE); /* Do the actual blit */ @@ -5645,13 +4758,13 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co if (wined3d_settings.strict_draw_ordering) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ } - else if (location == SFLAG_INDRAWABLE) + else if (location == WINED3D_LOCATION_DRAWABLE) { TRACE("Copying depth texture to onscreen depth buffer.\n"); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - context->swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); - surface_depth_blt(surface, context, surface->texture_name, + context->swapchain->front_buffer, NULL, WINED3D_LOCATION_DRAWABLE); + surface_depth_blt(surface, context, surface->container->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target); checkGLcall("depth_blt"); @@ -5665,82 +4778,45 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co ERR("Invalid location (%#x) specified.\n", location); } - surface->flags |= location; + surface->locations |= location; surface->ds_current_size.cx = surface->resource.width; surface->ds_current_size.cy = surface->resource.height; } -void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) +void surface_validate_location(struct wined3d_surface *surface, DWORD location) { - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - struct wined3d_surface *overlay; + TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - TRACE("surface %p, location %s, persistent %#x.\n", - surface, debug_surflocation(location), persistent); + surface->locations |= location; +} - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface) - && !(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - && (location & SFLAG_INDRAWABLE)) - ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n"); +void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) +{ + TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - location |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); + if (location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + wined3d_texture_set_dirty(surface->container); + surface->locations &= ~location; - if (persistent) - { - if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) - || ((surface->flags & SFLAG_INSRGBTEX) && !(location & SFLAG_INSRGBTEX))) - { - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); - } - } - surface->flags &= ~SFLAG_LOCATIONS; - surface->flags |= location; - - /* Redraw emulated overlays, if any */ - if (location & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) - { - LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) - { - surface_draw_overlay(overlay); - } - } - } - else - { - if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX))) - { - if (surface->container) - { - TRACE("Passing to container\n"); - wined3d_texture_set_dirty(surface->container, TRUE); - } - } - surface->flags &= ~location; - } - - if (!(surface->flags & SFLAG_LOCATIONS)) - { + if (!surface->locations) ERR("Surface %p does not have any up to date location.\n", surface); - } } static DWORD resource_access_from_location(DWORD location) { switch (location) { - case SFLAG_INSYSMEM: + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_DIB: + case WINED3D_LOCATION_BUFFER: return WINED3D_RESOURCE_ACCESS_CPU; - case SFLAG_INDRAWABLE: - case SFLAG_INSRGBTEX: - case SFLAG_INTEXTURE: - case SFLAG_INRB_MULTISAMPLE: - case SFLAG_INRB_RESOLVED: + case WINED3D_LOCATION_DRAWABLE: + case WINED3D_LOCATION_TEXTURE_SRGB: + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_RB_MULTISAMPLE: + case WINED3D_LOCATION_RB_RESOLVED: return WINED3D_RESOURCE_ACCESS_GPU; default: @@ -5749,16 +4825,56 @@ static DWORD resource_access_from_location(DWORD location) } } -static void surface_load_sysmem(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, const RECT *rect) +static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) { - surface_prepare_system_memory(surface); + struct wined3d_device *device = surface->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; + UINT size = surface->resource.size; - if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) - surface_load_location(surface, SFLAG_INTEXTURE, NULL); + surface_get_memory(surface, &dst, location); + surface_get_memory(surface, &src, surface->locations); + + if (dst.buffer_object) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, dst.buffer_object)); + GL_EXTCALL(glBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, size, src.addr)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("Upload PBO"); + context_release(context); + return; + } + if (src.buffer_object) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, src.buffer_object)); + GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_PACK_BUFFER_ARB, 0, size, dst.addr)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("Download PBO"); + context_release(context); + return; + } + memcpy(dst.addr, src.addr, size); +} + +static void surface_load_sysmem(struct wined3d_surface *surface, + const struct wined3d_gl_info *gl_info, DWORD dst_location) +{ + if (surface->locations & surface_simple_locations) + { + surface_copy_simple_location(surface, dst_location); + return; + } + + if (surface->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) + surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB); /* Download the surface to system memory. */ - if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) + if (surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { struct wined3d_device *device = surface->resource.device; struct wined3d_context *context; @@ -5766,38 +4882,38 @@ static void surface_load_sysmem(struct wined3d_surface *surface, /* TODO: Use already acquired context when possible. */ context = context_acquire(device, NULL); - surface_bind_and_dirtify(surface, context, !(surface->flags & SFLAG_INTEXTURE)); - surface_download_data(surface, gl_info); + wined3d_texture_bind_and_dirtify(surface->container, context, + !(surface->locations & WINED3D_LOCATION_TEXTURE_RGB)); + surface_download_data(surface, gl_info, dst_location); context_release(context); return; } - if (surface->flags & SFLAG_INDRAWABLE) + if (surface->locations & WINED3D_LOCATION_DRAWABLE) { - read_from_framebuffer(surface, rect, surface->resource.allocatedMemory, - wined3d_surface_get_pitch(surface)); + read_from_framebuffer(surface, dst_location); return; } - FIXME("Can't load surface %p with location flags %#x into sysmem.\n", - surface, surface->flags & SFLAG_LOCATIONS); + FIXME("Can't load surface %p with location flags %s into sysmem.\n", + surface, wined3d_debug_location(surface->locations)); } static HRESULT surface_load_drawable(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, const RECT *rect) + const struct wined3d_gl_info *gl_info) { RECT r; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface)) { - ERR("Trying to load offscreen surface into SFLAG_INDRAWABLE.\n"); + ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); return WINED3DERR_INVALIDCALL; } - surface_get_rect(surface, rect, &r); - surface_load_location(surface, SFLAG_INTEXTURE, NULL); + surface_get_rect(surface, NULL, &r); + surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB); surface_blt_to_drawable(surface->resource.device, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); @@ -5805,7 +4921,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, } static HRESULT surface_load_texture(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, const RECT *rect, BOOL srgb) + const struct wined3d_gl_info *gl_info, BOOL srgb) { RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_device *device = surface->resource.device; @@ -5815,41 +4931,42 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_bo_address data; struct wined3d_format format; POINT dst_point = {0, 0}; - BYTE *mem; + BYTE *mem = NULL; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && surface_is_offscreen(surface) - && (surface->flags & SFLAG_INDRAWABLE)) + && (surface->locations & WINED3D_LOCATION_DRAWABLE)) { surface_load_fb_texture(surface, srgb); return WINED3D_OK; } - if (surface->flags & (SFLAG_INSRGBTEX | SFLAG_INTEXTURE) + if (surface->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (surface->resource.format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) { if (srgb) - surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, SFLAG_INTEXTURE, - &src_rect, surface, SFLAG_INSRGBTEX, &src_rect); + surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, + &src_rect, surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect); else - surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, SFLAG_INSRGBTEX, - &src_rect, surface, SFLAG_INTEXTURE, &src_rect); + surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_SRGB, + &src_rect, surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); return WINED3D_OK; } - if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED) + if (surface->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) && (!srgb || (surface->resource.format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) { - DWORD src_location = surface->flags & SFLAG_INRB_RESOLVED ? SFLAG_INRB_RESOLVED : SFLAG_INRB_MULTISAMPLE; - DWORD dst_location = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; + DWORD src_location = surface->locations & WINED3D_LOCATION_RB_RESOLVED ? + WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; + DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; RECT rect = {0, 0, surface->resource.width, surface->resource.height}; surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, src_location, @@ -5865,40 +4982,45 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (srgb) { - if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)) == SFLAG_INTEXTURE) + if ((surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | surface->map_binding)) + == WINED3D_LOCATION_TEXTURE_RGB) { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_load_location(surface, SFLAG_INSYSMEM, rect); + surface_prepare_map_memory(surface); + surface_load_location(surface, surface->map_binding); } } else { - if ((surface->flags & (SFLAG_INSRGBTEX | SFLAG_INSYSMEM)) == SFLAG_INSRGBTEX) + if ((surface->locations & (WINED3D_LOCATION_TEXTURE_SRGB | surface->map_binding)) + == WINED3D_LOCATION_TEXTURE_SRGB) { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_load_location(surface, SFLAG_INSYSMEM, rect); + surface_prepare_map_memory(surface); + surface_load_location(surface, surface->map_binding); } } - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->locations & surface_simple_locations)) { - WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); + WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); /* Lets hope we get it from somewhere... */ - surface_load_location(surface, SFLAG_INSYSMEM, rect); + surface_prepare_system_memory(surface); + surface_load_location(surface, WINED3D_LOCATION_SYSMEM); } /* TODO: Use already acquired context when possible. */ context = context_acquire(device, NULL); surface_prepare_texture(surface, context, srgb); - surface_bind_and_dirtify(surface, context, srgb); + wined3d_texture_bind_and_dirtify(surface->container, context, srgb); - if (surface->CKeyFlags & WINEDDSD_CKSRCBLT) + if (surface->container->color_key_flags & WINEDDSD_CKSRCBLT) { surface->flags |= SFLAG_GLCKEY; - surface->gl_color_key = surface->src_blt_color_key; + surface->gl_color_key = surface->container->src_blt_color_key; } else surface->flags &= ~SFLAG_GLCKEY; @@ -5908,12 +5030,21 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Don't use PBOs for converted surfaces. During PBO conversion we look at * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting * called. */ - if ((convert != WINED3D_CT_NONE || format.convert) && (surface->flags & SFLAG_PBO)) + if ((convert != WINED3D_CT_NONE || format.convert) && surface->pbo) { TRACE("Removing the pbo attached to surface %p.\n", surface); + + if (surface->flags & SFLAG_DIBSECTION) + surface->map_binding = WINED3D_LOCATION_DIB; + else + surface->map_binding = WINED3D_LOCATION_SYSMEM; + + surface_prepare_map_memory(surface); + surface_load_location(surface, surface->map_binding); surface_remove_pbo(surface, gl_info); } + surface_get_memory(surface, &data, surface->locations); if (format.convert) { /* This code is entered for texture formats which need a fixup. */ @@ -5929,11 +5060,13 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, context_release(context); return E_OUTOFMEMORY; } - format.convert(surface->resource.allocatedMemory, mem, src_pitch, width, height); + format.convert(data.addr, mem, src_pitch, src_pitch * height, + dst_pitch, dst_pitch * height, width, height, 1); format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; + data.addr = mem; } - else if (convert != WINED3D_CT_NONE && surface->resource.allocatedMemory) + else if (convert != WINED3D_CT_NONE) { /* This code is only entered for color keying fixups */ UINT height = surface->resource.height; @@ -5948,25 +5081,18 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, context_release(context); return E_OUTOFMEMORY; } - d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, src_pitch, + d3dfmt_convert_surface(data.addr, mem, src_pitch, width, height, dst_pitch, convert, surface); format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; - } - else - { - mem = surface->resource.allocatedMemory; + data.addr = mem; } - data.buffer_object = surface->pbo; - data.addr = mem; surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, &data); context_release(context); - /* Don't delete PBO memory. */ - if ((mem != surface->resource.allocatedMemory) && !(surface->flags & SFLAG_PBO)) - HeapFree(GetProcessHeap(), 0, mem); + HeapFree(GetProcessHeap(), 0, mem); return WINED3D_OK; } @@ -5975,31 +5101,32 @@ static void surface_multisample_resolve(struct wined3d_surface *surface) { RECT rect = {0, 0, surface->resource.width, surface->resource.height}; - if (!(surface->flags & SFLAG_INRB_MULTISAMPLE)) - ERR("Trying to resolve multisampled surface %p, but location SFLAG_INRB_MULTISAMPLE not current.\n", surface); + if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE)) + ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n", + surface); surface_blt_fbo(surface->resource.device, WINED3D_TEXF_POINT, - surface, SFLAG_INRB_MULTISAMPLE, &rect, surface, SFLAG_INRB_RESOLVED, &rect); + surface, WINED3D_LOCATION_RB_MULTISAMPLE, &rect, surface, WINED3D_LOCATION_RB_RESOLVED, &rect); } -HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, const RECT *rect) +HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; HRESULT hr; - TRACE("surface %p, location %s, rect %s.\n", surface, debug_surflocation(location), wine_dbgstr_rect(rect)); + TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == SFLAG_INTEXTURE && surface->flags & SFLAG_INDRAWABLE) + if (location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & WINED3D_LOCATION_DRAWABLE) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location); context_release(context); return WINED3D_OK; } - else if (location & surface->flags && surface->draw_binding != SFLAG_INDRAWABLE) + else if (location & surface->locations && surface->draw_binding != WINED3D_LOCATION_DRAWABLE) { /* Already up to date, nothing to do. */ return WINED3D_OK; @@ -6007,22 +5134,14 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c else { FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", - debug_surflocation(surface->flags & SFLAG_LOCATIONS), debug_surflocation(location)); + wined3d_debug_location(surface->locations), wined3d_debug_location(location)); return WINED3DERR_INVALIDCALL; } } - if (location == SFLAG_INSRGBTEX && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - location = SFLAG_INTEXTURE; - - if (surface->flags & location) + if (surface->locations & location) { TRACE("Location already up to date.\n"); - - if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) - && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); - return WINED3D_OK; } @@ -6034,7 +5153,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c required_access, surface->resource.access_flags); } - if (!(surface->flags & SFLAG_LOCATIONS)) + if (!surface->locations) { ERR("Surface %p does not have any up to date location.\n", surface); surface->flags |= SFLAG_LOST; @@ -6043,22 +5162,25 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c switch (location) { - case SFLAG_INSYSMEM: - surface_load_sysmem(surface, gl_info, rect); + case WINED3D_LOCATION_DIB: + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_BUFFER: + surface_load_sysmem(surface, gl_info, location); break; - case SFLAG_INDRAWABLE: - if (FAILED(hr = surface_load_drawable(surface, gl_info, rect))) + case WINED3D_LOCATION_DRAWABLE: + if (FAILED(hr = surface_load_drawable(surface, gl_info))) return hr; break; - case SFLAG_INRB_RESOLVED: + case WINED3D_LOCATION_RB_RESOLVED: surface_multisample_resolve(surface); break; - case SFLAG_INTEXTURE: - case SFLAG_INSRGBTEX: - if (FAILED(hr = surface_load_texture(surface, gl_info, rect, location == SFLAG_INSRGBTEX))) + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_TEXTURE_SRGB: + if (FAILED(hr = surface_load_texture(surface, gl_info, location == WINED3D_LOCATION_TEXTURE_SRGB))) return hr; break; @@ -6067,19 +5189,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c break; } - if (!rect) - { - surface->flags |= location; + surface_validate_location(surface, location); - if (location != SFLAG_INSYSMEM && (surface->flags & SFLAG_INSYSMEM)) - surface_evict_sysmem(surface); - } - - if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - { - surface->flags |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); - } + if (location != WINED3D_LOCATION_SYSMEM && (surface->locations & WINED3D_LOCATION_SYSMEM)) + surface_evict_sysmem(surface); return WINED3D_OK; } @@ -6108,14 +5221,8 @@ static void ffp_blit_free(struct wined3d_device *device) { } static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum target; - if (surface->container) - target = surface->container->target; - else - target = surface->texture_target; - - gl_info->gl_ops.gl.p_glEnable(target); + gl_info->gl_ops.gl.p_glEnable(surface->container->target); checkGLcall("glEnable(target)"); return WINED3D_OK; @@ -6193,7 +5300,6 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined } } -/* Do not call while under the GL lock. */ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color *color) { @@ -6205,7 +5311,6 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d return WINED3D_OK; } -/* Do not call while under the GL lock. */ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, float depth) { @@ -6368,7 +5473,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { int bpp, srcheight, srcwidth, dstheight, dstwidth, width; const struct wined3d_format *src_format, *dst_format; - struct wined3d_surface *orig_src = src_surface; + struct wined3d_texture *src_texture = NULL; struct wined3d_map_desc dst_map, src_map; const BYTE *sbase = NULL; HRESULT hr = WINED3D_OK; @@ -6394,13 +5499,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { if (dst_surface->resource.format->id != src_surface->resource.format->id) { - src_surface = surface_convert_format(src_surface, dst_format->id); - if (!src_surface) + if (!(src_texture = surface_convert_format(src_surface, dst_format->id))) { /* The conv function writes a FIXME */ WARN("Cannot convert source surface format to dest format.\n"); goto release; } + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0)); } wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY); src_format = src_surface->resource.format; @@ -6654,8 +5759,8 @@ do { \ /* The color keying flags are checked for correctness in ddraw */ if (flags & WINEDDBLT_KEYSRC) { - keylow = src_surface->src_blt_color_key.color_space_low_value; - keyhigh = src_surface->src_blt_color_key.color_space_high_value; + keylow = src_surface->container->src_blt_color_key.color_space_low_value; + keyhigh = src_surface->container->src_blt_color_key.color_space_high_value; } else if (flags & WINEDDBLT_KEYSRCOVERRIDE) { @@ -6666,8 +5771,8 @@ do { \ if (flags & WINEDDBLT_KEYDEST) { /* Destination color keys are taken from the source surface! */ - destkeylow = src_surface->dst_blt_color_key.color_space_low_value; - destkeyhigh = src_surface->dst_blt_color_key.color_space_high_value; + destkeylow = src_surface->container->dst_blt_color_key.color_space_low_value; + destkeyhigh = src_surface->container->dst_blt_color_key.color_space_high_value; } else if (flags & WINEDDBLT_KEYDESTOVERRIDE) { @@ -6854,13 +5959,12 @@ release: if (src_surface && src_surface != dst_surface) wined3d_surface_unmap(src_surface); /* Release the converted surface, if any. */ - if (src_surface && src_surface != orig_src) - wined3d_surface_decref(src_surface); + if (src_texture) + wined3d_texture_decref(src_texture); return hr; } -/* Do not call while under the GL lock. */ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color *color) { @@ -6874,7 +5978,6 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d WINEDDBLT_COLORFILL, &BltFx, WINED3D_TEXF_POINT); } -/* Do not call while under the GL lock. */ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, float depth) { @@ -6892,13 +5995,322 @@ const struct blit_shader cpu_blit = { cpu_blit_depth_fill, }; -static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UINT width, UINT height, - enum wined3d_multisample_type multisample_type, UINT multisample_quality, - struct wined3d_device *device, DWORD usage, enum wined3d_format_id format_id, - enum wined3d_pool pool, DWORD flags, void *parent, const struct wined3d_parent_ops *parent_ops) +HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect_in, + struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags, + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) { + struct wined3d_swapchain *src_swapchain, *dst_swapchain; + struct wined3d_device *device = dst_surface->resource.device; + DWORD src_ds_flags, dst_ds_flags; + RECT src_rect, dst_rect; + BOOL scale, convert; + enum wined3d_conversion_type dst_convert_type; + struct wined3d_format dst_conv_fmt; + + static const DWORD simple_blit = WINEDDBLT_ASYNC + | WINEDDBLT_COLORFILL + | WINEDDBLT_WAIT + | WINEDDBLT_DEPTHFILL + | WINEDDBLT_DONOTWAIT; + + TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", + dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), + flags, fx, debug_d3dtexturefiltertype(filter)); + TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); + + if (fx) + { + TRACE("dwSize %#x.\n", fx->dwSize); + TRACE("dwDDFX %#x.\n", fx->dwDDFX); + TRACE("dwROP %#x.\n", fx->dwROP); + TRACE("dwDDROP %#x.\n", fx->dwDDROP); + TRACE("dwRotationAngle %#x.\n", fx->dwRotationAngle); + TRACE("dwZBufferOpCode %#x.\n", fx->dwZBufferOpCode); + TRACE("dwZBufferLow %#x.\n", fx->dwZBufferLow); + TRACE("dwZBufferHigh %#x.\n", fx->dwZBufferHigh); + TRACE("dwZBufferBaseDest %#x.\n", fx->dwZBufferBaseDest); + TRACE("dwZDestConstBitDepth %#x.\n", fx->dwZDestConstBitDepth); + TRACE("lpDDSZBufferDest %p.\n", fx->u1.lpDDSZBufferDest); + TRACE("dwZSrcConstBitDepth %#x.\n", fx->dwZSrcConstBitDepth); + TRACE("lpDDSZBufferSrc %p.\n", fx->u2.lpDDSZBufferSrc); + TRACE("dwAlphaEdgeBlendBitDepth %#x.\n", fx->dwAlphaEdgeBlendBitDepth); + TRACE("dwAlphaEdgeBlend %#x.\n", fx->dwAlphaEdgeBlend); + TRACE("dwReserved %#x.\n", fx->dwReserved); + TRACE("dwAlphaDestConstBitDepth %#x.\n", fx->dwAlphaDestConstBitDepth); + TRACE("lpDDSAlphaDest %p.\n", fx->u3.lpDDSAlphaDest); + TRACE("dwAlphaSrcConstBitDepth %#x.\n", fx->dwAlphaSrcConstBitDepth); + TRACE("lpDDSAlphaSrc %p.\n", fx->u4.lpDDSAlphaSrc); + TRACE("lpDDSPattern %p.\n", fx->u5.lpDDSPattern); + TRACE("ddckDestColorkey {%#x, %#x}.\n", + fx->ddckDestColorkey.color_space_low_value, + fx->ddckDestColorkey.color_space_high_value); + TRACE("ddckSrcColorkey {%#x, %#x}.\n", + fx->ddckSrcColorkey.color_space_low_value, + fx->ddckSrcColorkey.color_space_high_value); + } + + if (dst_surface->resource.map_count || (src_surface && src_surface->resource.map_count)) + { + WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); + return WINEDDERR_SURFACEBUSY; + } + + surface_get_rect(dst_surface, dst_rect_in, &dst_rect); + + if (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom + || dst_rect.left > dst_surface->resource.width || dst_rect.left < 0 + || dst_rect.top > dst_surface->resource.height || dst_rect.top < 0 + || dst_rect.right > dst_surface->resource.width || dst_rect.right < 0 + || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0) + { + WARN("The application gave us a bad destination rectangle.\n"); + return WINEDDERR_INVALIDRECT; + } + + if (src_surface) + { + surface_get_rect(src_surface, src_rect_in, &src_rect); + + if (src_rect.left >= src_rect.right || src_rect.top >= src_rect.bottom + || src_rect.left > src_surface->resource.width || src_rect.left < 0 + || src_rect.top > src_surface->resource.height || src_rect.top < 0 + || src_rect.right > src_surface->resource.width || src_rect.right < 0 + || src_rect.bottom > src_surface->resource.height || src_rect.bottom < 0) + { + WARN("Application gave us bad source rectangle for Blt.\n"); + return WINEDDERR_INVALIDRECT; + } + } + else + { + memset(&src_rect, 0, sizeof(src_rect)); + } + + if (!fx || !(fx->dwDDFX)) + flags &= ~WINEDDBLT_DDFX; + + if (flags & WINEDDBLT_WAIT) + flags &= ~WINEDDBLT_WAIT; + + if (flags & WINEDDBLT_ASYNC) + { + static unsigned int once; + + if (!once++) + FIXME("Can't handle WINEDDBLT_ASYNC flag.\n"); + flags &= ~WINEDDBLT_ASYNC; + } + + /* WINEDDBLT_DONOTWAIT appeared in DX7. */ + if (flags & WINEDDBLT_DONOTWAIT) + { + static unsigned int once; + + if (!once++) + FIXME("Can't handle WINEDDBLT_DONOTWAIT flag.\n"); + flags &= ~WINEDDBLT_DONOTWAIT; + } + + if (!device->d3d_initialized) + { + WARN("D3D not initialized, using fallback.\n"); + goto cpu; + } + + /* We want to avoid invalidating the sysmem location for converted + * surfaces, since otherwise we'd have to convert the data back when + * locking them. */ + d3dfmt_get_conv(dst_surface, TRUE, TRUE, &dst_conv_fmt, &dst_convert_type); + if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) + { + WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); + goto cpu; + } + + if (flags & ~simple_blit) + { + WARN_(d3d_perf)("Using fallback for complex blit (%#x).\n", flags); + goto fallback; + } + + if (src_surface) + src_swapchain = src_surface->swapchain; + else + src_swapchain = NULL; + + dst_swapchain = dst_surface->swapchain; + + /* This isn't strictly needed. FBO blits for example could deal with + * cross-swapchain blits by first downloading the source to a texture + * before switching to the destination context. We just have this here to + * not have to deal with the issue, since cross-swapchain blits should be + * rare. */ + if (src_swapchain && dst_swapchain && src_swapchain != dst_swapchain) + { + FIXME("Using fallback for cross-swapchain blit.\n"); + goto fallback; + } + + scale = src_surface + && (src_rect.right - src_rect.left != dst_rect.right - dst_rect.left + || src_rect.bottom - src_rect.top != dst_rect.bottom - dst_rect.top); + convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id; + + dst_ds_flags = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + if (src_surface) + src_ds_flags = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + else + src_ds_flags = 0; + + if (src_ds_flags || dst_ds_flags) + { + if (flags & WINEDDBLT_DEPTHFILL) + { + float depth; + + TRACE("Depth fill.\n"); + + if (!surface_convert_depth_to_float(dst_surface, fx->u5.dwFillDepth, &depth)) + return WINED3DERR_INVALIDCALL; + + if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, &dst_rect, depth))) + return WINED3D_OK; + } + else + { + if (src_ds_flags != dst_ds_flags) + { + WARN("Rejecting depth / stencil blit between incompatible formats.\n"); + return WINED3DERR_INVALIDCALL; + } + + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect))) + return WINED3D_OK; + } + } + else + { + /* In principle this would apply to depth blits as well, but we don't + * implement those in the CPU blitter at the moment. */ + if ((dst_surface->locations & dst_surface->map_binding) + && (!src_surface || (src_surface->locations & src_surface->map_binding))) + { + if (scale) + TRACE("Not doing sysmem blit because of scaling.\n"); + else if (convert) + TRACE("Not doing sysmem blit because of format conversion.\n"); + else + goto cpu; + } + + if (flags & WINEDDBLT_COLORFILL) + { + struct wined3d_color color; + + TRACE("Color fill.\n"); + + if (!surface_convert_color_to_float(dst_surface, fx->u5.dwFillColor, &color)) + goto fallback; + + if (SUCCEEDED(surface_color_fill(dst_surface, &dst_rect, &color))) + return WINED3D_OK; + } + else + { + TRACE("Color blit.\n"); + + /* Upload */ + if ((src_surface->locations & WINED3D_LOCATION_SYSMEM) + && !(dst_surface->locations & WINED3D_LOCATION_SYSMEM)) + { + if (scale) + TRACE("Not doing upload because of scaling.\n"); + else if (convert) + TRACE("Not doing upload because of format conversion.\n"); + else + { + POINT dst_point = {dst_rect.left, dst_rect.top}; + + if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, &src_rect))) + { + if (!surface_is_offscreen(dst_surface)) + surface_load_location(dst_surface, dst_surface->draw_binding); + return WINED3D_OK; + } + } + } + + /* Use present for back -> front blits. The idea behind this is + * that present is potentially faster than a blit, in particular + * when FBO blits aren't available. Some ddraw applications like + * Half-Life and Prince of Persia 3D use Blt() from the backbuffer + * to the frontbuffer instead of doing a Flip(). D3D8 and D3D9 + * applications can't blit directly to the frontbuffer. */ + if (dst_swapchain && dst_swapchain->back_buffers + && dst_surface == dst_swapchain->front_buffer + && src_surface == dst_swapchain->back_buffers[0]) + { + enum wined3d_swap_effect swap_effect = dst_swapchain->desc.swap_effect; + + TRACE("Using present for backbuffer -> frontbuffer blit.\n"); + + /* Set the swap effect to COPY, we don't want the backbuffer + * to become undefined. */ + dst_swapchain->desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; + wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, NULL, 0); + dst_swapchain->desc.swap_effect = swap_effect; + + return WINED3D_OK; + } + + if (fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, + &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + { + TRACE("Using FBO blit.\n"); + + surface_blt_fbo(device, filter, + src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect); + surface_validate_location(dst_surface, dst_surface->draw_binding); + surface_invalidate_location(dst_surface, ~dst_surface->draw_binding); + + return WINED3D_OK; + } + + if (arbfp_blit.blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, + &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + { + TRACE("Using arbfp blit.\n"); + + if (SUCCEEDED(arbfp_blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect))) + return WINED3D_OK; + } + } + } + +fallback: + /* Special cases for render targets. */ + if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter))) + return WINED3D_OK; + +cpu: + + /* For the rest call the X11 surface implementation. For render targets + * this should be implemented OpenGL accelerated in surface_blt_special(), + * other blits are rather rare. */ + return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); +} + +static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, DWORD flags) +{ + struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); + const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); + UINT multisample_quality = desc->multisample_quality; BOOL lockable = flags & WINED3D_SURFACE_MAPPABLE; unsigned int resource_size; HRESULT hr; @@ -6913,43 +6325,34 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN * TODO: remove this after surfaces, usage and lockability have been debugged properly * this function is too deep to need to care about things like this. * Levels need to be checked too, since they all affect what can be done. */ - switch (pool) + switch (desc->pool) { - case WINED3D_POOL_SCRATCH: - if (!lockable) - { - FIXME("Called with a pool of SCRATCH and a lockable of FALSE " - "which are mutually exclusive, setting lockable to TRUE.\n"); - lockable = TRUE; - } - break; - - case WINED3D_POOL_SYSTEM_MEM: - if (!lockable) - FIXME("Called with a pool of SYSTEMMEM and a lockable of FALSE, this is acceptable but unexpected.\n"); - break; - case WINED3D_POOL_MANAGED: - if (usage & WINED3DUSAGE_DYNAMIC) + if (desc->usage & WINED3DUSAGE_DYNAMIC) FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n"); break; case WINED3D_POOL_DEFAULT: - if (lockable && !(usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + if (lockable && !(desc->usage & (WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n"); break; + case WINED3D_POOL_SCRATCH: + case WINED3D_POOL_SYSTEM_MEM: + break; + default: - FIXME("Unknown pool %#x.\n", pool); + FIXME("Unknown pool %#x.\n", desc->pool); break; }; - if (usage & WINED3DUSAGE_RENDERTARGET && pool != WINED3D_POOL_DEFAULT) + if (desc->usage & WINED3DUSAGE_RENDERTARGET && desc->pool != WINED3D_POOL_DEFAULT) FIXME("Trying to create a render target that isn't in the default pool.\n"); /* FIXME: Check that the format is supported by the device. */ - resource_size = wined3d_format_calculate_size(format, alignment, width, height, 1); + resource_size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, 1); if (!resource_size) return WINED3DERR_INVALIDCALL; @@ -6958,50 +6361,36 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN else surface->surface_ops = &surface_ops; - hr = resource_init(&surface->resource, device, WINED3D_RTYPE_SURFACE, format, - multisample_type, multisample_quality, usage, pool, width, height, 1, - resource_size, parent, parent_ops, &surface_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = resource_init(&surface->resource, device, WINED3D_RTYPE_SURFACE, format, + desc->multisample_type, multisample_quality, desc->usage, desc->pool, desc->width, desc->height, 1, + resource_size, NULL, &wined3d_null_parent_ops, &surface_resource_ops))) { WARN("Failed to initialize resource, returning %#x.\n", hr); return hr; } - /* "Standalone" surface. */ - surface_set_container(surface, NULL); - + surface_set_container(surface, container); + surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); + list_init(&surface->renderbuffers); list_init(&surface->overlays); /* Flags */ - surface->flags = SFLAG_NORMCOORD; /* Default to normalized coords. */ + surface->flags |= SFLAG_NORMCOORD; /* Default to normalized coords. */ if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; if (flags & WINED3D_SURFACE_PIN_SYSMEM) surface->flags |= SFLAG_PIN_SYSMEM; - if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) - surface->flags |= SFLAG_LOCKABLE; - /* I'm not sure if this qualifies as a hack or as an optimization. It - * seems reasonable to assume that lockable render targets will get - * locked, so we might as well set SFLAG_DYNLOCK right at surface - * creation. However, the other reason we want to do this is that several - * ddraw applications access surface memory while the surface isn't - * mapped. The SFLAG_DYNLOCK behaviour of keeping SYSMEM around for - * future locks prevents these from crashing. */ - if (lockable && (usage & WINED3DUSAGE_RENDERTARGET)) - surface->flags |= SFLAG_DYNLOCK; + if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) + surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; - /* Mark the texture as dirty so that it gets loaded first time around. */ - surface_add_dirty_rect(surface, NULL); - list_init(&surface->renderbuffers); - - TRACE("surface %p, memory %p, size %u\n", - surface, surface->resource.allocatedMemory, surface->resource.size); + surface->map_binding = WINED3D_LOCATION_SYSMEM; /* Call the private setup routine */ hr = surface->surface_ops->surface_private_setup(surface); if (FAILED(hr)) { ERR("Private setup failed, returning %#x\n", hr); + surface_set_container(surface, NULL); surface_cleanup(surface); return hr; } @@ -7009,44 +6398,58 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN /* Similar to lockable rendertargets above, creating the DIB section * during surface initialization prevents the sysmem pointer from changing * after a wined3d_surface_getdc() call. */ - if ((usage & WINED3DUSAGE_OWNDC) && !surface->hDC + if ((desc->usage & WINED3DUSAGE_OWNDC) && !surface->hDC && SUCCEEDED(surface_create_dib_section(surface))) + surface->map_binding = WINED3D_LOCATION_DIB; + + if (surface->map_binding == WINED3D_LOCATION_DIB) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - surface->resource.allocatedMemory = surface->dib.bitmap_data; + wined3d_resource_free_sysmem(&surface->resource); + surface_validate_location(surface, WINED3D_LOCATION_DIB); + surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); } return hr; } -HRESULT CDECL wined3d_surface_create(struct wined3d_device *device, UINT width, UINT height, - enum wined3d_format_id format_id, DWORD usage, enum wined3d_pool pool, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, DWORD flags, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_surface **surface) +HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) { + struct wined3d_device_parent *device_parent = container->resource.device->device_parent; + const struct wined3d_parent_ops *parent_ops; struct wined3d_surface *object; + void *parent; HRESULT hr; - TRACE("device %p, width %u, height %u, format %s\n", - device, width, height, debug_d3dformat(format_id)); - TRACE("surface %p, usage %s (%#x), pool %s, multisample_type %#x, multisample_quality %u\n", - surface, debug_d3dusage(usage), usage, debug_d3dpool(pool), multisample_type, multisample_quality); - TRACE("flags %#x, parent %p, parent_ops %p.\n", flags, parent, parent_ops); + TRACE("container %p, width %u, height %u, format %s, usage %s (%#x), " + "pool %s, multisample_type %#x, multisample_quality %u, flags %#x, surface %p.\n", + container, desc->width, desc->height, debug_d3dformat(desc->format), + debug_d3dusage(desc->usage), desc->usage, debug_d3dpool(desc->pool), + desc->multisample_type, desc->multisample_quality, flags, surface); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return WINED3DERR_OUTOFVIDEOMEMORY; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; - if (FAILED(hr = surface_init(object, device->surface_alignment, width, height, multisample_type, - multisample_quality, device, usage, format_id, pool, flags, parent, parent_ops))) + if (FAILED(hr = surface_init(object, container, desc, flags))) { WARN("Failed to initialize surface, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - TRACE("Created surface %p.\n", object); + if (FAILED(hr = device_parent->ops->surface_created(device_parent, + wined3d_texture_get_parent(container), object, &parent, &parent_ops))) + { + WARN("Failed to create surface parent, hr %#x.\n", hr); + surface_set_container(object, NULL); + wined3d_surface_decref(object); + return hr; + } + + TRACE("Created surface %p, parent %p, parent_ops %p.\n", object, parent, parent_ops); + + object->resource.parent = parent; + object->resource.parent_ops = parent_ops; *surface = object; return hr; diff --git a/reactos/dll/directx/wine/wined3d/swapchain.c b/reactos/dll/directx/wine/wined3d/swapchain.c index f0d7fbee297..6dbcf804c30 100644 --- a/reactos/dll/directx/wine/wined3d/swapchain.c +++ b/reactos/dll/directx/wine/wined3d/swapchain.c @@ -25,7 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); -/* Do not call while under the GL lock. */ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { HRESULT hr; @@ -82,7 +81,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain->backup_wnd, swapchain->backup_dc); - ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); + wined3d_release_dc(swapchain->backup_wnd, swapchain->backup_dc); DestroyWindow(swapchain->backup_wnd); } } @@ -96,7 +95,6 @@ ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) return refcount; } -/* Do not call while under the GL lock. */ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedDecrement(&swapchain->ref); @@ -149,9 +147,8 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, return WINED3DERR_INVALIDCALL; } - wined3d_swapchain_set_window(swapchain, dst_window_override); - - swapchain->swapchain_ops->swapchain_present(swapchain, src_rect, dst_rect, dirty_region, flags); + wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, + dst_rect, dst_window_override, dirty_region, flags); return WINED3D_OK; } @@ -298,19 +295,20 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format->color_fixup)) { - DWORD location = SFLAG_INTEXTURE; + DWORD location = WINED3D_LOCATION_TEXTURE_RGB; if (backbuffer->resource.multisample_type) { - location = SFLAG_INRB_RESOLVED; - surface_load_location(backbuffer, location, NULL); + location = WINED3D_LOCATION_RB_RESOLVED; + surface_load_location(backbuffer, location); } context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, backbuffer, NULL, location); gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, swapchain->front_buffer, + NULL, WINED3D_LOCATION_DRAWABLE); context_set_draw_buffer(context, GL_BACK); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -352,8 +350,9 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, if (is_complex_fixup(backbuffer->resource.format->color_fixup)) gl_filter = GL_NEAREST; - context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); - context_bind_texture(context2, backbuffer->texture_target, backbuffer->texture_name); + context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, swapchain->front_buffer, + NULL, WINED3D_LOCATION_DRAWABLE); + context_bind_texture(context2, backbuffer->texture_target, backbuffer->container->texture_rgb.name); /* Set up the texture. The surface is not in a wined3d_texture * container, so there are no D3D texture settings to dirtify. */ @@ -426,12 +425,22 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT gl_info = context->gl_info; - /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ - if (swapchain->device->bCursorVisible && - swapchain->device->cursorTexture && - !swapchain->device->hardwareCursor) + if (swapchain->device->logo_texture) { - struct wined3d_surface cursor; + struct wined3d_surface *src_surface = surface_from_resource( + wined3d_texture_get_sub_resource(swapchain->device->logo_texture, 0)); + RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; + + /* Blit the logo into the upper left corner of the drawable. */ + wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_ALPHATEST, + NULL, WINED3D_TEXF_POINT); + } + + if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture + && !swapchain->device->hardwareCursor) + { + struct wined3d_surface *cursor = surface_from_resource( + wined3d_texture_get_sub_resource(swapchain->device->cursor_texture, 0)); RECT destRect = { swapchain->device->xScreenSpace - swapchain->device->xHotSpot, @@ -439,43 +448,12 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, }; - TRACE("Rendering the cursor. Creating fake surface at %p\n", &cursor); - /* Build a fake surface to call the Blitting code. It is not possible to use the interface passed by - * the application because we are only supposed to copy the information out. Using a fake surface - * allows us to use the Blitting engine and avoid copying the whole texture -> render target blitting code. - */ - memset(&cursor, 0, sizeof(cursor)); - cursor.resource.ref = 1; - cursor.resource.device = swapchain->device; - cursor.resource.pool = WINED3D_POOL_SCRATCH; - cursor.resource.format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); - cursor.resource.type = WINED3D_RTYPE_SURFACE; - cursor.texture_name = swapchain->device->cursorTexture; - cursor.texture_target = GL_TEXTURE_2D; - cursor.texture_level = 0; - cursor.resource.width = swapchain->device->cursorWidth; - cursor.resource.height = swapchain->device->cursorHeight; - /* The cursor must have pow2 sizes */ - cursor.pow2Width = cursor.resource.width; - cursor.pow2Height = cursor.resource.height; - /* The surface is in the texture */ - cursor.flags |= SFLAG_INTEXTURE; - /* DDBLT_KEYSRC will cause BltOverride to enable the alpha test with GL_NOTEQUAL, 0.0, - * which is exactly what we want :-) - */ + + TRACE("Rendering the software cursor.\n"); + if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - wined3d_surface_blt(back_buffer, &destRect, &cursor, NULL, WINEDDBLT_KEYSRC, - NULL, WINED3D_TEXF_POINT); - } - - if (swapchain->device->logo_surface) - { - struct wined3d_surface *src_surface = swapchain->device->logo_surface; - RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; - - /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_KEYSRC, + wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_ALPHATEST, NULL, WINED3D_TEXF_POINT); } @@ -520,26 +498,22 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT */ if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - surface_load_location(back_buffer, SFLAG_INTEXTURE, NULL); - surface_modify_location(back_buffer, SFLAG_INDRAWABLE, FALSE); + surface_load_location(back_buffer, WINED3D_LOCATION_TEXTURE_RGB); + surface_invalidate_location(back_buffer, WINED3D_LOCATION_DRAWABLE); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); } else { - surface_load_location(back_buffer, back_buffer->draw_binding, NULL); + surface_load_location(back_buffer, back_buffer->draw_binding); } if (swapchain->render_to_fbo) { - /* This codepath should only be hit with the COPY swapeffect. Otherwise a backbuffer- - * window size mismatch is impossible(fullscreen) and src and dst rectangles are - * not allowed(they need the COPY swapeffect) - * - * The DISCARD swap effect is ok as well since any backbuffer content is allowed after - * the swap. */ - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP) - FIXME("Render-to-fbo with WINED3D_SWAP_EFFECT_FLIP\n"); + static unsigned int once; + + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) + FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); swapchain_blit(swapchain, context, &src_rect, &dst_rect); } @@ -567,33 +541,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT } } - /* This is disabled, but the code left in for debug purposes. - * - * Since we're allowed to modify the new back buffer on a D3DSWAPEFFECT_DISCARD flip, - * we can clear it with some ugly color to make bad drawing visible and ease debugging. - * The Debug runtime does the same on Windows. However, a few games do not redraw the - * screen properly, like Max Payne 2, which leaves a few pixels undefined. - * - * Tests show that the content of the back buffer after a discard flip is indeed not - * reliable, so no game can depend on the exact content. However, it resembles the - * old contents in some way, for example by showing fragments at other locations. In - * general, the color theme is still intact. So Max payne, which draws rather dark scenes - * gets a dark background image. If we clear it with a bright ugly color, the game's - * bug shows up much more than it does on Windows, and the players see single pixels - * with wrong colors. - * (The Max Payne bug has been confirmed on Windows with the debug runtime) */ - if (FALSE && swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) - { - static const struct wined3d_color cyan = {0.0f, 1.0f, 1.0f, 1.0f}; - - TRACE("Clearing the color buffer with cyan color\n"); - - wined3d_device_clear(swapchain->device, 0, NULL, - WINED3DCLEAR_TARGET, &cyan, 1.0f, 0); - } - - if (!swapchain->render_to_fbo && ((swapchain->front_buffer->flags & SFLAG_INSYSMEM) - || (back_buffer->flags & SFLAG_INSYSMEM))) + if (!swapchain->render_to_fbo && ((swapchain->front_buffer->locations & WINED3D_LOCATION_SYSMEM) + || (back_buffer->locations & WINED3D_LOCATION_SYSMEM))) { /* Both memory copies of the surfaces are ok, flip them around too instead of dirtifying * Doesn't work with render_to_fbo because we're not flipping @@ -602,32 +551,35 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (front->resource.size == back_buffer->resource.size) { - DWORD fbflags; flip_surface(front, back_buffer); /* Tell the front buffer surface that is has been modified. However, * the other locations were preserved during that, so keep the flags. * This serves to update the emulated overlay, if any. */ - fbflags = front->flags; - surface_modify_location(front, SFLAG_INDRAWABLE, TRUE); - front->flags = fbflags; + surface_validate_location(front, WINED3D_LOCATION_DRAWABLE); } else { - surface_modify_location(front, SFLAG_INDRAWABLE, TRUE); - surface_modify_location(back_buffer, SFLAG_INDRAWABLE, TRUE); + surface_validate_location(front, WINED3D_LOCATION_DRAWABLE); + surface_invalidate_location(front, ~WINED3D_LOCATION_DRAWABLE); + surface_validate_location(back_buffer, WINED3D_LOCATION_DRAWABLE); + surface_invalidate_location(back_buffer, ~WINED3D_LOCATION_DRAWABLE); } } else { - surface_modify_location(swapchain->front_buffer, SFLAG_INDRAWABLE, TRUE); + surface_validate_location(swapchain->front_buffer, WINED3D_LOCATION_DRAWABLE); + surface_invalidate_location(swapchain->front_buffer, ~WINED3D_LOCATION_DRAWABLE); /* If the swapeffect is DISCARD, the back buffer is undefined. That means the SYSMEM * and INTEXTURE copies can keep their old content if they have any defined content. * If the swapeffect is COPY, the content remains the same. If it is FLIP however, * the texture / sysmem copy needs to be reloaded from the drawable */ if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP) - surface_modify_location(back_buffer, back_buffer->draw_binding, TRUE); + { + surface_validate_location(back_buffer, back_buffer->draw_binding); + surface_invalidate_location(back_buffer, ~back_buffer->draw_binding); + } } if (fb->depth_stencil) @@ -635,7 +587,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || fb->depth_stencil->flags & SFLAG_DISCARD) { - surface_modify_ds_location(fb->depth_stencil, SFLAG_DISCARDED, + surface_modify_ds_location(fb->depth_stencil, WINED3D_LOCATION_DISCARDED, fb->depth_stencil->resource.width, fb->depth_stencil->resource.height); if (fb->depth_stencil == swapchain->device->onscreen_depth_stencil) @@ -657,7 +609,7 @@ static const struct wined3d_swapchain_ops swapchain_gl_ops = /* Helper function that blits the front buffer contents to the target window. */ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) { - const struct wined3d_surface *front; + struct wined3d_surface *front; POINT offset = {0, 0}; HDC src_dc, dst_dc; RECT draw_rect; @@ -666,14 +618,13 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("swapchain %p, rect %s.\n", swapchain, wine_dbgstr_rect(rect)); front = swapchain->front_buffer; - if (!(front->resource.usage & WINED3DUSAGE_RENDERTARGET)) - return; - if (front->resource.map_count) ERR("Trying to blit a mapped surface.\n"); TRACE("Copying surface %p to screen.\n", front); + surface_load_location(front, WINED3D_LOCATION_DIB); + src_dc = front->hDC; window = swapchain->win_handle; dst_dc = GetDCEx(window, 0, DCX_CLIPSIBLINGS | DCX_CACHE); @@ -731,10 +682,6 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const REC front->dib.bitmap_data = back->dib.bitmap_data; back->dib.bitmap_data = tmp; - tmp = front->resource.allocatedMemory; - front->resource.allocatedMemory = back->resource.allocatedMemory; - back->resource.allocatedMemory = tmp; - if (front->resource.heap_memory) ERR("GDI Surface %p has heap memory allocated.\n", front); @@ -804,7 +751,6 @@ void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) swapchain->render_to_fbo = TRUE; } -/* Do not call while under the GL lock. */ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -883,7 +829,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 surface_desc.format = swapchain->desc.backbuffer_format; surface_desc.multisample_type = swapchain->desc.multisample_type; surface_desc.multisample_quality = swapchain->desc.multisample_quality; - surface_desc.usage = WINED3DUSAGE_RENDERTARGET; + surface_desc.usage = 0; surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = swapchain->desc.backbuffer_width; surface_desc.height = swapchain->desc.backbuffer_height; @@ -899,7 +845,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 surface_set_swapchain(swapchain->front_buffer, swapchain); if (!(device->wined3d->flags & WINED3D_NO3D)) - surface_modify_location(swapchain->front_buffer, SFLAG_INDRAWABLE, TRUE); + { + surface_validate_location(swapchain->front_buffer, WINED3D_LOCATION_DRAWABLE); + surface_invalidate_location(swapchain->front_buffer, ~WINED3D_LOCATION_DRAWABLE); + } /* MSDN says we're only allowed a single fullscreen swapchain per device, * so we should really check to see if there is a fullscreen swapchain @@ -993,6 +942,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } + surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); @@ -1000,6 +950,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 parent, &surface_desc, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); + swapchain->desc.backbuffer_count = i; goto err; } surface_set_swapchain(swapchain->back_buffers[i], swapchain); @@ -1070,7 +1021,6 @@ err: return hr; } -/* Do not call while under the GL lock. */ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -1098,7 +1048,6 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win return WINED3D_OK; } -/* Do not call while under the GL lock. */ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain *swapchain) { struct wined3d_context **newArray; diff --git a/reactos/dll/directx/wine/wined3d/texture.c b/reactos/dll/directx/wine/wined3d/texture.c index d670ce8ac86..3aba595da70 100644 --- a/reactos/dll/directx/wine/wined3d/texture.c +++ b/reactos/dll/directx/wine/wined3d/texture.c @@ -39,6 +39,14 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, device, parent, parent_ops, resource_ops); + if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY)) == WINED3DFMT_FLAG_BLOCKS) + { + UINT width_mask = format->block_width - 1; + UINT height_mask = format->block_height - 1; + if (desc->width & width_mask || desc->height & height_mask) + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) @@ -61,8 +69,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->level_count = level_count; texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; - texture->texture_rgb.dirty = TRUE; - texture->texture_srgb.dirty = TRUE; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) @@ -86,7 +92,7 @@ static void gltexture_delete(const struct wined3d_gl_info *gl_info, struct gl_te tex->name = 0; } -static void wined3d_texture_unload(struct wined3d_texture *texture) +static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) { struct wined3d_device *device = texture->resource.device; struct wined3d_context *context = NULL; @@ -104,7 +110,7 @@ static void wined3d_texture_unload(struct wined3d_texture *texture) if (context) context_release(context); - wined3d_texture_set_dirty(texture, TRUE); + wined3d_texture_set_dirty(texture); resource_unload(&texture->resource); } @@ -124,28 +130,28 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) texture->texture_ops->texture_sub_resource_cleanup(sub_resource); } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); HeapFree(GetProcessHeap(), 0, texture->sub_resources); resource_cleanup(&texture->resource); } -void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) +void wined3d_texture_set_dirty(struct wined3d_texture *texture) { - texture->texture_rgb.dirty = dirty; - texture->texture_srgb.dirty = dirty; + texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); } /* Context activation is done by the caller. */ -static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb, BOOL *set_surface_desc) +void wined3d_texture_bind(struct wined3d_texture *texture, + struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; struct gl_texture *gl_tex; - BOOL new_texture = FALSE; - HRESULT hr = WINED3D_OK; GLenum target; - TRACE("texture %p, context %p, srgb %#x, set_surface_desc %p.\n", texture, context, srgb, set_surface_desc); + TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); + + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = FALSE; /* sRGB mode cache for preload() calls outside drawprim. */ if (srgb) @@ -153,89 +159,122 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, else texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; - gl_tex = wined3d_texture_get_gl_texture(texture, context->gl_info, srgb); + gl_tex = wined3d_texture_get_gl_texture(texture, srgb); target = texture->target; - /* Generate a texture name if we don't already have one. */ - if (!gl_tex->name) - { - *set_surface_desc = TRUE; - gl_info->gl_ops.gl.p_glGenTextures(1, &gl_tex->name); - checkGLcall("glGenTextures"); - TRACE("Generated texture %d.\n", gl_tex->name); - if (texture->resource.pool == WINED3D_POOL_DEFAULT) - { - /* Tell OpenGL to try and keep this texture in video ram (well mostly). */ - GLclampf tmp = 0.9f; - gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &gl_tex->name, &tmp); - } - /* Initialise the state of the texture object to the OpenGL defaults, - * not the D3D defaults. */ - gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3D_TADDRESS_WRAP; - gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3D_TADDRESS_WRAP; - gl_tex->states[WINED3DTEXSTA_ADDRESSW] = WINED3D_TADDRESS_WRAP; - gl_tex->states[WINED3DTEXSTA_BORDERCOLOR] = 0; - gl_tex->states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_LINEAR; - gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; /* GL_NEAREST_MIPMAP_LINEAR */ - gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_LINEAR; /* GL_NEAREST_MIPMAP_LINEAR */ - gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL] = 0; - gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] = 1; - if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = TRUE; - else - gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = srgb; - gl_tex->states[WINED3DTEXSTA_SHADOW] = FALSE; - wined3d_texture_set_dirty(texture, TRUE); - new_texture = TRUE; - - if (texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) - { - /* This means double binding the texture at creation, but keeps - * the code simpler all in all, and the run-time path free from - * additional checks. */ - context_bind_texture(context, target, gl_tex->name); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, GL_TRUE); - checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, GL_TRUE)"); - } - } - else - { - *set_surface_desc = FALSE; - } - if (gl_tex->name) { context_bind_texture(context, target, gl_tex->name); - if (new_texture) - { - /* For a new texture we have to set the texture levels after - * binding the texture. Beware that texture rectangles do not - * support mipmapping, but set the maxmiplevel if we're relying - * on the partial GL_ARB_texture_non_power_of_two emulation with - * texture rectangles. (I.e., do not care about cond_np2 here, - * just look for GL_TEXTURE_RECTANGLE_ARB.) */ - if (target != GL_TEXTURE_RECTANGLE_ARB) - { - TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->level_count - 1); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); - checkGLcall("glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count)"); - } - if (target == GL_TEXTURE_CUBE_MAP_ARB) - { - /* Cubemaps are always set to clamp, regardless of the sampler state. */ - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - } - } - } - else - { - ERR("This texture doesn't have an OpenGL texture assigned to it.\n"); - hr = WINED3DERR_INVALIDCALL; + return; } - return hr; + gl_info->gl_ops.gl.p_glGenTextures(1, &gl_tex->name); + checkGLcall("glGenTextures"); + TRACE("Generated texture %d.\n", gl_tex->name); + + if (!gl_tex->name) + { + ERR("Failed to generate a texture name.\n"); + return; + } + + if (texture->resource.pool == WINED3D_POOL_DEFAULT) + { + /* Tell OpenGL to try and keep this texture in video ram (well mostly). */ + GLclampf tmp = 0.9f; + gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &gl_tex->name, &tmp); + } + + /* Initialise the state of the texture object to the OpenGL defaults, not + * the wined3d defaults. */ + gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3D_TADDRESS_WRAP; + gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3D_TADDRESS_WRAP; + gl_tex->states[WINED3DTEXSTA_ADDRESSW] = WINED3D_TADDRESS_WRAP; + gl_tex->states[WINED3DTEXSTA_BORDERCOLOR] = 0; + gl_tex->states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_LINEAR; + gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; /* GL_NEAREST_MIPMAP_LINEAR */ + gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_LINEAR; /* GL_NEAREST_MIPMAP_LINEAR */ + gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL] = 0; + gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] = 1; + if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = TRUE; + else + gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = srgb; + gl_tex->states[WINED3DTEXSTA_SHADOW] = FALSE; + wined3d_texture_set_dirty(texture); + + context_bind_texture(context, target, gl_tex->name); + + if (texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) + { + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, GL_TRUE); + checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, GL_TRUE)"); + } + + /* For a new texture we have to set the texture levels after binding the + * texture. Beware that texture rectangles do not support mipmapping, but + * set the maxmiplevel if we're relying on the partial + * GL_ARB_texture_non_power_of_two emulation with texture rectangles. + * (I.e., do not care about cond_np2 here, just look for + * GL_TEXTURE_RECTANGLE_ARB.) */ + if (target != GL_TEXTURE_RECTANGLE_ARB) + { + TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->level_count - 1); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + checkGLcall("glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count)"); + } + + if (target == GL_TEXTURE_CUBE_MAP_ARB) + { + /* Cubemaps are always set to clamp, regardless of the sampler state. */ + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + } + + if (texture->flags & WINED3D_TEXTURE_COND_NP2) + { + /* Conditinal non power of two textures use a different clamping + * default. If we're using the GL_WINE_normalized_texrect partial + * driver emulation, we're dealing with a GL_TEXTURE_2D texture which + * has the address mode set to repeat - something that prevents us + * from hitting the accelerated codepath. Thus manually set the GL + * state. The same applies to filtering. Even if the texture has only + * one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW + * fallback on macos. */ + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3D_TADDRESS_CLAMP; + gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3D_TADDRESS_CLAMP; + gl_tex->states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_POINT; + gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; + gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; + } +} + +/* Context activation is done by the caller. */ +void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, + struct wined3d_context *context, BOOL srgb) +{ + DWORD active_sampler; + + /* We don't need a specific texture unit, but after binding the texture + * the current unit is dirty. Read the unit back instead of switching to + * 0, this avoids messing around with the state manager's GL states. The + * current texture unit should always be a valid one. + * + * To be more specific, this is tricky because we can implicitly be + * called from sampler() in state.c. This means we can't touch anything + * other than whatever happens to be the currently active texture, or we + * would risk marking already applied sampler states dirty again. */ + active_sampler = context->rev_tex_unit_map[context->active_texture]; + if (active_sampler != WINED3D_UNMAPPED_STAGE) + context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + + wined3d_texture_bind(texture, context, srgb); } /* Context activation is done by the caller. */ @@ -275,8 +314,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, TRACE("texture %p, sampler_states %p.\n", texture, sampler_states); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, - texture->flags & WINED3D_TEXTURE_IS_SRGB); + gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); /* This function relies on the correct texture being bound and loaded. */ @@ -435,7 +473,6 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) return refcount; } -/* Do not call while under the GL lock. */ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) { ULONG refcount = InterlockedDecrement(&texture->resource.ref); @@ -469,10 +506,45 @@ DWORD CDECL wined3d_texture_get_priority(const struct wined3d_texture *texture) return resource_get_priority(&texture->resource); } -/* Do not call while under the GL lock. */ +/* Context activation is done by the caller */ +void wined3d_texture_load(struct wined3d_texture *texture, + struct wined3d_context *context, BOOL srgb) +{ + UINT sub_count = texture->level_count * texture->layer_count; + const struct wined3d_gl_info *gl_info = context->gl_info; + DWORD flag; + UINT i; + + TRACE("texture %p, srgb %#x.\n", texture, srgb); + + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = FALSE; + + if (srgb) + flag = WINED3D_TEXTURE_SRGB_VALID; + else + flag = WINED3D_TEXTURE_RGB_VALID; + + if (texture->flags & flag) + { + TRACE("Texture %p not dirty, nothing to do.\n", texture); + return; + } + + /* Reload the surfaces if the texture is marked dirty. */ + for (i = 0; i < sub_count; ++i) + { + texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb); + } + texture->flags |= flag; +} + void CDECL wined3d_texture_preload(struct wined3d_texture *texture) { - texture->texture_ops->texture_preload(texture, SRGB_ANY); + struct wined3d_context *context; + context = context_acquire(texture->resource.device, NULL); + wined3d_texture_load(texture, context, texture->flags & WINED3D_TEXTURE_IS_SRGB); + context_release(context); } void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) @@ -549,6 +621,67 @@ enum wined3d_texture_filter_type CDECL wined3d_texture_get_autogen_filter_type(c return texture->filter_type; } +HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, + DWORD flags, const struct wined3d_color_key *color_key) +{ + TRACE("texture %p, flags %#x, color_key %p.\n", texture, flags, color_key); + + if (flags & WINEDDCKEY_COLORSPACE) + { + FIXME("Unhandled flags %#x.\n", flags); + return WINED3DERR_INVALIDCALL; + } + + if (color_key) + { + switch (flags & ~WINEDDCKEY_COLORSPACE) + { + case WINEDDCKEY_DESTBLT: + texture->dst_blt_color_key = *color_key; + texture->color_key_flags |= WINEDDSD_CKDESTBLT; + break; + + case WINEDDCKEY_DESTOVERLAY: + texture->dst_overlay_color_key = *color_key; + texture->color_key_flags |= WINEDDSD_CKDESTOVERLAY; + break; + + case WINEDDCKEY_SRCOVERLAY: + texture->src_overlay_color_key = *color_key; + texture->color_key_flags |= WINEDDSD_CKSRCOVERLAY; + break; + + case WINEDDCKEY_SRCBLT: + texture->src_blt_color_key = *color_key; + texture->color_key_flags |= WINEDDSD_CKSRCBLT; + break; + } + } + else + { + switch (flags & ~WINEDDCKEY_COLORSPACE) + { + case WINEDDCKEY_DESTBLT: + texture->color_key_flags &= ~WINEDDSD_CKDESTBLT; + break; + + case WINEDDCKEY_DESTOVERLAY: + texture->color_key_flags &= ~WINEDDSD_CKDESTOVERLAY; + break; + + case WINEDDCKEY_SRCOVERLAY: + texture->color_key_flags &= ~WINEDDSD_CKSRCOVERLAY; + break; + + case WINEDDCKEY_SRCBLT: + texture->color_key_flags &= ~WINEDDSD_CKSRCBLT; + break; + } + } + + return WINED3D_OK; +} + void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) { /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ @@ -584,148 +717,44 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3DERR_INVALIDCALL; } - wined3d_texture_set_dirty(texture, TRUE); texture->texture_ops->texture_sub_resource_add_dirty_region(sub_resource, dirty_region); return WINED3D_OK; } -/* Context activation is done by the caller. */ -static HRESULT texture2d_bind(struct wined3d_texture *texture, +static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, struct wined3d_context *context, BOOL srgb) { - const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL set_gl_texture_desc; - HRESULT hr; - - TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - - hr = wined3d_texture_bind(texture, context, srgb, &set_gl_texture_desc); - if (set_gl_texture_desc && SUCCEEDED(hr)) - { - UINT sub_count = texture->level_count * texture->layer_count; - BOOL srgb_tex = !context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - && (texture->flags & WINED3D_TEXTURE_IS_SRGB); - struct gl_texture *gl_tex; - UINT i; - - gl_tex = wined3d_texture_get_gl_texture(texture, context->gl_info, srgb_tex); - - for (i = 0; i < sub_count; ++i) - { - struct wined3d_surface *surface = surface_from_resource(texture->sub_resources[i]); - surface_set_texture_name(surface, gl_tex->name, srgb_tex); - } - - /* Conditinal non power of two textures use a different clamping - * default. If we're using the GL_WINE_normalized_texrect partial - * driver emulation, we're dealing with a GL_TEXTURE_2D texture which - * has the address mode set to repeat - something that prevents us - * from hitting the accelerated codepath. Thus manually set the GL - * state. The same applies to filtering. Even if the texture has only - * one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW - * fallback on macos. */ - if (texture->flags & WINED3D_TEXTURE_COND_NP2) - { - GLenum target = texture->target; - - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - checkGLcall("glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)"); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - checkGLcall("glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)"); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST)"); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST)"); - gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3D_TADDRESS_CLAMP; - gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3D_TADDRESS_CLAMP; - gl_tex->states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_POINT; - gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; - gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; - } - } - - return hr; -} - -static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) -{ - switch (srgb) - { - case SRGB_RGB: - return FALSE; - - case SRGB_SRGB: - return TRUE; - - default: - return texture->flags & WINED3D_TEXTURE_IS_SRGB; - } -} - -/* Do not call while under the GL lock. */ -static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB srgb) -{ - UINT sub_count = texture->level_count * texture->layer_count; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_context *context = NULL; - struct gl_texture *gl_tex; - BOOL srgb_mode; - UINT i; - - TRACE("texture %p, srgb %#x.\n", texture, srgb); - - srgb_mode = texture_srgb_mode(texture, srgb); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb_mode); - - if (!device->isInDraw) - { - /* No danger of recursive calls, context_acquire() sets isInDraw to TRUE - * when loading offscreen render targets into the texture. */ - context = context_acquire(device, NULL); - } - - if (gl_tex->dirty) - { - /* Reload the surfaces if the texture is marked dirty. */ - for (i = 0; i < sub_count; ++i) - { - surface_load(surface_from_resource(texture->sub_resources[i]), srgb_mode); - } - } - else - { - TRACE("Texture %p not dirty, nothing to do.\n", texture); - } - - /* No longer dirty. */ - gl_tex->dirty = FALSE; - - if (context) context_release(context); + surface_load(surface_from_resource(sub_resource), srgb); } static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region) { - surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_region); + struct wined3d_surface *surface = surface_from_resource(sub_resource); + + surface_prepare_map_memory(surface); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); } static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource) { struct wined3d_surface *surface = surface_from_resource(sub_resource); - /* Clean out the texture name we gave to the surface so that the - * surface doesn't try and release it. */ - surface_set_texture_name(surface, 0, TRUE); - surface_set_texture_name(surface, 0, FALSE); surface_set_texture_target(surface, 0, 0); surface_set_container(surface, NULL); wined3d_surface_decref(surface); } -/* Do not call while under the GL lock. */ -static void texture2d_unload(struct wined3d_resource *resource) +static const struct wined3d_texture_ops texture2d_ops = +{ + texture2d_sub_resource_load, + texture2d_sub_resource_add_dirty_region, + texture2d_sub_resource_cleanup, +}; + +static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; @@ -736,27 +765,16 @@ static void texture2d_unload(struct wined3d_resource *resource) for (i = 0; i < sub_count; ++i) { struct wined3d_resource *sub_resource = texture->sub_resources[i]; - struct wined3d_surface *surface = surface_from_resource(sub_resource); sub_resource->resource_ops->resource_unload(sub_resource); - surface_set_texture_name(surface, 0, FALSE); /* Delete RGB name */ - surface_set_texture_name(surface, 0, TRUE); /* Delete sRGB name */ } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); } -static const struct wined3d_texture_ops texture2d_ops = +static const struct wined3d_resource_ops texture_resource_ops = { - texture2d_bind, - texture2d_preload, - texture2d_sub_resource_add_dirty_region, - texture2d_sub_resource_cleanup, -}; - -static const struct wined3d_resource_ops texture2d_resource_ops = -{ - texture2d_unload, + wined3d_texture_unload, }; static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -827,7 +845,7 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -859,15 +877,13 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi UINT idx = j * texture->level_count + i; struct wined3d_surface *surface; - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, - parent, &surface_desc, idx, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) { - FIXME("(%p) Failed to create surface, hr %#x.\n", texture, hr); + WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_container(surface, texture); surface_set_texture_target(surface, cube_targets[j], i); texture->sub_resources[idx] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); @@ -954,7 +970,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1015,16 +1031,13 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { struct wined3d_surface *surface; - /* Use the callback to create the texture surface. */ - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, - parent, &surface_desc, i, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) { - FIXME("Failed to create surface %p, hr %#x\n", texture, hr); + WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_container(surface, texture); surface_set_texture_target(surface, texture->target, i); texture->sub_resources[i] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); @@ -1036,58 +1049,16 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -/* Context activation is done by the caller. */ -static HRESULT texture3d_bind(struct wined3d_texture *texture, +static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, struct wined3d_context *context, BOOL srgb) { - BOOL dummy; - - TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - - return wined3d_texture_bind(texture, context, srgb, &dummy); -} - -/* Do not call while under the GL lock. */ -static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB srgb) -{ - UINT sub_count = texture->level_count * texture->layer_count; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_context *context = NULL; - struct gl_texture *gl_tex; - BOOL srgb_mode; - UINT i; - - TRACE("texture %p, srgb %#x.\n", texture, srgb); - - srgb_mode = texture_srgb_mode(texture, srgb); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb_mode); - - if (gl_tex->dirty) - { - context = context_acquire(device, NULL); - - /* Reload the surfaces if the texture is marked dirty. */ - for (i = 0; i < sub_count; ++i) - { - wined3d_volume_load(volume_from_resource(texture->sub_resources[i]), context, - srgb_mode); - } - - context_release(context); - } - else - { - TRACE("Texture %p not dirty, nothing to do.\n", texture); - } - - /* No longer dirty. */ - gl_tex->dirty = FALSE; + wined3d_volume_load(volume_from_resource(sub_resource), context, srgb); } static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region) { + wined3d_texture_set_dirty(volume_from_resource(sub_resource)->container); } static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource) @@ -1099,41 +1070,18 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource wined3d_volume_decref(volume); } -/* Do not call while under the GL lock. */ -static void texture3d_unload(struct wined3d_resource *resource) -{ - struct wined3d_texture *texture = wined3d_texture_from_resource(resource); - UINT i; - - TRACE("texture %p.\n", texture); - - for (i = 0; i < texture->level_count; ++i) - { - struct wined3d_resource *sub_resource = texture->sub_resources[i]; - sub_resource->resource_ops->resource_unload(sub_resource); - } - - wined3d_texture_unload(texture); -} - static const struct wined3d_texture_ops texture3d_ops = { - texture3d_bind, - texture3d_preload, + texture3d_sub_resource_load, texture3d_sub_resource_add_dirty_region, texture3d_sub_resource_cleanup, }; -static const struct wined3d_resource_ops texture3d_resource_ops = -{ - texture3d_unload, -}; - static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, UINT levels, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - UINT tmp_w, tmp_h, tmp_d; + struct wined3d_resource_desc volume_desc; unsigned int i; HRESULT hr; @@ -1203,7 +1151,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - desc, device, parent, parent_ops, &texture3d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1216,38 +1164,31 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->target = GL_TEXTURE_3D; /* Generate all the surfaces. */ - tmp_w = desc->width; - tmp_h = desc->height; - tmp_d = desc->depth; - + volume_desc = *desc; + volume_desc.resource_type = WINED3D_RTYPE_VOLUME; for (i = 0; i < texture->level_count; ++i) { struct wined3d_volume *volume; - /* Create the volume. */ - hr = device->device_parent->ops->create_volume(device->device_parent, parent, - tmp_w, tmp_h, tmp_d, i, desc->format, desc->pool, desc->usage, &volume); - if (FAILED(hr)) + if (FAILED(hr = wined3d_volume_create(texture, &volume_desc, i, &volume))) { ERR("Creating a volume for the volume texture failed, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - /* Set its container to this texture. */ - volume_set_container(volume, texture); texture->sub_resources[i] = &volume->resource; /* Calculate the next mipmap level. */ - tmp_w = max(1, tmp_w >> 1); - tmp_h = max(1, tmp_h >> 1); - tmp_d = max(1, tmp_d >> 1); + volume_desc.width = max(1, volume_desc.width >> 1); + volume_desc.height = max(1, volume_desc.height >> 1); + volume_desc.depth = max(1, volume_desc.depth >> 1); } return WINED3D_OK; } -HRESULT CDECL wined3d_texture_create_2d(struct wined3d_device *device, const struct wined3d_resource_desc *desc, +HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD surface_flags, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { @@ -1257,79 +1198,33 @@ HRESULT CDECL wined3d_texture_create_2d(struct wined3d_device *device, const str TRACE("device %p, desc %p, level_count %u, surface_flags %#x, parent %p, parent_ops %p, texture %p.\n", device, desc, level_count, surface_flags, parent, parent_ops, texture); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + switch (desc->resource_type) { - *texture = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; + case WINED3D_RTYPE_TEXTURE: + hr = texture_init(object, desc, level_count, surface_flags, device, parent, parent_ops); + break; + + case WINED3D_RTYPE_VOLUME_TEXTURE: + hr = volumetexture_init(object, desc, level_count, device, parent, parent_ops); + break; + + case WINED3D_RTYPE_CUBE_TEXTURE: + hr = cubetexture_init(object, desc, level_count, surface_flags, device, parent, parent_ops); + break; + + default: + ERR("Invalid resource type %s.\n", debug_d3dresourcetype(desc->resource_type)); + hr = WINED3DERR_INVALIDCALL; + break; } - if (FAILED(hr = texture_init(object, desc, level_count, surface_flags, device, parent, parent_ops))) + if (FAILED(hr)) { WARN("Failed to initialize texture, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *texture = NULL; - return hr; - } - - TRACE("Created texture %p.\n", object); - *texture = object; - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_texture_create_3d(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT level_count, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) -{ - struct wined3d_texture *object; - HRESULT hr; - - TRACE("device %p, desc %p, level_count %u, parent %p, parent_ops %p, texture %p.\n", - device, desc, level_count, parent, parent_ops, texture); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *texture = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } - - if (FAILED(hr = volumetexture_init(object, desc, level_count, device, parent, parent_ops))) - { - WARN("Failed to initialize volumetexture, returning %#x\n", hr); - HeapFree(GetProcessHeap(), 0, object); - *texture = NULL; - return hr; - } - - TRACE("Created texture %p.\n", object); - *texture = object; - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_texture_create_cube(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT level_count, DWORD surface_flags, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_texture **texture) -{ - struct wined3d_texture *object; - HRESULT hr; - - TRACE("device %p, desc %p, level_count %u, surface_flags %#x, parent %p, parent_ops %p, texture %p.\n", - device, desc, level_count, surface_flags, parent, parent_ops, texture); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *texture = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } - - if (FAILED(hr = cubetexture_init(object, desc, level_count, surface_flags, device, parent, parent_ops))) - { - WARN("Failed to initialize cubetexture, returning %#x\n", hr); - HeapFree(GetProcessHeap(), 0, object); - *texture = NULL; return hr; } diff --git a/reactos/dll/directx/wine/wined3d/utils.c b/reactos/dll/directx/wine/wined3d/utils.c index 52580dcf545..a0df9aec991 100644 --- a/reactos/dll/directx/wine/wined3d/utils.c +++ b/reactos/dll/directx/wine/wined3d/utils.c @@ -186,18 +186,19 @@ struct wined3d_format_block_info UINT block_width; UINT block_height; UINT block_byte_count; + BOOL verify; }; static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8}, - {WINED3DFMT_DXT2, 4, 4, 16}, - {WINED3DFMT_DXT3, 4, 4, 16}, - {WINED3DFMT_DXT4, 4, 4, 16}, - {WINED3DFMT_DXT5, 4, 4, 16}, - {WINED3DFMT_ATI2N, 4, 4, 16}, - {WINED3DFMT_YUY2, 2, 1, 4}, - {WINED3DFMT_UYVY, 2, 1, 4}, + {WINED3DFMT_DXT1, 4, 4, 8, TRUE}, + {WINED3DFMT_DXT2, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, + {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, + {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, + {WINED3DFMT_UYVY, 2, 1, 4, FALSE}, }; struct wined3d_format_vertex_info @@ -247,117 +248,136 @@ struct wined3d_format_texture_info unsigned int conv_byte_count; unsigned int flags; enum wined3d_gl_extension extension; - void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); + void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth); }; -static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { /* WINED3DFMT_L4A4_UNORM exists as an internal gl format, but for some reason there is not * format+type combination to load it. Thus convert it to A8L8, then load it * with A4L4 internal, but A8L8 format+type */ - unsigned int x, y; + unsigned int x, y, z; const unsigned char *Source; unsigned char *Dest; - UINT outpitch = pitch * 2; - for(y = 0; y < height; y++) { - Source = src + y * pitch; - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) { - unsigned char color = (*Source++); - /* A */ Dest[1] = (color & 0xf0) << 0; - /* L */ Dest[0] = (color & 0x0f) << 4; - Dest += 2; + for (z = 0; z < depth; z++) + { + for (y = 0; y < height; y++) + { + Source = src + z * src_slice_pitch + y * src_row_pitch; + Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + unsigned char color = (*Source++); + /* A */ Dest[1] = (color & 0xf0) << 0; + /* L */ Dest[0] = (color & 0x0f) << 4; + Dest += 2; + } } } } -static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const WORD *Source; - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - unsigned short *Dest_s = (unsigned short *) (dst + y * pitch); - Source = (const WORD *)(src + y * pitch); - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - short v = ((color >> 5) & 0x3e); - short u = ((color ) & 0x1f); - short v_conv = v + 16; - short u_conv = u + 16; + unsigned short *Dest_s = (unsigned short *) (dst + z * dst_slice_pitch + y * dst_row_pitch); + Source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); + for (x = 0; x < width; x++ ) + { + short color = (*Source++); + unsigned char l = ((color >> 10) & 0xfc); + short v = ((color >> 5) & 0x3e); + short u = ((color ) & 0x1f); + short v_conv = v + 16; + short u_conv = u + 16; - *Dest_s = ((v_conv << 11) & 0xf800) | ((l << 5) & 0x7e0) | (u_conv & 0x1f); - Dest_s += 1; + *Dest_s = ((v_conv << 11) & 0xf800) | ((l << 5) & 0x7e0) | (u_conv & 0x1f); + Dest_s += 1; + } } } } -static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const WORD *Source; unsigned char *Dest; - UINT outpitch = (pitch * 3)/2; /* This makes the gl surface bigger(24 bit instead of 16), but it works with * fixed function and shaders without further conversion once the surface is * loaded */ - for(y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - char v = ((color >> 5) & 0x3e); - char u = ((color ) & 0x1f); + for (z = 0; z < depth; z++) + { + for (y = 0; y < height; y++) + { + Source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + short color = (*Source++); + unsigned char l = ((color >> 10) & 0xfc); + char v = ((color >> 5) & 0x3e); + char u = ((color ) & 0x1f); - /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign - * and doubles the positive range. Thus shift left only once, gl does the 2nd - * shift. GL reads a signed value and converts it into an unsigned value. - */ - /* M */ Dest[2] = l << 1; + /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign + * and doubles the positive range. Thus shift left only once, gl does the 2nd + * shift. GL reads a signed value and converts it into an unsigned value. + */ + /* M */ Dest[2] = l << 1; - /* Those are read as signed, but kept signed. Just left-shift 3 times to scale - * from 5 bit values to 8 bit values. - */ - /* V */ Dest[1] = v << 3; - /* U */ Dest[0] = u << 3; - Dest += 3; + /* Those are read as signed, but kept signed. Just left-shift 3 times to scale + * from 5 bit values to 8 bit values. + */ + /* V */ Dest[1] = v << 3; + /* U */ Dest[0] = u << 3; + Dest += 3; + } } } } -static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const short *Source; unsigned char *Dest; - UINT outpitch = (pitch * 3)/2; - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - Source = (const short *)(src + y * pitch); - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - const short color = (*Source++); - /* B */ Dest[0] = 0xff; - /* G */ Dest[1] = (color >> 8) + 128; /* V */ - /* R */ Dest[2] = (color & 0xff) + 128; /* U */ - Dest += 3; + Source = (const short *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + const short color = (*Source++); + /* B */ Dest[0] = 0xff; + /* G */ Dest[1] = (color >> 8) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + Dest += 3; + } } } } -static void convert_r8g8_snorm_l8x8_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r8g8_snorm_l8x8_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const DWORD *Source; unsigned char *Dest; @@ -365,193 +385,222 @@ static void convert_r8g8_snorm_l8x8_unorm(const BYTE *src, BYTE *dst, UINT pitch * shaders if the shader is adjusted. (There's no use for this format in gl's * standard fixed function pipeline anyway). */ - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - Source = (const DWORD *)(src + y * pitch); - Dest = dst + y * pitch; - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - LONG color = (*Source++); - /* B */ Dest[0] = ((color >> 16) & 0xff); /* L */ - /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ - /* R */ Dest[2] = (color & 0xff) + 128; /* U */ - Dest += 4; + Source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + LONG color = (*Source++); + /* B */ Dest[0] = ((color >> 16) & 0xff); /* L */ + /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + Dest += 4; + } } } } -static void convert_r8g8_snorm_l8x8_unorm_nv(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r8g8_snorm_l8x8_unorm_nv(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const DWORD *Source; unsigned char *Dest; /* This implementation works with the fixed function pipeline and shaders * without further modification after converting the surface. */ - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - Source = (const DWORD *)(src + y * pitch); - Dest = dst + y * pitch; - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - LONG color = (*Source++); - /* L */ Dest[2] = ((color >> 16) & 0xff); /* L */ - /* V */ Dest[1] = ((color >> 8 ) & 0xff); /* V */ - /* U */ Dest[0] = (color & 0xff); /* U */ - /* I */ Dest[3] = 255; /* X */ - Dest += 4; + Source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + LONG color = (*Source++); + /* L */ Dest[2] = ((color >> 16) & 0xff); /* L */ + /* V */ Dest[1] = ((color >> 8 ) & 0xff); /* V */ + /* U */ Dest[0] = (color & 0xff); /* U */ + /* I */ Dest[3] = 255; /* X */ + Dest += 4; + } } } } -static void convert_r8g8b8a8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r8g8b8a8_snorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const DWORD *Source; unsigned char *Dest; - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - Source = (const DWORD *)(src + y * pitch); - Dest = dst + y * pitch; - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - LONG color = (*Source++); - /* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */ - /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ - /* R */ Dest[2] = (color & 0xff) + 128; /* U */ - /* A */ Dest[3] = ((color >> 24) & 0xff) + 128; /* Q */ - Dest += 4; + Source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + LONG color = (*Source++); + /* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */ + /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + /* A */ Dest[3] = ((color >> 24) & 0xff) + 128; /* Q */ + Dest += 4; + } } } } -static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const DWORD *Source; unsigned short *Dest; - UINT outpitch = (pitch * 3)/2; - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - Source = (const DWORD *)(src + y * pitch); - Dest = (unsigned short *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - const DWORD color = (*Source++); - /* B */ Dest[0] = 0xffff; - /* G */ Dest[1] = (color >> 16) + 32768; /* V */ - /* R */ Dest[2] = (color & 0xffff) + 32768; /* U */ - Dest += 3; + Source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = (unsigned short *) (dst + z * dst_slice_pitch + y * dst_row_pitch); + for (x = 0; x < width; x++ ) + { + const DWORD color = (*Source++); + /* B */ Dest[0] = 0xffff; + /* G */ Dest[1] = (color >> 16) + 32768; /* V */ + /* R */ Dest[2] = (color & 0xffff) + 32768; /* U */ + Dest += 3; + } } } } -static void convert_r16g16(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r16g16(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const WORD *Source; WORD *Dest; - UINT outpitch = (pitch * 3)/2; - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - WORD green = (*Source++); - WORD red = (*Source++); - Dest[0] = green; - Dest[1] = red; - /* Strictly speaking not correct for R16G16F, but it doesn't matter because the - * shader overwrites it anyway - */ - Dest[2] = 0xffff; - Dest += 3; + Source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = (WORD *) (dst + z * dst_slice_pitch + y * dst_row_pitch); + for (x = 0; x < width; x++ ) + { + WORD green = (*Source++); + WORD red = (*Source++); + Dest[0] = green; + Dest[1] = red; + /* Strictly speaking not correct for R16G16F, but it doesn't matter because the + * shader overwrites it anyway */ + Dest[2] = 0xffff; + Dest += 3; + } } } } -static void convert_r32g32_float(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_r32g32_float(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; const float *Source; float *Dest; - UINT outpitch = (pitch * 3)/2; - for(y = 0; y < height; y++) + for (z = 0; z < depth; z++) { - Source = (const float *)(src + y * pitch); - Dest = (float *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) + for (y = 0; y < height; y++) { - float green = (*Source++); - float red = (*Source++); - Dest[0] = green; - Dest[1] = red; - Dest[2] = 1.0f; - Dest += 3; + Source = (const float *)(src + z * src_slice_pitch + y * src_row_pitch); + Dest = (float *) (dst + z * dst_slice_pitch + y * dst_row_pitch); + for (x = 0; x < width; x++ ) + { + float green = (*Source++); + float red = (*Source++); + Dest[0] = green; + Dest[1] = red; + Dest[2] = 1.0f; + Dest += 3; + } } } } -static void convert_s1_uint_d15_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_s1_uint_d15_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; - UINT outpitch = pitch * 2; + unsigned int x, y, z; - for (y = 0; y < height; ++y) + for (z = 0; z < depth; z++) { - const WORD *source = (const WORD *)(src + y * pitch); - DWORD *dest = (DWORD *)(dst + y * outpitch); - - for (x = 0; x < width; ++x) + for (y = 0; y < height; ++y) { - /* The depth data is normalized, so needs to be scaled, - * the stencil data isn't. Scale depth data by - * (2^24-1)/(2^15-1) ~~ (2^9 + 2^-6). */ - WORD d15 = source[x] >> 1; - DWORD d24 = (d15 << 9) + (d15 >> 6); - dest[x] = (d24 << 8) | (source[x] & 0x1); + const WORD *source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); + DWORD *dest = (DWORD *)(dst + z * dst_slice_pitch + y * dst_row_pitch); + + for (x = 0; x < width; ++x) + { + /* The depth data is normalized, so needs to be scaled, + * the stencil data isn't. Scale depth data by + * (2^24-1)/(2^15-1) ~~ (2^9 + 2^-6). */ + WORD d15 = source[x] >> 1; + DWORD d24 = (d15 << 9) + (d15 >> 6); + dest[x] = (d24 << 8) | (source[x] & 0x1); + } } } } -static void convert_s4x4_uint_d24_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_s4x4_uint_d24_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; + unsigned int x, y, z; - for (y = 0; y < height; ++y) + for (z = 0; z < depth; z++) { - const DWORD *source = (const DWORD *)(src + y * pitch); - DWORD *dest = (DWORD *)(dst + y * pitch); - - for (x = 0; x < width; ++x) + for (y = 0; y < height; ++y) { - /* Just need to clear out the X4 part. */ - dest[x] = source[x] & ~0xf0; + const DWORD *source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + DWORD *dest = (DWORD *)(dst + z * dst_slice_pitch + y * dst_row_pitch); + + for (x = 0; x < width; ++x) + { + /* Just need to clear out the X4 part. */ + dest[x] = source[x] & ~0xf0; + } } } } -static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { - unsigned int x, y; - UINT outpitch = pitch * 2; + unsigned int x, y, z; - for (y = 0; y < height; ++y) + for (z = 0; z < depth; z++) { - const DWORD *source = (const DWORD *)(src + y * pitch); - float *dest_f = (float *)(dst + y * outpitch); - DWORD *dest_s = (DWORD *)(dst + y * outpitch); - - for (x = 0; x < width; ++x) + for (y = 0; y < height; ++y) { - dest_f[x * 2] = float_24_to_32((source[x] & 0xffffff00) >> 8); - dest_s[x * 2 + 1] = source[x] & 0xff; + const DWORD *source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + float *dest_f = (float *)(dst + z * dst_slice_pitch + y * dst_row_pitch); + DWORD *dest_s = (DWORD *)dest_f; + + for (x = 0; x < width; ++x) + { + dest_f[x * 2] = float_24_to_32((source[x] & 0xffffff00) >> 8); + dest_s[x * 2 + 1] = source[x] & 0xff; + } } } } @@ -738,7 +787,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8B8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, @@ -830,10 +880,18 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, /* Depth stencil formats */ + {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, + {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, @@ -865,6 +923,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, NULL}, + {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -882,6 +944,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, convert_s4x4_uint_d24_unorm}, + {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -1018,6 +1084,8 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) format->block_height = format_block_info[i].block_height; format->block_byte_count = format_block_info[i].block_byte_count; format->flags |= WINED3DFMT_FLAG_BLOCKS; + if (!format_block_info[i].verify) + format->flags |= WINED3DFMT_FLAG_BLOCKS_NO_VERIFY; } return TRUE; @@ -2553,6 +2621,21 @@ const char *debug_d3dtstype(enum wined3d_transform_state tstype) } } +static const char *debug_shader_type(enum wined3d_shader_type type) +{ + switch(type) + { +#define WINED3D_TO_STR(type) case type: return #type + WINED3D_TO_STR(WINED3D_SHADER_TYPE_PIXEL); + WINED3D_TO_STR(WINED3D_SHADER_TYPE_VERTEX); + WINED3D_TO_STR(WINED3D_SHADER_TYPE_GEOMETRY); +#undef WINED3D_TO_STR + default: + FIXME("Unrecognized shader type %#x.\n", type); + return "unrecognized"; + } +} + const char *debug_d3dstate(DWORD state) { if (STATE_IS_RENDER(state)) @@ -2566,8 +2649,8 @@ const char *debug_d3dstate(DWORD state) } if (STATE_IS_SAMPLER(state)) return wine_dbg_sprintf("STATE_SAMPLER(%#x)", state - STATE_SAMPLER(0)); - if (STATE_IS_PIXELSHADER(state)) - return "STATE_PIXELSHADER"; + if (STATE_IS_SHADER(state)) + return wine_dbg_sprintf("STATE_SHADER(%s)", debug_shader_type(state - STATE_SHADER(0))); if (STATE_IS_TRANSFORM(state)) return wine_dbg_sprintf("STATE_TRANSFORM(%s)", debug_d3dtstype(state - STATE_TRANSFORM(0))); if (STATE_IS_STREAMSRC(state)) @@ -2576,10 +2659,6 @@ const char *debug_d3dstate(DWORD state) return "STATE_INDEXBUFFER"; if (STATE_IS_VDECL(state)) return "STATE_VDECL"; - if (STATE_IS_VSHADER(state)) - return "STATE_VSHADER"; - if (STATE_IS_GEOMETRY_SHADER(state)) - return "STATE_GEOMETRY_SHADER"; if (STATE_IS_VIEWPORT(state)) return "STATE_VIEWPORT"; if (STATE_IS_LIGHT_TYPE(state)) @@ -2710,19 +2789,6 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) TRACE("\tW: %s%s\n", debug_fixup_channel_source(fixup.w_source), fixup.w_sign_fixup ? ", SIGN_FIXUP" : ""); } -const char *debug_surflocation(DWORD flag) { - char buf[128]; - - buf[0] = 0; - if (flag & SFLAG_INSYSMEM) strcat(buf, " | SFLAG_INSYSMEM"); /* 17 */ - if (flag & SFLAG_INDRAWABLE) strcat(buf, " | SFLAG_INDRAWABLE"); /* 19 */ - if (flag & SFLAG_INTEXTURE) strcat(buf, " | SFLAG_INTEXTURE"); /* 18 */ - if (flag & SFLAG_INSRGBTEX) strcat(buf, " | SFLAG_INSRGBTEX"); /* 18 */ - if (flag & SFLAG_INRB_MULTISAMPLE) strcat(buf, " | SFLAG_INRB_MULTISAMPLE"); /* 25 */ - if (flag & SFLAG_INRB_RESOLVED) strcat(buf, " | SFLAG_INRB_RESOLVED"); /* 22 */ - return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0"); -} - BOOL is_invalid_op(const struct wined3d_state *state, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3) { @@ -3240,9 +3306,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) { - struct wined3d_surface *surf = surface_from_resource(texture->sub_resources[0]); - - if (surf->CKeyFlags & WINEDDSD_CKSRCBLT && !surf->resource.format->alpha_size) + if (texture->color_key_flags & WINEDDSD_CKSRCBLT && !texture->resource.format->alpha_size) { if (aop == WINED3D_TOP_DISABLE) { @@ -3489,14 +3553,14 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st void sampler_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD sampler = state_id - STATE_SAMPLER(0); - DWORD mapped_stage = context->swapchain->device->texUnitMap[sampler]; + DWORD mapped_stage = context->tex_unit_map[sampler]; /* No need to enable / disable anything here for unused samplers. The * tex_colorop handler takes care. Also no action is needed with pixel * shaders, or if tex_colorop will take care of this business. */ if (mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= context->gl_info->limits.textures) return; - if (sampler >= state->lowest_disabled_stage) + if (sampler >= context->lowest_disabled_stage) return; if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) return; @@ -3707,17 +3771,53 @@ void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) const char *wined3d_debug_location(DWORD location) { - char buf[200]; + char buf[294]; buf[0] = '\0'; #define LOCATION_TO_STR(u) if (location & u) { strcat(buf, " | "#u); location &= ~u; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM); + LOCATION_TO_STR(WINED3D_LOCATION_USER_MEMORY); + LOCATION_TO_STR(WINED3D_LOCATION_DIB); LOCATION_TO_STR(WINED3D_LOCATION_BUFFER); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_RGB); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_SRGB); + LOCATION_TO_STR(WINED3D_LOCATION_DRAWABLE); + LOCATION_TO_STR(WINED3D_LOCATION_RB_MULTISAMPLE); + LOCATION_TO_STR(WINED3D_LOCATION_RB_RESOLVED); #undef LOCATION_TO_STR if (location) FIXME("Unrecognized location flag(s) %#x.\n", location); return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } + +/* Print a floating point value with the %.8e format specifier, always using + * '.' as decimal separator. */ +void wined3d_ftoa(float value, char *s) +{ + int idx = 1; + + if (copysignf(1.0f, value) < 0.0f) + ++idx; + + /* Be sure to allocate a buffer of at least 17 characters for the result + as sprintf may return a 3 digit exponent when using the MSVC runtime + instead of a 2 digit exponent. */ + sprintf(s, "%.8e", value); + if (isfinite(value)) + s[idx] = '.'; +} + +void wined3d_release_dc(HWND window, HDC dc) +{ + /* You'd figure ReleaseDC() would fail if the DC doesn't match the window. + * However, that's not what actually happens, and there are user32 tests + * that confirm ReleaseDC() with the wrong window is supposed to succeed. + * So explicitly check that the DC belongs to the window, since we want to + * avoid releasing a DC that belongs to some other window if the original + * window was already destroyed. */ + if (WindowFromDC(dc) != window) + WARN("DC %p does not belong to window %p.\n", dc, window); + else if (!ReleaseDC(window, dc)) + ERR("Failed to release device context %p, last error %#x.\n", dc, GetLastError()); +} diff --git a/reactos/dll/directx/wine/wined3d/volume.c b/reactos/dll/directx/wine/wined3d/volume.c index df8e5e49b4b..bd0420066ce 100644 --- a/reactos/dll/directx/wine/wined3d/volume.c +++ b/reactos/dll/directx/wine/wined3d/volume.c @@ -25,29 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -/* Context activation is done by the caller. */ -static void volume_bind_and_dirtify(const struct wined3d_volume *volume, - struct wined3d_context *context, BOOL srgb) -{ - struct wined3d_texture *container = volume->container; - DWORD active_sampler; - - /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. - * Read the unit back instead of switching to 0, this avoids messing around with the state manager's - * gl states. The current texture unit should always be a valid one. - * - * To be more specific, this is tricky because we can implicitly be called - * from sampler() in state.c. This means we can't touch anything other than - * whatever happens to be the currently active texture, or we would risk - * marking already applied sampler states dirty again. */ - active_sampler = volume->resource.device->rev_tex_unit_map[context->active_texture]; - - if (active_sampler != WINED3D_UNMAPPED_STAGE) - device_invalidate_state(volume->resource.device, STATE_SAMPLER(active_sampler)); - - container->texture_ops->texture_bind(container, context, srgb); -} - void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) { TRACE("volume %p, container %p.\n", volume, container); @@ -55,18 +32,73 @@ void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture volume->container = container; } +static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) +{ + if (volume->resource.heap_memory) + return TRUE; + + if (!wined3d_resource_allocate_sysmem(&volume->resource)) + { + ERR("Failed to allocate system memory.\n"); + return FALSE; + } + return TRUE; +} + /* Context activation is done by the caller. */ -static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, +static void wined3d_volume_allocate_texture(struct wined3d_volume *volume, const struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + void *mem = NULL; + + if (gl_info->supported[APPLE_CLIENT_STORAGE] && !format->convert + && volume_prepare_system_memory(volume)) + { + TRACE("Enabling GL_UNPACK_CLIENT_STORAGE_APPLE for volume %p\n", volume); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + mem = volume->resource.heap_memory; + volume->flags |= WINED3D_VFLAG_CLIENT_STORAGE; + } GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal, volume->resource.width, volume->resource.height, volume->resource.depth, - 0, format->glFormat, format->glType, NULL)); + 0, format->glFormat, format->glType, mem)); checkGLcall("glTexImage3D"); + + if (mem) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } +} + +static void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, + UINT *slice_pitch) +{ + const struct wined3d_format *format = volume->resource.format; + + if (format->flags & WINED3DFMT_FLAG_BLOCKS) + { + /* Since compressed formats are block based, pitch means the amount of + * bytes to the next row of block rather than the next row of pixels. */ + UINT row_block_count = (volume->resource.width + format->block_width - 1) / format->block_width; + UINT slice_block_count = (volume->resource.height + format->block_height - 1) / format->block_height; + *row_pitch = row_block_count * format->block_byte_count; + *slice_pitch = *row_pitch * slice_block_count; + } + else + { + unsigned char alignment = volume->resource.device->surface_alignment; + *row_pitch = format->byte_count * volume->resource.width; /* Bytes / row */ + *row_pitch = (*row_pitch + alignment - 1) & ~(alignment - 1); + *slice_pitch = *row_pitch * volume->resource.height; + } + + TRACE("Returning row pitch %u, slice pitch %u.\n", *row_pitch, *slice_pitch); } /* Context activation is done by the caller. */ @@ -75,11 +107,36 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + UINT width = volume->resource.width; + UINT height = volume->resource.height; + UINT depth = volume->resource.depth; + BYTE *mem = data->addr; TRACE("volume %p, context %p, level %u, format %s (%#x).\n", volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + if (format->convert) + { + UINT dst_row_pitch, dst_slice_pitch; + UINT src_row_pitch, src_slice_pitch; + UINT alignment = volume->resource.device->surface_alignment; + + if (data->buffer_object) + ERR("Loading a converted volume from a PBO.\n"); + if (format->flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); + + dst_row_pitch = width * format->conv_byte_count; + dst_row_pitch = (dst_row_pitch + alignment - 1) & ~(alignment - 1); + dst_slice_pitch = dst_row_pitch * height; + + wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch); + + mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); + format->convert(data->addr, mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, width, height, depth); + } if (data->buffer_object) { @@ -88,8 +145,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine } GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, - volume->resource.width, volume->resource.height, volume->resource.depth, - format->glFormat, format->glType, data->addr)); + width, height, depth, + format->glFormat, format->glType, mem)); checkGLcall("glTexSubImage3D"); if (data->buffer_object) @@ -97,6 +154,9 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); } + + if (mem != data->addr) + HeapFree(GetProcessHeap(), 0, mem); } static void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD location) @@ -120,6 +180,13 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + if (format->convert) + { + FIXME("Attempting to download a converted volume, format %s.\n", + debug_d3dformat(format->id)); + return; + } + if (data->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data->buffer_object)); @@ -140,9 +207,7 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; - volume->resource.allocatedMemory = NULL; + wined3d_resource_free_sysmem(&volume->resource); wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); } @@ -176,7 +241,7 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, * implementing EXT_SRGB_DECODE in the driver or finding out why we * picked the wrong copy for the original upload and fixing that. * - * Also keep in mind that we want to avoid using resource.allocatedMemory + * Also keep in mind that we want to avoid using resource.heap_memory * for DEFAULT pool surfaces. */ WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); @@ -185,14 +250,27 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, if (!data.addr) return; - volume_bind_and_dirtify(volume, context, !dest_is_srgb); + wined3d_texture_bind_and_dirtify(volume->container, context, !dest_is_srgb); wined3d_volume_download_data(volume, context, &data); - volume_bind_and_dirtify(volume, context, dest_is_srgb); + wined3d_texture_bind_and_dirtify(volume->container, context, dest_is_srgb); wined3d_volume_upload_data(volume, context, &data); HeapFree(GetProcessHeap(), 0, data.addr); } +static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) +{ + if (volume->resource.pool != WINED3D_POOL_MANAGED) + return FALSE; + if (volume->download_count >= 10) + return FALSE; + if (volume->resource.format->convert) + return FALSE; + if (volume->flags & WINED3D_VFLAG_CLIENT_STORAGE) + return FALSE; + + return TRUE; +} /* Context activation is done by the caller. */ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) @@ -232,7 +310,7 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, } else if (volume->locations & WINED3D_LOCATION_SYSMEM) { - struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; + struct wined3d_bo_address data = {0, volume->resource.heap_memory}; wined3d_volume_upload_data(volume, context, &data); } else if (volume->locations & WINED3D_LOCATION_BUFFER) @@ -255,17 +333,14 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, } wined3d_volume_validate_location(volume, location); - if (volume->resource.pool == WINED3D_POOL_MANAGED && volume->download_count < 10) + if (wined3d_volume_can_evict(volume)) wined3d_volume_evict_sysmem(volume); break; case WINED3D_LOCATION_SYSMEM: - if (!volume->resource.allocatedMemory || !volume->resource.heap_memory) - { + if (!volume->resource.heap_memory) ERR("Trying to load WINED3D_LOCATION_SYSMEM without setting it up first.\n"); - return; - } if (volume->locations & WINED3D_LOCATION_DISCARDED) { @@ -274,12 +349,12 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, } else if (volume->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; + struct wined3d_bo_address data = {0, volume->resource.heap_memory}; if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB) - volume_bind_and_dirtify(volume, context, FALSE); + wined3d_texture_bind_and_dirtify(volume->container, context, FALSE); else - volume_bind_and_dirtify(volume, context, TRUE); + wined3d_texture_bind_and_dirtify(volume->container, context, TRUE); volume->download_count++; wined3d_volume_download_data(volume, context, &data); @@ -307,9 +382,9 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_bo_address data = {volume->pbo, NULL}; if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB) - volume_bind_and_dirtify(volume, context, FALSE); + wined3d_texture_bind_and_dirtify(volume->container, context, FALSE); else - volume_bind_and_dirtify(volume, context, TRUE); + wined3d_texture_bind_and_dirtify(volume->container, context, TRUE); wined3d_volume_download_data(volume, context, &data); } @@ -331,7 +406,7 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, /* Context activation is done by the caller. */ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) { - volume_bind_and_dirtify(volume, context, srgb_mode); + wined3d_texture_bind_and_dirtify(volume->container, context, srgb_mode); if (srgb_mode) { @@ -384,19 +459,6 @@ static void wined3d_volume_free_pbo(struct wined3d_volume *volume) context_release(context); } -static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) -{ - if (volume->resource.allocatedMemory) - return TRUE; - - volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size); - if (!volume->resource.heap_memory) - return FALSE; - volume->resource.allocatedMemory = volume->resource.heap_memory; - return TRUE; -} - - static void volume_unload(struct wined3d_resource *resource) { struct wined3d_volume *volume = volume_from_resource(resource); @@ -432,7 +494,8 @@ static void volume_unload(struct wined3d_resource *resource) } /* The texture name is managed by the container. */ - volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED); + volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED + | WINED3D_VFLAG_CLIENT_STORAGE); resource_unload(resource); } @@ -454,7 +517,6 @@ ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) return refcount; } -/* Do not call while under the GL lock. */ ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) { ULONG refcount; @@ -499,7 +561,6 @@ DWORD CDECL wined3d_volume_get_priority(const struct wined3d_volume *volume) return resource_get_priority(&volume->resource); } -/* Do not call while under the GL lock. */ void CDECL wined3d_volume_preload(struct wined3d_volume *volume) { FIXME("volume %p stub!\n", volume); @@ -512,6 +573,56 @@ struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volum return &volume->resource; } +static BOOL volume_check_block_align(const struct wined3d_volume *volume, + const struct wined3d_box *box) +{ + UINT width_mask, height_mask; + const struct wined3d_format *format = volume->resource.format; + + if (!box) + return TRUE; + + /* This assumes power of two block sizes, but NPOT block sizes would be + * silly anyway. + * + * This also assumes that the format's block depth is 1. */ + width_mask = format->block_width - 1; + height_mask = format->block_height - 1; + + if (box->left & width_mask) + return FALSE; + if (box->top & height_mask) + return FALSE; + if (box->right & width_mask && box->right != volume->resource.width) + return FALSE; + if (box->bottom & height_mask && box->bottom != volume->resource.height) + return FALSE; + + return TRUE; +} + +static BOOL wined3d_volume_check_box_dimensions(const struct wined3d_volume *volume, + const struct wined3d_box *box) +{ + if (!box) + return TRUE; + + if (box->left >= box->right) + return FALSE; + if (box->top >= box->bottom) + return FALSE; + if (box->front >= box->back) + return FALSE; + if (box->right > volume->resource.width) + return FALSE; + if (box->bottom > volume->resource.height) + return FALSE; + if (box->back > volume->resource.depth) + return FALSE; + + return TRUE; +} + HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { @@ -519,16 +630,34 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_context *context; const struct wined3d_gl_info *gl_info; BYTE *base_memory; + const struct wined3d_format *format = volume->resource.format; TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); + map_desc->data = NULL; if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) { WARN("Volume %p is not CPU accessible.\n", volume); - map_desc->data = NULL; return WINED3DERR_INVALIDCALL; } + if (volume->resource.map_count) + { + WARN("Volume is already mapped.\n"); + return WINED3DERR_INVALIDCALL; + } + if (!wined3d_volume_check_box_dimensions(volume, box)) + { + WARN("Map box is invalid.\n"); + return WINED3DERR_INVALIDCALL; + } + if ((format->flags & WINED3DFMT_FLAG_BLOCKS) && !volume_check_block_align(volume, box)) + { + WARN("Map box is misaligned for %ux%u blocks.\n", + format->block_width, format->block_height); + return WINED3DERR_INVALIDCALL; + } + flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags); if (volume->flags & WINED3D_VFLAG_PBO) @@ -553,7 +682,8 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, } else { - base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + GLenum access = wined3d_resource_gl_legacy_map_flags(flags); + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, access)); } GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); @@ -580,14 +710,21 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); context_release(context); } - base_memory = volume->resource.allocatedMemory; + base_memory = volume->resource.heap_memory; } TRACE("Base memory pointer %p.\n", base_memory); - map_desc->row_pitch = volume->resource.format->byte_count * volume->resource.width; /* Bytes / row */ - map_desc->slice_pitch = volume->resource.format->byte_count - * volume->resource.width * volume->resource.height; /* Bytes / slice */ + if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) + { + map_desc->row_pitch = volume->resource.width * format->byte_count; + map_desc->slice_pitch = map_desc->row_pitch * volume->resource.height; + } + else + { + wined3d_volume_get_pitch(volume, &map_desc->row_pitch, &map_desc->slice_pitch); + } + if (!box) { TRACE("No box supplied - all is ok\n"); @@ -597,15 +734,28 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, { TRACE("Lock Box (%p) = l %u, t %u, r %u, b %u, fr %u, ba %u\n", box, box->left, box->top, box->right, box->bottom, box->front, box->back); - map_desc->data = base_memory - + (map_desc->slice_pitch * box->front) /* FIXME: is front < back or vica versa? */ - + (map_desc->row_pitch * box->top) - + (box->left * volume->resource.format->byte_count); + + if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) + { + /* Compressed textures are block based, so calculate the offset of + * the block that contains the top-left pixel of the locked rectangle. */ + map_desc->data = base_memory + + (box->front * map_desc->slice_pitch) + + ((box->top / format->block_height) * map_desc->row_pitch) + + ((box->left / format->block_width) * format->block_byte_count); + } + else + { + map_desc->data = base_memory + + (map_desc->slice_pitch * box->front) + + (map_desc->row_pitch * box->top) + + (box->left * volume->resource.format->byte_count); + } } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) { - wined3d_texture_set_dirty(volume->container, TRUE); + wined3d_texture_set_dirty(volume->container); if (volume->flags & WINED3D_VFLAG_PBO) wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_BUFFER); @@ -613,7 +763,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM); } - volume->flags |= WINED3D_VFLAG_LOCKED; + volume->resource.map_count++; TRACE("Returning memory %p, row pitch %d, slice pitch %d.\n", map_desc->data, map_desc->row_pitch, map_desc->slice_pitch); @@ -630,9 +780,9 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (!(volume->flags & WINED3D_VFLAG_LOCKED)) + if (!volume->resource.map_count) { - WARN("Trying to unlock unlocked volume %p.\n", volume); + WARN("Trying to unlock an unlocked volume %p.\n", volume); return WINED3DERR_INVALIDCALL; } @@ -650,7 +800,7 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) context_release(context); } - volume->flags &= ~WINED3D_VFLAG_LOCKED; + volume->resource.map_count--; return WINED3D_OK; } @@ -660,12 +810,12 @@ static const struct wined3d_resource_ops volume_resource_ops = volume_unload, }; -static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device *device, UINT width, - UINT height, UINT depth, UINT level, DWORD usage, enum wined3d_format_id format_id, - enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, UINT level) { + struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); + const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); HRESULT hr; UINT size; @@ -676,19 +826,18 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device } /* TODO: Write tests for other resources and move this check * to resource_init, if applicable. */ - if (usage & WINED3DUSAGE_DYNAMIC - && (pool == WINED3D_POOL_MANAGED || pool == WINED3D_POOL_SCRATCH)) + if (desc->usage & WINED3DUSAGE_DYNAMIC + && (desc->pool == WINED3D_POOL_MANAGED || desc->pool == WINED3D_POOL_SCRATCH)) { - WARN("Attempted to create a DYNAMIC texture in pool %u.\n", pool); + WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); return WINED3DERR_INVALIDCALL; } - size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth); + size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, desc->depth); - hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format, - WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, - size, parent, parent_ops, &volume_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->pool, desc->width, desc->height, desc->depth, + size, NULL, &wined3d_null_parent_ops, &volume_resource_ops))) { WARN("Failed to initialize resource, returning %#x.\n", hr); return hr; @@ -697,46 +846,56 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device volume->texture_level = level; volume->locations = WINED3D_LOCATION_DISCARDED; - if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC - && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) + if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !format->convert) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; - volume->resource.allocatedMemory = NULL; + wined3d_resource_free_sysmem(&volume->resource); volume->flags |= WINED3D_VFLAG_PBO; } + volume_set_container(volume, container); + return WINED3D_OK; } -HRESULT CDECL wined3d_volume_create(struct wined3d_device *device, UINT width, UINT height, - UINT depth, UINT level, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_volume **volume) +HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + unsigned int level, struct wined3d_volume **volume) { + struct wined3d_device_parent *device_parent = container->resource.device->device_parent; + const struct wined3d_parent_ops *parent_ops; struct wined3d_volume *object; + void *parent; HRESULT hr; - TRACE("device %p, width %u, height %u, depth %u, usage %#x, format %s, pool %s\n", - device, width, height, depth, usage, debug_d3dformat(format_id), debug_d3dpool(pool)); - TRACE("parent %p, parent_ops %p, volume %p.\n", parent, parent_ops, volume); + TRACE("container %p, width %u, height %u, depth %u, level %u, format %s, " + "usage %#x, pool %s, volume %p.\n", + container, desc->width, desc->height, desc->depth, level, debug_d3dformat(desc->format), + desc->usage, debug_d3dpool(desc->pool), volume); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *volume = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; - hr = volume_init(object, device, width, height, depth, level, - usage, format_id, pool, parent, parent_ops); - if (FAILED(hr)) + if (FAILED(hr = volume_init(object, container, desc, level))) { WARN("Failed to initialize volume, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - TRACE("Created volume %p.\n", object); + if (FAILED(hr = device_parent->ops->volume_created(device_parent, + wined3d_texture_get_parent(container), object, &parent, &parent_ops))) + { + WARN("Failed to create volume parent, hr %#x.\n", hr); + volume_set_container(object, NULL); + wined3d_volume_decref(object); + return hr; + } + + TRACE("Created volume %p, parent %p, parent_ops %p.\n", object, parent, parent_ops); + + object->resource.parent = parent; + object->resource.parent_ops = parent_ops; *volume = object; return WINED3D_OK; diff --git a/reactos/dll/directx/wine/wined3d/wined3d.spec b/reactos/dll/directx/wine/wined3d/wined3d.spec index f451b7a35ac..3a6dd333081 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d.spec +++ b/reactos/dll/directx/wine/wined3d/wined3d.spec @@ -156,11 +156,9 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) -@ cdecl wined3d_palette_create(ptr long ptr ptr ptr) +@ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) -@ cdecl wined3d_palette_get_flags(ptr) -@ cdecl wined3d_palette_get_parent(ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) @@ -176,6 +174,7 @@ @ cdecl wined3d_resource_get_desc(ptr ptr) @ cdecl wined3d_resource_get_parent(ptr) @ cdecl wined3d_resource_get_private_data(ptr ptr ptr ptr) +@ cdecl wined3d_resource_set_parent(ptr ptr) @ cdecl wined3d_resource_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr) @@ -205,9 +204,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_create(ptr long long long long long long long long ptr ptr ptr) @ cdecl wined3d_surface_decref(ptr) -@ cdecl wined3d_surface_flip(ptr ptr long) @ cdecl wined3d_surface_from_resource(ptr) @ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_flip_status(ptr long) @@ -225,13 +222,11 @@ @ cdecl wined3d_surface_preload(ptr) @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_restore(ptr) -@ cdecl wined3d_surface_set_color_key(ptr long ptr) -@ cdecl wined3d_surface_set_mem(ptr ptr long) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_set_palette(ptr ptr) @ cdecl wined3d_surface_set_priority(ptr long) @ cdecl wined3d_surface_unmap(ptr) -@ cdecl wined3d_surface_update_desc(ptr long long long long long) +@ cdecl wined3d_surface_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) @@ -251,9 +246,7 @@ @ cdecl wined3d_swapchain_set_window(ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) -@ cdecl wined3d_texture_create_2d(ptr ptr long long ptr ptr ptr) -@ cdecl wined3d_texture_create_3d(ptr ptr long ptr ptr ptr) -@ cdecl wined3d_texture_create_cube(ptr ptr long long ptr ptr ptr) +@ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) @ cdecl wined3d_texture_get_autogen_filter_type(ptr) @@ -266,6 +259,7 @@ @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) +@ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_priority(ptr long) @@ -275,7 +269,6 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl wined3d_volume_create(ptr long long long long long long ptr ptr ptr) @ cdecl wined3d_volume_decref(ptr) @ cdecl wined3d_volume_from_resource(ptr) @ cdecl wined3d_volume_get_parent(ptr) diff --git a/reactos/dll/directx/wine/wined3d/wined3d_gl.h b/reactos/dll/directx/wine/wined3d/wined3d_gl.h index 8ad865e4d3c..b357bb180db 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d_gl.h +++ b/reactos/dll/directx/wine/wined3d/wined3d_gl.h @@ -84,6 +84,7 @@ enum wined3d_gl_extension ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, ARB_TEXTURE_MIRRORED_REPEAT, + ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, @@ -126,6 +127,7 @@ enum wined3d_gl_extension EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, + EXT_TEXTURE_MIRROR_CLAMP, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA, diff --git a/reactos/dll/directx/wine/wined3d/wined3d_main.c b/reactos/dll/directx/wine/wined3d/wined3d_main.c index 6eab4aec14f..d290a6f362a 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d_main.c +++ b/reactos/dll/directx/wine/wined3d/wined3d_main.c @@ -85,7 +85,6 @@ struct wined3d_settings wined3d_settings = FALSE, /* 3D support enabled by default. */ }; -/* Do not call while under the GL lock. */ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) { struct wined3d *object; @@ -157,8 +156,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInstDLL; - wc.hIcon = LoadIconA(NULL, (LPCSTR)IDI_WINLOGO); - wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hIcon = LoadIconA(NULL, (const char *)IDI_WINLOGO); + wc.hCursor = LoadCursorA(NULL, (const char *)IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = WINED3D_OPENGL_WINDOW_CLASS_NAME; @@ -505,18 +504,17 @@ void wined3d_unregister_window(HWND window) } /* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("WineD3D DLLMain Reason=%u\n", fdwReason); - - switch (fdwReason) + switch (reason) { case DLL_PROCESS_ATTACH: - return wined3d_dll_init(hInstDLL); + return wined3d_dll_init(inst); case DLL_PROCESS_DETACH: - if (lpv) break; - return wined3d_dll_destroy(hInstDLL); + if (!reserved) + return wined3d_dll_destroy(inst); + break; case DLL_THREAD_DETACH: if (!context_set_current(NULL)) diff --git a/reactos/dll/directx/wine/wined3d/wined3d_private.h b/reactos/dll/directx/wine/wined3d/wined3d_private.h index 17988f76ad7..abfcb7a1dc9 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d_private.h +++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h @@ -551,6 +551,7 @@ enum wined3d_shader_type WINED3D_SHADER_TYPE_PIXEL, WINED3D_SHADER_TYPE_VERTEX, WINED3D_SHADER_TYPE_GEOMETRY, + WINED3D_SHADER_TYPE_COUNT, }; struct wined3d_shader_version @@ -946,7 +947,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; -#define eps 1e-8 +#define eps 1e-8f #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) @@ -963,10 +964,10 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_SAMPLER(num) (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE) + 1 + (num)) #define STATE_IS_SAMPLER(num) ((num) >= STATE_SAMPLER(0) && (num) <= STATE_SAMPLER(MAX_COMBINED_SAMPLERS - 1)) -#define STATE_PIXELSHADER (STATE_SAMPLER(MAX_COMBINED_SAMPLERS - 1) + 1) -#define STATE_IS_PIXELSHADER(a) ((a) == STATE_PIXELSHADER) +#define STATE_SHADER(a) (STATE_SAMPLER(MAX_COMBINED_SAMPLERS) + (a)) +#define STATE_IS_SHADER(a) ((a) >= STATE_SHADER(0) && (a) < STATE_SHADER(WINED3D_SHADER_TYPE_COUNT)) -#define STATE_TRANSFORM(a) (STATE_PIXELSHADER + (a)) +#define STATE_TRANSFORM(a) (STATE_SHADER(WINED3D_SHADER_TYPE_COUNT) + (a) - 1) #define STATE_IS_TRANSFORM(a) ((a) >= STATE_TRANSFORM(1) && (a) <= STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(255))) #define STATE_STREAMSRC (STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(255)) + 1) @@ -977,13 +978,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_VDECL (STATE_INDEXBUFFER + 1) #define STATE_IS_VDECL(a) ((a) == STATE_VDECL) -#define STATE_VSHADER (STATE_VDECL + 1) -#define STATE_IS_VSHADER(a) ((a) == STATE_VSHADER) - -#define STATE_GEOMETRY_SHADER (STATE_VSHADER + 1) -#define STATE_IS_GEOMETRY_SHADER(a) ((a) == STATE_GEOMETRY_SHADER) - -#define STATE_VIEWPORT (STATE_GEOMETRY_SHADER + 1) +#define STATE_VIEWPORT (STATE_VDECL + 1) #define STATE_IS_VIEWPORT(a) ((a) == STATE_VIEWPORT) #define STATE_LIGHT_TYPE (STATE_VIEWPORT + 1) @@ -1092,9 +1087,13 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; - DWORD padding : 1; + DWORD use_immediate_mode_draw : 1; DWORD texShaderBumpMap : 8; /* MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ + DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ + DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ + DWORD rebind_fbo : 1; + DWORD padding : 19; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1105,6 +1104,8 @@ struct wined3d_context DWORD active_texture; DWORD texture_type[MAX_COMBINED_SAMPLERS]; + UINT instance_count; + /* The actual opengl context */ UINT level; HGLRC restore_ctx; @@ -1125,7 +1126,6 @@ struct wined3d_context struct fbo_entry *current_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding; - BOOL rebind_fbo; struct wined3d_surface **blit_targets; GLenum *draw_buffers; DWORD draw_buffers_mask; /* Enabled draw buffers, 31 max. */ @@ -1141,6 +1141,15 @@ struct wined3d_context UINT free_event_query_count; struct list event_queries; + struct wined3d_stream_info stream_info; + + /* Fences for GL_APPLE_flush_buffer_range */ + struct wined3d_event_query *buffer_queries[MAX_ATTRIBS]; + unsigned int num_buffer_queries; + + DWORD tex_unit_map[MAX_COMBINED_SAMPLERS]; + DWORD rev_tex_unit_map[MAX_COMBINED_SAMPLERS]; + /* Extension emulation */ GLint gl_fog_source; GLfloat fog_coord_value; @@ -1308,6 +1317,8 @@ void context_state_drawbuf(struct wined3d_context *context, void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void context_stream_info_from_declaration(struct wined3d_context *context, + const struct wined3d_state *state, struct wined3d_stream_info *stream_info) DECLSPEC_HIDDEN; /***************************************************************************** * Internal representation of a light @@ -1461,10 +1472,12 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX650 = 0x0fc6, CARD_NVIDIA_GEFORCE_GTX650TI = 0x11c6, CARD_NVIDIA_GEFORCE_GTX660 = 0x11c0, + CARD_NVIDIA_GEFORCE_GTX660M = 0x0fd4, CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, @@ -1502,6 +1515,7 @@ enum wined3d_pci_device CARD_INTEL_IVBD = 0x0162, CARD_INTEL_IVBM = 0x0166, CARD_INTEL_IVBS = 0x015a, + CARD_INTEL_HWM = 0x0416, }; struct wined3d_fbo_ops @@ -1719,6 +1733,10 @@ const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *frag const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN; void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSPEC_HIDDEN; +void wined3d_ftoa(float value, char *s) DECLSPEC_HIDDEN; + +extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; +extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; enum wined3d_ffp_vs_fog_mode { @@ -1794,8 +1812,12 @@ struct wined3d_stream_state UINT flags; }; +#define WINED3D_STATE_NO_REF 0x00000001 +#define WINED3D_STATE_INIT_DEFAULT 0x00000002 + struct wined3d_state { + DWORD flags; const struct wined3d_fb_state *fb; struct wined3d_vertex_declaration *vertex_declaration; @@ -1807,20 +1829,14 @@ struct wined3d_state INT load_base_vertex_index; /* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */ GLenum gl_primitive_type; - struct wined3d_shader *vertex_shader; - struct wined3d_buffer *vs_cb[MAX_CONSTANT_BUFFERS]; - struct wined3d_sampler *vs_sampler[MAX_SAMPLER_OBJECTS]; + struct wined3d_shader *shader[WINED3D_SHADER_TYPE_COUNT]; + struct wined3d_buffer *cb[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; + struct wined3d_sampler *sampler[WINED3D_SHADER_TYPE_COUNT][MAX_SAMPLER_OBJECTS]; + BOOL vs_consts_b[MAX_CONST_B]; INT vs_consts_i[MAX_CONST_I * 4]; float *vs_consts_f; - struct wined3d_shader *geometry_shader; - struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; - struct wined3d_sampler *gs_sampler[MAX_SAMPLER_OBJECTS]; - - struct wined3d_shader *pixel_shader; - struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; - struct wined3d_sampler *ps_sampler[MAX_SAMPLER_OBJECTS]; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4]; float *ps_consts_f; @@ -1828,7 +1844,6 @@ struct wined3d_state struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - DWORD lowest_disabled_stage; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; struct wined3d_vec4 clip_planes[MAX_CLIPPLANES]; @@ -1845,12 +1860,10 @@ struct wined3d_state DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; -/***************************************************************************** - * IWineD3DDevice implementation structure - */ #define WINED3D_UNMAPPED_STAGE ~0U -/* Multithreaded flag. Removed from the public header to signal that IWineD3D::CreateDevice ignores it */ +/* Multithreaded flag. Removed from the public header to signal that + * wined3d_device_create() ignores it. */ #define WINED3DCREATE_MULTITHREADED 0x00000004 struct wined3d_device @@ -1879,22 +1892,18 @@ struct wined3d_device APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; const struct blit_shader *blitter; - UINT instance_count; - - WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ - WORD isInDraw : 1; - WORD bCursorVisible : 1; - WORD d3d_initialized : 1; - WORD inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ - WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ - WORD useDrawStridedSlow : 1; - WORD filter_messages : 1; - WORD padding : 8; - - BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */ + BYTE vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ + BYTE bCursorVisible : 1; + BYTE d3d_initialized : 1; + BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ + BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ + BYTE filter_messages : 1; + BYTE padding : 2; unsigned char surface_alignment; /* Line Alignment of surfaces */ + WORD padding2 : 16; + struct wined3d_state state; struct wined3d_state *update_state; struct wined3d_stateblock *recording; @@ -1923,11 +1932,11 @@ struct wined3d_device UINT xScreenSpace; UINT yScreenSpace; UINT cursorWidth, cursorHeight; - GLuint cursorTexture; + struct wined3d_texture *cursor_texture; HCURSOR hardwareCursor; - /* The Wine logo surface */ - struct wined3d_surface *logo_surface; + /* The Wine logo texture */ + struct wined3d_texture *logo_texture; /* Textures for when no other textures are mapped */ UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS]; @@ -1935,14 +1944,8 @@ struct wined3d_device UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS]; - /* With register combiners we can skip junk texture stages */ - DWORD texUnitMap[MAX_COMBINED_SAMPLERS]; - DWORD rev_tex_unit_map[MAX_COMBINED_SAMPLERS]; - - /* Stream source management */ - struct wined3d_stream_info stream_info; - struct wined3d_event_query *buffer_queries[MAX_ATTRIBS]; - unsigned int num_buffer_queries; + /* Command stream */ + struct wined3d_cs *cs; /* Context management */ struct wined3d_context **contexts; @@ -1957,15 +1960,12 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN; -void device_preload_textures(const struct wined3d_device *device) DECLSPEC_HIDDEN; LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; -void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) @@ -1975,9 +1975,9 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta return context->isStateDirty[idx] & (1 << shift); } -static inline void invalidate_active_texture(const struct wined3d_device *device, struct wined3d_context *context) +static inline void context_invalidate_active_texture(struct wined3d_context *context) { - DWORD sampler = device->rev_tex_unit_map[context->active_texture]; + DWORD sampler = context->rev_tex_unit_map[context->active_texture]; if (sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(context, STATE_SAMPLER(sampler)); } @@ -1990,9 +1990,6 @@ struct wined3d_resource_ops void (*resource_unload)(struct wined3d_resource *resource); }; -void *wined3d_resource_allocate_sysmem(SIZE_T size) DECLSPEC_HIDDEN; -void wined3d_resource_free_sysmem(void *mem) DECLSPEC_HIDDEN; - struct wined3d_resource { LONG ref; @@ -2011,7 +2008,6 @@ struct wined3d_resource UINT depth; UINT size; DWORD priority; - BYTE *allocatedMemory; /* Pointer to the real data location */ void *heap_memory; struct list privateData; struct list resource_list_entry; @@ -2031,9 +2027,12 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; +GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 @@ -2054,33 +2053,26 @@ enum wined3d_texture_state MAX_WINETEXTURESTATES = 11, }; -enum WINED3DSRGB -{ - SRGB_ANY = 0, /* Uses the cached value(e.g. external calls) */ - SRGB_RGB = 1, /* Loads the rgb texture */ - SRGB_SRGB = 2, /* Loads the srgb texture */ -}; - struct gl_texture { DWORD states[MAX_WINETEXTURESTATES]; - BOOL dirty; GLuint name; }; struct wined3d_texture_ops { - HRESULT (*texture_bind)(struct wined3d_texture *texture, + void (*texture_sub_resource_load)(struct wined3d_resource *sub_resource, struct wined3d_context *context, BOOL srgb); - void (*texture_preload)(struct wined3d_texture *texture, enum WINED3DSRGB srgb); void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region); void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); }; -#define WINED3D_TEXTURE_COND_NP2 0x1 -#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 -#define WINED3D_TEXTURE_IS_SRGB 0x4 +#define WINED3D_TEXTURE_COND_NP2 0x00000001 +#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000002 +#define WINED3D_TEXTURE_IS_SRGB 0x00000004 +#define WINED3D_TEXTURE_RGB_VALID 0x00000008 +#define WINED3D_TEXTURE_SRGB_VALID 0x00000010 struct wined3d_texture { @@ -2098,6 +2090,13 @@ struct wined3d_texture const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup; GLenum target; + + /* Color keys for DDraw */ + struct wined3d_color_key dst_blt_color_key; + struct wined3d_color_key src_blt_color_key; + struct wined3d_color_key dst_overlay_color_key; + struct wined3d_color_key src_overlay_color_key; + DWORD color_key_flags; }; static inline struct wined3d_texture *wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2106,27 +2105,37 @@ static inline struct wined3d_texture *wined3d_texture_from_resource(struct wined } static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_texture *texture, - const struct wined3d_gl_info *gl_info, BOOL srgb) + BOOL srgb) { - return srgb && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - ? &texture->texture_srgb : &texture->texture_rgb; + return srgb ? &texture->texture_srgb : &texture->texture_rgb; } void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECLSPEC_HIDDEN; +void wined3d_texture_bind(struct wined3d_texture *texture, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_load(struct wined3d_texture *texture, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; -#define WINED3D_VFLAG_LOCKED 0x00000001 -#define WINED3D_VFLAG_ALLOCATED 0x00000002 -#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000004 -#define WINED3D_VFLAG_PBO 0x00000008 +#define WINED3D_VFLAG_ALLOCATED 0x00000001 +#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 +#define WINED3D_VFLAG_PBO 0x00000004 +#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000008 #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 -#define WINED3D_LOCATION_BUFFER 0x00000004 -#define WINED3D_LOCATION_TEXTURE_RGB 0x00000008 -#define WINED3D_LOCATION_TEXTURE_SRGB 0x00000010 +#define WINED3D_LOCATION_USER_MEMORY 0x00000004 +#define WINED3D_LOCATION_DIB 0x00000008 +#define WINED3D_LOCATION_BUFFER 0x00000010 +#define WINED3D_LOCATION_TEXTURE_RGB 0x00000020 +#define WINED3D_LOCATION_TEXTURE_SRGB 0x00000040 +#define WINED3D_LOCATION_DRAWABLE 0x00000080 +#define WINED3D_LOCATION_RB_MULTISAMPLE 0x00000100 +#define WINED3D_LOCATION_RB_RESOLVED 0x00000200 const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; @@ -2146,7 +2155,10 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_volume, resource); } -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; +HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; +void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, + BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, @@ -2182,7 +2194,6 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); - void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); }; @@ -2193,7 +2204,9 @@ struct wined3d_surface struct wined3d_texture *container; struct wined3d_swapchain *swapchain; struct wined3d_palette *palette; /* D3D7 style palette handling */ - DWORD draw_binding; + DWORD draw_binding, map_binding; + void *user_memory; + DWORD locations; DWORD flags; @@ -2208,27 +2221,16 @@ struct wined3d_surface GLuint pbo; GLuint rb_multisample; GLuint rb_resolved; - GLuint texture_name; - GLuint texture_name_srgb; GLint texture_level; GLenum texture_target; RECT lockedRect; - RECT dirtyRect; int lockCount; -#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy */ /* For GetDC */ struct wined3d_surface_dib dib; HDC hDC; - /* Color keys for DDraw */ - struct wined3d_color_key dst_blt_color_key; - struct wined3d_color_key src_blt_color_key; - struct wined3d_color_key dst_overlay_color_key; - struct wined3d_color_key src_overlay_color_key; - DWORD CKeyFlags; - struct wined3d_color_key gl_color_key; struct list renderbuffers; @@ -2252,22 +2254,21 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf const struct wined3d_gl_info *gl_info, BOOL srgb) { return srgb && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - ? surface->texture_name_srgb : surface->texture_name; + ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; } -void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3d_box *dirty_rect) DECLSPEC_HIDDEN; +void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; +void surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; -HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, const RECT *rect) DECLSPEC_HIDDEN; +HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; -void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) DECLSPEC_HIDDEN; void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample) DECLSPEC_HIDDEN; void surface_prepare_texture(struct wined3d_surface *surface, @@ -2276,12 +2277,15 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_container(struct wined3d_surface *surface, struct wined3d_texture *container) DECLSPEC_HIDDEN; void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; +void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; +HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; +void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; @@ -2296,49 +2300,26 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ -#define SFLAG_LOCKABLE 0x00000010 /* Surface can be locked. */ -#define SFLAG_DYNLOCK 0x00000020 /* Surface is often locked by the application. */ -#define SFLAG_PIN_SYSMEM 0x00000040 /* Keep the surface in sysmem, at the same address. */ -#define SFLAG_DCINUSE 0x00000080 /* Set between GetDC and ReleaseDC calls. */ -#define SFLAG_LOST 0x00000100 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000200 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000400 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_INOVERLAYDRAW 0x00000800 /* Overlay drawing is in progress. Recursion prevention. */ -#define SFLAG_DIBSECTION 0x00001000 /* Has a DIB section attached for GetDC. */ -#define SFLAG_USERPTR 0x00002000 /* The application allocated the memory for this surface. */ -#define SFLAG_ALLOCATED 0x00004000 /* A GL texture is allocated for this surface. */ -#define SFLAG_SRGBALLOCATED 0x00008000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00010000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00020000 /* The system memory copy is current. */ -#define SFLAG_INTEXTURE 0x00040000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00080000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00100000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00200000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00800000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ +#define SFLAG_PIN_SYSMEM 0x00000020 /* Keep the surface in sysmem, at the same address. */ +#define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ +#define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ +#define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ +#define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ +#define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ +#define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ +#define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long - * SFLAG_DIBSECTION: The dib code manages the memory * SFLAG_DYNLOCK: Avoid freeing the data for performance - * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup */ #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ - SFLAG_DIBSECTION | \ - SFLAG_USERPTR | \ - SFLAG_PBO | \ SFLAG_PIN_SYSMEM) -#define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \ - SFLAG_INTEXTURE | \ - SFLAG_INSRGBTEX | \ - SFLAG_INDRAWABLE | \ - SFLAG_INRB_MULTISAMPLE | \ - SFLAG_INRB_RESOLVED) - enum wined3d_conversion_type { WINED3D_CT_NONE, @@ -2452,10 +2433,73 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; -HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; -void state_init_default(struct wined3d_state *state, struct wined3d_device *device) DECLSPEC_HIDDEN; +HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, + const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_cs_ops +{ + void *(*require_space)(struct wined3d_cs *cs, size_t size); + void (*submit)(struct wined3d_cs *cs); +}; + +struct wined3d_cs +{ + const struct wined3d_cs_ops *ops; + struct wined3d_device *device; + struct wined3d_fb_state fb; + struct wined3d_state state; + + size_t data_size; + void *data; +}; + +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; + +void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, + DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_count, + UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, + const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, + enum wined3d_format_id format_id) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, + enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, + struct wined3d_surface *render_target) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, + struct wined3d_shader *shader) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, + UINT frequency, UINT flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, + struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; + /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d * allows GetData on a created issue, but opengl doesn't @@ -2507,8 +2551,8 @@ struct wined3d_buffer GLuint buffer_object; GLenum buffer_object_usage; GLenum buffer_type_hint; - UINT buffer_object_size; DWORD flags; + void *map_ptr; struct wined3d_map_range *maps; ULONG maps_size, modified_areas; @@ -2527,9 +2571,11 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view { @@ -2573,6 +2619,11 @@ struct wined3d_swapchain HWND backup_wnd; }; +static inline BOOL swapchain_is_p8(const struct wined3d_swapchain *swapchain) +{ + return swapchain->desc.backbuffer_format == WINED3DFMT_P8_UINT; +} + void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -2605,7 +2656,6 @@ const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; -const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; @@ -2683,6 +2733,8 @@ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *s UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; +void wined3d_release_dc(HWND window, HDC dc) DECLSPEC_HIDDEN; + struct wined3d_shader_lconst { struct list entry; @@ -2778,11 +2830,12 @@ struct wined3d_shader }; void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) DECLSPEC_HIDDEN; -void find_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN; +void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + BOOL position_transformed, struct ps_compile_args *args, + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void find_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct vs_compile_args *args) DECLSPEC_HIDDEN; +void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + WORD swizzle_map, struct vs_compile_args *args) DECLSPEC_HIDDEN; void shader_buffer_clear(struct wined3d_shader_buffer *buffer) DECLSPEC_HIDDEN; BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) DECLSPEC_HIDDEN; @@ -2885,15 +2938,12 @@ struct ps_np2fixup_info { struct wined3d_palette { LONG ref; - void *parent; struct wined3d_device *device; HPALETTE hpal; WORD palVersion; /*| */ WORD palNumEntries; /*| LOGPALETTE */ PALETTEENTRY palents[256]; /*| */ - /* This is to store the palette in 'screen format' */ - int screen_palents[256]; DWORD flags; }; @@ -2924,6 +2974,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLOCKS 0x00020000 #define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 #define WINED3DFMT_FLAG_TEXTURE 0x00080000 +#define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 struct wined3d_rational { @@ -2967,7 +3018,8 @@ struct wined3d_format unsigned int flags; struct wined3d_rational height_scale; struct color_fixup_desc color_fixup; - void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); + void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth); }; const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, @@ -2979,16 +3031,14 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, static inline BOOL use_vs(const struct wined3d_state *state) { - /* Check stateblock->vertexDecl to allow this to be used from - * IWineD3DDeviceImpl_FindTexUnitMap(). This is safe because - * stateblock->vertexShader implies a vertex declaration instead of ddraw - * style strided data. */ - return state->vertex_shader && !state->vertex_declaration->position_transformed; + /* Check state->vertex_declaration to allow this to be used before the + * stream info is validated, for example in device_update_tex_unit_map(). */ + return state->shader[WINED3D_SHADER_TYPE_VERTEX] && !state->vertex_declaration->position_transformed; } static inline BOOL use_ps(const struct wined3d_state *state) { - return !!state->pixel_shader; + return !!state->shader[WINED3D_SHADER_TYPE_PIXEL]; } static inline void context_apply_state(struct wined3d_context *context, @@ -3004,4 +3054,4 @@ static inline void context_apply_state(struct wined3d_context *context, #define MAKEDWORD_VERSION(maj, min) (((maj & 0xffff) << 16) | (min & 0xffff)) -#endif /* __WINE_WINED3D_PRIVATE_H */ +#endif diff --git a/reactos/include/psdk/d3d9.h b/reactos/include/psdk/d3d9.h index 8758e282b00..c538cd7ea42 100644 --- a/reactos/include/psdk/d3d9.h +++ b/reactos/include/psdk/d3d9.h @@ -132,6 +132,9 @@ typedef struct IDirect3DVolume9 *LPDIRECT3DVOLUME9, *PDIRECT3DVOLUME9; DEFINE_GUID(IID_IDirect3DSwapChain9, 0x794950f2, 0xadfc, 0x458a, 0x90, 0x5e, 0x10, 0xa1, 0xb, 0xb, 0x50, 0x3b); typedef struct IDirect3DSwapChain9 *LPDIRECT3DSWAPCHAIN9, *PDIRECT3DSWAPCHAIN9; +DEFINE_GUID(IID_IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0x3e, 0x4c, 0x7d, 0x8d, 0x33, 0x3); +typedef struct IDirect3DSwapChain9Ex *LPDIRECT3DSWAPCHAIN9EX, *PDIRECT3DSWAPCHAIN9EX; + DEFINE_GUID(IID_IDirect3DSurface9, 0xcfbaf3a, 0x9ff6, 0x429a, 0x99, 0xb3, 0xa2, 0x79, 0x6a, 0xf8, 0xb8, 0x9b); typedef struct IDirect3DSurface9 *LPDIRECT3DSURFACE9, *PDIRECT3DSURFACE9; @@ -423,6 +426,68 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) #define IDirect3DSwapChain9_GetPresentParameters(p,a) (p)->GetPresentParameters(a) #endif +/***************************************************************************** + * IDirect3DSwapChain9Ex interface + */ +#define INTERFACE IDirect3DSwapChain9Ex +DECLARE_INTERFACE_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IDirect3DSwapChain9 methods ***/ + STDMETHOD(Present)(THIS_ const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) PURE; + STDMETHOD(GetFrontBufferData)(THIS_ struct IDirect3DSurface9 *pDestSurface) PURE; + STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, struct IDirect3DSurface9 **ppBackBuffer) PURE; + STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE; + STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE *pMode) PURE; + STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **ppDevice) PURE; + STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters) PURE; + /*** IDirect3DSwapChain9Ex methods ***/ + STDMETHOD(GetLastPresentCount)(THIS_ UINT *pLastPresentCount) PURE; + STDMETHOD(GetPresentStats)(THIS_ D3DPRESENTSTATS *pPresentationStatistics) PURE; + STDMETHOD(GetDisplayModeEx)(THIS_ D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DSwapChain9Ex_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DSwapChain9Ex_Release(p) (p)->lpVtbl->Release(p) +/*** IDirect3DSwapChain9 methods ***/ +#define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->lpVtbl->Present(p,a,b,c,d,e) +#define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->lpVtbl->GetFrontBufferData(p,a) +#define IDirect3DSwapChain9EX_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) +#define IDirect3DSwapChain9EX_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) +#define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->lpVtbl->GetPresentParameters(p,a) +/*** IDirect3DSwapChain9Ex methods ***/ +#define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->lpVtbl->GetLastPresentCount(p,a) +#define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->lpVtbl->GetPresentStats(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->lpVtbl->GetDisplayModeEx(p,a,b) +#else +/*** IUnknown methods ***/ +#define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirect3DSwapChain9Ex_AddRef(p) (p)->AddRef() +#define IDirect3DSwapChain9Ex_Release(p) (p)->Release() +/*** IDirect3DSwapChain9 methods ***/ +#define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->Present(a,b,c,d,e) +#define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->GetFrontBufferData(a) +#define IDirect3DSwapChain9Ex_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) +#define IDirect3DSwapChain9Ex_GetRasterStatus(p,a) (p)->GetRasterStatus(a) +#define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->GetDisplayMode(a) +#define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->GetDevice(a) +#define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->GetPresentParameters(a) +/*** IDirect3DSwapChain9Ex methods ***/ +#define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->GetLastPresentCount(a) +#define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->GetPresentStats(a) +#define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->GetDisplayModeEx(a,b) +#endif + /***************************************************************************** * IDirect3DResource9 interface */ diff --git a/reactos/include/psdk/d3d9types.h b/reactos/include/psdk/d3d9types.h index 9c7c57cc170..26b259a93bf 100644 --- a/reactos/include/psdk/d3d9types.h +++ b/reactos/include/psdk/d3d9types.h @@ -1587,6 +1587,16 @@ typedef enum _D3DCOMPOSERECTSOP{ D3DCOMPOSERECTS_NEG, D3DCOMPOSERECTS_FORCE_DWORD = 0x7fffffff } D3DCOMPOSERECTSOP; + +typedef struct _D3DPRESENTSTATS +{ + UINT PresentCount; + UINT PresentRefreshCount; + UINT SyncRefreshCount; + LARGE_INTEGER SyncQPCTime; + LARGE_INTEGER SyncGPUTime; +} D3DPRESENTSTATS; + #endif /* D3D_DISABLE_9EX */ typedef enum _D3DSHADER_COMPARISON diff --git a/reactos/include/reactos/wine/wgl.h b/reactos/include/reactos/wine/wgl.h index d3cfc7e2428..f11f19ccfc3 100644 --- a/reactos/include/reactos/wine/wgl.h +++ b/reactos/include/reactos/wine/wgl.h @@ -1,4 +1,4 @@ -/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */ +/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */ #ifndef __WINE_WGL_H #define __WINE_WGL_H @@ -14,13 +14,16 @@ typedef char GLchar; typedef char GLcharARB; typedef double GLclampd; typedef float GLclampf; +typedef int GLclampx; typedef double GLdouble; typedef unsigned int GLenum; +typedef int GLfixed; typedef float GLfloat; typedef unsigned short GLhalfNV; typedef unsigned int GLhandleARB; typedef int GLint; typedef INT64 GLint64; +typedef INT64 GLint64EXT; typedef INT_PTR GLintptr; typedef INT_PTR GLintptrARB; typedef short GLshort; @@ -32,6 +35,7 @@ typedef struct __GLsync * GLsync; typedef unsigned char GLubyte; typedef unsigned int GLuint; typedef UINT64 GLuint64; +typedef UINT64 GLuint64EXT; typedef unsigned short GLushort; typedef INT_PTR GLvdpauSurfaceNV; typedef void GLvoid; @@ -119,16 +123,19 @@ typedef void GLvoid; #define GL_ALL_COMPLETED_NV 0x84F2 #define GL_ALL_SHADER_BITS 0xFFFFFFFF #define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF +#define GL_ALL_STATIC_DATA_IBM 103060 #define GL_ALPHA 0x1906 #define GL_ALPHA12 0x803D #define GL_ALPHA12_EXT 0x803D #define GL_ALPHA16 0x803E #define GL_ALPHA16F_ARB 0x881C +#define GL_ALPHA16F_EXT 0x881C #define GL_ALPHA16I_EXT 0x8D8A #define GL_ALPHA16UI_EXT 0x8D78 #define GL_ALPHA16_EXT 0x803E #define GL_ALPHA16_SNORM 0x9018 #define GL_ALPHA32F_ARB 0x8816 +#define GL_ALPHA32F_EXT 0x8816 #define GL_ALPHA32I_EXT 0x8D84 #define GL_ALPHA32UI_EXT 0x8D72 #define GL_ALPHA4 0x803B @@ -137,6 +144,7 @@ typedef void GLvoid; #define GL_ALPHA8I_EXT 0x8D90 #define GL_ALPHA8UI_EXT 0x8D7E #define GL_ALPHA8_EXT 0x803C +#define GL_ALPHA8_OES 0x803C #define GL_ALPHA8_SNORM 0x9014 #define GL_ALPHA_BIAS 0x0D1D #define GL_ALPHA_BITS 0x0D55 @@ -233,7 +241,9 @@ typedef void GLvoid; #define GL_BEVEL_NV 0x90A6 #define GL_BGR 0x80E0 #define GL_BGRA 0x80E1 +#define GL_BGRA8_EXT 0x93A1 #define GL_BGRA_EXT 0x80E1 +#define GL_BGRA_IMG 0x80E1 #define GL_BGRA_INTEGER 0x8D9B #define GL_BGRA_INTEGER_EXT 0x8D9B #define GL_BGR_EXT 0x80E0 @@ -249,6 +259,7 @@ typedef void GLvoid; #define GL_BITMAP 0x1A00 #define GL_BITMAP_TOKEN 0x0704 #define GL_BLEND 0x0BE2 +#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 #define GL_BLEND_COLOR 0x8005 #define GL_BLEND_COLOR_EXT 0x8005 #define GL_BLEND_DST 0x0BE0 @@ -267,6 +278,8 @@ typedef void GLvoid; #define GL_BLEND_EQUATION_RGB 0x8009 #define GL_BLEND_EQUATION_RGB_EXT 0x8009 #define GL_BLEND_EQUATION_RGB_OES 0x8009 +#define GL_BLEND_OVERLAP_NV 0x9281 +#define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 #define GL_BLEND_SRC 0x0BE1 #define GL_BLEND_SRC_ALPHA 0x80CB #define GL_BLEND_SRC_ALPHA_EXT 0x80CB @@ -283,6 +296,7 @@ typedef void GLvoid; #define GL_BLUE_INTEGER_EXT 0x8D96 #define GL_BLUE_MAX_CLAMP_INGR 0x8566 #define GL_BLUE_MIN_CLAMP_INGR 0x8562 +#define GL_BLUE_NV 0x1905 #define GL_BLUE_SCALE 0x0D1A #define GL_BOLD_BIT_NV 0x01 #define GL_BOOL 0x8B56 @@ -295,6 +309,7 @@ typedef void GLvoid; #define GL_BOOL_VEC4_ARB 0x8B59 #define GL_BOUNDING_BOX_NV 0x908D #define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C +#define GL_BROWSER_DEFAULT_WEBGL 0x9244 #define GL_BUFFER 0x82E0 #define GL_BUFFER_ACCESS 0x88BB #define GL_BUFFER_ACCESS_ARB 0x88BB @@ -304,6 +319,8 @@ typedef void GLvoid; #define GL_BUFFER_DATA_SIZE 0x9303 #define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 #define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D +#define GL_BUFFER_IMMUTABLE_STORAGE 0x821F +#define GL_BUFFER_KHR 0x82E0 #define GL_BUFFER_MAPPED 0x88BC #define GL_BUFFER_MAPPED_ARB 0x88BC #define GL_BUFFER_MAPPED_OES 0x88BC @@ -317,6 +334,7 @@ typedef void GLvoid; #define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_SIZE_ARB 0x8764 +#define GL_BUFFER_STORAGE_FLAGS 0x8220 #define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200 #define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200 #define GL_BUFFER_USAGE 0x8765 @@ -346,6 +364,7 @@ typedef void GLvoid; #define GL_CLAMP_READ_COLOR_ARB 0x891C #define GL_CLAMP_TO_BORDER 0x812D #define GL_CLAMP_TO_BORDER_ARB 0x812D +#define GL_CLAMP_TO_BORDER_NV 0x812D #define GL_CLAMP_TO_BORDER_SGIS 0x812D #define GL_CLAMP_TO_EDGE 0x812F #define GL_CLAMP_TO_EDGE_SGIS 0x812F @@ -353,11 +372,14 @@ typedef void GLvoid; #define GL_CLAMP_VERTEX_COLOR_ARB 0x891A #define GL_CLEAR 0x1500 #define GL_CLEAR_BUFFER 0x82B4 +#define GL_CLEAR_TEXTURE 0x9365 #define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 #define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 #define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF #define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000 #define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 +#define GL_CLIENT_STORAGE_BIT 0x0200 #define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 #define GL_CLIP_DISTANCE0 0x3000 #define GL_CLIP_DISTANCE1 0x3001 @@ -371,11 +393,17 @@ typedef void GLvoid; #define GL_CLIP_FAR_HINT_PGI 0x1A221 #define GL_CLIP_NEAR_HINT_PGI 0x1A220 #define GL_CLIP_PLANE0 0x3000 +#define GL_CLIP_PLANE0_IMG 0x3000 #define GL_CLIP_PLANE1 0x3001 +#define GL_CLIP_PLANE1_IMG 0x3001 #define GL_CLIP_PLANE2 0x3002 +#define GL_CLIP_PLANE2_IMG 0x3002 #define GL_CLIP_PLANE3 0x3003 +#define GL_CLIP_PLANE3_IMG 0x3003 #define GL_CLIP_PLANE4 0x3004 +#define GL_CLIP_PLANE4_IMG 0x3004 #define GL_CLIP_PLANE5 0x3005 +#define GL_CLIP_PLANE5_IMG 0x3005 #define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 #define GL_CLOSE_PATH_NV 0x00 #define GL_CMYKA_EXT 0x800D @@ -386,6 +414,8 @@ typedef void GLvoid; #define GL_COLOR 0x1800 #define GL_COLOR3_BIT_PGI 0x00010000 #define GL_COLOR4_BIT_PGI 0x00020000 +#define GL_COLORBURN_NV 0x929A +#define GL_COLORDODGE_NV 0x9299 #define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 #define GL_COLOR_ARRAY 0x8076 #define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23 @@ -456,6 +486,14 @@ typedef void GLvoid; #define GL_COLOR_ATTACHMENT9_NV 0x8CE9 #define GL_COLOR_ATTACHMENT_EXT 0x90F0 #define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 +#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002 +#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004 +#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008 +#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010 +#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020 +#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040 +#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080 #define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 #define GL_COLOR_CLEAR_VALUE 0x0C22 #define GL_COLOR_COMPONENTS 0x8283 @@ -558,22 +596,43 @@ typedef void GLvoid; #define GL_COMPRESSED_LUMINANCE_ARB 0x84EA #define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 #define GL_COMPRESSED_R11_EAC 0x9270 +#define GL_COMPRESSED_R11_EAC_OES 0x9270 #define GL_COMPRESSED_RED 0x8225 #define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD #define GL_COMPRESSED_RED_RGTC1 0x8DBB #define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB #define GL_COMPRESSED_RG 0x8226 #define GL_COMPRESSED_RG11_EAC 0x9272 +#define GL_COMPRESSED_RG11_EAC_OES 0x9272 #define GL_COMPRESSED_RGB 0x84ED #define GL_COMPRESSED_RGB8_ETC2 0x9274 +#define GL_COMPRESSED_RGB8_ETC2_OES 0x9274 #define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276 +#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES 0x9276 #define GL_COMPRESSED_RGBA 0x84EE #define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 +#define GL_COMPRESSED_RGBA8_ETC2_EAC_OES 0x9278 #define GL_COMPRESSED_RGBA_ARB 0x84EE +#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB +#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 +#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 +#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA +#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC +#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD +#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 +#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 +#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 +#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 +#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 +#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 +#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 +#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 #define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C #define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 +#define GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137 #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 +#define GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138 #define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 #define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 @@ -590,38 +649,68 @@ typedef void GLvoid; #define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 #define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 #define GL_COMPRESSED_SIGNED_R11_EAC 0x9271 +#define GL_COMPRESSED_SIGNED_R11_EAC_OES 0x9271 #define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE #define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC #define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC #define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 +#define GL_COMPRESSED_SIGNED_RG11_EAC_OES 0x9273 #define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE #define GL_COMPRESSED_SLUMINANCE 0x8C4A #define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B #define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B #define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A #define GL_COMPRESSED_SRGB 0x8C48 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 #define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 +#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_OES 0x9279 #define GL_COMPRESSED_SRGB8_ETC2 0x9275 +#define GL_COMPRESSED_SRGB8_ETC2_OES 0x9275 #define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277 +#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES 0x9277 #define GL_COMPRESSED_SRGB_ALPHA 0x8C49 #define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D #define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 +#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56 +#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57 #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV 0x8C4D #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV 0x8C4E #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV 0x8C4F #define GL_COMPRESSED_SRGB_EXT 0x8C48 +#define GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54 +#define GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55 #define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C +#define GL_COMPRESSED_SRGB_S3TC_DXT1_NV 0x8C4C #define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 #define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#define GL_COMPUTE_LOCAL_WORK_SIZE 0x8267 +#define GL_COMPUTE_PROGRAM_NV 0x90FB +#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC #define GL_COMPUTE_SHADER 0x91B9 #define GL_COMPUTE_SHADER_BIT 0x00000020 #define GL_COMPUTE_SUBROUTINE 0x92ED #define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3 #define GL_COMPUTE_TEXTURE 0x82A0 +#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267 #define GL_COMP_BIT_ATI 0x00000002 #define GL_CONDITION_SATISFIED 0x911C #define GL_CONDITION_SATISFIED_APPLE 0x911C +#define GL_CONJOINT_NV 0x9284 #define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD #define GL_CONSTANT 0x8576 #define GL_CONSTANT_ALPHA 0x8003 @@ -640,10 +729,14 @@ typedef void GLvoid; #define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 #define GL_CONTEXT_FLAGS 0x821E #define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 +#define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002 +#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001 #define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 +#define GL_CONTEXT_LOST_WEBGL 0x9242 #define GL_CONTEXT_PROFILE_MASK 0x9126 +#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 #define GL_CONTINUOUS_AMD 0x9007 +#define GL_CONTRAST_NV 0x92A1 #define GL_CONVEX_HULL_NV 0x908B #define GL_CONVOLUTION_1D 0x8010 #define GL_CONVOLUTION_1D_EXT 0x8010 @@ -699,11 +792,16 @@ typedef void GLvoid; #define GL_COORD_REPLACE 0x8862 #define GL_COORD_REPLACE_ARB 0x8862 #define GL_COORD_REPLACE_NV 0x8862 +#define GL_COORD_REPLACE_OES 0x8862 #define GL_COPY 0x1503 #define GL_COPY_INVERTED 0x150C #define GL_COPY_PIXEL_TOKEN 0x0706 +#define GL_COPY_READ_BUFFER 0x8F36 #define GL_COPY_READ_BUFFER_BINDING 0x8F36 +#define GL_COPY_READ_BUFFER_NV 0x8F36 +#define GL_COPY_WRITE_BUFFER 0x8F37 #define GL_COPY_WRITE_BUFFER_BINDING 0x8F37 +#define GL_COPY_WRITE_BUFFER_NV 0x8F37 #define GL_COUNTER_RANGE_AMD 0x8BC1 #define GL_COUNTER_TYPE_AMD 0x8BC0 #define GL_COUNT_DOWN_NV 0x9089 @@ -716,7 +814,7 @@ typedef void GLvoid; #define GL_COVERAGE_COMPONENT4_NV 0x8ED1 #define GL_COVERAGE_COMPONENT_NV 0x8ED0 #define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 -#define GL_COVERAGE_SAMPLES_NV 0x80A9 +#define GL_COVERAGE_SAMPLES_NV 0x8ED4 #define GL_CPU_OPTIMIZED_QCOM 0x8FB1 #define GL_CUBIC_CURVE_TO_NV 0x0C #define GL_CUBIC_EXT 0x8334 @@ -769,12 +867,15 @@ typedef void GLvoid; #define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B #define GL_CURRENT_WEIGHT_ARB 0x86A8 #define GL_CW 0x0900 +#define GL_DARKEN_NV 0x9297 #define GL_DATA_BUFFER_AMD 0x9151 #define GL_DEBUG_ASSERT_MESA 0x875B #define GL_DEBUG_CALLBACK_FUNCTION 0x8244 #define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 +#define GL_DEBUG_CALLBACK_FUNCTION_KHR 0x8244 #define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 #define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245 +#define GL_DEBUG_CALLBACK_USER_PARAM_KHR 0x8245 #define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149 #define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F #define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B @@ -784,53 +885,77 @@ typedef void GLvoid; #define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C #define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A #define GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GL_DEBUG_GROUP_STACK_DEPTH_KHR 0x826D #define GL_DEBUG_LOGGED_MESSAGES 0x9145 #define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 #define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145 +#define GL_DEBUG_LOGGED_MESSAGES_KHR 0x9145 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR 0x8243 #define GL_DEBUG_OBJECT_MESA 0x8759 #define GL_DEBUG_OUTPUT 0x92E0 +#define GL_DEBUG_OUTPUT_KHR 0x92E0 #define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 #define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 +#define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 #define GL_DEBUG_PRINT_MESA 0x875A #define GL_DEBUG_SEVERITY_HIGH 0x9146 #define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 #define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146 +#define GL_DEBUG_SEVERITY_HIGH_KHR 0x9146 #define GL_DEBUG_SEVERITY_LOW 0x9148 #define GL_DEBUG_SEVERITY_LOW_AMD 0x9148 #define GL_DEBUG_SEVERITY_LOW_ARB 0x9148 +#define GL_DEBUG_SEVERITY_LOW_KHR 0x9148 #define GL_DEBUG_SEVERITY_MEDIUM 0x9147 #define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147 #define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147 +#define GL_DEBUG_SEVERITY_MEDIUM_KHR 0x9147 #define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GL_DEBUG_SEVERITY_NOTIFICATION_KHR 0x826B #define GL_DEBUG_SOURCE_API 0x8246 #define GL_DEBUG_SOURCE_API_ARB 0x8246 +#define GL_DEBUG_SOURCE_API_KHR 0x8246 #define GL_DEBUG_SOURCE_APPLICATION 0x824A #define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A +#define GL_DEBUG_SOURCE_APPLICATION_KHR 0x824A #define GL_DEBUG_SOURCE_OTHER 0x824B #define GL_DEBUG_SOURCE_OTHER_ARB 0x824B +#define GL_DEBUG_SOURCE_OTHER_KHR 0x824B #define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 #define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248 +#define GL_DEBUG_SOURCE_SHADER_COMPILER_KHR 0x8248 #define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 #define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249 +#define GL_DEBUG_SOURCE_THIRD_PARTY_KHR 0x8249 #define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 #define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR 0x8247 #define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D #define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR 0x824D #define GL_DEBUG_TYPE_ERROR 0x824C #define GL_DEBUG_TYPE_ERROR_ARB 0x824C +#define GL_DEBUG_TYPE_ERROR_KHR 0x824C #define GL_DEBUG_TYPE_MARKER 0x8268 +#define GL_DEBUG_TYPE_MARKER_KHR 0x8268 #define GL_DEBUG_TYPE_OTHER 0x8251 #define GL_DEBUG_TYPE_OTHER_ARB 0x8251 +#define GL_DEBUG_TYPE_OTHER_KHR 0x8251 #define GL_DEBUG_TYPE_PERFORMANCE 0x8250 #define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250 +#define GL_DEBUG_TYPE_PERFORMANCE_KHR 0x8250 #define GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GL_DEBUG_TYPE_POP_GROUP_KHR 0x826A #define GL_DEBUG_TYPE_PORTABILITY 0x824F #define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F +#define GL_DEBUG_TYPE_PORTABILITY_KHR 0x824F #define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GL_DEBUG_TYPE_PUSH_GROUP_KHR 0x8269 #define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E #define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR 0x824E #define GL_DECAL 0x2101 #define GL_DECODE_EXT 0x8A49 #define GL_DECR 0x1E03 @@ -858,6 +983,14 @@ typedef void GLvoid; #define GL_DEPTH_BOUNDS_EXT 0x8891 #define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 #define GL_DEPTH_BUFFER_BIT 0x00000100 +#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100 +#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200 +#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400 +#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800 +#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000 +#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000 +#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000 +#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000 #define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF #define GL_DEPTH_CLAMP 0x864F #define GL_DEPTH_CLAMP_FAR_AMD 0x901F @@ -907,10 +1040,12 @@ typedef void GLvoid; #define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C #define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A #define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B +#define GL_DIFFERENCE_NV 0x929E #define GL_DIFFUSE 0x1201 #define GL_DISCARD_ATI 0x8763 #define GL_DISCARD_NV 0x8530 #define GL_DISCRETE_AMD 0x9006 +#define GL_DISJOINT_NV 0x9283 #define GL_DISPATCH_INDIRECT_BUFFER 0x90EE #define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF #define GL_DISPLAY_LIST 0x82E7 @@ -946,10 +1081,22 @@ typedef void GLvoid; #define GL_DOUBLE_EXT 0x140A #define GL_DOUBLE_MAT2 0x8F46 #define GL_DOUBLE_MAT2_EXT 0x8F46 +#define GL_DOUBLE_MAT2x3 0x8F49 +#define GL_DOUBLE_MAT2x3_EXT 0x8F49 +#define GL_DOUBLE_MAT2x4 0x8F4A +#define GL_DOUBLE_MAT2x4_EXT 0x8F4A #define GL_DOUBLE_MAT3 0x8F47 #define GL_DOUBLE_MAT3_EXT 0x8F47 +#define GL_DOUBLE_MAT3x2 0x8F4B +#define GL_DOUBLE_MAT3x2_EXT 0x8F4B +#define GL_DOUBLE_MAT3x4 0x8F4C +#define GL_DOUBLE_MAT3x4_EXT 0x8F4C #define GL_DOUBLE_MAT4 0x8F48 #define GL_DOUBLE_MAT4_EXT 0x8F48 +#define GL_DOUBLE_MAT4x2 0x8F4D +#define GL_DOUBLE_MAT4x2_EXT 0x8F4D +#define GL_DOUBLE_MAT4x3 0x8F4E +#define GL_DOUBLE_MAT4x3_EXT 0x8F4E #define GL_DOUBLE_VEC2 0x8FFC #define GL_DOUBLE_VEC2_EXT 0x8FFC #define GL_DOUBLE_VEC3 0x8FFD @@ -960,73 +1107,94 @@ typedef void GLvoid; #define GL_DRAW_BUFFER0 0x8825 #define GL_DRAW_BUFFER0_ARB 0x8825 #define GL_DRAW_BUFFER0_ATI 0x8825 +#define GL_DRAW_BUFFER0_EXT 0x8825 #define GL_DRAW_BUFFER0_NV 0x8825 #define GL_DRAW_BUFFER1 0x8826 #define GL_DRAW_BUFFER10 0x882F #define GL_DRAW_BUFFER10_ARB 0x882F #define GL_DRAW_BUFFER10_ATI 0x882F +#define GL_DRAW_BUFFER10_EXT 0x882F #define GL_DRAW_BUFFER10_NV 0x882F #define GL_DRAW_BUFFER11 0x8830 #define GL_DRAW_BUFFER11_ARB 0x8830 #define GL_DRAW_BUFFER11_ATI 0x8830 +#define GL_DRAW_BUFFER11_EXT 0x8830 #define GL_DRAW_BUFFER11_NV 0x8830 #define GL_DRAW_BUFFER12 0x8831 #define GL_DRAW_BUFFER12_ARB 0x8831 #define GL_DRAW_BUFFER12_ATI 0x8831 +#define GL_DRAW_BUFFER12_EXT 0x8831 #define GL_DRAW_BUFFER12_NV 0x8831 #define GL_DRAW_BUFFER13 0x8832 #define GL_DRAW_BUFFER13_ARB 0x8832 #define GL_DRAW_BUFFER13_ATI 0x8832 +#define GL_DRAW_BUFFER13_EXT 0x8832 #define GL_DRAW_BUFFER13_NV 0x8832 #define GL_DRAW_BUFFER14 0x8833 #define GL_DRAW_BUFFER14_ARB 0x8833 #define GL_DRAW_BUFFER14_ATI 0x8833 +#define GL_DRAW_BUFFER14_EXT 0x8833 #define GL_DRAW_BUFFER14_NV 0x8833 #define GL_DRAW_BUFFER15 0x8834 #define GL_DRAW_BUFFER15_ARB 0x8834 #define GL_DRAW_BUFFER15_ATI 0x8834 +#define GL_DRAW_BUFFER15_EXT 0x8834 #define GL_DRAW_BUFFER15_NV 0x8834 #define GL_DRAW_BUFFER1_ARB 0x8826 #define GL_DRAW_BUFFER1_ATI 0x8826 +#define GL_DRAW_BUFFER1_EXT 0x8826 #define GL_DRAW_BUFFER1_NV 0x8826 #define GL_DRAW_BUFFER2 0x8827 #define GL_DRAW_BUFFER2_ARB 0x8827 #define GL_DRAW_BUFFER2_ATI 0x8827 +#define GL_DRAW_BUFFER2_EXT 0x8827 #define GL_DRAW_BUFFER2_NV 0x8827 #define GL_DRAW_BUFFER3 0x8828 #define GL_DRAW_BUFFER3_ARB 0x8828 #define GL_DRAW_BUFFER3_ATI 0x8828 +#define GL_DRAW_BUFFER3_EXT 0x8828 #define GL_DRAW_BUFFER3_NV 0x8828 #define GL_DRAW_BUFFER4 0x8829 #define GL_DRAW_BUFFER4_ARB 0x8829 #define GL_DRAW_BUFFER4_ATI 0x8829 +#define GL_DRAW_BUFFER4_EXT 0x8829 #define GL_DRAW_BUFFER4_NV 0x8829 #define GL_DRAW_BUFFER5 0x882A #define GL_DRAW_BUFFER5_ARB 0x882A #define GL_DRAW_BUFFER5_ATI 0x882A +#define GL_DRAW_BUFFER5_EXT 0x882A #define GL_DRAW_BUFFER5_NV 0x882A #define GL_DRAW_BUFFER6 0x882B #define GL_DRAW_BUFFER6_ARB 0x882B #define GL_DRAW_BUFFER6_ATI 0x882B +#define GL_DRAW_BUFFER6_EXT 0x882B #define GL_DRAW_BUFFER6_NV 0x882B #define GL_DRAW_BUFFER7 0x882C #define GL_DRAW_BUFFER7_ARB 0x882C #define GL_DRAW_BUFFER7_ATI 0x882C +#define GL_DRAW_BUFFER7_EXT 0x882C #define GL_DRAW_BUFFER7_NV 0x882C #define GL_DRAW_BUFFER8 0x882D #define GL_DRAW_BUFFER8_ARB 0x882D #define GL_DRAW_BUFFER8_ATI 0x882D +#define GL_DRAW_BUFFER8_EXT 0x882D #define GL_DRAW_BUFFER8_NV 0x882D #define GL_DRAW_BUFFER9 0x882E #define GL_DRAW_BUFFER9_ARB 0x882E #define GL_DRAW_BUFFER9_ATI 0x882E +#define GL_DRAW_BUFFER9_EXT 0x882E #define GL_DRAW_BUFFER9_NV 0x882E #define GL_DRAW_BUFFER_EXT 0x0C01 #define GL_DRAW_FRAMEBUFFER 0x8CA9 #define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9 #define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6 #define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6 #define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_NV 0x8CA9 #define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 #define GL_DRAW_INDIRECT_BUFFER 0x8F3F #define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 @@ -1042,7 +1210,12 @@ typedef void GLvoid; #define GL_DSDT_MAG_VIB_NV 0x86F7 #define GL_DSDT_NV 0x86F5 #define GL_DST_ALPHA 0x0304 +#define GL_DST_ATOP_NV 0x928F #define GL_DST_COLOR 0x0306 +#define GL_DST_IN_NV 0x928B +#define GL_DST_NV 0x9287 +#define GL_DST_OUT_NV 0x928D +#define GL_DST_OVER_NV 0x9289 #define GL_DS_BIAS_NV 0x8716 #define GL_DS_SCALE_NV 0x8710 #define GL_DT_BIAS_NV 0x8717 @@ -1073,6 +1246,7 @@ typedef void GLvoid; #define GL_DYNAMIC_DRAW_ARB 0x88E8 #define GL_DYNAMIC_READ 0x88E9 #define GL_DYNAMIC_READ_ARB 0x88E9 +#define GL_DYNAMIC_STORAGE_BIT 0x0100 #define GL_EDGEFLAG_BIT_PGI 0x00040000 #define GL_EDGE_FLAG 0x0B43 #define GL_EDGE_FLAG_ARRAY 0x8079 @@ -1112,26 +1286,11 @@ typedef void GLvoid; #define GL_EQUAL 0x0202 #define GL_EQUIV 0x1509 #define GL_ETC1_RGB8_OES 0x8D64 +#define GL_ETC1_SRGB8_NV 0x88EE #define GL_EVAL_2D_NV 0x86C0 #define GL_EVAL_BIT 0x00010000 #define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 #define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_EVAL_VERTEX_ATRRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATRRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATRRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATRRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATRRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATRRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATRRIB15_NV 0x86D5 -#define GL_EVAL_VERTEX_ATRRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATRRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATRRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATRRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATRRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATRRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATRRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATRRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATRRIB9_NV 0x86CF #define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 #define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 #define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 @@ -1148,6 +1307,7 @@ typedef void GLvoid; #define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD #define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE #define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF +#define GL_EXCLUSION_NV 0x92A0 #define GL_EXP 0x0800 #define GL_EXP2 0x0801 #define GL_EXPAND_NEGATE_NV 0x8539 @@ -1201,10 +1361,22 @@ typedef void GLvoid; #define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D #define GL_FLOAT_MAT2 0x8B5A #define GL_FLOAT_MAT2_ARB 0x8B5A +#define GL_FLOAT_MAT2x3 0x8B65 +#define GL_FLOAT_MAT2x3_NV 0x8B65 +#define GL_FLOAT_MAT2x4 0x8B66 +#define GL_FLOAT_MAT2x4_NV 0x8B66 #define GL_FLOAT_MAT3 0x8B5B #define GL_FLOAT_MAT3_ARB 0x8B5B +#define GL_FLOAT_MAT3x2 0x8B67 +#define GL_FLOAT_MAT3x2_NV 0x8B67 +#define GL_FLOAT_MAT3x4 0x8B68 +#define GL_FLOAT_MAT3x4_NV 0x8B68 #define GL_FLOAT_MAT4 0x8B5C #define GL_FLOAT_MAT4_ARB 0x8B5C +#define GL_FLOAT_MAT4x2 0x8B69 +#define GL_FLOAT_MAT4x2_NV 0x8B69 +#define GL_FLOAT_MAT4x3 0x8B6A +#define GL_FLOAT_MAT4x3_NV 0x8B6A #define GL_FLOAT_R16_NV 0x8884 #define GL_FLOAT_R32_NV 0x8885 #define GL_FLOAT_RG16_NV 0x8886 @@ -1255,32 +1427,28 @@ typedef void GLvoid; #define GL_FOG_DENSITY 0x0B62 #define GL_FOG_DISTANCE_MODE_NV 0x855A #define GL_FOG_END 0x0B64 -#define GL_FOG_FACTOR_TO_ALPHA_SGIX 0x836F #define GL_FOG_FUNC_POINTS_SGIS 0x812B #define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_GEN_MODE_NV 0x855A #define GL_FOG_HINT 0x0C54 #define GL_FOG_INDEX 0x0B61 #define GL_FOG_MODE 0x0B65 #define GL_FOG_OFFSET_SGIX 0x8198 #define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD #define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC #define GL_FOG_START 0x0B63 -#define GL_FONT_ASCENDER_NV 0x00200000 -#define GL_FONT_DESCENDER_NV 0x00400000 -#define GL_FONT_HAS_KERNING_NV 0x10000000 -#define GL_FONT_HEIGHT_NV 0x00800000 -#define GL_FONT_MAX_ADVANCE_HEIGHT_NV 0x02000000 -#define GL_FONT_MAX_ADVANCE_WIDTH_NV 0x01000000 -#define GL_FONT_UNDERLINE_POSITION_NV 0x04000000 -#define GL_FONT_UNDERLINE_THICKNESS_NV 0x08000000 -#define GL_FONT_UNITS_PER_EM_NV 0x00100000 -#define GL_FONT_X_MAX_BOUNDS_NV 0x00040000 -#define GL_FONT_X_MIN_BOUNDS_NV 0x00010000 -#define GL_FONT_Y_MAX_BOUNDS_NV 0x00080000 -#define GL_FONT_Y_MIN_BOUNDS_NV 0x00020000 +#define GL_FONT_ASCENDER_BIT_NV 0x00200000 +#define GL_FONT_DESCENDER_BIT_NV 0x00400000 +#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000 +#define GL_FONT_HEIGHT_BIT_NV 0x00800000 +#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000 +#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000 +#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000 +#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000 +#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000 +#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000 +#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000 +#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000 +#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000 #define GL_FORCE_BLUE_TO_ONE_NV 0x8860 #define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 #define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 @@ -1338,6 +1506,7 @@ typedef void GLvoid; #define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 #define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 #define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 +#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 #define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 #define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211 #define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 @@ -1384,6 +1553,7 @@ typedef void GLvoid; #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES 0x8CD6 +#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES 0x8CD9 #define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB @@ -1401,8 +1571,10 @@ typedef void GLvoid; #define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES 0x8CD7 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134 +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV 0x8D56 #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES 0x8CDC @@ -1469,7 +1641,7 @@ typedef void GLvoid; #define GL_GET_TEXTURE_IMAGE_TYPE 0x8292 #define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA #define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLYPH_HAS_KERNING_NV 0x100 +#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100 #define GL_GLYPH_HEIGHT_BIT_NV 0x02 #define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10 #define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04 @@ -1479,6 +1651,7 @@ typedef void GLvoid; #define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40 #define GL_GLYPH_WIDTH_BIT_NV 0x01 #define GL_GPU_ADDRESS_NV 0x8F34 +#define GL_GPU_DISJOINT_EXT 0x8FBB #define GL_GPU_OPTIMIZED_QCOM 0x8FB2 #define GL_GREATER 0x0204 #define GL_GREEN 0x1904 @@ -1489,8 +1662,10 @@ typedef void GLvoid; #define GL_GREEN_INTEGER_EXT 0x8D95 #define GL_GREEN_MAX_CLAMP_INGR 0x8565 #define GL_GREEN_MIN_CLAMP_INGR 0x8561 +#define GL_GREEN_NV 0x1904 #define GL_GREEN_SCALE 0x0D18 #define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 +#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 #define GL_HALF_APPLE 0x140B #define GL_HALF_BIAS_NEGATE_NV 0x853B #define GL_HALF_BIAS_NORMAL_NV 0x853A @@ -1499,6 +1674,8 @@ typedef void GLvoid; #define GL_HALF_FLOAT_ARB 0x140B #define GL_HALF_FLOAT_NV 0x140B #define GL_HALF_FLOAT_OES 0x8D61 +#define GL_HARDLIGHT_NV 0x929B +#define GL_HARDMIX_NV 0x92A9 #define GL_HIGH_FLOAT 0x8DF2 #define GL_HIGH_INT 0x8DF5 #define GL_HILO16_NV 0x86F8 @@ -1526,6 +1703,10 @@ typedef void GLvoid; #define GL_HI_BIAS_NV 0x8714 #define GL_HI_SCALE_NV 0x870E #define GL_HORIZONTAL_LINE_TO_NV 0x06 +#define GL_HSL_COLOR_NV 0x92AF +#define GL_HSL_HUE_NV 0x92AD +#define GL_HSL_LUMINOSITY_NV 0x92B0 +#define GL_HSL_SATURATION_NV 0x92AE #define GL_IDENTITY_NV 0x862A #define GL_IGNORE_BORDER_HP 0x8150 #define GL_IMAGE_1D 0x904C @@ -1631,6 +1812,7 @@ typedef void GLvoid; #define GL_INDEX_WRITEMASK 0x0C21 #define GL_INFO_LOG_LENGTH 0x8B84 #define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 +#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 #define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 #define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 #define GL_INT 0x1404 @@ -1752,7 +1934,7 @@ typedef void GLvoid; #define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 #define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 #define GL_INVALID_FRAMEBUFFER_OPERATION_OES 0x0506 -#define GL_INVALID_INDEX 0xFFFFFFFFu +#define GL_INVALID_INDEX 0xFFFFFFFF #define GL_INVALID_OPERATION 0x0502 #define GL_INVALID_VALUE 0x0501 #define GL_INVARIANT_DATATYPE_EXT 0x87EB @@ -1762,6 +1944,8 @@ typedef void GLvoid; #define GL_INVERSE_TRANSPOSE_NV 0x862D #define GL_INVERT 0x150A #define GL_INVERTED_SCREEN_W_REND 0x8491 +#define GL_INVERT_OVG_NV 0x92B4 +#define GL_INVERT_RGB_NV 0x92A3 #define GL_IR_INSTRUMENT1_SGIX 0x817F #define GL_ISOLINES 0x8E7A #define GL_IS_PER_PATCH 0x92E7 @@ -1779,6 +1963,9 @@ typedef void GLvoid; #define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027 #define GL_LAYER_NV 0x8DAA #define GL_LAYER_PROVOKING_VERTEX 0x825E +#define GL_LAYOUT_DEFAULT_INTEL 0 +#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2 +#define GL_LAYOUT_LINEAR_INTEL 1 #define GL_LEFT 0x0406 #define GL_LEQUAL 0x0203 #define GL_LERP_ATI 0x8969 @@ -1791,6 +1978,7 @@ typedef void GLvoid; #define GL_LIGHT5 0x4005 #define GL_LIGHT6 0x4006 #define GL_LIGHT7 0x4007 +#define GL_LIGHTEN_NV 0x9298 #define GL_LIGHTING 0x0B50 #define GL_LIGHTING_BIT 0x00000040 #define GL_LIGHT_ENV_MODE_SGIX 0x8407 @@ -1802,6 +1990,9 @@ typedef void GLvoid; #define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 #define GL_LINE 0x1B01 #define GL_LINEAR 0x2601 +#define GL_LINEARBURN_NV 0x92A5 +#define GL_LINEARDODGE_NV 0x92A4 +#define GL_LINEARLIGHT_NV 0x92A7 #define GL_LINEAR_ATTENUATION 0x1208 #define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 #define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F @@ -1847,10 +2038,12 @@ typedef void GLvoid; #define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC #define GL_LOCAL_EXT 0x87C4 #define GL_LOCATION 0x930E +#define GL_LOCATION_COMPONENT 0x934A #define GL_LOCATION_INDEX 0x930F #define GL_LOGIC_OP 0x0BF1 #define GL_LOGIC_OP_MODE 0x0BF0 #define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 +#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 #define GL_LOWER_LEFT 0x8CA1 #define GL_LOW_FLOAT 0x8DF0 #define GL_LOW_INT 0x8DF3 @@ -1865,6 +2058,7 @@ typedef void GLvoid; #define GL_LUMINANCE12_EXT 0x8041 #define GL_LUMINANCE16 0x8042 #define GL_LUMINANCE16F_ARB 0x881E +#define GL_LUMINANCE16F_EXT 0x881E #define GL_LUMINANCE16I_EXT 0x8D8C #define GL_LUMINANCE16UI_EXT 0x8D7A #define GL_LUMINANCE16_ALPHA16 0x8048 @@ -1873,11 +2067,13 @@ typedef void GLvoid; #define GL_LUMINANCE16_EXT 0x8042 #define GL_LUMINANCE16_SNORM 0x9019 #define GL_LUMINANCE32F_ARB 0x8818 +#define GL_LUMINANCE32F_EXT 0x8818 #define GL_LUMINANCE32I_EXT 0x8D86 #define GL_LUMINANCE32UI_EXT 0x8D74 #define GL_LUMINANCE4 0x803F #define GL_LUMINANCE4_ALPHA4 0x8043 #define GL_LUMINANCE4_ALPHA4_EXT 0x8043 +#define GL_LUMINANCE4_ALPHA4_OES 0x8043 #define GL_LUMINANCE4_EXT 0x803F #define GL_LUMINANCE6_ALPHA2 0x8044 #define GL_LUMINANCE6_ALPHA2_EXT 0x8044 @@ -1886,14 +2082,18 @@ typedef void GLvoid; #define GL_LUMINANCE8UI_EXT 0x8D80 #define GL_LUMINANCE8_ALPHA8 0x8045 #define GL_LUMINANCE8_ALPHA8_EXT 0x8045 +#define GL_LUMINANCE8_ALPHA8_OES 0x8045 #define GL_LUMINANCE8_ALPHA8_SNORM 0x9016 #define GL_LUMINANCE8_EXT 0x8040 +#define GL_LUMINANCE8_OES 0x8040 #define GL_LUMINANCE8_SNORM 0x9015 #define GL_LUMINANCE_ALPHA 0x190A #define GL_LUMINANCE_ALPHA16F_ARB 0x881F +#define GL_LUMINANCE_ALPHA16F_EXT 0x881F #define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D #define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B #define GL_LUMINANCE_ALPHA32F_ARB 0x8819 +#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 #define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 #define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 #define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 @@ -1914,6 +2114,7 @@ typedef void GLvoid; #define GL_MAGNITUDE_BIAS_NV 0x8718 #define GL_MAGNITUDE_SCALE_NV 0x8712 #define GL_MAJOR_VERSION 0x821B +#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 #define GL_MALI_SHADER_BINARY_ARM 0x8F60 #define GL_MANUAL_GENERATE_MIPMAP 0x8294 #define GL_MAP1_BINORMAL_EXT 0x8446 @@ -1976,6 +2177,7 @@ typedef void GLvoid; #define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 #define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 #define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 +#define GL_MAP_COHERENT_BIT 0x0080 #define GL_MAP_COLOR 0x0D10 #define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 #define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 @@ -1983,6 +2185,7 @@ typedef void GLvoid; #define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 #define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 #define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 +#define GL_MAP_PERSISTENT_BIT 0x0040 #define GL_MAP_READ_BIT 0x0001 #define GL_MAP_READ_BIT_EXT 0x0001 #define GL_MAP_STENCIL 0x0D11 @@ -2076,6 +2279,7 @@ typedef void GLvoid; #define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 #define GL_MAX_CLIP_DISTANCES 0x0D32 #define GL_MAX_CLIP_PLANES 0x0D32 +#define GL_MAX_CLIP_PLANES_IMG 0x0D32 #define GL_MAX_COLOR_ATTACHMENTS 0x8CDF #define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF #define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF @@ -2091,6 +2295,7 @@ typedef void GLvoid; #define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF #define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39 #define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39 +#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39 #define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC #define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E #define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F @@ -2100,14 +2305,18 @@ typedef void GLvoid; #define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 #define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265 #define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264 +#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB +#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF #define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD -#define GL_MAX_COMPUTE_LOCAL_INVOCATIONS 0x90EB #define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB #define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262 #define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC #define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB #define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263 +#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344 +#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345 #define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE +#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB #define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF #define GL_MAX_CONVOLUTION_HEIGHT 0x801B #define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B @@ -2118,18 +2327,24 @@ typedef void GLvoid; #define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C #define GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES 0x851C #define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR 0x826C #define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 #define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 #define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144 +#define GL_MAX_DEBUG_LOGGED_MESSAGES_KHR 0x9144 #define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 #define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD 0x9143 #define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143 +#define GL_MAX_DEBUG_MESSAGE_LENGTH_KHR 0x9143 +#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV 0x90D1 +#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0 #define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 #define GL_MAX_DEPTH 0x8280 #define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F #define GL_MAX_DRAW_BUFFERS 0x8824 #define GL_MAX_DRAW_BUFFERS_ARB 0x8824 #define GL_MAX_DRAW_BUFFERS_ATI 0x8824 +#define GL_MAX_DRAW_BUFFERS_EXT 0x8824 #define GL_MAX_DRAW_BUFFERS_NV 0x8824 #define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC #define GL_MAX_ELEMENTS_INDICES 0x80E9 @@ -2191,6 +2406,7 @@ typedef void GLvoid; #define GL_MAX_IMAGE_UNITS_EXT 0x8F38 #define GL_MAX_INTEGER_SAMPLES 0x9110 #define GL_MAX_LABEL_LENGTH 0x82E8 +#define GL_MAX_LABEL_LENGTH_KHR 0x82E8 #define GL_MAX_LAYERS 0x8281 #define GL_MAX_LIGHTS 0x0D31 #define GL_MAX_LIST_NESTING 0x0B31 @@ -2248,8 +2464,8 @@ typedef void GLvoid; #define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44 #define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 #define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 +#define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT 0x8905 #define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F #define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F #define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F #define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F @@ -2267,8 +2483,10 @@ typedef void GLvoid; #define GL_MAX_RENDERBUFFER_SIZE_OES 0x84E8 #define GL_MAX_SAMPLES 0x8D57 #define GL_MAX_SAMPLES_ANGLE 0x8D57 +#define GL_MAX_SAMPLES_APPLE 0x8D57 #define GL_MAX_SAMPLES_EXT 0x8D57 #define GL_MAX_SAMPLES_IMG 0x9135 +#define GL_MAX_SAMPLES_NV 0x8D57 #define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 #define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59 #define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 @@ -2278,8 +2496,11 @@ typedef void GLvoid; #define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD #define GL_MAX_SHININESS_NV 0x8504 #define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199 +#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199 #define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A +#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A #define GL_MAX_SPARSE_TEXTURE_SIZE_AMD 0x9198 +#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB 0x9198 #define GL_MAX_SPOT_EXPONENT_NV 0x8505 #define GL_MAX_SUBROUTINES 0x8DE7 #define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 @@ -2347,6 +2568,7 @@ typedef void GLvoid; #define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 #define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA #define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9 +#define GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 #define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 #define GL_MAX_VERTEX_HINT_PGI 0x1A22D #define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA @@ -2382,12 +2604,15 @@ typedef void GLvoid; #define GL_MINMAX_SINK 0x8030 #define GL_MINMAX_SINK_EXT 0x8030 #define GL_MINOR_VERSION 0x821C +#define GL_MINUS_CLAMPED_NV 0x92B3 +#define GL_MINUS_NV 0x929F #define GL_MIN_EXT 0x8007 #define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B #define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B #define GL_MIN_LOD_WARNING_AMD 0x919C #define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC #define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 +#define GL_MIN_PROGRAM_TEXEL_OFFSET_EXT 0x8904 #define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 #define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E #define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E @@ -2395,6 +2620,7 @@ typedef void GLvoid; #define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 #define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37 #define GL_MIN_SPARSE_LEVEL_AMD 0x919B +#define GL_MIN_SPARSE_LEVEL_ARB 0x919B #define GL_MIPMAP 0x8293 #define GL_MIRRORED_REPEAT 0x8370 #define GL_MIRRORED_REPEAT_ARB 0x8370 @@ -2403,12 +2629,16 @@ typedef void GLvoid; #define GL_MIRROR_CLAMP_ATI 0x8742 #define GL_MIRROR_CLAMP_EXT 0x8742 #define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 +#define GL_MIRROR_CLAMP_TO_EDGE 0x8743 #define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 #define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 #define GL_MITER_REVERT_NV 0x90A7 #define GL_MITER_TRUNCATE_NV 0x90A8 #define GL_MODELVIEW 0x1700 #define GL_MODELVIEW0_ARB 0x1700 +#define GL_MODELVIEW0_EXT 0x1700 +#define GL_MODELVIEW0_MATRIX_EXT 0x0BA6 +#define GL_MODELVIEW0_STACK_DEPTH_EXT 0x0BA3 #define GL_MODELVIEW10_ARB 0x872A #define GL_MODELVIEW11_ARB 0x872B #define GL_MODELVIEW12_ARB 0x872C @@ -2444,7 +2674,6 @@ typedef void GLvoid; #define GL_MODELVIEW8_ARB 0x8728 #define GL_MODELVIEW9_ARB 0x8729 #define GL_MODELVIEW_MATRIX 0x0BA6 -#define GL_MODELVIEW_MATRIX1_EXT 0x8506 #define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES 0x898D #define GL_MODELVIEW_PROJECTION_NV 0x8629 #define GL_MODELVIEW_STACK_DEPTH 0x0BA3 @@ -2458,6 +2687,7 @@ typedef void GLvoid; #define GL_MOVE_TO_RESETS_NV 0x90B5 #define GL_MOV_ATI 0x8961 #define GL_MULT 0x0103 +#define GL_MULTIPLY_NV 0x9294 #define GL_MULTISAMPLE 0x809D #define GL_MULTISAMPLE_3DFX 0x86B2 #define GL_MULTISAMPLE_ARB 0x809D @@ -2465,12 +2695,19 @@ typedef void GLvoid; #define GL_MULTISAMPLE_BIT_3DFX 0x20000000 #define GL_MULTISAMPLE_BIT_ARB 0x20000000 #define GL_MULTISAMPLE_BIT_EXT 0x20000000 +#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000 +#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000 +#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000 +#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000 +#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000 +#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000 +#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000 +#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000 #define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 #define GL_MULTISAMPLE_EXT 0x809D #define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 #define GL_MULTISAMPLE_SGIS 0x809D #define GL_MULTIVIEW_EXT 0x90F1 -#define GL_MULTI_HULLS_NV 0x908C #define GL_MUL_ATI 0x8964 #define GL_MVP_MATRIX_EXT 0x87E3 #define GL_N3F_V3F 0x2A25 @@ -2494,9 +2731,11 @@ typedef void GLvoid; #define GL_NEGATIVE_Y_EXT 0x87DA #define GL_NEGATIVE_Z_EXT 0x87DB #define GL_NEVER 0x0200 +#define GL_NEXT_BUFFER_NV -2 #define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025 #define GL_NICEST 0x1102 #define GL_NONE 0 +#define GL_NONE_OES 0 #define GL_NOOP 0x1505 #define GL_NOR 0x1508 #define GL_NORMALIZE 0x0BA1 @@ -2526,6 +2765,7 @@ typedef void GLvoid; #define GL_NOTEQUAL 0x0205 #define GL_NO_ERROR 0 #define GL_NO_RESET_NOTIFICATION_ARB 0x8261 +#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 #define GL_NUM_ACTIVE_VARIABLES 0x9304 #define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A #define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 @@ -2546,6 +2786,7 @@ typedef void GLvoid; #define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 #define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 #define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024 +#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB 0x91A8 #define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 #define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A #define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 @@ -2580,7 +2821,10 @@ typedef void GLvoid; #define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 #define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 #define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 +#define GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3 +#define GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1 #define GL_OFFSET_TEXTURE_2D_NV 0x86E8 +#define GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2 #define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 #define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 #define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C @@ -2683,6 +2927,7 @@ typedef void GLvoid; #define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 #define GL_OUTPUT_VERTEX_EXT 0x879A #define GL_OUT_OF_MEMORY 0x0505 +#define GL_OVERLAY_NV 0x9296 #define GL_PACK_ALIGNMENT 0x0D05 #define GL_PACK_CMYK_HINT_EXT 0x800E #define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D @@ -2719,6 +2964,8 @@ typedef void GLvoid; #define GL_PALETTE8_RGBA4_OES 0x8B98 #define GL_PALETTE8_RGBA8_OES 0x8B96 #define GL_PARALLEL_ARRAYS_INTEL 0x83F4 +#define GL_PARAMETER_BUFFER_ARB 0x80EE +#define GL_PARAMETER_BUFFER_BINDING_ARB 0x80EF #define GL_PARTIAL_SUCCESS_NV 0x902E #define GL_PASS_THROUGH_NV 0x86E6 #define GL_PASS_THROUGH_TOKEN 0x0700 @@ -2753,17 +3000,14 @@ typedef void GLvoid; #define GL_PATH_JOIN_STYLE_NV 0x9079 #define GL_PATH_MITER_LIMIT_NV 0x907A #define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A -#define GL_PATH_SAMPLE_QUALITY_NV 0x9085 #define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD #define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE #define GL_PATH_STENCIL_FUNC_NV 0x90B7 #define GL_PATH_STENCIL_REF_NV 0x90B8 #define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9 #define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2 -#define GL_PATH_STROKE_BOUND_NV 0x9086 #define GL_PATH_STROKE_COVER_MODE_NV 0x9083 #define GL_PATH_STROKE_MASK_NV 0x9084 -#define GL_PATH_STROKE_OVERSAMPLE_COUNT_NV 0x9087 #define GL_PATH_STROKE_WIDTH_NV 0x9075 #define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D #define GL_PATH_TERMINAL_END_CAP_NV 0x9078 @@ -2778,6 +3022,7 @@ typedef void GLvoid; #define GL_PER_STAGE_CONSTANTS_NV 0x8535 #define GL_PHONG_HINT_WIN 0x80EB #define GL_PHONG_WIN 0x80EA +#define GL_PINLIGHT_NV 0x92A8 #define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080 #define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080 #define GL_PIXEL_COUNTER_BITS_NV 0x8864 @@ -2846,6 +3091,10 @@ typedef void GLvoid; #define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF #define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF #define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC +#define GL_PLUS_CLAMPED_ALPHA_NV 0x92B2 +#define GL_PLUS_CLAMPED_NV 0x92B1 +#define GL_PLUS_DARKER_NV 0x9292 +#define GL_PLUS_NV 0x9291 #define GL_PN_TRIANGLES_ATI 0x87F0 #define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 #define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 @@ -2885,6 +3134,7 @@ typedef void GLvoid; #define GL_POINT_SPRITE_ARB 0x8861 #define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 #define GL_POINT_SPRITE_NV 0x8861 +#define GL_POINT_SPRITE_OES 0x8861 #define GL_POINT_SPRITE_R_MODE_NV 0x8863 #define GL_POINT_TOKEN 0x0701 #define GL_POLYGON 0x0009 @@ -2963,6 +3213,7 @@ typedef void GLvoid; #define GL_PRIMITIVE_ID_NV 0x8C7C #define GL_PRIMITIVE_RESTART 0x8F9D #define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 +#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 #define GL_PRIMITIVE_RESTART_INDEX 0x8F9E #define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 #define GL_PRIMITIVE_RESTART_NV 0x8558 @@ -2971,6 +3222,7 @@ typedef void GLvoid; #define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 #define GL_PROGRAM_ATTRIBS_ARB 0x88AC #define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 +#define GL_PROGRAM_BINARY_ANGLE 0x93A6 #define GL_PROGRAM_BINARY_FORMATS 0x87FF #define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF #define GL_PROGRAM_BINARY_LENGTH 0x8741 @@ -2985,6 +3237,7 @@ typedef void GLvoid; #define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 #define GL_PROGRAM_INPUT 0x92E3 #define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 +#define GL_PROGRAM_KHR 0x82E2 #define GL_PROGRAM_LENGTH_ARB 0x8627 #define GL_PROGRAM_LENGTH_NV 0x8627 #define GL_PROGRAM_MATRIX_EXT 0x8E2D @@ -3024,8 +3277,6 @@ typedef void GLvoid; #define GL_PROJECTION_MATRIX 0x0BA7 #define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES 0x898E #define GL_PROJECTION_STACK_DEPTH 0x0BA4 -#define GL_PROJECTIVE_2D_NV 0x9093 -#define GL_PROJECTIVE_3D_NV 0x9095 #define GL_PROVOKING_VERTEX 0x8E4F #define GL_PROVOKING_VERTEX_EXT 0x8E4F #define GL_PROXY_COLOR_TABLE 0x80D3 @@ -3079,7 +3330,10 @@ typedef void GLvoid; #define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 #define GL_QUARTER_BIT_ATI 0x00000010 #define GL_QUERY 0x82E3 +#define GL_QUERY_BUFFER 0x9192 #define GL_QUERY_BUFFER_AMD 0x9192 +#define GL_QUERY_BUFFER_BARRIER_BIT 0x00008000 +#define GL_QUERY_BUFFER_BINDING 0x9193 #define GL_QUERY_BUFFER_BINDING_AMD 0x9193 #define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 #define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16 @@ -3087,6 +3341,8 @@ typedef void GLvoid; #define GL_QUERY_BY_REGION_WAIT_NV 0x8E15 #define GL_QUERY_COUNTER_BITS 0x8864 #define GL_QUERY_COUNTER_BITS_ARB 0x8864 +#define GL_QUERY_COUNTER_BITS_EXT 0x8864 +#define GL_QUERY_KHR 0x82E3 #define GL_QUERY_NO_WAIT 0x8E14 #define GL_QUERY_NO_WAIT_NV 0x8E14 #define GL_QUERY_OBJECT_AMD 0x9153 @@ -3097,6 +3353,7 @@ typedef void GLvoid; #define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 #define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867 #define GL_QUERY_RESULT_EXT 0x8866 +#define GL_QUERY_RESULT_NO_WAIT 0x9194 #define GL_QUERY_RESULT_NO_WAIT_AMD 0x9194 #define GL_QUERY_WAIT 0x8E13 #define GL_QUERY_WAIT_NV 0x8E13 @@ -3118,6 +3375,7 @@ typedef void GLvoid; #define GL_R1UI_T2F_V3F_SUN 0x85C9 #define GL_R1UI_V3F_SUN 0x85C4 #define GL_R32F 0x822E +#define GL_R32F_EXT 0x822E #define GL_R32I 0x8235 #define GL_R32UI 0x8236 #define GL_R3_G3_B2 0x2A10 @@ -3135,9 +3393,14 @@ typedef void GLvoid; #define GL_READ_BUFFER_NV 0x0C02 #define GL_READ_FRAMEBUFFER 0x8CA8 #define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 +#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8 #define GL_READ_FRAMEBUFFER_BINDING 0x8CAA +#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA +#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA #define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA +#define GL_READ_FRAMEBUFFER_BINDING_NV 0x8CAA #define GL_READ_FRAMEBUFFER_EXT 0x8CA8 +#define GL_READ_FRAMEBUFFER_NV 0x8CA8 #define GL_READ_ONLY 0x88B8 #define GL_READ_ONLY_ARB 0x88B8 #define GL_READ_PIXELS 0x828C @@ -3162,6 +3425,7 @@ typedef void GLvoid; #define GL_RED_INTEGER_EXT 0x8D94 #define GL_RED_MAX_CLAMP_INGR 0x8564 #define GL_RED_MIN_CLAMP_INGR 0x8560 +#define GL_RED_NV 0x1903 #define GL_RED_SCALE 0x0D14 #define GL_RED_SNORM 0x8F90 #define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B @@ -3258,8 +3522,10 @@ typedef void GLvoid; #define GL_RENDERBUFFER_RED_SIZE_OES 0x8D50 #define GL_RENDERBUFFER_SAMPLES 0x8CAB #define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB +#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB #define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB #define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 +#define GL_RENDERBUFFER_SAMPLES_NV 0x8CAB #define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 #define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 #define GL_RENDERBUFFER_STENCIL_SIZE_OES 0x8D55 @@ -3293,6 +3559,7 @@ typedef void GLvoid; #define GL_RESCALE_NORMAL 0x803A #define GL_RESCALE_NORMAL_EXT 0x803A #define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 +#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 #define GL_RESTART_PATH_NV 0xF0 #define GL_RESTART_SUN 0x0001 #define GL_RETAINED_APPLE 0x8A1B @@ -3305,6 +3572,7 @@ typedef void GLvoid; #define GL_RG16UI 0x823A #define GL_RG16_SNORM 0x8F99 #define GL_RG32F 0x8230 +#define GL_RG32F_EXT 0x8230 #define GL_RG32I 0x823B #define GL_RG32UI 0x823C #define GL_RG8 0x822B @@ -3333,6 +3601,7 @@ typedef void GLvoid; #define GL_RGB2_EXT 0x804E #define GL_RGB32F 0x8815 #define GL_RGB32F_ARB 0x8815 +#define GL_RGB32F_EXT 0x8815 #define GL_RGB32I 0x8D83 #define GL_RGB32I_EXT 0x8D83 #define GL_RGB32UI 0x8D71 @@ -3353,6 +3622,7 @@ typedef void GLvoid; #define GL_RGB8UI 0x8D7D #define GL_RGB8UI_EXT 0x8D7D #define GL_RGB8_EXT 0x8051 +#define GL_RGB8_OES 0x8051 #define GL_RGB8_SNORM 0x8F96 #define GL_RGB9_E5 0x8C3D #define GL_RGB9_E5_EXT 0x8C3D @@ -3373,6 +3643,7 @@ typedef void GLvoid; #define GL_RGBA2_EXT 0x8055 #define GL_RGBA32F 0x8814 #define GL_RGBA32F_ARB 0x8814 +#define GL_RGBA32F_EXT 0x8814 #define GL_RGBA32I 0x8D82 #define GL_RGBA32I_EXT 0x8D82 #define GL_RGBA32UI 0x8D70 @@ -3388,6 +3659,7 @@ typedef void GLvoid; #define GL_RGBA8UI 0x8D7C #define GL_RGBA8UI_EXT 0x8D7C #define GL_RGBA8_EXT 0x8058 +#define GL_RGBA8_OES 0x8058 #define GL_RGBA8_SNORM 0x8F97 #define GL_RGBA_DXT5_S3TC 0x83A4 #define GL_RGBA_FLOAT16_APPLE 0x881A @@ -3411,6 +3683,7 @@ typedef void GLvoid; #define GL_RGB_FLOAT32_ATI 0x8815 #define GL_RGB_INTEGER 0x8D98 #define GL_RGB_INTEGER_EXT 0x8D98 +#define GL_RGB_RAW_422_APPLE 0x8A51 #define GL_RGB_S3TC 0x83A0 #define GL_RGB_SCALE 0x8573 #define GL_RGB_SCALE_ARB 0x8573 @@ -3437,6 +3710,7 @@ typedef void GLvoid; #define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 #define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 #define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 +#define GL_SAMPLER_2D_ARRAY_SHADOW_NV 0x8DC4 #define GL_SAMPLER_2D_MULTISAMPLE 0x9108 #define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B #define GL_SAMPLER_2D_RECT 0x8B63 @@ -3461,7 +3735,9 @@ typedef void GLvoid; #define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D #define GL_SAMPLER_CUBE_SHADOW 0x8DC5 #define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 +#define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5 #define GL_SAMPLER_EXTERNAL_OES 0x8D66 +#define GL_SAMPLER_KHR 0x82E6 #define GL_SAMPLER_OBJECT_AMD 0x9155 #define GL_SAMPLER_RENDERBUFFER_NV 0x8E56 #define GL_SAMPLES 0x80A9 @@ -3518,6 +3794,7 @@ typedef void GLvoid; #define GL_SCISSOR_BOX 0x0C10 #define GL_SCISSOR_TEST 0x0C11 #define GL_SCREEN_COORDINATES_REND 0x8490 +#define GL_SCREEN_NV 0x9295 #define GL_SECONDARY_COLOR_ARRAY 0x845E #define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 #define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C @@ -3563,11 +3840,12 @@ typedef void GLvoid; #define GL_SHADER_IMAGE_LOAD 0x82A4 #define GL_SHADER_IMAGE_STORE 0x82A5 #define GL_SHADER_INCLUDE_ARB 0x8DAE +#define GL_SHADER_KHR 0x82E1 #define GL_SHADER_OBJECT_ARB 0x8B48 #define GL_SHADER_OBJECT_EXT 0x8B48 #define GL_SHADER_OPERATION_NV 0x86DF #define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_SHADER_STORAGE_BARRIER_BIT 0x2000 +#define GL_SHADER_STORAGE_BARRIER_BIT 0x00002000 #define GL_SHADER_STORAGE_BLOCK 0x92E6 #define GL_SHADER_STORAGE_BUFFER 0x90D2 #define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3 @@ -3612,6 +3890,10 @@ typedef void GLvoid; #define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF #define GL_SINGLE_COLOR 0x81F9 #define GL_SINGLE_COLOR_EXT 0x81F9 +#define GL_SKIP_COMPONENTS1_NV -6 +#define GL_SKIP_COMPONENTS2_NV -5 +#define GL_SKIP_COMPONENTS3_NV -4 +#define GL_SKIP_COMPONENTS4_NV -3 #define GL_SKIP_DECODE_EXT 0x8A4A #define GL_SKIP_MISSING_GLYPH_NV 0x90A9 #define GL_SLICE_ACCUM_SUN 0x85CC @@ -3622,10 +3904,14 @@ typedef void GLvoid; #define GL_SLUMINANCE8 0x8C47 #define GL_SLUMINANCE8_ALPHA8 0x8C45 #define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 +#define GL_SLUMINANCE8_ALPHA8_NV 0x8C45 #define GL_SLUMINANCE8_EXT 0x8C47 +#define GL_SLUMINANCE8_NV 0x8C47 #define GL_SLUMINANCE_ALPHA 0x8C44 #define GL_SLUMINANCE_ALPHA_EXT 0x8C44 +#define GL_SLUMINANCE_ALPHA_NV 0x8C44 #define GL_SLUMINANCE_EXT 0x8C46 +#define GL_SLUMINANCE_NV 0x8C46 #define GL_SMALL_CCW_ARC_TO_NV 0x12 #define GL_SMALL_CW_ARC_TO_NV 0x14 #define GL_SMOOTH 0x1D01 @@ -3635,6 +3921,7 @@ typedef void GLvoid; #define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 #define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 #define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E +#define GL_SOFTLIGHT_NV 0x929C #define GL_SOURCE0_ALPHA 0x8588 #define GL_SOURCE0_ALPHA_ARB 0x8588 #define GL_SOURCE0_ALPHA_EXT 0x8588 @@ -3658,6 +3945,7 @@ typedef void GLvoid; #define GL_SPARE0_NV 0x852E #define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 #define GL_SPARE1_NV 0x852F +#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9 #define GL_SPECULAR 0x1202 #define GL_SPHERE_MAP 0x2402 #define GL_SPOT_CUTOFF 0x1206 @@ -3680,12 +3968,18 @@ typedef void GLvoid; #define GL_SRC2_RGB 0x8582 #define GL_SRC_ALPHA 0x0302 #define GL_SRC_ALPHA_SATURATE 0x0308 +#define GL_SRC_ATOP_NV 0x928E #define GL_SRC_COLOR 0x0300 +#define GL_SRC_IN_NV 0x928A +#define GL_SRC_NV 0x9286 +#define GL_SRC_OUT_NV 0x928C +#define GL_SRC_OVER_NV 0x9288 #define GL_SRGB 0x8C40 #define GL_SRGB8 0x8C41 #define GL_SRGB8_ALPHA8 0x8C43 #define GL_SRGB8_ALPHA8_EXT 0x8C43 #define GL_SRGB8_EXT 0x8C41 +#define GL_SRGB8_NV 0x8C41 #define GL_SRGB_ALPHA 0x8C42 #define GL_SRGB_ALPHA_EXT 0x8C42 #define GL_SRGB_DECODE_ARB 0x8299 @@ -3693,7 +3987,9 @@ typedef void GLvoid; #define GL_SRGB_READ 0x8297 #define GL_SRGB_WRITE 0x8298 #define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_OVERFLOW_KHR 0x0503 #define GL_STACK_UNDERFLOW 0x0504 +#define GL_STACK_UNDERFLOW_KHR 0x0504 #define GL_STANDARD_FONT_NAME_NV 0x9072 #define GL_STATE_RESTORE 0x8BDC #define GL_STATIC_ATI 0x8760 @@ -3703,6 +3999,7 @@ typedef void GLvoid; #define GL_STATIC_DRAW_ARB 0x88E4 #define GL_STATIC_READ 0x88E5 #define GL_STATIC_READ_ARB 0x88E5 +#define GL_STATIC_VERTEX_ARRAY_IBM 103061 #define GL_STENCIL 0x1802 #define GL_STENCIL_ATTACHMENT 0x8D20 #define GL_STENCIL_ATTACHMENT_EXT 0x8D20 @@ -3721,6 +4018,14 @@ typedef void GLvoid; #define GL_STENCIL_BACK_WRITEMASK 0x8CA5 #define GL_STENCIL_BITS 0x0D57 #define GL_STENCIL_BUFFER_BIT 0x00000400 +#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000 +#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000 +#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000 +#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000 +#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000 +#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000 +#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000 +#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000 #define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 #define GL_STENCIL_CLEAR_VALUE 0x0B91 #define GL_STENCIL_COMPONENTS 0x8285 @@ -3942,6 +4247,7 @@ typedef void GLvoid; #define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 #define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 #define GL_TEXTURE_BINDING_3D 0x806A +#define GL_TEXTURE_BINDING_3D_OES 0x806A #define GL_TEXTURE_BINDING_BUFFER 0x8C2C #define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C #define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C @@ -3963,9 +4269,11 @@ typedef void GLvoid; #define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 #define GL_TEXTURE_BORDER 0x1005 #define GL_TEXTURE_BORDER_COLOR 0x1004 +#define GL_TEXTURE_BORDER_COLOR_NV 0x1004 #define GL_TEXTURE_BORDER_VALUES_NV 0x871A #define GL_TEXTURE_BUFFER 0x8C2A #define GL_TEXTURE_BUFFER_ARB 0x8C2A +#define GL_TEXTURE_BUFFER_BINDING 0x8C2A #define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D #define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D #define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D @@ -4084,6 +4392,7 @@ typedef void GLvoid; #define GL_TEXTURE_GATHER 0x82A2 #define GL_TEXTURE_GATHER_SHADOW 0x82A3 #define GL_TEXTURE_GEN_MODE 0x2500 +#define GL_TEXTURE_GEN_MODE_OES 0x2500 #define GL_TEXTURE_GEN_Q 0x0C63 #define GL_TEXTURE_GEN_R 0x0C62 #define GL_TEXTURE_GEN_S 0x0C60 @@ -4101,6 +4410,7 @@ typedef void GLvoid; #define GL_TEXTURE_IMAGE_TYPE 0x8290 #define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8 #define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F +#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F #define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF #define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED #define GL_TEXTURE_INTENSITY_SIZE 0x8061 @@ -4133,9 +4443,11 @@ typedef void GLvoid; #define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 #define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A #define GL_TEXTURE_MAX_LEVEL 0x813D +#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D #define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D #define GL_TEXTURE_MAX_LOD 0x813B #define GL_TEXTURE_MAX_LOD_SGIS 0x813B +#define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF #define GL_TEXTURE_MIN_FILTER 0x2801 #define GL_TEXTURE_MIN_LOD 0x813A #define GL_TEXTURE_MIN_LOD_SGIS 0x813A @@ -4166,6 +4478,7 @@ typedef void GLvoid; #define GL_TEXTURE_SHADOW 0x82A1 #define GL_TEXTURE_SHARED_SIZE 0x8C3F #define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F +#define GL_TEXTURE_SPARSE_ARB 0x91A6 #define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 #define GL_TEXTURE_STACK_DEPTH 0x0BA5 #define GL_TEXTURE_STENCIL_SIZE 0x88F1 @@ -4205,9 +4518,10 @@ typedef void GLvoid; #define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 #define GL_TIMEOUT_EXPIRED 0x911B #define GL_TIMEOUT_EXPIRED_APPLE 0x911B -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull -#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull +#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF +#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFF #define GL_TIMESTAMP 0x8E28 +#define GL_TIMESTAMP_EXT 0x8E28 #define GL_TIME_ELAPSED 0x88BF #define GL_TIME_ELAPSED_EXT 0x88BF #define GL_TOP_LEVEL_ARRAY_SIZE 0x930C @@ -4232,15 +4546,18 @@ typedef void GLvoid; #define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 #define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25 #define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 #define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24 #define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F #define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F #define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F #define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B #define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F #define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F #define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F #define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 #define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23 #define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 #define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85 @@ -4248,6 +4565,7 @@ typedef void GLvoid; #define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 #define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84 #define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 +#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C #define GL_TRANSFORM_FEEDBACK_NV 0x8E22 #define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23 #define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 @@ -4277,8 +4595,6 @@ typedef void GLvoid; #define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E #define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 #define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_PROJECTIVE_2D_NV 0x9097 -#define GL_TRANSPOSE_PROJECTIVE_3D_NV 0x9099 #define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 #define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 #define GL_TRIANGLES 0x0004 @@ -4295,7 +4611,7 @@ typedef void GLvoid; #define GL_TRIANGULAR_NV 0x90A5 #define GL_TRUE 1 #define GL_TYPE 0x92FA -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 +#define GL_UNCORRELATED_NV 0x9282 #define GL_UNDEFINED_APPLE 0x8A1C #define GL_UNDEFINED_VERTEX 0x8260 #define GL_UNIFORM 0x92E1 @@ -4330,27 +4646,34 @@ typedef void GLvoid; #define GL_UNIFORM_SIZE 0x8A38 #define GL_UNIFORM_TYPE 0x8A37 #define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 +#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 #define GL_UNPACK_ALIGNMENT 0x0CF5 #define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 #define GL_UNPACK_CMYK_HINT_EXT 0x800F +#define GL_UNPACK_COLORSPACE_CONVERSION_WEBGL 0x9243 #define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129 #define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128 #define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A #define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127 #define GL_UNPACK_COMPRESSED_SIZE_SGIX 0x831A #define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 +#define GL_UNPACK_FLIP_Y_WEBGL 0x9240 #define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 #define GL_UNPACK_IMAGE_HEIGHT 0x806E #define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E #define GL_UNPACK_LSB_FIRST 0x0CF1 +#define GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL 0x9241 #define GL_UNPACK_RESAMPLE_OML 0x8985 #define GL_UNPACK_RESAMPLE_SGIX 0x842D #define GL_UNPACK_ROW_BYTES_APPLE 0x8A16 #define GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2 #define GL_UNPACK_SKIP_IMAGES 0x806D #define GL_UNPACK_SKIP_IMAGES_EXT 0x806D #define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#define GL_UNPACK_SKIP_PIXELS_EXT 0x0CF4 #define GL_UNPACK_SKIP_ROWS 0x0CF3 +#define GL_UNPACK_SKIP_ROWS_EXT 0x0CF3 #define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 #define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 #define GL_UNPACK_SWAP_BYTES 0x0CF0 @@ -4368,6 +4691,7 @@ typedef void GLvoid; #define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2 #define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 #define GL_UNSIGNED_INT64_AMD 0x8BC2 +#define GL_UNSIGNED_INT64_ARB 0x140F #define GL_UNSIGNED_INT64_NV 0x140F #define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 #define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 @@ -4449,7 +4773,6 @@ typedef void GLvoid; #define GL_UNSIGNED_INT_VEC4 0x8DC8 #define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 #define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_UNSIGNED_NEGATE_NV 0x853D #define GL_UNSIGNED_NORMALIZED 0x8C17 #define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 #define GL_UNSIGNED_NORMALIZED_EXT 0x8C17 @@ -4462,6 +4785,7 @@ typedef void GLvoid; #define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 #define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 #define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365 #define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 #define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 #define GL_UNSIGNED_SHORT_5_6_5 0x8363 @@ -4497,26 +4821,21 @@ typedef void GLvoid; #define GL_VECTOR_EXT 0x87BF #define GL_VENDOR 0x1F00 #define GL_VERSION 0x1F02 -#define GL_VERSION_1_1 1 -#define GL_VERSION_1_2 1 -#define GL_VERSION_1_3 1 -#define GL_VERSION_1_4 1 -#define GL_VERSION_1_5 1 -#define GL_VERSION_2_0 1 -#define GL_VERSION_2_1 1 -#define GL_VERSION_3_0 1 -#define GL_VERSION_3_1 1 -#define GL_VERSION_3_2 1 +#define GL_VERSION_ES_CL_1_0 1 +#define GL_VERSION_ES_CL_1_1 1 +#define GL_VERSION_ES_CM_1_1 1 #define GL_VERTEX23_BIT_PGI 0x00000004 #define GL_VERTEX4_BIT_PGI 0x00000008 #define GL_VERTEX_ARRAY 0x8074 #define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21 #define GL_VERTEX_ARRAY_BINDING 0x85B5 #define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 +#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 #define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 #define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 #define GL_VERTEX_ARRAY_COUNT_EXT 0x807D #define GL_VERTEX_ARRAY_EXT 0x8074 +#define GL_VERTEX_ARRAY_KHR 0x8074 #define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B #define GL_VERTEX_ARRAY_LIST_IBM 103070 #define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 @@ -4564,9 +4883,12 @@ typedef void GLvoid; #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT 0x88FE +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV 0x88FE #define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 #define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 #define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD +#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD #define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD #define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A #define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E @@ -4599,14 +4921,16 @@ typedef void GLvoid; #define GL_VERTEX_BLEND_ARB 0x86A7 #define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B #define GL_VERTEX_DATA_HINT_PGI 0x1A22A +#define GL_VERTEX_ELEMENT_SWIZZLE_AMD 0x91A4 #define GL_VERTEX_ID_NV 0x8C7B +#define GL_VERTEX_ID_SWIZZLE_AMD 0x91A5 #define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF #define GL_VERTEX_PRECLIP_SGIX 0x83EE #define GL_VERTEX_PROGRAM_ARB 0x8620 #define GL_VERTEX_PROGRAM_BINDING_NV 0x864A #define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8BB7 #define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8BB6 -#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8BB4 +#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8BB5 #define GL_VERTEX_PROGRAM_NV 0x8620 #define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 #define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 @@ -4686,9 +5010,14 @@ typedef void GLvoid; #define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE #define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF #define GL_VIEW_COMPATIBILITY_CLASS 0x82B6 +#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB 0x91A7 #define GL_VIRTUAL_PAGE_SIZE_X_AMD 0x9195 +#define GL_VIRTUAL_PAGE_SIZE_X_ARB 0x9195 #define GL_VIRTUAL_PAGE_SIZE_Y_AMD 0x9196 +#define GL_VIRTUAL_PAGE_SIZE_Y_ARB 0x9196 #define GL_VIRTUAL_PAGE_SIZE_Z_AMD 0x9197 +#define GL_VIRTUAL_PAGE_SIZE_Z_ARB 0x9197 +#define GL_VIVIDLIGHT_NV 0x92A6 #define GL_VOLATILE_APPLE 0x8A1A #define GL_WAIT_FAILED 0x911D #define GL_WAIT_FAILED_APPLE 0x911D @@ -4718,6 +5047,7 @@ typedef void GLvoid; #define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C #define GL_W_EXT 0x87D8 #define GL_XOR 0x1506 +#define GL_XOR_NV 0x1506 #define GL_X_EXT 0x87D5 #define GL_YCBAYCR8A_4224_NV 0x9032 #define GL_YCBCR_422_APPLE 0x85B9 @@ -4749,7 +5079,7 @@ void GLAPIENTRY glBindTexture(GLenum,GLuint); void GLAPIENTRY glBitmap(GLsizei,GLsizei,GLfloat,GLfloat,GLfloat,GLfloat,const GLubyte*); void GLAPIENTRY glBlendFunc(GLenum,GLenum); void GLAPIENTRY glCallList(GLuint); -void GLAPIENTRY glCallLists(GLsizei,GLenum,const GLvoid*); +void GLAPIENTRY glCallLists(GLsizei,GLenum,const void*); void GLAPIENTRY glClear(GLbitfield); void GLAPIENTRY glClearAccum(GLfloat,GLfloat,GLfloat,GLfloat); void GLAPIENTRY glClearColor(GLfloat,GLfloat,GLfloat,GLfloat); @@ -4791,7 +5121,7 @@ void GLAPIENTRY glColor4us(GLushort,GLushort,GLushort,GLushort); void GLAPIENTRY glColor4usv(const GLushort*); void GLAPIENTRY glColorMask(GLboolean,GLboolean,GLboolean,GLboolean); void GLAPIENTRY glColorMaterial(GLenum,GLenum); -void GLAPIENTRY glColorPointer(GLint,GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glColorPointer(GLint,GLenum,GLsizei,const void*); void GLAPIENTRY glCopyPixels(GLint,GLint,GLsizei,GLsizei,GLenum); void GLAPIENTRY glCopyTexImage1D(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLint); void GLAPIENTRY glCopyTexImage2D(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLsizei,GLint); @@ -4808,10 +5138,10 @@ void GLAPIENTRY glDisable(GLenum); void GLAPIENTRY glDisableClientState(GLenum); void GLAPIENTRY glDrawArrays(GLenum,GLint,GLsizei); void GLAPIENTRY glDrawBuffer(GLenum); -void GLAPIENTRY glDrawElements(GLenum,GLsizei,GLenum,const GLvoid*); -void GLAPIENTRY glDrawPixels(GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); +void GLAPIENTRY glDrawElements(GLenum,GLsizei,GLenum,const void*); +void GLAPIENTRY glDrawPixels(GLsizei,GLsizei,GLenum,GLenum,const void*); void GLAPIENTRY glEdgeFlag(GLboolean); -void GLAPIENTRY glEdgeFlagPointer(GLsizei,const GLvoid*); +void GLAPIENTRY glEdgeFlagPointer(GLsizei,const void*); void GLAPIENTRY glEdgeFlagv(const GLboolean*); void GLAPIENTRY glEnable(GLenum); void GLAPIENTRY glEnableClientState(GLenum); @@ -4856,22 +5186,22 @@ void GLAPIENTRY glGetMaterialiv(GLenum,GLenum,GLint*); void GLAPIENTRY glGetPixelMapfv(GLenum,GLfloat*); void GLAPIENTRY glGetPixelMapuiv(GLenum,GLuint*); void GLAPIENTRY glGetPixelMapusv(GLenum,GLushort*); -void GLAPIENTRY glGetPointerv(GLenum,GLvoid**); +void GLAPIENTRY glGetPointerv(GLenum,void**); void GLAPIENTRY glGetPolygonStipple(GLubyte*); -const GLubyte * GLAPIENTRY glGetString(GLenum); +const GLubyte* GLAPIENTRY glGetString(GLenum); void GLAPIENTRY glGetTexEnvfv(GLenum,GLenum,GLfloat*); void GLAPIENTRY glGetTexEnviv(GLenum,GLenum,GLint*); void GLAPIENTRY glGetTexGendv(GLenum,GLenum,GLdouble*); void GLAPIENTRY glGetTexGenfv(GLenum,GLenum,GLfloat*); void GLAPIENTRY glGetTexGeniv(GLenum,GLenum,GLint*); -void GLAPIENTRY glGetTexImage(GLenum,GLint,GLenum,GLenum,GLvoid*); +void GLAPIENTRY glGetTexImage(GLenum,GLint,GLenum,GLenum,void*); void GLAPIENTRY glGetTexLevelParameterfv(GLenum,GLint,GLenum,GLfloat*); void GLAPIENTRY glGetTexLevelParameteriv(GLenum,GLint,GLenum,GLint*); void GLAPIENTRY glGetTexParameterfv(GLenum,GLenum,GLfloat*); void GLAPIENTRY glGetTexParameteriv(GLenum,GLenum,GLint*); void GLAPIENTRY glHint(GLenum,GLenum); void GLAPIENTRY glIndexMask(GLuint); -void GLAPIENTRY glIndexPointer(GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glIndexPointer(GLenum,GLsizei,const void*); void GLAPIENTRY glIndexd(GLdouble); void GLAPIENTRY glIndexdv(const GLdouble*); void GLAPIENTRY glIndexf(GLfloat); @@ -4883,7 +5213,7 @@ void GLAPIENTRY glIndexsv(const GLshort*); void GLAPIENTRY glIndexub(GLubyte); void GLAPIENTRY glIndexubv(const GLubyte*); void GLAPIENTRY glInitNames(void); -void GLAPIENTRY glInterleavedArrays(GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glInterleavedArrays(GLenum,GLsizei,const void*); GLboolean GLAPIENTRY glIsEnabled(GLenum); GLboolean GLAPIENTRY glIsList(GLuint); GLboolean GLAPIENTRY glIsTexture(GLuint); @@ -4929,12 +5259,12 @@ void GLAPIENTRY glNormal3i(GLint,GLint,GLint); void GLAPIENTRY glNormal3iv(const GLint*); void GLAPIENTRY glNormal3s(GLshort,GLshort,GLshort); void GLAPIENTRY glNormal3sv(const GLshort*); -void GLAPIENTRY glNormalPointer(GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glNormalPointer(GLenum,GLsizei,const void*); void GLAPIENTRY glOrtho(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble); void GLAPIENTRY glPassThrough(GLfloat); -void GLAPIENTRY glPixelMapfv(GLenum,GLint,const GLfloat*); -void GLAPIENTRY glPixelMapuiv(GLenum,GLint,const GLuint*); -void GLAPIENTRY glPixelMapusv(GLenum,GLint,const GLushort*); +void GLAPIENTRY glPixelMapfv(GLenum,GLsizei,const GLfloat*); +void GLAPIENTRY glPixelMapuiv(GLenum,GLsizei,const GLuint*); +void GLAPIENTRY glPixelMapusv(GLenum,GLsizei,const GLushort*); void GLAPIENTRY glPixelStoref(GLenum,GLfloat); void GLAPIENTRY glPixelStorei(GLenum,GLint); void GLAPIENTRY glPixelTransferf(GLenum,GLfloat); @@ -4978,7 +5308,7 @@ void GLAPIENTRY glRasterPos4iv(const GLint*); void GLAPIENTRY glRasterPos4s(GLshort,GLshort,GLshort,GLshort); void GLAPIENTRY glRasterPos4sv(const GLshort*); void GLAPIENTRY glReadBuffer(GLenum); -void GLAPIENTRY glReadPixels(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLvoid*); +void GLAPIENTRY glReadPixels(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,void*); void GLAPIENTRY glRectd(GLdouble,GLdouble,GLdouble,GLdouble); void GLAPIENTRY glRectdv(const GLdouble*,const GLdouble*); void GLAPIENTRY glRectf(GLfloat,GLfloat,GLfloat,GLfloat); @@ -5030,7 +5360,7 @@ void GLAPIENTRY glTexCoord4i(GLint,GLint,GLint,GLint); void GLAPIENTRY glTexCoord4iv(const GLint*); void GLAPIENTRY glTexCoord4s(GLshort,GLshort,GLshort,GLshort); void GLAPIENTRY glTexCoord4sv(const GLshort*); -void GLAPIENTRY glTexCoordPointer(GLint,GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glTexCoordPointer(GLint,GLenum,GLsizei,const void*); void GLAPIENTRY glTexEnvf(GLenum,GLenum,GLfloat); void GLAPIENTRY glTexEnvfv(GLenum,GLenum,const GLfloat*); void GLAPIENTRY glTexEnvi(GLenum,GLenum,GLint); @@ -5041,14 +5371,14 @@ void GLAPIENTRY glTexGenf(GLenum,GLenum,GLfloat); void GLAPIENTRY glTexGenfv(GLenum,GLenum,const GLfloat*); void GLAPIENTRY glTexGeni(GLenum,GLenum,GLint); void GLAPIENTRY glTexGeniv(GLenum,GLenum,const GLint*); -void GLAPIENTRY glTexImage1D(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const GLvoid*); -void GLAPIENTRY glTexImage2D(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*); +void GLAPIENTRY glTexImage1D(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,const void*); +void GLAPIENTRY glTexImage2D(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const void*); void GLAPIENTRY glTexParameterf(GLenum,GLenum,GLfloat); void GLAPIENTRY glTexParameterfv(GLenum,GLenum,const GLfloat*); void GLAPIENTRY glTexParameteri(GLenum,GLenum,GLint); void GLAPIENTRY glTexParameteriv(GLenum,GLenum,const GLint*); -void GLAPIENTRY glTexSubImage1D(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const GLvoid*); -void GLAPIENTRY glTexSubImage2D(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*); +void GLAPIENTRY glTexSubImage1D(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,const void*); +void GLAPIENTRY glTexSubImage2D(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const void*); void GLAPIENTRY glTranslated(GLdouble,GLdouble,GLdouble); void GLAPIENTRY glTranslatef(GLfloat,GLfloat,GLfloat); void GLAPIENTRY glVertex2d(GLdouble,GLdouble); @@ -5075,7 +5405,7 @@ void GLAPIENTRY glVertex4i(GLint,GLint,GLint,GLint); void GLAPIENTRY glVertex4iv(const GLint*); void GLAPIENTRY glVertex4s(GLshort,GLshort,GLshort,GLshort); void GLAPIENTRY glVertex4sv(const GLshort*); -void GLAPIENTRY glVertexPointer(GLint,GLenum,GLsizei,const GLvoid*); +void GLAPIENTRY glVertexPointer(GLint,GLenum,GLsizei,const void*); void GLAPIENTRY glViewport(GLint,GLint,GLsizei,GLsizei); #endif /* __WINE_WGL_H */ diff --git a/reactos/include/reactos/wine/wined3d.h b/reactos/include/reactos/wine/wined3d.h index bf4b39209ca..7ddd4664bff 100644 --- a/reactos/include/reactos/wine/wined3d.h +++ b/reactos/include/reactos/wine/wined3d.h @@ -824,6 +824,7 @@ enum wined3d_display_rotation #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_MASK 0x00004fff +#define WINED3DUSAGE_TEXTURE 0x10000000 #define WINED3DUSAGE_OWNDC 0x20000000 #define WINED3DUSAGE_STATICDECL 0x40000000 #define WINED3DUSAGE_OVERLAY 0x80000000 @@ -1267,6 +1268,7 @@ enum wined3d_display_rotation #define WINEDDBLT_WAIT 0x01000000 #define WINEDDBLT_DEPTHFILL 0x02000000 #define WINEDDBLT_DONOTWAIT 0x08000000 +#define WINEDDBLT_ALPHATEST 0x80000000 /* DDSURFACEDESC.dwFlags */ #define WINEDDSD_CAPS 0x00000001 @@ -1480,18 +1482,9 @@ enum wined3d_display_rotation #define WINEDDCAPS2_STEREO 0x02000000 #define WINEDDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL 0x04000000 -/* DDCAPS.d */ -#define WINEDDPCAPS_4BIT 0x00000001 -#define WINEDDPCAPS_8BITENTRIES 0x00000002 -#define WINEDDPCAPS_8BIT 0x00000004 -#define WINEDDPCAPS_INITIALIZE 0x00000008 -#define WINEDDPCAPS_PRIMARYSURFACE 0x00000010 -#define WINEDDPCAPS_PRIMARYSURFACELEFT 0x00000020 -#define WINEDDPCAPS_ALLOW256 0x00000040 -#define WINEDDPCAPS_VSYNC 0x00000080 -#define WINEDDPCAPS_1BIT 0x00000100 -#define WINEDDPCAPS_2BIT 0x00000200 -#define WINEDDPCAPS_ALPHA 0x00000400 +#define WINED3D_PALETTE_8BIT_ENTRIES 0x00000001 +#define WINED3D_PALETTE_ALLOW_256 0x00000002 +#define WINED3D_PALETTE_ALPHA 0x00000004 #define WINED3D_SURFACE_MAPPABLE 0x00000001 #define WINED3D_SURFACE_DISCARD 0x00000002 @@ -1736,7 +1729,6 @@ struct wined3d_ddraw_caps DWORD color_key_caps; DWORD fx_caps; DWORD fx_alpha_caps; - DWORD pal_caps; DWORD sv_caps; DWORD svb_caps; DWORD svb_color_key_caps; @@ -1979,14 +1971,12 @@ struct wined3d_device_parent_ops { void (__cdecl *wined3d_device_created)(struct wined3d_device_parent *device_parent, struct wined3d_device *device); void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); + HRESULT (__cdecl *surface_created)(struct wined3d_device_parent *device_parent, void *container_parent, + struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops); + HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent, void *container_parent, + struct wined3d_volume *volume, void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *create_swapchain_surface)(struct wined3d_device_parent *device_parent, void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface); - HRESULT (__cdecl *create_texture_surface)(struct wined3d_device_parent *device_parent, void *container_parent, - const struct wined3d_resource_desc *desc, UINT sub_resource_idx, DWORD flags, - struct wined3d_surface **surface); - HRESULT (__cdecl *create_volume)(struct wined3d_device_parent *device_parent, void *container_parent, - UINT width, UINT height, UINT depth, UINT level, enum wined3d_format_id format_id, - enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume); HRESULT (__cdecl *create_swapchain)(struct wined3d_device_parent *device_parent, struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain); }; @@ -2236,12 +2226,10 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, - const PALETTEENTRY *entries, void *parent, struct wined3d_palette **palette); + unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette); ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); -DWORD __cdecl wined3d_palette_get_flags(const struct wined3d_palette *palette); -void * __cdecl wined3d_palette_get_parent(const struct wined3d_palette *palette); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries); @@ -2261,6 +2249,7 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource); HRESULT __cdecl wined3d_resource_get_private_data(const struct wined3d_resource *resource, REFGUID guid, void *data, DWORD *data_size); +void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); HRESULT __cdecl wined3d_resource_set_private_data(struct wined3d_resource *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags); @@ -2303,12 +2292,7 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); -HRESULT __cdecl wined3d_surface_create(struct wined3d_device *device, UINT width, UINT height, - enum wined3d_format_id format_id, DWORD usage, enum wined3d_pool pool, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, DWORD flags, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_surface **surface); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_flip(struct wined3d_surface *surface, struct wined3d_surface *override, DWORD flags); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); @@ -2328,16 +2312,14 @@ HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, void __cdecl wined3d_surface_preload(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc); HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, - DWORD flags, const struct wined3d_color_key *color_key); -HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem, UINT pitch); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); void __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_desc(struct wined3d_surface *surface, UINT width, UINT height, enum wined3d_format_id format_id, - enum wined3d_multisample_type multisample_type, UINT multisample_quality); + enum wined3d_multisample_type multisample_type, UINT multisample_quality, + void *mem, UINT pitch); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx); HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, @@ -2370,12 +2352,7 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -HRESULT __cdecl wined3d_texture_create_2d(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT level_count, DWORD surface_flags, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_texture **texture); -HRESULT __cdecl wined3d_texture_create_3d(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT level_count, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture); -HRESULT __cdecl wined3d_texture_create_cube(struct wined3d_device *device, const struct wined3d_resource_desc *desc, +HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD surface_flags, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture); ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); @@ -2392,6 +2369,8 @@ ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture *texture, enum wined3d_texture_filter_type filter_type); +HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, + DWORD flags, const struct wined3d_color_key *color_key); DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); DWORD __cdecl wined3d_texture_set_priority(struct wined3d_texture *texture, DWORD priority); @@ -2405,9 +2384,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); -HRESULT __cdecl wined3d_volume_create(struct wined3d_device *device, UINT width, UINT height, UINT depth, - UINT level, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, void *parent, - const struct wined3d_parent_ops *parent_ops, struct wined3d_volume **volume); ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume); struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); void * __cdecl wined3d_volume_get_parent(const struct wined3d_volume *volume); From 78cd1ad5571d73f32983203c09092bdef51bc881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sun, 26 Jan 2014 20:55:38 +0000 Subject: [PATCH 075/124] [DDRAW] - Comment out usage of GET_MODULE_HANDLE_EX_FLAG_PIN because it doesn't work. svn path=/trunk/; revision=61844 --- reactos/dll/directx/wine/ddraw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/dll/directx/wine/ddraw/main.c b/reactos/dll/directx/wine/ddraw/main.c index d9665d008f7..7733c6b8696 100644 --- a/reactos/dll/directx/wine/ddraw/main.c +++ b/reactos/dll/directx/wine/ddraw/main.c @@ -879,7 +879,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) * an application would unload ddraw from the WM_DESTROY handler for * that window, it would return to unmapped memory and die. Apparently * this is supposed to work on Windows. */ - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS /*| GET_MODULE_HANDLE_EX_FLAG_PIN*/, (const WCHAR *)&ddraw_self, &ddraw_self)) ERR("Failed to get own module handle.\n"); From 5f866a6e2e633cfaf7ff68dc6f6270b9c6ebf1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sun, 26 Jan 2014 21:26:56 +0000 Subject: [PATCH 076/124] [WINED3D] - Try fixing MSVC build svn path=/trunk/; revision=61845 --- reactos/dll/directx/wine/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/reactos/dll/directx/wine/wined3d/utils.c b/reactos/dll/directx/wine/wined3d/utils.c index a0df9aec991..a69cedea32c 100644 --- a/reactos/dll/directx/wine/wined3d/utils.c +++ b/reactos/dll/directx/wine/wined3d/utils.c @@ -25,6 +25,7 @@ */ #include "wined3d_private.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(d3d); From c224fd594b748805fbd1f87f64b3f5abd1284cb6 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 26 Jan 2014 21:55:59 +0000 Subject: [PATCH 077/124] [LIBWINE][WINED3D] - Import isfinite from Wine libport & hack-define copysignf -- aka fix build svn path=/trunk/; revision=61847 --- reactos/dll/directx/wine/wined3d/utils.c | 5 ++- reactos/include/reactos/wine/config.h | 3 ++ reactos/include/reactos/wine/port.h | 14 +++++-- reactos/lib/3rdparty/libwine/CMakeLists.txt | 1 + reactos/lib/3rdparty/libwine/isfinite.c | 46 +++++++++++++++++++++ reactos/lib/3rdparty/libwine/isinf.c | 4 +- reactos/lib/3rdparty/libwine/isnan.c | 4 +- 7 files changed, 68 insertions(+), 9 deletions(-) create mode 100644 reactos/lib/3rdparty/libwine/isfinite.c diff --git a/reactos/dll/directx/wine/wined3d/utils.c b/reactos/dll/directx/wine/wined3d/utils.c index a69cedea32c..18ee65e7b39 100644 --- a/reactos/dll/directx/wine/wined3d/utils.c +++ b/reactos/dll/directx/wine/wined3d/utils.c @@ -25,7 +25,10 @@ */ #include "wined3d_private.h" -#include + +#ifdef _MSC_VER +#define copysignf(x, y) ((x) < 0.0f ? -fabsf(y) : fabsf(y)) +#endif WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/include/reactos/wine/config.h b/reactos/include/reactos/wine/config.h index 3f56ce35033..6f1d8d632cb 100644 --- a/reactos/include/reactos/wine/config.h +++ b/reactos/include/reactos/wine/config.h @@ -296,6 +296,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_IO_H 1 +/* Define to 1 if you have the `isfinite' function. */ +/* #undef HAVE_ISFINITE */ + /* Define to 1 if you have the `isinf' function. */ /* #undef HAVE_ISINF */ diff --git a/reactos/include/reactos/wine/port.h b/reactos/include/reactos/wine/port.h index 43f693b08ee..7b42643de67 100644 --- a/reactos/include/reactos/wine/port.h +++ b/reactos/include/reactos/wine/port.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_WINE_PORT_H @@ -25,7 +25,9 @@ # error You must include config.h to use this header #endif -#define _GNU_SOURCE /* for pread/pwrite */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE /* for pread/pwrite, isfinite */ +#endif #include #include #include @@ -246,11 +248,15 @@ extern int getopt_long_only (int ___argc, char *const *___argv, size_t getpagesize(void); #endif /* HAVE_GETPAGESIZE */ -#if !defined(HAVE_ISINF) && !defined(_ISINF) && !defined(isinf) +#if !defined(HAVE_ISFINITE) && !defined(isfinite) +int isfinite(double x); +#endif + +#if !defined(HAVE_ISINF) && !defined(isinf) int isinf(double x); #endif -#if !defined(HAVE_ISNAN) && !defined(_ISNAN) && !defined(isnan) +#if !defined(HAVE_ISNAN) && !defined(isnan) int isnan(double x); #endif diff --git a/reactos/lib/3rdparty/libwine/CMakeLists.txt b/reactos/lib/3rdparty/libwine/CMakeLists.txt index d7bf83449fc..a57e9851b47 100644 --- a/reactos/lib/3rdparty/libwine/CMakeLists.txt +++ b/reactos/lib/3rdparty/libwine/CMakeLists.txt @@ -6,6 +6,7 @@ list(APPEND SOURCE config.c debug_ros.c isinf.c + isfinite.c isnan.c loader.c ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/wctype.c diff --git a/reactos/lib/3rdparty/libwine/isfinite.c b/reactos/lib/3rdparty/libwine/isfinite.c new file mode 100644 index 00000000000..9909f6d294e --- /dev/null +++ b/reactos/lib/3rdparty/libwine/isfinite.c @@ -0,0 +1,46 @@ +/* + * isfinite function + * + * Copyright 2013 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#if !defined(HAVE_ISFINITE) && !defined(isfinite) + +#ifdef HAVE_IEEEFP_H +#include + +int isfinite(double x) +{ + return finite(x); +} + +#elif defined(HAVE_FLOAT_H) && defined(HAVE__FINITE) +#include + +int isfinite(double x) +{ + return _finite(x); +} + +#else +#error No isfinite() implementation available. +#endif + +#endif /* !defined(HAVE_ISFINITE) && !defined(isfinite) */ diff --git a/reactos/lib/3rdparty/libwine/isinf.c b/reactos/lib/3rdparty/libwine/isinf.c index baef611b0eb..4a97f37f6ce 100644 --- a/reactos/lib/3rdparty/libwine/isinf.c +++ b/reactos/lib/3rdparty/libwine/isinf.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#if !defined(HAVE_ISINF) && !defined(_ISINF) && !defined(isinf) +#if !defined(HAVE_ISINF) && !defined(isinf) #ifdef HAVE_IEEEFP_H #include @@ -43,4 +43,4 @@ int isinf(double x) #error No isinf() implementation available. #endif -#endif /* !defined(HAVE_ISINF) && !defined(_ISINF) && !defined(isinf) */ +#endif /* !defined(HAVE_ISINF) && !defined(isinf) */ diff --git a/reactos/lib/3rdparty/libwine/isnan.c b/reactos/lib/3rdparty/libwine/isnan.c index 50445a1e956..1025b651925 100644 --- a/reactos/lib/3rdparty/libwine/isnan.c +++ b/reactos/lib/3rdparty/libwine/isnan.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#if !defined(HAVE_ISNAN) && !defined(_ISNAN) && !defined(isnan) +#if !defined(HAVE_ISNAN) && !defined(isnan) #ifdef HAVE_IEEEFP_H #include @@ -43,4 +43,4 @@ int isnan(double x) #error No isnan() implementation available. #endif -#endif /* !defined(HAVE_ISNAN) && !defined(_ISNAN) && !defined(isnan) */ +#endif /* !defined(HAVE_ISNAN) && !defined(isnan) */ From beed0625d8c31c286fdfc9df8d1217bb69ec7018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 27 Jan 2014 00:30:12 +0000 Subject: [PATCH 078/124] [BEEP]: Convert to LONGLONG before doing the multiplication (or: use our macro Int32x32To64): avoids overflows. svn path=/trunk/; revision=61848 --- reactos/drivers/base/beep/beep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/drivers/base/beep/beep.c b/reactos/drivers/base/beep/beep.c index 444f0f07c86..9ba86705527 100644 --- a/reactos/drivers/base/beep/beep.c +++ b/reactos/drivers/base/beep/beep.c @@ -339,7 +339,7 @@ BeepStartIo(IN PDEVICE_OBJECT DeviceObject, { /* Beep successful, queue a DPC to stop it */ Status = STATUS_SUCCESS; - DueTime.QuadPart = BeepParam->Duration * -10000; + DueTime.QuadPart = Int32x32To64(BeepParam->Duration, -10000); InterlockedIncrement(&DeviceExtension->TimerActive); KeSetTimer(&DeviceExtension->Timer, DueTime, &DeviceObject->Dpc); } From c370a35059a0a91f3d860ac5b8a3e0916f110c99 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 27 Jan 2014 11:09:29 +0000 Subject: [PATCH 079/124] * Addendum to r61843. svn path=/trunk/; revision=61849 --- reactos/media/doc/README.WINE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 3fede646f91..f8e229eabe2 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -28,12 +28,12 @@ reactos/tools/wpp # Synced to Wine-1.7.1 The following libraries are shared with Wine. reactos/dll/directx/wine/amstream # Synced to Wine-1.7.1 -reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.1 -reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.1 +reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.11 +reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.11 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.1 -reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.1 +reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.11 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.1 @@ -46,7 +46,7 @@ reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.1 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.1 reactos/dll/directx/wine/qedit # Synced to Wine-1.7.1 reactos/dll/directx/wine/quartz # Synced to Wine-1.7.1 -reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1 +reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.11 reactos/dll/win32/activeds # Synced to Wine-1.7.1 reactos/dll/win32/actxprxy # Synced to Wine-1.7.1 From 9ebfde575abb9d682df805d3698124ced01ceea8 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 27 Jan 2014 11:14:28 +0000 Subject: [PATCH 080/124] [DDRAW] * Add a note so that this won't be lost. svn path=/trunk/; revision=61850 --- reactos/dll/directx/wine/ddraw/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reactos/dll/directx/wine/ddraw/main.c b/reactos/dll/directx/wine/ddraw/main.c index 7733c6b8696..9387cc09bc7 100644 --- a/reactos/dll/directx/wine/ddraw/main.c +++ b/reactos/dll/directx/wine/ddraw/main.c @@ -879,6 +879,8 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) * an application would unload ddraw from the WM_DESTROY handler for * that window, it would return to unmapped memory and die. Apparently * this is supposed to work on Windows. */ + + /* ReactOS r61844: Comment out usage of GET_MODULE_HANDLE_EX_FLAG_PIN because it doesn't work */ if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS /*| GET_MODULE_HANDLE_EX_FLAG_PIN*/, (const WCHAR *)&ddraw_self, &ddraw_self)) ERR("Failed to get own module handle.\n"); From 0f2f7f1c786e9198ce8176f3425c8beeefe13e09 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 27 Jan 2014 11:38:02 +0000 Subject: [PATCH 081/124] [DSOUND] * Revert r60474 until Johannes has time to look into it. svn path=/trunk/; revision=61851 --- .../dll/directx/wine/dsound/CMakeLists.txt | 3 +- reactos/dll/directx/wine/dsound/capture.c | 117 ++++++------------ reactos/dll/directx/wine/dsound/dsound.c | 24 ++++ reactos/dll/directx/wine/dsound/dsound_main.c | 6 +- .../dll/directx/wine/dsound/dsound_private.h | 1 + reactos/dll/directx/wine/dsound/primary.c | 65 +++++++--- reactos/media/doc/README.WINE | 2 +- 7 files changed, 119 insertions(+), 99 deletions(-) diff --git a/reactos/dll/directx/wine/dsound/CMakeLists.txt b/reactos/dll/directx/wine/dsound/CMakeLists.txt index d77cb4a499f..9d81dc6c6c7 100644 --- a/reactos/dll/directx/wine/dsound/CMakeLists.txt +++ b/reactos/dll/directx/wine/dsound/CMakeLists.txt @@ -5,6 +5,7 @@ add_definitions( -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + spec2def(dsound.dll dsound.spec ADD_IMPORTLIB) add_library(dsound SHARED @@ -24,5 +25,5 @@ add_library(dsound SHARED set_module_type(dsound win32dll) target_link_libraries(dsound dxguid uuid wine) -add_importlibs(dsound ole32 advapi32 user32 msvcrt kernel32 ntdll) +add_importlibs(dsound winmm ole32 advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/directx/wine/dsound/capture.c b/reactos/dll/directx/wine/dsound/capture.c index fd7539ac645..756bbc090f2 100644 --- a/reactos/dll/directx/wine/dsound/capture.c +++ b/reactos/dll/directx/wine/dsound/capture.c @@ -43,8 +43,6 @@ typedef struct IDirectSoundCaptureBufferImpl /* IDirectSoundNotify fields */ DSBPOSITIONNOTIFY *notifies; int nrofnotifies; - HANDLE thread; - HANDLE sleepev; } IDirectSoundCaptureBufferImpl; /* DirectSoundCaptureDevice implementation structure */ @@ -58,6 +56,7 @@ struct DirectSoundCaptureDevice WAVEFORMATEX *pwfx; IDirectSoundCaptureBufferImpl *capture_buffer; DWORD state; + UINT timerID; CRITICAL_SECTION lock; IMMDevice *mmdevice; IAudioClient *client; @@ -65,20 +64,12 @@ struct DirectSoundCaptureDevice struct list entry; }; -static DWORD WINAPI DSOUND_capture_thread(void *user); static void capturebuffer_destroy(IDirectSoundCaptureBufferImpl *This) { if (This->device->state == STATE_CAPTURING) This->device->state = STATE_STOPPING; - if(This->thread){ - SetEvent(This->sleepev); - WaitForSingleObject(This->thread, INFINITE); - CloseHandle(This->thread); - } - CloseHandle(This->sleepev); - HeapFree(GetProcessHeap(),0, This->pdscbd); if (This->device->client) { @@ -732,8 +723,8 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( } err = IAudioClient_Initialize(device->client, - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, - 200 * 100000, 0, device->pwfx, NULL); + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, + 200 * 100000, 50000, device->pwfx, NULL); if(FAILED(err)){ WARN("Initialize failed: %08x\n", err); IAudioClient_Release(device->client); @@ -746,27 +737,12 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( return err; } - This->sleepev = CreateEventW(NULL, 0, 0, NULL); - - err = IAudioClient_SetEventHandle(device->client, This->sleepev); - if(FAILED(err)){ - WARN("SetEventHandle failed: %08x\n", err); - IAudioClient_Release(device->client); - device->client = NULL; - CloseHandle(This->sleepev); - HeapFree(GetProcessHeap(), 0, This->pdscbd); - This->device->capture_buffer = 0; - HeapFree( GetProcessHeap(), 0, This ); - return err; - } - err = IAudioClient_GetService(device->client, &IID_IAudioCaptureClient, (void**)&device->capture); if(FAILED(err)){ WARN("GetService failed: %08x\n", err); IAudioClient_Release(device->client); device->client = NULL; - CloseHandle(This->sleepev); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -784,7 +760,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( device->client = NULL; IAudioCaptureClient_Release(device->capture); device->capture = NULL; - CloseHandle(This->sleepev); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -792,7 +767,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( } device->buffer = newbuf; device->buflen = buflen; - This->thread = CreateThread(NULL, 0, DSOUND_capture_thread, This, 0, NULL); } IDirectSoundCaptureBuffer_AddRef(&This->IDirectSoundCaptureBuffer8_iface); @@ -840,6 +814,9 @@ static ULONG DirectSoundCaptureDevice_Release( if (!ref) { TRACE("deleting object\n"); + timeKillEvent(device->timerID); + timeEndPeriod(DS_TIME_RES); + EnterCriticalSection(&DSOUND_capturers_lock); list_remove(&device->entry); LeaveCriticalSection(&DSOUND_capturers_lock); @@ -858,19 +835,29 @@ static ULONG DirectSoundCaptureDevice_Release( return ref; } -static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) +static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user, + DWORD_PTR dw1, DWORD_PTR dw2) { - HRESULT hr; - UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; + DirectSoundCaptureDevice *device = (DirectSoundCaptureDevice*)user; + UINT32 packet_frames, packet_bytes, avail_bytes; DWORD flags; BYTE *buf; + HRESULT hr; - if(!device->capture_buffer || device->state == STATE_STOPPED) - return S_FALSE; + if(!device->ref) + return; + + EnterCriticalSection(&device->lock); + + if(!device->capture_buffer || device->state == STATE_STOPPED){ + LeaveCriticalSection(&device->lock); + return; + } if(device->state == STATE_STOPPING){ device->state = STATE_STOPPED; - return S_FALSE; + LeaveCriticalSection(&device->lock); + return; } if(device->state == STATE_STARTING) @@ -879,28 +866,24 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, &flags, NULL, NULL); if(FAILED(hr)){ + LeaveCriticalSection(&device->lock); WARN("GetBuffer failed: %08x\n", hr); - return hr; + return; } packet_bytes = packet_frames * device->pwfx->nBlockAlign; - if(packet_bytes > device->buflen){ - TRACE("audio glitch: dsound buffer too small for data\n"); - skip_bytes = packet_bytes - device->buflen; - packet_bytes = device->buflen; - } avail_bytes = device->buflen - device->write_pos_bytes; if(avail_bytes > packet_bytes) avail_bytes = packet_bytes; - memcpy(device->buffer + device->write_pos_bytes, buf + skip_bytes, avail_bytes); + memcpy(device->buffer + device->write_pos_bytes, buf, avail_bytes); capture_CheckNotify(device->capture_buffer, device->write_pos_bytes, avail_bytes); packet_bytes -= avail_bytes; if(packet_bytes > 0){ if(device->capture_buffer->flags & DSCBSTART_LOOPING){ - memcpy(device->buffer, buf + skip_bytes + avail_bytes, packet_bytes); + memcpy(device->buffer, buf + avail_bytes, packet_bytes); capture_CheckNotify(device->capture_buffer, 0, packet_bytes); }else{ device->state = STATE_STOPPED; @@ -913,44 +896,12 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); if(FAILED(hr)){ + LeaveCriticalSection(&device->lock); WARN("ReleaseBuffer failed: %08x\n", hr); - return hr; + return; } - return S_OK; -} - -static DWORD WINAPI DSOUND_capture_thread(void *user) -{ - IDirectSoundCaptureBufferImpl *buffer = user; - HRESULT hr; - DWORD ret, wait_ms; - REFERENCE_TIME period; - - hr = IAudioClient_GetDevicePeriod(buffer->device->client, &period, NULL); - if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); - wait_ms = 5; - }else - wait_ms = MulDiv(5, period, 10000); - - while(buffer->ref){ - ret = WaitForSingleObject(buffer->sleepev, wait_ms); - - if(!buffer->device->ref) - break; - - if(ret == WAIT_OBJECT_0){ - EnterCriticalSection(&buffer->device->lock); - - DSOUND_capture_data(buffer->device); - - LeaveCriticalSection(&buffer->device->lock); - }else if(ret != WAIT_TIMEOUT) - WARN("WaitForSingleObject failed: %u\n", GetLastError()); - } - - return 0; + LeaveCriticalSection(&device->lock); } static struct _TestFormat { @@ -1014,6 +965,14 @@ static HRESULT DirectSoundCaptureDevice_Initialize( EnterCriticalSection(&DSOUND_capturers_lock); + LIST_FOR_EACH_ENTRY(device, &DSOUND_capturers, DirectSoundCaptureDevice, entry){ + if(IsEqualGUID(&device->guid, &devGUID)){ + IMMDevice_Release(mmdevice); + LeaveCriticalSection(&DSOUND_capturers_lock); + return DSERR_ALLOCATED; + } + } + hr = DirectSoundCaptureDevice_Create(&device); if (hr != DS_OK) { WARN("DirectSoundCaptureDevice_Create failed\n"); @@ -1048,6 +1007,8 @@ static HRESULT DirectSoundCaptureDevice_Initialize( } IAudioClient_Release(client); + device->timerID = DSOUND_create_timer(DSOUND_capture_timer, (DWORD_PTR)device); + list_add_tail(&DSOUND_capturers, &device->entry); *ppDevice = device; diff --git a/reactos/dll/directx/wine/dsound/dsound.c b/reactos/dll/directx/wine/dsound/dsound.c index eff3de84191..19577c914d7 100644 --- a/reactos/dll/directx/wine/dsound/dsound.c +++ b/reactos/dll/directx/wine/dsound/dsound.c @@ -715,6 +715,30 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, return hr == S_OK; } +UINT DSOUND_create_timer(LPTIMECALLBACK cb, DWORD_PTR user) +{ + UINT triggertime = DS_TIME_DEL, res = DS_TIME_RES, id; + TIMECAPS time; + + timeGetDevCaps(&time, sizeof(TIMECAPS)); + TRACE("Minimum timer resolution: %u, max timer: %u\n", time.wPeriodMin, time.wPeriodMax); + if (triggertime < time.wPeriodMin) + triggertime = time.wPeriodMin; + if (res < time.wPeriodMin) + res = time.wPeriodMin; + if (timeBeginPeriod(res) == TIMERR_NOCANDO) + WARN("Could not set minimum resolution, don't expect sound\n"); + id = timeSetEvent(triggertime, res, cb, user, TIME_PERIODIC | TIME_KILL_SYNCHRONOUS); + if (!id) + { + WARN("Timer not created! Retrying without TIME_KILL_SYNCHRONOUS\n"); + id = timeSetEvent(triggertime, res, cb, user, TIME_PERIODIC); + if (!id) + ERR("Could not create timer, sound playback will not occur\n"); + } + return id; +} + HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcGUID) { HRESULT hr = DS_OK; diff --git a/reactos/dll/directx/wine/dsound/dsound_main.c b/reactos/dll/directx/wine/dsound/dsound_main.c index fc20c51d6af..43e143276f6 100644 --- a/reactos/dll/directx/wine/dsound/dsound_main.c +++ b/reactos/dll/directx/wine/dsound/dsound_main.c @@ -768,16 +768,20 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: + TRACE("DLL_PROCESS_ATTACH\n"); instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); /* Increase refcount on dsound by 1 */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)hInstDLL, &hInstDLL); break; case DLL_PROCESS_DETACH: - if (lpvReserved) break; + TRACE("DLL_PROCESS_DETACH\n"); DeleteCriticalSection(&DSOUND_renderers_lock); DeleteCriticalSection(&DSOUND_capturers_lock); break; + default: + TRACE("UNKNOWN REASON\n"); + break; } return TRUE; } diff --git a/reactos/dll/directx/wine/dsound/dsound_private.h b/reactos/dll/directx/wine/dsound/dsound_private.h index 6bd6a9813f4..7a1d901f975 100644 --- a/reactos/dll/directx/wine/dsound/dsound_private.h +++ b/reactos/dll/directx/wine/dsound/dsound_private.h @@ -287,5 +287,6 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) DECLSP BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels) DECLSPEC_HIDDEN; +UINT DSOUND_create_timer(LPTIMECALLBACK cb, DWORD_PTR user) DECLSPEC_HIDDEN; HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN; diff --git a/reactos/dll/directx/wine/dsound/primary.c b/reactos/dll/directx/wine/dsound/primary.c index 5a907826c2d..fd1dbb75cc8 100644 --- a/reactos/dll/directx/wine/dsound/primary.c +++ b/reactos/dll/directx/wine/dsound/primary.c @@ -425,24 +425,35 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP return DS_OK; } -WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex) +static DWORD DSOUND_GetFormatSize(LPCWAVEFORMATEX wfex) { - WAVEFORMATEX *pwfx; - if(wfex->wFormatTag == WAVE_FORMAT_PCM){ - pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX)); - CopyMemory(pwfx, wfex, sizeof(PCMWAVEFORMAT)); - pwfx->cbSize = 0; - }else{ - pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX) + wfex->cbSize); - CopyMemory(pwfx, wfex, sizeof(WAVEFORMATEX) + wfex->cbSize); - } + if (wfex->wFormatTag == WAVE_FORMAT_PCM) + return sizeof(WAVEFORMATEX); + else + return sizeof(WAVEFORMATEX) + wfex->cbSize; +} - if(pwfx->wFormatTag == WAVE_FORMAT_PCM || - (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&((const WAVEFORMATEXTENSIBLE*)pwfx)->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) - pwfx->nBlockAlign = (pwfx->nChannels * pwfx->wBitsPerSample) / 8; - - return pwfx; +LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) +{ + DWORD size = DSOUND_GetFormatSize(wfex); + LPWAVEFORMATEX pwfx = HeapAlloc(GetProcessHeap(),0,size); + if (pwfx == NULL) { + WARN("out of memory\n"); + } else if (wfex->wFormatTag != WAVE_FORMAT_PCM) { + CopyMemory(pwfx, wfex, size); + } else { + CopyMemory(pwfx, wfex, sizeof(PCMWAVEFORMAT)); + pwfx->cbSize=0; + if (pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample/8) { + WARN("Fixing bad nBlockAlign (%u)\n", pwfx->nBlockAlign); + pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample/8; + } + if (pwfx->nAvgBytesPerSec != pwfx->nSamplesPerSec * pwfx->nBlockAlign) { + WARN("Fixing bad nAvgBytesPerSec (%u)\n", pwfx->nAvgBytesPerSec); + pwfx->nAvgBytesPerSec = pwfx->nSamplesPerSec * pwfx->nBlockAlign; + } + } + return pwfx; } HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passed_fmt) @@ -519,9 +530,27 @@ done: device->primary_pwfx = old_fmt; else HeapFree(GetProcessHeap(), 0, old_fmt); + } else if (passed_fmt->wFormatTag == WAVE_FORMAT_PCM || + passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { + /* Fill in "real" values to primary_pwfx */ + WAVEFORMATEX *fmt = device->primary_pwfx; + + *fmt = *device->pwfx; + fmtex = (void*)device->pwfx; + + if (IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) && + passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { + fmt->wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + } else { + fmt->wFormatTag = WAVE_FORMAT_PCM; + fmt->wBitsPerSample = 16; + } + fmt->nBlockAlign = fmt->nChannels * fmt->wBitsPerSample / 8; + fmt->nAvgBytesPerSec = fmt->nBlockAlign * fmt->nSamplesPerSec; + fmt->cbSize = 0; } else { - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); + device->primary_pwfx = HeapReAlloc(GetProcessHeap(), 0, device->primary_pwfx, sizeof(*fmtex)); + memcpy(device->primary_pwfx, device->pwfx, sizeof(*fmtex)); } out: diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index f8e229eabe2..f6940fb9be1 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -40,7 +40,7 @@ reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.1 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.1 -reactos/dll/directx/wine/dsound # Synced to Wine-1.7.1 +reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.1 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.1 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.1 From 268afe1faf53dcabb7e29b7f7270b855f5f91093 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 27 Jan 2014 12:29:29 +0000 Subject: [PATCH 082/124] [CONDRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61852 --- reactos/drivers/base/condrv/condrv.c | 1 - reactos/drivers/base/condrv/condrv.h | 15 ++------------- reactos/drivers/base/condrv/control.c | 3 ++- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/reactos/drivers/base/condrv/condrv.c b/reactos/drivers/base/condrv/condrv.c index 7d1e2367e30..6b96b974921 100644 --- a/reactos/drivers/base/condrv/condrv.c +++ b/reactos/drivers/base/condrv/condrv.c @@ -13,7 +13,6 @@ #define NDEBUG #include - /* FUNCTIONS ******************************************************************/ /* diff --git a/reactos/drivers/base/condrv/condrv.h b/reactos/drivers/base/condrv/condrv.h index 85f4f2199f8..38be86e15fc 100644 --- a/reactos/drivers/base/condrv/condrv.h +++ b/reactos/drivers/base/condrv/condrv.h @@ -17,34 +17,23 @@ #include "VisualDDKHelpers.h" #endif - -#include -#include - +#include #define CONDRV_TAG ' noC' #define DD_CONDRV_TAG '1noC' #define CONDRV_CONS_TAG '2noC' - -// -// Console Driver object extension -// +/* Console Driver object extension */ typedef struct _CONDRV_DRIVER { UNICODE_STRING RegistryPath; PDEVICE_OBJECT Controller; // The unique Controller device for the driver. } CONDRV_DRIVER, *PCONDRV_DRIVER; - - NTSTATUS NTAPI ConDrvCreateController(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath); NTSTATUS NTAPI ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject); - #endif // __CONDRV_H__ - -/* EOF */ diff --git a/reactos/drivers/base/condrv/control.c b/reactos/drivers/base/condrv/control.c index 819a098f6fc..78ce5b402a1 100644 --- a/reactos/drivers/base/condrv/control.c +++ b/reactos/drivers/base/condrv/control.c @@ -10,10 +10,11 @@ #include "condrv.h" +#include + #define NDEBUG #include - /* FUNCTIONS ******************************************************************/ NTSTATUS NTAPI From cf290173f499e5754eef7dce3d376941bd209eb3 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 27 Jan 2014 22:23:24 +0000 Subject: [PATCH 083/124] [KDCOM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61853 --- reactos/drivers/base/kdcom/kdcom.c | 3 +++ reactos/drivers/base/kdcom/kddll.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/reactos/drivers/base/kdcom/kdcom.c b/reactos/drivers/base/kdcom/kdcom.c index 0e9fc0f24a6..f7e86b632f9 100644 --- a/reactos/drivers/base/kdcom/kdcom.c +++ b/reactos/drivers/base/kdcom/kdcom.c @@ -7,8 +7,11 @@ */ #include "kddll.h" + #include +#include #include +#include #define NDEBUG #include diff --git a/reactos/drivers/base/kdcom/kddll.h b/reactos/drivers/base/kdcom/kddll.h index 3ff3171e53d..70c6c921fc8 100644 --- a/reactos/drivers/base/kdcom/kddll.h +++ b/reactos/drivers/base/kdcom/kddll.h @@ -6,15 +6,9 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer@ewactos.org) */ -#pragma once - #define NOEXTAPI #include -#include -#include #include -#include -#include /* port intrinsics */ //#define KDDEBUG /* uncomment to enable debugging this dll */ From 6098f6b3321d5c98bd938ce0a7cd70bde2d2dac7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 27 Jan 2014 22:55:47 +0000 Subject: [PATCH 084/124] [CMBATT] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61854 --- reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt | 1 + reactos/drivers/bus/acpi/cmbatt/cmbatt.c | 2 ++ reactos/drivers/bus/acpi/cmbatt/cmbatt.h | 5 +---- reactos/drivers/bus/acpi/cmbatt/cmbwmi.c | 2 ++ reactos/drivers/bus/acpi/cmbatt/cmexec.c | 3 +++ reactos/drivers/bus/acpi/cmbatt/guid.c | 6 ++++++ 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 reactos/drivers/bus/acpi/cmbatt/guid.c diff --git a/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt b/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt index 7e7ddc582df..6354a66e014 100644 --- a/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt +++ b/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE cmexec.c cmbpnp.c cmbwmi.c + guid.c cmbatt.rc) add_library(cmbatt SHARED ${SOURCE}) diff --git a/reactos/drivers/bus/acpi/cmbatt/cmbatt.c b/reactos/drivers/bus/acpi/cmbatt/cmbatt.c index 2e6f9bf2757..a9bddd4e603 100644 --- a/reactos/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/reactos/drivers/bus/acpi/cmbatt/cmbatt.c @@ -10,6 +10,8 @@ #include "cmbatt.h" +#include + /* GLOBALS ********************************************************************/ ULONG CmBattDebug; diff --git a/reactos/drivers/bus/acpi/cmbatt/cmbatt.h b/reactos/drivers/bus/acpi/cmbatt/cmbatt.h index 8f952d20200..1d172795966 100644 --- a/reactos/drivers/bus/acpi/cmbatt/cmbatt.h +++ b/reactos/drivers/bus/acpi/cmbatt/cmbatt.h @@ -6,13 +6,10 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#include -#include +#include #include -#include #include #include -#include #define IOCTL_BATTERY_QUERY_UNIQUE_ID \ CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 diff --git a/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c b/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c index 1bb01b63405..2a5a73f4603 100644 --- a/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c +++ b/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c @@ -10,6 +10,8 @@ #include "cmbatt.h" +#include + /* GLOBALS ********************************************************************/ WMIGUIDREGINFO CmBattWmiGuidList[1] = diff --git a/reactos/drivers/bus/acpi/cmbatt/cmexec.c b/reactos/drivers/bus/acpi/cmbatt/cmexec.c index beb646ab509..f808b5d4c0f 100644 --- a/reactos/drivers/bus/acpi/cmbatt/cmexec.c +++ b/reactos/drivers/bus/acpi/cmbatt/cmexec.c @@ -10,6 +10,9 @@ #include "cmbatt.h" +#include +#include + /* FUNCTIONS ******************************************************************/ NTSTATUS diff --git a/reactos/drivers/bus/acpi/cmbatt/guid.c b/reactos/drivers/bus/acpi/cmbatt/guid.c new file mode 100644 index 00000000000..3f4468bf330 --- /dev/null +++ b/reactos/drivers/bus/acpi/cmbatt/guid.c @@ -0,0 +1,6 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ From c7c833a29699d0248aa59e6e53e8668225e75006 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 27 Jan 2014 23:11:48 +0000 Subject: [PATCH 085/124] [COMPBATT] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61855 --- reactos/drivers/bus/acpi/compbatt/CMakeLists.txt | 1 + reactos/drivers/bus/acpi/compbatt/compbatt.c | 2 ++ reactos/drivers/bus/acpi/compbatt/compbatt.h | 5 +---- reactos/drivers/bus/acpi/compbatt/comppnp.c | 2 ++ reactos/drivers/bus/acpi/compbatt/guid.c | 8 ++++++++ 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 reactos/drivers/bus/acpi/compbatt/guid.c diff --git a/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt b/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt index b61bc216c40..8923c64c67d 100644 --- a/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt +++ b/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt @@ -3,6 +3,7 @@ list(APPEND SOURCE compbatt.c compmisc.c comppnp.c + guid.c compbatt.rc) add_library(compbatt SHARED ${SOURCE}) diff --git a/reactos/drivers/bus/acpi/compbatt/compbatt.c b/reactos/drivers/bus/acpi/compbatt/compbatt.c index 1630d2f84b3..c22f4c720ce 100644 --- a/reactos/drivers/bus/acpi/compbatt/compbatt.c +++ b/reactos/drivers/bus/acpi/compbatt/compbatt.c @@ -10,6 +10,8 @@ #include "compbatt.h" +#include + /* GLOBALS ********************************************************************/ ULONG CompBattDebug; diff --git a/reactos/drivers/bus/acpi/compbatt/compbatt.h b/reactos/drivers/bus/acpi/compbatt/compbatt.h index 792b893573e..7bb4efdd391 100644 --- a/reactos/drivers/bus/acpi/compbatt/compbatt.h +++ b/reactos/drivers/bus/acpi/compbatt/compbatt.h @@ -6,11 +6,8 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#include -#include +#include #include -#include -#include #define COMPBATT_BATTERY_INFORMATION_PRESENT 0x04 #define COMPBATT_TAG_ASSIGNED 0x80 diff --git a/reactos/drivers/bus/acpi/compbatt/comppnp.c b/reactos/drivers/bus/acpi/compbatt/comppnp.c index 4e32b147bd5..5966cda4826 100644 --- a/reactos/drivers/bus/acpi/compbatt/comppnp.c +++ b/reactos/drivers/bus/acpi/compbatt/comppnp.c @@ -10,6 +10,8 @@ #include "compbatt.h" +#include + /* FUNCTIONS ******************************************************************/ NTSTATUS diff --git a/reactos/drivers/bus/acpi/compbatt/guid.c b/reactos/drivers/bus/acpi/compbatt/guid.c new file mode 100644 index 00000000000..fde0eaaa18f --- /dev/null +++ b/reactos/drivers/bus/acpi/compbatt/guid.c @@ -0,0 +1,8 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ From 13083f4d7439da46790c91074dd4f377e90ee346 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 28 Jan 2014 05:49:19 +0000 Subject: [PATCH 086/124] [PEFIXUP] - Use correct struct member for section count. Patch by Sergei Antonov (saproj at gmail dot com) svn path=/trunk/; revision=61856 --- reactos/tools/pefixup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/tools/pefixup.c b/reactos/tools/pefixup.c index aa1c998488f..be25015e48b 100644 --- a/reactos/tools/pefixup.c +++ b/reactos/tools/pefixup.c @@ -378,7 +378,7 @@ int main(int argc, char **argv) { /* Update section flags */ for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < dtohl(nt_header->OptionalHeader.NumberOfRvaAndSizes); + i < dtohl(nt_header->FileHeader.NumberOfSections); i++, section_header++) { if (!strcmp((char*)section_header->Name, ".text") || From d237b22458f5fdd24f377f443dfb4aa1b43dbb9a Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 28 Jan 2014 06:07:56 +0000 Subject: [PATCH 087/124] [SPELLING] - Fix some typos that say "lastest." Patch by Sergei Antonov svn path=/trunk/; revision=61857 --- reactos/base/system/format/format.c | 6 +++--- reactos/dll/win32/fmifs/query.c | 6 +++--- reactos/dll/win32/setupapi/devinst.c | 2 +- reactos/drivers/input/i8042prt/mouse.c | 2 +- reactos/include/reactos/libs/fmifs/fmifs.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/reactos/base/system/format/format.c b/reactos/base/system/format/format.c index 5d2a166b68a..9b4962d0d22 100644 --- a/reactos/base/system/format/format.c +++ b/reactos/base/system/format/format.c @@ -276,7 +276,7 @@ static VOID Usage( LPTSTR ProgramName ) WCHAR szFormatW[MAX_PATH]; DWORD Index = 0; BYTE dummy; - BOOLEAN lastestVersion; + BOOLEAN latestVersion; LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); if (!LoadFMIFSEntryPoints()) @@ -286,9 +286,9 @@ static VOID Usage( LPTSTR ProgramName ) } szFormats[0] = 0; - while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &lastestVersion)) + while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) { - if (!lastestVersion) + if (!latestVersion) continue; if (szFormats[0]) _tcscat(szFormats, _T(", ")); diff --git a/reactos/dll/win32/fmifs/query.c b/reactos/dll/win32/fmifs/query.c index 93cfa8e00c9..da3f1d96702 100644 --- a/reactos/dll/win32/fmifs/query.c +++ b/reactos/dll/win32/fmifs/query.c @@ -15,12 +15,12 @@ QueryAvailableFileSystemFormat( IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ OUT UCHAR* Major, OUT UCHAR* Minor, - OUT BOOLEAN* LastestVersion) + OUT BOOLEAN* LatestVersion) { PLIST_ENTRY ListEntry; PIFS_PROVIDER Provider; - if (!FileSystem || !Major ||!Minor ||!LastestVersion) + if (!FileSystem || !Major ||!Minor ||!LatestVersion) return FALSE; ListEntry = ProviderListHead.Flink; @@ -38,7 +38,7 @@ QueryAvailableFileSystemFormat( wcscpy(FileSystem, Provider->Name); *Major = 0; /* FIXME */ *Minor = 0; /* FIXME */ - *LastestVersion = TRUE; /* FIXME */ + *LatestVersion = TRUE; /* FIXME */ return TRUE; } diff --git a/reactos/dll/win32/setupapi/devinst.c b/reactos/dll/win32/setupapi/devinst.c index 798c6ccb0fc..b7eeeef10d9 100644 --- a/reactos/dll/win32/setupapi/devinst.c +++ b/reactos/dll/win32/setupapi/devinst.c @@ -211,7 +211,7 @@ CheckSectionValid( * Field[3] Minor version * Field[4] Product type * Field[5] Suite mask - * Remark: lastests fields may be NULL if the information is not provided + * Remark: these fields may be NULL if the information is not provided */ Fields[0] = Section; if (Fields[0] == NULL) diff --git a/reactos/drivers/input/i8042prt/mouse.c b/reactos/drivers/input/i8042prt/mouse.c index d6e224a4c59..cb66c353ada 100644 --- a/reactos/drivers/input/i8042prt/mouse.c +++ b/reactos/drivers/input/i8042prt/mouse.c @@ -214,7 +214,7 @@ i8042MouHandleButtons( (DeviceExtension->MouseButtonState & ~Mask) | (NewButtonData & Mask); } -/* Does lastest initializations for the mouse. This method +/* Does final initializations for the mouse. This method * is called just before connecting the interrupt. */ NTSTATUS diff --git a/reactos/include/reactos/libs/fmifs/fmifs.h b/reactos/include/reactos/libs/fmifs/fmifs.h index 98c4065639e..cdf87f504af 100644 --- a/reactos/include/reactos/libs/fmifs/fmifs.h +++ b/reactos/include/reactos/libs/fmifs/fmifs.h @@ -148,7 +148,7 @@ QueryAvailableFileSystemFormat( IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ OUT UCHAR* Major, OUT UCHAR* Minor, - OUT BOOLEAN* LastestVersion); + OUT BOOLEAN* LatestVersion); BOOL NTAPI QueryDeviceInformation( From a2e358b4925674a064f380d4bc01284bea1896c3 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 28 Jan 2014 11:11:36 +0000 Subject: [PATCH 088/124] [ACPI] * Create a main header and move some inclusions to it. CORE-7716 svn path=/trunk/; revision=61858 --- reactos/drivers/bus/acpi/acpienum.c | 7 ++----- reactos/drivers/bus/acpi/busmgr/bus.c | 7 +------ reactos/drivers/bus/acpi/busmgr/button.c | 8 +------- reactos/drivers/bus/acpi/busmgr/power.c | 7 +------ reactos/drivers/bus/acpi/busmgr/system.c | 7 ++----- reactos/drivers/bus/acpi/busmgr/utils.c | 7 +------ reactos/drivers/bus/acpi/buspdo.c | 10 +--------- reactos/drivers/bus/acpi/eval.c | 15 +-------------- reactos/drivers/bus/acpi/interface.c | 9 +-------- reactos/drivers/bus/acpi/main.c | 9 +-------- reactos/drivers/bus/acpi/osl.c | 4 ++-- reactos/drivers/bus/acpi/pnp.c | 9 +-------- reactos/drivers/bus/acpi/power.c | 8 +------- reactos/drivers/bus/acpi/precomp.h | 12 ++++++++++++ 14 files changed, 28 insertions(+), 91 deletions(-) create mode 100644 reactos/drivers/bus/acpi/precomp.h diff --git a/reactos/drivers/bus/acpi/acpienum.c b/reactos/drivers/bus/acpi/acpienum.c index 4abb3dacfe6..d258b45da6b 100644 --- a/reactos/drivers/bus/acpi/acpienum.c +++ b/reactos/drivers/bus/acpi/acpienum.c @@ -6,11 +6,8 @@ * UPDATE HISTORY: * 01-05-2001 CSH Created */ -#include -#include -#include -#include -#include + +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/busmgr/bus.c b/reactos/drivers/bus/acpi/busmgr/bus.c index 7ca7ced3f9d..7f408effcad 100644 --- a/reactos/drivers/bus/acpi/busmgr/bus.c +++ b/reactos/drivers/bus/acpi/busmgr/bus.c @@ -27,12 +27,7 @@ * Copyright (C)2009 Samuel Serapion */ -#include - -#include -#include -#include -#include +#include #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/busmgr/button.c b/reactos/drivers/bus/acpi/busmgr/button.c index 94d9314d964..c4be270c52c 100644 --- a/reactos/drivers/bus/acpi/busmgr/button.c +++ b/reactos/drivers/bus/acpi/busmgr/button.c @@ -22,18 +22,12 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include -#include -#include -#include -#include +#include #define NDEBUG #include - - #define _COMPONENT ACPI_BUTTON_COMPONENT ACPI_MODULE_NAME ("acpi_button") diff --git a/reactos/drivers/bus/acpi/busmgr/power.c b/reactos/drivers/bus/acpi/busmgr/power.c index 9f36c4d8ac6..2a21454ddae 100644 --- a/reactos/drivers/bus/acpi/busmgr/power.c +++ b/reactos/drivers/bus/acpi/busmgr/power.c @@ -40,16 +40,11 @@ * Copyright (C)2009 Samuel Serapion */ -#include -#include -#include -#include -#include +#include #define NDEBUG #include - #define _COMPONENT ACPI_POWER_COMPONENT ACPI_MODULE_NAME ("acpi_power") diff --git a/reactos/drivers/bus/acpi/busmgr/system.c b/reactos/drivers/bus/acpi/busmgr/system.c index 4ceea93635e..41977ec1af3 100644 --- a/reactos/drivers/bus/acpi/busmgr/system.c +++ b/reactos/drivers/bus/acpi/busmgr/system.c @@ -26,11 +26,8 @@ /* Modified for ReactOS and latest ACPICA * Copyright (C)2009 Samuel Serapion */ -#include -#include -#include -#include -#include "list.h" + +#include #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/busmgr/utils.c b/reactos/drivers/bus/acpi/busmgr/utils.c index 3692e56963e..0c7428323f5 100644 --- a/reactos/drivers/bus/acpi/busmgr/utils.c +++ b/reactos/drivers/bus/acpi/busmgr/utils.c @@ -23,12 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include - -#include -#include -#include -#include +#include #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/buspdo.c b/reactos/drivers/bus/acpi/buspdo.c index b5394783128..e0809bb031b 100644 --- a/reactos/drivers/bus/acpi/buspdo.c +++ b/reactos/drivers/bus/acpi/buspdo.c @@ -1,12 +1,4 @@ -#include - -#include -#include -#include -#include - -#include -#include +#include "precomp.h" #include #include diff --git a/reactos/drivers/bus/acpi/eval.c b/reactos/drivers/bus/acpi/eval.c index c254d667569..a6456c4a249 100644 --- a/reactos/drivers/bus/acpi/eval.c +++ b/reactos/drivers/bus/acpi/eval.c @@ -1,18 +1,5 @@ -#include +#include "precomp.h" -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/interface.c b/reactos/drivers/bus/acpi/interface.c index 084b85f3a11..bf666574156 100644 --- a/reactos/drivers/bus/acpi/interface.c +++ b/reactos/drivers/bus/acpi/interface.c @@ -1,12 +1,5 @@ -#include +#include "precomp.h" -#include - -#include -#include -#include - -#include #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/main.c b/reactos/drivers/bus/acpi/main.c index 8d8f2eaccbc..b2da79cbd67 100644 --- a/reactos/drivers/bus/acpi/main.c +++ b/reactos/drivers/bus/acpi/main.c @@ -1,12 +1,5 @@ -#include +#include "precomp.h" -#include -#include - -#include -#include - -#include #include #define NDEBUG diff --git a/reactos/drivers/bus/acpi/osl.c b/reactos/drivers/bus/acpi/osl.c index 9b1ea6fdfb5..06055ba840e 100644 --- a/reactos/drivers/bus/acpi/osl.c +++ b/reactos/drivers/bus/acpi/osl.c @@ -3,11 +3,11 @@ * ACPI Component Architecture Operating System Layer (OSL) for ReactOS * * * *******************************************************************************/ -#include -#include +#include "precomp.h" #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/pnp.c b/reactos/drivers/bus/acpi/pnp.c index c935cd0a117..b0cb32d78fb 100644 --- a/reactos/drivers/bus/acpi/pnp.c +++ b/reactos/drivers/bus/acpi/pnp.c @@ -1,12 +1,5 @@ -#include +#include "precomp.h" -#include - -#include -#include -#include - -#include #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/power.c b/reactos/drivers/bus/acpi/power.c index cb58d4ff0dd..559d4867e6f 100644 --- a/reactos/drivers/bus/acpi/power.c +++ b/reactos/drivers/bus/acpi/power.c @@ -1,10 +1,4 @@ -#include - -#include -#include - -#include -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/bus/acpi/precomp.h b/reactos/drivers/bus/acpi/precomp.h new file mode 100644 index 00000000000..fcb766d3eeb --- /dev/null +++ b/reactos/drivers/bus/acpi/precomp.h @@ -0,0 +1,12 @@ +#ifndef _ACPI_PCH_ +#define _ACPI_PCH_ + +#include +#include +#include +#include +#include +#include +#include + +#endif /* _ACPI_PCH_ */ From 422315f946c5344b9fc4ce16241d784ed8ad6015 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 28 Jan 2014 11:17:12 +0000 Subject: [PATCH 089/124] [PCIX] * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61859 --- reactos/drivers/bus/pcix/guid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/reactos/drivers/bus/pcix/guid.c b/reactos/drivers/bus/pcix/guid.c index 78a272379ea..5200a01ad1f 100644 --- a/reactos/drivers/bus/pcix/guid.c +++ b/reactos/drivers/bus/pcix/guid.c @@ -1,5 +1,6 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ +#include #include #include #include From fe9e1e93889fa0bd241ba2d2a5cb919b7cc7922d Mon Sep 17 00:00:00 2001 From: Benedikt Freisen Date: Tue, 28 Jan 2014 15:46:28 +0000 Subject: [PATCH 090/124] [MSPAINT] Apply patches from CORE-7551 (Drag and Drop between Paint and the shell) and CORE-7561 (insert from file) svn path=/trunk/; revision=61860 --- reactos/base/applications/mspaint/dib.c | 19 ++++ reactos/base/applications/mspaint/dib.h | 2 + reactos/base/applications/mspaint/main.c | 7 ++ reactos/base/applications/mspaint/precomp.h | 1 + reactos/base/applications/mspaint/winproc.c | 109 +++++++++++++------- 5 files changed, 99 insertions(+), 39 deletions(-) diff --git a/reactos/base/applications/mspaint/dib.c b/reactos/base/applications/mspaint/dib.c index e7e80362cc5..ee5bcb815e1 100644 --- a/reactos/base/applications/mspaint/dib.c +++ b/reactos/base/applications/mspaint/dib.c @@ -95,6 +95,17 @@ SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC, LPSYSTEMTIME time, int HeapFree(GetProcessHeap(), 0, buffer); } +void ShowFileLoadError(LPTSTR name) +{ + TCHAR programname[20]; + TCHAR loaderrortext[100]; + TCHAR temptext[500]; + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); + LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); + _stprintf(temptext, loaderrortext, name); + MessageBox(hMainWnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION); +} + void LoadDIBFromFile(HBITMAP * hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) { @@ -105,18 +116,25 @@ LoadDIBFromFile(HBITMAP * hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, in HANDLE hFile; if (!hBitmap) + { + ShowFileLoadError(name); return; + } hFile = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); if (hFile == INVALID_HANDLE_VALUE) + { + ShowFileLoadError(name); return; + } /* read header and check for 'BM' magic */ ReadFile(hFile, &bfh, sizeof(BITMAPFILEHEADER), &dwBytesRead, NULL); if (bfh.bfType != 0x4d42) { CloseHandle(hFile); + ShowFileLoadError(name); return; } @@ -133,6 +151,7 @@ LoadDIBFromFile(HBITMAP * hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, in if (!bi) { CloseHandle(hFile); + ShowFileLoadError(name); return; } diff --git a/reactos/base/applications/mspaint/dib.h b/reactos/base/applications/mspaint/dib.h index 22a21163421..49fd7229971 100644 --- a/reactos/base/applications/mspaint/dib.h +++ b/reactos/base/applications/mspaint/dib.h @@ -16,3 +16,5 @@ void SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC, LPSYSTEMTIME time, int vRes); void LoadDIBFromFile(HBITMAP *hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes); + +void ShowFileLoadError(LPTSTR name); diff --git a/reactos/base/applications/mspaint/main.c b/reactos/base/applications/mspaint/main.c index 55bd9d480ac..00d587ea13a 100644 --- a/reactos/base/applications/mspaint/main.c +++ b/reactos/base/applications/mspaint/main.c @@ -409,6 +409,10 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument clearHistory(); isAFile = TRUE; } + else + { + exit(0); + } } /* initializing the CHOOSECOLOR structure for use with ChooseColor */ @@ -489,6 +493,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* Make the window visible on the screen */ ShowWindow (hwnd, nFunsterStil); + /* inform the system, that the main window accepts dropped files */ + DragAcceptFiles(hwnd, TRUE); + /* Run the message loop. It will run until GetMessage() returns 0 */ while (GetMessage(&messages, NULL, 0, 0)) { diff --git a/reactos/base/applications/mspaint/precomp.h b/reactos/base/applications/mspaint/precomp.h index 0221d2bcecd..c35d7513002 100644 --- a/reactos/base/applications/mspaint/precomp.h +++ b/reactos/base/applications/mspaint/precomp.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "definitions.h" #include "drawing.h" diff --git a/reactos/base/applications/mspaint/winproc.c b/reactos/base/applications/mspaint/winproc.c index a68b2682c27..071849aa7e5 100644 --- a/reactos/base/applications/mspaint/winproc.c +++ b/reactos/base/applications/mspaint/winproc.c @@ -11,8 +11,6 @@ #include "precomp.h" -#include - #include "dialogs.h" #include "registry.h" @@ -162,6 +160,43 @@ saveImage(BOOL overwrite) } } +void +UpdateApplicationProperties(HBITMAP bitmap, LPTSTR newfilename, LPTSTR newfilepathname) +{ + TCHAR tempstr[1000]; + TCHAR resstr[100]; + insertReversible(bitmap); + updateCanvasAndScrollbars(); + CopyMemory(filename, newfilename, sizeof(filename)); + CopyMemory(filepathname, newfilepathname, sizeof(filepathname)); + LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); + _stprintf(tempstr, resstr, filename); + SetWindowText(hMainWnd, tempstr); + clearHistory(); + isAFile = TRUE; +} + +void +InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) +{ + HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); + SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); + SendMessage(window, WM_COMMAND, ID_RECTSEL, 0); + + DeleteObject(SelectObject(hSelDC, hSelBm = CopyImage(bitmap, + IMAGE_BITMAP, 0, 0, + LR_COPYRETURNORG))); + newReversible(); + rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0; + rectSel_dest[0] = rectSel_dest[1] = 0; + rectSel_dest[2] = GetDIBWidth(hSelBm); + rectSel_dest[3] = GetDIBHeight(hSelBm); + BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], + hSelDC, 0, 0, SRCCOPY); + placeSelWin(); + ShowWindow(hSelection, SW_SHOW); +} + BOOL drawing; LRESULT CALLBACK @@ -169,6 +204,25 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) /* handle the messages */ { + case WM_DROPFILES: + { + HDROP drophandle; + TCHAR droppedfile[MAX_PATH]; + drophandle = (HDROP)wParam; + DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); + DragFinish(drophandle); + HBITMAP bmNew = NULL; + LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + if (bmNew != NULL) + { + TCHAR *pathend; + pathend = _tcsrchr(droppedfile, '\\'); + pathend++; + UpdateApplicationProperties(bmNew, pathend, pathend); + } + break; + } + case WM_CREATE: ptStack = NULL; ptSP = 0; @@ -785,27 +839,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) { - TCHAR tempstr[1000]; - TCHAR resstr[100]; - insertReversible(bmNew); - updateCanvasAndScrollbars(); - CopyMemory(filename, ofn.lpstrFileTitle, sizeof(filename)); - CopyMemory(filepathname, ofn.lpstrFileTitle, sizeof(filepathname)); - LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); - _stprintf(tempstr, resstr, filename); - SetWindowText(hMainWnd, tempstr); - clearHistory(); - isAFile = TRUE; - } - else - { - TCHAR programname[20]; - TCHAR loaderrortext[100]; - TCHAR temptext[500]; - LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); - LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); - _stprintf(temptext, loaderrortext, ofn.lpstrFile); - MessageBox(hwnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION); + UpdateApplicationProperties(bmNew, ofn.lpstrFileTitle, ofn.lpstrFileTitle); } } break; @@ -848,22 +882,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) OpenClipboard(hMainWnd); if (GetClipboardData(CF_BITMAP) != NULL) { - HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); - SendMessage(hwnd, WM_COMMAND, ID_RECTSEL, 0); - - DeleteObject(SelectObject(hSelDC, hSelBm = CopyImage(GetClipboardData(CF_BITMAP), - IMAGE_BITMAP, 0, 0, - LR_COPYRETURNORG))); - newReversible(); - rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0; - rectSel_dest[0] = rectSel_dest[1] = 0; - rectSel_dest[2] = GetDIBWidth(hSelBm); - rectSel_dest[3] = GetDIBHeight(hSelBm); - BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - hSelDC, 0, 0, SRCCOPY); - placeSelWin(); - ShowWindow(hSelection, SW_SHOW); + InsertSelectionFromHBITMAP(GetClipboardData(CF_BITMAP), hwnd); } CloseClipboard(); break; @@ -899,6 +918,18 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (GetSaveFileName(&ofn) != 0) SaveDIBToFile(hSelBm, ofn.lpstrFile, hDrawingDC, NULL, NULL, fileHPPM, fileVPPM); break; + case IDM_EDITPASTEFROM: + if (GetOpenFileName(&ofn) != 0) + { + HBITMAP bmNew = NULL; + LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + if (bmNew != NULL) + { + InsertSelectionFromHBITMAP(bmNew, hwnd); + DeleteObject(bmNew); + } + } + break; case IDM_COLORSEDITPALETTE: if (ChooseColor(&choosecolor)) { From 20cc3104732af8b49730f71e10ca0ea50ce72d8f Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 28 Jan 2014 18:22:46 +0000 Subject: [PATCH 091/124] [MSPAINT] - Fix build svn path=/trunk/; revision=61862 --- reactos/base/applications/mspaint/winproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/base/applications/mspaint/winproc.c b/reactos/base/applications/mspaint/winproc.c index 071849aa7e5..cdb2a6cd6ad 100644 --- a/reactos/base/applications/mspaint/winproc.c +++ b/reactos/base/applications/mspaint/winproc.c @@ -208,10 +208,10 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { HDROP drophandle; TCHAR droppedfile[MAX_PATH]; + HBITMAP bmNew = NULL; drophandle = (HDROP)wParam; DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); DragFinish(drophandle); - HBITMAP bmNew = NULL; LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) { From 29393f64412c35754ca2e615d1b4610fb0185709 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 28 Jan 2014 18:25:57 +0000 Subject: [PATCH 092/124] [MSPAINT] - Fix buffer overflow svn path=/trunk/; revision=61863 --- reactos/base/applications/mspaint/winproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/base/applications/mspaint/winproc.c b/reactos/base/applications/mspaint/winproc.c index cdb2a6cd6ad..3ae93a5a5af 100644 --- a/reactos/base/applications/mspaint/winproc.c +++ b/reactos/base/applications/mspaint/winproc.c @@ -210,7 +210,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) TCHAR droppedfile[MAX_PATH]; HBITMAP bmNew = NULL; drophandle = (HDROP)wParam; - DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); + DragQueryFile(drophandle, 0, droppedfile, SIZEOF(droppedfile)); DragFinish(drophandle); LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) From e713cb85340d8b014221f79321eeb8d38009bd4e Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Tue, 28 Jan 2014 19:32:53 +0000 Subject: [PATCH 093/124] [MSGINA] Implement the change password dialog. svn path=/trunk/; revision=61864 --- reactos/dll/win32/msgina/CMakeLists.txt | 2 +- reactos/dll/win32/msgina/gui.c | 195 +++++++++++++++++++++++- reactos/dll/win32/msgina/lang/bg-BG.rc | 3 + reactos/dll/win32/msgina/lang/cs-CZ.rc | 3 + reactos/dll/win32/msgina/lang/de-DE.rc | 7 +- reactos/dll/win32/msgina/lang/en-US.rc | 3 + reactos/dll/win32/msgina/lang/es-ES.rc | 3 + reactos/dll/win32/msgina/lang/fr-FR.rc | 3 + reactos/dll/win32/msgina/lang/he-IL.rc | 3 + reactos/dll/win32/msgina/lang/id-ID.rc | 3 + reactos/dll/win32/msgina/lang/it-IT.rc | 3 + reactos/dll/win32/msgina/lang/ja-JP.rc | 3 + reactos/dll/win32/msgina/lang/no-NO.rc | 3 + reactos/dll/win32/msgina/lang/pl-PL.rc | 3 + reactos/dll/win32/msgina/lang/ro-RO.rc | 3 + reactos/dll/win32/msgina/lang/ru-RU.rc | 3 + reactos/dll/win32/msgina/lang/sk-SK.rc | 3 + reactos/dll/win32/msgina/lang/tr-TR.rc | 3 + reactos/dll/win32/msgina/lang/uk-UA.rc | 3 + reactos/dll/win32/msgina/msgina.h | 3 + reactos/dll/win32/msgina/resource.h | 27 ++-- 21 files changed, 261 insertions(+), 21 deletions(-) diff --git a/reactos/dll/win32/msgina/CMakeLists.txt b/reactos/dll/win32/msgina/CMakeLists.txt index 9524d6d64f1..08b8fb483bc 100644 --- a/reactos/dll/win32/msgina/CMakeLists.txt +++ b/reactos/dll/win32/msgina/CMakeLists.txt @@ -17,6 +17,6 @@ list(APPEND SOURCE add_library(msgina SHARED ${SOURCE}) set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 secur32 userenv msvcrt kernel32 ntdll) add_pch(msgina msgina.h) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c index 07b6d514c89..06c589427b9 100644 --- a/reactos/dll/win32/msgina/gui.c +++ b/reactos/dll/win32/msgina/gui.c @@ -221,10 +221,193 @@ GetTextboxText( static -BOOL -DoChangePassword(HWND hwndDlg) +INT +ResourceMessageBox( + IN PGINA_CONTEXT pgContext, + IN HWND hwnd, + IN UINT uType, + IN UINT uCaption, + IN UINT uText) { - return FALSE; + WCHAR szCaption[256]; + WCHAR szText[256]; + + LoadStringW(pgContext->hDllInstance, uCaption, szCaption, 256); + LoadStringW(pgContext->hDllInstance, uText, szText, 256); + + return pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx, + hwnd, + szText, + szCaption, + uType); +} + + +static +BOOL +DoChangePassword( + IN PGINA_CONTEXT pgContext, + IN HWND hwndDlg) +{ + WCHAR UserName[256]; + WCHAR DomainName[256]; + WCHAR OldPassword[256]; + WCHAR NewPassword1[256]; + WCHAR NewPassword2[256]; + PMSV1_0_CHANGEPASSWORD_REQUEST RequestBuffer = NULL; + PMSV1_0_CHANGEPASSWORD_RESPONSE ResponseBuffer = NULL; + ULONG RequestBufferSize; + ULONG ResponseBufferSize = 0; + LPWSTR Ptr; + LSA_STRING PackageName; + HANDLE LsaHandle = NULL; + ULONG AuthenticationPackage = 0; + BOOL res = FALSE; + NTSTATUS ProtocolStatus; + NTSTATUS Status; + + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, UserName, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, DomainName, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_OLDPWD, OldPassword, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NewPassword1, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NewPassword2, 256); + + /* Compare the two passwords and fail if they do not match */ + if (wcscmp(NewPassword1, NewPassword2) != 0) + { + ResourceMessageBox(pgContext, + hwndDlg, + MB_OK | MB_ICONEXCLAMATION, + IDS_CHANGEPWDTITLE, + IDS_NONMATCHINGPASSWORDS); + return FALSE; + } + + /* Calculate the request buffer size */ + RequestBufferSize = sizeof(MSV1_0_CHANGEPASSWORD_REQUEST) + + ((wcslen(DomainName) + 1) * sizeof(WCHAR)) + + ((wcslen(UserName) + 1) * sizeof(WCHAR)) + + ((wcslen(OldPassword) + 1) * sizeof(WCHAR)) + + ((wcslen(NewPassword1) + 1) * sizeof(WCHAR)); + + /* Allocate the request buffer */ + RequestBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + RequestBufferSize); + if (RequestBuffer == NULL) + { + ERR("HeapAlloc failed\n"); + return FALSE; + } + + /* Initialize the request buffer */ + RequestBuffer->MessageType = MsV1_0ChangePassword; + RequestBuffer->Impersonating = TRUE; + + Ptr = (LPWSTR)((ULONG_PTR)RequestBuffer + sizeof(MSV1_0_CHANGEPASSWORD_REQUEST)); + + /* Pack the domain name */ + RequestBuffer->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + RequestBuffer->DomainName.MaximumLength = RequestBuffer->DomainName.Length + sizeof(WCHAR); + RequestBuffer->DomainName.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->DomainName.Buffer, + DomainName, + RequestBuffer->DomainName.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->DomainName.MaximumLength); + + /* Pack the user name */ + RequestBuffer->AccountName.Length = wcslen(UserName) * sizeof(WCHAR); + RequestBuffer->AccountName.MaximumLength = RequestBuffer->AccountName.Length + sizeof(WCHAR); + RequestBuffer->AccountName.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->AccountName.Buffer, + UserName, + RequestBuffer->AccountName.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->AccountName.MaximumLength); + + /* Pack the old password */ + RequestBuffer->OldPassword.Length = wcslen(OldPassword) * sizeof(WCHAR); + RequestBuffer->OldPassword.MaximumLength = RequestBuffer->OldPassword.Length + sizeof(WCHAR); + RequestBuffer->OldPassword.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->OldPassword.Buffer, + OldPassword, + RequestBuffer->OldPassword.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->OldPassword.MaximumLength); + + /* Pack the new password */ + RequestBuffer->NewPassword.Length = wcslen(NewPassword1) * sizeof(WCHAR); + RequestBuffer->NewPassword.MaximumLength = RequestBuffer->NewPassword.Length + sizeof(WCHAR); + RequestBuffer->NewPassword.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->NewPassword.Buffer, + NewPassword1, + RequestBuffer->NewPassword.MaximumLength); + + /* Connect to the LSA server */ + Status = LsaConnectUntrusted(&LsaHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaConnectUntrusted failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the authentication package */ + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Call the authentication package */ + Status = LsaCallAuthenticationPackage(LsaHandle, + AuthenticationPackage, + RequestBuffer, + RequestBufferSize, + (PVOID*)&ResponseBuffer, + &ResponseBufferSize, + &ProtocolStatus); + if (!NT_SUCCESS(Status)) + { + ERR("LsaCallAuthenticationPackage failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (!NT_SUCCESS(ProtocolStatus)) + { + TRACE("LsaCallAuthenticationPackage failed (ProtocolStatus 0x%08lx)\n", ProtocolStatus); + goto done; + } + + res = TRUE; + + ResourceMessageBox(pgContext, + hwndDlg, + MB_OK | MB_ICONINFORMATION, + IDS_CHANGEPWDTITLE, + IDS_PASSWORDCHANGED); + +done: + if (RequestBuffer != NULL) + HeapFree(GetProcessHeap(), 0, RequestBuffer); + + if (ResponseBuffer != NULL) + LsaFreeReturnBuffer(ResponseBuffer); + + if (LsaHandle != NULL) + NtClose(LsaHandle); + + return res; } @@ -255,7 +438,7 @@ ChangePasswordDialogProc( switch (LOWORD(wParam)) { case IDOK: - if (DoChangePassword(hwndDlg)) + if (DoChangePassword(pgContext, hwndDlg)) { EndDialog(hwndDlg, TRUE); } @@ -322,7 +505,7 @@ OnChangePassword( { INT res; - FIXME("OnChangePassword()\n"); + TRACE("OnChangePassword()\n"); res = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, @@ -332,7 +515,7 @@ OnChangePassword( ChangePasswordDialogProc, (LPARAM)pgContext); - FIXME("Result: %x\n", res); + TRACE("Result: %x\n", res); return FALSE; } diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc index e88e000f7c1..c0b011f9855 100644 --- a/reactos/dll/win32/msgina/lang/bg-BG.rc +++ b/reactos/dll/win32/msgina/lang/bg-BG.rc @@ -125,4 +125,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc index 3d25f68e1e8..64b43dfed2b 100644 --- a/reactos/dll/win32/msgina/lang/cs-CZ.rc +++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc @@ -130,4 +130,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc index 28185199612..c8d9ec9a310 100644 --- a/reactos/dll/win32/msgina/lang/de-DE.rc +++ b/reactos/dll/win32/msgina/lang/de-DE.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "Computer sperren", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Abmelden...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Password ändern", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "Passwort ändern", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Task-Manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 189, 154, 76, 14 END @@ -123,6 +123,9 @@ BEGIN IDS_LOGONMSG "Sie sind angemeldet als %s." IDS_LOGONDATE "Anmeldedatum: %s %s" IDS_COMPUTERLOCKED "Computer ist gesperrt" - IDS_LOCKEDWRONGPASSWORD "Das Kennwort ist falsch. Bitte geben Sie das Kennwort erneut ein. Bei Buchstaben des Kennworts wird Groß- und Kleinschreibung unterschieden." + IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch. Bitte geben Sie das Passwort erneut ein. Bei Buchstaben des Passworts wird Groß- und Kleinschreibung unterschieden." IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt. Nur %s\\%s oder ein Administrator kann den Computer entsperren." + IDS_CHANGEPWDTITLE "Passwort ändern" + IDS_NONMATCHINGPASSWORDS "Die eingegebenen Passworte stimmen nicht überein. Geben Sie das neue Passwort in beide Textfelder ein." + IDS_PASSWORDCHANGED "Ihr Passwort wurde geändert." END diff --git a/reactos/dll/win32/msgina/lang/en-US.rc b/reactos/dll/win32/msgina/lang/en-US.rc index b94d71f53e5..ae6e781f6c1 100644 --- a/reactos/dll/win32/msgina/lang/en-US.rc +++ b/reactos/dll/win32/msgina/lang/en-US.rc @@ -125,4 +125,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc index f740ffdb4fc..6af8138f9d1 100644 --- a/reactos/dll/win32/msgina/lang/es-ES.rc +++ b/reactos/dll/win32/msgina/lang/es-ES.rc @@ -127,4 +127,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc index 5732f52d09d..754756d4df4 100644 --- a/reactos/dll/win32/msgina/lang/fr-FR.rc +++ b/reactos/dll/win32/msgina/lang/fr-FR.rc @@ -125,4 +125,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc index bf778f02a5d..470426de437 100644 --- a/reactos/dll/win32/msgina/lang/he-IL.rc +++ b/reactos/dll/win32/msgina/lang/he-IL.rc @@ -125,4 +125,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc index ec30a7271bc..1d149821b2e 100644 --- a/reactos/dll/win32/msgina/lang/id-ID.rc +++ b/reactos/dll/win32/msgina/lang/id-ID.rc @@ -124,4 +124,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc index e6b1a3ed90b..a9df14e2cfa 100644 --- a/reactos/dll/win32/msgina/lang/it-IT.rc +++ b/reactos/dll/win32/msgina/lang/it-IT.rc @@ -133,4 +133,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc index 65ad7386c0f..de1857de1aa 100644 --- a/reactos/dll/win32/msgina/lang/ja-JP.rc +++ b/reactos/dll/win32/msgina/lang/ja-JP.rc @@ -125,4 +125,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc index a7cde1ea879..681a2c2ffa4 100644 --- a/reactos/dll/win32/msgina/lang/no-NO.rc +++ b/reactos/dll/win32/msgina/lang/no-NO.rc @@ -125,4 +125,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc index 531104efb86..8afcdcb9c37 100644 --- a/reactos/dll/win32/msgina/lang/pl-PL.rc +++ b/reactos/dll/win32/msgina/lang/pl-PL.rc @@ -134,4 +134,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc index 19f83f5842a..455ac91d5ad 100644 --- a/reactos/dll/win32/msgina/lang/ro-RO.rc +++ b/reactos/dll/win32/msgina/lang/ro-RO.rc @@ -127,4 +127,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc index 6ba97fc1b26..830658430fa 100644 --- a/reactos/dll/win32/msgina/lang/ru-RU.rc +++ b/reactos/dll/win32/msgina/lang/ru-RU.rc @@ -127,4 +127,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc index 38ee9257d05..8b1bf56184c 100644 --- a/reactos/dll/win32/msgina/lang/sk-SK.rc +++ b/reactos/dll/win32/msgina/lang/sk-SK.rc @@ -130,4 +130,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/tr-TR.rc b/reactos/dll/win32/msgina/lang/tr-TR.rc index 267a080e0a9..c197bce43e4 100644 --- a/reactos/dll/win32/msgina/lang/tr-TR.rc +++ b/reactos/dll/win32/msgina/lang/tr-TR.rc @@ -127,4 +127,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc index 1b4d3249072..75baefa3598 100644 --- a/reactos/dll/win32/msgina/lang/uk-UA.rc +++ b/reactos/dll/win32/msgina/lang/uk-UA.rc @@ -133,4 +133,7 @@ BEGIN IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h index a8d1432adbe..48d3f360b3b 100644 --- a/reactos/dll/win32/msgina/msgina.h +++ b/reactos/dll/win32/msgina/msgina.h @@ -15,8 +15,11 @@ #include #include #include +#include #include #include +#include +#include #include WINE_DEFAULT_DEBUG_CHANNEL(msgina); diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h index 148c8dc66ea..b430a7d8cfa 100644 --- a/reactos/dll/win32/msgina/resource.h +++ b/reactos/dll/win32/msgina/resource.h @@ -34,15 +34,18 @@ #define IDI_LOCKICON 21 -#define IDS_LOGGEDOUTSAS 40000 -#define IDS_LOCKEDSAS 40001 -#define IDS_PRESSCTRLALTDELETE 40002 -#define IDS_ASKFORUSER 40003 -#define IDS_ASKFORPASSWORD 40004 -#define IDS_FORCELOGOFF 40005 -#define IDS_LOCKMSG 40006 -#define IDS_LOGONMSG 40007 -#define IDS_LOGONDATE 40008 -#define IDS_COMPUTERLOCKED 40009 -#define IDS_LOCKEDWRONGPASSWORD 40010 -#define IDS_LOCKEDWRONGUSER 40011 +#define IDS_LOGGEDOUTSAS 40000 +#define IDS_LOCKEDSAS 40001 +#define IDS_PRESSCTRLALTDELETE 40002 +#define IDS_ASKFORUSER 40003 +#define IDS_ASKFORPASSWORD 40004 +#define IDS_FORCELOGOFF 40005 +#define IDS_LOCKMSG 40006 +#define IDS_LOGONMSG 40007 +#define IDS_LOGONDATE 40008 +#define IDS_COMPUTERLOCKED 40009 +#define IDS_LOCKEDWRONGPASSWORD 40010 +#define IDS_LOCKEDWRONGUSER 40011 +#define IDS_CHANGEPWDTITLE 40012 +#define IDS_NONMATCHINGPASSWORDS 40013 +#define IDS_PASSWORDCHANGED 40014 From 892e41ffa868e14dd5be55bf475592d3c6720603 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 28 Jan 2014 20:57:32 +0000 Subject: [PATCH 094/124] [MSFS] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61868 --- reactos/drivers/filesystems/msfs/create.c | 3 ++- reactos/drivers/filesystems/msfs/finfo.c | 1 - reactos/drivers/filesystems/msfs/fsctrl.c | 1 - reactos/drivers/filesystems/msfs/msfs.c | 1 - reactos/drivers/filesystems/msfs/msfs.h | 1 - reactos/drivers/filesystems/msfs/rw.c | 1 - 6 files changed, 2 insertions(+), 6 deletions(-) diff --git a/reactos/drivers/filesystems/msfs/create.c b/reactos/drivers/filesystems/msfs/create.c index 1e3808af278..154bea78719 100644 --- a/reactos/drivers/filesystems/msfs/create.c +++ b/reactos/drivers/filesystems/msfs/create.c @@ -10,10 +10,11 @@ #include "msfs.h" +#include + #define NDEBUG #include - /* FUNCTIONS *****************************************************************/ /* Creates the client side */ diff --git a/reactos/drivers/filesystems/msfs/finfo.c b/reactos/drivers/filesystems/msfs/finfo.c index bacf2622f7e..5772865500c 100644 --- a/reactos/drivers/filesystems/msfs/finfo.c +++ b/reactos/drivers/filesystems/msfs/finfo.c @@ -18,7 +18,6 @@ #define MAILSLOT_NO_MESSAGE MAXULONG #define MAILSLOT_WAIT_FOREVER MAXULONG - /* FUNCTIONS *****************************************************************/ static NTSTATUS diff --git a/reactos/drivers/filesystems/msfs/fsctrl.c b/reactos/drivers/filesystems/msfs/fsctrl.c index be54c442b3e..280e2a856c3 100644 --- a/reactos/drivers/filesystems/msfs/fsctrl.c +++ b/reactos/drivers/filesystems/msfs/fsctrl.c @@ -13,7 +13,6 @@ #define NDEBUG #include - /* FUNCTIONS *****************************************************************/ NTSTATUS DEFAULTAPI diff --git a/reactos/drivers/filesystems/msfs/msfs.c b/reactos/drivers/filesystems/msfs/msfs.c index 06f3fed2797..5f72823a85f 100644 --- a/reactos/drivers/filesystems/msfs/msfs.c +++ b/reactos/drivers/filesystems/msfs/msfs.c @@ -13,7 +13,6 @@ #define NDEBUG #include - /* FUNCTIONS *****************************************************************/ NTSTATUS NTAPI diff --git a/reactos/drivers/filesystems/msfs/msfs.h b/reactos/drivers/filesystems/msfs/msfs.h index c73daee02be..772b80a204d 100644 --- a/reactos/drivers/filesystems/msfs/msfs.h +++ b/reactos/drivers/filesystems/msfs/msfs.h @@ -10,7 +10,6 @@ #define __DRIVERS_FS_MS_MSFS_H #include -#include #define DEFAULTAPI NTAPI diff --git a/reactos/drivers/filesystems/msfs/rw.c b/reactos/drivers/filesystems/msfs/rw.c index f0c66ed56c9..aac5dd53b3b 100644 --- a/reactos/drivers/filesystems/msfs/rw.c +++ b/reactos/drivers/filesystems/msfs/rw.c @@ -13,7 +13,6 @@ #define NDEBUG #include - /* FUNCTIONS *****************************************************************/ NTSTATUS DEFAULTAPI From ce6694437c4dbd4abb0e04980ce04abc208a6bf5 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 28 Jan 2014 21:21:04 +0000 Subject: [PATCH 095/124] [NTFS] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61869 --- reactos/drivers/filesystems/ntfs/attrib.c | 3 --- reactos/drivers/filesystems/ntfs/blockdev.c | 3 --- reactos/drivers/filesystems/ntfs/close.c | 3 --- reactos/drivers/filesystems/ntfs/create.c | 3 --- reactos/drivers/filesystems/ntfs/dirctl.c | 3 --- reactos/drivers/filesystems/ntfs/dispatch.c | 3 --- reactos/drivers/filesystems/ntfs/fastio.c | 1 - reactos/drivers/filesystems/ntfs/fcb.c | 6 ------ reactos/drivers/filesystems/ntfs/finfo.c | 3 --- reactos/drivers/filesystems/ntfs/fsctl.c | 4 ++-- reactos/drivers/filesystems/ntfs/mft.c | 4 ---- reactos/drivers/filesystems/ntfs/misc.c | 3 --- reactos/drivers/filesystems/ntfs/ntfs.c | 1 - reactos/drivers/filesystems/ntfs/ntfs.h | 2 -- reactos/drivers/filesystems/ntfs/rw.c | 2 -- 15 files changed, 2 insertions(+), 42 deletions(-) diff --git a/reactos/drivers/filesystems/ntfs/attrib.c b/reactos/drivers/filesystems/ntfs/attrib.c index bcd20fc89c7..f17b70ac05f 100644 --- a/reactos/drivers/filesystems/ntfs/attrib.c +++ b/reactos/drivers/filesystems/ntfs/attrib.c @@ -31,9 +31,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ static diff --git a/reactos/drivers/filesystems/ntfs/blockdev.c b/reactos/drivers/filesystems/ntfs/blockdev.c index a73f646469e..85586939343 100644 --- a/reactos/drivers/filesystems/ntfs/blockdev.c +++ b/reactos/drivers/filesystems/ntfs/blockdev.c @@ -30,9 +30,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ NTSTATUS diff --git a/reactos/drivers/filesystems/ntfs/close.c b/reactos/drivers/filesystems/ntfs/close.c index a07764c10ff..1ce76594fdb 100644 --- a/reactos/drivers/filesystems/ntfs/close.c +++ b/reactos/drivers/filesystems/ntfs/close.c @@ -31,9 +31,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ /* diff --git a/reactos/drivers/filesystems/ntfs/create.c b/reactos/drivers/filesystems/ntfs/create.c index 8fe3b13f043..5eef5286c5e 100644 --- a/reactos/drivers/filesystems/ntfs/create.c +++ b/reactos/drivers/filesystems/ntfs/create.c @@ -30,9 +30,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ static diff --git a/reactos/drivers/filesystems/ntfs/dirctl.c b/reactos/drivers/filesystems/ntfs/dirctl.c index 4e146235130..7024e0012f7 100644 --- a/reactos/drivers/filesystems/ntfs/dirctl.c +++ b/reactos/drivers/filesystems/ntfs/dirctl.c @@ -30,9 +30,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ #if 0 diff --git a/reactos/drivers/filesystems/ntfs/dispatch.c b/reactos/drivers/filesystems/ntfs/dispatch.c index 3424f126fa2..4670f45431b 100644 --- a/reactos/drivers/filesystems/ntfs/dispatch.c +++ b/reactos/drivers/filesystems/ntfs/dispatch.c @@ -31,9 +31,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ /* diff --git a/reactos/drivers/filesystems/ntfs/fastio.c b/reactos/drivers/filesystems/ntfs/fastio.c index 186867b43b7..fc778336296 100644 --- a/reactos/drivers/filesystems/ntfs/fastio.c +++ b/reactos/drivers/filesystems/ntfs/fastio.c @@ -32,7 +32,6 @@ #include "ntfs.h" - /* FUNCTIONS ****************************************************************/ BOOLEAN diff --git a/reactos/drivers/filesystems/ntfs/fcb.c b/reactos/drivers/filesystems/ntfs/fcb.c index 5cfc97d76d3..ee5553a8196 100644 --- a/reactos/drivers/filesystems/ntfs/fcb.c +++ b/reactos/drivers/filesystems/ntfs/fcb.c @@ -30,16 +30,10 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - - /* MACROS *******************************************************************/ #define TAG_FCB 'BCFI' - - /* FUNCTIONS ****************************************************************/ static diff --git a/reactos/drivers/filesystems/ntfs/finfo.c b/reactos/drivers/filesystems/ntfs/finfo.c index 85c43711e42..96143eeda7c 100644 --- a/reactos/drivers/filesystems/ntfs/finfo.c +++ b/reactos/drivers/filesystems/ntfs/finfo.c @@ -30,9 +30,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ /* diff --git a/reactos/drivers/filesystems/ntfs/fsctl.c b/reactos/drivers/filesystems/ntfs/fsctl.c index 6f88b1d2b27..e3e20f0c040 100644 --- a/reactos/drivers/filesystems/ntfs/fsctl.c +++ b/reactos/drivers/filesystems/ntfs/fsctl.c @@ -29,11 +29,11 @@ #include "ntfs.h" +#include + #define NDEBUG #include -/* GLOBALS *****************************************************************/ - /* FUNCTIONS ****************************************************************/ /* diff --git a/reactos/drivers/filesystems/ntfs/mft.c b/reactos/drivers/filesystems/ntfs/mft.c index da90a8f4788..d40d91994e7 100644 --- a/reactos/drivers/filesystems/ntfs/mft.c +++ b/reactos/drivers/filesystems/ntfs/mft.c @@ -31,12 +31,8 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ - NTSTATUS NtfsOpenMft(PDEVICE_EXTENSION Vcb) { diff --git a/reactos/drivers/filesystems/ntfs/misc.c b/reactos/drivers/filesystems/ntfs/misc.c index 56589062229..11ce46bc416 100644 --- a/reactos/drivers/filesystems/ntfs/misc.c +++ b/reactos/drivers/filesystems/ntfs/misc.c @@ -31,9 +31,6 @@ #define NDEBUG #include -/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ /* diff --git a/reactos/drivers/filesystems/ntfs/ntfs.c b/reactos/drivers/filesystems/ntfs/ntfs.c index 865b9e9dcf5..dff05051774 100644 --- a/reactos/drivers/filesystems/ntfs/ntfs.c +++ b/reactos/drivers/filesystems/ntfs/ntfs.c @@ -35,7 +35,6 @@ PNTFS_GLOBAL_DATA NtfsGlobalData = NULL; - /* FUNCTIONS ****************************************************************/ /* diff --git a/reactos/drivers/filesystems/ntfs/ntfs.h b/reactos/drivers/filesystems/ntfs/ntfs.h index 9ae2df9b5c3..e6459f4a800 100644 --- a/reactos/drivers/filesystems/ntfs/ntfs.h +++ b/reactos/drivers/filesystems/ntfs/ntfs.h @@ -2,8 +2,6 @@ #define NTFS_H #include -#include -#include #define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ diff --git a/reactos/drivers/filesystems/ntfs/rw.c b/reactos/drivers/filesystems/ntfs/rw.c index 05edff23034..ba60de03a2a 100644 --- a/reactos/drivers/filesystems/ntfs/rw.c +++ b/reactos/drivers/filesystems/ntfs/rw.c @@ -32,13 +32,11 @@ #define NDEBUG #include - /* GLOBALS *******************************************************************/ #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - /* FUNCTIONS ****************************************************************/ /* From 38aa140c5a85732c2248492ae9a5d0e98018c937 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 28 Jan 2014 21:45:44 +0000 Subject: [PATCH 096/124] [MOUNTMGR] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61870 --- reactos/drivers/filters/mountmgr/database.c | 2 -- reactos/drivers/filters/mountmgr/device.c | 2 -- reactos/drivers/filters/mountmgr/mntmgr.h | 5 +---- reactos/drivers/filters/mountmgr/mountmgr.c | 2 -- reactos/drivers/filters/mountmgr/notify.c | 4 ++-- reactos/drivers/filters/mountmgr/point.c | 2 -- reactos/drivers/filters/mountmgr/symlink.c | 2 -- reactos/drivers/filters/mountmgr/uniqueid.c | 2 -- 8 files changed, 3 insertions(+), 18 deletions(-) diff --git a/reactos/drivers/filters/mountmgr/database.c b/reactos/drivers/filters/mountmgr/database.c index b80a8987f58..f6a730c4965 100644 --- a/reactos/drivers/filters/mountmgr/database.c +++ b/reactos/drivers/filters/mountmgr/database.c @@ -23,8 +23,6 @@ * PROGRAMMER: Pierre Schweitzer (pierre.schweitzer@reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "mntmgr.h" #define NDEBUG diff --git a/reactos/drivers/filters/mountmgr/device.c b/reactos/drivers/filters/mountmgr/device.c index e76b7aa8be7..c86df7a5426 100644 --- a/reactos/drivers/filters/mountmgr/device.c +++ b/reactos/drivers/filters/mountmgr/device.c @@ -23,8 +23,6 @@ * PROGRAMMER: Pierre Schweitzer (pierre.schweitzer@reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "mntmgr.h" #define MAX_DEVICES 0x3E8 /* Matches 1000 devices */ diff --git a/reactos/drivers/filters/mountmgr/mntmgr.h b/reactos/drivers/filters/mountmgr/mntmgr.h index f1c401a396e..d0cf8a96151 100644 --- a/reactos/drivers/filters/mountmgr/mntmgr.h +++ b/reactos/drivers/filters/mountmgr/mntmgr.h @@ -2,14 +2,11 @@ #define _MNTMGR_H_ #include -#include #include #include #include -#include -#include +#include #include -#include /* Enter FIXME */ #ifdef IsEqualGUID diff --git a/reactos/drivers/filters/mountmgr/mountmgr.c b/reactos/drivers/filters/mountmgr/mountmgr.c index d955453ed1d..cddbcc446f5 100644 --- a/reactos/drivers/filters/mountmgr/mountmgr.c +++ b/reactos/drivers/filters/mountmgr/mountmgr.c @@ -24,8 +24,6 @@ * Alex Ionescu (alex.ionescu@reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "mntmgr.h" #define NDEBUG diff --git a/reactos/drivers/filters/mountmgr/notify.c b/reactos/drivers/filters/mountmgr/notify.c index 4e148f296ec..60f9f78e4c3 100644 --- a/reactos/drivers/filters/mountmgr/notify.c +++ b/reactos/drivers/filters/mountmgr/notify.c @@ -24,10 +24,10 @@ * Alex Ionescu (alex.ionescu@reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "mntmgr.h" +#include + #define NDEBUG #include diff --git a/reactos/drivers/filters/mountmgr/point.c b/reactos/drivers/filters/mountmgr/point.c index 3eab7c360f3..0c2136c1a7f 100644 --- a/reactos/drivers/filters/mountmgr/point.c +++ b/reactos/drivers/filters/mountmgr/point.c @@ -23,8 +23,6 @@ * PROGRAMMER: Pierre Schweitzer (pierre.schweitzer@reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "mntmgr.h" #define NDEBUG diff --git a/reactos/drivers/filters/mountmgr/symlink.c b/reactos/drivers/filters/mountmgr/symlink.c index f5b76e69bc8..80c5b00873e 100644 --- a/reactos/drivers/filters/mountmgr/symlink.c +++ b/reactos/drivers/filters/mountmgr/symlink.c @@ -23,8 +23,6 @@ * PROGRAMMER: Pierre Schweitzer (pierre.schweitzer@reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "mntmgr.h" #define NDEBUG diff --git a/reactos/drivers/filters/mountmgr/uniqueid.c b/reactos/drivers/filters/mountmgr/uniqueid.c index 66160ffb534..b0a2f5547bf 100644 --- a/reactos/drivers/filters/mountmgr/uniqueid.c +++ b/reactos/drivers/filters/mountmgr/uniqueid.c @@ -23,8 +23,6 @@ * PROGRAMMER: Pierre Schweitzer (pierre.schweitzer@reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "mntmgr.h" #define NDEBUG From 91bacc4dc86a7cc33452405e030fbc6da819ae08 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 28 Jan 2014 21:52:53 +0000 Subject: [PATCH 097/124] [KSECDD] Add public ksecioctl.h containing the supported IOCTLs svn path=/trunk/; revision=61871 --- reactos/drivers/crypto/ksecdd/CMakeLists.txt | 1 + reactos/drivers/crypto/ksecdd/dispatch.c | 8 +++- reactos/drivers/crypto/ksecdd/ksecdd.h | 4 -- .../reactos/drivers/ksecdd/ksecioctl.h | 43 +++++++++++++++++++ 4 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 reactos/include/reactos/drivers/ksecdd/ksecioctl.h diff --git a/reactos/drivers/crypto/ksecdd/CMakeLists.txt b/reactos/drivers/crypto/ksecdd/CMakeLists.txt index eb8a3184701..1ffccb4c892 100644 --- a/reactos/drivers/crypto/ksecdd/CMakeLists.txt +++ b/reactos/drivers/crypto/ksecdd/CMakeLists.txt @@ -3,6 +3,7 @@ spec2def(ksecdd.sys ksecdd.spec) include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ksecdd ${REACTOS_SOURCE_DIR}/lib/cryptlib) list(APPEND SOURCE diff --git a/reactos/drivers/crypto/ksecdd/dispatch.c b/reactos/drivers/crypto/ksecdd/dispatch.c index 34be2fbf974..9209bc2ed46 100644 --- a/reactos/drivers/crypto/ksecdd/dispatch.c +++ b/reactos/drivers/crypto/ksecdd/dispatch.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "ksecdd.h" +#include #define NDEBUG #include @@ -96,7 +97,12 @@ KsecDeviceControl( /* Check ioctl code */ switch (IoControlCode) { - case IOCTL_KSEC_GEN_RANDOM: + case IOCTL_KSEC_REGISTER_LSA_PROCESS: + + Status = STATUS_SUCCESS; + break; + + case IOCTL_KSEC_RANDOM_FILL_BUFFER: Status = KsecGenRandom(Buffer, *OutputLength); break; diff --git a/reactos/drivers/crypto/ksecdd/ksecdd.h b/reactos/drivers/crypto/ksecdd/ksecdd.h index 86eebb4d592..addcd153456 100644 --- a/reactos/drivers/crypto/ksecdd/ksecdd.h +++ b/reactos/drivers/crypto/ksecdd/ksecdd.h @@ -10,10 +10,6 @@ #include #include -// 0x390004 -#define IOCTL_KSEC_GEN_RANDOM \ - CTL_CODE(FILE_DEVICE_KSEC, 0x01, METHOD_BUFFERED, FILE_ANY_ACCESS) - #if defined(_M_IX86) || defined(_M_AMD64) typedef struct _KSEC_MACHINE_SPECIFIC_COUNTERS { diff --git a/reactos/include/reactos/drivers/ksecdd/ksecioctl.h b/reactos/include/reactos/drivers/ksecdd/ksecioctl.h new file mode 100644 index 00000000000..004db5a7cd0 --- /dev/null +++ b/reactos/include/reactos/drivers/ksecdd/ksecioctl.h @@ -0,0 +1,43 @@ + + +#pragma once + +// 0: 0x398000 - called from LSASRV!LsapInitLsa +#define IOCTL_KSEC_REGISTER_LSA_PROCESS \ + CTL_CODE(FILE_DEVICE_KSEC, 0x00, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +// 1: 0x390004 - called from tcpip!InitIsnGenerator +#define IOCTL_KSEC_1 \ + CTL_CODE(FILE_DEVICE_KSEC, 0x01, METHOD_BUFFERED, FILE_ANY_ACCESS) + +// 2: 0x390008 - called from SystemFunction036 aka RtlGenRandom via RandomFillBuffer +#define IOCTL_KSEC_RANDOM_FILL_BUFFER \ + CTL_CODE(FILE_DEVICE_KSEC, 0x02, METHOD_BUFFERED, FILE_ANY_ACCESS) + +// 3: 0x39000E - called from SystemFunction040 aka RtlEncryptMemory with OptionFlags == 0 +#define IOCTL_KSEC_ENCRYPT_PROCESS \ + CTL_CODE(FILE_DEVICE_KSEC, 0x03, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +// 4: 0x390012 - called from SystemFunction041 aka RtlDecryptMemory with OptionFlags == 0 +#define IOCTL_KSEC_DECRYPT_PROCESS \ + CTL_CODE(FILE_DEVICE_KSEC, 0x04, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +// 5: 0x390016 - called from SystemFunction040 aka RtlEncryptMemory with OptionFlags == 1 +#define IOCTL_KSEC_ENCRYPT_CROSS_PROCESS \ + CTL_CODE(FILE_DEVICE_KSEC, 0x05, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +// 6: 0x39001A - called from SystemFunction041 aka RtlDecryptMemory with OptionFlags == 1 +#define IOCTL_KSEC_DECRYPT_CROSS_PROCESS \ + CTL_CODE(FILE_DEVICE_KSEC, 0x06, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +// 7: 0x39001E - called from SystemFunction040 aka RtlEncryptMemory with OptionFlags == 2 +#define IOCTL_KSEC_ENCRYPT_SAME_LOGON \ + CTL_CODE(FILE_DEVICE_KSEC, 0x07, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +// 8: 0x390022 - called from SystemFunction041 aka RtlDecryptMemory with OptionFlags == 2 +#define IOCTL_KSEC_DECRYPT_SAME_LOGON \ + CTL_CODE(FILE_DEVICE_KSEC, 0x08, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +// e: 0x390038 - see http://wiki.mysmartlogon.com/Kernel_mode_SSP +#define IOCTL_KSEC_REGISTER_EXTENSION \ + CTL_CODE(FILE_DEVICE_KSEC, 0x0e, METHOD_BUFFERED, FILE_ANY_ACCESS) From 55564f4975a8cdb90187237066f3b578847163bd Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 28 Jan 2014 21:55:30 +0000 Subject: [PATCH 098/124] [RTL] Add implementation of RtlFindLastBackwardRunClear from amd64 branch, thanks to Alex for noticing that it has never been merged. svn path=/trunk/; revision=61872 --- reactos/lib/rtl/bitmap.c | 60 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/reactos/lib/rtl/bitmap.c b/reactos/lib/rtl/bitmap.c index 4a79bd0c6c8..b009355dc90 100644 --- a/reactos/lib/rtl/bitmap.c +++ b/reactos/lib/rtl/bitmap.c @@ -709,7 +709,7 @@ RtlFindNextForwardRunSet( *StartingRunIndex = FromIndex + Length; /* Now return the length of the run */ - return RtlpGetLengthOfRunSet(BitMapHeader, FromIndex, MAXINDEX); + return RtlpGetLengthOfRunSet(BitMapHeader, FromIndex + Length, MAXINDEX); } BITMAP_INDEX @@ -728,8 +728,62 @@ RtlFindLastBackwardRunClear( _In_ BITMAP_INDEX FromIndex, _Out_ PBITMAP_INDEX StartingRunIndex) { - UNIMPLEMENTED; - return 0; + BITMAP_INDEX Value, InvValue, BitPos; + PBITMAP_BUFFER Buffer; + + /* Make sure we don't go past the end */ + FromIndex = min(FromIndex, BitMapHeader->SizeOfBitMap - 1); + + /* Calculate positions */ + Buffer = BitMapHeader->Buffer + FromIndex / _BITCOUNT; + BitPos = (_BITCOUNT - 1) - (FromIndex & (_BITCOUNT - 1)); + + /* Get the inversed value, clear bits that don't belong to the run */ + InvValue = ~(*Buffer--) << BitPos >> BitPos; + + /* Skip all set ULONGs */ + while (InvValue == 0) + { + /* Did we already reach past the first ULONG? */ + if (Buffer < BitMapHeader->Buffer) + { + /* Yes, nothing found */ + return 0; + } + + InvValue = ~(*Buffer--); + } + + /* We hit a clear bit, check how many set bits are left */ + BitScanReverse(&BitPos, InvValue); + + /* Calculate last bit position */ + FromIndex = (Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos; + + Value = ~InvValue << ((_BITCOUNT - 1) - BitPos) >> ((_BITCOUNT - 1) - BitPos); + + /* Skip all clear ULONGs */ + while (Value == 0 && Buffer >= BitMapHeader->Buffer) + { + Value = *Buffer--; + } + + if (Value != 0) + { + /* We hit a set bit, check how many clear bits are left */ + BitScanReverse(&BitPos, Value); + + /* Calculate Starting Index */ + *StartingRunIndex = (Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos + 1; + } + else + { + /* We reached the start of the bitmap */ + *StartingRunIndex = 0; + } + + /* Return length of the run */ + return FromIndex - *StartingRunIndex; } From bb6ca7fcfcf3c1957b887617111afc643e9be94c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Tue, 28 Jan 2014 22:36:57 +0000 Subject: [PATCH 099/124] [WIN32K] - Fix allocation of DRIVEROBJ objects svn path=/trunk/; revision=61873 --- reactos/win32ss/gdi/eng/driverobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/win32ss/gdi/eng/driverobj.h b/reactos/win32ss/gdi/eng/driverobj.h index d433bbdc2e9..92a0bab7ad9 100644 --- a/reactos/win32ss/gdi/eng/driverobj.h +++ b/reactos/win32ss/gdi/eng/driverobj.h @@ -14,7 +14,7 @@ typedef DRIVEROBJ *PDRIVEROBJ; BOOL NTAPI DRIVEROBJ_Cleanup(PVOID pObject); -#define DRIVEROBJ_AllocObjectWithHandle() ((PEDRIVEROBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DRIVEROBJ, sizeof(DRIVEROBJ))) +#define DRIVEROBJ_AllocObjectWithHandle() ((PEDRIVEROBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DRIVEROBJ, sizeof(EDRIVEROBJ))) #define DRIVEROBJ_FreeObjectByHandle(hdo) GDIOBJ_FreeObjByHandle((HGDIOBJ)hdo, GDI_OBJECT_TYPE_DRIVEROBJ) #define DRIVEROBJ_UnlockObject(pdo) GDIOBJ_vUnlockObject((POBJ)pdo) From 45e155f85aee7c4c54d6e3ed0483c1caa673083b Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 28 Jan 2014 23:40:27 +0000 Subject: [PATCH 100/124] [NTOSKRNL] - Implement FsRtlRegisterFileSystemFilterCallbacks - Fix returned ResultLength value in NtQuerySystemInformation - Create \FileSystems\Filters folder in IopCreateRootDirectories, used by Windows fltmgr svn path=/trunk/; revision=61874 --- reactos/ntoskrnl/ex/sysinfo.c | 51 ++++++++++++++------------- reactos/ntoskrnl/fsrtl/fastio.c | 36 ++++++++++++++++--- reactos/ntoskrnl/io/iomgr/iomgr.c | 58 +++++++++++++++++++++++-------- 3 files changed, 101 insertions(+), 44 deletions(-) diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c index f441dff1d62..f8195b01947 100644 --- a/reactos/ntoskrnl/ex/sysinfo.c +++ b/reactos/ntoskrnl/ex/sysinfo.c @@ -1654,7 +1654,7 @@ SSI_DEF(SystemExtendServiceTableInformation) /* Check who is calling */ if (PreviousMode != KernelMode) { - static const UNICODE_STRING Win32kName = + static const UNICODE_STRING Win32kName = RTL_CONSTANT_STRING(L"\\SystemRoot\\System32\\win32k.sys"); /* Make sure we can load drivers */ @@ -1663,7 +1663,7 @@ SSI_DEF(SystemExtendServiceTableInformation) /* FIXME: We can't, fail */ return STATUS_PRIVILEGE_NOT_HELD; } - + _SEH2_TRY { /* Probe and copy the unicode string */ @@ -1684,7 +1684,7 @@ SSI_DEF(SystemExtendServiceTableInformation) _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - + /* Recursively call the function, so that we are from kernel mode */ return ZwSetSystemInformation(SystemExtendServiceTableInformation, (PVOID)&Win32kName, @@ -1956,51 +1956,51 @@ CallQS [] = SI_QX(SystemPerformanceInformation), SI_QX(SystemTimeOfDayInformation), SI_QX(SystemPathInformation), /* should be SI_XX */ - SI_QX(SystemProcessInformation), - SI_QX(SystemCallCountInformation), - SI_QX(SystemDeviceInformation), - SI_QX(SystemProcessorPerformanceInformation), - SI_QS(SystemFlagsInformation), + SI_QX(SystemProcessInformation), // aka SystemProcessesAndThreadsInformation + SI_QX(SystemCallCountInformation), // aka SystemCallCounts + SI_QX(SystemDeviceInformation), // aka SystemConfigurationInformation + SI_QX(SystemProcessorPerformanceInformation), // aka SystemProcessorTimes + SI_QS(SystemFlagsInformation), // aka SystemGlobalFlag SI_QX(SystemCallTimeInformation), /* should be SI_XX */ SI_QX(SystemModuleInformation), - SI_QX(SystemLocksInformation), + SI_QX(SystemLocksInformation), // aka SystemLockInformation SI_QX(SystemStackTraceInformation), /* should be SI_XX */ SI_QX(SystemPagedPoolInformation), /* should be SI_XX */ SI_QX(SystemNonPagedPoolInformation), /* should be SI_XX */ SI_QX(SystemHandleInformation), SI_QX(SystemObjectInformation), - SI_QX(SystemPageFileInformation), - SI_QX(SystemVdmInstemulInformation), + SI_QX(SystemPageFileInformation), // aka SystemPagefileInformation + SI_QX(SystemVdmInstemulInformation), // aka SystemInstructionEmulationCounts SI_QX(SystemVdmBopInformation), /* it should be SI_XX */ - SI_QS(SystemFileCacheInformation), + SI_QS(SystemFileCacheInformation), // aka SystemCacheInformation SI_QX(SystemPoolTagInformation), - SI_QX(SystemInterruptInformation), - SI_QS(SystemDpcBehaviourInformation), + SI_QX(SystemInterruptInformation), // aka SystemProcessorStatistics + SI_QS(SystemDpcBehaviourInformation), // aka SystemDpcInformation SI_QX(SystemFullMemoryInformation), /* it should be SI_XX */ - SI_XS(SystemLoadGdiDriverInformation), - SI_XS(SystemUnloadGdiDriverInformation), - SI_QS(SystemTimeAdjustmentInformation), + SI_XS(SystemLoadGdiDriverInformation), // correct: SystemLoadImage + SI_XS(SystemUnloadGdiDriverInformation), // correct: SystemUnloadImage + SI_QS(SystemTimeAdjustmentInformation), // aka SystemTimeAdjustment SI_QX(SystemSummaryMemoryInformation), /* it should be SI_XX */ SI_QX(SystemNextEventIdInformation), /* it should be SI_XX */ - SI_QX(SystemEventIdsInformation), /* it should be SI_XX */ + SI_QX(SystemEventIdsInformation), /* it should be SI_XX */ // SystemPerformanceTraceInformation SI_QX(SystemCrashDumpInformation), SI_QX(SystemExceptionInformation), SI_QX(SystemCrashDumpStateInformation), SI_QX(SystemKernelDebuggerInformation), SI_QX(SystemContextSwitchInformation), SI_QS(SystemRegistryQuotaInformation), - SI_XS(SystemExtendServiceTableInformation), + SI_XS(SystemExtendServiceTableInformation), // correct: SystemLoadAndCallImage SI_XS(SystemPrioritySeperation), SI_QX(SystemPlugPlayBusInformation), /* it should be SI_XX */ SI_QX(SystemDockInformation), /* it should be SI_XX */ - SI_QX(SystemPowerInformation), /* it should be SI_XX */ + SI_QX(SystemPowerInformation), /* it should be SI_XX */ // SystemPowerInformationNative? SystemInvalidInfoClass2 SI_QX(SystemProcessorSpeedInformation), /* it should be SI_XX */ - SI_QS(SystemCurrentTimeZoneInformation), /* it should be SI_QX */ + SI_QS(SystemCurrentTimeZoneInformation), /* it should be SI_QX */ // aka SystemTimeZoneInformation SI_QX(SystemLookasideInformation), SI_XS(SystemSetTimeSlipEvent), SI_XS(SystemCreateSession), SI_XS(SystemDeleteSession), - SI_QX(SystemInvalidInfoClass4), /* it should be SI_XX */ + SI_QX(SystemInvalidInfoClass4), /* it should be SI_XX */ // SystemSessionInformation? SI_QX(SystemRangeStartInformation), SI_QS(SystemVerifierInformation), SI_XS(SystemAddVerifier), @@ -2021,7 +2021,7 @@ NtQuerySystemInformation(IN SYSTEM_INFORMATION_CLASS SystemInformationClass, OUT PULONG UnsafeResultLength) { KPROCESSOR_MODE PreviousMode; - ULONG ResultLength; + ULONG ResultLength = 0; NTSTATUS FStatus = STATUS_NOT_IMPLEMENTED; PAGED_CODE(); @@ -2038,8 +2038,11 @@ NtQuerySystemInformation(IN SYSTEM_INFORMATION_CLASS SystemInformationClass, ProbeForWriteUlong(UnsafeResultLength); } + if (UnsafeResultLength) + *UnsafeResultLength = 0; + /* - * Check the request is valid. + * Check if the request is valid. */ if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) { diff --git a/reactos/ntoskrnl/fsrtl/fastio.c b/reactos/ntoskrnl/fsrtl/fastio.c index aad368e4fff..174c8bc4638 100644 --- a/reactos/ntoskrnl/fsrtl/fastio.c +++ b/reactos/ntoskrnl/fsrtl/fastio.c @@ -1802,7 +1802,7 @@ FsRtlAcquireFileForModWriteEx(IN PFILE_OBJECT FileObject, Exclusive = TRUE; ResourceToAcquire = FcbHeader->Resource; } - else if (!FcbHeader->PagingIoResource || + else if (!FcbHeader->PagingIoResource || (FcbHeader->Flags & FSRTL_FLAG_ACQUIRE_MAIN_RSRC_SH)) { /* Acquire main resource shared if flag is specified or @@ -1942,9 +1942,35 @@ FsRtlReleaseFileForModWrite(IN PFILE_OBJECT FileObject, *--*/ NTSTATUS NTAPI -FsRtlRegisterFileSystemFilterCallbacks(IN PDRIVER_OBJECT FilterDriverObject, - IN PFS_FILTER_CALLBACKS Callbacks) +FsRtlRegisterFileSystemFilterCallbacks( + PDRIVER_OBJECT FilterDriverObject, + PFS_FILTER_CALLBACKS Callbacks) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PFS_FILTER_CALLBACKS NewCallbacks; + PEXTENDED_DRIVER_EXTENSION DriverExtension; + PAGED_CODE(); + + /* Verify parameters */ + if ((FilterDriverObject == NULL) || (Callbacks == NULL)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Allocate a buffer for a copy of the callbacks */ + NewCallbacks = ExAllocatePoolWithTag(NonPagedPool, + Callbacks->SizeOfFsFilterCallbacks, + 'gmSF'); + if (NewCallbacks == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the callbacks */ + RtlCopyMemory(NewCallbacks, Callbacks, Callbacks->SizeOfFsFilterCallbacks); + + /* Set the callbacks in the driver extension */ + DriverExtension = (PEXTENDED_DRIVER_EXTENSION)FilterDriverObject->DriverExtension; + DriverExtension->FsFilterCallbacks = NewCallbacks; + + return STATUS_SUCCESS; } diff --git a/reactos/ntoskrnl/io/iomgr/iomgr.c b/reactos/ntoskrnl/io/iomgr/iomgr.c index fe86ac9f68d..b1d4a136731 100644 --- a/reactos/ntoskrnl/io/iomgr/iomgr.c +++ b/reactos/ntoskrnl/io/iomgr/iomgr.c @@ -110,7 +110,7 @@ IopInitLookasideLists(VOID) IOC_TAG1, 32, &ExSystemLookasideListHead); - + /* Initialize the Lookaside List for Large IRPs */ ExInitializeSystemLookasideList(&IoLargeIrpLookaside, NonPagedPool, @@ -137,11 +137,11 @@ IopInitLookasideLists(VOID) &ExSystemLookasideListHead); /* Allocate the global lookaside list buffer */ - CurrentList = ExAllocatePoolWithTag(NonPagedPool, + CurrentList = ExAllocatePoolWithTag(NonPagedPool, 4 * KeNumberProcessors * sizeof(GENERAL_LOOKASIDE), TAG_IO); - + /* Loop all processors */ for (i = 0; i < KeNumberProcessors; i++) { @@ -165,13 +165,13 @@ IopInitLookasideLists(VOID) &ExSystemLookasideListHead); Prcb->PPLookasideList[LookasideCompletionList].P = CurrentList; CurrentList++; - + } else { Prcb->PPLookasideList[LookasideCompletionList].P = &IoCompletionPacketLookaside; } - + /* Set the Large IRP List */ Prcb->PPLookasideList[LookasideLargeIrpList].L = &IoLargeIrpLookaside; if (CurrentList) @@ -185,7 +185,7 @@ IopInitLookasideLists(VOID) &ExSystemLookasideListHead); Prcb->PPLookasideList[LookasideLargeIrpList].P = CurrentList; CurrentList++; - + } else { @@ -205,7 +205,7 @@ IopInitLookasideLists(VOID) &ExSystemLookasideListHead); Prcb->PPLookasideList[LookasideSmallIrpList].P = CurrentList; CurrentList++; - + } else { @@ -223,10 +223,10 @@ IopInitLookasideLists(VOID) TAG_MDL, 128, &ExSystemLookasideListHead); - + Prcb->PPLookasideList[LookasideMdlList].P = CurrentList; CurrentList++; - + } else { @@ -332,6 +332,7 @@ IopCreateRootDirectories() OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING DirName; HANDLE Handle; + NTSTATUS Status; /* Create the '\Driver' object directory */ RtlInitUnicodeString(&DirName, L"\\Driver"); @@ -340,9 +341,14 @@ IopCreateRootDirectories() OBJ_PERMANENT, NULL, NULL); - if (!NT_SUCCESS(NtCreateDirectoryObject(&Handle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes))) return FALSE; + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create \\Driver directory: 0x%lx\n", Status); + return FALSE; + } NtClose(Handle); /* Create the '\FileSystem' object directory */ @@ -352,9 +358,31 @@ IopCreateRootDirectories() OBJ_PERMANENT, NULL, NULL); - if (!NT_SUCCESS(NtCreateDirectoryObject(&Handle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes))) return FALSE; + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create \\FileSystem directory: 0x%lx\n", Status); + return FALSE; + } + NtClose(Handle); + + /* Create the '\FileSystem' object directory */ + RtlInitUnicodeString(&DirName, L"\\FileSystem\\Filters"); + InitializeObjectAttributes(&ObjectAttributes, + &DirName, + OBJ_PERMANENT, + NULL, + NULL); + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create \\FileSystem\\Filters directory: 0x%lx\n", Status); + return FALSE; + } NtClose(Handle); /* Return success */ From 9bda77c266c3a109f1b8cf4e984ae38fa300a718 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 29 Jan 2014 10:51:04 +0000 Subject: [PATCH 101/124] [HIDCLASS] * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61876 --- reactos/drivers/hid/hidclass/CMakeLists.txt | 1 + reactos/drivers/hid/hidclass/guid.c | 9 +++++++++ reactos/drivers/hid/hidclass/precomp.h | 2 -- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 reactos/drivers/hid/hidclass/guid.c diff --git a/reactos/drivers/hid/hidclass/CMakeLists.txt b/reactos/drivers/hid/hidclass/CMakeLists.txt index 08fdc7ae4c4..a2dae40eab9 100644 --- a/reactos/drivers/hid/hidclass/CMakeLists.txt +++ b/reactos/drivers/hid/hidclass/CMakeLists.txt @@ -6,6 +6,7 @@ list(APPEND SOURCE hidclass.c hidclass.rc pdo.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) add_library(hidclass SHARED ${SOURCE}) diff --git a/reactos/drivers/hid/hidclass/guid.c b/reactos/drivers/hid/hidclass/guid.c new file mode 100644 index 00000000000..a24db4d729d --- /dev/null +++ b/reactos/drivers/hid/hidclass/guid.c @@ -0,0 +1,9 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include +#include +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/drivers/hid/hidclass/precomp.h b/reactos/drivers/hid/hidclass/precomp.h index d59b642510d..37afc2a0530 100644 --- a/reactos/drivers/hid/hidclass/precomp.h +++ b/reactos/drivers/hid/hidclass/precomp.h @@ -4,8 +4,6 @@ #include #include #include - -#include #include #define HIDCLASS_TAG 'CdiH' From 1f5cc0b90b4996a83309893032b3341e2567a7de Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 29 Jan 2014 10:52:04 +0000 Subject: [PATCH 102/124] [I8042PRT] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61877 --- reactos/drivers/input/i8042prt/i8042prt.h | 4 ---- reactos/drivers/input/i8042prt/keyboard.c | 3 +++ reactos/drivers/input/i8042prt/misc.c | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/drivers/input/i8042prt/i8042prt.h b/reactos/drivers/input/i8042prt/i8042prt.h index 8cbe739afb6..92478010e6c 100644 --- a/reactos/drivers/input/i8042prt/i8042prt.h +++ b/reactos/drivers/input/i8042prt/i8042prt.h @@ -4,10 +4,6 @@ #include #include #include -#include -#include -#include -#include /*----------------------------------------------------- * Structures diff --git a/reactos/drivers/input/i8042prt/keyboard.c b/reactos/drivers/input/i8042prt/keyboard.c index 209836ade15..e59af0955a6 100644 --- a/reactos/drivers/input/i8042prt/keyboard.c +++ b/reactos/drivers/input/i8042prt/keyboard.c @@ -13,6 +13,9 @@ #include "i8042prt.h" +#include +#include + #include /* GLOBALS *******************************************************************/ diff --git a/reactos/drivers/input/i8042prt/misc.c b/reactos/drivers/input/i8042prt/misc.c index 64f67c133ca..6b6ad572e89 100644 --- a/reactos/drivers/input/i8042prt/misc.c +++ b/reactos/drivers/input/i8042prt/misc.c @@ -13,6 +13,7 @@ #include /* FUNCTIONS *****************************************************************/ + static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI From 6b89580cf481254c2f49c4c6bdca271ba2d1884c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 29 Jan 2014 10:53:48 +0000 Subject: [PATCH 103/124] [KBDCLASS] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61878 --- reactos/drivers/input/kbdclass/CMakeLists.txt | 1 + reactos/drivers/input/kbdclass/guid.c | 8 ++++++++ reactos/drivers/input/kbdclass/kbdclass.c | 6 +++++- reactos/drivers/input/kbdclass/kbdclass.h | 5 ----- reactos/drivers/input/kbdclass/misc.c | 2 ++ 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 reactos/drivers/input/kbdclass/guid.c diff --git a/reactos/drivers/input/kbdclass/CMakeLists.txt b/reactos/drivers/input/kbdclass/CMakeLists.txt index ac63a01083f..f899f644975 100644 --- a/reactos/drivers/input/kbdclass/CMakeLists.txt +++ b/reactos/drivers/input/kbdclass/CMakeLists.txt @@ -2,6 +2,7 @@ add_library(kbdclass SHARED kbdclass.c misc.c + guid.c kbdclass.rc) set_module_type(kbdclass kernelmodedriver) diff --git a/reactos/drivers/input/kbdclass/guid.c b/reactos/drivers/input/kbdclass/guid.c new file mode 100644 index 00000000000..542ffa1e9fb --- /dev/null +++ b/reactos/drivers/input/kbdclass/guid.c @@ -0,0 +1,8 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#define STDAPICALLTYPE __stdcall +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/drivers/input/kbdclass/kbdclass.c b/reactos/drivers/input/kbdclass/kbdclass.c index ec8de662167..12ff89e3fec 100644 --- a/reactos/drivers/input/kbdclass/kbdclass.c +++ b/reactos/drivers/input/kbdclass/kbdclass.c @@ -7,9 +7,13 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define INITGUID #include "kbdclass.h" +#include +#include +#include +#include + static DRIVER_UNLOAD DriverUnload; static DRIVER_DISPATCH ClassCreate; static DRIVER_DISPATCH ClassClose; diff --git a/reactos/drivers/input/kbdclass/kbdclass.h b/reactos/drivers/input/kbdclass/kbdclass.h index fd92082a44c..6c40fd90663 100644 --- a/reactos/drivers/input/kbdclass/kbdclass.h +++ b/reactos/drivers/input/kbdclass/kbdclass.h @@ -1,10 +1,5 @@ #include -#include #include -#include -#include - -#include #define MAX_PATH 260 diff --git a/reactos/drivers/input/kbdclass/misc.c b/reactos/drivers/input/kbdclass/misc.c index 91aa4f857e5..ce0db805471 100644 --- a/reactos/drivers/input/kbdclass/misc.c +++ b/reactos/drivers/input/kbdclass/misc.c @@ -9,6 +9,8 @@ #include "kbdclass.h" +#include + static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI From 379fe87636b946197f0f7ac2a68e007848293e68 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 29 Jan 2014 10:54:59 +0000 Subject: [PATCH 104/124] [MOUCLASS] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61879 --- reactos/drivers/input/mouclass/CMakeLists.txt | 1 + reactos/drivers/input/mouclass/guid.c | 7 +++++++ reactos/drivers/input/mouclass/misc.c | 2 ++ reactos/drivers/input/mouclass/mouclass.c | 6 +++++- reactos/drivers/input/mouclass/mouclass.h | 7 +------ 5 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 reactos/drivers/input/mouclass/guid.c diff --git a/reactos/drivers/input/mouclass/CMakeLists.txt b/reactos/drivers/input/mouclass/CMakeLists.txt index f5bf9656690..821c729200c 100644 --- a/reactos/drivers/input/mouclass/CMakeLists.txt +++ b/reactos/drivers/input/mouclass/CMakeLists.txt @@ -2,6 +2,7 @@ add_library(mouclass SHARED misc.c mouclass.c + guid.c mouclass.rc) set_module_type(mouclass kernelmodedriver) diff --git a/reactos/drivers/input/mouclass/guid.c b/reactos/drivers/input/mouclass/guid.c new file mode 100644 index 00000000000..0dd88914f27 --- /dev/null +++ b/reactos/drivers/input/mouclass/guid.c @@ -0,0 +1,7 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/drivers/input/mouclass/misc.c b/reactos/drivers/input/mouclass/misc.c index b7d882b0978..7d88221e706 100644 --- a/reactos/drivers/input/mouclass/misc.c +++ b/reactos/drivers/input/mouclass/misc.c @@ -9,6 +9,8 @@ #include "mouclass.h" +#include + static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI diff --git a/reactos/drivers/input/mouclass/mouclass.c b/reactos/drivers/input/mouclass/mouclass.c index 25019e0bb78..070dc5096e4 100644 --- a/reactos/drivers/input/mouclass/mouclass.c +++ b/reactos/drivers/input/mouclass/mouclass.c @@ -7,9 +7,13 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define INITGUID #include "mouclass.h" +#include +#include +#include +#include + static DRIVER_UNLOAD DriverUnload; static DRIVER_DISPATCH ClassCreate; static DRIVER_DISPATCH ClassClose; diff --git a/reactos/drivers/input/mouclass/mouclass.h b/reactos/drivers/input/mouclass/mouclass.h index 5bf7e15c7e5..d69402a5526 100644 --- a/reactos/drivers/input/mouclass/mouclass.h +++ b/reactos/drivers/input/mouclass/mouclass.h @@ -1,10 +1,5 @@ #include -#include -#include -#include -#include - -#include +#include #define MAX_PATH 260 From 0bf31251eabbc46f177dc69a070c76a43f13843d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 29 Jan 2014 10:56:25 +0000 Subject: [PATCH 105/124] [SERMOUSE] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61880 --- reactos/drivers/input/sermouse/createclose.c | 2 ++ reactos/drivers/input/sermouse/detect.c | 3 +++ reactos/drivers/input/sermouse/fdo.c | 2 ++ reactos/drivers/input/sermouse/internaldevctl.c | 2 ++ reactos/drivers/input/sermouse/misc.c | 2 ++ reactos/drivers/input/sermouse/readmouse.c | 2 ++ reactos/drivers/input/sermouse/sermouse.c | 3 ++- reactos/drivers/input/sermouse/sermouse.h | 6 ++---- 8 files changed, 17 insertions(+), 5 deletions(-) diff --git a/reactos/drivers/input/sermouse/createclose.c b/reactos/drivers/input/sermouse/createclose.c index 0c213dcdf53..a70bfd701d2 100644 --- a/reactos/drivers/input/sermouse/createclose.c +++ b/reactos/drivers/input/sermouse/createclose.c @@ -8,6 +8,8 @@ #include "sermouse.h" +#include + NTSTATUS NTAPI SermouseCreate( IN PDEVICE_OBJECT DeviceObject, diff --git a/reactos/drivers/input/sermouse/detect.c b/reactos/drivers/input/sermouse/detect.c index f27ee82d46a..f5fa5271181 100644 --- a/reactos/drivers/input/sermouse/detect.c +++ b/reactos/drivers/input/sermouse/detect.c @@ -10,6 +10,9 @@ #include "sermouse.h" +#include +#include + /* Most of this file is ripped from reactos/drivers/bus/serenum/detect.c */ static NTSTATUS diff --git a/reactos/drivers/input/sermouse/fdo.c b/reactos/drivers/input/sermouse/fdo.c index a8f7c7262b3..486abea139c 100644 --- a/reactos/drivers/input/sermouse/fdo.c +++ b/reactos/drivers/input/sermouse/fdo.c @@ -8,6 +8,8 @@ #include "sermouse.h" +#include + NTSTATUS NTAPI SermouseAddDevice( IN PDRIVER_OBJECT DriverObject, diff --git a/reactos/drivers/input/sermouse/internaldevctl.c b/reactos/drivers/input/sermouse/internaldevctl.c index 37bf775193f..0022ac33eca 100644 --- a/reactos/drivers/input/sermouse/internaldevctl.c +++ b/reactos/drivers/input/sermouse/internaldevctl.c @@ -8,6 +8,8 @@ #include "sermouse.h" +#include + NTSTATUS NTAPI SermouseInternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, diff --git a/reactos/drivers/input/sermouse/misc.c b/reactos/drivers/input/sermouse/misc.c index cb288392831..0465e83988b 100644 --- a/reactos/drivers/input/sermouse/misc.c +++ b/reactos/drivers/input/sermouse/misc.c @@ -8,6 +8,8 @@ #include "sermouse.h" +#include + static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI diff --git a/reactos/drivers/input/sermouse/readmouse.c b/reactos/drivers/input/sermouse/readmouse.c index 0c7f48c8559..6142e9bdeb9 100644 --- a/reactos/drivers/input/sermouse/readmouse.c +++ b/reactos/drivers/input/sermouse/readmouse.c @@ -10,6 +10,8 @@ #include "sermouse.h" +#include + static NTSTATUS SermouseDeviceIoControl( IN PDEVICE_OBJECT DeviceObject, diff --git a/reactos/drivers/input/sermouse/sermouse.c b/reactos/drivers/input/sermouse/sermouse.c index 10091b2b0ab..c7e8b789a46 100644 --- a/reactos/drivers/input/sermouse/sermouse.c +++ b/reactos/drivers/input/sermouse/sermouse.c @@ -6,9 +6,10 @@ * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin@reactos.org) */ -#define INITGUID #include "sermouse.h" +#include + static DRIVER_UNLOAD DriverUnload; static DRIVER_DISPATCH IrpStub; DRIVER_INITIALIZE DriverEntry; diff --git a/reactos/drivers/input/sermouse/sermouse.h b/reactos/drivers/input/sermouse/sermouse.h index b884008b7b6..696bb171811 100644 --- a/reactos/drivers/input/sermouse/sermouse.h +++ b/reactos/drivers/input/sermouse/sermouse.h @@ -1,8 +1,6 @@ -#include -#include +#include #include -#include -#include +#include #define SERMOUSE_TAG 'uoMS' From 1f2d5bca916cab488b7b90da7c0d4d58613b79e4 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 29 Jan 2014 10:59:06 +0000 Subject: [PATCH 106/124] [KS] * Properly name the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61881 --- reactos/drivers/ksfilter/ks/allocators.c | 2 +- reactos/drivers/ksfilter/ks/api.c | 2 +- reactos/drivers/ksfilter/ks/bag.c | 2 +- reactos/drivers/ksfilter/ks/clocks.c | 2 +- reactos/drivers/ksfilter/ks/connectivity.c | 2 +- reactos/drivers/ksfilter/ks/device.c | 2 +- reactos/drivers/ksfilter/ks/deviceinterface.c | 2 +- reactos/drivers/ksfilter/ks/driver.c | 2 +- reactos/drivers/ksfilter/ks/event.c | 2 +- reactos/drivers/ksfilter/ks/filter.c | 2 +- reactos/drivers/ksfilter/ks/filterfactory.c | 2 +- reactos/drivers/ksfilter/ks/image.c | 2 +- reactos/drivers/ksfilter/ks/irp.c | 4 +++- reactos/drivers/ksfilter/ks/kcom.c | 2 +- reactos/drivers/ksfilter/ks/methods.c | 2 +- reactos/drivers/ksfilter/ks/misc.c | 2 +- reactos/drivers/ksfilter/ks/pin.c | 2 +- reactos/drivers/ksfilter/ks/{priv.h => precomp.h} | 2 +- reactos/drivers/ksfilter/ks/property.c | 2 +- reactos/drivers/ksfilter/ks/swenum.c | 2 +- reactos/drivers/ksfilter/ks/topology.c | 2 +- reactos/drivers/ksfilter/ks/unknown.c | 2 +- reactos/drivers/ksfilter/ks/worker.c | 2 +- 23 files changed, 25 insertions(+), 23 deletions(-) rename reactos/drivers/ksfilter/ks/{priv.h => precomp.h} (99%) diff --git a/reactos/drivers/ksfilter/ks/allocators.c b/reactos/drivers/ksfilter/ks/allocators.c index 5c7457ff791..efeea721d9b 100644 --- a/reactos/drivers/ksfilter/ks/allocators.c +++ b/reactos/drivers/ksfilter/ks/allocators.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/api.c b/reactos/drivers/ksfilter/ks/api.c index 504b60570f7..26aa2cf8025 100644 --- a/reactos/drivers/ksfilter/ks/api.c +++ b/reactos/drivers/ksfilter/ks/api.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/bag.c b/reactos/drivers/ksfilter/ks/bag.c index ec8beb07afa..4f328a0a6d4 100644 --- a/reactos/drivers/ksfilter/ks/bag.c +++ b/reactos/drivers/ksfilter/ks/bag.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/clocks.c b/reactos/drivers/ksfilter/ks/clocks.c index 15a567d1081..7b397a6a290 100644 --- a/reactos/drivers/ksfilter/ks/clocks.c +++ b/reactos/drivers/ksfilter/ks/clocks.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/connectivity.c b/reactos/drivers/ksfilter/ks/connectivity.c index 1d995263bc8..2056aa5bc21 100644 --- a/reactos/drivers/ksfilter/ks/connectivity.c +++ b/reactos/drivers/ksfilter/ks/connectivity.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/device.c b/reactos/drivers/ksfilter/ks/device.c index 7b974ddf7a7..b9d865f6ace 100644 --- a/reactos/drivers/ksfilter/ks/device.c +++ b/reactos/drivers/ksfilter/ks/device.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/deviceinterface.c b/reactos/drivers/ksfilter/ks/deviceinterface.c index 4c981932d6b..36fe9437fc9 100644 --- a/reactos/drivers/ksfilter/ks/deviceinterface.c +++ b/reactos/drivers/ksfilter/ks/deviceinterface.c @@ -1,4 +1,4 @@ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/driver.c b/reactos/drivers/ksfilter/ks/driver.c index ed43717e219..77ff4d26960 100644 --- a/reactos/drivers/ksfilter/ks/driver.c +++ b/reactos/drivers/ksfilter/ks/driver.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/event.c b/reactos/drivers/ksfilter/ks/event.c index 367148488e4..f851957c19e 100644 --- a/reactos/drivers/ksfilter/ks/event.c +++ b/reactos/drivers/ksfilter/ks/event.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/filter.c b/reactos/drivers/ksfilter/ks/filter.c index 30ef76cc049..5fb686d3973 100644 --- a/reactos/drivers/ksfilter/ks/filter.c +++ b/reactos/drivers/ksfilter/ks/filter.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/filterfactory.c b/reactos/drivers/ksfilter/ks/filterfactory.c index c2b4e25d8d0..5ad12916f46 100644 --- a/reactos/drivers/ksfilter/ks/filterfactory.c +++ b/reactos/drivers/ksfilter/ks/filterfactory.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/image.c b/reactos/drivers/ksfilter/ks/image.c index 3cfa72f5521..7e31cd497ff 100644 --- a/reactos/drivers/ksfilter/ks/image.c +++ b/reactos/drivers/ksfilter/ks/image.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #include #include diff --git a/reactos/drivers/ksfilter/ks/irp.c b/reactos/drivers/ksfilter/ks/irp.c index 4ec985ff277..fe66ac42ab4 100644 --- a/reactos/drivers/ksfilter/ks/irp.c +++ b/reactos/drivers/ksfilter/ks/irp.c @@ -6,7 +6,9 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" + +#include #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/kcom.c b/reactos/drivers/ksfilter/ks/kcom.c index be38e1a8021..2d020affaf0 100644 --- a/reactos/drivers/ksfilter/ks/kcom.c +++ b/reactos/drivers/ksfilter/ks/kcom.c @@ -7,7 +7,7 @@ Andrew Greenwood */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/methods.c b/reactos/drivers/ksfilter/ks/methods.c index 96369788e31..65b49c60373 100644 --- a/reactos/drivers/ksfilter/ks/methods.c +++ b/reactos/drivers/ksfilter/ks/methods.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/misc.c b/reactos/drivers/ksfilter/ks/misc.c index fd867263b67..1aa2b7dcbdc 100644 --- a/reactos/drivers/ksfilter/ks/misc.c +++ b/reactos/drivers/ksfilter/ks/misc.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/pin.c b/reactos/drivers/ksfilter/ks/pin.c index 4a57476e95a..0865b3b7b8c 100644 --- a/reactos/drivers/ksfilter/ks/pin.c +++ b/reactos/drivers/ksfilter/ks/pin.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #include diff --git a/reactos/drivers/ksfilter/ks/priv.h b/reactos/drivers/ksfilter/ks/precomp.h similarity index 99% rename from reactos/drivers/ksfilter/ks/priv.h rename to reactos/drivers/ksfilter/ks/precomp.h index 43d859fcd75..73376d99b0f 100644 --- a/reactos/drivers/ksfilter/ks/priv.h +++ b/reactos/drivers/ksfilter/ks/precomp.h @@ -1,6 +1,6 @@ #define _KSDDK_ -#include +#include #include #include #include diff --git a/reactos/drivers/ksfilter/ks/property.c b/reactos/drivers/ksfilter/ks/property.c index b6b191198bc..960b4997406 100644 --- a/reactos/drivers/ksfilter/ks/property.c +++ b/reactos/drivers/ksfilter/ks/property.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/swenum.c b/reactos/drivers/ksfilter/ks/swenum.c index d65fa1e5935..0b76c8562a4 100644 --- a/reactos/drivers/ksfilter/ks/swenum.c +++ b/reactos/drivers/ksfilter/ks/swenum.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #include #include diff --git a/reactos/drivers/ksfilter/ks/topology.c b/reactos/drivers/ksfilter/ks/topology.c index 7a9b447b662..c6dc1b77718 100644 --- a/reactos/drivers/ksfilter/ks/topology.c +++ b/reactos/drivers/ksfilter/ks/topology.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/unknown.c b/reactos/drivers/ksfilter/ks/unknown.c index 6af2adf54f8..795e9241a4c 100644 --- a/reactos/drivers/ksfilter/ks/unknown.c +++ b/reactos/drivers/ksfilter/ks/unknown.c @@ -7,7 +7,7 @@ * KJK::Hyperion */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/drivers/ksfilter/ks/worker.c b/reactos/drivers/ksfilter/ks/worker.c index f544d633f67..276d93207be 100644 --- a/reactos/drivers/ksfilter/ks/worker.c +++ b/reactos/drivers/ksfilter/ks/worker.c @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include From ad76a6a0773220f75aa5c9400d102ea323467228 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 29 Jan 2014 11:00:53 +0000 Subject: [PATCH 107/124] [AFD] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61882 --- reactos/drivers/network/afd/afd/bind.c | 1 - reactos/drivers/network/afd/afd/connect.c | 1 + reactos/drivers/network/afd/afd/context.c | 1 + reactos/drivers/network/afd/afd/event.c | 2 +- reactos/drivers/network/afd/afd/info.c | 1 + reactos/drivers/network/afd/afd/listen.c | 1 + reactos/drivers/network/afd/afd/lock.c | 1 + reactos/drivers/network/afd/afd/read.c | 1 + reactos/drivers/network/afd/afd/select.c | 1 + reactos/drivers/network/afd/afd/tdi.c | 8 ++++---- reactos/drivers/network/afd/afd/tdiconn.c | 2 +- reactos/drivers/network/afd/afd/write.c | 2 +- reactos/drivers/network/afd/include/afd.h | 9 +-------- reactos/drivers/network/afd/include/tdiconn.h | 4 ---- 14 files changed, 15 insertions(+), 20 deletions(-) diff --git a/reactos/drivers/network/afd/afd/bind.c b/reactos/drivers/network/afd/afd/bind.c index ec895faaf5d..e16ab26874c 100644 --- a/reactos/drivers/network/afd/afd/bind.c +++ b/reactos/drivers/network/afd/afd/bind.c @@ -105,4 +105,3 @@ AfdBindSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, return UnlockAndMaybeComplete( FCB, Status, Irp, (ULONG_PTR)FCB->AddressFile.Handle ); } - diff --git a/reactos/drivers/network/afd/afd/connect.c b/reactos/drivers/network/afd/afd/connect.c index bd394a3abc2..7a08fdfa8b1 100644 --- a/reactos/drivers/network/afd/afd/connect.c +++ b/reactos/drivers/network/afd/afd/connect.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS diff --git a/reactos/drivers/network/afd/afd/context.c b/reactos/drivers/network/afd/afd/context.c index 5cc8ac766bc..6bcc17c5db1 100644 --- a/reactos/drivers/network/afd/afd/context.c +++ b/reactos/drivers/network/afd/afd/context.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS NTAPI diff --git a/reactos/drivers/network/afd/afd/event.c b/reactos/drivers/network/afd/afd/event.c index 801f2a54d69..93f5f3d3360 100644 --- a/reactos/drivers/network/afd/afd/event.c +++ b/reactos/drivers/network/afd/afd/event.c @@ -7,6 +7,7 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include NTSTATUS AfdEventError( @@ -307,5 +308,4 @@ NTSTATUS AfdDeregisterEventHandlers( return STATUS_SUCCESS; } - /* EOF */ diff --git a/reactos/drivers/network/afd/afd/info.c b/reactos/drivers/network/afd/afd/info.c index 60955240a2d..2ceff463561 100644 --- a/reactos/drivers/network/afd/afd/info.c +++ b/reactos/drivers/network/afd/afd/info.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS NTAPI diff --git a/reactos/drivers/network/afd/afd/listen.c b/reactos/drivers/network/afd/afd/listen.c index 00f8e7537df..94893fc5ea6 100644 --- a/reactos/drivers/network/afd/afd/listen.c +++ b/reactos/drivers/network/afd/afd/listen.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static NTSTATUS SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt, diff --git a/reactos/drivers/network/afd/afd/lock.c b/reactos/drivers/network/afd/afd/lock.c index 5b0ed2280be..714987d50b9 100644 --- a/reactos/drivers/network/afd/afd/lock.c +++ b/reactos/drivers/network/afd/afd/lock.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" PVOID GetLockedData(PIRP Irp, PIO_STACK_LOCATION IrpSp) diff --git a/reactos/drivers/network/afd/afd/read.c b/reactos/drivers/network/afd/afd/read.c index 9ba5c31fe13..6e02a67c435 100644 --- a/reactos/drivers/network/afd/afd/read.c +++ b/reactos/drivers/network/afd/afd/read.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static VOID RefillSocketBuffer( PAFD_FCB FCB ) diff --git a/reactos/drivers/network/afd/afd/select.c b/reactos/drivers/network/afd/afd/select.c index a19ec5775d9..66b8ac846ca 100644 --- a/reactos/drivers/network/afd/afd/select.c +++ b/reactos/drivers/network/afd/afd/select.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static VOID PrintEvents( ULONG Events ) { diff --git a/reactos/drivers/network/afd/afd/tdi.c b/reactos/drivers/network/afd/afd/tdi.c index fcdb77bb39c..60040e16d39 100644 --- a/reactos/drivers/network/afd/afd/tdi.c +++ b/reactos/drivers/network/afd/afd/tdi.c @@ -7,11 +7,11 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include -#include -#include "debug.h" -#include "tdiconn.h" -#include "tdi_proto.h" + +#include +#include #if DBG #if 0 diff --git a/reactos/drivers/network/afd/afd/tdiconn.c b/reactos/drivers/network/afd/afd/tdiconn.c index 72b7c3f75ec..a0c27c9c2b4 100644 --- a/reactos/drivers/network/afd/afd/tdiconn.c +++ b/reactos/drivers/network/afd/afd/tdiconn.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include UINT TdiAddressSizeFromType( UINT AddressType ) { @@ -261,4 +262,3 @@ TdiBuildConnectionInfo return Status; } - diff --git a/reactos/drivers/network/afd/afd/write.c b/reactos/drivers/network/afd/afd/write.c index 6b2c23c787c..3f071095bc7 100644 --- a/reactos/drivers/network/afd/afd/write.c +++ b/reactos/drivers/network/afd/afd/write.c @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static IO_COMPLETION_ROUTINE SendComplete; @@ -661,4 +662,3 @@ AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp, return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } } - diff --git a/reactos/drivers/network/afd/include/afd.h b/reactos/drivers/network/afd/include/afd.h index d06bf46b51c..f27ce8f8fe4 100644 --- a/reactos/drivers/network/afd/include/afd.h +++ b/reactos/drivers/network/afd/include/afd.h @@ -11,16 +11,9 @@ #ifndef _AFD_H #define _AFD_H -#include #include #include -#include -#include -#include #include -#include -#include -#include #define _WINBASE_ #define _WINDOWS_H #define _INC_WINDOWS @@ -434,4 +427,4 @@ NTSTATUS NTAPI AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); -#endif/*_AFD_H*/ +#endif /* _AFD_H */ diff --git a/reactos/drivers/network/afd/include/tdiconn.h b/reactos/drivers/network/afd/include/tdiconn.h index 1eb94a33d4c..4a6e10ef4f2 100644 --- a/reactos/drivers/network/afd/include/tdiconn.h +++ b/reactos/drivers/network/afd/include/tdiconn.h @@ -1,9 +1,5 @@ #pragma once -#ifdef _MSC_VER -#include -#endif - typedef VOID *PTDI_CONNECTION_INFO_PAIR; PTRANSPORT_ADDRESS TaCopyTransportAddress( PTRANSPORT_ADDRESS OtherAddress ); From e2be2729b0c0e41a5c23a424cb65ec187d813401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Wed, 29 Jan 2014 18:32:14 +0000 Subject: [PATCH 108/124] [WIN32K] - Implement GDIOBJ_TryLockObject and used it for DRIVEROBJs - Fix EngUnlockDriverObj svn path=/trunk/; revision=61883 --- reactos/win32ss/gdi/eng/driverobj.c | 13 +++--- reactos/win32ss/gdi/eng/driverobj.h | 4 +- reactos/win32ss/gdi/ntgdi/gdiobj.c | 69 +++++++++++++++++++++++++++++ reactos/win32ss/gdi/ntgdi/gdiobj.h | 6 +++ reactos/win32ss/gdi/ntgdi/misc.h | 8 ++++ 5 files changed, 92 insertions(+), 8 deletions(-) diff --git a/reactos/win32ss/gdi/eng/driverobj.c b/reactos/win32ss/gdi/eng/driverobj.c index d3488a668e6..db2e8e3e39a 100644 --- a/reactos/win32ss/gdi/eng/driverobj.c +++ b/reactos/win32ss/gdi/eng/driverobj.c @@ -80,7 +80,7 @@ EngDeleteDriverObj( PEDRIVEROBJ pedo; /* Lock the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); if (!pedo) { return FALSE; @@ -100,10 +100,11 @@ EngDeleteDriverObj( /* Prevent cleanup callback from being called again */ pedo->drvobj.pFreeProc = NULL; - /* NOTE: We don't care about the bLocked param, as our handle manager - allows freeing the object, while we hold any number of locks. */ + /* Unlock if the caller indicates it is locked */ + if (bLocked) + DRIVEROBJ_UnlockObject(pedo); - /* Delete the object */ + /* Now delete the object */ GDIOBJ_vDeleteObject(&pedo->baseobj); return TRUE; } @@ -117,7 +118,7 @@ EngLockDriverObj( PEDRIVEROBJ pedo; /* Lock the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); /* Return pointer to the DRIVEROBJ structure */ return &pedo->drvobj; @@ -133,7 +134,7 @@ EngUnlockDriverObj( ULONG cLocks; /* First lock to get a pointer to the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); if(!pedo) { /* Object could not be locked, fail. */ diff --git a/reactos/win32ss/gdi/eng/driverobj.h b/reactos/win32ss/gdi/eng/driverobj.h index 92a0bab7ad9..25961e461ad 100644 --- a/reactos/win32ss/gdi/eng/driverobj.h +++ b/reactos/win32ss/gdi/eng/driverobj.h @@ -20,7 +20,7 @@ BOOL NTAPI DRIVEROBJ_Cleanup(PVOID pObject); FORCEINLINE PEDRIVEROBJ -DRIVEROBJ_LockObject(HDRVOBJ hdo) +DRIVEROBJ_TryLockObject(HDRVOBJ hdo) { - return GDIOBJ_LockObject(hdo, GDIObjType_DRVOBJ_TYPE); + return GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE); } diff --git a/reactos/win32ss/gdi/ntgdi/gdiobj.c b/reactos/win32ss/gdi/ntgdi/gdiobj.c index 34f33668592..2958a186dd5 100644 --- a/reactos/win32ss/gdi/ntgdi/gdiobj.c +++ b/reactos/win32ss/gdi/ntgdi/gdiobj.c @@ -52,11 +52,14 @@ #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DC_TYPE || \ (objt) == GDIObjType_RGN_TYPE) +#define ASSERT_TRYLOCK_OBJECT_TYPE(objt) \ + ASSERT((objt) == GDIObjType_DRVOBJ_TYPE) #else #define DBG_INCREASE_LOCK_COUNT(ppi, hobj) #define DBG_DECREASE_LOCK_COUNT(x, y) #define ASSERT_SHARED_OBJECT_TYPE(objt) #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) +#define ASSERT_TRYLOCK_OBJECT_TYPE(objt) #endif #if defined(_M_IX86) || defined(_M_AMD64) @@ -621,6 +624,72 @@ GDIOBJ_vReferenceObjectByPointer(POBJ pobj) DBG_LOGEVENT(&pobj->slhLog, EVENT_REFERENCE, cRefs); } +PGDIOBJ +NTAPI +GDIOBJ_TryLockObject( + HGDIOBJ hobj, + UCHAR objt) +{ + PENTRY pentry; + POBJ pobj; + DWORD dwThreadId; + + /* Check if the handle type matches */ + ASSERT_TRYLOCK_OBJECT_TYPE(objt); + if ((((ULONG_PTR)hobj >> 16) & 0x1f) != objt) + { + DPRINT("Wrong object type: hobj=0x%p, objt=0x%x\n", hobj, objt); + return NULL; + } + + /* Reference the handle entry */ + pentry = ENTRY_ReferenceEntryByHandle(hobj, 0); + if (!pentry) + { + DPRINT("GDIOBJ: Requested handle 0x%p is not valid.\n", hobj); + return NULL; + } + + /* Get the pointer to the BASEOBJECT */ + pobj = pentry->einfo.pobj; + + /* Check if we already own the lock */ + dwThreadId = PtrToUlong(PsGetCurrentThreadId()); + if (pobj->dwThreadId != dwThreadId) + { + /* Disable APCs and try acquiring the push lock */ + KeEnterCriticalRegion(); + if(!ExTryAcquirePushLockExclusive(&pobj->pushlock)) + { + ULONG cRefs, ulIndex; + /* Already owned. Clean up and leave. */ + KeLeaveCriticalRegion(); + + /* Calculate the index */ + ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr); + + /* Decrement reference count */ + ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); + cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]); + ASSERT(cRefs & REF_MASK_VALID); + + return NULL; + } + + /* Set us as lock owner */ + ASSERT(pobj->dwThreadId == 0); + pobj->dwThreadId = dwThreadId; + } + + /* Increase lock count */ + pobj->cExclusiveLock++; + DBG_INCREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), hobj); + DBG_LOGEVENT(&pobj->slhLog, EVENT_LOCK, 0); + + /* Return the object */ + return pobj; +} + PGDIOBJ NTAPI GDIOBJ_LockObject( diff --git a/reactos/win32ss/gdi/ntgdi/gdiobj.h b/reactos/win32ss/gdi/ntgdi/gdiobj.h index 5eb30a3ea7d..b049ff5d801 100644 --- a/reactos/win32ss/gdi/ntgdi/gdiobj.h +++ b/reactos/win32ss/gdi/ntgdi/gdiobj.h @@ -141,6 +141,12 @@ GDIOBJ_LockObject( HGDIOBJ hobj, UCHAR objt); +PGDIOBJ +NTAPI +GDIOBJ_TryLockObject( + HGDIOBJ hobj, + UCHAR objt); + VOID NTAPI GDIOBJ_vUnlockObject( diff --git a/reactos/win32ss/gdi/ntgdi/misc.h b/reactos/win32ss/gdi/ntgdi/misc.h index 22297f05bf7..3684f402b0d 100644 --- a/reactos/win32ss/gdi/ntgdi/misc.h +++ b/reactos/win32ss/gdi/ntgdi/misc.h @@ -112,6 +112,14 @@ ExAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock) } } +FORCEINLINE +BOOLEAN +ExTryAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock) +{ + /* Try acquiring the lock */ + return !InterlockedBitTestAndSet((PLONG)PushLock, EX_PUSH_LOCK_LOCK_V); +} + FORCEINLINE VOID ExReleasePushLockExclusive(PEX_PUSH_LOCK PushLock) From ac3145e072ae85b672254f4def8c434addb88f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Wed, 29 Jan 2014 19:09:15 +0000 Subject: [PATCH 109/124] [WIN32K] - Formatting, no code change. svn path=/trunk/; revision=61884 --- reactos/win32ss/gdi/eng/eng.h | 4 +- reactos/win32ss/gdi/eng/engwindow.c | 443 ++++++++++++++-------------- 2 files changed, 222 insertions(+), 225 deletions(-) diff --git a/reactos/win32ss/gdi/eng/eng.h b/reactos/win32ss/gdi/eng/eng.h index fba140b9921..fac3f97cca7 100644 --- a/reactos/win32ss/gdi/eng/eng.h +++ b/reactos/win32ss/gdi/eng/eng.h @@ -18,8 +18,8 @@ IntEngMaskBlt(SURFOBJ *psoDest, VOID FASTCALL IntEngWindowChanged( - PWND Window, - FLONG flChanged); + _In_ PWND Window, + _In_ FLONG flChanged); VOID FASTCALL IntGdiAcquireSemaphore ( HSEMAPHORE hsem ); VOID FASTCALL IntGdiReleaseSemaphore ( HSEMAPHORE hsem ); diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c index cbb7f7c6099..423f61f79e2 100644 --- a/reactos/win32ss/gdi/eng/engwindow.c +++ b/reactos/win32ss/gdi/eng/engwindow.c @@ -6,9 +6,6 @@ * PROGRAMER: Gregor Anich */ -/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. - */ - #include #define NDEBUG @@ -22,32 +19,32 @@ INT gcountPWO = 0; VOID FASTCALL IntEngWndCallChangeProc( - IN WNDOBJ *pwo, - IN FLONG flChanged) + IN WNDOBJ *pwo, + IN FLONG flChanged) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - if (WndObjInt->ChangeProc == NULL) + if (WndObjInt->ChangeProc == NULL) { - return; + return; } - /* check flags of the WNDOBJ */ - flChanged &= WndObjInt->Flags; - if (flChanged == 0) + /* check flags of the WNDOBJ */ + flChanged &= WndObjInt->Flags; + if (flChanged == 0) { - return; + return; } - /* Call the WNDOBJCHANGEPROC */ - if (flChanged == WOC_CHANGED) + /* Call the WNDOBJCHANGEPROC */ + if (flChanged == WOC_CHANGED) { - pwo = NULL; + pwo = NULL; } - DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", - WndObjInt->ChangeProc, flChanged); - WndObjInt->ChangeProc(pwo, flChanged); + DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", + WndObjInt->ChangeProc, flChanged); + WndObjInt->ChangeProc(pwo, flChanged); } /* @@ -56,74 +53,74 @@ IntEngWndCallChangeProc( BOOLEAN FASTCALL IntEngWndUpdateClipObj( - WNDGDI *WndObjInt, - PWND Window) + WNDGDI *WndObjInt, + PWND Window) { - HRGN hVisRgn; - PROSRGNDATA visRgn; - CLIPOBJ *ClipObj = NULL; - CLIPOBJ *OldClipObj; + HRGN hVisRgn; + PROSRGNDATA visRgn; + CLIPOBJ *ClipObj = NULL; + CLIPOBJ *OldClipObj; - DPRINT("IntEngWndUpdateClipObj\n"); + DPRINT("IntEngWndUpdateClipObj\n"); - hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); - if (hVisRgn != NULL) - { - NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); - visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); - if (visRgn != NULL) + hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); + if (hVisRgn != NULL) { - if (visRgn->rdh.nCount > 0) - { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, - &visRgn->rdh.rcBound); - DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); - DPRINT(" BoundingRect: %d, %d %d, %d\n", - visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, - visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); + visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); + if (visRgn != NULL) { - ULONG i; - for (i = 0; i < visRgn->rdh.nCount; i++) - { - DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, - visRgn->Buffer[i].left, visRgn->Buffer[i].top, - visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); - } + if (visRgn->rdh.nCount > 0) + { + ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, + &visRgn->rdh.rcBound); + DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); + DPRINT(" BoundingRect: %d, %d %d, %d\n", + visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, + visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + { + ULONG i; + for (i = 0; i < visRgn->rdh.nCount; i++) + { + DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, + visRgn->Buffer[i].left, visRgn->Buffer[i].top, + visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); + } + } + } + RGNOBJAPI_Unlock(visRgn); } - } - RGNOBJAPI_Unlock(visRgn); + else + { + DPRINT1("Warning: Couldn't lock visible region of window DC\n"); + } + GreDeleteObject(hVisRgn); } else { - DPRINT1("Warning: Couldn't lock visible region of window DC\n"); + DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); } - GreDeleteObject(hVisRgn); - } - else - { - DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); - } - if (ClipObj == NULL) - { - /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, - &Window->rcClient); - } + if (ClipObj == NULL) + { + /* Fall back to client rect */ + ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, + &Window->rcClient); + } - if (ClipObj == NULL) - { - DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); - return FALSE; - } + if (ClipObj == NULL) + { + DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); + return FALSE; + } - RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); - if (OldClipObj != NULL) - IntEngDeleteClipRegion(OldClipObj); + RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); + RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); + OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); + if (OldClipObj != NULL) + IntEngDeleteClipRegion(OldClipObj); - return TRUE; + return TRUE; } /* @@ -132,49 +129,49 @@ IntEngWndUpdateClipObj( VOID FASTCALL IntEngWindowChanged( - PWND Window, - FLONG flChanged) + _In_ PWND Window, + _In_ FLONG flChanged) { - PPROPERTY pprop; - WNDGDI *Current; - HWND hWnd; + PPROPERTY pprop; + WNDGDI *Current; + HWND hWnd; - ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); + ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); - hWnd = Window->head.h; - pprop = IntGetProp(Window, AtomWndObj); - if (!pprop) - { - return; - } - Current = (WNDGDI *)pprop->Data; - if ( gcountPWO && - Current && - Current->Hwnd == hWnd && - Current->WndObj.pvConsumer != NULL ) - { - /* Update the WNDOBJ */ - switch (flChanged) - { + hWnd = Window->head.h; + pprop = IntGetProp(Window, AtomWndObj); + if (!pprop) + { + return; + } + Current = (WNDGDI *)pprop->Data; + if ( gcountPWO && + Current && + Current->Hwnd == hWnd && + Current->WndObj.pvConsumer != NULL ) + { + /* Update the WNDOBJ */ + switch (flChanged) + { case WOC_RGN_CLIENT: - /* Update the clipobj and client rect of the WNDOBJ */ - IntEngWndUpdateClipObj(Current, Window); - break; + /* Update the clipobj and client rect of the WNDOBJ */ + IntEngWndUpdateClipObj(Current, Window); + break; case WOC_DELETE: - /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ - break; - } + /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ + break; + } - /* Call the change proc */ - IntEngWndCallChangeProc(&Current->WndObj, flChanged); + /* Call the change proc */ + IntEngWndCallChangeProc(&Current->WndObj, flChanged); - /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ - if (flChanged == WOC_RGN_CLIENT) - { - IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); - } - } + /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ + if (flChanged == WOC_RGN_CLIENT) + { + IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); + } + } } /* @@ -183,75 +180,75 @@ IntEngWindowChanged( WNDOBJ* APIENTRY EngCreateWnd( - SURFOBJ *pso, - HWND hWnd, - WNDOBJCHANGEPROC pfn, - FLONG fl, - int iPixelFormat) + SURFOBJ *pso, + HWND hWnd, + WNDOBJCHANGEPROC pfn, + FLONG fl, + int iPixelFormat) { - WNDGDI *WndObjInt = NULL; - WNDOBJ *WndObjUser = NULL; - PWND Window; - BOOL calledFromUser; - DECLARE_RETURN(WNDOBJ*); + WNDGDI *WndObjInt = NULL; + WNDOBJ *WndObjUser = NULL; + PWND Window; + BOOL calledFromUser; + DECLARE_RETURN(WNDOBJ*); - DPRINT("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", - pso, hWnd, pfn, fl, iPixelFormat); + DPRINT1("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", + pso, hWnd, pfn, fl, iPixelFormat); - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterShared(); - } - - /* Get window object */ - Window = UserGetWindowObject(hWnd); - if (Window == NULL) - { - RETURN( NULL); + calledFromUser = UserIsEntered(); + if (!calledFromUser) { + UserEnterShared(); } - /* Create WNDOBJ */ - WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); - if (WndObjInt == NULL) + /* Get window object */ + Window = UserGetWindowObject(hWnd); + if (Window == NULL) { - DPRINT1("Failed to allocate memory for a WND structure!\n"); - RETURN( NULL); + RETURN( NULL); } - /* Fill the clipobj */ - WndObjInt->ClientClipObj = NULL; - if (!IntEngWndUpdateClipObj(WndObjInt, Window)) + /* Create WNDOBJ */ + WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); + if (WndObjInt == NULL) { - EngFreeMem(WndObjInt); - RETURN( NULL); + DPRINT1("Failed to allocate memory for a WND structure!\n"); + RETURN( NULL); } - /* Fill user object */ - WndObjUser = GDIToObj(WndObjInt, WND); - WndObjUser->psoOwner = pso; - WndObjUser->pvConsumer = NULL; + /* Fill the clipobj */ + WndObjInt->ClientClipObj = NULL; + if (!IntEngWndUpdateClipObj(WndObjInt, Window)) + { + EngFreeMem(WndObjInt); + RETURN( NULL); + } - /* Fill internal object */ - WndObjInt->Hwnd = hWnd; - WndObjInt->ChangeProc = pfn; - WndObjInt->Flags = fl; - WndObjInt->PixelFormat = iPixelFormat; + /* Fill user object */ + WndObjUser = GDIToObj(WndObjInt, WND); + WndObjUser->psoOwner = pso; + WndObjUser->pvConsumer = NULL; - /* associate object with window */ - IntSetProp(Window, AtomWndObj, WndObjInt); - ++gcountPWO; + /* Fill internal object */ + WndObjInt->Hwnd = hWnd; + WndObjInt->ChangeProc = pfn; + WndObjInt->Flags = fl; + WndObjInt->PixelFormat = iPixelFormat; - DPRINT("EngCreateWnd: SUCCESS!\n"); + /* associate object with window */ + IntSetProp(Window, AtomWndObj, WndObjInt); + ++gcountPWO; - RETURN( WndObjUser); + DPRINT("EngCreateWnd: SUCCESS!\n"); + + RETURN( WndObjUser); CLEANUP: - if (!calledFromUser){ - UserLeave(); - } + if (!calledFromUser) { + UserLeave(); + } - END_CLEANUP; + END_CLEANUP; } @@ -261,39 +258,39 @@ CLEANUP: VOID APIENTRY EngDeleteWnd( - IN WNDOBJ *pwo) + IN WNDOBJ *pwo) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - PWND Window; - BOOL calledFromUser; + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + PWND Window; + BOOL calledFromUser; - DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); + DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterExclusive(); - } + calledFromUser = UserIsEntered(); + if (!calledFromUser) { + UserEnterExclusive(); + } - /* Get window object */ - Window = UserGetWindowObject(WndObjInt->Hwnd); - if (Window == NULL) - { - DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); - } - else - { - /* Remove object from window */ - IntRemoveProp(Window, AtomWndObj); - --gcountPWO; - } + /* Get window object */ + Window = UserGetWindowObject(WndObjInt->Hwnd); + if (Window == NULL) + { + DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); + } + else + { + /* Remove object from window */ + IntRemoveProp(Window, AtomWndObj); + --gcountPWO; + } - if (!calledFromUser){ - UserLeave(); - } + if (!calledFromUser) { + UserLeave(); + } - /* Free resources */ - IntEngDeleteClipRegion(WndObjInt->ClientClipObj); - EngFreeMem(WndObjInt); + /* Free resources */ + IntEngDeleteClipRegion(WndObjInt->ClientClipObj); + EngFreeMem(WndObjInt); } @@ -303,18 +300,18 @@ EngDeleteWnd( BOOL APIENTRY WNDOBJ_bEnum( - IN WNDOBJ *pwo, - IN ULONG cj, - OUT ULONG *pul) + IN WNDOBJ *pwo, + IN ULONG cj, + OUT ULONG *pul) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - BOOL Ret; + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + BOOL Ret; - DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); - Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); + DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); + Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); - return Ret; + DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); + return Ret; } @@ -324,22 +321,22 @@ WNDOBJ_bEnum( ULONG APIENTRY WNDOBJ_cEnumStart( - IN WNDOBJ *pwo, - IN ULONG iType, - IN ULONG iDirection, - IN ULONG cLimit) + IN WNDOBJ *pwo, + IN ULONG iType, + IN ULONG iDirection, + IN ULONG cLimit) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - ULONG Ret; + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + ULONG Ret; - DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", - pwo, iType, iDirection, cLimit); + DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", + pwo, iType, iDirection, cLimit); - /* FIXME: Should we enumerate all rectangles or not? */ - Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); + /* FIXME: Should we enumerate all rectangles or not? */ + Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); - return Ret; + DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); + return Ret; } @@ -349,29 +346,29 @@ WNDOBJ_cEnumStart( VOID APIENTRY WNDOBJ_vSetConsumer( - IN WNDOBJ *pwo, - IN PVOID pvConsumer) + IN WNDOBJ *pwo, + IN PVOID pvConsumer) { - BOOL Hack; + BOOL Hack; - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); + DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); - Hack = (pwo->pvConsumer == NULL); - pwo->pvConsumer = pvConsumer; + Hack = (pwo->pvConsumer == NULL); + pwo->pvConsumer = pvConsumer; - /* HACKHACKHACK - * - * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state - * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer - * in the callback to identify the WNDOBJ I think. - * - * - blight - */ - if (Hack) + /* HACKHACKHACK + * + * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state + * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer + * in the callback to identify the WNDOBJ I think. + * + * - blight + */ + if (Hack) { - IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); - IntEngWndCallChangeProc(pwo, WOC_CHANGED); - IntEngWndCallChangeProc(pwo, WOC_DRAWN); + IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); + IntEngWndCallChangeProc(pwo, WOC_CHANGED); + IntEngWndCallChangeProc(pwo, WOC_DRAWN); } } From ab7ef6db66cd57949999b9c09e72f83d4665a1bf Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Wed, 29 Jan 2014 20:11:11 +0000 Subject: [PATCH 110/124] [crt] partial sync of file.c with wine 1.7.11 svn path=/trunk/; revision=61885 --- reactos/lib/sdk/crt/stdio/file.c | 232 ++++++++++++++++++++++++++++--- 1 file changed, 213 insertions(+), 19 deletions(-) diff --git a/reactos/lib/sdk/crt/stdio/file.c b/reactos/lib/sdk/crt/stdio/file.c index e1e045f94fb..6425575561e 100644 --- a/reactos/lib/sdk/crt/stdio/file.c +++ b/reactos/lib/sdk/crt/stdio/file.c @@ -89,15 +89,25 @@ int *__p___mb_cur_max(void); #define WX_APPEND 0x20 #define WX_TEXT 0x80 +/* values for exflag - it's used differently in msvcr90.dll*/ +#define EF_UTF8 0x01 +#define EF_UTF16 0x02 +#define EF_CRIT_INIT 0x04 +#define EF_UNK_UNICODE 0x08 + +static char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; +static char utf16_bom[2] = { 0xff, 0xfe }; + /* FIXME: this should be allocated dynamically */ #define MAX_FILES 2048 #define FD_BLOCK_SIZE 64 +/* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { HANDLE handle; unsigned char wxflag; char unk1; - BOOL crit_init; + int exflag; CRITICAL_SECTION crit; } ioinfo; @@ -734,10 +744,8 @@ int CDECL _wunlink(const wchar_t *path) /* _flushall calls fflush which calls _flushall */ int CDECL fflush(FILE* file); -/********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL _flushall(void) +/* INTERNAL: Flush all stream buffer */ +static int flush_all_buffers(int mask) { int i, num_flushed = 0; FILE *file; @@ -748,8 +756,8 @@ int CDECL _flushall(void) if (file->_flag) { - if(file->_flag & _IOWRT) { - fflush(file); + if(file->_flag & mask) { + fflush(file); num_flushed++; } } @@ -760,22 +768,41 @@ int CDECL _flushall(void) return num_flushed; } +/********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL _flushall(void) +{ + return flush_all_buffers(_IOWRT | _IOREAD); +} + /********************************************************************* * fflush (MSVCRT.@) */ int CDECL fflush(FILE* file) { if(!file) { - _flushall(); + flush_all_buffers(_IOWRT); } else if(file->_flag & _IOWRT) { int res; _lock_file(file); res = flush_buffer(file); + /* FIXME + if(!res && (file->_flag & _IOCOMMIT)) + res = _commit(file->_file) ? EOF : 0; + */ _unlock_file(file); return res; - } + } else if(file->_flag & _IOREAD) { + _lock_file(file); + file->_cnt = 0; + file->_ptr = file->_base; + _unlock_file(file); + + return 0; + } return 0; } @@ -1220,7 +1247,9 @@ void CDECL rewind(FILE* file) static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) { int plus = strchrW(mode, '+') != NULL; - + + while(*mode == ' ') mode++; + switch(*mode++) { case 'R': case 'r': @@ -1241,23 +1270,97 @@ static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) return -1; } - while (*mode) + /* FIXME */ + /* *stream_flags |= MSVCRT__commode; */ + + while (*mode && *mode!=',') switch (*mode++) { case 'B': case 'b': *open_flags |= _O_BINARY; *open_flags &= ~_O_TEXT; break; - case 'T': case 't': + case 't': *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; + case 'D': + *open_flags |= _O_TEMPORARY; + break; + case 'T': + *open_flags |= _O_SHORT_LIVED; + break; + /* FIXME + case 'c': + *stream_flags |= _IOCOMMIT; + break; + case 'n': + *stream_flags &= ~_IOCOMMIT; + break; + */ + case 'N': + *open_flags |= _O_NOINHERIT; + break; case '+': case ' ': + case 'a': + case 'w': + break; + case 'S': + case 'R': + FIXME("ignoring cache optimization flag: %c\n", mode[-1]); break; default: - FIXME(":unknown flag %c not supported\n",mode[-1]); + ERR("incorrect mode flag: %c\n", mode[-1]); + break; } + + if(*mode == ',') + { + static const WCHAR ccs[] = {'c','c','s'}; + static const WCHAR utf8[] = {'u','t','f','-','8'}; + static const WCHAR utf16le[] = {'u','t','f','-','1','6','l','e'}; + static const WCHAR unicode[] = {'u','n','i','c','o','d','e'}; + + mode++; + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) + return -1; + mode += sizeof(ccs)/sizeof(ccs[0]); + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(*mode == '=')) + return -1; + mode++; + while(*mode == ' ') mode++; + + if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) + { + *open_flags |= _O_U8TEXT; + mode += sizeof(utf8)/sizeof(utf8[0]); + } + else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) + { + *open_flags |= _O_U16TEXT; + mode += sizeof(utf16le)/sizeof(utf16le[0]); + } + else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) + { + *open_flags |= _O_WTEXT; + mode += sizeof(unicode)/sizeof(unicode[0]); + } + else + { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + *_errno() = EINVAL; + return -1; + } + + while(*mode == ' ') mode++; + } + + if(!MSVCRT_CHECK_PMT(*mode == 0)) + return -1; + return 0; } @@ -1446,19 +1549,23 @@ wchar_t * CDECL _wmktemp(wchar_t *pattern) int wxflags = 0; unsigned unsupp; /* until we support everything */ - if (oflags & _O_APPEND) wxflags |= WX_APPEND; - if (oflags & _O_BINARY) {/* Nothing to do */} - else if (oflags & _O_TEXT) wxflags |= WX_TEXT; - else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} + if (oflags & _O_APPEND) wxflags |= WX_APPEND; + if (oflags & _O_BINARY) {/* Nothing to do */} + else if (oflags & _O_TEXT) wxflags |= WX_TEXT; + else if (oflags & _O_WTEXT) wxflags |= WX_TEXT; + else if (oflags & _O_U16TEXT) wxflags |= WX_TEXT; + else if (oflags & _O_U8TEXT) wxflags |= WX_TEXT; + else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} else wxflags |= WX_TEXT; /* default to TEXT*/ - if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; + if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; if ((unsupp = oflags & ~( _O_BINARY|_O_TEXT|_O_APPEND| _O_TRUNC|_O_EXCL|_O_CREAT| _O_RDWR|_O_WRONLY|_O_TEMPORARY| _O_NOINHERIT| - _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED + _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED| + _O_WTEXT|_O_U16TEXT|_O_U8TEXT ))) ERR(":unsupported oflags 0x%04x\n",unsupp); @@ -1639,6 +1746,29 @@ int CDECL _sopen( const char *path, int oflags, int shflags, ... ) return fd; } +static int check_bom(HANDLE h, int oflags, BOOL seek) +{ + char bom[sizeof(utf8_bom)]; + DWORD r; + + oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); + + if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) + return oflags; + + if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { + oflags |= _O_U8TEXT; + }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { + if (seek && r>2) + SetFilePointer(h, 2, NULL, FILE_BEGIN); + oflags |= _O_U16TEXT; + }else if (seek) { + SetFilePointer(h, 0, NULL, FILE_BEGIN); + } + + return oflags; +} + /********************************************************************* * _wsopen_s (MSVCRT.@) */ @@ -1722,6 +1852,21 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = (oflags & _O_NOINHERIT) ? FALSE : TRUE; + if ((oflags&(_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) + && (creation==OPEN_ALWAYS || creation==OPEN_EXISTING) + && !(access&GENERIC_READ)) + { + hand = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + if (hand != INVALID_HANDLE_VALUE) + { + oflags = check_bom(hand, oflags, FALSE); + CloseHandle(hand); + } + else + oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); + } + hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); if (hand == INVALID_HANDLE_VALUE) { @@ -1730,7 +1875,56 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int return *_errno(); } + if (oflags & (_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) + { + if ((access & GENERIC_WRITE) && (creation==CREATE_NEW + || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING + || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) + { + if (oflags & _O_U8TEXT) + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf8_bom) && WriteFile(hand, (char*)utf8_bom+written, + sizeof(utf8_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf8_bom)) { + WARN("error writing BOM\n"); + CloseHandle(hand); + *_errno() = GetLastError(); + return *_errno(); + } + } + else + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf16_bom) && WriteFile(hand, (char*)utf16_bom+written, + sizeof(utf16_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf16_bom)) + { + WARN("error writing BOM\n"); + CloseHandle(hand); + *_errno() = GetLastError(); + return *_errno(); + } + } + } + else if (access & GENERIC_READ) + oflags = check_bom(hand, oflags, TRUE); + } + *fd = alloc_fd(hand, wxflag); + if (*fd == -1) + return *_errno(); + + if (oflags & _O_WTEXT) + get_ioinfo(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; + else if (oflags & _O_U16TEXT) + get_ioinfo(*fd)->exflag |= EF_UTF16; + else if (oflags & _O_U8TEXT) + get_ioinfo(*fd)->exflag |= EF_UTF8; TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0; From dee3cd18d34d75ff51077822faa1911ca4b4df8a Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 29 Jan 2014 21:46:55 +0000 Subject: [PATCH 111/124] [LAUTUS.MSSTYLES] - Update to latest version by Pisarz svn path=/trunk/; revision=61886 --- .../lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp | Bin 10174 -> 10174 bytes .../bitmaps/NORMAL_CHECKBOX13.bmp | Bin 3574 -> 3574 bytes .../bitmaps/NORMAL_CHECKBOX16.bmp | Bin 0 -> 12342 bytes .../bitmaps/NORMAL_CHECKBOX25.bmp | Bin 0 -> 30054 bytes .../bitmaps/NORMAL_COMBOBUTTON.bmp | Bin 2358 -> 1516 bytes .../bitmaps/NORMAL_COMBOBUTTONGLYPH.bmp | Bin 1414 -> 840 bytes .../NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp | Bin 1578 -> 3896 bytes .../bitmaps/NORMAL_GROUPBOX.bmp | Bin 1558 -> 1416 bytes .../bitmaps/NORMAL_LISTVIEWHEADER.bmp | Bin 2878 -> 5096 bytes .../NORMAL_LISTVIEWHEADERBACKGROUND.bmp | Bin 1150 -> 204 bytes .../bitmaps/NORMAL_RESIZEGRIP2.bmp | Bin 1622 -> 680 bytes .../bitmaps/NORMAL_SCROLLARROWS.bmp | Bin 4918 -> 11576 bytes .../bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp | Bin 2278 -> 3176 bytes .../bitmaps/NORMAL_SCROLLSHAFTVERTICAL.bmp | Bin 2166 -> 3320 bytes .../NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp | Bin 1414 -> 952 bytes .../NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp | Bin 1398 -> 1016 bytes .../bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp | Bin 2518 -> 4136 bytes .../bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp | Bin 2486 -> 4280 bytes .../bitmaps/NORMAL_SLIDERTRACK.bmp | Bin 1174 -> 296 bytes .../bitmaps/NORMAL_SLIDERTRACKVERT.bmp | Bin 0 -> 342 bytes .../NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp | Bin 2102 -> 1292 bytes .../NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp | Bin 2102 -> 1260 bytes .../NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp | Bin 2102 -> 1256 bytes .../bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp | Bin 2102 -> 1236 bytes .../bitmaps/NORMAL_STARTBUTTON.bmp | Bin 4378 -> 9956 bytes .../bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp | Bin 2134 -> 3136 bytes .../bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp | Bin 1174 -> 336 bytes .../NORMAL_STARTGROUPTOOLBARBUTTON.bmp | Bin 4246 -> 9296 bytes .../NORMAL_STARTPANELPLACESBACKGROUND.bmp | Bin 4358 -> 61556 bytes .../bitmaps/NORMAL_STATUSBACKGROUND.bmp | Bin 2506 -> 4340 bytes .../bitmaps/NORMAL_TABITEM.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABITEMBOTH.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABITEMLEFT.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABITEMRIGHT.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABITEMTOP.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABITEMTOPBOTH.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABITEMTOPLEFT.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABITEMTOPRIGHT.bmp | Bin 2878 -> 5096 bytes .../bitmaps/NORMAL_TABPANEEDGE.bmp | Bin 3382 -> 6968 bytes .../NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp | Bin 2998 -> 1992 bytes .../bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp | Bin 6518 -> 14200 bytes .../NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp | Bin 2438 -> 3592 bytes .../NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp | Bin 2438 -> 3592 bytes ...L_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp | Bin 824 -> 824 bytes .../NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp | Bin 2518 -> 4136 bytes .../NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp | Bin 2486 -> 4280 bytes .../bitmaps/NORMAL_TASKBARBACKGROUND.bmp | Bin 2326 -> 3704 bytes .../bitmaps/NORMAL_TASKBARTRAY.bmp | Bin 3766 -> 8024 bytes .../bitmaps/NORMAL_TOOLBARBACKGROUND.bmp | Bin 2902 -> 1964 bytes .../bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp | Bin 2338 -> 10614 bytes .../bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp | Bin 4614 -> 14754 bytes .../NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp | Bin 4614 -> 14754 bytes .../media/themes/lautus.msstyles/lautus.rc | 9 ++++++--- .../textfiles/ExtraLargeNormal.INI | Bin 106832 -> 107070 bytes .../textfiles/LargeFontsNormal.INI | Bin 106764 -> 106934 bytes .../textfiles/NormalNormal.INI | Bin 106696 -> 106934 bytes 56 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp create mode 100644 reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp create mode 100644 reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp index 3060dffc136a611015034f5acdbee22089f6af60..65b66dec5d8c2dfb9c0f8b97ddf7a34096bc6da9 100644 GIT binary patch literal 10174 zcmdU!TXrMI4Ti^?$g|&^6=VT^_iC~UugZ(CE|ZBgvNWPDykDDls`7t8q1h^tc8)m8 zIT;%Q3WfT+*lgAhpnv}5x1T=QzklfO-z9&O{8RG7ryuqA)2Cnaybbc7$zYI1y18;U(@aN^+^H-Sg}vWXJ=>W{Onx%T>31Xoih%f#`p?}xZ1BZ zV8v%=pBEPwX*wFFalfDXosP{h-;^Hrs^J?bj`-;)n-(HX0j7iTmZt7u}bBYTezY%gf9ETJG=e(opNF z$s~bM;$B}}+2?6LJ*L*}UHW!=o9?wAms{{b zGml;o8)MCZQQ~&m9mOrvYPm>j$!fVwYpn~PX~yz{XLC7bt#xbJZ9UH=ZcpFGhPdS_ ztyfuMj9!IkuIaaUpX=$nEOCeW&1{6XS*_D%jn0B?WBKu|v##TEy!<0!l(-W;E1UHu zZIMmZW^3JMZT^k?5ra*vT?fBnz$kGmJwMy+R-$->b<#Wec4&=}ItF{AIn&H-Q>Evw z#9ionb&Orw?Z7HUeta>v%j1S`uJ5zNUFqKKh<(|mm)(m5e3!7%ujIw!VjheVm;3cX z+@FeY^Slhde#C1pV3fG*O_3@8|4O@0bM_DI*T-*yU-;akz~$WLjE{Yss)H{$mp+2u zf;)qg;_Q5n1|#?wZUP%Fu``u(^_>C+Sb;g{c5AMC&pw-Lz>0n1?|vr%D?WSRPQ^i| z2zvu7?jtsN0o;a6#o6GSJ;s)p_POv!yssG<#z9=IogEcj$L3sfotZeZ8E<(@v0rkW zX3TqRFv|T7x~JpDbJe`R_};U}=9)veR_krA{8Y|zKp9amUJyrzZ)|W{GQiJP{X+{~0d#=*0c9KK9Gmj{Q9_ z12=ds&I|BQ6|kDz8JrYn+@|sx@vW(a zU8_`ppPg9+#_^Bmbm~YI5UolUr=S$o+IlQ=N zERGtBPsTd?M`#oEP&8-r__2wzn7!TUwBO+Nm8%Q}!!!`5QiHn;Oq)-0!y#jd*&f@R zqn0hl(-A^Y@UVlEY5gtOVH2l)HWUCXRY^`w&t2~#Dh`d z@*929nd$P_u)|ksk9lmYS*cf3;&Prm=oxl-P;Uu&Y-r6rFm|b9#WDCE6c0v;yVZI7 zpqPi2M7o7tOH1}^;kSh^;?TS8uEq_%IJJ(C^}!b(#c#o#!AZd(@6licAA?J-@V)y4 zV17hjBl<9YuIlVnAFX)?n_p*p_~^5F%uM|v6@F zHrx_@qZ*fM>O3WvuWQ0=Tm4r1_qBF~FJh$Uhj7JD)Osd5+o<=VCL|B{+Ry#7TtC(^ zxi*C3%KaK2l3R;oz^TMRQM;JdoYe}NBPQw=`t?z_%+-r5aXE`Dx1MPYGM(9&K0AK; z^3B|vvH6&{HPQ$Ala?oli}(HdhOK9y_Uj&+jjw5IEjdKF-z7On-H+GWx@YhGdGFz4 zYfkqu#)fU{ge!~^*ZStV7uJU-zp;M&zDHm8@8$QNJ$-#dv8H7o=%?bN|4vWddiM10 z8EX${`t&Y2hOy0gob~#ZyOsO39MSSUVW<~h_t(RR#xJ3VZ#{nN<>O~8tvs{DrEl&% zd*!0^!gzyAo~(Hj@k#XLx6!lL8tdtEedf*2HOP~5y!<7u z<>xsUrw30@-um`nSl{0Bbb9R8)7Lz4%~;lyxNwuz4AL*yS|4NY;WvFTCta^|`!Fs& zbMRdoXVD*T^zmP;ukU*ZJ9_!sMjt%RGh3@3x%K0%7cV@u~Iz!%O=R_lJ*qKAyAqT~Lb${|3(+zl-}TdV%8c{g_-p zK1nk-0HegEo;Mx_r{;KZEjdMVj2(G^X?WUw$KKCZHGg|gvgUXAU;OKM@G@iYavWn_ z2&4Zs0vUSkC3}E8_3o{TdC%){1KB?Q zejc6`7MvVhZ`kKr|0VCU-lOq6-2R&1?OL@Dj)bq-hx0JwL-{1R5qzly zlHgp|_1HMy=MQl!80GzCKcZ^Kbk>Hz>#o4SzHX3%bKci!LMV|;vECLNo9ZkV^Xw^zc(^_I7$jAsbHa0?7mU%}#-l?f692^{kuq^Y=%*>!vDuu8t^UluB;`sPD zgk_m`Zf*{zr>7w-%e)H<3phVN4`Es6wK?bV@-l>FnRjVv30GHFAuP+h%gf79U|yTs zReWA=>_zEoKIcbkt-pEyOq|}6r0PDe$^UnIGjN|(^G!}pq8XU0(P`h;_V%`njmRfVBW5-E+{Z>PfrgNm^Yiv zLV|q_&^m+uMTz z`<+Gad3ug{kB*L@z`V-d*s{zUy*KGO=2iBvmStXLuW4E4_5EG6GOw~1vMlr7-Q7Wf zdDZ!sc^@7gpuoJ3kB?Ab-fFc9g;sl?o}Qq<#{2yI3cUg&lEs@141iy?6I^>C^iQtSsy;EG(_G)PN!g3ZnQz z5Q`L6S_opHg5m>F5kx`PSCg4peSf>U!nxfz1n4uK2B9bw=QZ)}igY;cLY&7Tp5 zd#N5udmP`?o7I2?ig@+?QltNnFyJ|W1d^(1dZH2B0z z%^D%`Q0q@e#3RyM)||z39x=o9So}pJ;Z_!r@R)$(Md7W!8vTx1PbB&o>gO!0Hz1ou z|4z;haDRMTKR;(Tp`Rv)^zsz?Npa%Ic@X!>PvW2al*nJD4gIv0Y5iE+$&#NAV<$#E zuX=N+S6&x$Ab1}2`%}L^`U_XTKUgpR@%~`_)(J!Tqpp|CAlsq*!2psKo>M*uU)BfT z^9ALHP)tH5m8vfe^?R<#A2rzX{Uo1|%1Ja|c42>#Po|*KdWPzJa=8+R!1^rjzk#dj zb8Y=rdTR0q>q$|Tc|Ds^zHllyI&X>=uY{3ACE-D!Bm|uDMfyeP{E_*@Wq?bVJTie{ zxZ9am=%jpW4=8_vc6DA-9~I!&{3&W^e`YyHo`c%oq<-sqsPcz4nDPP-Ln@^D%SyC? zCZD1bBA`5C%4`&d5!GWBS7QBR>a!`xw7#Lg)$1JoKk=%sp!C+%Ym+}Zpcun`l|R^$ z{K+c=uIK0JdA9y~_%`K-6XJ1{D36#ZhYDpudcAU_TE!z?l7gkBILRL}P@(=m`uVH; F`3YOu-^l;~ literal 3574 zcmeH|y-QnB7{(v1ZDXr#)6dju?6)>eHHjwX#;tqz`~{gD+%q^hI_a1cB7zV>41OVq zLkA}vgpk1q5kC->fEdsi;NT#JhK4XaJdAiej**cOjE;_CY-|jPL;~aE+9>-*x114 z<|ekbwy?dujh&qx?C$O&o6TZxZx8$X`^e>TI5;@K;o%|j`8VzG#m zlan*q%Tk_!|9uARrzuT_-DokfD{mKCw0mD@ymVik#z*gXs_CHnA8Gt_H%RFYiF^^eq%wyIY^O*I< zJW^i<^N0tS=bGxRyno93M^#*T|ET@{^EkM!^T11ZKKKNBhd}oWbaOzLctGHDX+NFk z-@jTOyR@Im%leOnNdKuJ(toT(`j3rB|EVX^e;SDNpGNYx`cD(#d^rTVQ=qpBbeBMP Y3v`b_m-f>}H`n)S>+}2b`k$`1@7r*cJOBUy diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..03c3a5a121f2930c9a4393b13cb611056303140b GIT binary patch literal 12342 zcmeI2xo#vm42EalU>;$^4L6zxn0%kr@C5^ggAE+nnc={R4FkUK`?gWrUwOU;N2o(p z-3B(O0cffy{vt(*EU9{a{`2GSZ{@!qqrZQR==+HN9nl}({v7=s{rlDb`SAJo`ue(n zE-x=jIy*c2jU%s;fw{T48S5S&9~aQc$w?MDCgX$AelCv~+q1K?#mvl1CDCU;zKhX5 zvW10(Vt#(UmA(Q`EEg9Si>0NdRzjCp8!P65Y-MGoSYBRkBy`YC=RYa_{{FtSzq-0w zK-j5kql&oEDBJMZjyhoUeP?H<*xK4EX>)V4$f4cc-LYNt_xAS6XU1(KbiwEk zZ7}3d4l(B{Jh|6~M+aNrjg9uZ;_;s`z~fU+?xR!XKeD#mxBn~f>;-Z@htN&qXZ`7d zkMZk^ClB!jymc$qE@jpv`p^XfR{ZnxbD0nHH4$@vdU_h;*-PXP<8>i0V9i16hcS`6 zMy`f1vH{?JNSLT`<(nT%x{$(O2=l^AtZfH&>qVoAMtWa48;Nc=xyEK04@PGuodN&pI^aee6RwwNG4f^S`S8O^T;} z`i^Yl=tlopi`UoJ^6cG~|D4gOU+MZyg6Aws-p2je)HeU!zv6RqKjORQA8~`sKi|Rl zqCf7-CXQXO63-B0L>}ArAp=J~+VAoO z`wQ{oJVQ;-rQ!ZR-2dbGpEhUew!4Geku$D%ieiPu? ze&>!&W$-E=qAqRisXGn4W04!oE0Qv}df3#j=(jjAKFcG%s$GSPGU5)U_gBYZ%W~YNMO_uWl~?zu;L9_cK1l9O1c+z_^xh_fjs8SjI9} zy;I5Kw}2>f@54FEbiMzB0n3=2yZDBR59jCS#p&s3CDDftx?sSHCr)>Fcja$m{FcW1 zC?)P_=%6c}`O&_(xG1sj@9*We=&Ezv$HzyhgRXe(;~RSq8>wBN=|czI6wjFKYwkAa z;Acw6(b2wZ!&t04Yib_Vara7Uzc1eSfyXZ?eO3;qugX6A!L^TVWpLzmc-CTnf4@9W z<5v}-gAdp@e(YW1#lApxcz9Sz^s)c0uCB`cjy~goXWfV`eKEIU+dkG240z@f^M^YI zzO|A0!}yF5^B14m2#mfFPkiY@V5CXTFWB__N?hFIa@NJR{cz^5zmwt_%dzY7M!9;} z)INA~-2OVwKB@YCL2YQN9gGi-+Lr$R1MG{h;$rCIx3l#3vuWV1m;4SF+v&4?*ff5` zQh6?qc-px*^&-B{?|1l24l##G@Z?aR{Gk?sC5PeoqCdtpho|<53v;U?`XudR6Pe#e zs9V;sROT}rjQ(Pa7%&&}tcuf54K-fQZ&EzIP(K;}_V#xC-leS{QI0M)wGW;)@9Vm} zSMK>E#j_6NxVc)#(Lq<6*kvsIH22MMpXJDDqdRRpewkZxazB!Cbkq6AI-y=2M>qAq dPPa}T@qO|ay!&?&e42m6C5OlXuzmAi?0SEFIqwdU^GsEfAr>kVoF+P6lV#S_0d-m*b z?%cU50f&7M=bJKf-izbHg$u*^^XDfE{TXX%?NYY{j@PeWul%@p@!}8#-;hl<>S+fK zu}ZI{*m`lqu}&@PM{ey>Hx)Pb1E;hd?Kp+EXjlfT(F^<#+~Tqn)fYBV^+-novk>cL@7UE>3N z^~3S&55Da(2RRBdhaY0A)&6l~#6wQ3Ud-v`b zhi570IXtZdJh9=X`#V%{NkfqV2hFCASYs; zlbawYf~zE?pXGWs@JZ z`1Jo#ILLjjT)9#un_@+M3yEvjGnc#wyTUcCM&fxc2im>TTKD8=k^2~DbS_qNa+q7g z9oOtO`FreV89cF_U)B(LJNeg?`wsh%TY&?I*lIaWojP^w-RQP?9R0y8ao`)z;A-+W z`h(MhgSZ$YHMW+1d`}Mc{M6hn_5-KnM-L9xc1`YP-*xvNOX1)?%I6+68l2Lc&&|Q! z|M>Ca>b+e}j>Wq_^7hiTWC;@bDA;II#3oG25kUL53MF|XXVOn=5&nse%w zz+o<$=5OY)(VnwWj~yIh6|c?Cc`uGQ)~RLv$gN%KrsBqa;FR{qu5pz12hSMx-@_gM z9zLGuTtAR>oyFhjUW#>;OZDbFJvbZ_WAWW?)I7`dx9@vXoAptHryo5yj3xJP`|sh7 ze?v$7c^(<(hcY(eM!vBB9`0-2L_CO#Yu%X587sNqV6JNOH~Ob@-h(5?3jS?#wp{zv zk0o+&oisPA(cqNUZVwJ~>KY&Ds~^sFT)Vr>L9T@`N3H!3TP+89YdRk>m$hsgf2*-G zR`A4DW7~fZ_x1lFaE+p4?!#I}u*GLfac#%4IMEi%)<+Jmk&1KELWAk}#YeZm79+#@`GM=%m`;KfW-}UwQR;>re624VqpU>?F_nf>(^31H!zK`-c zrS8d5^B&c{oBXg{js8(M$g^tRqtbU%tf+4x@%_0u133$J#do4pb$pj9N9(-AeTVMJ z(IWRT&gfjM=HwtRMc|HWmNh(9Vn55^iS695e#oi!-@|>)zxLn5jn6}k6>G@#q{hac z&pnUY)&|b^vvrE@Rs$;$7*q^uEbT zN1a|LYko)ESgyfL`$k;L_-1_2@f~a|`#v_>V%d7|=Z=jz%*W+G_ zI6Z#+cqI=XJ{-n~?a}lH2RyOW*jSUVUcFkq&*7a8@4yi5sn-c@75aly;&}4p$*S$= z&z}c``&?wxv+*xqz6=Un;6x7B0k&P{i1Wdmac&sfb#oBwY>%ctI5Ad{gIIBf@r)Po zoMIl=iS5wzcRrkl-W=?G_PuBI6it6{O0n8y4(A2m@PqkE1$(J3ZOd=k##r^>i0cY| zuEFVb&}(yQ&;6!t>c^ZM#wg|B_wC!aS7MuOH2s+q=EHt+a6aKM&vW085!Wda&vVBJ7k(>2Ix%!)S4QM0bZR`=$JEQiHrL}jcslY)|wnG^d>)cnZv*P(ZUBXh`l+FbH3{wbDihp zrDDgt#Q33&VGG@ZLx0lThdqR_J~oMMqmHra!QmV*26J_^xq4c*O{~`zHF#n>r^JJJ zF+VZS7*lpm(cFU=cd^yIIJoyDalnV) zQ*t-^&>x(VAM6$KwwTv!Tc$rarTLhf1K(IPxqQsLEY`)c^=Rzi=I?yu9VNr?(FB8-EU_X|NgW5f(UbJC0T~7NcIWes0BXL`^@*) z&S}h6EEZ8Jl~691QK?i=tyXbyae>RrOVnyL)a!LL8Vy`sUE%ur8qH=CtyT*+H#fMw zy+ym-MyJ!k-Q6AT@9**O@PNn1M?5_};raO)FE20XcDv~Hdg%B27z_p&4u=?xMi`IB zm`o;^PN#T%eZ_1x!+bu+VzIz-xx{LCp<~e1zj#>2ZK# z{K%T7VH$=Jb>?9RVdT`nEQm8zF2}iA+(}5>i5hpzxf(}t!m!jhD-0b&6nviwxNjWJ z%}eRi6Sd^z!%!H~^W@&hli`6d3T{4z%Z}@_mcVg@pr3Hq5dmusEX$_HvV>*Zwng<5 zx#0Bd4X0-|#R)SI^g0FwTg2rJRdNu`SI|h-90a_Fw+qMfMY;RS!F{A9nX8qV*C2fw zB7F&t_NIZ>NSp6i3k$x6v|kPB`aU*an!Yfletbrm!^59@kelK2J&LvPUx~e6T)%(Z zUgZ&U+5IT)4d%3BnarK4adao0#Qmch=$y;Bo|^0O-Bqc8KClVyKj)jQAJrvs9^rwf ON#<{a)THp;0R94F;U!!E literal 2358 zcmeIyyJ{j)0LJmjZnB%(CL1@&=CZkGcXH`dOZvQsFW>|C0`_)x78ZhqAU1Y_2nvdd zA}Zc5pgzEtGheE2HtACOha>WvBkGwm=lSJn!(vaXmUU;|dCc&dv0|;8S7YY7XX|Yk zbS_w4uNOX_4}QNNfj|JkU=X2D2;p!Tkw^s5XcVzn4Domzi9`a)WD==V3h8tjnM?-R zY!lgR|r=@hfs4D|@O1T6pn diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp index 2105fafac51de855c85c7cfbc91107a0897f8ebc..14a433b18b55a3b9489b384bdc33b743bf000d40 100644 GIT binary patch literal 3896 zcmeI!OA3QP5Jl07QwKuGAWLus!C`Qo{pX|kU=%f3ghgiw7xF0ZK-EBbRMTMF^{FZ> zIe0IA vEBXY{SkY03#)6|=7DYc%5C&HjS+oo29Z(<85YQOVEb4D(a%Q#wSLGmB literal 1578 zcmeIy%L;-(6b9h2tn7Xdf*v4xfF2;%y`ImdDBe&+yddg3{7trL@h@7o@PmIC&RGl` z4)b{4#-ejqg}BPwLFO!@2(7DMWPdmRL>Au-q3b#f!+>d;uq+FHT{O5!j4hKYoynfcAf0 z4kUmE{Ac)21_EjXYJccLxf#I%l$*iOK)D%{*(f(dL1EMkNMeGd4{C%5HPQz)+yTpT fWMmeg7D#wd!;HZe9zdUwhk#jy8fBs7Yz77ZWn228 literal 1558 zcmZ?r6=P!n12Yx|1`Qxf42VU5n2~`4EY1Ox7vhFspdd(s;XlLw|7+K-{SN{_kx@Jv q2BT?U1f>B+tN>UvFku0}@`8~GT$G>?Orzr9@SsmP;D{F-@dyBgBM5u| diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp index 4a46dcabf4316f168210837d295382e4909cc745..5d4c4b71d41c8c0eb4ff4ca91c9dadeed8ec5ac3 100644 GIT binary patch literal 5096 zcmeH~Jx&5q7)8exJ8Ud(=?Ywcy&G_SumKYi8X5{9B+?L+;PB_jI52-K!TYc!F*$`c zoSgTHAzua_xpU#+F}sOQ+4LXbD+NmJb^??-og+}{ zc59&2>(xN1->-qvU{C?2@wfs?lSv7brqdEA&F3XhisJ$(Z8il^N|FL7rD+b7_WK+t z?}U(dLdZKIkpvkwx2-HB|D&0>{6iT zzA~WavJB|_?GHfD9S%U6cRtq|r9k)lFaf&XXGfs>{j~Z{l2Jy?)SI?y5E-- z(7)%`CD8r8ErIU$qy)O(cLmV>o)$p&QC0xm@B19+ekYHKoaYw(4e$8T4qDEbDI41eta literal 2878 zcmeH|%W7It6oyyYv`w2{tx20pV_MToOw(!;)61ZPX51IZ8|Vw@Tr$qUnc_eML82q$ zNI@Nlf&?NFjS`V~MI_?o0sbCcg=Qrk1Tyu5eK_aa2R8dZd#&^9_s?k>u{BBbLAg^Y zV@DYiG&S;iWnT4nC~`PK+uPePnM^R7&9GQ3uv)FK*=*R|-NoMC9_)5I91aJZPA6P0 z7u;?)JRT3cUN3w;ANKe6;rIIy2m}xe261q3fKVuea5#)eB!Xx(idZa$cs!0oB7tNw ziBu|ubUKa0!$TY$9U+s+;Q06$*=!cMTn_ns9w#R!C=?1P7K=DNJw>ThLb+VV+1VK? zl?tlWDr&VF>h(GrjRu;{CR(i)+U+*Z&(G26bkOZ~(d+fl@Aokn44~|IJjNM}&wxAw zquy}wqPhZ+T5^9vO*AWcbbFR)Uh?$LJkg@$`MpIVjpW4x4bie>?%^_#R|}AVTN1F7#l=n*5<8=0n9FtfZ_e)pyvC}4oh(dtp9Jh=VY2%oU?&Tcoh(dt pa=Yxd1nj;F*nJbQ`z~PjL%>e1YrJm8%6peiv+_9Z8#nFGe*kfKNKgO( diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp index abf1d0c30ddb68d871f1743e768024fd4b97113a..43135e8bdf6b7119779ff253020d3abca2cbbe91 100644 GIT binary patch literal 204 zcmbu%F$x1A5J1r%ND;DCHkZgbVi(AzavwW8D=V7_7P5sP!h#FpC3eCdAs^n%RP%g) zIr_+Yh_jf*iHl5liFrEQ<^EAhp|!>sgS8gt9Nv3E2*emkDX}aIIcG{K)LL2BmDU>D Sw$XcMj3J+3lCIM2&tM0AM=~-1 literal 1150 zcmeIwJqm*`90l;$+Sb;7dWxQ)2WaNrr6=f(+_GhIauPC#Lm&hMg^)wMKJ6(A{@{`1 z1u}&H^Yux^?7{WU-E=INL}YXSW>Mt7u$(T0loDlGLMa8UHL9vYUDs%u2F4h)ZHun! zV6BC74&Hn8eUD)nFpeWa2#7I)uPs^rV3~pcn*ou~iq@3UhPJe$jP`V(oQ`y&GhOIP GH~In+vMz-H diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_RESIZEGRIP2.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_RESIZEGRIP2.bmp index d53f603c1f015411548c89cda64e7050ace8481f..89a49c45a8552cb0f896981b6324de97a095a299 100644 GIT binary patch literal 680 zcmeH@K?=e!5Jg{I39c+2KwNna_ui>1&*E_!LJ1|5LMf$`k}JeX;x5*eODFt4B%l9> z$?g8!5$hp*6`Tb}LBU=aE~1x*gp=F@z*AKfbzP&BLTgRaG#F!O+ZJmrUDwg~J;N|C zjw91FG0!v0vaqfz&N;mIG3|F$5>6y(c@?r(5tfTB*OPVIpRC*NkQnEGihjSv`Cs(E Hl>fjBlRh%i literal 1622 zcmeIwOA3Q95C-6+^^w*-bAm2=f*zo&Zo2JxJfb2ZA|i;0h=S z;KJm3e>h@rv4l9&>O_5{mO@bqaieqXy_z=70Rep9M-T)E!w^vvA&z4tNrE&@k!2b3 zJV#L!D9aL6RiUnHG);rHZP9fd`o4!@J~sFK59T-US8sr>>$e4C`JtC)3_;VI^&u@Y yhM?)qp3t_osVGLygmk1sMKN-}XxF8hQeUJ}R8uR)n&B}vj4flw*fS1{BjX8ftV6{B diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp index 95ccd6cdfb5d01d83208ec3b3d76b0051c0ecf95..d614e473bfb3574abb2e93923b8f181632b1e019 100644 GIT binary patch literal 11576 zcmd6rO>b0H7=Wwn>cYfLS+JP6s3r)thBP>-O=?>L3lgJCJ`$wU(sVjAbSk1NOu(Pu zO2oLvw$quG9j&y5QYebFQWeF10m`TP2YjY)IUdiMd+s?+Nu1o?+`03d_rB*nZ|^*J z-rl=&Th;2Tf&Huey~y7a{+_Ga%)YAXc|L#X1^HV&!S2@lkNz9{-;W;a+g}eK{rTV_ zd;O#w6V~9t?k%s}{^{qt%gc;1hS>a*`w!-4=gy6cOifI#EG!yBZ2s{d_rJYzwZFfA zpud0e!uXxVC4ERm{=2JJfn~ciF+qB2E){v=4-5Kh2a%bVzFZWhf^h!p}m-7sPR5jGAVaL}$wU32o@4qFg6Rf-cX3W=} zKVc1?Y0{S0E>ABnEZFt2dFnqtI=W}~?ytT$v-s<6V~EYuKj(_2EnBv{Qd@iG^V7zV z2)?+vre@QoO|`YPU!Fd_{M&+Bi;DcnP_d?_hW}HBytZ}gh0#&f&l|#@D~9D0G~dvA zhOSp=KiEC2pOJd9_uuHZug{+K-;Dlr=TBIJch|?}-SxM5cRxq)k^NJVcl7gy@Q!}2 z7~j#)HXmBg(De%K2fcgkW67Vr|3<%k7VK7K|Yg{8*~Jec!%)>F#u?P~cmbB%|^n z{`lxvDwTrYzkmPHTyAE1nk3yk`2Zg{aG>|-(O7j9`91j78(pBpFpt{d`bA=mU-8b@ZpdoIqA5%D!z}l(&xjZJzqz&sa2# zYS+i$fze?68H>iH?fUDyz?d`sj74)7ve#GfT$+0n&Wt%D!&o%m^$wm(W6L-*F#e21 z;~pExhvq}sgXSx%7F16)#DBeHNKik>kcxZynf3DD;Qi%9`HX#ONB)d5cuMN1kHN>* zU*~<+SMi?xqj=ALUN;|_4^<7CudG5)J=GBZ^^ze${UAds?$^8H>iH?fbJHUtr7`f5uvIOZ)z*crJ~c;Ha20K8!`e`?XzBTm7spm8^Ac0eqhNwU+^2^&qf;Z*5TVhJjJ2xY#itVE5@hzSn>Sa z92*C`RYPpPyi$uxtIAqJjB#n+sv!pd6uwv%;$jhtM!YYMPpBWpb)HmlPBay>E&rHY z;{T=~qRz7bj}HJkPjCbkr$vK_k8I=T@)W=so;3h;p5fRm0*o`G*_b&S{?DGL40$lo zd5XXgYREsJv8louysBH&!T*!@mlH_(pMBH>jq@AD%R;EKtE*Iu&$@FzM|9bYM|hhD zM$S=ateA}h{U>XK7Z^Dg-2Ng0i1=B+BM!K*q)9jt?|>uqOL zR6yfA#^(FD)9?&ydO1l;Q<;^fP2f@;%|nIkul64`n)qCwOc>LuUG#RQ%X}hHP%n3Qy5u z`x)|BUsCa^&QS-DMm?iQIS=35QvXcjCmQpfW+GTeGR=WIZS^T+s<#|popB#P)*Z{( zd{jR}Qcr`YF>nS%mra)kE)CgstWW2G%W^(6gykZ}IDvjkFURj~SG>T;Dt;?UjCkw6 zazpa_kMQJ-b8@%DY>{D6Zmhc}o#sZ$M*xu953R)~I1dz`o;rmFW6sDnevZ;}%!30T z0l=&IG8~)5E^uZv8#8C)fVWt&h;Er*U0*4?l+kg2h7Voe&eXs4aWAgazp0X+M-3#O z?E5M9QGjtCGWp>VEXX(?^>!V;RNvO}OylSK+Eo15^@2=ym7f=wAh3^rwl`G^PdkPB zt&cya67Q(|xx}i>yZrn}Dx-L2@pK43Sx5PQqt43^$MZ#NYlZca!rI@DL{22k_)*Qn zd3f$8Mm}zy`w6`N7WI2_#j9X4xpY^M&u~8p;~VoqJogjD$M!R1D$^%CaP0RrWK;8+ z@6kE2J^;^psra$J0jbxAOJMH~pMkG$-XZa2fn-ROFB$RGkSHI6Z_KaduQxzcKf@;j z`yt<#)$`Y{Vjn}cH8isK-?E242=bZMwuUf1dpL-1*%{{B+#gi@*nWo0Z$BiwPd`JZ z@@xL-)6ek7d(tX?Y(GQped}f6S+LGhFIZz?{vpCLOw zY84*X$3Jt)y~5K5K7PCHjkSD;@8i!sxunWpI?e6pJnt)>1(G2S|Ia6n>%0tcJYR5s pFnESU^)qCjmcQLF#u@m!*Bk8k2BzLZ_TFk^SvWpKRX2(Y*~e~0V2ggkJPU*Muztw!~F zof?e>Jv=5*qCUrp@Vt;SHHU=E5EA1JHO~7x4rYr>k6}bzno##^$X^< zUB9ZpuHRjeeZSw6uWB&nN6fP-@Gf7~-(9|{zWaPtecgOjf8Bglf!%ynga3b?%@_9J z{8uaGl4IZA6tAxe`5dkv#p#rBe;N{rCO;{rBSM^F8RNr@tk~({IQ2 J^#6SM{sEu$YNG%E diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp index ddf53bff3b79e782be732fb16637a98edd4e2bad..5bc68001093a0a50a921b0fc6369312593819e02 100644 GIT binary patch literal 3176 zcmZ?r&ER1G12Z700mOnpYy-rM3=%++fx!qUFT@SOU;!X;=f+J^5yR(q?@2|YdfvSs z4Ffuc0jY@^sGi~Ip~Ix2(Kw}JoRV7T0M(Di4=@Z!P1Hd33~Se{Ar*~=^=NtnH4FxI hIv_Ps1JyH3BOMItFc>XI2X`8!SNxEktfv8c3;=pa-Vy)+ literal 2278 zcmeH|O$viB6olhXTU*qEQXil z@q9;S;T9TmbgeLG-%rv)>?F3 zhraJI3u8@I<50CJfHf8S@+VFeZ-{@RBXSW4;&;UI(%2!s#_AuWun*MPsmE)4sE{TOEF z_IUN;8`n;V3socGPFRR}@uYMfX3+4n5K>AgrJ%LOG)*wZz*-CE9K81kAt1(xloE2z rD5ap*iq;zF0)shV4g9kPPRGNr-}T$gx?3&D5V&VPSP%RUKl;HNHSt5h diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp index dd0d29801d8e86c78e04bd66982237e412b66efe..57d8f2f9f590b960a862ed4e2437b0261f47b962 100644 GIT binary patch literal 952 zcmaixF;2rk5JeZ!K}SWw0qE%Hp`haoD1tyNMYfcf9&wLw4#Y_!8DVK-lGxt0$LlqA zpa?$!xk#kR_n(pHKNmaR%j?&DvDP{IDe3@qg4z?u=t4Y$A07VHIzU^BC1by9b7Jhd zmZ;2fQaVr4)))~2IpBrKvM_kxFhZb#Q&CaoRA^19YK;*gkmpu~VSIMM93IGVc|Pnl zPz~2;|8E!&t)9m95!%vfrQ!rai{m6#S|J4Y`qoxj>$fc-wAS`J1(8;II-N>6f#gI& z7?o1A`ak%NQOD=c|2X8i=YAQ(c;MC6nmnIHkqpDu7!d+Fw@p=LY5Fo6Z5ScYmGfQK zl`+X|_9>#YcmVg_iHnQ}Vd*I*!AMdNhSJhfTHDbDzEVS=Gc_)> zfs%Z@@csupJlab%uY1_<;Jo_2UZC6ApW*(^wLfQoZ9|Bho0VY-2&TE+$oKd%_QCVZxUe|S&WsFj5%-S(7 z!COL%-PD(*b3$5cxAi4H@7Q@uTC=V9eJP`XQ|f{)IpIS?DiGo3QV?dH=ks{{Fve5r`@ips=(hc2FFG5vrn+l1ke9vz5m~!KGrvuGd5SuM12Yx|1`QyK9f(0RBLfFmJOd~%#0|kfL68Ip{QnO^KzbC9hQVkW7+Gn6 O5ds*fNQ2B8F&F@ImIPG* diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp index a8254201bd5d2648919a54ce5d248580d109984a..97b4e2a2e43ec5b5bb3ab631e970da9a974cdc04 100644 GIT binary patch literal 4136 zcmd6oJ#W)M7{}ce1`q>c^w>|p#Kg`AW9U?=Tan6ER0a?Nv48;a1xVY}fd)#`w9bp) z;`cOx-<@ORYmv~CEIj_-?);+RiMYk;L&dsXn z3DUPC=WF}uX#b$y+7}4~5ZtmRp6?Ha!;6b01PHD@Ja;gf^i6mhp5{T)+ z6{KM#637(~3?iAh=*lBmtM+;tO_oq&uSa8#5vC%60P4L?;jJjk`uy?Jhj;JazJBxS z#Y>Su0Ks+L_P+nvZ?#%q7L60ZOg*VP%}Lc)s{!k}?K++I;h|`wv$)-E12#My$C=M& zGu5iJ$ZD)&er-JKI8Nnp!^Vhix7(dgOH`5wby9sTHN`;B)l14LNabNKJWfwf^DN5= zQl@&%^J1h{REL`A^?IhqdA~39IPagE9%J4gDiWQqroYaPMkCY1_x&K`P>JBII)NHj zQ>vq8^+|U?Ob`CkSQuQa=}{ELpbnRgOL93>u0!`0iN6;`ZhG+a>ZKLQ+JAU}G(6a{ zzvlBLRPA-WKPY)dn2H2ay@PCP~(1Z z8`Mq|e&;|M&t>5ehOtD~JW_s37>Wd9UPqcF((en1>5-*r7RNHBsp(OqX`Un^ftVg; zo|joBQ+~DPcv%*OOl4_a$80)XLZ*lMC|q8O1k&(e%Pvv)AdS7ga_v)iE6TRFwzf7m zH#asm9t#5m5WKGagQcQzKe)Yo#HF?W=eu8jZ#$iisPI_~(s;IXyT`|(!e=pv>GAXA zL|XeGrbqwmOjh`D3}Si=T~}22ECw+>0?(5bewKll9`R%%EBvAWF+GYblh!_n>2b;X ULs18!nps*__W$El&=s_5mFw=stMC$Bcm;06l}o{u(P$L0SPb!a9En5%$z&3#R0`>I8ktN6*=!cMTn_ns9)&^y#bObqQVHd98I?)} z)oK;BS`GDj9gRi<&1Ms=RtxQR8=X!E-EJ4XUJw0#AEs$y{A^+{7+^RYVl*0IJRV~* znP57dVm6yWceku%2Fn@vNlbH7K3-zUT$5aN#r@yD;6yd(aM z5Pw04za+$m1Y-gHT_Kwo+##i|Y*A{}7Nu-s_UW9hlljwSE)5qmf6QqwbD&3TuQ{)2>g8rviBG@fVTX$&vLzlHK~7k^EN rzahSQkMSRKKKBsPzn2idMTn2_N1Bi(+BMYRiXhp3kQlK3eva?1sy$nes$F0(pAJJa{J2QwsKqw^< z4V0!AI~UuD?KpN5c+WYxQ7$^)fOY&SN*=#@&v!YA@+9--PK;m6i1%^d#{C@kjo3ZJ zSnMS}zk5sE{0)RJpR2u&C9^=rlL^FbyJMNnj$!^|0RXwDtB82*cYB`G^=zkS+1-xi zwA*&8Wi^`}(`*}N>(XdmUV_weX++3^_q$ymkMO5l+i`8%wb+6}&$0x+nJbX^WTHgk zmQ?06h(u1n-QuU4x^pFVx8R6ru1h>!(u@~e%L#Iar14f=hoC<;fzAN{oni;rileVjw5*CCmQ?Vd{SGV`7sRB zFqnU?&*g(C4CnQ?vV|GXS_;{{L7nTqsm-=%FiRt6S$I}_pFwC{pyt@ z4-)4IqNE>?3&{kc*e~X2h;|9XFbD>|-}imr^L$M5WPwD#A&T>1cy-12!5~B8B)~n*XB8 z`c1xn_KU2a<$0amz@{8(3hXb?bJ>1^7Ec5=MN4JBzcfpDTOHM2c-J! zDWcf#6=uEPcY8g%(`g#U`Ptd`lau=KajjOvd3bnu2y$yjN0h0T;CG5DiBA+tBwkzJ zAo1uQ68}(1ka()Twp}FYtBXq{eq(=?#23{JiGQ%TLgMqpekkW@`6;Pok{^6ulX#u` Zm!Fr!!ZP&b=P{OxftR26*e?Eo_z5PdQXl{T literal 2486 zcmeH{K~BO@6h%LR6huW)6h%?7MONSfWbE8sunM+7!VWrVm=H%Koi$-X2m}&HX$q7A zl|op-_4BbLATy(J(3{+!ci)@5oV@&(*Y_Y{diD{Lrd62wjoL#3tS{1eB(ySZE(au& z$sn7}BA3e{pUW{+l8iS&~+WXUJw0#AA`XFhGAeh9KtkBj7B5aA121*F(#7g>nUeg85GYcW3CJbCu_vWM{{g5MEY@+HE_;Xz>Ex99P@c_)uGU&d#f=XUoxN`>$B@!uCg+*N+NbJqa zm*2m9`TXI-r}yuHT(G)NA3ps2_6;ZuL_o1hkh)(#e*FFY`_HdmKm_C}fW-d%{{8pQ ZA0PrUfZR+hc4T7_E5ag%O|Jsb#{e03#(Dq% literal 1174 zcmeH{(Fp?~42I*K=XtbGouU(TfWCLHPS6qDMo>gVahEjb-zkcLpD+9gc?coT*GJQc zhwv_$5nV-!?C{^>-!71tXMvn^?7im@0>>CRrNlXBE~Rj-m0N4vduQpMnmd>`@P9Wj gegi3qGgHR_S_|$wXbiY*pw{5Jg3AK_=3pv)0mqdZQ~&?~ diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6cb7cd09e303cb657d9b8acf3cc92d5ff0ec490d GIT binary patch literal 342 zcmbu3F$#b%3`Nt$$wPGX1RlWM)%!191fhniwQA$1bdO-*eF%9Z8OF&_sUF#Z7Bs++ zMH1OMFHH>*pg F{TI!g=CS|) literal 0 HcmV?d00001 diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp index 02522f2b5eee89afda56a48188e51cc6fccfe466..7d1af69944df585d9a95dd043a7fd9caeb14f164 100644 GIT binary patch literal 1292 zcmcJPJ*yf~5Qg6y5(r5kklrHqW7WiU&+c-2xqbeKe?Y8ktgLLT1VOM6L_|;!ECj(q zL_}2Z`x6xv|3l_@33v7=gcNyUmh*UK&Utrc@#WW-54h;l9pItWSBe0|9X`?%c=sOo z_W3oQiDd)=0R)3VghC;N!(l`s5k#X=#9}eT<8dSs2_%zAq*5uQ(`jTf8Dz6rvc354K$lgv|25++ii3@9dx^0^m;w?`+W=s z0}O{lj7B4j$74(;6HKR5%w{vp=W{F;3oMsQtX3~=fs_j?=;2ON(_ zoK7d4&u96Xu!UjSZz6sJS`qW@Tdd?e(q+D~Zz$|Q%6AI3>G50T(73@TVlTTvhpGKwEQtM#eM-H`CgnRCLixO57KED}NBx&<{SmRL*|sT!NfJU3 zdu;M<7~=AveBUb@e!uRwh`D{Lx2T>8rm|1&cE(qQ}>0dcttvCO7y@%Vo z@&20Y!L427)*fBTyzhx0*#U0iC&qHVI%6*}pXbjT^H%1s_`B+-@;&^mf0ojJo7dBPVKu*5%w;#%mT^0< znjZ&yx68c9fnm4X;cz(MbUNX3x!`uY;qiFj^?Kp+`QZ2a5eNhj3^rI1dik;!C`&1R9y<&e+kQ79BpEEZ8Jl~691QK?i=tyWR1 z)lje3(P%W#Y&Owqwa{+2(dl&1?RL@Y_0aG4F&GRm91bxWjW8aMF_}y-olY^E%`l(O zu~;myTrRO%tziDD&D!k2<{7x_GhjPbhGF|Gj@R^w;QWhVp9=PwV1E^Ct610Pg7fcU zU0(>!B`?^Qg1sfoe@xpw!M-op+k*W-upbKcBf;Jg?8kz=E7*I2{Y0>z3idO>elFPi zf-T2+!j|JYTi4$N=W={jwj9?vTlb$W+keUaA@0&Y1@FHS>}$dPCD^|O+oH@q5S+gd p?3aT5O0W+F`?X-d5$v~u{Z6po3-$-W{wUa=1p7#^^>w!x{{SB2+y4Ln diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp index 745aff8c512355c127206cedc9c7c424364ae294..fcbf995e7266004d4164edb14308ab411e8521c7 100644 GIT binary patch literal 1260 zcmb7E%c|N?6kRPH6gnu}R_IM`>rGB#PIA(Jkk0!f{(v9g4>)(`%z*>Jfgnzt2_h&c zDvGH1et`M|-7#v<$%R4}dk5B8`*n6ge*NBmz!h71a`MmQN%D92NKfEB=}(_R|4BUX zWHO0VDur}9jZ7wkY&MHrE{A+Rk3yk2!+OY=-%Kj>Teu<#LJDYK8TB zjm>6*?RJaZZioGTkHg`B4fw7jLYQ`Tmzh$OadHcxe|!m5_Ks);YoPI9p*@~ zNBLag+~neMAOswX3kh&cSE8gdh5KCP)L#w{>iwHX<1OvWv#x9U6`BsFy~qW8rs)c| zR2`P~L(!Sash%P06wf@@y>GxJ-R9io?#+mE$Km7wxI^4a*n~tPFx$5@VOfk>AsE#Y zhG7~eyP661BI2(P#KCmI%sUJNwkD4wDBqJ0sGktQfLC*a`2zVquNU-_5!9FAQ-2vz z{Y}25=7W8g)5ZVh`;mMt7{&3Ic`);61~s!L=~F+_XCrRF1-JowJ39*t!9oxlJ3#~mMMV)6=K<6O zoSY=hc_C#=|8UWtw|U&}U3~v|+cds=TQv+1zwL9GTua8!hKCwqmMOOuiFW&*UL^{YV_~(*X!ft{_peG>vGF|y$%nw GCF2vLr^5jN diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp index f466a1203dca00662e7522920558683eb0d68d88..d688e83fceef98d07e61ce2e94627a2b5464f0e4 100644 GIT binary patch literal 1256 zcmd6l&1%9x6opSq7lkfLTcI_jH9y2mLLZ`Z-xu)(d;nj-y*qaI8ktN6*=!cMTn_ns9)&^y#bObqQVHd98I?)})oK;BS`GDj9gRi<&1Ms=RtxQR z8=X!E-EJ4XUJw0#AA`XF!{HF4(Fo)57?a5a)9Dnm*$ngf9E-&QuIpmCT*C7_tX3~=fs_j?=;2ON(_oK7eI7odj)7Lxsq?XVC=`$z2XBF7iF2lnS2R}>{q zm++YM{RfF3C4Q1PDzA$9Fg^grYy%c!UvA=LGHF@d{U;2=Gz}7WlR@`E|8(7fs_Ckx z3D;Byi9pW@&4EUu1-_G_=gn+>0E9C~^eZ-unvSjywvxX|^Z9@EcY$KDyBoh>n|IFr aUg}@wxRh5Umd}GK<;@7Tr2OyC5BLDpLP#Ki z0D%x7+%F060LRwZc#4G^mwd^e?&?lDRdwp`A3v{8@W=Hr5DxCng8ClR5pG_DgUk8p zO$85szd$4sVKf?LEEZ!t9%mwvU^1CxDwSe7on|JJVK$p(E|+6IpJ$;^V6j+asZ?UQ zTxO+GVYOOityW{bUT34xV6)j|tJPw=-DaoLVYl05uh(P0-{)X3;BYwPXf)z@JmzFF z;dDCXY&PS3KIdYw;BvX-YPI5ez2;`K;dZ;_ZntAF<3kfu55r z?3opM*%!}@&%ARoCo_{@zyEweq5-u(DV`}x6rb>wTHrJJ*>7q5Am%8QN+_4hs8lMb zR;#GhYN*%iXfzsVHk)X*T4=Z1=yW>hcDv~Hdg%B27z_p&4u=?xMi`IBm`o;^PN$g7 zW|+_CSS%J;E|*xXR#>ms*lae~ZnxO&cG&OtI2;Z*9*;PkPB@>>xLhu{Uaz>_Zn)p? zTrQ0Al@LOuqjwb_*r=c=MEN#{Dik*78;gx^;&dQpA=D=M^VT5rBb$}Y=7HsOe%`;? zDBIW0_pIwWE{Ef0pq!kTkR^5n=b$Y=Pn@@WWpSSJJ>h#aUlpS$*#YV_`P!JsMCp&& zgrT7b4RwaN7-&+!Z4gm@thG`+M8_60d!Fz4%JY5Si=lFH;Wbs^)hBjiMGl*!WWK0} zxoEL+;+P9e?*Qc!)5x11^Xd6gyuK8#FU9prL4WZ7d%p9O$vh{b{)yiAC9N;nmX~)< zMwzpseur4TuuEJJKHnGn{O$V?(EL!$XBHUq`AdG>|Bw5pWjXwP$#RH|T#gv{3tH>o AEdT%j literal 2102 zcmeIyOG^S_7{&3atSl?ju9~;Xz)#>>+V@f2D(~D0mWhwrBVsyav7CM1=VU5wOS4JdL4~M1I=a=tyT-| zb{m~e2iphv)K&u`5cSI0?XwRtJMnY^%~~t z_G^C+_Rqk7KLa6;WZoD*+AHz@LNEO!?XpkeT`_d zO`?w_`b45nCE700XA*rb(GH2ekmyT^zLIFCL|;qvR>nbzb763o_4x1Sqn{=EMWSD& zzi?RM`GjHmO`^9lc1fHIU9?-GZzTFwqVFX7UZNkQU4E1}m+k4Hb-&TNe`wtwv}}(6 Hy_NL|NL8?| diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp index 78ff5701d863653342868ce4be1cbc8df26845d4..a92c7648458d9024d1a0d637588ad0ed3fdf9d44 100644 GIT binary patch literal 9956 zcmd6sd2G$;8pq9zo9RMnIc-r@OIM|vqMh1x)5YKpdKKwrD{ASCkqB4F5Q%k2?0a0p zSSJ~BEkR-@VvFVS-~B@_@fUwsX57#7yuaVC=X6tbjd{*F@AACQ_IrQt_C4>wy#GWr zQR+z=#jh*B9DZLk2_|jQko&~q!Mj~h?A$WP&tzROk zEzNAx#*ACdtw;Sk6cqBE1cRG_Y1yahU;IvY}Pc61QS$HD`e>ZBWWlc@d zzhz6lE&crbu-UqGYnRJqQd6L8B5`M$CSDv`En8r~UuhxEorcIkt?%cUEX~&KoDVQ>RBLE+Hw9pkRYF86uQLWm(h`}Wf zr^I7wS)bPC$%D6|E9mO@_;}+YAt9khj~DTT}V42NkiI&n2K_$5=`;-=-!f&lJfHMf`Wp{lP4Dy6-~9NxVRY3m@#9f zOqo(zQi>$Gzemn*Pc+qTBE7{sntNNxL;BVq{a&>>7dv0xV@7kAcIt6^bGFFyKZo=I6hlw{sX)~OSs zbSzJ|V8H_3#jahu{#hHrr*+}Ng-8Yk2Qge73)nQaBvsR9UgLzAyI9oOE_A6X2}`Da zhYq1U7qf5Y&Yg7lzv?DhkxA~6j69Kd?u0Q>Wzm>ZySNj>mX8Qxh^|Rd9xQ|r zBZj?u_cGuapZD+I|95Q!pSgq#lE~`=Mtaz)t%6u=Y*+bo?HUVdLWPoHz(bF>#=^3B z^JZ3H_C)rGRjXG0*OM5N@O9(%L6XIZH;=AZ6?&QYx7#lZk{Q2jfStWvkf^j4ZTibTb z0#*k2wEp_*uPkK@_n59R=o(wHx2R3yOAT8s#K35;pV*byg9wA2l4XXal$0sPDC5E5 zlTwBQpEZG$0S_N7bRFYXsfuB>5JO68D!rOQX7UuxNMNLDV`>Ur-7`6v2chqHucXF) zPn%4f@VjX%-Itu4jGEdsR@8~{z*& z`VSbut~7X%uth^;WardI5kV4;X|#l>sH~})it$Dad3m|HdAXWONy*8SZ?)5cpb;U{ zvZto~x=(h@pWn=L@C3*kr1XZvCx}Sgi$O;Fzu-fg8HW zc*#OTN!ZHq^5*o+8K2#d)lbesfq?=3{+yKH3)JxS_4BLI>en2IVXTNTF{dWAp!Q9@ zK^O=7oOU^GL`Ow4{(JT6mDD3CIwqPeiIb8B=IRg{8WSDU!?Y$PMMp<*ObG~RMVx{^ z02`7RQa~b5imG4}`k{V|BLVpPGwWGUva_=}s*M{ruAt!WY)olsY0OhrhS=C{l;IQ< z6wrzclB_~#5g`_cM4^)AH4W~2*npzly{^W63aCo}&=g(ih ze3=EA6kkV<9GN+DW@%|DC&{BnkHT?UksLj0Gz(b!koLd|vGoxchd0h5Ojpy%H*emo zsHng%TLU}eojZ5-?Afzy*)ksd`t|FZHf@4WD>Aok-9#QObU`aT2-Ikd!!+O=)u&IN z@#Du|yLN5Hj2SpObm-7;zx}p-`*zL=M6!GLZeGOOw{H(0K1?ezNFt9G=O`?=J`Upm z1F*x+!9n`QjT^k^ty{Ogd-v|*#fxmv_@W>7@85sw)G0Xdw{6?Tut5@ewAj4bvF>Y)P8kjz^5n@A4!lSrj~1s0EZAVltzei9#yG^l zQG|_V(xgeu1&%Ri&YZ#B>({Rdzz}8n0X}_#43fyl$H^IqNZ z#3I0Sc>esk?cd7bz^4@%B-v%@2ZK!vY7#u7^r0As0614O(}xWk#yW7~#ED;i`Gxay zwE#>NKCLHDoI>{;f;rAwFUiGihZ$M)^#&YdeRD&l0uK#H=ljNqk4 zVH^(X96g5&8NyI!o&5g$?|I$No;|BI4EVGngCz23p^Js+dWmrxTQA1x)~y?xb#87B zL!BMrTctU3=3KaNp;{QMQSglblE~-eqs0o8Ne*5-qR><=5sf_=L6DLiXJf(bUIhzQ4T9M&TfU$*z8JQXA+Tf;6 zjFUR3!a^E#WURN?>EFM<91_Nj<1I7y>1Qw(BY*ht;jD+G?Cfyh(~1n6Ch};Ziv?r5 zE{rp~WY&8z&R1z)_3hga2tnWCZp4TYq%1+4UKCRZ)}Rar{@=8fcL#Rp*SBw4+E;)j z+l2*lEKFt9Qc^2sIpD(vHv&Zjxadb93BQaC&P79pWV2cV333>tIXT%`*_oNVrHqWs z%aVkgHm~epO@0VtE?4w{E_pSm?ygEL`NEB5;cZkqmUArr<{L zj8#F`QkO>WlFG??Q)A$UU=9HvdT(P=ZPmK`4a86W3;O@w<5X6>2jduU^5?n7VM4P! za)xJF=C5hGmu{g4Nh!nGvSkac$Z(p4N&M9zO^rGj=ey~p4!}_$A~ko6)6(r8hkqtF zY}f#(S-*Zg|2qLCKp!TO*|TTEfnQcuMv7#^?{Q`n%`(sf1OgJV%7REBYQo?eg7A4R z(1f`n;l74djIE00n(gnvfdljmf6Kr(0zdt<7kRYM6)S326Jt@WiVLCXr4`P_igVRc z*F6pg7~_I{;mw;jtek8UMDq35UvpG=_39N{m=QpdcLdUG$UTnFhuq_Ur#M@JsW~}- zAlSs|fBqN;&di@b9}aw0Z0>Q8WH8VN`hUfH?{U&>08(epKlZ$L9*Vt*T@pt;CP172 z@Ok_9?%iWx5Ca_ew9+j|B99ijZg$DK&4dYC& z?5p@g66@MVu2~e3*o>O@IH0*|0hlWMM%?41&Y5Hb5C?ixU9@NuNTm8bPOSkLW+U!# z*t>xp_6KBU-MUz~q>g)>dSYnQJx*G5O^Whh)x5{y6OU;dyTxu zsTKxnlpGS+*nK|i9;aw}iQ*5rP*L){Y5|_aee!#pisG`*eviX`Q3trGVkdp#dz_-; z3LAiM?l7q1kG{vLEGlgX#!;m6sqS$qruKD1Di-8`BgjKCgGfwn7zULX;G$qf^^K+h iE=Iyu6-m`sSfg^vP?)3D;)-uSFTlZj&z=cQn*0wf0vGxK literal 4378 zcmd6q`BPK(8pcmTP@-%iMuLLDge_pA37ZMK4G=^?6cq$QmGUH0RadM48)WvQy`PcAeYNAb?Q`1n>Gy!g#t>Y5{~cP`S? z(=l(}Jj|az9}5;NKt@IeGBY!=aN$B^Wo02dI~$7@EkaIC4i+z7j3rB!VCmAOShj2# zmM>q96)RR?)v8rky?Qm)tXYHH++3_%w+?xEdC1St$NKf_v0=joY}~jJn>KC2=FOW? zP*8xaTeo7{wr$wHeLHsS*nz^rLhRhR6T5cpLQzo>ii?X;Qc{B5yLV&Ho;}#RcP~my zOR;a?KJ4GW9|sN`z`=tDarp3I9653XM~@!Gv17+jUS5uhiVEm-IvhWK9F>)osH&>M zi4!Mq^5jXJI&})CPoGA0bv5*QJ({TNp`igcZ{EbMTen~^7|__*h^D3{G&eV+ zrKJU}t*y9o=MLK1+R)zKj*gBFbar;)?%liS>gvM1d-u@Y-Ho1}9^Aiw9}gZpKyPm^ z9zJ}CzP>&@dh`g7A3w&ECr{Ad-;bwHpJHHO0MDL1!}I6Q@#4h`ynOi*G)?2xt5n|{3?y>*lgJHn`RN_PBl?4jZTPO-D%MXc%f4edd!mh6lNI4w; zZ@%)UsELP$&+3?#%4ds9ZmExo@x}$le5xvn8okG`W!&NPky{LVM^hZKFr2moaQ7RE z0*=dFbdjgi;BYqM=ixQ%t-+u95{F^4zO-o-7x zvGcnND}%|X4+>s+;k(YpcsCdOk-Q;UF3--<)uSmXBz)z!ZMkuAYwmozDm-LnlZUIL z-OvxgwdFerM0Z1?;!}2RtY3M)ebdgA_~?)>k-&*>JLChCth1ZAJ0c;woxb^xUj6!8 zbVqhVWVgi4`ERpAp9^c!y6E<@C%V0l54F=>X{#^#2tUnoczkDf-{psNbZ6z$laC&q z?62&kb!97j-JSVEzZ=KK&ROU;J?U9b`M}v{H2wVCKzYxzr0IU{&UT;tW;S+CLO)gB z)6#*O=VYwWFKPx#pXRCjgiar2&A71TkC`Bi+*RCnuAhn0bbn1>aZ#jn!Wi<$FpFgg z-@$c~EH?9MU8gBZ)17r!Gh$_vTpjo_FV2Q%A z#6{rY7plFt=Y=)EKtlW5ePjc zGId=+ey=s$o456fS|;%n3d}??v&7xQ%XeycZ^p`k`)v4r!OD!@@TtCD9`0tIm|5cK zC6OxB-Dx?wU)C6ZwEmheb92(V)e5P^%hOB~%0vqAoRpXlXQjzdmM|!>>hD=X{_o)0@OZYiJf01g^RXX7 z2Nn_}LvkE)k28-(|M$uNay9UJW2-LO^rC28Yvc96;ZM*Yp(y3CYrz~&(A8r>6eVsL zKHI{yw9_gCU)N64GTykrm`~M4QI7wjD<<5?mpf-m@3N>6EAK=JY=IZ{V<||rHHArEHUyT=|rYAO4AEZ%wjQOtb_I?r!?d1t>J6q zHK)xKF_l64k}jc8QpbibON2tQ@R0`XOF9^6tnDCQ?`6kY#v2zHW0aXCCR!L`MWWOl zB4ui-QnWo)B#JedDPk&v_9gK*+dHf0n$R(~y0iUO0*eu2Wm&@V;&YW{3A-ElT(z*| Wqy5Kl*2)s={$n^dg#qT~uo>3fKsVcfVE+2LgCY5= zyJzT!$NNj9bqDzd;uhi>;tZ`IBXkbmuP)}$2av{L82TRQmFkpIQc58N=YlatDJ6t7 zO$7jx!g^%>)22se NmpajoxtQG>p&#O(R+#_* literal 2134 zcmeH`%W8u_6oyTkwrSIAYSa6@i>|ut19a6*SAjm9B0>-Z2?QYsA_PH@Jc2}mF`A3M z#NV;mo>`=XuKeII!^}57!*J%~>$@iW@?I5$S2lZN)nru>mK&dJXw;X*7K;s`)oMYK zB*?N1MNy!tD%$NfG);r9>o5!holXbcZWpF$qSx!evMkuP4aafN@Au)lEoI6OK&X`G6pD4dZLvFq`hB>eny625;y!uKyp`2H0M z-@hi|`!^(f|CWUB-;wbBdlJ6?K(apnk)+7qAp7}=WPScK2|xdZ2zKeLYhnS1=tqLaUupZUG|-0uw+er>t*Ysb}Jd$0dIc=PAc+dod; z{c-mG_lpm|Uw!=j#*=TipMAUc{M(}!Umw5v^6d4O7q36Rdh_|s+t2UbeSZJ`^N07J gKED6>35Y&?{0v54K79Q0;R6I+zI=IbxrKoN06LKHZvX%Q literal 1174 zcmZ?royNid24+B71IW??VkRJFWZ(dccL2qOxFHxQ2$En34i5gGm6i2>)~s3oXV0Gf zf9~A5|L4!2|9{b+}@_*a5ZU1-f z-1&d^?%n_Q?c4YNz<~q*4{8XVBFE& zhgqk40Qc|hZ-({-Oy5?kg{saaN#ObMXf){eyWMW<^0LurluM<2E|*TFlF4L(Bx5Hh zkw_#M4ElUN@A0wc=*Z=AIUEkV-EOs7KZAYR8eGC>o6QEdoKC0P?e=&)UauD(3ZRb*9;58D_w;qkbQ={1bjL9ikI2&t9U#V*G#(i}?{cEN{)|uvidcdHo6< zzr3-a!*ci@9TxLDbXbfgbXczI7Zhp+%(ArJ^hp1<+Jk1}XEo zB1s@%lxMR!NE9WIAZ#?_`K_i?aU+fsuO)EYT9e7I1S|(nwjc(j1Pc^< zDEbAF+FP%O>KhSZmfb6X{et~+nZpu%LhlBCsNgioNj<_#-6#0_hz>2_^Klw55d-dT#;t zGl39#d!0Ko3kVmOg=qM&PjWY#nP=aebN24stSsWUF~i}j%`h(PI}dir*rmnjao2yb z_e~7=#a<*gn5d{IFbohK9gUcn7{tcLA}%ft@$vCUNJv0pVj_}~l8~I7jFglVq^71K zEiDb{>FLPG$UtUhCbF`!ke!{4oSYow=H?+9>-*x114<|ekbwy?dujh&qx?C$PjZ*LC-cG{Yy znZae;1KhJg^vhMGwO8gM1Uyzx{7iF6vv8ez|(SQsMG-NWY{WbISw& z3zd`o&r}Ziw^jMBTs@zt?EA(hg74tW`yZ(YzJbv({{xjH{(WmZRsMS_#J{4W&*$GW z7km%)`;DM-vj2_>#dmUbBl&NssQl}sUs8{)gW$iR!uxs#>iFa{Y9LVyhLLbJKlJc? zVCeU9}*gNc0M^2xq6-jiSYSDQLL}#?_EnR*uNZVq47^2mu5bi`5d0W<=YQ`0I>pq A>;M1& diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp index 50107bf6300e87f97b7e866b2de5bd4020747261..cc55eb9c6a483e887f4e6be29aff74abe15e4be7 100644 GIT binary patch literal 61556 zcmeI(J8n}!6o6qfe4e@a{^QqTw)yw9y?<%1pY8R#y*|u7xA)oXTl@K^kMY`EXm9UtZcJJj~}Y=J)q) z+~3{BxVyb=$3Oj_

y9Wmc`}_NQdwV-OJCjhY+g7M{0lw(h(B9>Mov9|A}@rqVjHGMhr za^~gC%bAxmugQYQSA6Bn%bAzwMdx$R)_M-P@631(xqXSAP{Fgc6&3ncgI4w#>@)Zq z6Mv86IT_E%EM4BscdsQijr4?WC6<_fcU-4C5 z4f(2)L$1VERVBU}Wfk+jtyfOmS7WgxO|uSA+FaeGxMh@}-@ z@fBb36<_gHUJd!Gl0&YEM4BscdsQijr4?WC6<_fcU-4C54f(2)L$1VERVBU}Wfk+j ztyfOmS7WgxO|uSA+FaeGxMh@}-@@fBb36<_gHUJd!Gl0&Y< zS5+mx8f6vpzO7eI+*f0pHNOw=|}of>?n)% zZNKNMxyo`LwaC5PE=BL6O4=p=8ANW~UnTi_kiPGsl!De8#u!*@F^(ggbMW3Hgn$?$ zQc9Sn2{~uX^NjMFVh!klm3v@!K6S@KyKky`yD3f0nDw9^*bkfsoQK>8+=t`=@&I{& JJg^oX_yTCGWRL&= diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STATUSBACKGROUND.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STATUSBACKGROUND.bmp index 4df9c48b6fbde04d739de9c71f7d37c704ecbf04..b581ffc113fd950942267d961d3761352dca8022 100644 GIT binary patch literal 4340 zcmZ?r{UX2s24+A~1BhLKSQLmE86CQ4kPel7=h=bU{Hp@ zvtb0Dj)FlM0#8Q4Xb8|a1O{coC(}{Gs7M}GUKx}XIGK(bMor5X!>If6>h&-JZ-xJFWt14P@d=V>}YD;*J05fMd1#Vh&t)2-kJtc^-VXv|y*y=_!L$Q^umc*wj9^Zn6D$ap k1S^T!5Qfclxh)rtDo#{!AQUWBNu^R1Djagy%N8eYVb|>D5GNG}$nWB>BtL+7 z{Skl3wm$9n!t?e>iW4XptKAy)^z^II$a*#1KfJ#GtYPv!?Ux)cIezB&r13dzqwy!> zFF$pMIcTEUtcC_b_wKIK=_Jv@N9WV&-CuV=4A<**(J2L5uAqP36xrTGK4gGA1c;v)K%X zr%tC+aPNMlSu7UIEL-NLS#EZ|%*~*SUrsafd_J22d4Eb1$MGs(u9o?7nPW&~E}gBG zYoIp3BtTkMG-;ZwR?C$Hw5fHTP`Sz=uo15F4+gr6Vt(Emm z135V>a0>TQhYL>X;jT`>EoL*%$p|AD$ZuL-{Wi^3AcwmM+* zK`@Z!CHq;LrlbFo;czrUO@;&mdEe}II&9hZ-lF}z(>Zv-Hp`YR*npoC&W}o#={gp2 z@AmgE4w!VCy0co~rNb%AnR$eZ&+JEHsc;Zw6QXp1$fXfmx@tnm;4Eb8gh{s{6h9?&^1YKV97qT|s9Mzo5K0u5RJ6??6)2@2401iK_b@uhni8 z@-ThVW8IDVo!v>?E*NbzH-4H&M72)^!_Vq>Hq?sR&Ty1}=5$^5UvAOrceZTfc)@hW zi^9A32t4V!`n`DoSarW+y0xy5cQrg;02z+>_62bD`|ch%)%~Kjaa)WwR?GABJ7D9k ze&10YZgsy8(G}zB_sgHa@t};~au=jFejCeW73{YY!9dRR|FHy^w|-a^ycW|HzRB^5 xngj!}_mk@x!NqMW*DJp3auxeEYLkO&T|MQyrutt2671LH`(-`8?_W0>e*@`40l@$O literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp index 7f9451a61748ce539f71e7a97027758cb4e9cfd6..d3e4f27eb53107ba240ebaba067417dfdcd96945 100644 GIT binary patch literal 5096 zcmbW4J#XVi5QdfZ(p{RAM5+KO;sCh=Y#0U{IE9OA4yn>Pcgmd$f537Q|E~NM`v=52 zeSc6AKP9Wl^UjjA>;%b*qv3LPc3v)*;>(@+;mzQShRJK%uQ^_F{LJxL<4f8`<4?w4 ze(nx)&_uIY4Gn_M{e8RLPNId6&ZpD+zwUt;uG{UTQRJm@%p@hQ-|we!?4wzdbUWP= zHy8}FIPuan>GygiZaf}yAs@}tlu1h5G@Rnd(k$bk#deaW@@E;XX_jXhla#pGY=*;A zr_(98_rKCC7K>$;EpyW>H#=YEX3)hirx|%ZpUr@LIHif>c$F_#%Y3=aF(fjV&Q{Ac zP#a(pAm`UKX_~B7%asJQsddUO=hDAiF$s{P?`c?h5$ADA(iBLrPs98U@L(s}C;ISE zbs1+8Acs3N^cdTa$L<>MV^21d0D0S_5n{bwb3E7&+jWGJt5CUhOF%B)blYu>ZX-Z~ zVA$(%<`SMtFpwaCQsHJlJGC;cmGw;Iug30fPtLi$ za59ePb59K?6CllF!%aLvggM-W=9^8Y{y2hx1XnckFpTGmcwx7?C=Ko$8^0T3)B*?w za&lJS6z-)C7o60?U7vzm%x0dG5k@eO-?YBSEyeFX2?i1bG-Z-`3mTTOWB*YwYiTe5}X!Ah3OV>-~NAN1kVzr1})brcsRTa&#F_ zzpF0i2eNk}9I3HiKJUVSG+Q*Jcxe(VFBe+vKXQ9KajF0*5UV@DWeFL1qKuqYxqVuA zu$@z*ripMjXKuc{OyhHx((6*n?jJLG7eHcf`RBRTmm_69ucW-xXHL2dIo$3maLU4! zu3OTsL1&aXeAQKAuTdb!N5b*0=4A4@@^8!D$?c`G<#DQXT2A3?eZZ=8-i$JPS9-6( zLWEPKa9UsKS32$^K(5}EILn+#!Cj7Cr1Z`yuhg!I0mS}4m$6$C4!e}TuUFDa7%E5Q zD{(})4BirX*;Nj&krHE2rS#z5>AO^2*V6#fdRve07p;1HfAw8GzQ3r+_s6;)vd2(f zjK(mUKO?(yZq)Cp`@Q+@>UVoTUEL2|L1z%Zpu9M)ZsD=-KvLB2r zFn!Zw-HrO4-AUXo7;Q8+ews%_wNC}Z&+2zJ)QZ~9aFl=MbY1peZqe#@wrt~g!F0xp z!n^ngJn6dny?Fpwb-!b}wXTqNH9TJc8IJh&1#tEI?jAVR{i3#UTZ}eV%k%U*VB@ZS z-%%ZIb-xeM731pntDnH}pp4&g7o;|R8_Q)C?6(uaK+g34u>_d6epnT}7Sk2J$?=Ms w1Ou`6lj|A5#ceCsE57S;75g=6lY=|Ie#&=E^}hln*ssa=t9pFjziBl71{d`K!~g&Q literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp index 7f9451a61748ce539f71e7a97027758cb4e9cfd6..e5975d457a5f0c2055129b0cc71e9443401a023c 100644 GIT binary patch literal 5096 zcmbW4O>^T!5Qfclxh)rtDo#{!AXKpwNu^R1Djagy%N8eYVb|>D5GNG}$nWB>BtL+7 z{Skl3wm$9n!t?e>iW4XptKAy)^z^II$a*#1KfJ#GtYPvU?Ux)cIezB&r13dzqwy!> zFF$pMIcTEUtcC_b_wKIK=_Jv@N9WV&-CuV=4A<**(J2L5uAqP36xrTGK4gGA1c;v)K%X zr%tC+aPNMlSu7UIEL-NLS#EZ|%*~*SUrsafd_J22d4Eb1$MGs(u9o?7nPW&~E}gBG zYoIp3BtTkMG-;ZwR?C$Hw5fHTP`Tnb$o15F4+gr6Vt(Emm z135V>a0>TQhYL>X;jT`>EoL*%$p|AD$ZuL-{Wi^3AcwmM+* zK`@Z!CHq;LrlbFo;czrUO@;&mdEe}II&9hZ-lF}z(>Zv-Hp`YR*npoC&W}o#={gp2 z@AmgE4w!VCy0co~rNb%AnR$eZ&+JEHsc;Zw6QXp1$fXfmx@tnm;4Eb8gh{s{6h9?&^1YKV97qT|s9Mzo5K0u5RJ6??6)2@2401iK_b@uhni8 z@-ThVW8IDVo!v>?E*NbzH-4H&M72)^!_Vq>Hq?sR&Ty1}=5$^5UvAOrceZTfc)@hW zi^9A32t4V!`n`DoSarW+y0xy5cQrg;02z+>_62bD`|ch%)%~Kjaa)WwR?GABJ7D9k ze&10YZgsy8(G}zB_sgHa@t};~au=jFejCeW73{YY!9dRR|FHy^w|-a^ycW|HzRB^5 xngj!}_mk@x!NqMW*DJp3auxeEYLkO&T|MQyrutt2671LH`(-`8?_W0>e*-rS0mc9T literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp index 7f9451a61748ce539f71e7a97027758cb4e9cfd6..d9bd13719c1190ee809eaa5bb3939738b5c099f8 100644 GIT binary patch literal 5096 zcmbW4J#XVi5Qd%B=`Kx5B2|DCaez304a0x~r*Lu2AyqoxopR^GvSB%ie^>sB{R3j1 zKCCZF;-_RadEQx)mYpD3aWq`c&d$r_Qhd2HKfZqWV$0+Q+OIiYas0yZ+18h|TU&oJ z{_1mgn1d#oPHSiobnfrl?RFB)eRMXN-2ZhC#BkkiCygR6jbkP$as7Tjjbk6plBC<| zmbiz9K^7-onkM~Tuf&Z;BQE5ld73gwiJOEI99f!W9JJU@(p3H|qczR)EMt-qH=Ry# zc~b#sizSl)IsTr8l^1ayrzA~*1P3(C?*NZ>qJ5^1 zk5!j(CIND^Lqm_THF@f;@ILiqGYOD44H_XkY6Cx#n)f(UcC3(Ys3O#E>K0|~BZW?>l5=JDKabzU0WIW~Sb#Ha-j z4CM5@z$x5I9WFSnhr2!lH=j;DCnJntAirsSkz0!2eG&{L2x#;$0YzG0QlO)F9^omv z44JBHxVH_5OQOhA9nQ_iH2%2xyt>cLafjQwPigBHz3AcwmQ+pOQG?zaXJ8sSNdWu~Frb zK`@ZU75iD5ro;b|!C*Kq>?Q(P( z&%diK=LfQXDjcb?Uq0``fHYb(q)H|K7?yiDVBm(uG}%I=>sc^5!pZ~13a>&uZcpI1^|>I)}bh8%8h7o4(i zrR$coYtR{G4qtVZ*lQHX$+2*}t2vo`uKe4wcXE5FYNVgRxK&t>eEgu^bS@2jP>5{AlA z`AQrSE`zs3UUrqkYox>&R4F~Ucls_>*Yz}jwBFR?`$elB-*>;O$M@};e1EF@A$ttv z#b^wp`3tf;=UV-)y5F1cu70=o)7AaZ6?6vi3(AY*>J}dR4kShWes;;9sJh?rTJ2gP z57XB@)?KUL*`37gg3(5Ef5T`{hHzxo**56bv0cR_07x3OGS!G1dt4CGw@A4`CFtH))*YcXBn>m0AB wNiYz5Ke?U}T->&Dz2dtrSFvBCHaWQF^>e;!s{a)r!9h*FU)AIL!Ohmz-w0^|!vFvP literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp index 7f9451a61748ce539f71e7a97027758cb4e9cfd6..92473af5aecf509de8a68c530a59e71552e96f84 100644 GIT binary patch literal 5096 zcmeH~O^(|}5QRHC1Kv3sFTL~uf~@3C7PR(JL9e^fswlV7p#x!!R7$@Noui%sbR{cm2E%L16O@4rD)+U<4^ zyN3r^xn|}4LlnREJ?v6CeEL*Xhdc}+9moBC55;(OUFUI(=#+DHsGN5^o~AK}G-n2J zUeh!@D57)D3-(NSP}{bJ_wF5L7zUAM zQyDH3Jq*Weapw8l_s$!~@iNaSQmnamBE%WQ=b3Z9T;_{JSm`3AN!a7_g+ZLhFL&Vc zcLs5urf2f#7U!mqk5`|525}xO`c|@Su3MK!265hs@x03*#;f-G=fPV9l$1_&&7DUC z6)=>P&TZQ@O?x^86)=?VpYKesYn$P`Y-SXmh9MIzySL^hw@WmRKU*DKfy_?+E*XvPIJQxE%N0t zD_(GO@ZqoX{2n}hk&hSuaRq6-@}1(w6-r7&*YW9)!cpxyDBqs%ok`!bUvSB8WC?IH z@7x!BN=z2_92W8P`$$71Oyey`;IRn4l-D#VHT(x&$b-UqeLOPb&Aa$&127cl!E~-Y zgofH*-0XE4?^xFYgat5^lo>EN<+-N$C z=3ANm#CmM?5=NzQte!70=kW>TJgTe~TlS0Ep2*0oN_@qO6!TZiiZ^>1KbMl8DQFg} zO1=On>~HlapIoq*FEAg^crsSed-blu-a^G$eD%Wn_zI&c`Br(0e{J6Nq5Sn31MOPQ zo8vr{_v&0k&l3`goyR<`T09~fo{DzW=cPtp>iH5>RBF$}ah{?#u||R3f*a3y8`=hO zzhOKUnftv@M{QmDzt{7;9FF9k<93QC)t<<7;;Zw!&i&zhU!C8}xu3Lz&5B`3tpt~9 z9Vii72R7$-o%>k>Vp`7c_Fc1sDYuu5wlue6xkX4gEk9BV0`~7r=YEStEW4}o*s`~o zuH2TCJC7`4cgij2vGvkHju%@TYc0X6PZwb4>D;f>w%k@mTUINwT?edxb$;g`5J~fb z0qo=PqAb7Fu_SfLTUoo7)4XngoyYVo**t%B7yNDp0(PE;2@7E3ZSy_!fd3@lQ~Ddx Crozhr literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp index 7f9451a61748ce539f71e7a97027758cb4e9cfd6..92473af5aecf509de8a68c530a59e71552e96f84 100644 GIT binary patch literal 5096 zcmeH~O^(|}5QRHC1Kv3sFTL~uf~@3C7PR(JL9e^fswlV7p#x!!R7$@Noui%sbR{cm2E%L16O@4rD)+U<4^ zyN3r^xn|}4LlnREJ?v6CeEL*Xhdc}+9moBC55;(OUFUI(=#+DHsGN5^o~AK}G-n2J zUeh!@D57)D3-(NSP}{bJ_wF5L7zUAM zQyDH3Jq*Weapw8l_s$!~@iNaSQmnamBE%WQ=b3Z9T;_{JSm`3AN!a7_g+ZLhFL&Vc zcLs5urf2f#7U!mqk5`|525}xO`c|@Su3MK!265hs@x03*#;f-G=fPV9l$1_&&7DUC z6)=>P&TZQ@O?x^86)=?VpYKesYn$P`Y-SXmh9MIzySL^hw@WmRKU*DKfy_?+E*XvPIJQxE%N0t zD_(GO@ZqoX{2n}hk&hSuaRq6-@}1(w6-r7&*YW9)!cpxyDBqs%ok`!bUvSB8WC?IH z@7x!BN=z2_92W8P`$$71Oyey`;IRn4l-D#VHT(x&$b-UqeLOPb&Aa$&127cl!E~-Y zgofH*-0XE4?^xFYgat5^lo>EN<+-N$C z=3ANm#CmM?5=NzQte!70=kW>TJgTe~TlS0Ep2*0oN_@qO6!TZiiZ^>1KbMl8DQFg} zO1=On>~HlapIoq*FEAg^crsSed-blu-a^G$eD%Wn_zI&c`Br(0e{J6Nq5Sn31MOPQ zo8vr{_v&0k&l3`goyR<`T09~fo{DzW=cPtp>iH5>RBF$}ah{?#u||R3f*a3y8`=hO zzhOKUnftv@M{QmDzt{7;9FF9k<93QC)t<<7;;Zw!&i&zhU!C8}xu3Lz&5B`3tpt~9 z9Vii72R7$-o%>k>Vp`7c_Fc1sDYuu5wlue6xkX4gEk9BV0`~7r=YEStEW4}o*s`~o zuH2TCJC7`4cgij2vGvkHju%@TYc0X6PZwb4>D;f>w%k@mTUINwT?edxb$;g`5J~fb z0qo=PqAb7Fu_SfLTUoo7)4XngoyYVo**t%B7yNDp0(PE;2@7E3ZSy_!fd3@lQ~Ddx Crozhr literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp index 7f9451a61748ce539f71e7a97027758cb4e9cfd6..92473af5aecf509de8a68c530a59e71552e96f84 100644 GIT binary patch literal 5096 zcmeH~O^(|}5QRHC1Kv3sFTL~uf~@3C7PR(JL9e^fswlV7p#x!!R7$@Noui%sbR{cm2E%L16O@4rD)+U<4^ zyN3r^xn|}4LlnREJ?v6CeEL*Xhdc}+9moBC55;(OUFUI(=#+DHsGN5^o~AK}G-n2J zUeh!@D57)D3-(NSP}{bJ_wF5L7zUAM zQyDH3Jq*Weapw8l_s$!~@iNaSQmnamBE%WQ=b3Z9T;_{JSm`3AN!a7_g+ZLhFL&Vc zcLs5urf2f#7U!mqk5`|525}xO`c|@Su3MK!265hs@x03*#;f-G=fPV9l$1_&&7DUC z6)=>P&TZQ@O?x^86)=?VpYKesYn$P`Y-SXmh9MIzySL^hw@WmRKU*DKfy_?+E*XvPIJQxE%N0t zD_(GO@ZqoX{2n}hk&hSuaRq6-@}1(w6-r7&*YW9)!cpxyDBqs%ok`!bUvSB8WC?IH z@7x!BN=z2_92W8P`$$71Oyey`;IRn4l-D#VHT(x&$b-UqeLOPb&Aa$&127cl!E~-Y zgofH*-0XE4?^xFYgat5^lo>EN<+-N$C z=3ANm#CmM?5=NzQte!70=kW>TJgTe~TlS0Ep2*0oN_@qO6!TZiiZ^>1KbMl8DQFg} zO1=On>~HlapIoq*FEAg^crsSed-blu-a^G$eD%Wn_zI&c`Br(0e{J6Nq5Sn31MOPQ zo8vr{_v&0k&l3`goyR<`T09~fo{DzW=cPtp>iH5>RBF$}ah{?#u||R3f*a3y8`=hO zzhOKUnftv@M{QmDzt{7;9FF9k<93QC)t<<7;;Zw!&i&zhU!C8}xu3Lz&5B`3tpt~9 z9Vii72R7$-o%>k>Vp`7c_Fc1sDYuu5wlue6xkX4gEk9BV0`~7r=YEStEW4}o*s`~o zuH2TCJC7`4cgij2vGvkHju%@TYc0X6PZwb4>D;f>w%k@mTUINwT?edxb$;g`5J~fb z0qo=PqAb7Fu_SfLTUoo7)4XngoyYVo**t%B7yNDp0(PE;2@7E3ZSy_!fd3@lQ~Ddx Crozhr literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp index 7f9451a61748ce539f71e7a97027758cb4e9cfd6..92473af5aecf509de8a68c530a59e71552e96f84 100644 GIT binary patch literal 5096 zcmeH~O^(|}5QRHC1Kv3sFTL~uf~@3C7PR(JL9e^fswlV7p#x!!R7$@Noui%sbR{cm2E%L16O@4rD)+U<4^ zyN3r^xn|}4LlnREJ?v6CeEL*Xhdc}+9moBC55;(OUFUI(=#+DHsGN5^o~AK}G-n2J zUeh!@D57)D3-(NSP}{bJ_wF5L7zUAM zQyDH3Jq*Weapw8l_s$!~@iNaSQmnamBE%WQ=b3Z9T;_{JSm`3AN!a7_g+ZLhFL&Vc zcLs5urf2f#7U!mqk5`|525}xO`c|@Su3MK!265hs@x03*#;f-G=fPV9l$1_&&7DUC z6)=>P&TZQ@O?x^86)=?VpYKesYn$P`Y-SXmh9MIzySL^hw@WmRKU*DKfy_?+E*XvPIJQxE%N0t zD_(GO@ZqoX{2n}hk&hSuaRq6-@}1(w6-r7&*YW9)!cpxyDBqs%ok`!bUvSB8WC?IH z@7x!BN=z2_92W8P`$$71Oyey`;IRn4l-D#VHT(x&$b-UqeLOPb&Aa$&127cl!E~-Y zgofH*-0XE4?^xFYgat5^lo>EN<+-N$C z=3ANm#CmM?5=NzQte!70=kW>TJgTe~TlS0Ep2*0oN_@qO6!TZiiZ^>1KbMl8DQFg} zO1=On>~HlapIoq*FEAg^crsSed-blu-a^G$eD%Wn_zI&c`Br(0e{J6Nq5Sn31MOPQ zo8vr{_v&0k&l3`goyR<`T09~fo{DzW=cPtp>iH5>RBF$}ah{?#u||R3f*a3y8`=hO zzhOKUnftv@M{QmDzt{7;9FF9k<93QC)t<<7;;Zw!&i&zhU!C8}xu3Lz&5B`3tpt~9 z9Vii72R7$-o%>k>Vp`7c_Fc1sDYuu5wlue6xkX4gEk9BV0`~7r=YEStEW4}o*s`~o zuH2TCJC7`4cgij2vGvkHju%@TYc0X6PZwb4>D;f>w%k@mTUINwT?edxb$;g`5J~fb z0qo=PqAb7Fu_SfLTUoo7)4XngoyYVo**t%B7yNDp0(PE;2@7E3ZSy_!fd3@lQ~Ddx Crozhr literal 2878 zcmeH{$!fw-7=;t(saE6c6Li^CmtAz<7w9AV1TF+Y#Cb*>7pFJD14q#iX%{a1;EH_7 z%{9lL^Y#6iwmd!}mi1=7IcEKsWm^f)znkmMX&LEWuwVg=Mgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnru-8F&%?8`;7Q5XJ z`~4n=!vV+R5$43_dS>vPfk&DF`vSKq>}pbRtHQXDkUY7tKo=3{q5@q^poIej(W z7u3}R?yU>=Iz6{~GiNXCi;wfa!!LUo@eqHXjChz%Mm$0%BOaxb5s%R&1Ueb<6rGHC zn(jrQdll$p#B+2q;(0n5afdEg&X1L;)JB}|5j0b&jSTlnZDi^GlBv{2fzSKzoTWC3 oJmZ?X))Cj7)JB=lliH~GIejFS8<$NB{r; diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp index ab499452d5b5be9a7961c781ee194c106851fb80..39266b1c8310b8d3affdd124419b70eb05f8b6c3 100644 GIT binary patch literal 6968 zcmeI%Ar8YZ5JXX@2MDgz3ls)L#pOA54`it*3d+bS{&*|>$Tskh)$_2tx7VYMZ_WA4 zUVeLO_i=wq{+X{mE^>T(ueOeTFS0I~4ATpI8N+$t9rOX5MEdB%0-V|(eOQ1~`=bvF zaB6?_VF6C28k literal 3382 zcmZ?rHRELf12Yx|1`Qy~0E!tIIKbi>K=~tl5X`^`6awN|vu6E&|Ni}d5CDpd;?Xb| zO#>q<4S>rAq6sFF00RRPBME?MR6X9%8Vw)3!NWKjKBM7-90H^10XZ}<*`wiu879ag Wqv3-b8klT)gb#`B4Wb(|5QP9IY7-a$ diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp index 0ec3a587f96242098e376f169d980802b9a08382..4a949079729b2ca101748f5cf5cfbbeacc42d935 100644 GIT binary patch literal 1992 zcmZ?rJ;BZZ25vx71BkhRcmWVIGH?J%28Je}ybw18vjF)Ztf8U7@E-_w@7@hk!oUaz z$ZTe2xG>{jVE=D1S24=T?2m2Y=&>5(;PB2{f9MoyDL!6Fq zIL3BXd=!%(`>4J88+lgc3|!3Tw!l{{G*uoLhro=u>tYvsIxDNE#!TC<-m|9`->h`Or~s_t{2@7!PNJKEhe smB6WWyt295?rc1t<&4lyjx-vzgJ>iMJ>w);;wZ%JKl*lOoM8+@EMdTi@T)Jryo~XjZkdmSnbsKs2)fR-^43dqqJxR>P~%ySyKH-G z<-1;cm4TbRPrm*7o7sDM{UC4?%rMuk6SZ@Cdb%;E&M=z*arH1~q_crJ!`u(CgaIQ$ z*4$-`r*z9YN|Ggxa zO)$e;yN+sSV@{pfQ#;N`XJgGd!`u(CgaISMjWw4r(>gx`(A#% z(0le9Wj2zY>qHT81WG42VFbjn$?BRxI%B|CXAj^ygrQ>`%dU+ovR}ovqQhtQV3kft z8`egcFs0f!Z=oYK6woY<(av>RztXbG%r2p&^Bf!4GS)rqgU%km(x=Oi!{C^JdsMZvhCKtAi45 z+sSxZC$k)w*?Va}$_Cb?huwqD(8(OS3^Uu!b*iIM$mg_W1a#M&F$Rov_5kFg%E8_> zSH`xYgYF)ziY?~Ouw>1Zv1z`Ajq@fZf}E>^5^meccv>g39GKaA={&~<)})8sgU-;& z9J&ls)XjCO6LZQDD4)}o5fI0wq;`xkV63wTARko@2t&uXt^c_)wiO+8_h40QF?WWI z^JdsMZvhCKtAi45+sSxZC$k)w+3T=}oxP{`y$IYcLn-toCyy;^r*{BM7y)tMYHPD zs~G8M46TJxRSbQchHK6lC1<1YG%~ZBQT(U(y|>P^1)*8aV@u0yixChNt$OV;2BcUO zn*qHwS1~)+T*XL7V`wdms$%HlG+cAeC^;LAr;(Z6jN(7N@4a=VEeOqW9$S=I?*N!E z0^-1>dhO~MkYbgN0jxQl?Mk(ZVHK24ba9o1ZiH7c($QC23s}X_$7#6coKbQ%8c!qh zf8O_AH?}=>Q0?QRx;XGyy_FW~qhhEuoshtyu4PeOSB!MRZ`au@>KX-oI~oc#3b)b; zlc^ct;|YeRuombtf!X5I7n9iZuGe@17($%7pS-hKZ*s8v-k++m>2EDC$Nb`}QD*G( zRA#Lublw+(f=)XJRcv80%m94w|J0aLtp$R~ zYX>z;dPEV-%dL)Hrw#mbozy#w{~>e8+w8q^HhYOZ_Qr_YSNOlNz2JSwx+LSm{Mpr8{H7+s#S(2Y#Oyr}W$tKqkCHmh=NSilNZI#=TflVJwL ycs^Ea!SEE;0>MgaXa!2kXNb8mt1yruD!Ml{~xH+#Kybo4LTqS)8~ literal 6518 zcmeH}QEI|a5Jg`!(P&I)`_~u&Z0)^5t z7b0?!myg4pA#d-W&jESOLwJe*9^>_pg^-03{3G6fs_s{W=|)(u*V4AFY&IL|x=yy+ zt?YI?>HA*x`@I|v2RR;(ayp&ld_K$Na*^xxD!1EB;v4*O2i}3d-2v=|?>~)7x|ea9 z#3mfDDF-a)fE66D83%060V_FR3l7+l16FasRvfUJ1E#cqB@aVlon@sN-p5KOV61cs z#!7QAR$73u(is>lorAH`5{#8Dz*y-LjFnbktaJs&N^3C7%MhRG8SAV&wY|905Pqwt zW>Fi}R1{iGKbV?+Fg5*PYWl&{^nza#7A_MLwO}zomk+*n7i^wGY%jb*Cdc@*npY5hs@85{oXQ`&o1l{Qf2g96x0jj>FeE;lA$3=%++f#DJ_1A`DZ1cL>D#GM;ANkt5w-@PXljp}*# zel!e*VHl8_d4TE}jvhKpDjH2Y@816>wa@{oA8z3`8V0~PB{lN^)ibPJvxZbeue387 ur=$54)S#kQdLzpoQZo-wJ;OB80a^5Tc|>@yA6qXPiYlwkJ& literal 2438 zcmeH}O$vfg6op@Ey7`=*eJ}^m=AWc(bS%y5%Q4|HrvP4x?sOuU{ z)1YlzbX|wO?=cJm#&N_nP2eAF*$iwC{C5v5yW#y2EAy&Q=p2R4Rp>m0ZmrO56uPZK z=PPu9LKiA@kwUjq==KVo#uC$g%cpNO(s?Coqz;`%>e6YXT=_OrW?(b5eL7!*bo4_y L9erMfem?t8$CpQ( diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp index f03106d4e1e315ae92e55833f27cc9b4b64915be..7330949f3a68d659a15086efc9eb5b9008aab8f5 100644 GIT binary patch literal 3592 zcmZ?r<=|rg12Z700mOnp>;lA$3=%++f#DJ_1A`DZ1cL>D#GM;AKfilVJOZj8)iW9f z??=&z=%K^JXE>lrpn8T;J%|5~hQVkUkee6Qu31A;o&&09pp%~ebh3wD{u#Ar i&6?3T1?Hb=)25M>=YZ-*^^AtW`_Xjpj_fdCU;qHnlwkJ& literal 2438 zcmeH{;R(Vp5QVQ=wY6HPQ#gSGh=1M32^^twl~M>H1Og!hLdXiwG)~}8;SL@g@8EuX zyu17J-BPJrO?1uOkoCx_s44y{&oA9q*<1%Sjw7aN!aUDdmIXoxNGYL|g4P$PBhkSHlf~vgl;1FGyq{NRU%oebGtW>136;6i_i5`6xjLC^8@<&@n)J M(MXVYuptHp0M0U*SO5S3 diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp index 421bd808135627399f73e238aff6c41893e98f80..8ced93149769b6cbf5687aae8d42c4fc17fb5ce5 100644 GIT binary patch literal 4136 zcmd6q%Wl&^6o$>31&9UW5&8tISh459SaemXyCRicQCWZxhz$r3FF@L+4m402(&pw{ zd`}bj#)+jlEfPA;hU0&ZXQuQ0b?rH}`tZ@lZKsO+MUWMi&cvZy zKmft3y6t`canNeDzN{K2f|+`<>e!Q}Z&m}=b=!42?V}^rMrU!m-3GKgT-RO9=X2AR zX_d{`#Nyg`-f>;&(d~9;vl5jg!kkRMl9^&q&DBfF8Hn^aJ3Gs>EGI~r>DlMi$gEf% zW}?^YNsse>U+Zz+KbIa8-XA8CDql^1ogI(I(!=-tAmlKK;A}d9884?y$IMozsskcD z_)QaKaIw;(D2ibn13ClJfWzcEs@^K`^P`+dVl^6+VkWq{q+GQ*G^oNRR%nU%JANV-V>v8Vpp0 z&teei5qO@i@Usj=dc@PIuJDTjM0ylirmcMt>2b;XLs|PEmdAfl`xM@qVgBp?1I;J^ AcmMzZ literal 2518 zcmeH{%WA?<5QfL9jn-bQwf17wy6Y2k)m2^hU3?8+z@=}XK7g*Z%MdW2C@Mx2yx<%B zJ;}%+bmFd*7W`ns@Fk0L{u%QAVaLhiHA3{Fx{RtfRUwLb{!_hACAgGyUr?!3Lb+T< zrBXq)T1Bl^L%m){qtQUK*+i?=Lc85Yr_({V+l6VGuq+F`UJtfyqu=jiFc@Gs9AY#Y zVLTpVGMQjHonkhd!EqeS=W{F;3oMsQtX3~=f2sM8$ln89%eet8GN zfe;k}Au1XH6p4(>D?#3H{k4GojV85+eMWP;hyA_gZV&qh0sBV*`>eq8c^^5(^|^rS z8o9&y1jZRAI^+XmE~uQnKlZnWE2EOU`&l$3V1FWD9}%!W6|j#9*q;g5UkE(!i&?ko z_$pG#pUgQa;QOWp?Dg8}hP_zBEc+(`d$}p>p9P-R;rg0?m2+Ic_e}`cp9|QFaV6P{ Vai!VoG3kc=fqD7j)$I@F`~~@>p+*1z diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp index b3d5971c66407ad5d14d988bb73ec19fa0850478..0174ac3c4c9e1c1a90887dea8ef5503c78270060 100644 GIT binary patch literal 4280 zcmeH|Pj1sd7{$$+1&9?#-~=3iJ$nwq2{=Sn9HHH_s|4Z#HED3vhPFx5`0tGE@&DN7 z&5S*Xn#8h~6kFp_)&BhH&HKJL{qXVIYfU`wvA@In3hyVpFSNJVHSG)j{^q58#V@d3 z|29I8^jRP!AGjW|Y|peh768TL=Qs!>KZvLw5*m2KcU|f@#I`-la!t$GnD%C)c$5Vn z2SJQa#8-^^j8aDULWPi!kstkeuJbT7FGKU#C+uKk9)EuS(US*R*EM$JclGCXVaz)g z0Fby(u;b^ts*0k>vMgeZ5aK${<9fYZE*Fc1VHmTkt6#dVc$5WiiO0oF;#0<0nj~07 zkymAjyF$M_$@{oTSd@wfd|3%zzdTjn$K}K8r&xJjl(PPT9@Db0pvU(mFZC3S9>IUT z<^DAKP17<>u3yv_<v`TPvZ`(!fd z$%BL*>^<)X#mn<phk|aTvWhjaQRaG&Y%`l(Op=la)UB_avz;e07YPG_8 zy~bv9KQvbKUyK`Qfge@7JUI9y4>95$X{tkI$d=oxJp2d8~x6eO!JGWOk-!kv>_$%KC?s>D3^DXl}kKg$I0Hi;m A8vpw zdK|tJHyAKtXT{SBMgK|ECnO1(M*j45ejkiZiM~ zC$gBO?GW9#tNVGLeVl8}c>x%1MTt%%E|XUiio{r0DGNcvoKzNVrBBVBy?IcpR*f5- ztWJ#nkvQ#cku8*JURd4W!o1HA0;N(@gX@l5i_9}hDBzuOvx!)i;IQ06k+m09?Zq~J zhP{K;gh-J^MJfoEgbFIBY3Pj!b6xdMFJ@V1spGY@WSBw_HDOQ*T1VV7QIwrR@s?fS zjzz;l;JQPRSN(FQ^X*_|Wn~$^W%f!%P7p{Pr;X*>iLk-lgawUOMKTW(-V_i2ajj0j z_ZzFe^x|2!yVhl~uXWdqNSUFfbQzU#`AF2mcU(wAi2vck&Bl7AHr6+4irFTjm)r!C zE)7Qzj5dKJ&3GXN;y|N55^97&;IeM<~ltQVg=vCR3B36$>#anhYxTEvC660gYkL0loXa=d~Na zUP6?>_}itb7IUSbuk13RUO@HTdPGf86gM8!7!$!YGa;R`)S2EVJah0;&&8) zBE)%dJ-os*9A2R?2y93v!D|wr`A)^CaKSWN2G)<7E?A&M<4OMj19n|#cy;?~JRXh4 wBXuHG9Mau~gP=t)gsYpx zt49WRJB=1Mi-cm$7goQ9Pgrs(ER?3H@;p}vK~+_$u4}~@)ijOTwpG`4>ib^9FlZb{ zP1B@#p0(WFV(Y;+13x_j_I#Uv>OkTKJ2$Ys;RKl*?A_qt2DSs8pm2lI4UTSL``igm NZg6&ki`#cU^bMDc8k7J4 diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARTRAY.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARTRAY.bmp index ae0c6e04a0dd87f92dc884c39e48e1baf6677ab0..46ec94945d0860ca620bf6651a3eb49c5b85d951 100644 GIT binary patch literal 8024 zcmeHL%T6Ol6s;`42HO)Jj*WRXc7&5*Y-A=xfSef#fs~OzY|tpmHi{I@Virjj`J(*h zUG@35u)fehA+zB;PZ7ZuR z8W#k&hj1r@1&uML(P%bsbKuNdI0mbU&SjI=dSks-uj3+WHS!u~r3k1L>Ed8OZSfKu zA6}(u!6u1IJhG`&<7sGKTvPo?HmRg%XJuu~)UPai)#_-AF|E0H)oS4?0@7NAQU}l$ zW4?YSHa0fa6>D~WnJJ}OiYGozqCe3VSN7cHqAkX30vq`7%5jk>O4P2x|x`MYnnFvmmuGzhx&#uF1Qqy%|L5GLVZQ}<$zcPG|N zwKb)1TwTwrXVQ~5TWHIdFW&%dd}NAw8>$UxScAP@?-kJEAOOR2)hT$!mUY$m_!XO9 z!l{0rq>h3u#p8CB0#a^q&BU$avP^Mb)9XTTK(xh}u0^NYaTF|Yid?DE=^h*$Jo5?r zzp$e%#-O1Ku~UdlA>*oQp%NM4`jsa42u6 zc3UP6?d`U}3zmqEs0Uo}((5P@T%{~$OYnp$NJ{XtbfQgs^zus-00nI^<|rTw^eE<( zGb+4ZpT6dMszSa4XiJtIANP-mK9J*XB|1zJ?)OKdQHSp){0Jb(?0X3k8ONM1nm4H> za;jH~QFX?UWoypZG4e>F7Lk#47S*)j1RE^!>b2GQ7AEBv<)#*BOO|~L4D4OxTr21h z3?`GwPIrgUvB-iNJH#G`knNT_yHz=>=*;ivD@%c{H7~2l8bFFI9ITXr5H=K`Em?Ll zJON~|ljW3w;mMGKPIxL@TwL^eySun{@rIY7hZU$S8OZ7Mxe$%fQj=#^E7&BdxMRVS z|GmKssjr*x472>pZOn7uj7KG8D@!EU+eKTl?E7cp^77KX^Q$>@0By;#)6+K!keI)L z&Ja|_C3Ff*r&IUlujbGJwB^s=&&K03+yrOOLG5)0gxLFc@A+P@knaH6^4lMib38U3 za{PR9el7xuI6x*hH#hR$uZCO)(3Zdc{$U~BYSd0#+}+*v@gx7`@UqqPT!}RkZ7JUs zZONwBS6A1#udXr098wHgXuA6O!-wegPAV^X9q`KM$3eOO88CAxUPR_+F%8j$9^F)2 z(dP4Os-M=SWy98?ygd@K0XaL`^6sCzTeS2RgUk`9a2rQ;@%Z>S8jo>#jC4I3Nduy>s$R3QRV3wPeK|oukXAk!d n5BE9#K-@#)z=$mFpPruHRw#76!So!kiB9f8G8AtHWM3 literal 3766 zcmeI#K?;IU5XSMpX=zys2@);@7ea1bbbuD_x`2o1T%DlnO{3l6gXsNW;4#D7%o}*` z-5>9Q)h&Umubv(kkBDr|zr23Vzv0QHu&_9eElpF)^W4g^w5qDCu4`+W#@e>EuIsGt zdmDzq#&NW1nrxnDTlR(sJqR=K(=*`57laOk4*Ww0A}QENfxl&hAd!Nt6zrtH-=RW~ YNx@zU4pQKM2q8F1!AS}VDg6!j0T2u{wg3PC diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TOOLBARBACKGROUND.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TOOLBARBACKGROUND.bmp index da6198c5d8666f5814f317e8e2db808d1fe35d50..a1e5916dff400b8cf235e4000a01da77e7348f56 100644 GIT binary patch literal 1964 zcmcJ|*$IO{6ougvvYE{+o-~lB)GYtQA&URBt@R3$cq%|Ns*2e348$sYlA5O literal 2902 zcmeI!O=`n15QgD5X_}@@oAl=rJwXp(Z?efY%O1-o>H%zw@ejsej19)V!&lW=g;2Vh zMZph@5Hpe%Vi59(uwXhGEb+j&i5YG2g-51OKE47QdU` zjK7A59(CW>srnj7$d3Y)l(Im504h|v|~gK2OF@&Oayf>GPKl1=&90^*vOCzCtsFH+U@+%<#Ot8NOI+ z-M2~QS)6!16w9d_nHjj`ES1aU6^dmjm7Rer%(b<(;PBwUQY?>SkKqb)eSJMRIy|)1 z>uV9qJeI~z;R^HH#zt^_bYyEcH@0ziCt{h$crJ;Zz!m1^=4Nnmd>k^XRoiexHqWt6 z96N?9% zP&q%hb&O@RR?8&TWgE7Q*baB`=g!XRWu+qH*aCABaqQWa46qj+?(!+dihXR=>(3I~ zk^%0r!!1_M&TPBUP>Bq1i!S%_;=*>CO_j*-xz|@$w%cl{M2643!}Hi{w^bs;=hkpf zd!3F-Wcb`Bo`Zh3s}dPLw~etK^m;0h;d6WF>-}J$5*a?X-|wrK>=PM2_u>BD+J^^~ z$ndyJT4vN9+$HDxHqZCGmQrNQJ6yb--ZlYu23LJG6w9ewMlLyX@D6V&mZ4O32CgvS z8A|XDhGKafdkj~Y@Cqe(1_S>fVwuO%*eP6L!XuR66%1mpfqxLO%ws&4#7^J}6W*W% zj}S7eRf8DzD6)Bub>i4DTw%f!l;917iMVd!L^kWNuFv+k!h{zn!4nvGgIJz>4c1{@ zwsF}GSD5esC3pb?Phb#VGl_NChHWFZ!<|L!e+LgBV+ikHCK1P;ZOH(8*5S@0_DlcZ zAIx*a&qoHh?(f3_V!wfZP>Bq17o7esAod&h2bIY1xrqG+{y`-&d@f?Yfqzhm44;eG zZ{QzPBE#n*_8a&ImB{e9i2VlsK_xPLE@HnytX7E(pNrV9VzN(U_*}$(gIKK+86I~| z%Z%ECJLi1gHLkDD{lg3UhkX4*zWyQd2ub^V{ln8d1#>F- j`iF4cM85tZTsM)ge+buO-4{O>3?vd4N1X=Xnt4&V2yq&Kx=s90-DfAc6=Y3Zfv0 zh#(^3*t>((?OKNSPv-pDze?CP#dvEmj{n?sDcPo}2w;I zOa|F(7P(vw`FtLQLIK5M5v5WI<#HL7N(I$w6}4Io^?DtRMgz@e6RlPY?RFcTP6yp? z7rkB&{eB;V!2rYI5Tnrugi zFNE_;VPDC!z821(wk@2$rEi4qzm+$)^ZB-UmPdd0yMFeEO)=-rzY5E2j_D;~e-QSv zuvdirQP`h^y(;WAVQ&cgv#`Gidt2DM!rmA5p|FpIy*PK=R*s6ZUsu{}A@6uzw2sm$03mEB2YNUq1Igr1jTe diff --git a/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp b/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp index 9b41ce88d1dcdddbfa6668e2936965219d9f9d5e..3d3e76db839578b31e757887e93a7b34f25716f2 100644 GIT binary patch literal 14754 zcmb`NU2K$98pnb1QM&T|(L#aFbUJOPg#!H;+ERv@c7}!}1Q9`&1=7@_64nqxwY6xn zy79uS7bZqyG$yi}V7$TjbE6V3|r=SB2)-n_r%&-)MgKhC-E<6Ot{b@D+m zm%V$=&A}yHcY!W6l<7Fc!lKWdv$>%Sj^}*M!o_T0)7E9pMZ#iXNr3X;m~qZCkNL(E zJ7#lMP9?Z7*ZhJvis5B9K&pZJUZ z1wMIQ!aQLPdJ-3|#}09*7g&S!cMEADE9?{cg`ChQ>=n8NcrhQXA_B1^#vvd4#((3Z zLtk%vwmg9gnxgG`fjq#+W&u6A=g*%%ykNnC&xDBuWo6TPpAvo)KG(Ss%}EQL!VUqA zh@0`jPvTXqjfOlI_`wtX$TeyK9%xK#@G-eyLD{KAixz#iw4%bTUcK5?ZP?&8ZmbqI zy2{EbKUT4{!fDP;@fy@MXb6A!L5vNIAGb|fD0{ReVe8Wf9Fm2EQ9>&EqAvW-)2BHFS zNiJTzcwpJGWp`N1c(8tDW#wI{(&r5uX83HV+TgfG*FGs5#0za}1#Fu(_#blNnAn*n z@TP9ayH>?Ny=vvEn;W&Z@u;e*5{LC}-MV#N19aec{rdHun{j5|%9Sf`%0@=E+VVEh zhCIe^;zUeL7vn;`k+1NE|5l+(zK!AkmMvR67t@3F*Q{CNbA;SkvwDr^1s^yNE3V;M z*?2*=&<33&0{x0OQ70i6%N6p8I;N+^1$sqFwytm9yv5taKDN=oc&u8r%I(^<%f0;a z%kI#jLvEcoG6!wolIL?>w#b|9LQEissSjci<}X~(3eC_C4T(>?&?{R%MWaz~lbT^2 zG(n5LzCQQ*>#wU#Id|pC70-!to=aYr{I$1bi{68ObprKG3})j(-BUm03jH-HWMi?| zWUMxJmoC|C*1hx2JDvkv;Iv}J3eV5DpkYl-jnnn6uC8ucw#XUk8_gevORll8aay)q zBvRw^g=Mzxd6X#Djdbcs=^)qy8LoYNR9aX>M)?S7nQQq34k=)M}}G zp{ADz)DgN7OXidFJzD=#Yg?OZXlU@Z$pO})r;(%Ufp{H0eAsn&cNc0oR$J@p>+4;c zu9b~3+1f2|kEdT)9Z}O^9a(=NcGMZQ9}${_r215@qod>2_U+pXe9(s&z^S@=qmK!> z>h&OBmFscEwWX!Sajk6ZlP$hqV3Yek{ghfM?k{kG8{?d(u89-*?zO4jSpC%Q-MjB# zTe75&Kvc%c>Vd}bUCw{6?zy1Kf!Z#*MADS>(>Z?QdF-{n3@kFhurN3?-IIZPd< zR4*f`y{SnwCx75nuQjP70~`{Ggxk4ur|aqInNplC>DoSl{y@)-3dDys==0or&|-cb zaIrX_&4AFjs^_ojd;L z9_Wpq=wBQk4fz*bLO!MsbxsdNSK>?#VLK|s1+-#Katd(F7@Q*ly`H$>kMY3IQkrPE z@Cx~a`Lk3rh%dJ2g>b@8a*14o8z2t6GsZbMkaPG!T+qXKgn7ccrC!B+EM{m5C+uOD zo(M1eWj**A_{=%xFc&|#78~e+O?(aWL?27Oj1TXY(_By7u!nEN4qmK73_~ymm=kia z{J`e@@X)lvYc@{C3m@TTfTJDr&Uw~19YQUz{V=bPlWApoVc!t0X=A2=>0q|*;h`@? z_l(UlU^X7)eHK%thv(oDt{M7f{@VLoT7)(@p7S*e7qbz@;bC&bc>ZC0AX$P7JWL0C zC-*EzsR?Ss>Ljckjv1%6m}7Yy=I)%FintgLIN(#rfpx;ZQmUuWYr?()udt>|>7*$$ zuYgM!7vq6%*4yZvtWPfu`>plbu;0>?>3i^^SL26q3VV#Lsnd7GDAWW!j0d*x7Y^K8 zB0@}P5E4RD9vm|k7oq~(xOc$`KZv2l&f*rvEX)_USbor_(8GA(C${SZ)@%`4g$`j? z9^9+jg`L7Sp;3S{_x9p@G=AbQ`WN`*V^pjOdXgLHfgR#dFR%vd^W7vZWQBb~zmOC9 zguMdaZQ#Xxw2BDCl^Ek6e!{0XUK+aVy8?XSf~IK8_jT^O_}DCo3y1Yw5|E$ z|83IN(dLgkJ3BqU8P5CtJpEqcnPx_|+VVEhhCIe^{3j-+i*X^p$ya#8f2+_X-^TF& z;K4&)6ZAj_V#RMV@&@eOzSGABK5!*g2M--|-MUsbUXU%cLFb4-zamc5Nyx==g?yrp z>1lC+ULo0gt{*sXP+Sgr`|v^!caBGiE98hWQ)An zF2n?KnED_V1gZlJU;&TV>dN5r8ec< z^z^jn#Bbc5ZgG(=hosA~W5;+da$C0OJ@{8AP~XI0HZIgX^+T@EUz0-i#EBD=Cyt-+ z&soqNE}wq-sr&7>-#iDnz{!5kdoG&8T%LoRJbBWcK7D#xw#XUk8_gevOYZ5jXQyS$ z9XWE?=L@;;%P+rp9zXy5vl|>7^gQ@YPt3?8=1^}(jvR3Vrw82GbLWf;`Acn+2h`I2 z=+dZp^!x1j3m0w=4Gwv&4;(n)dkXpa!w*0BxcvV6@5+_``1p`RoTHAIOMK1@opBd0 zUYwAv2hoKZBVXuovDRAd+Ws) zU-W$N6@7>SoN~FWuU|OO3&~esdwLf_s-bpm^*v+tQ!~@@ERRGderk`efW_da79C&{l4|qTiiFEk)4!4 zJ(IWO0Be-$yYv})jKzsKq7D4XVd^k7FgP%B`QMi((VYA_`}EUpNNZ9@aN`{g=gysT zue|b#d;k6Srxd44y0%ZCKhSfd0`XxD`aJg@w3wdBbbd;o*zai5ndob+5hl8XVkv@4fe}Vs=i~WQ8t)JV9qPp@&&~h=*~} zq36VB#?c18+$+$LJcds~K;v$q_t|Hk9o2eQKlC4)>{;Kn}46I>C!vphf`elV8LHE$amIFdpcQ zpXgs49}W2zTtYsk4|PtyqbqSHhp-(L;sRQ+COHK-W(>{|fnHBs@W*)IXDLlITzG|i z!u(mP8N?S`^g=k{C%Hr}!VM4y-WlT@9LPERATH=(Jikz{bi~;6^94tSu zc|SZft?-(SlkvhwxEbJR$Gmf%^-YIR3v55kE97KanO@j8glpQEX<#~-t$TRr3(-Ae zvkaJx2YH{xRO#V4xP)tlzL~%FK9?4u4UXr0&BDcOgmHM795J4M7#~QM-~tcR0pH0z z%Ta2A+ORqaYlmaTsV(MM9*4O*C#NDV#sd!c6mnplu&wZK@a1BE&PQ8_m+qd z6B>ks(3A(qjKzhh05|SkaKaB_XtA@ng)s~B1um8!^eOZ(9{7pvI)OD?gjS(L*p&zO z>ULqLuuW(b;LN?f_#Ta)_>2ApKKU3GYl5ES26|wJIMfTQ!TNkRNefwFpU^Mlgg#-f zz;_#XF(0iW0&ykA_=lhHDUO$h?)t6(U$~$t+VXv!`z}5<3+U0UXBfj}Wo4fU6J-k* zPV0S2_)+*==SDOqEp!U}9zrAHW_<9Icol1-A6A{pvoMsKvrVuBMaZK#U z6ZoPdIfov`qf_=TEMLBSl6?Z~Q(zwo|D)Hll>+$8|IOJ?AWoCIW>_|Q1oR=!_=b>@T|8%%Mf?9(OUMy z+|jj9$_DX5+gbtJrVajwTsS6nrU|^M8}iQYBdc6rd6Rt`JlBXxkEr%7)YNSG-~NhC z)&7{hQSh7L+~DVF56J&*ADMg`!+s*s z**1$KbI2#2$pCD~7J0K>hzaB{^+7Di56fS;Sgz0m$S>kUkLZ=HpITbBxhC19W>{xa z^~~NNe!G7C_19`s&VB#=_ns4Z8>tZ&@othX?77hXhugA6@4-Lnf%>Lr%*KVfr+&y4 z`fF0i?%1(oa>w=^exHfy!f)prH*R`i9qY&pqcJd+afv zC+uO`p=aUte+=0eldatX_jvl9)e$uv)=}8&s55FmA~Xrw%e)|`=V7;c^=#6fccYKr zFC|X#c%83ba+O|4zLM+hiYw3SxmGsz$rj%)u*rR&eoCzr_ZPUpjd9LfoXB^tjrK7< zrDtGwGU<$ePRR31G~#(KyjY)i@`Jd*dGFr6PJ92jZ#*MADS>(>Z^;4HASdW0^c3rL z^cg-|oQNaZz@HqZ4pVLIZ6nA3a(t5Kh2&4C_Q`f=P3j14yu(3zru;K+J=ZTL${`j|w**RU46}klS1f9`@9%k_&9>zt7o)e!LM;rKZuRurg7(NLB zjk|?j{m*7p>s>u{>ePh#+%!0O@~;zmo;faUUecWXLPp>oM4X8YJrups#J;}}59|Lr z^j!FCe28H&pNPh&bME`?0-UJPJ|QRc3*;v{qy=h*{=|HE5N~3G-lmDgrwXjvzqhw(sf{6zoa_-M$#;1cp-9(?H0E}HfMdqs91-aC#07th2X;$oqT#|TYL`=AHAb fZ#slpVEbWSAt%$y^uoR&T+_x(1Jl85-NWO*sIg$( literal 4614 zcmeH}v2KGf5Qgc}DHSwbI(F#LC+L(c-SZB8JU@(wJ^~vEkdQzK1VZlp=p0#ARn;~_ zBiYiA34||q=krfKF89Y|8}D>{BR!E$q`TyWj!E+MxJ~i!k1LR6*+ZJ9udIV_sPz1S zbW%KUj%%(wld~*~f-va%vkS}QOw*(w<~YS=a)x10kPip3BL_U&b)CxdTys8Mb7R)E z-fi0|2!mKo`RSUPc{WX>APnk{Gw$i{{dG2ZRaGengRVQRqy9aU#~iObEnaZnYhIjV z1#Y1NypMwWey{y#b2gLk@QGhIPCl_02faY7&F^(i>|4QpZ}FV+(>=Opo}BCTePqSA zi{Jachpc>q`(E?n94l}O72tgy-1mlG2-@F*K8N~_D9chp%yaSyGoHGxCFB#A$)W$y z67u1o7l;MF7k%H$qA2Ket5c}oi*Xz!BkRccSq^v5T6Xs3 zp5)>ES|87P{?GcazKgeS=x>Kt_}?M@+bq-z=Y+Bqk^Wt=;;+T${-XGgb1uAG?s=IC z-YNdH?PYR__q$RJgYphd>Hl6~y|7W( zB-|%#4!||fC_`Czg`7+$(@2k3tcY=m^DrG~hxXP9^g+MX!Zu;Mu(OET;*onis}kU~ zL4XtEKvTvBALHWn3Altj%nud|VnBOv*ecL>LTD6r2}z-)2+q03G>(KC0Z!=0SVBG) zuaHZe2fX1yJ?hgAI_wbWqgmJ^>=zCSq>;`dI&?fB>=oeEAi$maAs;-1?(m6oF@Nwp zo#uO=&Gu!-L`Gpgc?`9b*sO3_u92iWxijz zviywd5I?jbR>T-S%rE*t|5BU+E@)+%;1TLj7k$wqt@g*nVdlR3?sGLYHJ-y(^>3Kt zw9RebzTHt~?b@|7s&heg(bD*!4|9M%&>!D;ZDL%wZ<;V)>IB+ItzNzQ@yg1|>8;gU zJ&&zhx4G)7D(NyG@PZS3I8sM-ht&r95HI3Q+vrZLOq-Pf7r1es=lBFo@M^o_pIyIx z{f+AC>QWzY*s^7d+q`+R*8m+jud3SOC|BYmZX4EbxS=*OYKu72Ci4p2O&jmw7#IA+ zbMiqXFpiYQ_5ywH+_}?hLSOKp|4kb=d5_?oO`A6Pdz3{Vw4n~yYGYDu@t4AG0lm=% zACosiF8CM^5kGu|XYu|%A+5Hq(I#NLw7pq8jvYJZE?v6hIy*bvh7B7$C-}_iQ{{P6 zXU7iD=bGB;5y(l60y&U;gD1Rain@ec;7UHh_tfiEd$$sa#2goS7A|N4hYvpZKutLJ z+H0@5{{DW?hi8;wZo#Ek_h+@$Cy<+n6CS_|=9!8mxWJwGW*ZtB3ib8%uC}(;kJY#k zmv!sbc@A*l_x9UwyId~kxiHt@QeRi^RDVWo8 zCJT)XjV_8J?*aV6*x@2idp?bgjqds9pZ9#m$H%>Y@k9NocdWJDip^wud%J6DYEta$ya(_?S67#N@WBUt|6Al$d_)d}2i}7F zu3fv_0o7F-7u8l;U~V!_<_CVTc~q`}>C&&+6*|HNFOi2>SNWTyQ+aBjqod>I-o1NW zqx8m$^hKYx7Sz9p5C)(j~^?2;RX7I7e}tSkB{Y52lwvo?&+FsHBYDw(*z${d>A+5UnPXP*xE=Q z#53f(gh1}a`~8Z~#dJD7yMO0S@GP$}@i>AIcGc*EcLpihIq7>OD2hgWA2c#8hf z0SA_5HJs2JU(+A);|RFNGjxChxeP7vA8|+Td2!J- zefnR~FLr5Mh?Vi7KJCyRoXAh~0WbP9a7`R|Mj6VYt8uWH&~_;-G|98}K# z7U9A(<71rA$+R+l#xcC++{%V+aK7Yk2`)?3i}$gd>!sTB&z8w0-j|I#u7|}Wyl-VW zhVA@;+n;a=>(Ul|m=EsMJH{{MG>^|BTo&U%|K?Zb3Ug+$`NVz7gmaqua5Amvr}SHZ zi}46`24W@6ZVmHqn1e0W`e+vR2>XSD0&8?<5gj@n5cUf2Y7pQaU#sz*`6tfB{9$_F3wWS0 zv4{l53kUk|68KxCU&srC!hnzyG6H|&z>D%t0&A%8Azs9tF_*L{#t2?;AvQcGE|fPO z37w-wn~)MR6%`fZ+E@8p_(_;uy=F~8$0^}6JsVRQxS~(1fR=cO_X}c8%#90udf&vj zm?rohk1~!(fCue%tFIC5U)-qH-Wcy2>2#0F_2u*qop(K%jK5c`2}(e8ENysIna-%0wU&(WhQD{igH)*EUgqqc}MZ8ERW-L&x@ z4s?MFe&RX#AQBiyN@IJWOMMR=8}gdK2_D31|Gxd+BY1~*IAViF=tHcAhK_l?)W)RR zIxOrK&>L;=G4nO#f{*bK@xxbm7Vqy9BtiPx(9n?D9rF64$szUm<(FT&+qZAK*I$3# zu@AxfEqu_2GI)wQ_uoIn^)n+x>^&b2aN+mcZ@;-uKmD|%3;QysPM&h7PMw-j zTR8y_laKKX^NBo$PZ#2XztNAm+%9C#oj+d~er(tsKYrYM0Kec1xY#@X$jFHM<(FSP zpI?9d)%zE}96$b`(^%Y-=gt+>R$jOhE`QMF*=L`fIy-t+TAxtt@AvZv@8S*Obo=)I zx!-^P-N)<4AAj_|WqK291Z z<3*dVzWS;Z7ko_I;AnFn9jWuoGtYo8)K*qNYy3jaTgorYX`4sPJJ#B6wK@69E3Y{A z1y7wk>GzoN4g05GfBm)ZKUKrk@Dh25b(OzKI8BG2aYbGe_mm>%$W@x>R}hrX#c z%qz4R3FI)wO&$sJOPQ|W66Rer#J|kz9>xEuH{X17nmt_lKzqDEzwqMt$Rm$r+{ff`U_uhMN z_T`sfcIVHZ_neqN^v!Wp9M3)Zr1u9gz5MsfGs7dp`|i8niIaQv)mPob*;W^g+tZ-Cudg-mV-n#nXhaXHS z*A>7=AAK|>o>!iJ`soRkA;)$J#5gIy1HUqNSo6@I-0$O~qwNKi=^QQ=C({Q0#0p*E z!`~0&hi)Mw{i6dM@J7ABy2E&A$Mk>)u^|qghmLVBp*EBc`4BJGhDe|f#tSce066C! z{z?dN#~b*Lc(VpFe@%~hJaqrxdt^ae(8GROQ0&x>_=Z?nyzm#X#Y1=+otb9<-9vDX zxLPczLw(|b7fasIIsMH0Ex?86lrv7W0cbDeML&S}+c`&gTmQ@Apz{8=2p66iALA5i zW&Dg|c+I($4cp*+$=?!OmZ}%;V>#DLwdbELlS{lW8+Tj}i%EFj%5n_b`2)8<;S$!R zE&8Cpf5tn;FXS|j&mvqFm7erknaI& zC`az`jCBKEtO0Oh91E^Ry1&#K01xV+Gx?16;J_L~e+i*c*d-)|mLfRkUcC?rtYL6k zXl=B3p@DG;^*}#j0uRO!uGOr$^wBKr5m=L1n^~i6z3$LCYdC8;ycz_!$Jc5+#CYKo z=VJaaJ&Xq$qjw}QUO3Qym%!gD{X$+C6b6KxkP-MB2VRtK5{RGiAzs9tF_*L{dKX@B zF-?dI<&8%|=V;L;q=bz2FviQv%Rd)>5@yRQDhfJI37_fNn99HveOd*y#6!Ga*xwJv zg+9H9V_ZxVe2PaIMZ3_f%Fo zmHEEByyA@N5I?jbR>T-S%rE-D2c@?G=dCs-HLkqsb2Wfp@g4SFiegFur}^8yx!{h%$JJI?c^V>ReM>JpwtY zQ6LAB|L}zO%mQ5CNig(7u#$fjjd!d*Hx<0{cGf4>DHzAwKlW zw{*Nu!-e1V>(~9ewdun5CvE%MTw7b)jM~Zxc$j=lE@nQF$MESwT<|ygF_+tgZ0hjg zLi>Ss|6K_lz%Td$E_@#aAHF|f-;UoWpL{a+&6djU-redn7T1|d71UNFU)l{N5_@dgF~Z{4>hfw?Q2TJ6v}yhg>|7>SdK1m z!Q=Ra9M`LT%PZ_%`Z#Hvrp?&cnAd^0;A7$jN1OY6pFrk@X{86b+tw4)LJ*7y|0_>s~?o!c#*!yWpHAiH#W}Ye&S+! zu>ajRx1V`aZJ1YRGZOflhH;Ze!u(REYq*4Y7Y*?*^SVdze@fr>P51Wp`mv%t^PGO+ z#gYA9w6OimY$nUz*|ff&d_rxQCd^NZ594P1tAtP&TN}xPc!qq(+QAxv_xlx}i`tW$ zWxr70N_kGqANuClAstfsCK7)T)02NWIn#cyeOz_PapVU)i{5BL9~K{U2-hRHz|Z2u z+=oBoz&GUYoMLkR;fEjoj(tM*F*Df=-;8Nb_lV2-c>Je3seRW+AAR(?a_*?=91-v< zv0-e?3-YaL;^U+1kPGX8#Rmo5q8_jf+lKz{lbQUwFgc_@GaNz!-@c@rPGu5qOIJ z(E$#4qh4U$VLY^BdccF&5C_jg$2gZz8_I`#h!<-^B+v)rg%>^moO2IDn;>Qtik7wur2XYx&;6LJy-t*$3 zYx?v*C2>3DXk3Vu@u5EL&>oz~PxJvV`ZI7%9C$_<%A%`ru$a(xDK0uM{bF3WZ+t9X zjDvQJ6FS2SpnC}J(Z9vQbYNU@4kbPG%>NeP!hOmaC)zNbLSFO(h@+izgg52re_0$< e&i@wS!ZYJzoY2X%GJeJ}yyo1>hHY@ZZt~5JgFoDiI`UC{v`!2~x35`rIMM<1j9A1Ue8PA%PGGgq-=7XJu`*j44)$ zEqxo<_1p3Hc$Uwv`{&5C59;4ZFQklg7rjy+ML$nw2;Gf25XbQY=?zMf|>%5OX9QFb0B$>R&H9rqyaNsXHa8%w~ z&Y|_*6bRc9e^=e&J-dvHnK#5c*L#i)BgH4K_ZOU9z8&co*5Jls*R?AicOUtG$cN+d zD85kd*^n^)3kU4^_Rf2!PULhRbGjFuYnV=RQ77`MsubkIbK`27MnOmM=p9-?o;wP{=lY%61xqdCnq96&!-N$X)6eQ(X7Qf$n=a<9t&U>&zyUu}MX4{#v diff --git a/reactos/media/themes/lautus.msstyles/lautus.rc b/reactos/media/themes/lautus.msstyles/lautus.rc index 52770aa91d0..f5b60077257 100644 --- a/reactos/media/themes/lautus.msstyles/lautus.rc +++ b/reactos/media/themes/lautus.msstyles/lautus.rc @@ -10,14 +10,16 @@ COMBO COMBODATA {0x0003,0x0003, 0x0000, 0x0003, 0x0006, 0x0001,0x0004,0x0007 1 SIZENAMES {L"Normal Size\0Large Fonts\0Extra Large Fonts\0\0"} 1 MINDEPTH {0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x0000,} -EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal.INI" -LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal.INI" -NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal.INI" +EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal.INI" +LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal.INI" +NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal.INI" THEMES_INI TEXTFILE {L"\r\n"} NORMAL_BALLOONCLOSE_BMP BITMAP "bitmaps/NORMAL_BALLOONCLOSE.bmp" NORMAL_BUTTON_BMP BITMAP "bitmaps/NORMAL_BUTTON.bmp" NORMAL_CHECKBOX13_BMP BITMAP "bitmaps/NORMAL_CHECKBOX13.bmp" +NORMAL_CHECKBOX16_BMP BITMAP "bitmaps/NORMAL_CHECKBOX16.bmp" +NORMAL_CHECKBOX25_BMP BITMAP "bitmaps/NORMAL_CHECKBOX25.bmp" NORMAL_CHEVRON_BMP BITMAP "bitmaps/NORMAL_CHEVRON.bmp" NORMAL_CLOSEBUTTON_BMP BITMAP "bitmaps/NORMAL_CLOSEBUTTON.bmp" NORMAL_CLOSEGLYPH9_BMP BITMAP "bitmaps/NORMAL_CLOSEGLYPH9.bmp" @@ -71,6 +73,7 @@ NORMAL_SCROLLTHUMBVERTICAL_BMP BITMAP "bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp" NORMAL_SEPARATORVERT_BMP BITMAP "bitmaps/NORMAL_SEPARATORVERT.bmp" NORMAL_SEPARATOR_BMP BITMAP "bitmaps/NORMAL_SEPARATOR.bmp" NORMAL_SLIDERTRACK_BMP BITMAP "bitmaps/NORMAL_SLIDERTRACK.bmp" +NORMAL_SLIDERTRACKVERT_BMP BITMAP "bitmaps/NORMAL_SLIDERTRACKVERT.bmp" NORMAL_SMALLCLOSEBUTTON_BMP BITMAP "bitmaps/NORMAL_SMALLCLOSEBUTTON.bmp" NORMAL_SMALLFRAMECAPTIONSIZING_BMP BITMAP "bitmaps/NORMAL_SMALLFRAMECAPTIONSIZING.bmp" NORMAL_SMALLFRAMECAPTION_BMP BITMAP "bitmaps/NORMAL_SMALLFRAMECAPTION.bmp" diff --git a/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI b/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI index fc031b218db8f32d2f210571c6645b08f9631583..493f982ffff256fcabf7265b53a644228555186c 100644 GIT binary patch delta 1464 zcmaJ>ZAepL6uxKL-5eL2^Lx&1YMGUabEUOnxDf1zk)`EuGlzr}h-io*Wc0wk3<&AG?TK4J>_H)sq~&A9}JS zVpZ@EHZ-ST#fcc~vK^uN(|KVb(qw03w9D4VMl8)1Ck*TH=0zLilFHq%4*f+OR=)CbpY7*AJi$g;POY5;wBv44(5$$nUMZ^!l&d&_FdsirXJplv& zc2_U9-XB>B;5`yr-!25AcGnG9iJ(KBnotym+fsaaYv>=4;dZJp=n1Osep&`l?w%)f zviv_GP8!n{qOCawIfg%2soqJ?cV81?`Yg{v)5DqNw)puvspwG%9S@1M8aO)cX%a&& zs%_h_w(gMQ5=2tjvtJRxmJ54R@-ebMlBn7sN8r0@eMzKF4+qfwI-Iukvm&bMZ%uw_IAR(4=FgP}X0)1wVl$3&jSgIid+sh23poY(!*#j&V@5>njfOywet_QUqrt#&clwI*-DLM!c2DTTg55-@|#6vc8yARnrPS9(YNA zcQR|NsR;jv9tb(Oye?F9Gge0E+~wu>BEue|eTmi7k$|w~hIGWsM-LBKv#lk3?C7Q3 zY>UiC+MfxN+ThMf9nUwb(7Gjbbh=rlk-RLkkpe8!OvNa@=3)<<$-{Sa8DbjhLV8|` z-d=%UMN7`4w^`f{z1PY^@kkB}R#Q2GefxOL8JWy<(9T~%`PrA#=s`lsLZ_}~q2>B7 z#I^Is$PD4Zz7tdKiSElzykf)C$>fX0*>r50bYD@ki4!v_x%zueDnae>q5XmvSNiNw zu0NYjaQcRCDnXp-4J7gyZ_Uf~TUMfL%OYsEUC`(6VUgn`A$`})pWc6yZ>scmv5d%^ zLVSH3_$|B**PlvEZz4C>hSH0u84Y6<=&V|Z*n0^}J~_Js0%GG%B}cIK!x zf(Eve?+p)p#88ZE1vZIY&C`eaYX*K+N{VZ^fTA0*BrBGH01(SES)V!{=ujQ?hQW$h?Sz89g%&xSQvFW5~jWmeBx>1y%Vl`@X!KIq9nXPt6 zmi@{Gg=4*dhCytILl@BNe3KAUos*cTsYYWoCBeiHBD3kDGyZ|hSHh&PSY`jb`|i2t zeCIpgJNLY^pRgZXVS@o2LoRz4V_+(nO2+nX?;{|#;7#~&V>9z4)4?2I4l*6sU@N3C ziAf?dZrX4oEv$&uiacuAi=zEa_M~Vpz~Y$9pK7BvxlDrh&s5=Twi5ehH0b@jj7GRo z*(NJv6$l%IXUdAbZyrvK$B|GTHii|%(g2OroA-yT*RP>ItqFt`y^AcJ(w&ed-+kH^ zjO*oe$`Fx?5E^XN#9a;rG**%?Pdy>}ajJR|}O^05NX8nhYy)&P_)Ag1# zvkMKJP>WO%YByr^kc)DsU0KP#A$<>k2ZJxM`2IN$IqrZmGV^-~zmcjH|DT&h$;H)XQb~+<)iO~XK8d&&ZP~*y5+cYs<>OpuTv8gmf1I3p?>b!nXRVC)bKWO*PjSmx;<&#y?t{H)Fyf zPa~iE+h#N^aWt@4TegD1e_0GQid2=8gKk7>V=4tH3NcdG!dombtjkcTaE0+y_cmS_ z%&pn!Fjip@aKyV0I1+mZhW;Ib825sa1e+m;wDo|T_@4*E|9WXW`3y^CIDymE1(KL=6Cj8lcVJdM}l6^@rK8s zHb=z#jw4Ww?n@;kS`Wp^Uyg^k4?qd;Ylo?|H4?)?P!azj7|g)>iF?7xdk@2~Xpr$j zmLIax^KKuOe$`*JV^|}S@J~)IR2XfxJULk8LwAa delta 1946 zcmaJ?e@q*76z?nDQObFqU2{V?p#fG2!KH{e0<3nMn*`ZXry_0{gMf%+b_Yfz2&@4E zYFx*BvEQw!Tg}uo%Z8iZ#gjRkW==xTEQDmsvS@+{!DS<)ByO6BKdv{1^lbU3y?gKT zKHtyxeLwGeUwy}XaETf2!+@A^&Q}ZQcV;4^|MG#Yx<;K_*R1?@=o&F+bRE5+FVbtm z53RWqE5vL@&}5!s&S)aPGeeq)LW;rEp7DE;2iSpPQlr(h<<|gCXVx3)ArnBl+{Nr<1*J9XNgBL^|uVr0Mj1eE96Jlpd;^Y#+ zT#k`mutrki7moD?!xc8dm4JYgHWq6(Icfg-@zi)6`K1$zad@LZ9gi)piO=2Vh^29{ zqMS~Zcp)BguRPjepuy5a#)jZLaXFz&{@UPo0~=B{}q&= z)x}X)^-mUh`EVJaW3QP=Ex?mdGdxLx7HIIj0%cg;)JZ2A|9Ci_Ky}f~+pVCSAV+RJ z4?IQ(Sd4aO;C!Ene%d=`SefCl(qpFQ`$H)!qavQ~@1T|;pQb-cEi_@|w&TOMj8uGY zyFoE?2I+2sOcL3p^kwYO3uK0e0wN6oi#xpn@$83ObonhLumcL|q_@_f+Icuvz{phr z9iK5&!Yx|Yw||@$tKQOfBd4a2};&!|A#zL`l=PqXEFNi~pqTHZ;HMCw2w&S#+tJqHYQdYsWy z_qaC?-oU?ZZ^ruV`Dp!>qtaXf#D`Ft6VX0jmuz_HRBei2MWdI^rJEilzWA<1?_!Sb8$2-K4e#mYRegDeIdxuo`G zxCy2B&$nAq`g%7yu5iS?4{U_r1N$)|6cPSa5ajS42msdq`7}l@n&q>5p;>dnr2Qk< zL>k->mNQ?6iwOk&tcc)=F#zRw?U@3MKFAPzqjHsuzX|z@EDL7y`SM5?Fq-*`F>ga@ z)I^kJ4P-+vh{WCwtvI)XCD9hJ%JaR@3TjqXvTX_K^W?FEFlf?rZHbsA)&Vfcr{4$3 zkPHz$tgNbRtO_GpOw4qJ#Oelyfl9dpnF{`Zbzm|f|90Qp?3R7sWWYS|Fsv`A+ QrCOLsyP;cd@I!6tzrZ4p-T(jq diff --git a/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI b/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI index 0b7877b928375a69a7cb05b55f9a9697c9ef8556..4111ce3099be1eaccf8a8fac9fe90bd128266c3d 100644 GIT binary patch delta 2255 zcmb7FeN0ua8m*gAU5a;0=%wCAFn6296GlLqwFu4n#!V=CbJ05JENxk|O+x*9O(ee!a%p?gHC4~iG#svI z#M@~Jcs2b(z|{NsfJxmM?aH<7xh#Q>i-nqCFtWD+j5tx6jLsr0PMj=2kBP^H;;t$E zZq@og6M7$%1=59Lr@*3lawQ!!)M@s^%4MIf-brUF3xxGBMr?jO0r{^I*?l_NQZuDZ zD&`E!We2U;;eU+UpZ|JuBvu?-&~4AACtkZ06EUQiI**-IhTo=@ou%>t2sF-_tHz3< z1a!>kafe-?x4WuhP+u%4*_e^ZA=tXSbLwOx{%$S8%(s)ngCiVICGJ`<;|~Lwflg`B zHIRXPj}~W~@uYJbSkO@(LmRtKDZ>uk-Jgt9kJa)7J9={>T(KRolOfrr5Pc!b} z)La!;$34OAX1;Rv3z9v0cRV%}j!j4#4o@sb#eW}qrUfF}Acl5LwW*X$hVj;yCD@*I zkPdz!sKd_mq_zYXFPI~Y@X+OSQt=8T)49t}D#+jtXrU7q)e5OeoTj_YmZv^AR4+Svnl|-G_(n zG%{tP^LLIbR3%&iqo)KX7qifktzEO}49mLf)73d>JKu~UaPYedQa0Jt(D@Wh^|#FXW9Y;eN@ zI{s^<1CC9^QV(h5=u?pYKQU;zsOvicwX3Z0Qf(t+pV;pOfh;zFnRo`_0CBzmc|_j? zHsZDdkGlGNVmJU=>3S3N119X%py=hXPb$Rkd;*H+)qzP7$l!C3O>RC5ytLE|MY0D^ zeta3qiNgkNX}b;1hty^yhISZ@kbKYgl~UdjaLL3{Vu-)Q$T(u29BI}Lo$B@OI$}7+ z(sI8AtszJ1`nn;Lu&k=lb52Vf-H;(=c0<#K^&q>5g+QX@eFqYiP)d9Ren!#C#~PLg WZS{o^*VFJKX+FaO-*^`uR{aZuLzjC1 delta 1511 zcmaJ>VN6?96z(bAYgd}*OV>Obc!Q=xLI{#F#gW;(u&GFJTk2HA%`vti5`yK45eWg- zFvHYDh92$Nnr^E>mu8u`c^BW9lT@9AU|h(Ok!A4*KNcj6kdhc<;+)?1WCe8Y*M0AN z-~G;a?mg#z^}R6utuWY&am9NsS_>Gf%t68WCB`53vm4eDEB|n#cg=!9z&t@V|Eq*k z=6Xkn@Kv_&x3pPWEsgk-eLY^VHyYSbsl$phYkfHRpp1&s&A+`E3KinOOh4P4?XzQd zTEgaphMo~O``!JrV_lggV5zY9EGt%g_S!let=xte6$z(uFW;M^tY;HSN7lW;C4u>T z2fOIo=rX*~YzGwM;3k==5BnXBW`xSFPXJ6s^Iy)cIG)81zueVrf#VpzU5%byHz%R!CvY* z06CP}$%`C&|9QG8K@n+(!G${pWQw$cA44$@#kWH-n;fXMnO8sPmoarsM)fm+X}HyD zTpM;CR}8*Lt^_zt$PsO@Vqz?ak&`Vb9-CQ7^RrN_4>IUz(t(lqY6ef7#Ne4528l&Z z*1@X%CR#t_#FhfvG!riMWfv3o>j zEnnYUYaVdZ51M&{=1~qzij=AYnJS-wYK*km*z~wyW#RFG4e$p3d20*SR~4Y|7m;c6 zMX)-A+Ps2+g}VRiO*XvHYsKjuE}Uipb}o7_#R^&HVo|o~BYEA8iCo^aN*><+O=Nd& z?<^$I1zx>*13bDsKO{Z^g&3+)xs;otL2w&>bS(gLW>c6=r1K_vo7Z=D=FT2;Qr-*T zB<)2wVV3Kxg<{GJLs8~0`T^8aX&G-vS3ggu`lzgM~yRZw@DAxM^P~cOxDy2P2_&wfqBi0rE^MRH9#AOoIyB?_b{D0az^5s5xRtymr`3`|iKl2`Fe7N}8EQxcaBV3o;tj1KXU^GcF`NAMj wLEAqeori=q#vYyT*`I}#`8Jw93Rf`@6taznv&4Kr%|;__7j)?jF{riw4Idgld;kCd From b32e20f0c18f3b809f8cc0f49b1e127bab8867ab Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Wed, 29 Jan 2014 21:49:44 +0000 Subject: [PATCH 112/124] [crt] fix error handling (use _dosmaperr) svn path=/trunk/; revision=61887 --- reactos/lib/sdk/crt/stdio/file.c | 33 +++++++++++++------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/reactos/lib/sdk/crt/stdio/file.c b/reactos/lib/sdk/crt/stdio/file.c index 6425575561e..1a361c454d4 100644 --- a/reactos/lib/sdk/crt/stdio/file.c +++ b/reactos/lib/sdk/crt/stdio/file.c @@ -817,18 +817,15 @@ int CDECL _close(int fd) LOCK_FILES(); hand = fdtoh(fd); TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) + if (!is_valid_fd(fd)) { ret = -1; - else if (!CloseHandle(hand)) - { - WARN(":failed-last error (%d)\n",GetLastError()); - _dosmaperr(GetLastError()); - ret = -1; - } - else - { + } else { free_fd(fd); - ret = 0; + ret = CloseHandle(hand) ? 0 : -1; + if (ret) { + WARN(":failed-last error (%d)\n",GetLastError()); + _dosmaperr(GetLastError()); + } } UNLOCK_FILES(); TRACE(":ok\n"); @@ -1718,7 +1715,9 @@ int CDECL _sopen_s( int *fd, const char *path, int oflags, int shflags, int pmod } *fd = alloc_fd(hand, wxflag); - + if (*fd == -1) + return *_errno(); + TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0; } @@ -1783,12 +1782,7 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int TRACE("fd*: %p :file (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", fd, debugstr_w(path), oflags, shflags, pmode); - if (!fd) - { - MSVCRT_INVALID_PMT("null out fd pointer"); - *_errno() = EINVAL; - return EINVAL; - } + if (!MSVCRT_CHECK_PMT( fd != NULL )) return EINVAL; *fd = -1; wxflag = split_oflags(oflags); @@ -1868,7 +1862,6 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int } hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); - if (hand == INVALID_HANDLE_VALUE) { WARN(":failed-last error (%d)\n",GetLastError()); _dosmaperr(GetLastError()); @@ -1891,7 +1884,7 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int if (written != sizeof(utf8_bom)) { WARN("error writing BOM\n"); CloseHandle(hand); - *_errno() = GetLastError(); + _dosmaperr(GetLastError()); return *_errno(); } } @@ -1906,7 +1899,7 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int { WARN("error writing BOM\n"); CloseHandle(hand); - *_errno() = GetLastError(); + _dosmaperr(GetLastError()); return *_errno(); } } From 05dbef656f553df980ed8921533275619b02e458 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Wed, 29 Jan 2014 21:54:49 +0000 Subject: [PATCH 113/124] [MSGINA] Create a connection to the LSA upon initialization and use it to change passwords. Logon will use the connection later. svn path=/trunk/; revision=61888 --- reactos/dll/win32/msgina/gui.c | 31 ++------------------ reactos/dll/win32/msgina/msgina.c | 47 +++++++++++++++++++++++++++++++ reactos/dll/win32/msgina/msgina.h | 2 ++ 3 files changed, 51 insertions(+), 29 deletions(-) diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c index 06c589427b9..6357d40439e 100644 --- a/reactos/dll/win32/msgina/gui.c +++ b/reactos/dll/win32/msgina/gui.c @@ -259,9 +259,6 @@ DoChangePassword( ULONG RequestBufferSize; ULONG ResponseBufferSize = 0; LPWSTR Ptr; - LSA_STRING PackageName; - HANDLE LsaHandle = NULL; - ULONG AuthenticationPackage = 0; BOOL res = FALSE; NTSTATUS ProtocolStatus; NTSTATUS Status; @@ -348,30 +345,9 @@ DoChangePassword( NewPassword1, RequestBuffer->NewPassword.MaximumLength); - /* Connect to the LSA server */ - Status = LsaConnectUntrusted(&LsaHandle); - if (!NT_SUCCESS(Status)) - { - ERR("LsaConnectUntrusted failed (Status 0x%08lx)\n", Status); - goto done; - } - - /* Get the authentication package */ - RtlInitAnsiString((PANSI_STRING)&PackageName, - MSV1_0_PACKAGE_NAME); - - Status = LsaLookupAuthenticationPackage(LsaHandle, - &PackageName, - &AuthenticationPackage); - if (!NT_SUCCESS(Status)) - { - ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); - goto done; - } - /* Call the authentication package */ - Status = LsaCallAuthenticationPackage(LsaHandle, - AuthenticationPackage, + Status = LsaCallAuthenticationPackage(pgContext->LsaHandle, + pgContext->AuthenticationPackage, RequestBuffer, RequestBufferSize, (PVOID*)&ResponseBuffer, @@ -404,9 +380,6 @@ done: if (ResponseBuffer != NULL) LsaFreeReturnBuffer(ResponseBuffer); - if (LsaHandle != NULL) - NtClose(LsaHandle); - return res; } diff --git a/reactos/dll/win32/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c index 2c7c1c18b46..946fcc8501a 100644 --- a/reactos/dll/win32/msgina/msgina.c +++ b/reactos/dll/win32/msgina/msgina.c @@ -254,6 +254,46 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) } +static +BOOL +ConnectToLsa( + PGINA_CONTEXT pgContext) +{ + LSA_STRING LogonProcessName; + LSA_STRING PackageName; + LSA_OPERATIONAL_MODE SecurityMode = 0; + NTSTATUS Status; + + /* Connect to the LSA server */ + RtlInitAnsiString((PANSI_STRING)&LogonProcessName, + "MSGINA"); + + Status = LsaRegisterLogonProcess(&LogonProcessName, + &pgContext->LsaHandle, + &SecurityMode); + if (!NT_SUCCESS(Status)) + { + ERR("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + /* Get the authentication package */ + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(pgContext->LsaHandle, + &PackageName, + &pgContext->AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + return TRUE; +} + + /* * @implemented */ @@ -283,6 +323,13 @@ WlxInitialize( return FALSE; } + if (!ConnectToLsa(pgContext)) + { + WARN("ConnectToLsa() failed\n"); + LocalFree(pgContext); + return FALSE; + } + /* Return the context to winlogon */ *pWlxContext = (PVOID)pgContext; pgContext->hDllInstance = hDllInstance; diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h index 48d3f360b3b..1eec5ec02e3 100644 --- a/reactos/dll/win32/msgina/msgina.h +++ b/reactos/dll/win32/msgina/msgina.h @@ -38,6 +38,8 @@ typedef struct PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; HWND hStatusWindow; + HANDLE LsaHandle; + ULONG AuthenticationPackage; DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon; From b2107235fbac190013c9a2c5831767f16f67db38 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Thu, 30 Jan 2014 17:36:30 +0000 Subject: [PATCH 114/124] [NtUser] - Remove unnecessary UINT size checks see CORE-7825. Patch by: Lee Schroeder. svn path=/trunk/; revision=61889 --- reactos/win32ss/user/ntuser/message.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/reactos/win32ss/user/ntuser/message.c b/reactos/win32ss/user/ntuser/message.c index 2a9a8808363..56f14064d03 100644 --- a/reactos/win32ss/user/ntuser/message.c +++ b/reactos/win32ss/user/ntuser/message.c @@ -331,7 +331,7 @@ PackParam(LPARAM *lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Non MsgMemoryEntry = FindMsgMemory(Msg); - if ((!MsgMemoryEntry) || (MsgMemoryEntry->Size < 0)) + if (!MsgMemoryEntry) { /* Keep previous behavior */ return STATUS_SUCCESS; @@ -390,11 +390,6 @@ UnpackParam(LPARAM lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL No PMSGMEMORY MsgMemoryEntry; MsgMemoryEntry = FindMsgMemory(Msg); ASSERT(MsgMemoryEntry); - if (MsgMemoryEntry->Size < 0) - { - /* Keep previous behavior */ - return STATUS_INVALID_PARAMETER; - } if (MsgMemoryEntry->Flags == MMS_FLAG_READWRITE) { From c95a650a7e5aad2a8cbf3c25c4d5520c25e3ba32 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 30 Jan 2014 19:05:54 +0000 Subject: [PATCH 115/124] [FREELDR] * Fix MSVC x64 build. svn path=/trunk/; revision=61891 --- reactos/boot/freeldr/freeldr/CMakeLists.txt | 2 ++ reactos/boot/freeldr/freeldr/include/freeldr.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt index af8b8949f71..1ee1181b314 100644 --- a/reactos/boot/freeldr/freeldr/CMakeLists.txt +++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt @@ -129,6 +129,8 @@ elseif(ARCH STREQUAL "amd64") arch/amd64/int386.S arch/amd64/pnpbios.S) list(APPEND FREELDR_COMMON_SOURCE + arch/i386/custom.c + arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c diff --git a/reactos/boot/freeldr/freeldr/include/freeldr.h b/reactos/boot/freeldr/freeldr/include/freeldr.h index 4aa964c7dcd..6144092e13e 100644 --- a/reactos/boot/freeldr/freeldr/include/freeldr.h +++ b/reactos/boot/freeldr/freeldr/include/freeldr.h @@ -99,10 +99,10 @@ #include #include #include -#endif -#if defined(_M_IX86) #include #include +#endif +#if defined(_M_IX86) #include #include #include From e933a21800b8af104796f679f5e537e0ade5739d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 30 Jan 2014 20:00:29 +0000 Subject: [PATCH 116/124] [KERNEL32] * Fix MSVC x64 build. svn path=/trunk/; revision=61892 --- reactos/include/reactos/subsys/win/conmsg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reactos/include/reactos/subsys/win/conmsg.h b/reactos/include/reactos/subsys/win/conmsg.h index 7409fd23d43..71284ce5c47 100644 --- a/reactos/include/reactos/subsys/win/conmsg.h +++ b/reactos/include/reactos/subsys/win/conmsg.h @@ -191,7 +191,9 @@ typedef struct _CONSRV_API_CONNECTINFO CONSOLE_START_INFO ConsoleStartInfo; } CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO; +#if defined(_M_IX86) C_ASSERT(sizeof(CONSRV_API_CONNECTINFO) == 0x638); +#endif typedef struct { From 26ed6933abb1f87133e547ce54a9127feb54a2d9 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Thu, 30 Jan 2014 21:23:25 +0000 Subject: [PATCH 117/124] [crt] revert 61885 and 61887 svn path=/trunk/; revision=61893 --- reactos/lib/sdk/crt/stdio/file.c | 259 +++++-------------------------- 1 file changed, 36 insertions(+), 223 deletions(-) diff --git a/reactos/lib/sdk/crt/stdio/file.c b/reactos/lib/sdk/crt/stdio/file.c index 1a361c454d4..ba95e5c0cc6 100644 --- a/reactos/lib/sdk/crt/stdio/file.c +++ b/reactos/lib/sdk/crt/stdio/file.c @@ -89,25 +89,15 @@ int *__p___mb_cur_max(void); #define WX_APPEND 0x20 #define WX_TEXT 0x80 -/* values for exflag - it's used differently in msvcr90.dll*/ -#define EF_UTF8 0x01 -#define EF_UTF16 0x02 -#define EF_CRIT_INIT 0x04 -#define EF_UNK_UNICODE 0x08 - -static char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; -static char utf16_bom[2] = { 0xff, 0xfe }; - /* FIXME: this should be allocated dynamically */ #define MAX_FILES 2048 #define FD_BLOCK_SIZE 64 -/* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { HANDLE handle; unsigned char wxflag; char unk1; - int exflag; + BOOL crit_init; CRITICAL_SECTION crit; } ioinfo; @@ -744,8 +734,10 @@ int CDECL _wunlink(const wchar_t *path) /* _flushall calls fflush which calls _flushall */ int CDECL fflush(FILE* file); -/* INTERNAL: Flush all stream buffer */ -static int flush_all_buffers(int mask) +/********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL _flushall(void) { int i, num_flushed = 0; FILE *file; @@ -756,8 +748,8 @@ static int flush_all_buffers(int mask) if (file->_flag) { - if(file->_flag & mask) { - fflush(file); + if(file->_flag & _IOWRT) { + fflush(file); num_flushed++; } } @@ -768,41 +760,22 @@ static int flush_all_buffers(int mask) return num_flushed; } -/********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL _flushall(void) -{ - return flush_all_buffers(_IOWRT | _IOREAD); -} - /********************************************************************* * fflush (MSVCRT.@) */ int CDECL fflush(FILE* file) { if(!file) { - flush_all_buffers(_IOWRT); + _flushall(); } else if(file->_flag & _IOWRT) { int res; _lock_file(file); res = flush_buffer(file); - /* FIXME - if(!res && (file->_flag & _IOCOMMIT)) - res = _commit(file->_file) ? EOF : 0; - */ _unlock_file(file); return res; - } else if(file->_flag & _IOREAD) { - _lock_file(file); - file->_cnt = 0; - file->_ptr = file->_base; - _unlock_file(file); - - return 0; - } + } return 0; } @@ -817,15 +790,18 @@ int CDECL _close(int fd) LOCK_FILES(); hand = fdtoh(fd); TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (!is_valid_fd(fd)) { + if (hand == INVALID_HANDLE_VALUE) ret = -1; - } else { + else if (!CloseHandle(hand)) + { + WARN(":failed-last error (%d)\n",GetLastError()); + _dosmaperr(GetLastError()); + ret = -1; + } + else + { free_fd(fd); - ret = CloseHandle(hand) ? 0 : -1; - if (ret) { - WARN(":failed-last error (%d)\n",GetLastError()); - _dosmaperr(GetLastError()); - } + ret = 0; } UNLOCK_FILES(); TRACE(":ok\n"); @@ -1244,9 +1220,7 @@ void CDECL rewind(FILE* file) static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) { int plus = strchrW(mode, '+') != NULL; - - while(*mode == ' ') mode++; - + switch(*mode++) { case 'R': case 'r': @@ -1267,10 +1241,7 @@ static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) return -1; } - /* FIXME */ - /* *stream_flags |= MSVCRT__commode; */ - - while (*mode && *mode!=',') + while (*mode) switch (*mode++) { case 'B': case 'b': @@ -1281,83 +1252,12 @@ static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; - case 'D': - *open_flags |= _O_TEMPORARY; - break; - case 'T': - *open_flags |= _O_SHORT_LIVED; - break; - /* FIXME - case 'c': - *stream_flags |= _IOCOMMIT; - break; - case 'n': - *stream_flags &= ~_IOCOMMIT; - break; - */ - case 'N': - *open_flags |= _O_NOINHERIT; - break; case '+': case ' ': - case 'a': - case 'w': - break; - case 'S': - case 'R': - FIXME("ignoring cache optimization flag: %c\n", mode[-1]); break; default: - ERR("incorrect mode flag: %c\n", mode[-1]); - break; + FIXME(":unknown flag %c not supported\n",mode[-1]); } - - if(*mode == ',') - { - static const WCHAR ccs[] = {'c','c','s'}; - static const WCHAR utf8[] = {'u','t','f','-','8'}; - static const WCHAR utf16le[] = {'u','t','f','-','1','6','l','e'}; - static const WCHAR unicode[] = {'u','n','i','c','o','d','e'}; - - mode++; - while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) - return -1; - mode += sizeof(ccs)/sizeof(ccs[0]); - while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(*mode == '=')) - return -1; - mode++; - while(*mode == ' ') mode++; - - if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) - { - *open_flags |= _O_U8TEXT; - mode += sizeof(utf8)/sizeof(utf8[0]); - } - else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) - { - *open_flags |= _O_U16TEXT; - mode += sizeof(utf16le)/sizeof(utf16le[0]); - } - else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) - { - *open_flags |= _O_WTEXT; - mode += sizeof(unicode)/sizeof(unicode[0]); - } - else - { - _invalid_parameter(NULL, NULL, NULL, 0, 0); - *_errno() = EINVAL; - return -1; - } - - while(*mode == ' ') mode++; - } - - if(!MSVCRT_CHECK_PMT(*mode == 0)) - return -1; - return 0; } @@ -1546,23 +1446,19 @@ wchar_t * CDECL _wmktemp(wchar_t *pattern) int wxflags = 0; unsigned unsupp; /* until we support everything */ - if (oflags & _O_APPEND) wxflags |= WX_APPEND; - if (oflags & _O_BINARY) {/* Nothing to do */} - else if (oflags & _O_TEXT) wxflags |= WX_TEXT; - else if (oflags & _O_WTEXT) wxflags |= WX_TEXT; - else if (oflags & _O_U16TEXT) wxflags |= WX_TEXT; - else if (oflags & _O_U8TEXT) wxflags |= WX_TEXT; - else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} + if (oflags & _O_APPEND) wxflags |= WX_APPEND; + if (oflags & _O_BINARY) {/* Nothing to do */} + else if (oflags & _O_TEXT) wxflags |= WX_TEXT; + else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} else wxflags |= WX_TEXT; /* default to TEXT*/ - if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; + if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; if ((unsupp = oflags & ~( _O_BINARY|_O_TEXT|_O_APPEND| _O_TRUNC|_O_EXCL|_O_CREAT| _O_RDWR|_O_WRONLY|_O_TEMPORARY| _O_NOINHERIT| - _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED| - _O_WTEXT|_O_U16TEXT|_O_U8TEXT + _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED ))) ERR(":unsupported oflags 0x%04x\n",unsupp); @@ -1715,9 +1611,7 @@ int CDECL _sopen_s( int *fd, const char *path, int oflags, int shflags, int pmod } *fd = alloc_fd(hand, wxflag); - if (*fd == -1) - return *_errno(); - + TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0; } @@ -1745,29 +1639,6 @@ int CDECL _sopen( const char *path, int oflags, int shflags, ... ) return fd; } -static int check_bom(HANDLE h, int oflags, BOOL seek) -{ - char bom[sizeof(utf8_bom)]; - DWORD r; - - oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); - - if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) - return oflags; - - if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { - oflags |= _O_U8TEXT; - }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { - if (seek && r>2) - SetFilePointer(h, 2, NULL, FILE_BEGIN); - oflags |= _O_U16TEXT; - }else if (seek) { - SetFilePointer(h, 0, NULL, FILE_BEGIN); - } - - return oflags; -} - /********************************************************************* * _wsopen_s (MSVCRT.@) */ @@ -1782,7 +1653,12 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int TRACE("fd*: %p :file (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", fd, debugstr_w(path), oflags, shflags, pmode); - if (!MSVCRT_CHECK_PMT( fd != NULL )) return EINVAL; + if (!fd) + { + MSVCRT_INVALID_PMT("null out fd pointer"); + *_errno() = EINVAL; + return EINVAL; + } *fd = -1; wxflag = split_oflags(oflags); @@ -1846,78 +1722,15 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = (oflags & _O_NOINHERIT) ? FALSE : TRUE; - if ((oflags&(_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) - && (creation==OPEN_ALWAYS || creation==OPEN_EXISTING) - && !(access&GENERIC_READ)) - { - hand = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, - &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (hand != INVALID_HANDLE_VALUE) - { - oflags = check_bom(hand, oflags, FALSE); - CloseHandle(hand); - } - else - oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); - } - hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); + if (hand == INVALID_HANDLE_VALUE) { WARN(":failed-last error (%d)\n",GetLastError()); _dosmaperr(GetLastError()); return *_errno(); } - if (oflags & (_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) - { - if ((access & GENERIC_WRITE) && (creation==CREATE_NEW - || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING - || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) - { - if (oflags & _O_U8TEXT) - { - DWORD written = 0, tmp; - - while(written!=sizeof(utf8_bom) && WriteFile(hand, (char*)utf8_bom+written, - sizeof(utf8_bom)-written, &tmp, NULL)) - written += tmp; - if (written != sizeof(utf8_bom)) { - WARN("error writing BOM\n"); - CloseHandle(hand); - _dosmaperr(GetLastError()); - return *_errno(); - } - } - else - { - DWORD written = 0, tmp; - - while(written!=sizeof(utf16_bom) && WriteFile(hand, (char*)utf16_bom+written, - sizeof(utf16_bom)-written, &tmp, NULL)) - written += tmp; - if (written != sizeof(utf16_bom)) - { - WARN("error writing BOM\n"); - CloseHandle(hand); - _dosmaperr(GetLastError()); - return *_errno(); - } - } - } - else if (access & GENERIC_READ) - oflags = check_bom(hand, oflags, TRUE); - } - *fd = alloc_fd(hand, wxflag); - if (*fd == -1) - return *_errno(); - - if (oflags & _O_WTEXT) - get_ioinfo(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; - else if (oflags & _O_U16TEXT) - get_ioinfo(*fd)->exflag |= EF_UTF16; - else if (oflags & _O_U8TEXT) - get_ioinfo(*fd)->exflag |= EF_UTF8; TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0; From c10bfd3da933f9cdfa82f12809a851ba17389ee6 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Fri, 31 Jan 2014 19:26:00 +0000 Subject: [PATCH 118/124] [MSGINA] Revert r61888. CORE-7824. svn path=/trunk/; revision=61895 --- reactos/dll/win32/msgina/gui.c | 31 ++++++++++++++++++-- reactos/dll/win32/msgina/msgina.c | 47 ------------------------------- reactos/dll/win32/msgina/msgina.h | 2 -- 3 files changed, 29 insertions(+), 51 deletions(-) diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c index 6357d40439e..06c589427b9 100644 --- a/reactos/dll/win32/msgina/gui.c +++ b/reactos/dll/win32/msgina/gui.c @@ -259,6 +259,9 @@ DoChangePassword( ULONG RequestBufferSize; ULONG ResponseBufferSize = 0; LPWSTR Ptr; + LSA_STRING PackageName; + HANDLE LsaHandle = NULL; + ULONG AuthenticationPackage = 0; BOOL res = FALSE; NTSTATUS ProtocolStatus; NTSTATUS Status; @@ -345,9 +348,30 @@ DoChangePassword( NewPassword1, RequestBuffer->NewPassword.MaximumLength); + /* Connect to the LSA server */ + Status = LsaConnectUntrusted(&LsaHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaConnectUntrusted failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the authentication package */ + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Call the authentication package */ - Status = LsaCallAuthenticationPackage(pgContext->LsaHandle, - pgContext->AuthenticationPackage, + Status = LsaCallAuthenticationPackage(LsaHandle, + AuthenticationPackage, RequestBuffer, RequestBufferSize, (PVOID*)&ResponseBuffer, @@ -380,6 +404,9 @@ done: if (ResponseBuffer != NULL) LsaFreeReturnBuffer(ResponseBuffer); + if (LsaHandle != NULL) + NtClose(LsaHandle); + return res; } diff --git a/reactos/dll/win32/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c index 946fcc8501a..2c7c1c18b46 100644 --- a/reactos/dll/win32/msgina/msgina.c +++ b/reactos/dll/win32/msgina/msgina.c @@ -254,46 +254,6 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) } -static -BOOL -ConnectToLsa( - PGINA_CONTEXT pgContext) -{ - LSA_STRING LogonProcessName; - LSA_STRING PackageName; - LSA_OPERATIONAL_MODE SecurityMode = 0; - NTSTATUS Status; - - /* Connect to the LSA server */ - RtlInitAnsiString((PANSI_STRING)&LogonProcessName, - "MSGINA"); - - Status = LsaRegisterLogonProcess(&LogonProcessName, - &pgContext->LsaHandle, - &SecurityMode); - if (!NT_SUCCESS(Status)) - { - ERR("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status); - return FALSE; - } - - /* Get the authentication package */ - RtlInitAnsiString((PANSI_STRING)&PackageName, - MSV1_0_PACKAGE_NAME); - - Status = LsaLookupAuthenticationPackage(pgContext->LsaHandle, - &PackageName, - &pgContext->AuthenticationPackage); - if (!NT_SUCCESS(Status)) - { - ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); - return FALSE; - } - - return TRUE; -} - - /* * @implemented */ @@ -323,13 +283,6 @@ WlxInitialize( return FALSE; } - if (!ConnectToLsa(pgContext)) - { - WARN("ConnectToLsa() failed\n"); - LocalFree(pgContext); - return FALSE; - } - /* Return the context to winlogon */ *pWlxContext = (PVOID)pgContext; pgContext->hDllInstance = hDllInstance; diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h index 1eec5ec02e3..48d3f360b3b 100644 --- a/reactos/dll/win32/msgina/msgina.h +++ b/reactos/dll/win32/msgina/msgina.h @@ -38,8 +38,6 @@ typedef struct PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; HWND hStatusWindow; - HANDLE LsaHandle; - ULONG AuthenticationPackage; DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon; From 735d21a7e325bdf2cd10803ec61a1cdaa92c719e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 1 Feb 2014 01:27:13 +0000 Subject: [PATCH 119/124] [APPS] Remove idiotic usage of REACTOS_VERSION_DLL in resources of executable files. svn path=/trunk/; revision=61896 --- reactos/base/applications/cmdutils/xcopy/rsrc.rc | 1 - reactos/base/applications/dxdiag/dxdiag.rc | 1 - reactos/base/applications/msconfig/msconfig.rc | 1 - 3 files changed, 3 deletions(-) diff --git a/reactos/base/applications/cmdutils/xcopy/rsrc.rc b/reactos/base/applications/cmdutils/xcopy/rsrc.rc index 72ca7d0bd29..13a1969cdeb 100644 --- a/reactos/base/applications/cmdutils/xcopy/rsrc.rc +++ b/reactos/base/applications/cmdutils/xcopy/rsrc.rc @@ -20,7 +20,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "xcopy command" #define REACTOS_STR_INTERNAL_NAME "xcopy" #define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe" diff --git a/reactos/base/applications/dxdiag/dxdiag.rc b/reactos/base/applications/dxdiag/dxdiag.rc index 7b423a1fee9..3e8400ca315 100644 --- a/reactos/base/applications/dxdiag/dxdiag.rc +++ b/reactos/base/applications/dxdiag/dxdiag.rc @@ -6,7 +6,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactX Diagnosis Tool" #define REACTOS_STR_INTERNAL_NAME "dxdiag" #define REACTOS_STR_ORIGINAL_FILENAME "dxdiag.exe" diff --git a/reactos/base/applications/msconfig/msconfig.rc b/reactos/base/applications/msconfig/msconfig.rc index 8ab923621f2..1173da05cb7 100644 --- a/reactos/base/applications/msconfig/msconfig.rc +++ b/reactos/base/applications/msconfig/msconfig.rc @@ -6,7 +6,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Configuration Tool" #define REACTOS_STR_INTERNAL_NAME "msconfig" #define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe" From 988c69e1c15cda9194372716ec9713d859ba8ffc Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sat, 1 Feb 2014 08:55:54 +0000 Subject: [PATCH 120/124] [baseaddress] hackfix for VLC Player startup svn path=/trunk/; revision=61898 --- reactos/cmake/baseaddress.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/cmake/baseaddress.cmake b/reactos/cmake/baseaddress.cmake index 5d25f132d55..4fc420d9cc6 100644 --- a/reactos/cmake/baseaddress.cmake +++ b/reactos/cmake/baseaddress.cmake @@ -283,7 +283,7 @@ set(baseaddress_wmi 0x707e0000) set(baseaddress_ws2_32_new 0x70790000) set(baseaddress_wshirda 0x70760000) set(baseaddress_wshtcpip 0x70730000) -set(baseaddress_wsock32 0x70700000) +set(baseaddress_wsock32 0x78700000) # FIXME: hackfix for VLC player set(baseaddress_wtsapi32 0x706d0000) set(baseaddress_wuapi 0x70690000) set(baseaddress_xinput1_1 0x70660000) From 0973a225b9b731e2725d156f0b3042573e079dd8 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 1 Feb 2014 12:12:26 +0000 Subject: [PATCH 121/124] [NDK] Add PsGetProcessSecurityPort, PsSetProcessSecurityPort, PsGetCurrentThreadProcessId svn path=/trunk/; revision=61899 --- reactos/include/ndk/psfuncs.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/reactos/include/ndk/psfuncs.h b/reactos/include/ndk/psfuncs.h index 253c2764271..b45574d78b6 100644 --- a/reactos/include/ndk/psfuncs.h +++ b/reactos/include/ndk/psfuncs.h @@ -284,6 +284,28 @@ PsReturnProcessPagedPoolQuota( _In_ SIZE_T Amount ); +NTKERNELAPI +PVOID +NTAPI +PsGetProcessSecurityPort( + _In_ PEPROCESS Process +); + +NTKERNELAPI +NTSTATUS +NTAPI +PsSetProcessSecurityPort( + _Inout_ PEPROCESS Process, + _In_ PVOID SecurityPort +); + +NTKERNELAPI +HANDLE +NTAPI +PsGetCurrentThreadProcessId( + VOID +); + #endif // From 21c0eca870935b5b9f8ee404fbc58c193e751c16 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 1 Feb 2014 14:28:15 +0000 Subject: [PATCH 122/124] [NPFS] - Implement NpInitializeAliases + NpTranslateAlias - Add a number of debug traces, disabled by default svn path=/trunk/; revision=61900 --- reactos/drivers/filesystems/npfs/create.c | 175 +++++++++++- reactos/drivers/filesystems/npfs/main.c | 285 ++++++++++++++++++++ reactos/drivers/filesystems/npfs/npfs.h | 79 ++++-- reactos/drivers/filesystems/npfs/strucsup.c | 2 - reactos/drivers/filesystems/npfs/volinfo.c | 14 + 5 files changed, 530 insertions(+), 25 deletions(-) diff --git a/reactos/drivers/filesystems/npfs/create.c b/reactos/drivers/filesystems/npfs/create.c index f498a698b10..d1b6479d1f6 100644 --- a/reactos/drivers/filesystems/npfs/create.c +++ b/reactos/drivers/filesystems/npfs/create.c @@ -59,12 +59,14 @@ NpOpenNamedPipeFileSystem(IN PFILE_OBJECT FileObject, { IO_STATUS_BLOCK Status; PAGED_CODE(); + TRACE("Entered\n"); NpSetFileObject(FileObject, NpVcb, NULL, FALSE); ++NpVcb->ReferenceCount; Status.Information = FILE_OPENED; Status.Status = STATUS_SUCCESS; + TRACE("Leaving, Status.Status = %lx\n", Status.Status); return Status; } @@ -78,6 +80,7 @@ NpOpenNamedPipeRootDirectory(IN PNP_DCB Dcb, IO_STATUS_BLOCK IoStatus; PNP_ROOT_DCB_FCB Ccb; PAGED_CODE(); + TRACE("Entered\n"); IoStatus.Status = NpCreateRootDcbCcb(&Ccb); if (NT_SUCCESS(IoStatus.Status)) @@ -93,6 +96,7 @@ NpOpenNamedPipeRootDirectory(IN PNP_DCB Dcb, IoStatus.Information = 0; } + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -116,6 +120,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, USHORT NamedPipeConfiguration; PLIST_ENTRY NextEntry, ListHead; PNP_CCB Ccb = NULL; + TRACE("Entered\n"); IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 0; @@ -167,6 +172,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, ((GrantedAccess & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) { IoStatus.Status = STATUS_ACCESS_DENIED; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -185,6 +191,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, if (NextEntry == ListHead) { IoStatus.Status = STATUS_PIPE_NOT_AVAILABLE; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -195,6 +202,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, if (!NT_SUCCESS(IoStatus.Status)) { NpUninitializeSecurity(Ccb); + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -203,9 +211,151 @@ NpCreateClientEnd(IN PNP_FCB Fcb, IoStatus.Information = FILE_OPENED; IoStatus.Status = STATUS_SUCCESS; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } +NTSTATUS +NTAPI +NpTranslateAlias( + PUNICODE_STRING PipeName) +{ + WCHAR UpcaseBuffer[MAX_INDEXED_LENGTH + 1]; + UNICODE_STRING UpcaseString; + ULONG Length; + PNPFS_ALIAS CurrentAlias; + NTSTATUS Status; + BOOLEAN BufferAllocated, BackSlash; + LONG Result; + PAGED_CODE(); + + /* Get the pipe name length and check for empty string */ + Length = PipeName->Length; + if (Length == 0) + { + return STATUS_SUCCESS; + } + + /* Check if the name starts with a path separator */ + BackSlash = (PipeName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR); + if (BackSlash) + { + /* We are only interested in the part after the backslash */ + Length -= sizeof(WCHAR); + } + + /* Check if the length is within our indexed list bounds */ + if ((Length >= MIN_INDEXED_LENGTH * sizeof(WCHAR)) && + (Length <= MAX_INDEXED_LENGTH * sizeof(WCHAR))) + { + /* Length is within bounds, use the list by length */ + CurrentAlias = NpAliasListByLength[(Length / sizeof(WCHAR)) - MIN_INDEXED_LENGTH]; + } + else + { + /* We use the generic list, search for an entry of the right size */ + CurrentAlias = NpAliasList; + while ((CurrentAlias != NULL) && (CurrentAlias->Name.Length != Length)) + { + /* Check if we went past the desired length */ + if (CurrentAlias->Name.Length > Length) + { + /* In this case there is no matching alias, return success */ + return STATUS_SUCCESS; + } + + /* Go to the next alias in the list */ + CurrentAlias = CurrentAlias->Next; + } + } + + /* Did we find any alias? */ + if (CurrentAlias == NULL) + { + /* Nothing found, no matching alias */ + return STATUS_SUCCESS; + } + + /* Check whether we can use our stack buffer */ + if (Length <= MAX_INDEXED_LENGTH * sizeof(WCHAR)) + { + /* Initialize the upcased string */ + UpcaseString.Buffer = UpcaseBuffer; + UpcaseString.MaximumLength = sizeof(UpcaseBuffer); + + /* Upcase the pipe name */ + Status = RtlUpcaseUnicodeString(&UpcaseString, PipeName, FALSE); + NT_ASSERT(NT_SUCCESS(Status)); + BufferAllocated = FALSE; + } + else + { + /* Upcase the pipe name, allocate the string buffer */ + Status = RtlUpcaseUnicodeString(&UpcaseString, PipeName, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + BufferAllocated = TRUE; + } + + /* Did the original name start with a backslash? */ + if (BackSlash) + { + /* Skip it for the comparison */ + UpcaseString.Buffer++; + UpcaseString.Length -= sizeof(WCHAR); + } + + /* Make sure the length matches the "raw" length */ + NT_ASSERT(UpcaseString.Length == Length); + NT_ASSERT(CurrentAlias->Name.Length == Length); + + /* Loop while we have aliases */ + do + { + /* Compare the names and check if they match */ + Result = NpCompareAliasNames(&UpcaseString, &CurrentAlias->Name); + if (Result == 0) + { + /* The names match, use the target name */ + *PipeName = *CurrentAlias->TargetName; + + /* Did the original name start with a backslash? */ + if (!BackSlash) + { + /* It didn't, so skip it in the target name as well */ + PipeName->Buffer++; + PipeName->Length -= sizeof(WCHAR); + } + break; + } + + /* Check if we went past all string candidates */ + if (Result < 0) + { + /* Nothing found, we're done */ + break; + } + + /* Go to the next alias */ + CurrentAlias = CurrentAlias->Next; + + /* Keep looping while we have aliases of the right length */ + } while ((CurrentAlias != NULL) && (CurrentAlias->Name.Length == Length)); + + /* Did we allocate a buffer? */ + if (BufferAllocated) + { + /* Free the allocated buffer */ + ASSERT(UpcaseString.Buffer != UpcaseBuffer); + RtlFreeUnicodeString(&UpcaseString); + } + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, @@ -223,6 +373,8 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, ACCESS_MASK DesiredAccess; LIST_ENTRY DeferredList; UNICODE_STRING Prefix; + NTSTATUS Status; + TRACE("Entered\n"); InitializeListHead(&DeferredList); IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); @@ -276,8 +428,9 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, goto Quickie; } - // Status = NpTranslateAlias(&FileName);; // ignore this for now - // if (!NT_SUCCESS(Status)) goto Quickie; + Status = NpTranslateAlias(&FileName); + if (!NT_SUCCESS(Status)) goto Quickie; + if (RelatedFileObject) { if (Type == NPFS_NTC_ROOT_DCB) @@ -355,6 +508,7 @@ Quickie: Irp->IoStatus = IoStatus; IoCompleteRequest(Irp, IO_NO_INCREMENT); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus.Status; } @@ -380,6 +534,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, USHORT NamedPipeConfiguration, CheckShareAccess; BOOLEAN AccessGranted; PAGED_CODE(); + TRACE("Entered\n"); Privileges = NULL; @@ -424,17 +579,23 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, &AccessState->GenerateOnClose); SeUnlockSubjectContext(SubjectSecurityContext); - if (!AccessGranted) return IoStatus; + if (!AccessGranted) + { + TRACE("Leaving, IoStatus = %lx\n", IoStatus); + return IoStatus; + } if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } if (Disposition == FILE_CREATE) { IoStatus.Status = STATUS_ACCESS_DENIED; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -455,6 +616,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, if (CheckShareAccess != ShareAccess) { IoStatus.Status = STATUS_ACCESS_DENIED; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -476,6 +638,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, { --Ccb->Fcb->CurrentInstances; NpDeleteCcb(Ccb, List); + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -485,6 +648,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 1; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -509,6 +673,7 @@ NpCreateNewNamedPipe(IN PNP_DCB Dcb, PNP_CCB Ccb; PNP_FCB Fcb; PAGED_CODE(); + TRACE("Entered\n"); if (!(Parameters->TimeoutSpecified) || !(Parameters->MaximumInstances) || @@ -611,9 +776,11 @@ NpCreateNewNamedPipe(IN PNP_DCB Dcb, IoStatus->Status = STATUS_SUCCESS; IoStatus->Information = FILE_CREATED; + TRACE("Leaving, STATUS_SUCCESS\n"); return STATUS_SUCCESS; Quickie: + TRACE("Leaving, Status = %lx\n", Status); IoStatus->Information = 0; IoStatus->Status = Status; return Status; @@ -635,6 +802,7 @@ NpFsdCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, UNICODE_STRING Prefix; PNAMED_PIPE_CREATE_PARAMETERS Parameters; IO_STATUS_BLOCK IoStatus; + TRACE("Entered\n"); InitializeListHead(&DeferredList); Process = IoGetRequestorProcess(Irp); @@ -741,6 +909,7 @@ Quickie: NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); Irp->IoStatus = IoStatus; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); return IoStatus.Status; diff --git a/reactos/drivers/filesystems/npfs/main.c b/reactos/drivers/filesystems/npfs/main.c index 449cfc41725..c30d64e2a17 100644 --- a/reactos/drivers/filesystems/npfs/main.c +++ b/reactos/drivers/filesystems/npfs/main.c @@ -16,14 +16,292 @@ /* GLOBALS ********************************************************************/ PDEVICE_OBJECT NpfsDeviceObject; +PVOID NpAliases; +PNPFS_ALIAS NpAliasList; +PNPFS_ALIAS NpAliasListByLength[MAX_INDEXED_LENGTH + 1 - MIN_INDEXED_LENGTH]; /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +NpReadAlias( + PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PNPFS_QUERY_VALUE_CONTEXT QueryContext = Context; + PWSTR CurrentString; + USHORT Length; + PNPFS_ALIAS CurrentAlias; + UNICODE_STRING TempString; + PUNICODE_STRING CurrentTargetName; + + /* Check if we have the expected type */ + if (ValueType != REG_MULTI_SZ) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if only the size is requested */ + if (QueryContext->SizeOnly) + { + /* Count this entry */ + QueryContext->NumberOfEntries++; + + /* Get the length of the value name (i.e. the target name). */ + Length = wcslen(ValueName) * sizeof(WCHAR); + + /* Add the size of the name plus a '\' and a UNICODE_STRING structure */ + QueryContext->FullSize += Length + sizeof(UNICODE_NULL) + + sizeof(OBJ_NAME_PATH_SEPARATOR) + + sizeof(UNICODE_STRING); + + /* Loop while we have alias names */ + CurrentString = ValueData; + while (*CurrentString != UNICODE_NULL) + { + /* Count this alias */ + QueryContext->NumberOfAliases++; + + /* Get the length of the current string (i.e. the alias name) */ + Length = wcslen(CurrentString) * sizeof(WCHAR); + + /* Count the length plus the size of an NPFS_ALIAS structure */ + QueryContext->FullSize += Length + sizeof(UNICODE_NULL) + sizeof(NPFS_ALIAS); + + /* Go to the next string */ + CurrentString += (Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); + } + } + else + { + /* Get the next name string pointer */ + CurrentTargetName = QueryContext->CurrentTargetName++; + + /* Get the length of the value name (i.e. the target name). */ + Length = wcslen(ValueName) * sizeof(WCHAR); + + /* Initialize the current name string (one char more than the name) */ + CurrentTargetName->Buffer = QueryContext->CurrentStringPointer; + CurrentTargetName->Length = Length + sizeof(OBJ_NAME_PATH_SEPARATOR); + CurrentTargetName->MaximumLength = CurrentTargetName->Length + sizeof(UNICODE_NULL); + + /* Update the current string pointer */ + QueryContext->CurrentStringPointer += + CurrentTargetName->MaximumLength / sizeof(WCHAR); + + /* Prepend a '\' before the name */ + CurrentTargetName->Buffer[0] = OBJ_NAME_PATH_SEPARATOR; + + /* Append the value name (including the NULL termination) */ + RtlCopyMemory(&CurrentTargetName->Buffer[1], + ValueName, + Length + sizeof(UNICODE_NULL)); + + /* Upcase the target name */ + RtlUpcaseUnicodeString(CurrentTargetName, CurrentTargetName, 0); + + /* Loop while we have alias names */ + CurrentString = ValueData; + while (*CurrentString != UNICODE_NULL) + { + /* Get the next alias pointer */ + CurrentAlias = QueryContext->CurrentAlias++; + + /* Get the length of the current string (i.e. the alias name) */ + Length = wcslen(CurrentString) * sizeof(WCHAR); + + /* Setup the alias structure */ + CurrentAlias->TargetName = CurrentTargetName; + CurrentAlias->Name.Buffer = QueryContext->CurrentStringPointer; + CurrentAlias->Name.Length = Length; + CurrentAlias->Name.MaximumLength = Length + sizeof(UNICODE_NULL); + + /* Upcase the alias name */ + TempString.Buffer = CurrentString; + TempString.Length = Length; + RtlUpcaseUnicodeString(&CurrentAlias->Name, + &TempString, + FALSE); + + /* Update the current string pointer */ + QueryContext->CurrentStringPointer += + CurrentAlias->Name.MaximumLength / sizeof(WCHAR); + + /* Go to the next string */ + CurrentString += (Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); + } + } + + return STATUS_SUCCESS; +} + +LONG +NTAPI +NpCompareAliasNames( + _In_ PCUNICODE_STRING String1, + _In_ PCUNICODE_STRING String2) +{ + ULONG Count; + PWCHAR P1, P2; + + /* First check if the string sizes match */ + if (String1->Length != String2->Length) + { + /* They don't, return positive if the first is longer, negative otherwise */ + return String1->Length - String2->Length; + } + + /* Now loop all characters */ + Count = String1->Length / sizeof(WCHAR); + P1 = String1->Buffer; + P2 = String2->Buffer; + while (Count) + { + /* Check if they don't match */ + if (*P1 != *P2) + { + /* Return positive if the first char is greater, negative otherwise */ + return *P1 - *P2; + } + + /* Go to the next buffer position */ + P1++; + P2++; + Count--; + } + + /* All characters matched, return 0 */ + return 0; +} + +NTSTATUS +NTAPI +NpInitializeAliases(VOID) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NPFS_QUERY_VALUE_CONTEXT Context; + NTSTATUS Status; + USHORT Length; + ULONG i; + PNPFS_ALIAS CurrentAlias, *AliasPointer; + + /* Initialize the query table */ + QueryTable[0].QueryRoutine = NpReadAlias; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_NOEXPAND; + QueryTable[0].Name = NULL; + QueryTable[0].EntryContext = NULL; + QueryTable[0].DefaultType = REG_NONE; + QueryTable[0].DefaultData = NULL; + QueryTable[0].DefaultLength = 0; + QueryTable[1].QueryRoutine = NULL; + QueryTable[1].Flags = 0; + QueryTable[1].Name = NULL; + + /* Setup the query context */ + Context.SizeOnly = 1; + Context.FullSize = 0; + Context.NumberOfAliases = 0; + Context.NumberOfEntries = 0; + + /* Query the registry values (calculate length only) */ + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES | RTL_REGISTRY_OPTIONAL, + L"Npfs\\Aliases", + QueryTable, + &Context, + NULL); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return STATUS_SUCCESS; + + return Status; + } + + /* Check if there is anything */ + if (Context.FullSize == 0) + { + /* Nothing to do, return success */ + return STATUS_SUCCESS; + } + + /* Allocate a structure large enough to hold all the data */ + NpAliases = ExAllocatePoolWithTag(NonPagedPool, Context.FullSize, 'sfpN'); + if (NpAliases == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Now setup the actual pointers in the context */ + Context.CurrentTargetName = NpAliases; + CurrentAlias = (PNPFS_ALIAS)&Context.CurrentTargetName[Context.NumberOfEntries]; + Context.CurrentAlias = CurrentAlias; + Context.CurrentStringPointer = (PWCHAR)&CurrentAlias[Context.NumberOfAliases]; + + /* This time query the real data */ + Context.SizeOnly = FALSE; + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES | RTL_REGISTRY_OPTIONAL, + L"Npfs\\Aliases", + QueryTable, + &Context, + NULL); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(NpAliases, 0); + NpAliases = NULL; + return Status; + } + + /* Make sure we didn't go past the end of the allocation! */ + NT_ASSERT((PUCHAR)Context.CurrentStringPointer <= + ((PUCHAR)NpAliases + Context.FullSize)); + + /* Loop all aliases we got */ + for (i = 0; i < Context.NumberOfAliases; i++) + { + /* Get the length and check what list to use */ + Length = CurrentAlias->Name.Length; + if ((Length >= MIN_INDEXED_LENGTH * sizeof(WCHAR)) && + (Length <= MAX_INDEXED_LENGTH * sizeof(WCHAR))) + { + /* For this length range, we use an indexed list */ + AliasPointer = &NpAliasListByLength[(Length / sizeof(WCHAR)) - 5]; + } + else + { + /* Length is outside of the range, use the default list */ + AliasPointer = &NpAliasList; + } + + /* Loop through all aliases already in the list until we find one that + is greater than our current alias */ + while ((*AliasPointer != NULL) && + (NpCompareAliasNames(&CurrentAlias->Name, + &(*AliasPointer)->Name) > 0)) + { + /* Go to the next alias */ + AliasPointer = &(*AliasPointer)->Next; + } + + /* Insert the alias in the list */ + CurrentAlias->Next = *AliasPointer; + *AliasPointer = CurrentAlias; + + /* Go to the next alias in the array */ + CurrentAlias++; + } + + return STATUS_SUCCESS; +} + + NTSTATUS NTAPI NpFsdDirectoryControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + TRACE("Entered\n"); UNIMPLEMENTED; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; @@ -45,6 +323,13 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, DPRINT1("Next-Generation NPFS-Lite\n"); + Status = NpInitializeAliases(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize aliases!\n"); + return Status; + } + DriverObject->MajorFunction[IRP_MJ_CREATE] = NpFsdCreate; DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = NpFsdCreateNamedPipe; DriverObject->MajorFunction[IRP_MJ_CLOSE] = NpFsdClose; diff --git a/reactos/drivers/filesystems/npfs/npfs.h b/reactos/drivers/filesystems/npfs/npfs.h index 77c7fceb19d..c33ce43fe3e 100644 --- a/reactos/drivers/filesystems/npfs/npfs.h +++ b/reactos/drivers/filesystems/npfs/npfs.h @@ -14,8 +14,12 @@ #include #include #include -#define UNIMPLEMENTED -#define DPRINT1 DbgPrint +//#define UNIMPLEMENTED +//#define DPRINT1 DbgPrint + +#define NDEBUG +#include +#define TRACE(...) /* DPRINT1("%s: ", __FUNCTION__); DbgPrint(__VA_ARGS__) */ // // Allow Microsoft Extensions @@ -26,6 +30,9 @@ #pragma warning(disable:4100) #endif +#define MIN_INDEXED_LENGTH 5 +#define MAX_INDEXED_LENGTH 9 + /* TYPEDEFS & DEFINES *********************************************************/ @@ -326,6 +333,32 @@ typedef struct _NP_VCB extern PNP_VCB NpVcb; +// +// Defines an alias +// +typedef struct _NPFS_ALIAS +{ + struct _NPFS_ALIAS *Next; + PUNICODE_STRING TargetName; + UNICODE_STRING Name; +} NPFS_ALIAS, *PNPFS_ALIAS; + +// +// Private structure used to enumerate the alias values +// +typedef struct _NPFS_QUERY_VALUE_CONTEXT +{ + BOOLEAN SizeOnly; + SIZE_T FullSize; + ULONG NumberOfAliases; + ULONG NumberOfEntries; + PNPFS_ALIAS CurrentAlias; + PUNICODE_STRING CurrentTargetName; + PWCHAR CurrentStringPointer; +} NPFS_QUERY_VALUE_CONTEXT, *PNPFS_QUERY_VALUE_CONTEXT; + +extern PNPFS_ALIAS NpAliasList; +extern PNPFS_ALIAS NpAliasListByLength[MAX_INDEXED_LENGTH + 1 - MIN_INDEXED_LENGTH]; /* FUNCTIONS ******************************************************************/ @@ -385,6 +418,12 @@ NpCompleteDeferredIrps(IN PLIST_ENTRY DeferredList) } } +LONG +NTAPI +NpCompareAliasNames( + _In_ PCUNICODE_STRING String1, + _In_ PCUNICODE_STRING String2); + BOOLEAN NTAPI NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, @@ -415,7 +454,7 @@ NTAPI NpAddDataQueueEntry(IN ULONG NamedPipeEnd, IN PNP_CCB Ccb, IN PNP_DATA_QUEUE DataQueue, - IN ULONG Who, + IN ULONG Who, IN ULONG Type, IN ULONG DataSize, IN PIRP Irp, @@ -510,20 +549,20 @@ NpSetConnectedPipeState(IN PNP_CCB Ccb, NTSTATUS NTAPI NpSetListeningPipeState(IN PNP_CCB Ccb, - IN PIRP Irp, + IN PIRP Irp, IN PLIST_ENTRY List); NTSTATUS NTAPI -NpSetDisconnectedPipeState(IN PNP_CCB Ccb, +NpSetDisconnectedPipeState(IN PNP_CCB Ccb, IN PLIST_ENTRY List); NTSTATUS NTAPI NpSetClosingPipeState(IN PNP_CCB Ccb, - IN PIRP Irp, - IN ULONG NamedPipeEnd, + IN PIRP Irp, + IN ULONG NamedPipeEnd, IN PLIST_ENTRY List); VOID @@ -594,7 +633,7 @@ NTSTATUS NTAPI NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue, IN LARGE_INTEGER WaitTime, - IN PIRP Irp, + IN PIRP Irp, IN PUNICODE_STRING AliasName); NTSTATUS @@ -607,27 +646,27 @@ NpCancelWaiter(IN PNP_WAIT_QUEUE WaitQueue, IO_STATUS_BLOCK NTAPI -NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, +NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, IN BOOLEAN Peek, IN BOOLEAN ReadOverflowOperation, IN PVOID Buffer, - IN ULONG BufferSize, - IN ULONG Mode, + IN ULONG BufferSize, + IN ULONG Mode, IN PNP_CCB Ccb, IN PLIST_ENTRY List); -NTSTATUS +NTSTATUS NTAPI NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, - IN ULONG Mode, - IN PVOID OutBuffer, - IN ULONG OutBufferSize, - IN ULONG PipeType, - OUT PULONG BytesWritten, - IN PNP_CCB Ccb, - IN ULONG NamedPipeEnd, - IN PETHREAD Thread, + IN ULONG Mode, + IN PVOID OutBuffer, + IN ULONG OutBufferSize, + IN ULONG PipeType, + OUT PULONG BytesWritten, + IN PNP_CCB Ccb, + IN ULONG NamedPipeEnd, + IN PETHREAD Thread, IN PLIST_ENTRY List); NTSTATUS diff --git a/reactos/drivers/filesystems/npfs/strucsup.c b/reactos/drivers/filesystems/npfs/strucsup.c index faa15f77f90..73d0360f79d 100644 --- a/reactos/drivers/filesystems/npfs/strucsup.c +++ b/reactos/drivers/filesystems/npfs/strucsup.c @@ -15,8 +15,6 @@ /* GLOBALS ********************************************************************/ -#define UNIMPLEMENTED - PWCHAR NpRootDCBName = L"\\"; PNP_VCB NpVcb; diff --git a/reactos/drivers/filesystems/npfs/volinfo.c b/reactos/drivers/filesystems/npfs/volinfo.c index 79e8471b232..54c9240e51c 100644 --- a/reactos/drivers/filesystems/npfs/volinfo.c +++ b/reactos/drivers/filesystems/npfs/volinfo.c @@ -23,6 +23,7 @@ NpQueryFsVolumeInfo(IN PVOID Buffer, PFILE_FS_VOLUME_INFORMATION InfoBuffer = Buffer; NTSTATUS Status; USHORT NameLength; + TRACE("Entered\n"); *Length -= sizeof(*InfoBuffer); @@ -47,6 +48,7 @@ NpQueryFsVolumeInfo(IN PVOID Buffer, RtlCopyMemory(InfoBuffer->VolumeLabel, L"Named Pipe", NameLength); *Length -= NameLength; + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -56,6 +58,7 @@ NpQueryFsSizeInfo(IN PVOID Buffer, IN OUT PULONG Length) { PFILE_FS_SIZE_INFORMATION InfoBuffer = Buffer; + TRACE("Entered\n"); *Length -= sizeof(*InfoBuffer); @@ -64,6 +67,7 @@ NpQueryFsSizeInfo(IN PVOID Buffer, InfoBuffer->SectorsPerAllocationUnit = 1; InfoBuffer->BytesPerSector = 1; + TRACE("Leaving, Status = STATUS_SUCCESS\n"); return STATUS_SUCCESS; } @@ -74,6 +78,7 @@ NpQueryFsDeviceInfo(IN PVOID Buffer, { PFILE_FS_DEVICE_INFORMATION InfoBuffer = Buffer; NTSTATUS Status; + TRACE("Entered\n"); if (*Length >= sizeof(*InfoBuffer)) { @@ -87,6 +92,7 @@ NpQueryFsDeviceInfo(IN PVOID Buffer, { Status = STATUS_BUFFER_OVERFLOW; } + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -98,6 +104,7 @@ NpQueryFsAttributeInfo(IN PVOID Buffer, PFILE_FS_ATTRIBUTE_INFORMATION InfoBuffer = Buffer; NTSTATUS Status; USHORT NameLength; + TRACE("Entered\n"); NameLength = (USHORT)(*Length - 12); if (NameLength < 8) @@ -117,6 +124,7 @@ NpQueryFsAttributeInfo(IN PVOID Buffer, InfoBuffer->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; RtlCopyMemory(InfoBuffer->FileSystemName, L"NPFS", NameLength); + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -126,11 +134,13 @@ NpQueryFsFullSizeInfo(IN PVOID Buffer, IN OUT PULONG Length) { PFILE_FS_FULL_SIZE_INFORMATION InfoBuffer = Buffer; + TRACE("Entered\n"); *Length -= sizeof(*InfoBuffer); RtlZeroMemory(InfoBuffer, sizeof(*InfoBuffer)); + TRACE("Leaving, Status = STATUS_SUCCESS\n"); return STATUS_SUCCESS; } @@ -145,6 +155,7 @@ NpCommonQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, PVOID Buffer; NTSTATUS Status; PAGED_CODE(); + TRACE("Entered\n"); IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->AssociatedIrp.SystemBuffer; @@ -174,6 +185,7 @@ NpCommonQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, } Irp->IoStatus.Information = IoStack->Parameters.QueryVolume.Length - Length; + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -184,6 +196,7 @@ NpFsdQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, { NTSTATUS Status; PAGED_CODE(); + TRACE("Entered\n"); FsRtlEnterFileSystem(); ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); @@ -199,6 +212,7 @@ NpFsdQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); } + TRACE("Leaving, Status = %lx\n", Status); return Status; } From e61f3d956bbf7704d275683a96a76a189d84ae7a Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 1 Feb 2014 15:46:09 +0000 Subject: [PATCH 123/124] [MSGINA] Delay load secur32.dll. svn path=/trunk/; revision=61901 --- reactos/dll/win32/msgina/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/msgina/CMakeLists.txt b/reactos/dll/win32/msgina/CMakeLists.txt index 08b8fb483bc..b7594a4f800 100644 --- a/reactos/dll/win32/msgina/CMakeLists.txt +++ b/reactos/dll/win32/msgina/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE add_library(msgina SHARED ${SOURCE}) set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 secur32 userenv msvcrt kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) +add_delay_importlibs(msgina secur32) add_pch(msgina msgina.h) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) From 005703c2dc6acc9a0722047dec761a72985ef194 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 1 Feb 2014 20:41:16 +0000 Subject: [PATCH 124/124] [NPFS] - Implement NpQueryClientProcess and NpSetClientProcess - Add a fast I/O dispatch table and implement NpFastRead and NpFastWrite The NPFS driver is now good enough to boot Windows 2003 to desktop! svn path=/trunk/; revision=61906 --- reactos/drivers/filesystems/npfs/fsctrl.c | 156 ++++++++++++++++++++-- reactos/drivers/filesystems/npfs/main.c | 13 +- reactos/drivers/filesystems/npfs/npfs.h | 40 ++++++ reactos/drivers/filesystems/npfs/read.c | 48 ++++++- reactos/drivers/filesystems/npfs/write.c | 53 +++++++- 5 files changed, 295 insertions(+), 15 deletions(-) diff --git a/reactos/drivers/filesystems/npfs/fsctrl.c b/reactos/drivers/filesystems/npfs/fsctrl.c index 10288a7d0d5..dc3526d35ea 100644 --- a/reactos/drivers/filesystems/npfs/fsctrl.c +++ b/reactos/drivers/filesystems/npfs/fsctrl.c @@ -53,10 +53,86 @@ NpInternalWrite(IN PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI NpQueryClientProcess(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStackLocation; + NODE_TYPE_CODE NodeTypeCode; + PNP_CCB Ccb; + PNP_CLIENT_PROCESS ClientSession, QueryBuffer; + ULONG Length; + PAGED_CODE(); + + /* Get the current stack location */ + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Decode the file object and check the node type */ + NodeTypeCode = NpDecodeFileObject(IoStackLocation->FileObject, 0, &Ccb, 0); + if (NodeTypeCode != NPFS_NTC_CCB) + { + return STATUS_PIPE_DISCONNECTED; + } + + /* Get the length of the query buffer */ + Length = IoStackLocation->Parameters.QueryFile.Length; + if (Length < 8) + { + return STATUS_INVALID_PARAMETER; + } + + QueryBuffer = Irp->AssociatedIrp.SystemBuffer; + + /* Lock the Ccb */ + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + + /* Get the CCBs client session and check if it's set */ + ClientSession = Ccb->ClientSession; + if (ClientSession != NULL) + { + /* Copy first 2 fields */ + QueryBuffer->Unknown = ClientSession->Unknown; + QueryBuffer->Process = ClientSession->Process; + } + else + { + /* Copy the process from the CCB */ + QueryBuffer->Unknown = NULL; + QueryBuffer->Process = Ccb->Process; + } + + /* Does the caller provide a large enough buffer for the full data? */ + if (Length >= sizeof(NP_CLIENT_PROCESS)) + { + Irp->IoStatus.Information = sizeof(NP_CLIENT_PROCESS); + + /* Do we have a ClientSession structure? */ + if (ClientSession != NULL) + { + /* Copy length and the data */ + QueryBuffer->DataLength = ClientSession->DataLength; + RtlCopyMemory(QueryBuffer->Buffer, + ClientSession->Buffer, + ClientSession->DataLength); + + /* NULL terminate the buffer */ + NT_ASSERT(QueryBuffer->DataLength <= 30); + QueryBuffer->Buffer[QueryBuffer->DataLength / sizeof(WCHAR)] = 0; + } + else + { + /* No data */ + QueryBuffer->DataLength = 0; + QueryBuffer->Buffer[0] = 0; + } + } + else + { + Irp->IoStatus.Information = FIELD_OFFSET(NP_CLIENT_PROCESS, DataLength); + } + + /* Unlock the Ccb */ + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + + return STATUS_SUCCESS; } NTSTATUS @@ -64,8 +140,72 @@ NTAPI NpSetClientProcess(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStackLocation; + NODE_TYPE_CODE NodeTypeCode; + PNP_CCB Ccb; + ULONG Length; + PNP_CLIENT_PROCESS InputBuffer, ClientSession, OldClientSession; + PAGED_CODE(); + + /* Get the current stack location */ + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Only kernel calls are allowed! */ + if (IoStackLocation->MinorFunction != IRP_MN_KERNEL_CALL) + { + return STATUS_ACCESS_DENIED; + } + + /* Decode the file object and check the node type */ + NodeTypeCode = NpDecodeFileObject(IoStackLocation->FileObject, 0, &Ccb, 0); + if (NodeTypeCode != NPFS_NTC_CCB) + { + return STATUS_PIPE_DISCONNECTED; + } + + /* Get the length of the query buffer and check if it's valid */ + Length = IoStackLocation->Parameters.QueryFile.Length; + if (Length != sizeof(NP_CLIENT_PROCESS)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Get the buffer and check if the data Length is valid */ + InputBuffer = Irp->AssociatedIrp.SystemBuffer; + if (InputBuffer->DataLength > 30) + { + return STATUS_INVALID_PARAMETER; + } + + /* Allocate a new structure */ + ClientSession = ExAllocatePoolWithQuotaTag(PagedPool, + sizeof(NP_CLIENT_PROCESS), + 'iFpN'); + + /* Copy the full input buffer */ + RtlCopyMemory(ClientSession, InputBuffer, sizeof(NP_CLIENT_PROCESS)); + + /* Lock the Ccb */ + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + + /* Get the old ClientSession and set the new */ + OldClientSession = Ccb->ClientSession; + Ccb->ClientSession = ClientSession; + + /* Copy the process to the CCB */ + Ccb->Process = ClientSession->Process; + + /* Unlock the Ccb */ + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + + /* Check if there was already a ClientSession */ + if (OldClientSession != NULL) + { + /* Free it */ + ExFreePoolWithTag(OldClientSession, 'iFpN'); + } + + return STATUS_SUCCESS; } NTSTATUS @@ -201,7 +341,7 @@ NpListen(IN PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI NpPeek(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, + IN PIRP Irp, IN PLIST_ENTRY List) { PIO_STACK_LOCATION IoStack; @@ -490,7 +630,7 @@ NpTransceive(IN PDEVICE_OBJECT DeviceObject, } if (!NT_SUCCESS(Status)) goto Quickie; - + if (EventBuffer) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); ASSERT(ReadQueue->QueueState == Empty); Status = NpAddDataQueueEntry(NamedPipeEnd, @@ -648,7 +788,7 @@ NpCommonFileSystemControl(IN PDEVICE_OBJECT DeviceObject, NpAcquireSharedVcb(); Status = NpInternalTransceive(DeviceObject, Irp, &DeferredList); break; - + case FSCTL_PIPE_INTERNAL_READ_OVFLOW: Overflow = TRUE; // on purpose diff --git a/reactos/drivers/filesystems/npfs/main.c b/reactos/drivers/filesystems/npfs/main.c index c30d64e2a17..d45e00deb72 100644 --- a/reactos/drivers/filesystems/npfs/main.c +++ b/reactos/drivers/filesystems/npfs/main.c @@ -20,6 +20,14 @@ PVOID NpAliases; PNPFS_ALIAS NpAliasList; PNPFS_ALIAS NpAliasListByLength[MAX_INDEXED_LENGTH + 1 - MIN_INDEXED_LENGTH]; +FAST_IO_DISPATCH NpFastIoDispatch = +{ + sizeof(FAST_IO_DISPATCH), + NULL, + NpFastRead, + NpFastWrite, +}; + /* FUNCTIONS ******************************************************************/ NTSTATUS @@ -311,6 +319,7 @@ NpFsdDirectoryControl(IN PDEVICE_OBJECT DeviceObject, return STATUS_NOT_IMPLEMENTED; } + NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, @@ -321,7 +330,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, NTSTATUS Status; UNREFERENCED_PARAMETER(RegistryPath); - DPRINT1("Next-Generation NPFS-Lite\n"); + DPRINT1("Next-Generation NPFS-Advanced\n"); Status = NpInitializeAliases(); if (!NT_SUCCESS(Status)) @@ -347,6 +356,8 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, DriverObject->DriverUnload = NULL; + DriverObject->FastIoDispatch = &NpFastIoDispatch; + RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe"); Status = IoCreateDevice(DriverObject, sizeof(NP_VCB), diff --git a/reactos/drivers/filesystems/npfs/npfs.h b/reactos/drivers/filesystems/npfs/npfs.h index c33ce43fe3e..7bc2fbf080a 100644 --- a/reactos/drivers/filesystems/npfs/npfs.h +++ b/reactos/drivers/filesystems/npfs/npfs.h @@ -360,6 +360,18 @@ typedef struct _NPFS_QUERY_VALUE_CONTEXT extern PNPFS_ALIAS NpAliasList; extern PNPFS_ALIAS NpAliasListByLength[MAX_INDEXED_LENGTH + 1 - MIN_INDEXED_LENGTH]; +// +// This structure is actually a user-mode structure and should go into a share header +// +typedef struct _NP_CLIENT_PROCESS +{ + PVOID Unknown; + PVOID Process; + USHORT DataLength; + WCHAR Buffer[17]; +} NP_CLIENT_PROCESS, *PNP_CLIENT_PROCESS; + + /* FUNCTIONS ******************************************************************/ // @@ -674,6 +686,34 @@ NTAPI NpFsdRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +_Function_class_(FAST_IO_READ) +_IRQL_requires_same_ +BOOLEAN +NTAPI +NpFastRead( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject); + +_Function_class_(FAST_IO_WRITE) +_IRQL_requires_same_ +BOOLEAN +NTAPI +NpFastWrite( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject); + NTSTATUS NTAPI diff --git a/reactos/drivers/filesystems/npfs/read.c b/reactos/drivers/filesystems/npfs/read.c index 4189868e518..60e48d3af65 100644 --- a/reactos/drivers/filesystems/npfs/read.c +++ b/reactos/drivers/filesystems/npfs/read.c @@ -16,6 +16,8 @@ /* GLOBALS ********************************************************************/ LONG NpSlowReadCalls; +ULONG NpFastReadTrue; +ULONG NpFastReadFalse; /* FUNCTIONS ******************************************************************/ @@ -23,8 +25,8 @@ BOOLEAN NTAPI NpCommonRead(IN PFILE_OBJECT FileObject, IN PVOID Buffer, - IN ULONG BufferSize, - OUT PIO_STATUS_BLOCK IoStatus, + IN ULONG BufferSize, + OUT PIO_STATUS_BLOCK IoStatus, IN PIRP Irp, IN PLIST_ENTRY List) { @@ -190,4 +192,46 @@ NpFsdRead(IN PDEVICE_OBJECT DeviceObject, return IoStatus.Status; } + +_Function_class_(FAST_IO_READ) +_IRQL_requires_same_ +BOOLEAN +NTAPI +NpFastRead( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + LIST_ENTRY DeferredList; + BOOLEAN Result; + PAGED_CODE(); + + InitializeListHead(&DeferredList); + + FsRtlEnterFileSystem(); + NpAcquireSharedVcb(); + + Result = NpCommonRead(FileObject, + Buffer, + Length, + IoStatus, + NULL, + &DeferredList); + if (Result) + ++NpFastReadTrue; + else + ++NpFastReadFalse; + + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); + FsRtlExitFileSystem(); + + return Result; +} + /* EOF */ diff --git a/reactos/drivers/filesystems/npfs/write.c b/reactos/drivers/filesystems/npfs/write.c index f8aa1500f39..7297a5bf7a2 100644 --- a/reactos/drivers/filesystems/npfs/write.c +++ b/reactos/drivers/filesystems/npfs/write.c @@ -16,6 +16,8 @@ /* GLOBALS ********************************************************************/ LONG NpSlowWriteCalls; +ULONG NpFastWriteTrue; +ULONG NpFastWriteFalse; /* FUNCTIONS ******************************************************************/ @@ -23,10 +25,10 @@ BOOLEAN NTAPI NpCommonWrite(IN PFILE_OBJECT FileObject, IN PVOID Buffer, - IN ULONG DataSize, - IN PETHREAD Thread, - IN PIO_STATUS_BLOCK IoStatus, - IN PIRP Irp, + IN ULONG DataSize, + IN PETHREAD Thread, + IN PIO_STATUS_BLOCK IoStatus, + IN PIRP Irp, IN PLIST_ENTRY List) { NODE_TYPE_CODE NodeType; @@ -207,4 +209,47 @@ NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, return IoStatus.Status; } + +_Function_class_(FAST_IO_WRITE) +_IRQL_requires_same_ +BOOLEAN +NTAPI +NpFastWrite( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + LIST_ENTRY DeferredList; + BOOLEAN Result; + PAGED_CODE(); + + InitializeListHead(&DeferredList); + + FsRtlEnterFileSystem(); + NpAcquireSharedVcb(); + + Result = NpCommonWrite(FileObject, + Buffer, + Length, + PsGetCurrentThread(), + IoStatus, + NULL, + &DeferredList); + if (Result) + ++NpFastWriteTrue; + else + ++NpFastWriteFalse; + + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); + FsRtlExitFileSystem(); + + return Result; +} + /* EOF */