Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70174: [README.WINE] Mark some modules as synced with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 28 09:55:56 2015 New Revision: 70174 URL: http://svn.reactos.org/svn/reactos?rev=70174&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.7.55. CORE-10536 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] Sat Nov 28 09:55:56 2015 @@ -17,7 +17,7 @@ reactos/tools/unicode # Synced to WineStaging-1.7.55 reactos/tools/widl # Synced to WineStaging-1.7.55 -reactos/tools/wpp # Synced to WineStaging-1.7.47 +reactos/tools/wpp # Synced to WineStaging-1.7.55 The following libraries are shared with Wine. @@ -27,23 +27,23 @@ reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.55 -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.47 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.55 -reactos/dll/win32/activeds # Synced to WineStaging-1.7.47 -reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.47 +reactos/dll/win32/activeds # Synced to WineStaging-1.7.55 +reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.55 reactos/dll/win32/advpack # Synced to WineStaging-1.7.55 reactos/dll/win32/atl # Synced to WineStaging-1.7.55 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.55 @@ -51,198 +51,198 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.55 reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.55 reactos/dll/win32/browseui # Out of sync -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/cabinet # Synced to WineStaging-1.7.55 +reactos/dll/win32/clusapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/comcat # Synced to WineStaging-1.7.55 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.55 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/compstui # Synced to WineStaging-1.7.47 +reactos/dll/win32/compstui # Synced to WineStaging-1.7.55 reactos/dll/win32/credui # Synced to WineStaging-1.7.55 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.55 -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/cryptdlg # Synced to WineStaging-1.7.55 +reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.55 +reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.55 +reactos/dll/win32/cryptui # Synced to WineStaging-1.7.55 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.55 -reactos/dll/win32/dciman32 # 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/dciman32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55 +reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55 +reactos/dll/win32/fusion # Synced to WineStaging-1.7.55 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.55 -reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.47 -reactos/dll/win32/hlink # Synced to WineStaging-1.7.47 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.55 +reactos/dll/win32/hlink # Synced to WineStaging-1.7.55 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.55 -reactos/dll/win32/httpapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/httpapi # Synced to WineStaging-1.7.55 reactos/dll/win32/iccvid # Synced to WineStaging-1.7.55 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.55 -reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.47 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.55 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.47 -reactos/dll/win32/initpki # Synced to WineStaging-1.7.47 -reactos/dll/win32/inseng # Synced to WineStaging-1.7.47 +reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.55 +reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.55 +reactos/dll/win32/initpki # Synced to WineStaging-1.7.55 +reactos/dll/win32/inseng # Synced to WineStaging-1.7.55 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to WineStaging-1.7.47 -reactos/dll/win32/itss # Synced to WineStaging-1.7.47 +reactos/dll/win32/itircl # Synced to WineStaging-1.7.55 +reactos/dll/win32/itss # Synced to WineStaging-1.7.55 reactos/dll/win32/jscript # Synced to WineStaging-1.7.55 -reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.47 -reactos/dll/win32/loadperf # Synced to WineStaging-1.7.47 +reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.55 +reactos/dll/win32/loadperf # Synced to WineStaging-1.7.55 reactos/dll/win32/localspl # Synced to WineStaging-1.7.55 reactos/dll/win32/localui # Synced to WineStaging-1.7.55 -reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/lz32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mcicda # Synced to WineStaging-1.7.55 -reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mciseq # Synced to WineStaging-1.7.55 -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/mciwave # Synced to WineStaging-1.7.55 +reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/mlang # Synced to WineStaging-1.7.55 +reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.55 reactos/dll/win32/mpr # Synced to WineStaging-1.7.55 -reactos/dll/win32/mprapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/mprapi # Synced to WineStaging-1.7.55 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.55 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.55 -reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mscms # Synced to WineStaging-1.7.55 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.7.55 -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/msftedit # Synced to WineStaging-1.7.55 +reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.55 +reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml # 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.55 -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/msimg32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/msimtf # Synced to WineStaging-1.7.55 +reactos/dll/win32/msisip # Synced to WineStaging-1.7.55 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.55 +reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.55 reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.55 -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/mssign32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mstask # Synced to WineStaging-1.7.55 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 -reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml # Synced to WineStaging-1.7.55 +reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.55 reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.55 -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/msxml4 # Synced to WineStaging-1.7.55 +reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.55 +reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.55 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/npptools # Synced to WineStaging-1.7.47 +reactos/dll/win32/npptools # Synced to WineStaging-1.7.55 reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.55 -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/ntprint # Synced to WineStaging-1.7.55 +reactos/dll/win32/objsel # Synced to WineStaging-1.7.55 +reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.55. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.55 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/oleacc # Synced to WineStaging-1.7.47 +reactos/dll/win32/oleacc # Synced to WineStaging-1.7.55 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.55 reactos/dll/win32/oledlg # Synced to WineStaging-1.7.55 -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/olepro32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/pdh # Synced to WineStaging-1.7.55 +reactos/dll/win32/pidgen # Synced to WineStaging-1.7.55 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -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.47 -reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/resutils # Synced to WineStaging-1.7.47 +reactos/dll/win32/printui # Synced to WineStaging-1.7.55 +reactos/dll/win32/propsys # Synced to WineStaging-1.7.55 +reactos/dll/win32/pstorec # Synced to WineStaging-1.7.55 +reactos/dll/win32/qmgr # Synced to WineStaging-1.7.55 +reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.55 +reactos/dll/win32/query # Synced to WineStaging-1.7.55 +reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/resutils # Synced to WineStaging-1.7.55 reactos/dll/win32/riched20 # Synced to WineStaging-1.7.55 -reactos/dll/win32/riched32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55 reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.7.55 -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.47 -reactos/dll/win32/schannel # Synced to WineStaging-1.7.47 -reactos/dll/win32/scrrun # Synced to WineStaging-1.7.47 +reactos/dll/win32/rsabase # Synced to WineStaging-1.7.55 +reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.55 +reactos/dll/win32/sccbase # Synced to WineStaging-1.7.55 +reactos/dll/win32/schannel # Synced to WineStaging-1.7.55 +reactos/dll/win32/scrrun # Synced to WineStaging-1.7.55 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/sensapi # Synced to WineStaging-1.7.55 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.47 -reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.47 +reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.55 +reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.55 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to WineStaging-1.7.47 +reactos/dll/win32/shfolder # Synced to WineStaging-1.7.55 reactos/dll/win32/shlwapi # Synced to WineStaging-1.7.55 -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/slbcsp # Synced to WineStaging-1.7.55 +reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/softpub # Synced to WineStaging-1.7.55 +reactos/dll/win32/spoolss # Synced to WineStaging-1.7.55 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.55 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.55 +reactos/dll/win32/sti # Synced to WineStaging-1.7.55 reactos/dll/win32/sxs # Synced to WineStaging-1.7.55 -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/updspapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/url # Synced to WineStaging-1.7.47 +reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/traffic # Synced to WineStaging-1.7.55 +reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/updspapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/url # Synced to WineStaging-1.7.55 reactos/dll/win32/urlmon # Synced to WineStaging-1.7.55 reactos/dll/win32/usp10 # Synced to WineStaging-1.7.55 reactos/dll/win32/uxtheme # Forked -reactos/dll/win32/vbscript # Synced to WineStaging-1.7.47 +reactos/dll/win32/vbscript # Synced to WineStaging-1.7.55 reactos/dll/win32/version # Synced to WineStaging-1.7.55 -reactos/dll/win32/vssapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.47 +reactos/dll/win32/vssapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.55 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.55 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.55 -reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.47 -reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 +reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.55 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/wing32 # Synced to WineStaging-1.7.55 reactos/dll/win32/winhttp # Synced to WineStaging-1.7.55 reactos/dll/win32/wininet # Synced to WineStaging-1.7.55 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 -reactos/dll/win32/winscard # Synced to WineStaging-1.7.47 +reactos/dll/win32/winscard # Synced to WineStaging-1.7.55 reactos/dll/win32/wintrust # Synced to WineStaging-1.7.55 -reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 +reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/wmi # Synced to WineStaging-1.7.55 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.55 -reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.55 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.55 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 -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/wtsapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/wuapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.55 reactos/dll/win32/xmllite # Synced to WineStaging-1.7.55 -reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.47 +reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.55 ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.47 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.55 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.55 -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.47 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.55 reactos/base/applications/games/winmine # Synced to WineStaging-1.7.55 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/extrac32 # Synced to WineStaging-1.7.55 +reactos/base/applications/iexplore # Synced to WineStaging-1.7.55 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.55 reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 reactos/base/services/rpcss # Synced to WineStaging-1.7.55 -reactos/base/system/expand # Synced to WineStaging-1.7.47 +reactos/base/system/expand # Synced to WineStaging-1.7.55 reactos/base/system/msiexec # Synced to WineStaging-1.7.55 reactos/modules/rosapps/winfile # Autosync

