Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68564: [README.WINE] Mark some modules as synced with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jul 23 13:08:39 2015 New Revision: 68564 URL: http://svn.reactos.org/svn/reactos?rev=68564&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Jul 23 13:08:39 2015 @@ -15,9 +15,9 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to WineStaging-1.7.37 +reactos/tools/unicode # Synced to WineStaging-1.7.47 reactos/tools/widl # Synced to Wine-1.7.17 -reactos/tools/wpp # Synced to WineStaging-1.7.37 +reactos/tools/wpp # Synced to WineStaging-1.7.47 The following libraries are shared with Wine. @@ -31,10 +31,10 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.37 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.37 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.37 +reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.47 @@ -43,158 +43,158 @@ reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.47 -reactos/dll/win32/activeds # Synced to WineStaging-1.7.37 -reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.37 -reactos/dll/win32/advpack # Synced to WineStaging-1.7.37 +reactos/dll/win32/activeds # Synced to WineStaging-1.7.47 +reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.47 +reactos/dll/win32/advpack # Synced to WineStaging-1.7.47 reactos/dll/win32/atl # Synced to WineStaging-1.7.47 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.47 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.47 reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.37 +reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.47 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.7.37 -reactos/dll/win32/clusapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/comcat # Synced to WineStaging-1.7.37 +reactos/dll/win32/cabinet # Synced to WineStaging-1.7.47 +reactos/dll/win32/clusapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/comcat # Synced to WineStaging-1.7.47 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.47 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/compstui # Synced to WineStaging-1.7.37 -reactos/dll/win32/credui # Synced to WineStaging-1.7.37 +reactos/dll/win32/compstui # Synced to WineStaging-1.7.47 +reactos/dll/win32/credui # Synced to WineStaging-1.7.47 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptui # Synced to WineStaging-1.7.37 +reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.47 +reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.47 +reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.47 +reactos/dll/win32/cryptui # Synced to WineStaging-1.7.47 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.47 -reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/faultrep # Synced to WineStaging-1.7.37 +reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/faultrep # Synced to WineStaging-1.7.47 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.47 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.47 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.47 -reactos/dll/win32/hlink # Synced to WineStaging-1.7.37 -reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.37 -reactos/dll/win32/httpapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/iccvid # Synced to WineStaging-1.7.37 +reactos/dll/win32/hlink # Synced to WineStaging-1.7.47 +reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.47 +reactos/dll/win32/httpapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/iccvid # Synced to WineStaging-1.7.47 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.47 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.47 -reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.37 +reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.47 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.47 -reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.37 -reactos/dll/win32/initpki # Synced to WineStaging-1.7.37 +reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.47 +reactos/dll/win32/initpki # Synced to WineStaging-1.7.47 reactos/dll/win32/inseng # Synced to WineStaging-1.7.47 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to WineStaging-1.7.37 -reactos/dll/win32/itss # Synced to WineStaging-1.7.37 +reactos/dll/win32/itircl # Synced to WineStaging-1.7.47 +reactos/dll/win32/itss # Synced to WineStaging-1.7.47 reactos/dll/win32/jscript # Synced to WineStaging-1.7.47 -reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.37 -reactos/dll/win32/loadperf # Synced to WineStaging-1.7.37 -reactos/dll/win32/localspl # Synced to WineStaging-1.7.37 -reactos/dll/win32/localui # Synced to WineStaging-1.7.37 -reactos/dll/win32/lz32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mcicda # Synced to WineStaging-1.7.37 +reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.47 +reactos/dll/win32/loadperf # Synced to WineStaging-1.7.47 +reactos/dll/win32/localspl # Synced to WineStaging-1.7.47 +reactos/dll/win32/localui # Synced to WineStaging-1.7.47 +reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mcicda # Synced to WineStaging-1.7.47 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mciseq # Synced to WineStaging-1.7.37 -reactos/dll/win32/mciwave # Synced to WineStaging-1.7.37 -reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/mlang # Synced to WineStaging-1.7.37 +reactos/dll/win32/mciseq # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciwave # Synced to WineStaging-1.7.47 +reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/mlang # Synced to WineStaging-1.7.47 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.47 reactos/dll/win32/mpr # Synced to WineStaging-1.7.47 -reactos/dll/win32/mprapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/mprapi # Synced to WineStaging-1.7.47 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.37 +reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.47 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.47 -reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mscms # Synced to WineStaging-1.7.37 +reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mscms # Synced to WineStaging-1.7.47 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.7.47 -reactos/dll/win32/msftedit # Synced to WineStaging-1.7.37 +reactos/dll/win32/msftedit # Synced to WineStaging-1.7.47 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37 -reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.37 +reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.47 reactos/dll/win32/msi # Synced to WineStaging-1.7.47 -reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msimtf # Synced to WineStaging-1.7.37 -reactos/dll/win32/msisip # Synced to WineStaging-1.7.37 -reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.37 -reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.37 -reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msimtf # Synced to WineStaging-1.7.47 +reactos/dll/win32/msisip # Synced to WineStaging-1.7.47 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.47 +reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.47 +reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mstask # Synced to WineStaging-1.7.47 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.37 -reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.47 +reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.47 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/npptools # Synced to WineStaging-1.7.37 -reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/ntprint # Synced to WineStaging-1.7.37 -reactos/dll/win32/objsel # Synced to WineStaging-1.7.37 +reactos/dll/win32/npptools # Synced to WineStaging-1.7.47 +reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/ntprint # Synced to WineStaging-1.7.47 +reactos/dll/win32/objsel # Synced to WineStaging-1.7.47 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.47 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.47 reactos/dll/win32/oleacc # Synced to WineStaging-1.7.47 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.47 reactos/dll/win32/oledlg # Synced to WineStaging-1.7.47 -reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/pdh # Synced to WineStaging-1.7.37 -reactos/dll/win32/pidgen # Synced to WineStaging-1.7.37 +reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/pdh # Synced to WineStaging-1.7.47 +reactos/dll/win32/pidgen # Synced to WineStaging-1.7.47 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to WineStaging-1.7.37 -reactos/dll/win32/propsys # Synced to WineStaging-1.7.37 -reactos/dll/win32/pstorec # Synced to WineStaging-1.7.37 +reactos/dll/win32/printui # Synced to WineStaging-1.7.47 +reactos/dll/win32/propsys # Synced to WineStaging-1.7.47 +reactos/dll/win32/pstorec # Synced to WineStaging-1.7.47 reactos/dll/win32/qmgr # Synced to WineStaging-1.7.47 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.47 -reactos/dll/win32/query # Synced to WineStaging-1.7.37 +reactos/dll/win32/query # Synced to WineStaging-1.7.47 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/resutils # Synced to WineStaging-1.7.37 +reactos/dll/win32/resutils # Synced to WineStaging-1.7.47 reactos/dll/win32/riched20 # Synced to WineStaging-1.7.47 -reactos/dll/win32/riched32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/riched32 # Synced to WineStaging-1.7.47 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17 -reactos/dll/win32/rsabase # Synced to WineStaging-1.7.37 +reactos/dll/win32/rsabase # Synced to WineStaging-1.7.47 reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.47 -reactos/dll/win32/sccbase # Synced to WineStaging-1.7.37 -reactos/dll/win32/schannel # Synced to WineStaging-1.7.37 +reactos/dll/win32/sccbase # Synced to WineStaging-1.7.47 +reactos/dll/win32/schannel # Synced to WineStaging-1.7.47 reactos/dll/win32/scrrun # Synced to WineStaging-1.7.47 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/sensapi # Synced to WineStaging-1.7.47 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.37 +reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.47 reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.47 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to WineStaging-1.7.37 +reactos/dll/win32/shfolder # Synced to WineStaging-1.7.47 reactos/dll/win32/shlwapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.37 -reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/softpub # Synced to WineStaging-1.7.37 -reactos/dll/win32/spoolss # Synced to WineStaging-1.7.37 -reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.37 -reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.37 -reactos/dll/win32/sti # Synced to WineStaging-1.7.37 -reactos/dll/win32/sxs # Synced to WineStaging-1.7.37 -reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/traffic # Synced to WineStaging-1.7.37 +reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.47 +reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/softpub # Synced to WineStaging-1.7.47 +reactos/dll/win32/spoolss # Synced to WineStaging-1.7.47 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.47 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.47 +reactos/dll/win32/sti # Synced to WineStaging-1.7.47 +reactos/dll/win32/sxs # Synced to WineStaging-1.7.47 +reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/traffic # Synced to WineStaging-1.7.47 reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37 reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) -reactos/dll/win32/updspapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/url # Synced to WineStaging-1.7.37 +reactos/dll/win32/updspapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/url # Synced to WineStaging-1.7.47 reactos/dll/win32/urlmon # Synced to WineStaging-1.7.47 reactos/dll/win32/usp10 # Synced to WineStaging-1.7.47 reactos/dll/win32/uxtheme # Forked @@ -203,7 +203,7 @@ reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.47 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.47 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.47 -reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.37 +reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.47 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to WineStaging-1.7.47 @@ -212,46 +212,46 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-1.7.47 -reactos/dll/win32/wintrust # Synced to WineStaging-1.7.37 -reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/wmi # Synced to WineStaging-1.7.37 -reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.37 +reactos/dll/win32/wintrust # Synced to WineStaging-1.7.47 +reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.47 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/wuapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.37 +reactos/dll/win32/wuapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.47 reactos/dll/win32/xmllite # Synced to WineStaging-1.7.47 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.47 ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.47 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.47 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.47 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.37 -reactos/base/applications/games/winmine # Synced to WineStaging-1.7.37 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-1.7.37 -reactos/base/applications/iexplore # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.47 +reactos/base/applications/games/winmine # Synced to WineStaging-1.7.47 with our own resources. +reactos/base/applications/extrac32 # Synced to WineStaging-1.7.47 +reactos/base/applications/iexplore # Synced to WineStaging-1.7.47 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.37 reactos/base/applications/wordpad # Synced to WineStaging-1.7.37 reactos/base/services/rpcss # Synced to WineStaging-1.7.37 -reactos/base/system/expand # Synced to WineStaging-1.7.37 -reactos/base/system/msiexec # Synced to WineStaging-1.7.37 +reactos/base/system/expand # Synced to WineStaging-1.7.47 +reactos/base/system/msiexec # Synced to WineStaging-1.7.47 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.37 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.47 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37

9 years, 1 month

[bfreisen] 68563: [MSPAINT_NEW] initialize ImageModel member variables

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Thu Jul 23 07:48:32 2015 New Revision: 68563 URL: http://svn.reactos.org/svn/reactos?rev=68563&view=rev Log: [MSPAINT_NEW] initialize ImageModel member variables Modified: trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/history.h Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Thu Jul 23 07:48:32 2015 @@ -20,6 +20,14 @@ void ImageModel::NotifyImageChanged() { imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); +} + +ImageModel::ImageModel() +{ + currInd = 0; + undoSteps = 0; + redoSteps = 0; + imageSaved = TRUE; } void ImageModel::CopyPrevious() Modified: trunk/reactos/base/applications/mspaint_new/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] Thu Jul 23 07:48:32 2015 @@ -18,6 +18,7 @@ int redoSteps; BOOL imageSaved; + ImageModel(); void CopyPrevious(void); void Undo(void); void Redo(void);

9 years, 1 month

[ekohl] 68562: [MSGINA] Show shutdown dialog at the logon screen if the user wants to shutdown. Patch by Jared Smudde. CORE-9919 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jul 22 20:28:51 2015 New Revision: 68562 URL: http://svn.reactos.org/svn/reactos?rev=68562&view=rev Log: [MSGINA] Show shutdown dialog at the logon screen if the user wants to shutdown. Patch by Jared Smudde. CORE-9919 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Wed Jul 22 20:28:51 2015 @@ -1161,7 +1161,8 @@ return TRUE; case IDC_SHUTDOWN: - EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN); + if (OnShutDown(hwndDlg, pgContext) == IDOK) + EndDialog(hwndDlg, pgContext->nShutdownAction); return TRUE; } break;

9 years, 1 month

[akhaldi] 68561: [DBGHELP] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:50:35 2015 New Revision: 68561 URL: http://svn.reactos.org/svn/reactos?rev=68561&view=rev Log: [DBGHELP] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/dbghelp/coff.c trunk/reactos/dll/win32/dbghelp/cpu_arm.c trunk/reactos/dll/win32/dbghelp/cpu_arm64.c trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/cpu_ppc.c trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/image_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/coff.c?r… Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.… Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm6… Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386… Modified: trunk/reactos/dll/win32/dbghelp/cpu_ppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_ppc.… Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Modified: trunk/reactos/dll/win32/dbghelp/image_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image_pr… Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mo… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

9 years, 1 month