8 years, 9 months

[hbelusca] 70173: [CLIPBRD] Implement loading the clipboard contents from a file. By Ricardo Hanke :) CORE-10550

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 28 01:22:34 2015 New Revision: 70173 URL: http://svn.reactos.org/svn/reactos?rev=70173&view=rev Log: [CLIPBRD] Implement loading the clipboard contents from a file. By Ricardo Hanke :) CORE-10550 Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/cliputils.c trunk/reactos/base/applications/clipbrd/fileutils.c trunk/reactos/base/applications/clipbrd/lang/de-DE.rc trunk/reactos/base/applications/clipbrd/lang/en-US.rc trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc trunk/reactos/base/applications/clipbrd/resources.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -37,7 +37,7 @@ if (!GetSaveFileNameW(&sfn)) return; - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; @@ -72,7 +72,7 @@ if (!GetOpenFileNameW(&ofn)) return; - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; @@ -94,7 +94,7 @@ DragQueryFileW(hDrop, 0, szFileName, ARRAYSIZE(szFileName)); DragFinish(hDrop); - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; @@ -163,7 +163,7 @@ if (CountClipboardFormats() == 0) return; - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) return; AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); Modified: trunk/reactos/base/applications/clipbrd/cliputils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -97,7 +97,7 @@ void DeleteClipboardContent(void) { - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; Modified: trunk/reactos/base/applications/clipbrd/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -8,14 +8,303 @@ #include "precomp.h" +static HGLOBAL ClipboardReadMemoryBlock(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HGLOBAL hData; + LPVOID lpData; + DWORD dwBytesRead; + + hData = GlobalAlloc(GHND, dwLength); + if (!hData) + { + return NULL; + } + + lpData = GlobalLock(hData); + if (!lpData) + { + GlobalFree(hData); + return NULL; + } + + if (SetFilePointer(hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + GlobalUnlock(hData); + GlobalFree(hData); + return NULL; + } + + if (!ReadFile(hFile, lpData, dwLength, &dwBytesRead, NULL)) + { + GlobalUnlock(hData); + GlobalFree(hData); + return NULL; + } + + GlobalUnlock(hData); + + return hData; +} + +static BOOL ClipboardReadMemory(HANDLE hFile, DWORD dwFormat, DWORD dwOffset, DWORD dwLength, LPCWSTR lpFormatName) +{ + HGLOBAL hData; + DWORD dwTemp; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + if ((dwFormat >= 0xC000) && (dwFormat <= 0xFFFF)) + { + dwTemp = RegisterClipboardFormatW(lpFormatName); + if (!dwTemp) + { + GlobalFree(hData); + return FALSE; + } + } + else + { + dwTemp = dwFormat; + } + + if (!SetClipboardData(dwTemp, hData)) + { + GlobalFree(hData); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadPalette(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + LPLOGPALETTE lpPalette; + HPALETTE hPalette; + HGLOBAL hData; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpPalette = GlobalLock(hData); + if (!lpPalette) + { + GlobalFree(hData); + return FALSE; + } + + hPalette = CreatePalette(lpPalette); + if (!hPalette) + { + GlobalUnlock(hData); + GlobalFree(hData); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + GlobalUnlock(hData); + GlobalFree(hData); + + if (!SetClipboardData(CF_PALETTE, hPalette)) + { + DeleteObject(hPalette); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadEnhMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HENHMETAFILE hEmf; + HGLOBAL hData; + LPVOID lpData; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpData = GlobalLock(hData); + if (!lpData) + { + GlobalFree(hData); + return FALSE; + } + + hEmf = SetEnhMetaFileBits(dwLength, lpData); + + GlobalUnlock(hData); + GlobalFree(hData); + + if (!hEmf) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + if (!SetClipboardData(CF_ENHMETAFILE, hEmf)) + { + DeleteEnhMetaFile(hEmf); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadBitmap(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HGLOBAL hData; + HBITMAP hBitmap; + LPBITMAP lpBitmap; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpBitmap = GlobalLock(hData); + if (!lpBitmap) + { + GlobalFree(hData); + return FALSE; + } + + lpBitmap->bmBits = lpBitmap + sizeof(BITMAP) + 1; + + hBitmap = CreateBitmapIndirect(lpBitmap); + + GlobalUnlock(hData); + GlobalFree(hData); + + if (!hBitmap) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + if (!SetClipboardData(CF_BITMAP, hBitmap)) + { + DeleteObject(hBitmap); + return FALSE; + } + + return TRUE; +} + void ReadClipboardFile(LPCWSTR lpFileName) +{ + CLIPBOARDFILEHEADER cfhFileHeader; + CLIPBOARDFORMATHEADER *cfhFormatArray = NULL; + HANDLE hFile; + DWORD dwBytesRead; + BOOL bResult; + int i; + + hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!ReadFile(hFile, &cfhFileHeader, sizeof(cfhFileHeader), &dwBytesRead, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if ((cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_NT) && (cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_BK)) + { + MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); + goto done; + } + + cfhFormatArray = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER)); + if (!cfhFormatArray) + { + SetLastError(ERROR_OUTOFMEMORY); + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!ReadFile(hFile, cfhFormatArray, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER), &dwBytesRead, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + for (i = 0; i < cfhFileHeader.wFormatCount; i++) + { + switch (cfhFormatArray[i].dwFormatID) + { + case CF_OWNERDISPLAY: + case CF_DSPMETAFILEPICT: + case CF_METAFILEPICT: + { + break; + } + + case CF_BITMAP: + case CF_DSPBITMAP: + { + bResult = ClipboardReadBitmap(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + break; + } + + case CF_DSPENHMETAFILE: + case CF_ENHMETAFILE: + { + bResult = ClipboardReadEnhMetafile(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + break; + } + + case CF_PALETTE: + { + bResult = ClipboardReadPalette(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + break; + } + + default: + { + if ((cfhFormatArray[i].dwFormatID < CF_PRIVATEFIRST) || (cfhFormatArray[i].dwFormatID > CF_PRIVATELAST)) + { + bResult = ClipboardReadMemory(hFile, cfhFormatArray[i].dwFormatID, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData, cfhFormatArray[i].szName); + } + break; + } + } + + if (!bResult) + { + ShowLastWin32Error(Globals.hMainWnd); + } + } + +done: + if (hFile != INVALID_HANDLE_VALUE) + { + CloseHandle(hFile); + } + + if (cfhFormatArray) + { + HeapFree(GetProcessHeap(), 0, cfhFormatArray); + } + + return; +} + +void WriteClipboardFile(LPCWSTR lpFileName) { MessageBoxW(Globals.hMainWnd, L"This function is currently not implemented.", L"Clipboard", MB_OK | MB_ICONINFORMATION); return; } - -void WriteClipboardFile(LPCWSTR lpFileName) -{ - MessageBoxW(Globals.hMainWnd, L"This function is currently not implemented.", L"Clipboard", MB_OK | MB_ICONINFORMATION); - return; -} Modified: trunk/reactos/base/applications/clipbrd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -60,4 +60,5 @@ STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "Die Daten in der Zwischenablage liegen in einem Format vor, welches nicht angezeigt werden kann." + ERROR_INVALID_FILE_FORMAT "Die ausgewÃ¤hlte Datei ist keine gÃ¼ltige Zwischenablagedatei." END Modified: trunk/reactos/base/applications/clipbrd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -60,4 +60,5 @@ STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "The Clipboard contains data in a format, that cannot be displayed." + ERROR_INVALID_FILE_FORMAT "The selected file is not a valid clipboard file." END Modified: trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -60,4 +60,5 @@ STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "Le Presse-papiers contient des donnÃ©es dans un format qui ne peut Ãªtre affichÃ©." + ERROR_INVALID_FILE_FORMAT "Le fichier sÃ©lectionnÃ© n'est pas un fichier valide du presse-papiers." END Modified: trunk/reactos/base/applications/clipbrd/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/resources.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/resources.h [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -34,4 +34,5 @@ #define STRING_CF_DIF 212 #define STRING_CF_HDROP 213 -#define ERROR_UNSUPPORTED_FORMAT 300 +#define ERROR_UNSUPPORTED_FORMAT 300 +#define ERROR_INVALID_FILE_FORMAT 301

8 years, 9 months

[akhaldi] 70172: [USER32] Sync ddemisc.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:52:21 2015 New Revision: 70172 URL: http://svn.reactos.org/svn/reactos?rev=70172&view=rev Log: [USER32] Sync ddemisc.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/include/dde_private.h trunk/reactos/win32ss/user/user32/misc/ddemisc.c 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] Fri Nov 27 22:52:21 2015 @@ -301,9 +301,9 @@ reactos/win32ss/user/user32/controls/scrollbar.c # Forked reactos/win32ss/user/user32/controls/static.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 - - reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) + reactos/win32ss/user/user32/include/dde_private.h # Synced to WineStaging-1.7.55 + + reactos/win32ss/user/user32/misc/dde.c # Synced to WineStaging-1.7.55 (dde_misc.c) reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 Modified: trunk/reactos/win32ss/user/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/dde_private.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/dde_private.h [iso-8859-1] Fri Nov 27 22:52:21 2015 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_DDEML_PRIVATE_H @@ -72,9 +72,9 @@ * be to provide a new protocol in the case were both partners are handled by DDEML. * * The StringHandles are in fact stored as local atoms. So an HSZ and a (local) atom - * can be used interchangably. However, in order to keep track of the allocated HSZ, + * can be used interchangeably. However, in order to keep track of the allocated HSZ, * and to free them upon instance termination, all HSZ are stored in a link list. - * When the HSZ need to be passed thru DDE messages, we need to convert them back and + * When the HSZ need to be passed through DDE messages, we need to convert them back and * forth to global atoms. */ @@ -143,9 +143,9 @@ /* DDE_LINK struct defines hot, warm, and cold links */ typedef struct tagWDML_LINK { struct tagWDML_LINK* next; /* to link all the active links */ - HCONV hConv; /* to get back to the converstaion */ + HCONV hConv; /* to get back to the conversation */ UINT transactionType;/* 0 for no link */ - HSZ hszItem; /* item targetted for (hot/warm) link */ + HSZ hszItem; /* item targeted for (hot/warm) link */ UINT uFmt; /* format for data */ } WDML_LINK; @@ -169,8 +169,6 @@ WDML_LINK* links[2]; /* active links for this instance (client and server) */ } WDML_INSTANCE; -extern CRITICAL_SECTION WDML_CritSect; /* protection for instance list */ - /* header for the DDE Data objects */ typedef struct tagDDE_DATAHANDLE_HEAD { @@ -189,66 +187,63 @@ extern HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInst, UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, - ULONG_PTR dwData1, ULONG_PTR dwData2); -extern WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); -extern void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); -extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); + ULONG_PTR dwData1, ULONG_PTR dwData2) DECLSPEC_HIDDEN; +extern WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; +extern void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; +extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; /* transaction handler on the server side */ -extern WDML_QUEUE_STATE WDML_ServerHandle(WDML_CONV* pConv, WDML_XACT* pXAct); +extern WDML_QUEUE_STATE WDML_ServerHandle(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; /* transaction handler on the client side */ HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, LPDWORD pdwResult) DECLSPEC_HIDDEN; /* called both in DdeClientTransaction and server side. */ -extern UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode); extern WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer); -extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side); -extern WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected); -extern WDML_CONV* WDML_GetConvFromWnd(HWND hWnd); + HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer) DECLSPEC_HIDDEN; +extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side) DECLSPEC_HIDDEN; +extern WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected) DECLSPEC_HIDDEN; +extern WDML_CONV* WDML_GetConvFromWnd(HWND hWnd) DECLSPEC_HIDDEN; extern WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic); + HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; extern BOOL WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode, - BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg); + BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg) DECLSPEC_HIDDEN; extern void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - UINT wType, HSZ hszItem, UINT wFmt); + UINT wType, HSZ hszItem, UINT wFmt) DECLSPEC_HIDDEN; extern WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, BOOL use_fmt, UINT uFmt); + HSZ hszItem, BOOL use_fmt, UINT uFmt) DECLSPEC_HIDDEN; extern void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, UINT wFmt); -extern void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side); + HSZ hszItem, UINT wFmt) DECLSPEC_HIDDEN; /* string internals */ -extern void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance); -extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz); -extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz); -extern ATOM WDML_MakeAtomFromHsz(HSZ hsz); -extern HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom); +extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; +extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; +extern ATOM WDML_MakeAtomFromHsz(HSZ hsz) DECLSPEC_HIDDEN; +extern HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) DECLSPEC_HIDDEN; /* client calls these */ -extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, UINT wFmt, HSZ hszItem); -extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct); -extern BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct); -extern void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt); -extern WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid); -extern HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, - BOOL fDeferUpd, BOOL fAckReq); -extern HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* p); -extern BOOL WDML_IsAppOwned(HDDEDATA hDdeData); -extern WDML_INSTANCE* WDML_GetInstance(DWORD InstId); -extern WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd); +extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, UINT wFmt, HSZ hszItem) DECLSPEC_HIDDEN; +extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; +extern BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; +extern void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt) DECLSPEC_HIDDEN; +extern HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, + BOOL fDeferUpd, BOOL dAckReq) DECLSPEC_HIDDEN; +extern HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* da) DECLSPEC_HIDDEN; +extern BOOL WDML_IsAppOwned(HDDEDATA hDdeData) DECLSPEC_HIDDEN; +extern WDML_INSTANCE* WDML_GetInstance(DWORD InstId) DECLSPEC_HIDDEN; +extern WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd) DECLSPEC_HIDDEN; /* broadcasting to DDE windows */ extern void WDML_BroadcastDDEWindows(LPCWSTR clsName, UINT uMsg, - WPARAM wParam, LPARAM lParam); -extern void WDML_NotifyThreadExit(DWORD tid); + WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; +extern void WDML_NotifyThreadExit(DWORD tid) DECLSPEC_HIDDEN; +extern void WDML_NotifyThreadDetach(void) DECLSPEC_HIDDEN; + static __inline void WDML_ExtractAck(WORD status, DDEACK* da) { *da = *((DDEACK*)&status); } -extern const WCHAR WDML_szEventClass[]; /* class of window for events (aka instance) */ -extern const char WDML_szServerConvClassA[]; /* ANSI class of window for server side conv */ -extern const WCHAR WDML_szServerConvClassW[]; /* unicode class of window for server side conv */ -extern const char WDML_szClientConvClassA[]; /* ANSI class of window for client side conv */ -extern const WCHAR WDML_szClientConvClassW[]; /* unicode class of window for client side conv */ +extern const WCHAR WDML_szEventClass[] DECLSPEC_HIDDEN; /* class of window for events (aka instance) */ +extern const char WDML_szServerConvClassA[] DECLSPEC_HIDDEN; /* ANSI class of window for server side conv */ +extern const WCHAR WDML_szServerConvClassW[] DECLSPEC_HIDDEN; /* unicode class of window for server side conv */ +extern const char WDML_szClientConvClassA[] DECLSPEC_HIDDEN; /* ANSI class of window for client side conv */ +extern const WCHAR WDML_szClientConvClassW[] DECLSPEC_HIDDEN; /* unicode class of window for client side conv */ #define WM_WDML_REGISTER (WM_USER + 0x200) #define WM_WDML_UNREGISTER (WM_USER + 0x201) Modified: trunk/reactos/win32ss/user/user32/misc/ddemisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddemisc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddemisc.c [iso-8859-1] Fri Nov 27 22:52:21 2015 @@ -39,14 +39,14 @@ const WCHAR WDML_szEventClass[] = L"DDEMLEvent"; /* protection for instance list */ -CRITICAL_SECTION WDML_CritSect; +static CRITICAL_SECTION WDML_CritSect; static CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &WDML_CritSect, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": WDML_CritSect") } }; -CRITICAL_SECTION WDML_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION WDML_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; /* ================================================================ * @@ -417,7 +417,7 @@ * Frees up all the strings still allocated in the list and * remove all the nodes from the list of HSZ nodes. */ -void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) +static void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) { /* Free any strings created in this instance. */ @@ -825,7 +825,7 @@ * * */ -UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, +static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes, BOOL bUnicode) { WDML_INSTANCE* pInstance; @@ -1820,7 +1820,7 @@ * * */ -void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) +static void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) { WDML_LINK* pPrev = NULL; WDML_LINK* pCurrent = NULL; @@ -1869,7 +1869,7 @@ WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, HSZ hszItem, BOOL use_fmt, UINT uFmt) { - WDML_LINK* pCurrent = NULL; + WDML_LINK* pCurrent; for (pCurrent = pInstance->links[side]; pCurrent != NULL; pCurrent = pCurrent->next) { @@ -1982,7 +1982,7 @@ * * */ -WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) +static WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) { WDML_XACT* pXAct; @@ -2049,7 +2049,7 @@ WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, HSZ hszService, HSZ hszTopic) { - WDML_CONV* pCurrent = NULL; + WDML_CONV* pCurrent; for (pCurrent = pInstance->convs[side]; pCurrent != NULL; pCurrent = pCurrent->next) {