[akhaldi] 68560: [WININET_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:43:32 2015 New Revision: 68560 URL: http://svn.reactos.org/svn/reactos?rev=68560&view=rev Log: [WININET_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/wininet/http.c trunk/rostests/winetests/wininet/urlcache.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Wed Jul 22 19:43:32 2015 @@ -1437,7 +1437,9 @@ BYTE buf[100]; HANDLE file; BOOL ret; - + FILETIME filetime_zero = {0}; + + static const char cached_content[] = "data read from cache"; static const char *types[] = { "*", "", NULL }; session = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -1497,9 +1499,13 @@ ok(InternetCloseHandle(request), "Close request handle failed\n"); - file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + file = CreateFileA(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + ret = WriteFile(file, cached_content, sizeof(cached_content), &size, NULL); + ok(ret && size, "WriteFile failed: %d, %d\n", ret, size); + ret = CommitUrlCacheEntryA(url, file_name, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, NULL, 0); + ok(ret, "CommitUrlCacheEntry failed: %d\n", GetLastError()); CloseHandle(file); /* Send the same request, requiring it to be retrieved from the cache */ @@ -1512,7 +1518,17 @@ ret = InternetReadFile(request, buf, sizeof(buf), &size); ok(ret, "InternetReadFile failed: %u\n", GetLastError()); ok(size == 100, "size = %u\n", size); - + buf[99] = 0; + todo_wine ok(!strcmp((char*)buf, cached_content), "incorrect page data: %s\n", (char*)buf); + + ok(InternetCloseHandle(request), "Close request handle failed\n"); + + DeleteUrlCacheEntryA(url); + request = HttpOpenRequestA(connect, "GET", "/tests/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + todo_wine ok(!ret, "HttpSendRequest succeeded\n"); + if(!ret) + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); ok(InternetCloseHandle(request), "Close request handle failed\n"); request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -1979,6 +1995,22 @@ "Set-Cookie: two\r\n" "\r\n"; +static const char okmsg_cookie_path[] = +"HTTP/1.1 200 OK\r\n" +"Date: Mon, 01 Dec 2008 13:44:34 GMT\r\n" +"Server: winetest\r\n" +"Content-Length: 0\r\n" +"Set-Cookie: subcookie2=data; path=/test_cookie_set_path\r\n" +"\r\n"; + +static const char okmsg_cookie[] = +"HTTP/1.1 200 OK\r\n" +"Date: Mon, 01 Dec 2008 13:44:34 GMT\r\n" +"Server: winetest\r\n" +"Content-Length: 0\r\n" +"Set-Cookie: testcookie=testvalue\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" @@ -2040,6 +2072,7 @@ WSADATA wsaData; int last_request = 0; char host_header[22]; + char host_header_override[30]; static BOOL test_b = FALSE; static int test_no_cache = 0; @@ -2066,6 +2099,7 @@ SetEvent(si->hEvent); sprintf(host_header, "Host: localhost:%d", si->port); + sprintf(host_header_override, "Host: test.local:%d\r\n", si->port); do { @@ -2188,7 +2222,7 @@ } if (strstr(buffer, "/testC")) { - if (strstr(buffer, "Cookie: cookie=biscuit")) + if (strstr(buffer, "cookie=biscuit")) send(c, okmsg, sizeof okmsg-1, 0); else send(c, notokmsg, sizeof notokmsg-1, 0); @@ -2326,6 +2360,86 @@ else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "HEAD /upload.txt")) + { + if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } + if (strstr(buffer, "PUT /upload2.txt")) + { + if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test_cookie_path1")) + { + if (strstr(buffer, "subcookie=data")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test_cookie_path2")) + { + if (strstr(buffer, "subcookie2=data")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test_cookie_set_path")) + { + send(c, okmsg_cookie_path, sizeof okmsg_cookie_path-1, 0); + } + if (strstr(buffer, "/test_cookie_merge")) + { + if (strstr(buffer, "subcookie=data") && + !strstr(buffer, "manual_cookie=test")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test_cookie_set_host_override")) + { + send(c, okmsg_cookie, sizeof okmsg_cookie-1, 0); + } + if (strstr(buffer, "/test_cookie_check_host_override")) + { + if (strstr(buffer, "Cookie:") && strstr(buffer, "testcookie=testvalue")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test_cookie_check_different_host")) + { + if (!strstr(buffer, "foo") && + strstr(buffer, "cookie=biscuit")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test_host_override")) + { + if (strstr(buffer, host_header_override)) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "HEAD /test_auth_host1")) + { + if (strstr(buffer, "Authorization: Basic dGVzdDE6cGFzcw==")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } + if (strstr(buffer, "HEAD /test_auth_host2")) + { + if (strstr(buffer, "Authorization: Basic dGVzdDE6cGFzczI=")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -2913,6 +3027,251 @@ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + +static void test_header_override(int port) +{ + char buffer[128], host_header_override[30], full_url[128]; + HINTERNET ses, con, req; + DWORD size, count, err; + BOOL ret; + + sprintf(host_header_override, "Host: test.local:%d\r\n", port); + sprintf(full_url, "http://localhost:%d/test_host_override", port); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + err = GetLastError(); + ok(!ret, "HttpQueryInfo succeeded\n"); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + ok(ret, "HttpQueryInfo failed\n"); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + ok(!ret, "HttpAddRequestHeaders succeeded\n"); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + + InternetCloseHandle(req); + InternetSetCookieA("http://localhost", "cookie", "biscuit"); + req = HttpOpenRequestA(con, NULL, "/testC", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_cookie_set_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + InternetSetCookieA("http://test.local", "foo", "bar"); + req = HttpOpenRequestA(con, NULL, "/test_cookie_check_different_host", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_cookie_check_different_host", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpenA failed\n"); + + con = InternetConnectA(ses, "localhost", port, "test1", "pass", INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); + + req = HttpOpenRequestA( con, "HEAD", "/test_auth_host1", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); + + test_status_code(req, 200); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpenA failed\n"); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); + + req = HttpOpenRequestA(con, "HEAD", "/test_auth_host1", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + test_status_code(req, 200); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpenA failed\n"); + + con = InternetConnectA(ses, "localhost", port, "test1", "pass2", INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); + + req = HttpOpenRequestA(con, "HEAD", "/test_auth_host2", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); + + test_status_code(req, 200); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpenA failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); + + req = HttpOpenRequestA(con, "HEAD", "/test_auth_host2", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); test_status_code(req, 200); @@ -3540,7 +3899,7 @@ HINTERNET ses, con, req; DWORD size, error; BOOL ret; - char buffer[64]; + char buffer[256]; ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -3568,7 +3927,7 @@ size = sizeof(buffer); ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "cookie=not biscuit"), "got '%s' expected \'cookie=not biscuit\'\n", buffer); + ok(!!strstr(buffer, "cookie=not biscuit"), "got '%s' expected \'cookie=not biscuit\'\n", buffer); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); @@ -3579,9 +3938,61 @@ size = sizeof(buffer); ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "cookie=biscuit"), "got '%s' expected \'cookie=biscuit\'\n", buffer); + ok(!strstr(buffer, "cookie=not biscuit"), "'%s' should not contain \'cookie=not biscuit\'\n", buffer); + ok(!!strstr(buffer, "cookie=biscuit"), "'%s' should contain \'cookie=biscuit\'\n", buffer); InternetCloseHandle(req); + + InternetSetCookieA("http://localhost/testCCCC", "subcookie", "data"); + + req = HttpOpenRequestA(con, NULL, "/test_cookie_path1", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_cookie_path1/abc", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_cookie_set_path", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_cookie_path2", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_cookie_merge", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, "Cookie: manual_cookie=test\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed: %u\n", GetLastError()); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + InternetCloseHandle(req); + InternetCloseHandle(con); InternetCloseHandle(ses); } @@ -4162,8 +4573,10 @@ con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); + /* On XP there is a weird bug that the following tests fail if certain cookies + * are set. We workaround this problem by passing INTERNET_FLAG_NO_COOKIES as flag. */ req = HttpOpenRequestA(con, "POST", "/test_request_content_length", NULL, NULL, NULL, - INTERNET_FLAG_KEEP_CONNECTION, 0); + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_NO_COOKIES, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); @@ -4219,6 +4632,59 @@ InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); +} + +static void test_basic_auth_credentials_reuse(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "PUT", "/upload2.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); } static void test_http_connection(void) @@ -4248,6 +4714,7 @@ test_basic_request(si.port, "GET", "/test6"); test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); + test_header_override(si.port); test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port); @@ -4268,6 +4735,7 @@ test_head_request(si.port); test_request_content_length(si.port); test_accept_encoding(si.port); + test_basic_auth_credentials_reuse(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit"); @@ -4763,7 +5231,13 @@ ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed: %d\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + "HttpSendRequest failed: %d\n", GetLastError()); + if (!ret) + { + win_skip("Cannot connect to https.\n"); + goto done; + } size = sizeof(flags); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); @@ -4888,6 +5362,7 @@ } HeapFree(GetProcessHeap(), 0, certificate_structW); +done: InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); Modified: trunk/rostests/winetests/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/urlcach… ============================================================================== --- trunk/rostests/winetests/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/urlcache.c [iso-8859-1] Wed Jul 22 19:43:32 2015 @@ -222,16 +222,16 @@ * is NULL. */ ret = IsUrlCacheEntryExpiredA(NULL, 0, NULL); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(NULL, 0, &ft); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(ft.dwLowDateTime == 0xdeadbeef && ft.dwHighDateTime == 0xbaadf00d, "expected time to be unchanged, got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime); ret = IsUrlCacheEntryExpiredA(test_url, 0, NULL); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); /* The return value should indicate whether the URL is expired, * and the filetime indicates the last modified time, but a cache entry @@ -314,7 +314,7 @@ ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(uncached_url, 0, &ft); - ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(ret != ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(!ft.dwLowDateTime && !ft.dwHighDateTime, "expected time (0,0), got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime); @@ -367,6 +367,7 @@ static void test_urlcacheA(void) { + static char long_url[300] = "http://www.winehq.org/"; static char ok_header[] = "HTTP/1.0 200 OK\r\n\r\n"; BOOL ret; HANDLE hFile; @@ -376,6 +377,7 @@ DWORD cbCacheEntryInfo; static const FILETIME filetime_zero; FILETIME now; + int len; ret = CreateUrlCacheEntryA(test_url, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); @@ -811,6 +813,30 @@ ret = pDeleteUrlCacheEntryA(test_hash_collisions2); ok(ret, "DeleteUrlCacheEntry failed: %d\n", GetLastError()); } + + len = strlen(long_url); + memset(long_url+len, 'a', sizeof(long_url)-len); + long_url[sizeof(long_url)-1] = 0; + ret = CreateUrlCacheEntryA(long_url, 0, NULL, filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); + + ret = CreateUrlCacheEntryA(long_url, 0, "extension", filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); + + long_url[250] = 0; + ret = CreateUrlCacheEntryA(long_url, 0, NULL, filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); + + ret = CreateUrlCacheEntryA(long_url, 0, "extension", filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); } static void test_urlcacheW(void)

9 years, 1 month

[akhaldi] 68559: [WININET] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:43:18 2015 New Revision: 68559 URL: http://svn.reactos.org/svn/reactos?rev=68559&view=rev Log: [WININET] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/wininet.spec trunk/reactos/dll/win32/wininet/wininet_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… ============================================================================== --- trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -324,8 +324,10 @@ UnlockUrlCacheEntryStream(cookie, 0); cookie_container = get_cookie_container(domain, path, TRUE); - if(!cookie_container) - return FALSE; + if(!cookie_container) { + heap_free(str); + return FALSE; + } GetSystemTimeAsFileTime(&time); for(pbeg=str; pbeg && *pbeg; name=data=NULL) { @@ -926,6 +928,7 @@ static const WCHAR szExpires[] = {'e','x','p','i','r','e','s','=',0}; static const WCHAR szSecure[] = {'s','e','c','u','r','e',0}; static const WCHAR szHttpOnly[] = {'h','t','t','p','o','n','l','y',0}; + static const WCHAR szVersion[] = {'v','e','r','s','i','o','n','=',0}; if (!(ptr = strchrW(ptr,';'))) break; *ptr++ = 0; @@ -1006,6 +1009,11 @@ cookie_flags |= INTERNET_COOKIE_HTTPONLY; ptr += strlenW(szHttpOnly); } + else if (strncmpiW(ptr, szVersion, 8) == 0) + { + FIXME("version not handled (%s)\n",debugstr_w(ptr)); + ptr += strlenW(szVersion); + } else if (*ptr) { FIXME("Unknown additional option %s\n",debugstr_w(ptr)); Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -557,6 +557,15 @@ } /*********************************************************************** + * ParseX509EncodedCertificateForListBoxEntry (@) + */ +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) +{ + FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * ShowX509EncodedCertificate (@) */ DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… ============================================================================== --- trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -1199,7 +1199,7 @@ res = sock_send(lpwh->nDataSocket, buffer, size, 0); *written = res>0 ? res : 0; - return res >= 0 ? ERROR_SUCCESS : sock_get_error(); + return res >= 0 ? ERROR_SUCCESS : WSAGetLastError(); } static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) @@ -2541,7 +2541,7 @@ if (connect(nsocket, (struct sockaddr *)&socketAddr, sock_namelen) < 0) { - ERR("Unable to connect (%d)\n", sock_get_error()); + ERR("Unable to connect (%d)\n", WSAGetLastError()); INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); closesocket(nsocket); } Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -362,9 +362,16 @@ EnterCriticalSection( &req->headers_section ); if ((header = HTTP_GetHeader( req, hostW ))) ret = heap_strdupW( header->lpszValue ); + else ret = heap_strdupW( req->server->canon_host_port ); LeaveCriticalSection( &req->headers_section ); return ret; } + +typedef enum { + BLOCKING_ALLOW, + BLOCKING_DISALLOW, + BLOCKING_WAITALL +} blocking_mode_t; struct data_stream_vtbl_t { DWORD (*get_avail_data)(data_stream_t*,http_request_t*); @@ -394,7 +401,7 @@ destroy_data_stream(req->data_stream); req->data_stream = &req->netconn_stream.data_stream; req->read_pos = req->read_size = req->netconn_stream.content_read = 0; - req->read_chunked = req->read_gzip = FALSE; + req->read_gzip = FALSE; } static void remove_header( http_request_t *request, const WCHAR *str, BOOL from_request ) @@ -743,25 +750,28 @@ int HeaderIndex; int numCookies = 0; LPHTTPHEADERW setCookieHeader; + WCHAR *path, *tmp; if(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) return; + path = heap_strdupW(request->path); + if (!path) + return; + + tmp = strrchrW(path, '/'); + if (tmp && tmp[1]) tmp[1] = 0; + EnterCriticalSection( &request->headers_section ); while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1) { - HTTPHEADERW *host; const WCHAR *data; WCHAR *name; setCookieHeader = &request->custHeaders[HeaderIndex]; if (!setCookieHeader->lpszValue) - continue; - - host = HTTP_GetHeader(request, hostW); - if(!host) continue; data = strchrW(setCookieHeader->lpszValue, '='); @@ -773,11 +783,12 @@ continue; data++; - set_cookie(host->lpszValue, request->path, name, data, INTERNET_COOKIE_HTTPONLY); + set_cookie(request->server->name, path, name, data, INTERNET_COOKIE_HTTPONLY); heap_free(name); } LeaveCriticalSection( &request->headers_section ); + heap_free(path); } static void strip_spaces(LPWSTR start) @@ -849,7 +860,7 @@ heap_free(authinfo); } -static UINT retrieve_cached_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR *auth_data) +static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR *realm, char **auth_data) { basicAuthorizationData *ad; UINT rc = 0; @@ -859,7 +870,7 @@ EnterCriticalSection(&authcache_cs); LIST_FOR_EACH_ENTRY(ad, &basicAuthorizationCache, basicAuthorizationData, entry) { - if (!strcmpiW(host,ad->host) && !strcmpW(realm,ad->realm)) + if (!strcmpiW(host, ad->host) && (!realm || !strcmpW(realm, ad->realm))) { TRACE("Authorization found in cache\n"); *auth_data = heap_alloc(ad->authorizationLen); @@ -1541,40 +1552,17 @@ return n; } -#define CH(x) (((x) >= 'A' && (x) <= 'Z') ? (x) - 'A' : \ - ((x) >= 'a' && (x) <= 'z') ? (x) - 'a' + 26 : \ - ((x) >= '0' && (x) <= '9') ? (x) - '0' + 52 : \ - ((x) == '+') ? 62 : ((x) == '/') ? 63 : -1) -static const signed char HTTP_Base64Dec[256] = -{ - CH( 0),CH( 1),CH( 2),CH( 3),CH( 4),CH( 5),CH( 6),CH( 7),CH( 8),CH( 9), - CH(10),CH(11),CH(12),CH(13),CH(14),CH(15),CH(16),CH(17),CH(18),CH(19), - CH(20),CH(21),CH(22),CH(23),CH(24),CH(25),CH(26),CH(27),CH(28),CH(29), - CH(30),CH(31),CH(32),CH(33),CH(34),CH(35),CH(36),CH(37),CH(38),CH(39), - CH(40),CH(41),CH(42),CH(43),CH(44),CH(45),CH(46),CH(47),CH(48),CH(49), - CH(50),CH(51),CH(52),CH(53),CH(54),CH(55),CH(56),CH(57),CH(58),CH(59), - CH(60),CH(61),CH(62),CH(63),CH(64),CH(65),CH(66),CH(67),CH(68),CH(69), - CH(70),CH(71),CH(72),CH(73),CH(74),CH(75),CH(76),CH(77),CH(78),CH(79), - CH(80),CH(81),CH(82),CH(83),CH(84),CH(85),CH(86),CH(87),CH(88),CH(89), - CH(90),CH(91),CH(92),CH(93),CH(94),CH(95),CH(96),CH(97),CH(98),CH(99), - CH(100),CH(101),CH(102),CH(103),CH(104),CH(105),CH(106),CH(107),CH(108),CH(109), - CH(110),CH(111),CH(112),CH(113),CH(114),CH(115),CH(116),CH(117),CH(118),CH(119), - CH(120),CH(121),CH(122),CH(123),CH(124),CH(125),CH(126),CH(127),CH(128),CH(129), - CH(130),CH(131),CH(132),CH(133),CH(134),CH(135),CH(136),CH(137),CH(138),CH(139), - CH(140),CH(141),CH(142),CH(143),CH(144),CH(145),CH(146),CH(147),CH(148),CH(149), - CH(150),CH(151),CH(152),CH(153),CH(154),CH(155),CH(156),CH(157),CH(158),CH(159), - CH(160),CH(161),CH(162),CH(163),CH(164),CH(165),CH(166),CH(167),CH(168),CH(169), - CH(170),CH(171),CH(172),CH(173),CH(174),CH(175),CH(176),CH(177),CH(178),CH(179), - CH(180),CH(181),CH(182),CH(183),CH(184),CH(185),CH(186),CH(187),CH(188),CH(189), - CH(190),CH(191),CH(192),CH(193),CH(194),CH(195),CH(196),CH(197),CH(198),CH(199), - CH(200),CH(201),CH(202),CH(203),CH(204),CH(205),CH(206),CH(207),CH(208),CH(209), - CH(210),CH(211),CH(212),CH(213),CH(214),CH(215),CH(216),CH(217),CH(218),CH(219), - CH(220),CH(221),CH(222),CH(223),CH(224),CH(225),CH(226),CH(227),CH(228),CH(229), - CH(230),CH(231),CH(232),CH(233),CH(234),CH(235),CH(236),CH(237),CH(238),CH(239), - CH(240),CH(241),CH(242),CH(243),CH(244),CH(245),CH(246),CH(247),CH(248), CH(249), - CH(250),CH(251),CH(252),CH(253),CH(254),CH(255), +static const signed char HTTP_Base64Dec[] = +{ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70 */ }; -#undef CH /*********************************************************************** * HTTP_DecodeBase64 @@ -1629,6 +1617,21 @@ return n; } +static WCHAR *encode_auth_data( const WCHAR *scheme, const char *data, UINT data_len ) +{ + WCHAR *ret; + UINT len, scheme_len = strlenW( scheme ); + + /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */ + len = scheme_len + 1 + ((data_len + 2) * 4) / 3; + if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, scheme, scheme_len * sizeof(WCHAR) ); + ret[scheme_len] = ' '; + HTTP_EncodeBase64( data, data_len, ret + scheme_len + 1 ); + return ret; +} + + /*********************************************************************** * HTTP_InsertAuthorization * @@ -1636,26 +1639,15 @@ */ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthInfo *pAuthInfo, LPCWSTR header ) { + static const WCHAR wszBasic[] = {'B','a','s','i','c',0}; + WCHAR *host, *authorization = NULL; + if (pAuthInfo) { - static const WCHAR wszSpace[] = {' ',0}; - static const WCHAR wszBasic[] = {'B','a','s','i','c',0}; - unsigned int len; - WCHAR *authorization = NULL; - if (pAuthInfo->auth_data_len) { - /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */ - len = strlenW(pAuthInfo->scheme)+1+((pAuthInfo->auth_data_len+2)*4)/3; - authorization = heap_alloc((len+1)*sizeof(WCHAR)); - if (!authorization) + if (!(authorization = encode_auth_data(pAuthInfo->scheme, pAuthInfo->auth_data, pAuthInfo->auth_data_len))) return FALSE; - - strcpyW(authorization, pAuthInfo->scheme); - strcatW(authorization, wszSpace); - HTTP_EncodeBase64(pAuthInfo->auth_data, - pAuthInfo->auth_data_len, - authorization+strlenW(authorization)); /* clear the data as it isn't valid now that it has been sent to the * server, unless it's Basic authentication which doesn't do @@ -1670,8 +1662,34 @@ TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(authorization); + } + else if (!strcmpW(header, szAuthorization) && (host = get_host_header(request))) + { + UINT data_len; + char *data; + + if ((data_len = retrieve_cached_basic_authorization(host, NULL, &data))) + { + TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); + + if (!(authorization = encode_auth_data(wszBasic, data, data_len))) + { + heap_free(data); + heap_free(host); + return FALSE; + } + + TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); + + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); + heap_free(data); + heap_free(authorization); + } + heap_free(host); } return TRUE; } @@ -1864,20 +1882,21 @@ static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; static const WCHAR slash[] = { '/',0 }; LPHTTPHEADERW host_header; + const WCHAR *host; LPCWSTR scheme; + EnterCriticalSection( &req->headers_section ); + host_header = HTTP_GetHeader(req, hostW); - if(!host_header) - return FALSE; - - EnterCriticalSection( &req->headers_section ); + if (host_header) host = host_header->lpszValue; + else host = req->server->canon_host_port; if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) scheme = https; else scheme = http; strcpyW(buf, scheme); - strcatW(buf, host_header->lpszValue); + strcatW(buf, host); if (req->path[0] != '/') strcatW(buf, slash); strcatW(buf, req->path); @@ -2123,16 +2142,12 @@ case INTERNET_OPTION_URL: { static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; WCHAR url[INTERNET_MAX_URL_LENGTH]; - HTTPHEADERW *host; TRACE("INTERNET_OPTION_URL\n"); - EnterCriticalSection( &req->headers_section ); - host = HTTP_GetHeader(req, hostW); strcpyW(url, httpW); - strcatW(url, host->lpszValue); + strcatW(url, req->server->canon_host_port); strcatW(url, req->path); - LeaveCriticalSection( &req->headers_section ); TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); return str_to_buffer(url, buffer, size, unicode); @@ -2499,7 +2514,7 @@ if (maxlen == -1) maxlen = sizeof(req->read_buf); res = NETCON_recv( req->netconn, req->read_buf + req->read_size, - maxlen - req->read_size, BLOCKING_ALLOW, &len ); + maxlen - req->read_size, TRUE, &len ); if(res == ERROR_SUCCESS) req->read_size += len; @@ -2645,24 +2660,28 @@ { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD res = ERROR_SUCCESS; - int len = 0; + int len = 0, ret = 0; size = min(size, netconn_stream->content_length-netconn_stream->content_read); if(size && is_valid_netconn(req->netconn)) { - if((res = NETCON_recv(req->netconn, buf, size, blocking_mode, &len))) { - len = 0; - if(blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK) - res = ERROR_SUCCESS; - else + while((res = NETCON_recv(req->netconn, buf+ret, size-ret, blocking_mode != BLOCKING_DISALLOW, &len)) == ERROR_SUCCESS) { + if(!len) { netconn_stream->content_length = netconn_stream->content_read; - }else if(!len) { - netconn_stream->content_length = netconn_stream->content_read; - } - } - - netconn_stream->content_read += *read = len; - TRACE("read %u bytes\n", len); + break; + } + ret += len; + netconn_stream->content_read += len; + if(blocking_mode != BLOCKING_WAITALL || size == ret) + break; + } + + if(ret || (blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK)) + res = ERROR_SUCCESS; + } + + TRACE("read %u bytes\n", ret); + *read = ret; return res; } @@ -2676,7 +2695,7 @@ return TRUE; do { - if(NETCON_recv(req->netconn, buf, sizeof(buf), BLOCKING_DISALLOW, &len) != ERROR_SUCCESS) + if(NETCON_recv(req->netconn, buf, sizeof(buf), FALSE, &len) != ERROR_SUCCESS) return FALSE; netconn_stream->content_read += len; @@ -2716,7 +2735,7 @@ if (maxlen == -1) maxlen = sizeof(stream->buf); res = NETCON_recv( req->netconn, stream->buf + stream->buf_size, - maxlen - stream->buf_size, BLOCKING_ALLOW, &len ); + maxlen - stream->buf_size, TRUE, &len ); if(res == ERROR_SUCCESS) stream->buf_size += len; @@ -2777,8 +2796,19 @@ if (req->contentLength == ~0u) req->contentLength = chunk_size; else req->contentLength += chunk_size; - if (!chunk_size) stream->end_of_data = TRUE; - return discard_chunked_eol(stream, req); + /* eat the rest of this line */ + if ((res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) + return res; + + /* if there's chunk data, return now */ + if (chunk_size) return ERROR_SUCCESS; + + /* otherwise, eat the terminator for this chunk */ + if ((res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) + return res; + + stream->end_of_data = TRUE; + return ERROR_SUCCESS; } remove_chunked_data(stream, 1); } @@ -2841,7 +2871,7 @@ break; } - res = NETCON_recv(req->netconn, (char *)buf+ret_read, read_bytes, BLOCKING_ALLOW, (int*)&read_bytes); + res = NETCON_recv(req->netconn, (char *)buf+ret_read, read_bytes, TRUE, (int*)&read_bytes); if(res != ERROR_SUCCESS) break; } @@ -2930,7 +2960,6 @@ request->data_stream = &chunked_stream->data_stream; request->contentLength = ~0u; - request->read_chunked = TRUE; } if(request->decoding) { @@ -3379,14 +3408,12 @@ HTTP_ProcessHeader(request, HTTP_ACCEPT, lpszAcceptTypes[i], HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA | HTTP_ADDHDR_FLAG_REQ | - (i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0)); + (i == 0 ? (HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD) : 0)); } } request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : g_szHttp1_1); - - HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) HTTP_DealWithProxy( hIC, session, request ); @@ -3540,7 +3567,7 @@ LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex) { LPHTTPHEADERW lphttpHdr = NULL; - BOOL request_only = dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS; + BOOL request_only = !!(dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS); INT requested_index = lpdwIndex ? *lpdwIndex : 0; DWORD level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK); INT index = -1; @@ -4219,8 +4246,8 @@ if(res != ERROR_SUCCESS || !cookies) return; - get_cookie_header(request->server->name, request->path, &cookies); - HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); + HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(cookies); } @@ -4880,6 +4907,9 @@ if (!request->verb) request->verb = heap_strdupW(szGET); + HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, + HTTP_ADDREQ_FLAG_ADD_IF_NEW | HTTP_ADDHDR_FLAG_REQ); + if (dwContentLength || strcmpW(request->verb, szGET)) { sprintfW(contentLengthStr, szContentLength, dwContentLength); @@ -4941,7 +4971,8 @@ HTTP_FixURL(request); if (request->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) { - HTTP_ProcessHeader(request, szConnection, szKeepAlive, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, szConnection, szKeepAlive, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); } HTTP_InsertAuthorization(request, request->authInfo, szAuthorization); HTTP_InsertAuthorization(request, request->proxyAuthInfo, szProxy_Authorization); @@ -5089,7 +5120,7 @@ dwBufferSize=2048; if (request->status_code == HTTP_STATUS_DENIED) { - WCHAR *host = get_host_header( request ); + WCHAR *host = heap_strdupW( request->server->canon_host_port ); DWORD dwIndex = 0; while (HTTP_HttpQueryInfoW(request,HTTP_QUERY_WWW_AUTHENTICATE,szAuthValue,&dwBufferSize,&dwIndex) == ERROR_SUCCESS) { @@ -5830,8 +5861,8 @@ session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; - session->send_timeout = INFINITE; - session->receive_timeout = INFINITE; + session->send_timeout = 0; + session->receive_timeout = 0; /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(session->hdr.dwInternalFlags & INET_OPENURL)) @@ -5958,7 +5989,7 @@ /* Add status code */ HTTP_ProcessHeader(request, szStatus, status_code, - HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(request->version); heap_free(request->statusText); @@ -6075,34 +6106,112 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier) { - LPHTTPHEADERW lphttpHdr = NULL; + LPHTTPHEADERW lphttpHdr; INT index; - BOOL request_only = dwModifier & HTTP_ADDHDR_FLAG_REQ; - DWORD res = ERROR_HTTP_INVALID_HEADER; + BOOL request_only = !!(dwModifier & HTTP_ADDHDR_FLAG_REQ); + DWORD res = ERROR_SUCCESS; TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier); EnterCriticalSection( &request->headers_section ); - /* REPLACE wins out over ADD */ - if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) - dwModifier &= ~HTTP_ADDHDR_FLAG_ADD; - - if (dwModifier & HTTP_ADDHDR_FLAG_ADD) - index = -1; - else - index = HTTP_GetCustomHeaderIndex(request, field, 0, request_only); - + index = HTTP_GetCustomHeaderIndex(request, field, 0, request_only); if (index >= 0) { + lphttpHdr = &request->custHeaders[index]; + + /* replace existing header if FLAG_REPLACE is given */ + if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) + { + HTTP_DeleteCustomHeader( request, index ); + + if (value && value[0]) + { + HTTPHEADERW hdr; + + hdr.lpszField = (LPWSTR)field; + hdr.lpszValue = (LPWSTR)value; + hdr.wFlags = hdr.wCount = 0; + + if (dwModifier & HTTP_ADDHDR_FLAG_REQ) + hdr.wFlags |= HDR_ISREQUEST; + + res = HTTP_InsertCustomHeader( request, &hdr ); + } + + goto out; + } + + /* do not add new header if FLAG_ADD_IF_NEW is set */ if (dwModifier & HTTP_ADDHDR_FLAG_ADD_IF_NEW) { - LeaveCriticalSection( &request->headers_section ); - return ERROR_HTTP_INVALID_HEADER; - } - lphttpHdr = &request->custHeaders[index]; - } - else if (value) + res = ERROR_HTTP_INVALID_HEADER; /* FIXME */ + goto out; + } + + /* handle appending to existing header */ + if (dwModifier & COALESCEFLAGS) + { + LPWSTR lpsztmp; + WCHAR ch = 0; + INT len = 0; + INT origlen = strlenW(lphttpHdr->lpszValue); + INT valuelen = strlenW(value); + + /* FIXME: Should it really clear HDR_ISREQUEST? */ + if (dwModifier & HTTP_ADDHDR_FLAG_REQ) + lphttpHdr->wFlags |= HDR_ISREQUEST; + else + lphttpHdr->wFlags &= ~HDR_ISREQUEST; + + if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA) + { + ch = ','; + lphttpHdr->wFlags |= HDR_COMMADELIMITED; + } + else if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) + { + ch = ';'; + lphttpHdr->wFlags |= HDR_COMMADELIMITED; + } + + len = origlen + valuelen + ((ch > 0) ? 2 : 0); + + lpsztmp = heap_realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR)); + if (lpsztmp) + { + lphttpHdr->lpszValue = lpsztmp; + /* FIXME: Increment lphttpHdr->wCount. Perhaps lpszValue should be an array */ + if (ch > 0) + { + lphttpHdr->lpszValue[origlen] = ch; + origlen++; + lphttpHdr->lpszValue[origlen] = ' '; + origlen++; + } + + memcpy(&lphttpHdr->lpszValue[origlen], value, valuelen*sizeof(WCHAR)); + lphttpHdr->lpszValue[len] = '\0'; + } + else + { + WARN("heap_realloc (%d bytes) failed\n",len+1); + res = ERROR_OUTOFMEMORY; + } + + goto out; + } + } + + /* FIXME: What about other combinations? */ + if ((dwModifier & ~HTTP_ADDHDR_FLAG_REQ) == HTTP_ADDHDR_FLAG_REPLACE) + { + res = ERROR_HTTP_HEADER_NOT_FOUND; + goto out; + } + + /* FIXME: What if value == ""? */ + if (value) { HTTPHEADERW hdr; @@ -6113,89 +6222,12 @@ if (dwModifier & HTTP_ADDHDR_FLAG_REQ) hdr.wFlags |= HDR_ISREQUEST; - res = HTTP_InsertCustomHeader(request, &hdr); - LeaveCriticalSection( &request->headers_section ); - return res; - } - /* no value to delete */ - else - { - LeaveCriticalSection( &request->headers_section ); - return ERROR_SUCCESS; - } - - if (dwModifier & HTTP_ADDHDR_FLAG_REQ) - lphttpHdr->wFlags |= HDR_ISREQUEST; - else - lphttpHdr->wFlags &= ~HDR_ISREQUEST; - - if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) - { - HTTP_DeleteCustomHeader( request, index ); - - if (value && value[0]) - { - HTTPHEADERW hdr; - - hdr.lpszField = (LPWSTR)field; - hdr.lpszValue = (LPWSTR)value; - hdr.wFlags = hdr.wCount = 0; - - if (dwModifier & HTTP_ADDHDR_FLAG_REQ) - hdr.wFlags |= HDR_ISREQUEST; - - res = HTTP_InsertCustomHeader(request, &hdr); - LeaveCriticalSection( &request->headers_section ); - return res; - } - - LeaveCriticalSection( &request->headers_section ); - return ERROR_SUCCESS; - } - else if (dwModifier & COALESCEFLAGS) - { - LPWSTR lpsztmp; - WCHAR ch = 0; - INT len = 0; - INT origlen = strlenW(lphttpHdr->lpszValue); - INT valuelen = strlenW(value); - - if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA) - { - ch = ','; - lphttpHdr->wFlags |= HDR_COMMADELIMITED; - } - else if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) - { - ch = ';'; - lphttpHdr->wFlags |= HDR_COMMADELIMITED; - } - - len = origlen + valuelen + ((ch > 0) ? 2 : 0); - - lpsztmp = heap_realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR)); - if (lpsztmp) - { - lphttpHdr->lpszValue = lpsztmp; - /* FIXME: Increment lphttpHdr->wCount. Perhaps lpszValue should be an array */ - if (ch > 0) - { - lphttpHdr->lpszValue[origlen] = ch; - origlen++; - lphttpHdr->lpszValue[origlen] = ' '; - origlen++; - } - - memcpy(&lphttpHdr->lpszValue[origlen], value, valuelen*sizeof(WCHAR)); - lphttpHdr->lpszValue[len] = '\0'; - res = ERROR_SUCCESS; - } - else - { - WARN("heap_realloc (%d bytes) failed\n",len+1); - res = ERROR_OUTOFMEMORY; - } - } + res = HTTP_InsertCustomHeader( request, &hdr ); + goto out; + } + + /* FIXME: What if value == NULL? */ +out: TRACE("<-- %d\n", res); LeaveCriticalSection( &request->headers_section ); return res; Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -711,7 +711,7 @@ if (wpi.proxyEnabled) { - TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); + TRACE("http proxy = %s bypass = %s\n", debugstr_w(wpi.proxy), debugstr_w(wpi.proxyBypass)); lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; lpwai->proxy = wpi.proxy; Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -129,6 +129,7 @@ { int socket; BOOL secure; + BOOL is_blocking; CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; server_t *server; @@ -416,7 +417,6 @@ CRITICAL_SECTION read_section; /* section to protect the following fields */ DWORD contentLength; /* total number of bytes to be read */ - BOOL read_chunked; /* are we reading in chunked mode? */ BOOL read_gzip; /* are we reading in gzip mode? */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ @@ -476,12 +476,6 @@ DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; - -typedef enum { - BLOCKING_ALLOW, - BLOCKING_DISALLOW, - BLOCKING_WAITALL -} blocking_mode_t; DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; @@ -489,17 +483,16 @@ DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; -DWORD NETCON_recv(netconn_t*,void*,size_t,blocking_mode_t,int*) DECLSPEC_HIDDEN; +DWORD NETCON_recv(netconn_t*,void*,size_t,BOOL,int*) DECLSPEC_HIDDEN; BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) DECLSPEC_HIDDEN; BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN; LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; -int sock_get_error(void) DECLSPEC_HIDDEN; int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; -server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); +server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN; DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN; void req_file_release(req_file_t*) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -273,10 +273,13 @@ InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); } -static void set_socket_blocking(int socket, blocking_mode_t mode) -{ - ULONG arg = mode == BLOCKING_DISALLOW; - ioctlsocket(socket, FIONBIO, &arg); +static void set_socket_blocking(netconn_t *conn, BOOL is_blocking) +{ + if(conn->is_blocking != is_blocking) { + ULONG arg = !is_blocking; + ioctlsocket(conn->socket, FIONBIO, &arg); + } + conn->is_blocking = is_blocking; } static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) @@ -290,11 +293,11 @@ assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { - set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); + set_socket_blocking(netconn, FALSE); result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { - res = sock_get_error(); + res = WSAGetLastError(); if (res == WSAEINPROGRESS || res == WSAEWOULDBLOCK) { FD_SET set; int res; @@ -317,9 +320,6 @@ { closesocket(netconn->socket); netconn->socket = -1; - } - else { - set_socket_blocking(netconn->socket, BLOCKING_ALLOW); } } if(result == -1) @@ -399,13 +399,8 @@ if(have_compat_cred_handle) FreeCredentialsHandle(&compat_cred_handle); DeleteCriticalSection(&init_sechandle_cs); - WSACleanup(); -} - -/* translate a unix error code into a winsock one */ -int sock_get_error(void) -{ - return WSAGetLastError(); + if(winsock_loaded) + WSACleanup(); } int sock_send(int fd, const void *msg, size_t len, int flags) @@ -415,7 +410,7 @@ { ret = send(fd, msg, len, flags); } - while(ret == -1 && sock_get_error() == WSAEINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -426,7 +421,7 @@ { ret = recv(fd, msg, len, flags); } - while(ret == -1 && sock_get_error() == WSAEINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -466,6 +461,8 @@ assert(status != SEC_E_OK); + set_socket_blocking(connection, TRUE); + while(status == SEC_I_CONTINUE_NEEDED || status == SEC_E_INCOMPLETE_MESSAGE) { if(out_buf.cbBuffer) { assert(status == SEC_I_CONTINUE_NEEDED); @@ -660,10 +657,13 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) { + /* send is always blocking. */ + set_socket_blocking(connection, TRUE); + if(!connection->secure) { *sent = sock_send(connection->socket, msg, len, flags); - return *sent == -1 ? sock_get_error() : ERROR_SUCCESS; + return *sent == -1 ? WSAGetLastError() : ERROR_SUCCESS; } else { @@ -686,21 +686,16 @@ } } -static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking_mode_t mode, SIZE_T *ret_size, BOOL *eof) +static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blocking, SIZE_T *ret_size, BOOL *eof) { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; SSIZE_T size, buf_len = 0; - blocking_mode_t tmp_mode; int i; SECURITY_STATUS res; assert(conn->extra_len < ssl_buf_size); - - /* BLOCKING_WAITALL is handled by caller */ - if(mode == BLOCKING_WAITALL) - mode = BLOCKING_ALLOW; if(conn->extra_len) { memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); @@ -710,12 +705,11 @@ conn->extra_buf = NULL; } - tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; - set_socket_blocking(conn->socket, tmp_mode); + set_socket_blocking(conn, blocking && !buf_len); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 0) { if(!buf_len) { - if(sock_get_error() == WSAEWOULDBLOCK) { + if(WSAGetLastError() == WSAEWOULDBLOCK) { TRACE("would block\n"); return WSAEWOULDBLOCK; } @@ -726,10 +720,10 @@ buf_len += size; } - *ret_size = buf_len; - if(!buf_len) { + TRACE("EOF\n"); *eof = TRUE; + *ret_size = 0; return ERROR_SUCCESS; } @@ -752,10 +746,10 @@ case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - set_socket_blocking(conn->socket, mode); + set_socket_blocking(conn, blocking); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) { - if(size < 0 && sock_get_error() == WSAEWOULDBLOCK) { + if(size < 0 && WSAGetLastError() == WSAEWOULDBLOCK) { TRACE("would block\n"); /* FIXME: Optimize extra_buf usage. */ @@ -815,7 +809,7 @@ * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t mode, int *recvd) +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, int *recvd) { *recvd = 0; if (!len) @@ -823,18 +817,13 @@ if (!connection->secure) { - int flags = 0; - - if(mode == BLOCKING_WAITALL) - flags = MSG_WAITALL; - - set_socket_blocking(connection->socket, mode); - *recvd = sock_recv(connection->socket, buf, len, flags); - return *recvd == -1 ? sock_get_error() : ERROR_SUCCESS; + set_socket_blocking(connection, blocking); + *recvd = sock_recv(connection->socket, buf, len, 0); + return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; } else { - SIZE_T size = 0, cread; + SIZE_T size = 0; BOOL eof; DWORD res; @@ -848,17 +837,13 @@ heap_free(connection->peek_msg_mem); connection->peek_msg_mem = connection->peek_msg = NULL; } - /* check if we have enough data from the peek buffer */ - if(mode != BLOCKING_WAITALL || size == len) { - *recvd = size; - return ERROR_SUCCESS; - } - - mode = BLOCKING_DISALLOW; + + *recvd = size; + return ERROR_SUCCESS; } do { - res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, mode, &cread, &eof); + res = read_ssl_chunk(connection, (BYTE*)buf, len, blocking, &size, &eof); if(res != ERROR_SUCCESS) { if(res == WSAEWOULDBLOCK) { if(size) @@ -868,14 +853,7 @@ } break; } - - if(eof) { - TRACE("EOF\n"); - break; - } - - size += cread; - }while(!size || (mode == BLOCKING_WAITALL && size < len)); + }while(!size && !eof); TRACE("received %ld bytes\n", size); *recvd = size; @@ -914,11 +892,10 @@ int len; char b; - set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); + set_socket_blocking(netconn, FALSE); len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); - set_socket_blocking(netconn->socket, BLOCKING_ALLOW); - - return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK); + + return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); } LPCVOID NETCON_GetCert(netconn_t *connection) @@ -947,26 +924,14 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) { int result; - struct timeval tv; - - /* value is in milliseconds, convert to struct timeval */ - if (value == INFINITE) - { - tv.tv_sec = 0; - tv.tv_usec = 0; - } - else - { - tv.tv_sec = value / 1000; - tv.tv_usec = (value % 1000) * 1000; - } + result = setsockopt(connection->socket, SOL_SOCKET, - send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, - sizeof(tv)); + send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&value, + sizeof(value)); if (result == -1) { WARN("setsockopt failed\n"); - return sock_get_error(); + return WSAGetLastError(); } return ERROR_SUCCESS; } Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -975,7 +975,8 @@ LPCSTR szLocalFileName, BYTE Directory, LPWSTR wszPath, - LPLONG lpBufferSize) + LPLONG lpBufferSize, + BOOL trunc_name) { LONG nRequired; int path_len = strlenW(pContainer->path); @@ -989,6 +990,8 @@ nRequired = (path_len + file_name_len) * sizeof(WCHAR); if(Directory != CACHE_CONTAINER_NO_SUBDIR) nRequired += (DIR_LENGTH + 1) * sizeof(WCHAR); + if (trunc_name && nRequired >= *lpBufferSize) + nRequired = *lpBufferSize; if (nRequired <= *lpBufferSize) { int dir_len; @@ -1004,7 +1007,9 @@ { dir_len = 0; } - MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len, file_name_len); + MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len, + *lpBufferSize/sizeof(WCHAR)-dir_len-path_len); + wszPath[*lpBufferSize/sizeof(WCHAR)-1] = 0; *lpBufferSize = nRequired; return TRUE; } @@ -1093,7 +1098,7 @@ if(!urlcache_create_file_pathW(container, header, (LPCSTR)url_entry+url_entry->local_name_off, - url_entry->cache_dir, path, &path_size)) + url_entry->cache_dir, path, &path_size, FALSE)) goto succ; if(!GetFileAttributesExW(path, GetFileExInfoStandard, &attr)) @@ -1291,9 +1296,6 @@ dos_date_time_to_file_time(url_entry->sync_date, url_entry->sync_time, &entry_info->LastSyncTime); } - if(size%4 && size<*info_size) - ZeroMemory((LPBYTE)entry_info+size, 4-size%4); - size = DWORD_ALIGN(size); if(unicode) url_len = urlcache_decode_url((const char*)url_entry+url_entry->url_off, NULL, 0); else @@ -1319,8 +1321,10 @@ LPSTR file_name; file_name = (LPSTR)entry_info+size; file_name_size = *info_size-size; - if((unicode && urlcache_create_file_pathW(container, header, (LPCSTR)url_entry+url_entry->local_name_off, url_entry->cache_dir, (LPWSTR)file_name, &file_name_size)) || - (!unicode && urlcache_create_file_pathA(container, header, (LPCSTR)url_entry+url_entry->local_name_off, url_entry->cache_dir, file_name, &file_name_size))) { + if((unicode && urlcache_create_file_pathW(container, header, (LPCSTR)url_entry+url_entry->local_name_off, + url_entry->cache_dir, (LPWSTR)file_name, &file_name_size, FALSE)) || + (!unicode && urlcache_create_file_pathA(container, header, (LPCSTR)url_entry+url_entry->local_name_off, + url_entry->cache_dir, file_name, &file_name_size))) { entry_info->lpszLocalFileName = file_name; } size += file_name_size; @@ -2612,7 +2616,7 @@ char file_name[MAX_PATH]; WCHAR extW[MAX_PATH]; BYTE cache_dir; - LONG full_path_len; + LONG full_path_len, ext_len = 0; BOOL generate_name = FALSE; DWORD error; HANDLE file; @@ -2643,6 +2647,8 @@ p--; } + if(e-p >= MAX_PATH) + e = p+MAX_PATH-1; memcpy(file_name, p, e-p); file_name[e-p] = 0; @@ -2682,7 +2688,7 @@ cache_dir = CACHE_CONTAINER_NO_SUBDIR; full_path_len = MAX_PATH * sizeof(WCHAR); - if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &full_path_len)) { + if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &full_path_len, TRUE)) { WARN("Failed to get full path for filename %s, needed %u bytes.\n", debugstr_a(file_name), full_path_len); cache_container_unlock_index(container, header); @@ -2696,7 +2702,7 @@ WCHAR *p; extW[0] = '.'; - MultiByteToWideChar(CP_ACP, 0, ext, -1, extW+1, MAX_PATH-1); + ext_len = MultiByteToWideChar(CP_ACP, 0, ext, -1, extW+1, MAX_PATH-1); for(p=extW; *p; p++) { switch(*p) { @@ -2714,6 +2720,10 @@ extW[0] = '\0'; } + if(!generate_name && full_path_len+5+ext_len>=MAX_PATH) { /* strlen("[255]") = 5 */ + full_path_len = MAX_PATH-5-ext_len-1; + } + for(i=0; i<255 && !generate_name; i++) { static const WCHAR format[] = {'[','%','u',']','%','s',0}; @@ -2726,6 +2736,9 @@ return TRUE; } } + + if(full_path_len+8+ext_len >= MAX_PATH) + full_path_len = MAX_PATH-8-ext_len-1; /* Try to generate random name */ GetSystemTimeAsFileTime(&ft); Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -216,7 +216,7 @@ @ stdcall IsUrlCacheEntryExpiredA(str long ptr) @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stdcall LoadUrlCacheContent() -@ stub ParseX509EncodedCertificateForListBoxEntry +@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr) @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) @ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -1,73 +1,15 @@ -diff -prudN e:\Wine\dlls\wininet/cookie.c e:\reactos-clean\dll\win32\wininet/cookie.c ---- e:\Wine\dlls\wininet/cookie.c 2013-03-02 14:18:01.994544800 +0100 -+++ e:\reactos-clean\dll\win32\wininet/cookie.c 2013-05-20 20:45:34.175815800 +0100 -@@ -250,6 +254,7 @@ static BOOL save_persistent_cookie(cooki - BOOL do_save = FALSE; - char buf[64], *dyn_buf; - FILETIME time; -+ DWORD dwBytesWritten; +diff -pudN e:\wine\dlls\wininet/http.c e:\reactos\dll\win32\wininet/http.c +--- e:\wine\dlls\wininet/http.c 2015-07-14 15:44:36.040192300 +0100 ++++ e:\reactos\dll\win32\wininet/http.c 2015-07-20 14:37:24.319646400 +0100 +@@ -143,6 +118,7 @@ static const WCHAR emptyW[] = {0}; - if (!create_cookie_url(domain->lpCookieDomain, domain->lpCookiePath, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) - return FALSE; -@@ -288,31 +293,31 @@ static BOOL save_persistent_cookie(cooki - continue; + #define COLLECT_TIME 60000 - dyn_buf = heap_strdupWtoA(cookie_container->lpCookieName); -- if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { -+ if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &dwBytesWritten, NULL)) { - heap_free(dyn_buf); - do_save = FALSE; - break; - } - heap_free(dyn_buf); -- if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { -+ if(!WriteFile(cookie_handle, "\n", 1, &dwBytesWritten, NULL)) { - do_save = FALSE; - break; - } ++#undef ARRAYSIZE + #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - dyn_buf = heap_strdupWtoA(cookie_container->lpCookieData); -- if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { -+ if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &dwBytesWritten, NULL)) { - heap_free(dyn_buf); - do_save = FALSE; - break; - } - heap_free(dyn_buf); -- if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { -+ if(!WriteFile(cookie_handle, "\n", 1, &dwBytesWritten, NULL)) { - do_save = FALSE; - break; - } - - dyn_buf = heap_strdupWtoA(domain->lpCookieDomain); -- if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { -+ if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &dwBytesWritten, NULL)) { - heap_free(dyn_buf); - do_save = FALSE; - break; -@@ -320,7 +325,7 @@ static BOOL save_persistent_cookie(cooki - heap_free(dyn_buf); - - dyn_buf = heap_strdupWtoA(domain->lpCookiePath); -- if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { -+ if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &dwBytesWritten, NULL)) { - heap_free(dyn_buf); - do_save = FALSE; - break; -@@ -330,7 +335,7 @@ static BOOL save_persistent_cookie(cooki - sprintf(buf, "\n%u\n%u\n%u\n%u\n%u\n*\n", cookie_container->flags, - cookie_container->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime, - cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime); -- if(!WriteFile(cookie_handle, buf, strlen(buf), NULL, NULL)) { -+ if(!WriteFile(cookie_handle, buf, strlen(buf), &dwBytesWritten, NULL)) { - do_save = FALSE; - break; - } -diff -prudN e:\Wine\dlls\wininet/http.c e:\reactos-clean\dll\win32\wininet/http.c ---- e:\Wine\dlls\wininet/http.c 2013-03-16 11:54:52.608610100 +0100 -+++ e:\reactos-clean\dll\win32\wininet/http.c 2013-05-20 16:36:21.826074500 +0100 -@@ -242,7 +249,13 @@ void server_release(server_t *server) + struct HttpAuthInfo +@@ -229,7 +205,13 @@ void server_release(server_t *server) if(InterlockedDecrement(&server->ref)) return; @@ -81,17 +23,20 @@ if(server->cert_chain) CertFreeCertificateChain(server->cert_chain); -@@ -324,7 +337,7 @@ BOOL collect_connections(collect_type_t +@@ -311,7 +293,11 @@ BOOL collect_connections(collect_type_t BOOL remaining = FALSE; DWORD64 now; -- now = GetTickCount64(); ++#ifdef __REACTOS__ + now = GetTickCount(); ++#else + now = GetTickCount64(); ++#endif LIST_FOR_EACH_ENTRY_SAFE(server, server_safe, &connection_pool, server_t, entry) { LIST_FOR_EACH_ENTRY_SAFE(netconn, netconn_safe, &server->conn_pool, netconn_t, pool_entry) { -@@ -1870,13 +1883,14 @@ static void http_release_netconn(http_re - if(!req->netconn) +@@ -1973,13 +1959,14 @@ static void http_release_netconn(http_re + if(!is_valid_netconn(req->netconn)) return; +#ifndef __REACTOS__ @@ -106,185 +51,57 @@ req->netconn = NULL; run_collector = !collector_running; -@@ -1904,6 +1918,10 @@ static void http_release_netconn(http_re +@@ -2007,6 +1994,10 @@ static void http_release_netconn(http_re } return; } +#else -+ // silence unused function warning ++ /* Silence unused function warning */ + (void)collect_connections_proc; +#endif INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); -diff -prudN e:\Wine\dlls\wininet/internet.c e:\reactos-clean\dll\win32\wininet/internet.c ---- e:\Wine\dlls\wininet/internet.c 2013-03-16 11:54:52.609610800 +0100 -+++ e:\reactos-clean\dll\win32\wininet/internet.c 2013-05-20 16:43:55.864085500 +0100 -@@ -292,11 +297,9 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, - if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) - return FALSE; - -- if(!init_urlcache()) -- { -- TlsFree(g_dwTlsErrIndex); -- return FALSE; -- } -+#ifndef __REACTOS__ -+ URLCacheContainers_CreateDefaults(); -+#endif - - WININET_hModule = hinstDLL; - break; -@@ -750,6 +753,9 @@ static VOID APPINFO_Destroy(object_heade - heap_free(lpwai->proxyBypass); - heap_free(lpwai->proxyUsername); - heap_free(lpwai->proxyPassword); -+#ifdef __REACTOS__ -+ WSACleanup(); -+#endif - } - - static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) -@@ -945,6 +951,11 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR l - LPCWSTR lpszProxy, LPCWSTR lpszProxyBypass, DWORD dwFlags) +diff -pudN e:\wine\dlls\wininet/internet.c e:\reactos\dll\win32\wininet/internet.c +--- e:\wine\dlls\wininet/internet.c 2015-04-12 18:21:54.309796800 +0100 ++++ e:\reactos\dll\win32\wininet/internet.c 2015-07-20 14:38:19.188784800 +0100 +@@ -1033,6 +996,9 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR l { appinfo_t *lpwai = NULL; + +#ifdef __REACTOS__ -+ WSADATA wsaData; -+ int error = WSAStartup(MAKEWORD(2, 2), &wsaData); -+ if (error) ERR("WSAStartup failed: %d\n", error); ++ init_winsock(); +#endif - if (TRACE_ON(wininet)) { #define FE(x) { x, #x } -@@ -3759,19 +3770,23 @@ LPSTR INTERNET_GetResponseBuffer(void) - - LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) - { -- struct pollfd pfd; -+ // ReactOS: use select instead of poll -+ fd_set infd; -+ struct timeval tv; - BOOL bSuccess = FALSE; - INT nRecv = 0; - LPSTR lpszBuffer = INTERNET_GetResponseBuffer(); - - TRACE("\n"); - -- pfd.fd = nSocket; -- pfd.events = POLLIN; -+ FD_ZERO(&infd); -+ FD_SET(nSocket,&infd); -+ tv.tv_sec = RESPONSE_TIMEOUT; -+ tv.tv_usec = 0; - - while (nRecv < MAX_REPLY_LEN) - { -- if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) -+ if (select(0, &infd, NULL, NULL, &tv) > 0) - { - if (recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) - { -diff -prudN e:\Wine\dlls\wininet/internet.h e:\reactos-clean\dll\win32\wininet/internet.h ---- e:\Wine\dlls\wininet/internet.h 2013-03-02 14:18:02.010553900 +0100 -+++ e:\reactos-clean\dll\win32\wininet/internet.h 2013-05-20 17:12:12.531037400 +0100 -@@ -419,7 +419,30 @@ BOOL NETCON_is_alive(netconn_t*) DECLSPE - LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; - int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; - DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; -+#ifndef __REACTOS__ - int sock_get_error(int) DECLSPEC_HIDDEN; -+#else -+#define sock_get_error(x) WSAGetLastError() -+const char *inet_ntop(int, const void *, char *, socklen_t); -+ -+static inline long unix_recv(int socket, void *buffer, size_t length, int flags) -+{ -+ return recv(socket, buffer, length, flags); -+} -+#define recv unix_recv -+ -+static inline int unix_ioctl(int filedes, long request, void *arg) -+{ -+ return ioctlsocket(filedes, request, arg); -+} -+#define ioctlsocket unix_ioctl -+ -+static inline int unix_getsockopt(int socket, int level, int option_name, void *option_value, socklen_t *option_len) -+{ -+ return getsockopt(socket, level, option_name, option_value, option_len); -+} -+#define getsockopt unix_getsockopt -+#endif - - server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); - -diff -prudN e:\Wine\dlls\wininet/netconnection.c e:\reactos-clean\dll\win32\wininet/netconnection.c ---- e:\Wine\dlls\wininet/netconnection.c 2013-03-16 11:54:52.610611400 +0100 -+++ e:\reactos-clean\dll\win32\wininet/netconnection.c 2013-05-20 17:12:51.246334100 +0100 -@@ -619,12 +624,16 @@ static DWORD create_netconn_socket(serve - if(result == -1) - { - if (sock_get_error(errno) == WSAEINPROGRESS) { -- struct pollfd pfd; -+ // ReactOS: use select instead of poll -+ fd_set outfd; -+ struct timeval tv; - int res; - -- pfd.fd = netconn->socket; -- pfd.events = POLLOUT; -- res = poll(&pfd, 1, timeout); -+ FD_ZERO(&outfd); -+ FD_SET(netconn->socket, &outfd); -+ tv.tv_sec = timeout / 1000; -+ tv.tv_usec = (timeout % 1000) * 1000; -+ res = select(0, NULL, &outfd, NULL, &tv); - if (!res) - { - closesocket(netconn->socket); -@@ -741,6 +750,7 @@ void NETCON_unload(void) - #endif - } - -+#ifndef __REACTOS__ - /* translate a unix error code into a winsock one */ - int sock_get_error( int err ) - { -@@ -807,6 +817,7 @@ int sock_get_error( int err ) - #endif - return err; - } -+#endif - - #ifdef SONAME_LIBSSL - static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) -diff -prudN e:\Wine\dlls\wininet/urlcache.c e:\reactos-clean\dll\win32\wininet/urlcache.c ---- e:\Wine\dlls\wininet/urlcache.c 2013-03-16 11:54:52.613613400 +0100 -+++ e:\reactos-clean\dll\win32\wininet/urlcache.c 2013-05-20 17:05:34.969949600 +0100 -@@ -201,6 +205,8 @@ typedef struct _URLCACHECONTAINER + static const wininet_flag_info access_type[] = { + +diff -pudN e:\wine\dlls\wininet/urlcache.c e:\reactos\dll\win32\wininet/urlcache.c +--- e:\wine\dlls\wininet/urlcache.c 2015-07-14 15:44:36.059193400 +0100 ++++ e:\reactos\dll\win32\wininet/urlcache.c 2015-07-20 14:40:55.736738800 +0100 +@@ -202,6 +179,8 @@ typedef struct /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); -+// ReactOS r54992 ++/* ReactOS r54992 */ +BOOL bDefaultContainersAdded = FALSE; - static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash); - -@@ -587,6 +593,8 @@ static void URLCacheContainers_CreateDef - static const WCHAR HistoryPrefix[] = {'V','i','s','i','t','e','d',':',0}; + static inline char *heap_strdupWtoUTF8(LPCWSTR str) + { +@@ -752,6 +731,8 @@ static void cache_containers_init(void) + static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; + static const WCHAR HistorySuffix[] = {'H','i','s','t','o','r','y','.','I','E','5',0}; static const WCHAR CookieSuffix[] = {0}; - static const WCHAR CookiePrefix[] = {'C','o','o','k','i','e',':',0}; -+ // ReactOS r50916 ++ /* ReactOS r50916 */ + static const WCHAR UserProfile[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; static const struct { int nFolder; /* CSIDL_* constant */ -@@ -601,6 +609,13 @@ static void URLCacheContainers_CreateDef +@@ -766,6 +747,13 @@ static void cache_containers_init(void) }; DWORD i; -+ // ReactOS r50916 ++ /* ReactOS r50916 */ + if (GetEnvironmentVariableW(UserProfile, NULL, 0) == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + TRACE("Environment variable 'USERPROFILE' does not exist!\n"); @@ -294,25 +111,25 @@ for (i = 0; i < sizeof(DefaultContainerData) / sizeof(DefaultContainerData[0]); i++) { WCHAR wszCachePath[MAX_PATH]; -@@ -655,6 +670,10 @@ static DWORD URLCacheContainers_FindCont - if(!lpwszUrl) +@@ -835,6 +823,10 @@ static DWORD cache_containers_find(const + if(!url) return ERROR_INVALID_PARAMETER; -+ // ReactOS r54992 ++ /* ReactOS r54992 */ + if (!bDefaultContainersAdded) -+ URLCacheContainers_CreateDefaults(); ++ cache_containers_init(); + - LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { - int prefix_len = strlenW(pContainer->cache_prefix); -@@ -693,6 +712,10 @@ static BOOL URLCacheContainers_Enum(LPCW - if (lpwszSearchPattern && dwIndex > 0) + int prefix_len = strlen(container->cache_prefix); +@@ -861,6 +853,10 @@ static BOOL cache_containers_enum(char * + if (search_pattern && index > 0) return FALSE; -+ // ReactOS r54992 ++ /* ReactOS r54992 */ + if (!bDefaultContainersAdded) -+ URLCacheContainers_CreateDefaults(); ++ cache_containers_init(); + - LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { - if (lpwszSearchPattern) + if (search_pattern) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jul 22 19:43:18 2015 @@ -207,7 +207,7 @@ reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to WineStaging-1.7.47 -reactos/dll/win32/wininet # Synced to WineStaging-1.7.37 +reactos/dll/win32/wininet # Synced to WineStaging-1.7.47 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628

9 years, 1 month

[akhaldi] 68558: [WINHTTP_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:39:37 2015 New Revision: 68558 URL: http://svn.reactos.org/svn/reactos?rev=68558&view=rev Log: [WINHTTP_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Wed Jul 22 19:39:37 2015 @@ -416,7 +416,7 @@ BOOL ret, reverse; WCHAR buffer[MAX_PATH]; WCHAR check_buffer[MAX_PATH]; - DWORD index, len, oldlen; + DWORD err, index, len, oldlen; static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR test_verb[] = {'P','O','S','T',0}; @@ -426,6 +426,11 @@ {'P','O','S','T',' ','h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','p','o','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; + static const WCHAR test_header_name2[] = {'n','a','m','e',0}; + static const WCHAR test_header_name3[] = {'a',0}; + static const WCHAR test_header_range[] = {'R','a','n','g','e',0}; + static const WCHAR test_header_range_bytes[] = {'R','a','n','g','e',':',' ','b','y','t','e','s','=','0','-','7','7','3','\r','\n',0}; + static const WCHAR test_header_bytes[] = {'b','y','t','e','s','=','0','-','7','7','3',0}; static const WCHAR test_flag_coalesce[] = {'t','e','s','t','2',',',' ','t','e','s','t','4',0}; static const WCHAR test_flag_coalesce_reverse[] = {'t','e','s','t','3',',',' ','t','e','s','t','4',0}; @@ -441,6 +446,7 @@ static const WCHAR field[] = {'f','i','e','l','d',0}; static const WCHAR value[] = {'v','a','l','u','e',' ',0}; static const WCHAR value_nospace[] = {'v','a','l','u','e',0}; + static const WCHAR empty[] = {0}; static const WCHAR test_headers[][14] = { @@ -457,7 +463,9 @@ {':','b',0}, {'c','d',0}, {' ','e',' ',':','f',0}, - {'f','i','e','l','d',':',' ','v','a','l','u','e',' ',0} + {'f','i','e','l','d',':',' ','v','a','l','u','e',' ',0}, + {'n','a','m','e',':',' ','v','a','l','u','e',0}, + {'n','a','m','e',':',0} }; static const WCHAR test_indices[][6] = { @@ -766,6 +774,14 @@ ret = WinHttpAddRequestHeaders(request, test_headers[9], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(ret, "WinHttpAddRequestHeaders failed\n"); + index = 0; + memset(buffer, 0xff, sizeof(buffer)); + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_name3, buffer, &len, &index); + ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(!memcmp(buffer, empty, sizeof(empty)), "unexpected result\n"); + ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n"); @@ -785,6 +801,72 @@ field, buffer, &len, &index); ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(!memcmp(buffer, value, sizeof(value)) || ! memcmp(buffer, value_nospace, sizeof(value_nospace)), "unexpected result\n"); + + SetLastError(0xdeadbeef); + ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, 0, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + + ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, ~0u, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + ok(ret, "failed to add header: %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_range, buffer, &len, &index); + ok(ret, "failed to get range header %u\n", GetLastError()); + ok(!memcmp(buffer, test_header_bytes, sizeof(test_header_bytes)), "incorrect string returned\n"); + ok(len == lstrlenW(test_header_bytes) * sizeof(WCHAR), "wrong length %u\n", len); + ok(index == 1, "wrong index %u\n", index); + + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_name2, buffer, &len, &index); + ok(!ret, "unexpected success\n"); + + SetLastError(0xdeadbeef); + ret = WinHttpAddRequestHeaders(request, test_headers[14], ~0u, WINHTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", err); + + ret = WinHttpAddRequestHeaders(request, test_headers[14], ~0u, WINHTTP_ADDREQ_FLAG_ADD); + ok(ret, "got %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_name2, buffer, &len, &index); + ok(ret, "got %u\n", GetLastError()); + ok(index == 1, "wrong index %u\n", index); + ok(!memcmp(buffer, value_nospace, sizeof(value_nospace)), "incorrect string\n"); + + ret = WinHttpAddRequestHeaders(request, test_headers[15], ~0u, WINHTTP_ADDREQ_FLAG_REPLACE); + ok(ret, "got %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_name2, buffer, &len, &index); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", err); + + ret = WinHttpAddRequestHeaders(request, test_headers[14], -1L, 0); + ok(ret, "got %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_name2, buffer, &len, &index); + ok(ret, "got %u\n", GetLastError()); + ok(index == 1, "wrong index %u\n", index); + ok(!memcmp(buffer, value_nospace, sizeof(value_nospace)), "incorrect string\n"); ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); @@ -895,6 +977,7 @@ ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -947,8 +1030,14 @@ ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); + if (!ret && GetLastError() == ERROR_WINHTTP_INVALID_SERVER_RESPONSE) /* win2k */ + { + win_skip("invalid response\n"); + goto done; + } ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -983,6 +1072,7 @@ ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %u\n", size); HeapFree(GetProcessHeap(), 0, version); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -1800,6 +1890,16 @@ static const char okmsg[] = "HTTP/1.1 200 OK\r\n" "Server: winetest\r\n" +"\r\n"; + +static const char notokmsg[] = +"HTTP/1.1 400 Bad Request\r\n" +"\r\n"; + +static const char cookiemsg[] = +"HTTP/1.1 200 OK\r\n" +"Set-Cookie: name = value \r\n" +"Set-Cookie: NAME = value \r\n" "\r\n"; static const char nocontentmsg[] = @@ -1912,13 +2012,35 @@ } if (strstr(buffer, "GET /not_modified")) { - send(c, notmodified, sizeof notmodified - 1, 0); + if (strstr(buffer, "If-Modified-Since:")) send(c, notmodified, sizeof notmodified - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); continue; } if (strstr(buffer, "HEAD /head")) { send(c, headmsg, sizeof headmsg - 1, 0); continue; + } + if (strstr(buffer, "GET /cookie3")) + { + if (strstr(buffer, "Cookie: name=value2; NAME=value; name=value\r\n") || + broken(strstr(buffer, "Cookie: name=value2; name=value; NAME=value\r\n") != NULL)) + send(c, okmsg, sizeof(okmsg) - 1, 0); + else + send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } + if (strstr(buffer, "GET /cookie2")) + { + if (strstr(buffer, "Cookie: NAME=value; name=value\r\n") || + broken(strstr(buffer, "Cookie: name=value; NAME=value\r\n") != NULL)) + send(c, okmsg, sizeof(okmsg) - 1, 0); + else + send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } + else if (strstr(buffer, "GET /cookie")) + { + if (!strstr(buffer, "Cookie: name=value\r\n")) send(c, cookiemsg, sizeof(cookiemsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } if (strstr(buffer, "GET /quit")) { @@ -1958,6 +2080,7 @@ ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -1988,8 +2111,9 @@ static void test_basic_authentication(int port) { static const WCHAR authW[] = {'/','a','u','t','h',0}; - static const WCHAR userW[] = {'u','s','e','r',0}; - static const WCHAR passW[] = {'p','w','d',0}; + static WCHAR userW[] = {'u','s','e','r',0}; + static WCHAR passW[] = {'p','w','d',0}; + static WCHAR pass2W[] = {'p','w','d','2',0}; HINTERNET ses, con, req; DWORD status, size, error, supported, first, target; BOOL ret; @@ -2058,6 +2182,7 @@ ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -2112,10 +2237,81 @@ ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); + + /* credentials set with WinHttpSetCredentials take precedence over those set through options */ + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); + ok(ret, "failed to set username %u\n", GetLastError()); + + ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, pass2W, lstrlenW(pass2W)); + ok(ret, "failed to set password %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); + ok(ret, "failed to set username %u\n", GetLastError()); + + ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, pass2W, lstrlenW(passW)); + ok(ret, "failed to set password %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, pass2W, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %u\n", GetLastError()); + ok(status == 401, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2192,6 +2388,7 @@ ret = WinHttpReceiveResponse(req, NULL); ok(ret, "expected success\n"); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -2299,11 +2496,12 @@ { static const WCHAR pathW[] = {'/','n','o','t','_','m','o','d','i','f','i','e','d',0}; static const WCHAR ifmodifiedW[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',':',' '}; + static const WCHAR ifmodified2W[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0}; BOOL ret; HINTERNET session, request, connection; - DWORD status, size, start = GetTickCount(); + DWORD index, len, status, size, start = GetTickCount(); SYSTEMTIME st; - WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3]; + WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3], buffer[32]; memcpy(today, ifmodifiedW, sizeof(ifmodifiedW)); GetSystemTime(&st); @@ -2320,12 +2518,19 @@ WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); - ret = WinHttpSendRequest(request, today, ~0u, NULL, 0, 0, 0); + ret = WinHttpSendRequest(request, today, 0, NULL, 0, 0, 0); ok(ret, "WinHttpSendRequest failed: %u\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + ifmodified2W, buffer, &len, &index); + ok(ret, "failed to get header %u\n", GetLastError()); + + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -2428,6 +2633,123 @@ WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); +} + +static void test_cookies( int port ) +{ + static const WCHAR cookieW[] = {'/','c','o','o','k','i','e',0}; + static const WCHAR cookie2W[] = {'/','c','o','o','k','i','e','2',0}; + static const WCHAR cookie3W[] = {'/','c','o','o','k','i','e','3',0}; + static const WCHAR cookieheaderW[] = + {'C','o','o','k','i','e',':',' ','n','a','m','e','=','v','a','l','u','e','2','\r','\n',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookieW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + + req = WinHttpOpenRequest( con, NULL, cookie3W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, cookieheaderW, ~0u, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200 || broken(status == 400), "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 400, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); } static void test_connection_info( int port ) @@ -3049,7 +3371,7 @@ IWinHttpRequest_Release( req ); pos.QuadPart = 0; - IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); + hr = IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); ok( hr == S_OK, "got %08x\n", hr ); buf[0] = 0; @@ -3405,6 +3727,7 @@ test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port); + test_cookies(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

9 years, 1 month

[akhaldi] 68557: [WINHTTP] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:39:23 2015 New Revision: 68557 URL: http://svn.reactos.org/svn/reactos?rev=68557&view=rev Log: [WINHTTP] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/winhttp/cookie.c trunk/reactos/dll/win32/winhttp/net.c trunk/reactos/dll/win32/winhttp/request.c trunk/reactos/dll/win32/winhttp/session.c trunk/reactos/dll/win32/winhttp/winhttp_private.h trunk/reactos/dll/win32/winhttp/winhttp_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winhttp/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/cookie.c… ============================================================================== --- trunk/reactos/dll/win32/winhttp/cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/cookie.c [iso-8859-1] Wed Jul 22 19:39:23 2015 @@ -42,7 +42,7 @@ LIST_FOR_EACH( item, &domain->cookies ) { cookie = LIST_ENTRY( item, cookie_t, entry ); - if (!strcmpW( cookie->path, path ) && !strcmpiW( cookie->name, name )) + if (!strcmpW( cookie->path, path ) && !strcmpW( cookie->name, name )) { TRACE("found %s=%s\n", debugstr_w(cookie->name), debugstr_w(cookie->value)); return cookie; @@ -109,7 +109,7 @@ else if ((old_cookie = find_cookie( domain, path, cookie->name ))) delete_cookie( old_cookie ); cookie->path = strdupW( path ); - list_add_tail( &domain->cookies, &cookie->entry ); + list_add_head( &domain->cookies, &cookie->entry ); TRACE("domain %s path %s <- %s=%s\n", debugstr_w(domain_name), debugstr_w(cookie->path), debugstr_w(cookie->name), debugstr_w(cookie->value)); @@ -122,22 +122,14 @@ const WCHAR *p; int len; - if (!(p = strchrW( string, '=' ))) - { - WARN("no '=' in %s\n", debugstr_w(string)); - return NULL; - } - if (p == string) - { - WARN("empty cookie name in %s\n", debugstr_w(string)); - return NULL; - } + if (!(p = strchrW( string, '=' ))) p = string + strlenW( string ); + len = p - string; + while (len && string[len - 1] == ' ') len--; + if (!len) return NULL; if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; - list_init( &cookie->entry ); - len = p - string; if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { heap_free( cookie ); @@ -146,18 +138,20 @@ memcpy( cookie->name, string, len * sizeof(WCHAR) ); cookie->name[len] = 0; - p++; /* skip '=' */ - while (*p == ' ') p++; - - len = strlenW( p ); - if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) - { - free_cookie( cookie ); - return NULL; - } - memcpy( cookie->value, p, len * sizeof(WCHAR) ); - cookie->value[len] = 0; - + if (*p++ == '=') + { + while (*p && *p == ' ') p++; + len = strlenW( p ); + while (len && p[len - 1] == ' ') len--; + + if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + free_cookie( cookie ); + return NULL; + } + memcpy( cookie->value, p, len * sizeof(WCHAR) ); + cookie->value[len] = 0; + } return cookie; } @@ -247,17 +241,25 @@ if (strstrW( request->path, cookie->path ) == request->path) { - const WCHAR format[] = {'C','o','o','k','i','e',':',' ','%','s','=','%','s',0}; - int len; + const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + int len, len_cookie = sizeof(cookieW) / sizeof(cookieW[0]), len_name = strlenW( cookie->name ); WCHAR *header; - len = strlenW( cookie->name ) + strlenW( format ) + strlenW( cookie->value ); + len = len_cookie + len_name; + if (cookie->value) len += strlenW( cookie->value ) + 1; if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; - sprintfW( header, format, cookie->name, cookie->value ); + memcpy( header, cookieW, len_cookie * sizeof(WCHAR) ); + strcpyW( header + len_cookie, cookie->name ); + if (cookie->value) + { + header[len_cookie + len_name] = '='; + strcpyW( header + len_cookie + len_name + 1, cookie->value ); + } TRACE("%s\n", debugstr_w(header)); - add_request_headers( request, header, len, WINHTTP_ADDREQ_FLAG_ADD ); + add_request_headers( request, header, len, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON ); heap_free( header ); } } Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Wed Jul 22 19:39:23 2015 @@ -353,6 +353,7 @@ res = sock_get_error( errno ); if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) { +#ifdef __REACTOS__ /* ReactOS: use select instead of poll */ fd_set outfd; struct timeval tv; @@ -364,6 +365,13 @@ tv.tv_usec = timeout * 1000; if (select( 0, NULL, &outfd, NULL, &tv ) > 0) +#else + struct pollfd pfd; + + pfd.fd = conn->socket; + pfd.events = POLLOUT; + if (poll( &pfd, 1, timeout ) > 0) +#endif ret = TRUE; else res = sock_get_error( errno ); Modified: trunk/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Wed Jul 22 19:39:23 2015 @@ -316,12 +316,8 @@ q++; /* skip past colon */ while (*q == ' ') q++; - if (!*q) - { - WARN("no value in line %s\n", debugstr_w(string)); - return header; - } len = strlenW( q ); + if (!(header->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { free_header( header ); @@ -393,76 +389,65 @@ static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) { int index; - header_t *header; + header_t hdr; TRACE("%s: %s 0x%08x\n", debugstr_w(field), debugstr_w(value), flags); - /* replace wins out over add */ - if (flags & WINHTTP_ADDREQ_FLAG_REPLACE) flags &= ~WINHTTP_ADDREQ_FLAG_ADD; - - if (flags & WINHTTP_ADDREQ_FLAG_ADD) index = -1; - else - index = get_header_index( request, field, 0, request_only ); - - if (index >= 0) + if ((index = get_header_index( request, field, 0, request_only )) >= 0) { if (flags & WINHTTP_ADDREQ_FLAG_ADD_IF_NEW) return FALSE; - header = &request->headers[index]; - } - else if (value) - { - header_t hdr; + } + + if (flags & WINHTTP_ADDREQ_FLAG_REPLACE) + { + if (index >= 0) + { + delete_header( request, index ); + if (!value || !value[0]) return TRUE; + } + else if (!(flags & WINHTTP_ADDREQ_FLAG_ADD)) + { + set_last_error( ERROR_WINHTTP_HEADER_NOT_FOUND ); + return FALSE; + } hdr.field = (LPWSTR)field; hdr.value = (LPWSTR)value; hdr.is_request = request_only; - return insert_header( request, &hdr ); } - /* no value to delete */ - else return TRUE; - - if (flags & WINHTTP_ADDREQ_FLAG_REPLACE) - { - delete_header( request, index ); - if (value) - { - header_t hdr; - + else if (value) + { + + if ((flags & (WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON)) && + index >= 0) + { + WCHAR *tmp; + int len, len_orig, len_value; + header_t *header = &request->headers[index]; + + len_orig = strlenW( header->value ); + len_value = strlenW( value ); + + len = len_orig + len_value + 2; + if (!(tmp = heap_realloc( header->value, (len + 1) * sizeof(WCHAR) ))) return FALSE; + header->value = tmp; + header->value[len_orig++] = (flags & WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA) ? ',' : ';'; + header->value[len_orig++] = ' '; + + memcpy( &header->value[len_orig], value, len_value * sizeof(WCHAR) ); + header->value[len] = 0; + return TRUE; + } + else + { hdr.field = (LPWSTR)field; hdr.value = (LPWSTR)value; hdr.is_request = request_only; - return insert_header( request, &hdr ); } - return TRUE; - } - else if (flags & (WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON)) - { - WCHAR sep, *tmp; - int len, orig_len, value_len; - - orig_len = strlenW( header->value ); - value_len = strlenW( value ); - - if (flags & WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA) sep = ','; - else sep = ';'; - - len = orig_len + value_len + 2; - if ((tmp = heap_realloc( header->value, (len + 1) * sizeof(WCHAR) ))) - { - header->value = tmp; - - header->value[orig_len] = sep; - orig_len++; - header->value[orig_len] = ' '; - orig_len++; - - memcpy( &header->value[orig_len], value, value_len * sizeof(WCHAR) ); - header->value[len] = 0; - return TRUE; - } - } + } + return TRUE; } @@ -475,7 +460,8 @@ if (len == ~0u) len = strlenW( headers ); if (!len) return TRUE; if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; - strcpyW( buffer, headers ); + memcpy( buffer, headers, len * sizeof(WCHAR) ); + buffer[len] = 0; p = buffer; do @@ -519,7 +505,7 @@ TRACE("%p, %s, 0x%x, 0x%08x\n", hrequest, debugstr_w(headers), len, flags); - if (!headers) + if (!headers || !len) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -972,10 +958,10 @@ #define INET6_ADDRSTRLEN 46 #endif -static WCHAR *addr_to_str( const struct sockaddr *addr ) +static WCHAR *addr_to_str( struct sockaddr *addr ) { char buf[INET6_ADDRSTRLEN]; - const void *src; + void *src; switch (addr->sa_family) { @@ -1239,6 +1225,8 @@ set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } + + if (headers && !headers_len) headers_len = strlenW( headers ); if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { @@ -1562,8 +1550,16 @@ return FALSE; auth_ptr = &request->authinfo; auth_target = attr_authorization; - username = request->connect->username; - password = request->connect->password; + if (request->creds[TARGET_SERVER][scheme].username) + { + username = request->creds[TARGET_SERVER][scheme].username; + password = request->creds[TARGET_SERVER][scheme].password; + } + else + { + username = request->connect->username; + password = request->connect->password; + } break; case WINHTTP_AUTH_TARGET_PROXY: @@ -1571,8 +1567,16 @@ return FALSE; auth_ptr = &request->proxy_authinfo; auth_target = attr_proxy_authorization; - username = request->connect->session->proxy_username; - password = request->connect->session->proxy_password; + if (request->creds[TARGET_PROXY][scheme].username) + { + username = request->creds[TARGET_PROXY][scheme].username; + password = request->creds[TARGET_PROXY][scheme].password; + } + else + { + username = request->connect->session->proxy_username; + password = request->connect->session->proxy_password; + } break; default: @@ -1756,11 +1760,12 @@ return ret; } -static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, const WCHAR *username, +static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme_flag, const WCHAR *username, const WCHAR *password ) { - if ((scheme == WINHTTP_AUTH_SCHEME_BASIC || scheme == WINHTTP_AUTH_SCHEME_DIGEST) && - (!username || !password)) + enum auth_scheme scheme = scheme_from_flag( scheme_flag ); + + if (scheme == SCHEME_INVALID || ((scheme == SCHEME_BASIC || scheme == SCHEME_DIGEST) && (!username || !password))) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -1769,24 +1774,24 @@ { case WINHTTP_AUTH_TARGET_SERVER: { - heap_free( request->connect->username ); - if (!username) request->connect->username = NULL; - else if (!(request->connect->username = strdupW( username ))) return FALSE; - - heap_free( request->connect->password ); - if (!password) request->connect->password = NULL; - else if (!(request->connect->password = strdupW( password ))) return FALSE; + heap_free( request->creds[TARGET_SERVER][scheme].username ); + if (!username) request->creds[TARGET_SERVER][scheme].username = NULL; + else if (!(request->creds[TARGET_SERVER][scheme].username = strdupW( username ))) return FALSE; + + heap_free( request->creds[TARGET_SERVER][scheme].password ); + if (!password) request->creds[TARGET_SERVER][scheme].password = NULL; + else if (!(request->creds[TARGET_SERVER][scheme].password = strdupW( password ))) return FALSE; break; } case WINHTTP_AUTH_TARGET_PROXY: { - heap_free( request->connect->session->proxy_username ); - if (!username) request->connect->session->proxy_username = NULL; - else if (!(request->connect->session->proxy_username = strdupW( username ))) return FALSE; - - heap_free( request->connect->session->proxy_password ); - if (!password) request->connect->session->proxy_password = NULL; - else if (!(request->connect->session->proxy_password = strdupW( password ))) return FALSE; + heap_free( request->creds[TARGET_PROXY][scheme].username ); + if (!username) request->creds[TARGET_PROXY][scheme].username = NULL; + else if (!(request->creds[TARGET_PROXY][scheme].username = strdupW( username ))) return FALSE; + + heap_free( request->creds[TARGET_PROXY][scheme].password ); + if (!password) request->creds[TARGET_PROXY][scheme].password = NULL; + else if (!(request->creds[TARGET_PROXY][scheme].password = strdupW( password ))) return FALSE; break; } default: @@ -2046,9 +2051,13 @@ { if (!start_next_chunk( request, notify )) return FALSE; } - } - if (!request->read_chunked && request->content_length != ~0u) + len = min( len, request->read_chunked_size ); + } + else if (request->content_length != ~0u) + { len = min( len, request->content_length - request->content_read ); + } + if (len <= request->read_size) return TRUE; if (!read_more_data( request, len, notify )) return FALSE; if (!request->read_size) request->content_length = request->content_read = 0; @@ -2094,7 +2103,9 @@ /* we rely on the fact that the protocol is ascii */ MultiByteToWideChar( CP_ACP, 0, status_code, len, status_codeW, len ); status_codeW[len] = 0; - if (!(process_header( request, attr_status, status_codeW, WINHTTP_ADDREQ_FLAG_REPLACE, FALSE ))) return FALSE; + if (!(process_header( request, attr_status, status_codeW, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE, FALSE ))) + return FALSE; len = status_code - buffer; if (!(versionW = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; @@ -2265,13 +2276,21 @@ { WCHAR *path, *p; - len = strlenW( location ) + 1; - if (location[0] != '/') len++; - if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; - - if (location[0] != '/') *p++ = '/'; - strcpyW( p, location ); - + if (location[0] == '/') + { + len = strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, location ); + } + else + { + if ((p = strrchrW( request->path, '/' ))) *p = 0; + len = strlenW( request->path ) + 1 + strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, request->path ); + strcatW( path, slashW ); + strcatW( path, location ); + } heap_free( request->path ); request->path = path; @@ -2316,7 +2335,7 @@ } else heap_free( hostname ); - if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; + if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; heap_free( request->path ); @@ -2680,6 +2699,7 @@ LONG send_timeout; LONG receive_timeout; WINHTTP_PROXY_INFO proxy; + BOOL async; }; static inline struct winhttp_request *impl_from_IWinHttpRequest( IWinHttpRequest *iface ) @@ -2698,8 +2718,20 @@ static void cancel_request( struct winhttp_request *request ) { if (request->state <= REQUEST_STATE_CANCELLED) return; - if (request->thread) SetEvent( request->cancel ); + + SetEvent( request->cancel ); + LeaveCriticalSection( &request->cs ); + WaitForSingleObject( request->thread, INFINITE ); + EnterCriticalSection( &request->cs ); + request->state = REQUEST_STATE_CANCELLED; + + CloseHandle( request->thread ); + request->thread = NULL; + CloseHandle( request->wait ); + request->wait = NULL; + CloseHandle( request->cancel ); + request->cancel = NULL; } /* critical section must be held */ @@ -3006,6 +3038,7 @@ request->bytes_available = 0; request->bytes_read = 0; request->error = ERROR_SUCCESS; + request->async = FALSE; request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; request->disable_feature = 0; request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; @@ -3019,6 +3052,26 @@ request->state = REQUEST_STATE_INITIALIZED; } +static void reset_request( struct winhttp_request *request ) +{ + cancel_request( request ); + WinHttpCloseHandle( request->hrequest ); + request->hrequest = NULL; + WinHttpCloseHandle( request->hconnect ); + request->hconnect = NULL; + heap_free( request->buffer ); + request->buffer = NULL; + heap_free( request->verb ); + request->verb = NULL; + request->offset = 0; + request->bytes_available = 0; + request->bytes_read = 0; + request->error = ERROR_SUCCESS; + request->async = FALSE; + VariantClear( &request->data ); + request->state = REQUEST_STATE_INITIALIZED; +} + static HRESULT WINAPI winhttp_request_Open( IWinHttpRequest *iface, BSTR method, @@ -3033,10 +3086,9 @@ 'W','i','n','3','2',';',' ','W','i','n','H','t','t','p','.','W','i','n','H','t','t','p', 'R','e','q','u','e','s','t','.','5',')',0}; struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; WCHAR *hostname, *path = NULL, *verb = NULL; - DWORD err = ERROR_OUTOFMEMORY, len, flags = 0, request_flags = 0; + DWORD err = ERROR_OUTOFMEMORY, len, flags = 0; TRACE("%p, %s, %s, %s\n", request, debugstr_w(method), debugstr_w(url), debugstr_variant(&async)); @@ -3052,12 +3104,9 @@ if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); EnterCriticalSection( &request->cs ); - if (request->state != REQUEST_STATE_INITIALIZED) - { - cancel_request( request ); - free_request( request ); - initialize_request( request ); - } + if (request->state < REQUEST_STATE_INITIALIZED) initialize_request( request ); + else reset_request( request ); + if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) goto error; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); hostname[uc.dwHostNameLength] = 0; @@ -3067,37 +3116,44 @@ path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (SUCCEEDED( VariantChangeType( &async, &async, 0, VT_BOOL )) && V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; - if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) + if (SUCCEEDED( VariantChangeType( &async, &async, 0, VT_BOOL )) && V_BOOL( &async )) request->async = TRUE; + else request->async = FALSE; + + if (!request->hsession) + { + if (!(request->hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, + WINHTTP_FLAG_ASYNC ))) + { + err = get_last_error(); + goto error; + } + if (!(request->hconnect = WinHttpConnect( request->hsession, hostname, uc.nPort, 0 ))) + { + WinHttpCloseHandle( request->hsession ); + request->hsession = NULL; + err = get_last_error(); + goto error; + } + } + else if (!(request->hconnect = WinHttpConnect( request->hsession, hostname, uc.nPort, 0 ))) { err = get_last_error(); goto error; } - if (!(hconnect = WinHttpConnect( hsession, hostname, uc.nPort, 0 ))) + + len = sizeof(httpsW) / sizeof(WCHAR); + if (uc.dwSchemeLength == len && !memcmp( uc.lpszScheme, httpsW, len * sizeof(WCHAR) )) + { + flags |= WINHTTP_FLAG_SECURE; + } + if (!(request->hrequest = WinHttpOpenRequest( request->hconnect, method, path, NULL, NULL, acceptW, flags ))) { err = get_last_error(); goto error; } - len = sizeof(httpsW) / sizeof(WCHAR); - if (uc.dwSchemeLength == len && !memcmp( uc.lpszScheme, httpsW, len * sizeof(WCHAR) )) - { - request_flags |= WINHTTP_FLAG_SECURE; - } - if (!(hrequest = WinHttpOpenRequest( hconnect, method, path, NULL, NULL, acceptW, request_flags ))) - { - err = get_last_error(); - goto error; - } - if (flags & WINHTTP_FLAG_ASYNC) - { - request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); - WinHttpSetOption( hrequest, WINHTTP_OPTION_CONTEXT_VALUE, &request, sizeof(request) ); - } + WinHttpSetOption( request->hrequest, WINHTTP_OPTION_CONTEXT_VALUE, &request, sizeof(request) ); + request->state = REQUEST_STATE_OPEN; - request->hsession = hsession; - request->hconnect = hconnect; - request->hrequest = hrequest; request->verb = verb; heap_free( hostname ); heap_free( path ); @@ -3105,8 +3161,8 @@ return S_OK; error: - WinHttpCloseHandle( hconnect ); - WinHttpCloseHandle( hsession ); + WinHttpCloseHandle( request->hconnect ); + request->hconnect = NULL; heap_free( hostname ); heap_free( path ); heap_free( verb ); @@ -3148,7 +3204,8 @@ goto done; } sprintfW( str, fmtW, header, value ? value : emptyW ); - if (!WinHttpAddRequestHeaders( request->hrequest, str, len, WINHTTP_ADDREQ_FLAG_REPLACE )) + if (!WinHttpAddRequestHeaders( request->hrequest, str, len, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE )) { err = get_last_error(); } @@ -3268,22 +3325,14 @@ static void wait_set_status_callback( struct winhttp_request *request, DWORD status ) { - if (!request->wait) return; status |= WINHTTP_CALLBACK_STATUS_REQUEST_ERROR; WinHttpSetStatusCallback( request->hrequest, wait_status_callback, status, 0 ); } static DWORD wait_for_completion( struct winhttp_request *request ) { - HANDLE handles[2]; - - if (!request->wait) - { - request->error = ERROR_SUCCESS; - return ERROR_SUCCESS; - } - handles[0] = request->wait; - handles[1] = request->cancel; + HANDLE handles[2] = { request->wait, request->cancel }; + switch (WaitForMultipleObjects( 2, handles, FALSE, INFINITE )) { case WAIT_OBJECT_0: @@ -3466,6 +3515,39 @@ return request_send_and_receive( request ); } +/* critical section must be held */ +static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) +{ + HANDLE thread = request->thread; + DWORD err, ret; + + LeaveCriticalSection( &request->cs ); + while ((err = MsgWaitForMultipleObjects( 1, &thread, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + } + switch (err) + { + case WAIT_OBJECT_0: + ret = ERROR_SUCCESS; + break; + case WAIT_TIMEOUT: + ret = ERROR_TIMEOUT; + break; + case WAIT_FAILED: + default: + ret = get_last_error(); + break; + } + EnterCriticalSection( &request->cs ); + return ret; +} + static HRESULT WINAPI winhttp_request_Send( IWinHttpRequest *iface, VARIANT body ) @@ -3487,20 +3569,22 @@ return S_OK; } VariantClear( &request->data ); - if ((hr = VariantCopyInd( &request->data, &body )) != S_OK) { + if ((hr = VariantCopyInd( &request->data, &body )) != S_OK) + { LeaveCriticalSection( &request->cs ); return hr; } - - if (request->wait) /* async request */ - { - if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) - { - LeaveCriticalSection( &request->cs ); - return HRESULT_FROM_WIN32( get_last_error() ); - } - } - else hr = request_send_and_receive( request ); + if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) + { + LeaveCriticalSection( &request->cs ); + return HRESULT_FROM_WIN32( get_last_error() ); + } + request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); + if (!request->async) + { + hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); + } LeaveCriticalSection( &request->cs ); return hr; } @@ -3923,39 +4007,6 @@ return hr; } -/* critical section must be held */ -static DWORD wait_for_response( struct winhttp_request *request, DWORD timeout ) -{ - HANDLE thread = request->thread; - DWORD err, ret; - - LeaveCriticalSection( &request->cs ); - while ((err = MsgWaitForMultipleObjects( 1, &thread, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) - { - MSG msg; - while (PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE )) - { - TranslateMessage( &msg ); - DispatchMessageW( &msg ); - } - } - switch (err) - { - case WAIT_OBJECT_0: - ret = ERROR_SUCCESS; - break; - case WAIT_TIMEOUT: - ret = ERROR_TIMEOUT; - break; - case WAIT_FAILED: - default: - ret = get_last_error(); - break; - } - EnterCriticalSection( &request->cs ); - return ret; -} - static HRESULT WINAPI winhttp_request_WaitForResponse( IWinHttpRequest *iface, VARIANT timeout, @@ -3967,17 +4018,12 @@ TRACE("%p, %s, %p\n", request, debugstr_variant(&timeout), succeeded); EnterCriticalSection( &request->cs ); - if (!request->thread) + if (request->state >= REQUEST_STATE_RESPONSE_RECEIVED) { LeaveCriticalSection( &request->cs ); return S_OK; } - if (request->state >= REQUEST_STATE_RESPONSE_RECEIVED) - { - LeaveCriticalSection( &request->cs ); - return S_OK; - } - switch ((err = wait_for_response( request, msecs ))) + switch ((err = request_wait( request, msecs ))) { case ERROR_TIMEOUT: if (succeeded) *succeeded = VARIANT_FALSE; Modified: trunk/reactos/dll/win32/winhttp/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/session.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] Wed Jul 22 19:39:23 2015 @@ -535,7 +535,7 @@ static void request_destroy( object_header_t *hdr ) { request_t *request = (request_t *)hdr; - unsigned int i; + unsigned int i, j; TRACE("%p\n", request); @@ -546,6 +546,7 @@ CloseHandle( request->task_thread ); CloseHandle( request->task_cancel ); CloseHandle( request->task_wait ); + request->task_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->task_cs ); } release_object( &request->connect->hdr ); @@ -566,6 +567,14 @@ heap_free( request->headers ); for (i = 0; i < request->num_accept_types; i++) heap_free( request->accept_types[i] ); heap_free( request->accept_types ); + for (i = 0; i < TARGET_MAX; i++) + { + for (j = 0; j < SCHEME_MAX; j++) + { + heap_free( request->creds[i][j].username ); + heap_free( request->creds[i][j].password ); + } + } heap_free( request ); } @@ -1310,7 +1319,8 @@ CFRelease( settings ); return ret; #else - FIXME( "no support on this platform\n" ); + static int once; + if (!once++) FIXME( "no support on this platform\n" ); return FALSE; #endif } Modified: trunk/reactos/dll/win32/winhttp/winhttp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] Wed Jul 22 19:39:23 2015 @@ -163,6 +163,14 @@ BOOL is_request; /* part of request headers? */ } header_t; +enum auth_target +{ + TARGET_INVALID = -1, + TARGET_SERVER, + TARGET_PROXY, + TARGET_MAX +}; + enum auth_scheme { SCHEME_INVALID = -1, @@ -170,7 +178,8 @@ SCHEME_NTLM, SCHEME_PASSPORT, SCHEME_DIGEST, - SCHEME_NEGOTIATE + SCHEME_NEGOTIATE, + SCHEME_MAX }; struct authinfo @@ -221,6 +230,11 @@ HANDLE task_thread; struct list task_queue; CRITICAL_SECTION task_cs; + struct + { + WCHAR *username; + WCHAR *password; + } creds[TARGET_MAX][SCHEME_MAX]; } request_t; typedef struct _task_header_t task_header_t; Modified: trunk/reactos/dll/win32/winhttp/winhttp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_ros.diff [iso-8859-1] Wed Jul 22 19:39:23 2015 @@ -1,6 +1,6 @@ -diff -pudN e:\wine\dlls\winhttp/net.c dll\win32\winhttp/net.c +diff -pudN e:\wine\dlls\winhttp/net.c e:\reactos\dll\win32\winhttp/net.c --- e:\wine\dlls\winhttp/net.c 2015-02-21 17:13:15.365542100 +0100 -+++ dll\win32\winhttp/net.c 2015-04-09 13:48:12.485050200 +0100 ++++ e:\reactos\dll\win32\winhttp/net.c 2015-07-20 14:25:14.321893000 +0100 @@ -73,6 +50,7 @@ static CRITICAL_SECTION cs_gethostbyname #endif @@ -25,18 +25,15 @@ static int sock_send(int fd, const void *msg, size_t len, int flags) { -@@ -366,11 +353,17 @@ BOOL netconn_connect( netconn_t *conn, c +@@ -366,11 +353,25 @@ BOOL netconn_connect( netconn_t *conn, c res = sock_get_error( errno ); if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) { -- struct pollfd pfd; ++#ifdef __REACTOS__ + /* ReactOS: use select instead of poll */ + fd_set outfd; + struct timeval tv; - -- pfd.fd = conn->socket; -- pfd.events = POLLOUT; -- if (poll( &pfd, 1, timeout ) > 0) ++ + FD_ZERO(&outfd); + FD_SET(conn->socket, &outfd); + @@ -44,13 +41,20 @@ + tv.tv_usec = timeout * 1000; + + if (select( 0, NULL, &outfd, NULL, &tv ) > 0) ++#else + struct pollfd pfd; + + pfd.fd = conn->socket; + pfd.events = POLLOUT; + if (poll( &pfd, 1, timeout ) > 0) ++#endif ret = TRUE; else res = sock_get_error( errno ); -diff -pudN e:\wine\dlls\winhttp/request.c dll\win32\winhttp/request.c ---- e:\wine\dlls\winhttp/request.c 2015-02-22 13:25:32.479716600 +0100 -+++ dll\win32\winhttp/request.c 2015-04-09 13:49:32.753638400 +0100 -@@ -1275,6 +1264,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNE +diff -pudN e:\wine\dlls\winhttp/request.c e:\reactos\dll\win32\winhttp/request.c +--- e:\wine\dlls\winhttp/request.c 2015-07-14 15:44:36.027191600 +0100 ++++ e:\reactos\dll\win32\winhttp/request.c 2015-07-20 14:28:31.803188200 +0100 +@@ -1263,6 +1252,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNE return ret; } @@ -58,7 +62,7 @@ #define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) static const WCHAR basicW[] = {'B','a','s','i','c',0}; -@@ -2722,8 +2712,8 @@ static void free_request( struct winhttp +@@ -2754,8 +2744,8 @@ static void free_request( struct winhttp CloseHandle( request->thread ); CloseHandle( request->wait ); CloseHandle( request->cancel ); @@ -69,7 +73,7 @@ heap_free( request->buffer ); heap_free( request->verb ); VariantClear( &request->data ); -@@ -2927,16 +2917,16 @@ static HRESULT WINAPI winhttp_request_Se +@@ -2959,16 +2949,16 @@ static HRESULT WINAPI winhttp_request_Se { case HTTPREQUEST_PROXYSETTING_DEFAULT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; @@ -90,7 +94,7 @@ request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; -@@ -2945,12 +2935,12 @@ static HRESULT WINAPI winhttp_request_Se +@@ -2977,12 +2967,12 @@ static HRESULT WINAPI winhttp_request_Se request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; if (V_VT( &proxy_server ) == VT_BSTR) { @@ -105,9 +109,9 @@ request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); } break; -diff -pudN e:\wine\dlls\winhttp/session.c dll\win32\winhttp/session.c ---- e:\wine\dlls\winhttp/session.c 2015-02-22 13:25:32.480717300 +0100 -+++ dll\win32\winhttp/session.c 2015-04-09 13:50:02.955100200 +0100 +diff -pudN e:\wine\dlls\winhttp/session.c e:\reactos\dll\win32\winhttp/session.c +--- e:\wine\dlls\winhttp/session.c 2015-07-14 15:44:36.029191700 +0100 ++++ e:\reactos\dll\win32\winhttp/session.c 2015-07-20 14:29:15.686698200 +0100 @@ -109,6 +81,9 @@ static void session_destroy( object_head heap_free( session->proxy_username ); heap_free( session->proxy_password ); @@ -149,7 +153,7 @@ goto end; } } -@@ -615,7 +595,7 @@ static WCHAR *blob_to_str( DWORD encodin +@@ -624,7 +604,7 @@ static WCHAR *blob_to_str( DWORD encodin static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jul 22 19:39:23 2015 @@ -206,7 +206,7 @@ reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.37 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/wing32 # Out of sync -reactos/dll/win32/winhttp # Synced to WineStaging-1.7.37 +reactos/dll/win32/winhttp # Synced to WineStaging-1.7.47 reactos/dll/win32/wininet # Synced to WineStaging-1.7.37 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628

9 years, 1 month

[akhaldi] 68556: [COMDLG32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:35:36 2015 New Revision: 68556 URL: http://svn.reactos.org/svn/reactos?rev=68556&view=rev Log: [COMDLG32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/comdlg32/filedlg.c Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Wed Jul 22 19:35:36 2015 @@ -1138,6 +1138,11 @@ for (i = 0; i < ARRAY_SIZE(defext_wildcard_filters); i++) { test_extension_helper(&ofn, defext_wildcard_filters[i], "deadbeef.xyz"); } + + /* Append valid extensions consisting of multiple parts */ + test_extension_helper(&ofn, "TestFilter (*.abc.def)\0*.abc.def\0", "deadbeef.abc.def"); + test_extension_helper(&ofn, "TestFilter (.abc.def)\0.abc.def\0", "deadbeef.abc.def"); + test_extension_helper(&ofn, "TestFilter (*.*.def)\0*.*.def\0", "deadbeef.xyz"); } #undef ARRAY_SIZE

9 years, 1 month

[akhaldi] 68555: [COMDLG32] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:35:34 2015 New Revision: 68555 URL: http://svn.reactos.org/svn/reactos?rev=68555&view=rev Log: [COMDLG32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/cdlg32.c trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/itemdlg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] Wed Jul 22 19:35:34 2015 @@ -62,7 +62,7 @@ #include "resource.h" /* Common dialogs implementation globals */ -#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ +#define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/comdlg32/cdlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg32.… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg32.c [iso-8859-1] Wed Jul 22 19:35:34 2015 @@ -268,7 +268,11 @@ */ HRESULT WINAPI DllRegisterServer(void) { +#ifdef __REACTOS__ return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance); +#else + return __wine_register_resources(COMDLG32_hInstance); +#endif } /*********************************************************************** @@ -276,7 +280,11 @@ */ HRESULT WINAPI DllUnregisterServer(void) { +#ifdef __REACTOS__ return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance); +#else + return __wine_unregister_resources(COMDLG32_hInstance); +#endif } #endif /* Win 7 */ Modified: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff [iso-8859-1] Wed Jul 22 19:35:34 2015 @@ -1,6 +1,6 @@ -diff -prudN e:\Wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c ---- e:\Wine\dlls\comdlg32/cdlg32.c 2013-10-26 22:24:27.508648000 +0100 -+++ e:\reactos\dll\win32\comdlg32/cdlg32.c 2014-03-05 11:46:06.260510700 +0100 +diff -pudN e:\wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c +--- e:\wine\dlls\comdlg32/cdlg32.c 2015-02-21 17:13:08.621542200 +0100 ++++ e:\reactos\dll\win32\comdlg32/cdlg32.c 2015-07-21 09:48:05.584922500 +0100 @@ -174,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void) return 0; /* we never set an error, so there isn't one */ } @@ -10,27 +10,33 @@ /************************************************************************* * Implement the CommDlg32 class factory * -@@ -283,7 +268,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI +@@ -283,7 +268,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSI */ HRESULT WINAPI DllRegisterServer(void) { -- return __wine_register_resources(COMDLG32_hInstance); ++#ifdef __REACTOS__ + return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance); ++#else + return __wine_register_resources(COMDLG32_hInstance); ++#endif } /*********************************************************************** -@@ -291,5 +276,7 @@ HRESULT WINAPI DllRegisterServer(void) +@@ -291,5 +280,11 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { -- return __wine_unregister_resources(COMDLG32_hInstance); ++#ifdef __REACTOS__ + return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance); ++#else + return __wine_unregister_resources(COMDLG32_hInstance); ++#endif } + +#endif /* Win 7 */ -diff -prudN e:\Wine\dlls\comdlg32/comdlg32.spec e:\reactos\dll\win32\comdlg32/comdlg32.spec ---- e:\Wine\dlls\comdlg32/comdlg32.spec 2011-09-16 23:22:36.026770600 +0100 +diff -pudN e:\wine\dlls\comdlg32/comdlg32.spec e:\reactos\dll\win32\comdlg32/comdlg32.spec +--- e:\wine\dlls\comdlg32/comdlg32.spec 2015-02-21 17:13:08.621542200 +0100 +++ e:\reactos\dll\win32\comdlg32/comdlg32.spec 2012-02-15 22:32:22.456422900 +0100 @@ -3,9 +3,9 @@ @ stdcall ChooseFontA(ptr) @@ -45,11 +51,10 @@ @ stdcall FindTextA(ptr) @ stdcall FindTextW(ptr) @ stdcall GetFileTitleA(str ptr long) - -diff -prudN e:\Wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c ---- e:\Wine\dlls\comdlg32/itemdlg.c 2013-10-26 22:24:27.515652700 +0100 -+++ e:\reactos\dll\win32\comdlg32/itemdlg.c 2013-10-15 19:32:27.803008200 +0100 -@@ -18,6 +18,8 @@ +diff -pudN e:\wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c +--- e:\wine\dlls\comdlg32/itemdlg.c 2015-04-05 20:44:56.807083800 +0100 ++++ e:\reactos\dll\win32\comdlg32/itemdlg.c 2015-07-21 09:56:34.329021000 +0100 +@@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ @@ -58,7 +63,12 @@ #include <stdarg.h> #define COBJMACROS -@@ -3660,3 +3662,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn + #define NONAMELESSUNION ++#define NONAMELESSSTRUCT + + #include "windef.h" + #include "winbase.h" +@@ -3847,3 +3850,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn { return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE); } Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Wed Jul 22 19:35:34 2015 @@ -2567,10 +2567,11 @@ filterSearchIndex[0] = '\0'; } + /* find the file extension by searching for the first dot in filterExt */ /* strip the * or anything else from the extension, "*.abc" becomes "abc" */ /* if the extension is invalid or contains a glob, ignore it */ - filterSearchIndex = PathFindExtensionW(filterExt); - if (*filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) + filterSearchIndex = strchrW(filterExt, '.'); + if (filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) { strcpyW(filterExt, filterSearchIndex); } Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/itemdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] Wed Jul 22 19:35:34 2015 @@ -1228,7 +1228,7 @@ /************************************************************************** * Window related functions. */ -static SIZE update_layout(FileDialogImpl *This) +static void update_layout(FileDialogImpl *This) { HDWP hdwp; HWND hwnd; @@ -1236,21 +1236,19 @@ RECT cancel_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; RECT toolbar_rc, ebrowser_rc, customctrls_rc; - int missing_width, missing_height; static const UINT vspacing = 4, hspacing = 4; - SIZE ret; - - GetClientRect(This->dlg_hwnd, &dialog_rc); - - missing_width = max(0, 320 - dialog_rc.right); - missing_height = max(0, 200 - dialog_rc.bottom); - - if(missing_width || missing_height) - { - TRACE("Missing (%d, %d)\n", missing_width, missing_height); - ret.cx = missing_width; - ret.cy = missing_height; - return ret; + static const UINT min_width = 320, min_height = 200; + + if (!GetClientRect(This->dlg_hwnd, &dialog_rc)) + { + TRACE("Invalid dialog window, not updating layout\n"); + return; + } + + if(dialog_rc.right < min_width || dialog_rc.bottom < min_height) + { + TRACE("Dialog size (%d, %d) too small, not updating layout\n", dialog_rc.right, dialog_rc.bottom); + return; } /**** @@ -1402,8 +1400,7 @@ else ERR("Failed to position dialog controls.\n"); - ret.cx = 0; ret.cy = 0; - return ret; + return; } static HRESULT init_explorerbrowser(FileDialogImpl *This) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jul 22 19:35:34 2015 @@ -56,7 +56,7 @@ reactos/dll/win32/clusapi # Synced to WineStaging-1.7.37 reactos/dll/win32/comcat # Synced to WineStaging-1.7.37 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.47 reactos/dll/win32/compstui # Synced to WineStaging-1.7.37 reactos/dll/win32/credui # Synced to WineStaging-1.7.37 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.47

9 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015