8 years, 9 months

[akhaldi] 70171: [USER32] Sync ddeserver.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:51:40 2015 New Revision: 70171 URL: http://svn.reactos.org/svn/reactos?rev=70171&view=rev Log: [USER32] Sync ddeserver.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/misc/ddeserver.c 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] Fri Nov 27 22:51:40 2015 @@ -305,7 +305,7 @@ reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/winhelp.c # Last sync date unknown Modified: trunk/reactos/win32ss/user/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] Fri Nov 27 22:51:40 2015 @@ -50,12 +50,12 @@ */ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) { - WDML_INSTANCE* pInstance = NULL; - WDML_LINK* pLink = NULL; - HDDEDATA hDdeData = 0; - HGLOBAL hItemData = 0; - WDML_CONV* pConv = NULL; - ATOM atom = 0; + WDML_INSTANCE* pInstance; + WDML_LINK* pLink; + HDDEDATA hDdeData; + HGLOBAL hItemData; + WDML_CONV* pConv; + ATOM atom; UINT count; TRACE("(%d,%p,%p)\n", idInst, hszTopic, hszItem); @@ -368,7 +368,7 @@ { HWND hwndClient; HSZ hszApp, hszTop; - HDDEDATA hDdeData = 0; + HDDEDATA hDdeData; WDML_INSTANCE* pInstance; UINT_PTR uiLo, uiHi;

8 years, 9 months

[akhaldi] 70170: [USER32] Sync ddeclient.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:50:54 2015 New Revision: 70170 URL: http://svn.reactos.org/svn/reactos?rev=70170&view=rev Log: [USER32] Sync ddeclient.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/misc/ddeclient.c 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] Fri Nov 27 22:50:54 2015 @@ -304,7 +304,7 @@ reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) - reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55 Modified: trunk/reactos/win32ss/user/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] Fri Nov 27 22:50:54 2015 @@ -88,7 +88,7 @@ { HWND hwndClient; WDML_INSTANCE* pInstance; - WDML_CONV* pConv = NULL; + WDML_CONV* pConv; ATOM aSrv = 0, aTpc = 0; TRACE("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); @@ -1126,7 +1126,7 @@ { WDML_CONV* pConv; WDML_XACT* pXAct; - HDDEDATA hDdeData = 0; + HDDEDATA hDdeData; TRACE("(%p,%d,%p,%p,%x,%x,%d,%p)\n", pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); @@ -1364,7 +1364,7 @@ */ BOOL WINAPI DdeDisconnect(HCONV hConv) { - WDML_CONV* pConv = NULL; + WDML_CONV* pConv; WDML_XACT* pXAct; BOOL ret = FALSE;

8 years, 9 months

[akhaldi] 70169: [USER32] Partially sync resources.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:49:47 2015 New Revision: 70169 URL: http://svn.reactos.org/svn/reactos?rev=70169&view=rev Log: [USER32] Partially sync resources.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/misc/resources.c 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] Fri Nov 27 22:49:47 2015 @@ -307,7 +307,7 @@ reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 - reactos/win32ss/user/user32/misc/resources.c # Forked? + reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/winhelp.c # Last sync date unknown reactos/win32ss/user/user32/misc/wsprintf.c # Synced to Wine-1_1_23 Modified: trunk/reactos/win32ss/user/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/resources.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/resources.c [iso-8859-1] Fri Nov 27 22:49:47 2015 @@ -1,6 +1,7 @@ #include <user32.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(resource); #ifndef _CFGMGR32_H_ #define CR_SUCCESS 0x00000000 @@ -20,49 +21,21 @@ static HINSTANCE hSetupApi = NULL; - -/* - * @implemented (Synced with Wine 08.01.2009) - */ -INT -WINAPI -LoadStringA(HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen) -{ - HGLOBAL hmem; - HRSRC hrsrc; - DWORD retval = 0; - - if (!buflen) return -1; - - /* Use loword (incremented by 1) as resourceid */ - if ((hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), - (LPWSTR)RT_STRING )) && - (hmem = LoadResource( instance, hrsrc ))) - { - const WCHAR *p = LockResource(hmem); - unsigned int id = resource_id & 0x000f; - - while (id--) p += *p + 1; - - RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, (PWSTR)(p + 1), *p * sizeof(WCHAR) ); - } - buffer[retval] = 0; - return retval; -} - - -/* - * @implemented (Synced with Wine 08.01.2009) - */ -INT -WINAPI -LoadStringW(HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen) +/********************************************************************** + * LoadStringW (USER32.@) + * Synced with Wine Staging 1.7.55 + */ +INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, + LPWSTR buffer, INT buflen ) { HGLOBAL hmem; HRSRC hrsrc; WCHAR *p; int string_num; int i; + + TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", + instance, resource_id, buffer, buflen); if(buffer == NULL) return 0; @@ -77,7 +50,9 @@ p = LockResource(hmem); string_num = resource_id & 0x000f; for (i = 0; i < string_num; i++) - p += *p + 1; + p += *p + 1; + + TRACE("strlen = %d\n", (int)*p ); /*if buflen == 0, then return a read-only pointer to the resource itself in buffer it is assumed that buffer is actually a (LPWSTR *) */ @@ -89,18 +64,51 @@ i = min(buflen - 1, *p); if (i > 0) { - memcpy(buffer, p + 1, i * sizeof (WCHAR)); + memcpy(buffer, p + 1, i * sizeof (WCHAR)); buffer[i] = 0; } else { - if (buflen > 1) { + if (buflen > 1) { buffer[0] = 0; - return 0; - } - } - + return 0; + } + } + + TRACE("%s loaded !\n", debugstr_w(buffer)); return i; } +/********************************************************************** + * LoadStringA (USER32.@) + * Synced with Wine Staging 1.7.55 + */ +INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) +{ + HGLOBAL hmem; + HRSRC hrsrc; + DWORD retval = 0; + + TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", + instance, resource_id, buffer, buflen); + + if (!buflen) return -1; + + /* Use loword (incremented by 1) as resourceid */ + if ((hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), + (LPWSTR)RT_STRING )) && + (hmem = LoadResource( instance, hrsrc ))) + { + const WCHAR *p = LockResource(hmem); + unsigned int id = resource_id & 0x000f; + + while (id--) p += *p + 1; + + if (buflen != 1) + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, (PWSTR)(p + 1), *p * sizeof(WCHAR) ); + } + buffer[retval] = 0; + TRACE("returning %s\n", debugstr_a(buffer)); + return retval; +} /* * @implemented

8 years, 9 months

[akhaldi] 70168: [USER32] Sync static.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:48:33 2015 New Revision: 70168 URL: http://svn.reactos.org/svn/reactos?rev=70168&view=rev Log: [USER32] Sync static.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/static.c 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] Fri Nov 27 22:48:33 2015 @@ -299,7 +299,7 @@ reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/controls/listbox.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/controls/scrollbar.c # Forked - reactos/win32ss/user/user32/controls/static.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/static.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 Modified: trunk/reactos/win32ss/user/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/static.c [iso-8859-1] Fri Nov 27 22:48:33 2015 @@ -21,7 +21,7 @@ * * This code was audited for completeness against the documented features * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * + * * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. @@ -174,7 +174,7 @@ SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } - + } return hOldBitmap; } @@ -299,7 +299,24 @@ static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) { +#ifdef __REACTOS__ return GetControlBrush( hwnd, hdc, WM_CTLCOLORSTATIC); +#else + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, + WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +#endif } static VOID STATIC_InitColours(void) @@ -326,7 +343,7 @@ case SS_OWNERDRAW: return TRUE; } - + return FALSE; } @@ -472,15 +489,12 @@ case WM_SETTEXT: if (hasTextStyle( full_style )) { - if (HIWORD(lParam)) - { - if(unicode) - lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); - else - lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); - STATIC_TryPaintFcn( hwnd, full_style ); - } - } + if (unicode) + lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); + else + lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); + STATIC_TryPaintFcn( hwnd, full_style ); + } break; case WM_SETFONT: @@ -823,6 +837,7 @@ GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { + FillRect( hdc, &rcClient, hbrush ); rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; rcClient.right = rcClient.left + bm.bmWidth;

8 years, 9 months

[akhaldi] 70167: [USER32] Sync listbox.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:47:40 2015 New Revision: 70167 URL: http://svn.reactos.org/svn/reactos?rev=70167&view=rev Log: [USER32] Sync listbox.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/listbox.c 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] Fri Nov 27 22:47:40 2015 @@ -297,7 +297,7 @@ reactos/win32ss/user/user32/controls/combo.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/edit.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/listbox.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/controls/scrollbar.c # Forked reactos/win32ss/user/user32/controls/static.c # Synced to Wine-1_1_39 Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] Fri Nov 27 22:47:40 2015 @@ -259,7 +259,7 @@ if (descr->style & WS_VSCROLL) SetScrollInfo( descr->self, SB_VERT, &info, TRUE ); - if (descr->style & WS_HSCROLL && descr->horz_extent) + if ((descr->style & WS_HSCROLL) && descr->horz_extent) { info.nPos = descr->horz_pos; info.nPage = descr->width; @@ -364,8 +364,11 @@ static void LISTBOX_UpdateSize( LB_DESCR *descr ) { RECT rect; + LONG style = GetWindowLongPtrW( descr->self, GWL_STYLE ); GetClientRect( descr->self, &rect ); + if (style & WS_HSCROLL) + rect.bottom += GetSystemMetrics(SM_CYHSCROLL); descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; if (!(descr->style & LBS_NOINTEGRALHEIGHT) && !(descr->style & LBS_OWNERDRAWVARIABLE)) @@ -557,7 +560,7 @@ dis.itemData = item->data; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, item ? debugstr_w(item->str) : "", action, + descr->self, index, debugstr_w(item->str), action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn ); @@ -660,7 +663,12 @@ if (LISTBOX_GetItemRect( descr, index, &rect ) != 1) return; if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) return; if (descr->font) oldFont = SelectObject( hdc, descr->font ); +#ifdef __REACTOS__ hbrush = GetControlColor( descr->owner, descr->self, hdc, WM_CTLCOLORLISTBOX); +#else + hbrush = (HBRUSH)SendMessageW( descr->owner, WM_CTLCOLORLISTBOX, + (WPARAM)hdc, (LPARAM)descr->self ); +#endif if (hbrush) oldBrush = SelectObject( hdc, hbrush ); if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); @@ -693,7 +701,7 @@ if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); SetWindowOrgEx( hdc, descr->horz_pos, 0, NULL ); - LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, ODA_FOCUS, on ? FALSE : TRUE ); + LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, ODA_FOCUS, !on ); if (oldFont) SelectObject( hdc, oldFont ); ReleaseDC( descr->self, hdc ); } @@ -750,7 +758,7 @@ if (!(descr->tabs = HeapAlloc( GetProcessHeap(), 0, descr->nb_tabs * sizeof(INT) ))) return FALSE; - memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT) ); + memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT) ); /* convert into "dialog units"*/ for (i = 0; i < descr->nb_tabs; i++) @@ -833,7 +841,7 @@ */ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { - INT index, min, max, res = -1; + INT index, min, max, res; if (!(descr->style & LBS_SORT)) return -1; /* Add it at the end */ min = 0; @@ -876,7 +884,7 @@ */ static INT LISTBOX_FindFileStrPos( LB_DESCR *descr, LPCWSTR str ) { - INT min, max, res = -1; + INT min, max, res; if (!HAS_STRINGS(descr)) return LISTBOX_FindStringPos( descr, str, FALSE ); @@ -1031,7 +1039,12 @@ } if (descr->font) oldFont = SelectObject( hdc, descr->font ); +#ifdef __REACTOS__ hbrush = GetControlColor( descr->owner, descr->self, hdc, WM_CTLCOLORLISTBOX); +#else + hbrush = (HBRUSH)SendMessageW( descr->owner, WM_CTLCOLORLISTBOX, + (WPARAM)hdc, (LPARAM)descr->self ); +#endif if (hbrush) oldBrush = SelectObject( hdc, hbrush ); if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); @@ -2516,7 +2529,7 @@ descr->nb_tabs = 0; descr->tabs = NULL; descr->wheel_remain = 0; - descr->caret_on = lphc ? FALSE : TRUE; + descr->caret_on = !lphc; if (descr->style & LBS_NOSEL) descr->caret_on = FALSE; descr->in_focus = FALSE; descr->captured = FALSE; @@ -2647,8 +2660,10 @@ return 0; case LB_ADDSTRING: +#ifdef __REACTOS__ case LB_ADDSTRING_LOWER: case LB_ADDSTRING_UPPER: +#endif { INT ret; LPWSTR textW; @@ -2663,12 +2678,14 @@ else return LB_ERRSPACE; } +#ifdef __REACTOS__ /* in the unicode the version, the string is really overwritten during the converting case */ if (msg == LB_ADDSTRING_LOWER) strlwrW(textW); else if (msg == LB_ADDSTRING_UPPER) struprW(textW); +#endif wParam = LISTBOX_FindStringPos( descr, textW, FALSE ); ret = LISTBOX_InsertString( descr, wParam, textW ); if (!unicode && HAS_STRINGS(descr)) @@ -2677,8 +2694,10 @@ } case LB_INSERTSTRING: +#ifdef __REACTOS__ case LB_INSERTSTRING_UPPER: case LB_INSERTSTRING_LOWER: +#endif { INT ret; LPWSTR textW; @@ -2693,12 +2712,14 @@ else return LB_ERRSPACE; } +#ifdef __REACTOS__ /* in the unicode the version, the string is really overwritten during the converting case */ if (msg == LB_INSERTSTRING_LOWER) strlwrW(textW); else if (msg == LB_INSERTSTRING_UPPER) struprW(textW); +#endif ret = LISTBOX_InsertString( descr, wParam, textW ); if(!unicode && HAS_STRINGS(descr)) HeapFree(GetProcessHeap(), 0, textW); @@ -3188,7 +3209,12 @@ if ((IS_OWNERDRAW(descr)) && !(descr->style & LBS_DISPLAYCHANGED)) { RECT rect; +#ifdef __REACTOS__ HBRUSH hbrush = GetControlColor( descr->owner, descr->self, (HDC)wParam, WM_CTLCOLORLISTBOX); +#else + HBRUSH hbrush = (HBRUSH)SendMessageW( descr->owner, WM_CTLCOLORLISTBOX, + wParam, (LPARAM)descr->self ); +#endif TRACE("hbrush = %p\n", hbrush); if(!hbrush) hbrush = GetSysColorBrush(COLOR_WINDOW);

8 years, 9 months

[akhaldi] 70166: [USER32] Sync icontitle.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:46:41 2015 New Revision: 70166 URL: http://svn.reactos.org/svn/reactos?rev=70166&view=rev Log: [USER32] Sync icontitle.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/icontitle.c 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] Fri Nov 27 22:46:41 2015 @@ -296,7 +296,7 @@ reactos/win32ss/user/user32/controls/button.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/combo.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/edit.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 reactos/win32ss/user/user32/controls/scrollbar.c # Forked reactos/win32ss/user/user32/controls/static.c # Synced to Wine-1_1_39 Modified: trunk/reactos/win32ss/user/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/icontitle.c [iso-8859-1] Fri Nov 27 22:46:41 2015 @@ -126,7 +126,7 @@ { RECT rect; HFONT hPrevFont; - HBRUSH hBrush = 0; + HBRUSH hBrush; COLORREF textColor = 0; if( bActive ) @@ -213,7 +213,7 @@ case WM_CLOSE: return 0; case WM_SHOWWINDOW: - if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); + if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: if( GetWindowLongPtrW( owner, GWL_STYLE ) & WS_CHILD )

8 years, 9 months

[akhaldi] 70165: [USER32] Sync edit.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 22:45:32 2015 New Revision: 70165 URL: http://svn.reactos.org/svn/reactos?rev=70165&view=rev Log: [USER32] Sync edit.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/edit.c 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] Fri Nov 27 22:45:32 2015 @@ -295,7 +295,7 @@ User32 - reactos/win32ss/user/user32/controls/button.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/combo.c # Synced to WineStaging-1.7.37 - reactos/win32ss/user/user32/controls/edit.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/controls/edit.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 reactos/win32ss/user/user32/controls/scrollbar.c # Forked Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Fri Nov 27 22:45:32 2015 @@ -511,7 +511,7 @@ LINEDEF *current_line; LINEDEF *previous_line; LINEDEF *start_line; - INT line_index = 0, nstart_line = 0, nstart_index = 0; + INT line_index = 0, nstart_line, nstart_index; INT line_count = es->line_count; INT orig_net_length; RECT rc; @@ -1097,7 +1097,7 @@ INT x = 0; INT y = 0; INT w; - INT lw = 0; + INT lw; LINEDEF *line_def; index = min(index, len); @@ -2235,12 +2235,9 @@ ret = (INT)LOWORD(TabbedTextOutW(dc, x, y, es->text + li + col, count, es->tabs_count, es->tabs, es->format_rect.left - es->x_offset)); } else { - LPWSTR text = es->text; - TextOutW(dc, x, y, text + li + col, count); - GetTextExtentPoint32W(dc, text + li + col, count, &size); + TextOutW(dc, x, y, es->text + li + col, count); + GetTextExtentPoint32W(dc, es->text + li + col, count, &size); ret = size.cx; - if (es->style & ES_PASSWORD) - HeapFree(GetProcessHeap(), 0, text); } if (rev) { if (es->composition_len == 0) @@ -2621,7 +2618,7 @@ LPWSTR p; HRGN hrgn = 0; LPWSTR buf = NULL; - UINT bufl = 0; + UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", debugstr_w(lpsz_replace), can_undo, send_update); @@ -2770,8 +2767,7 @@ EDIT_EM_EmptyUndoBuffer(es); } - if (bufl) - HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, buf); s += strl; @@ -2927,7 +2923,7 @@ */ static int calc_min_set_margin_size(HDC dc, INT left, INT right) { - WCHAR magic_string[] = {'\'','*','*','\'', 0}; + static const WCHAR magic_string[] = {'\'','*','*','\'', 0}; SIZE sz; GetTextExtentPointW(dc, magic_string, sizeof(magic_string)/sizeof(WCHAR) - 1, &sz); @@ -3995,12 +3991,11 @@ * WM_SIZE * */ -static void EDIT_WM_Size(EDITSTATE *es, UINT action, INT width, INT height) +static void EDIT_WM_Size(EDITSTATE *es, UINT action) { if ((action == SIZE_MAXIMIZED) || (action == SIZE_RESTORED)) { RECT rc; - TRACE("width = %d, height = %d\n", width, height); - SetRect(&rc, 0, 0, width, height); + GetClientRect(es->hwndSelf, &rc); EDIT_SetRectNP(es, &rc); EDIT_UpdateText(es, NULL, TRUE); } @@ -4373,7 +4368,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) { LONG buflen; - LPWSTR lpCompStr = NULL; + LPWSTR lpCompStr; LPSTR lpCompStrAttr = NULL; DWORD dwBufLenAttr; @@ -4416,8 +4411,6 @@ dwBufLenAttr); lpCompStrAttr[dwBufLenAttr] = 0; } - else - lpCompStrAttr = NULL; } /* check for change in composition start */ @@ -5193,7 +5186,7 @@ break; case WM_SIZE: - EDIT_WM_Size(es, (UINT)wParam, LOWORD(lParam), HIWORD(lParam)); + EDIT_WM_Size(es, (UINT)wParam); break; case WM_STYLECHANGED:

8 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015