Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue Dec 18 22:02:09 2007 New Revision: 31309 URL: http://svn.reactos.org/svn/reactos?rev=31309&view=rev Log: - fix a typo Modified: branches/rbuild/reactos/baseaddress.rbuild branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/baseaddress.rbui… ============================================================================== --- branches/rbuild/reactos/baseaddress.rbuild (original) +++ branches/rbuild/reactos/baseaddress.rbuild Tue Dec 18 22:02:09 2007 @@ -1,151 +1,151 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <baseadress name="BASEADDRESS_REGTESTS" value="0x07000000" /> - <baseadress name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> - <baseadress name="BASEADDRESS_COMCAT" value="0x20A50000" /> - <baseadress name="BASEADDRESS_DEVENUM" value="0x35680000" /> - <baseadress name="BASEADDRESS_PWRCFG" value="0x587e0000" /> - <baseadress name="BASEADDRESS_MMSYS" value="0x588a0000" /> - <baseadress name="BASEADDRESS_JOY" value="0x589b0000" /> - <baseadress name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> - <baseadress name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> - <baseadress name="BASEADDRESS_OBJSEL" value="0x5b400000" /> - <baseadress name="BASEADDRESS_TAPIUI" value="0x5b770000" /> - <baseadress name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> - <baseadress name="BASEADDRESS_USRMGR" value="0x5c900000" /> - <baseadress name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> - <baseadress name="BASEADDRESS_DPLAYX" value="0x5e080000" /> - <baseadress name="BASEADDRESS_INPUT" value ="0x5e400000" /> - <baseadress name="BASEADDRESS_DINPUT" value="0x5f580000" /> - <baseadress name="BASEADDRESS_NETID" value="0x5f660000" /> - <baseadress name="BASEADDRESS_MAPI32" value="0x62250000" /> - <baseadress name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> - <baseadress name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> - <baseadress name="BASEADDRESS_SYSDM" value="0x64dd0000" /> - <baseadress name="BASEADDRESS_NCPL" value="0x64ea0000" /> - <baseadress name="BASEADDRESS_MAIN" value="0x64f40000" /> - <baseadress name="BASEADDRESS_INTL" value="0x64fb0000" /> - <baseadress name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> - <baseadress name="BASEADDRESS_DESK" value="0x65080000" /> - <baseadress name="BASEADDRESS_APPWIZ" value="0x65100000" /> - <baseadress name="BASEADDRESS_MLANG" value="0x65140000" /> - <baseadress name="BASEADDRESS_ACCESS" value="0x65180000" /> - <baseadress name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> - <baseadress name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> - <baseadress name="BASEADDRESS_HID" value="0x688f0000" /> - <baseadress name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> - <baseadress name="BASEADDRESS_PSAPI" value="0x68f70000" /> - <baseadress name="BASEADDRESS_OLEACC" value="0x69640000" /> - <baseadress name="BASEADDRESS_WINMM" value="0x697d0000" /> - <baseadress name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> - <baseadress name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> - <baseadress name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> - <baseadress name="BASEADDRESS_SHELL32" value="0x6a360000" /> - <baseadress name="BASEADDRESS_UNICODE" value="0x6b200000" /> - <baseadress name="BASEADDRESS_ADVPACK" value="0x6b300000" /> - <baseadress name="BASEADDRESS_CONTROL" value="0x6b310000" /> - <baseadress name="BASEADDRESS_NCPA" value="0x6b320000" /> - <baseadress name="BASEADDRESS_DBGHELP" value="0x6b330000" /> - <baseadress name="BASEADDRESS_DINPUT8" value="0x6b340000" /> - <baseadress name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> - <baseadress name="BASEADDRESS_DSOUND" value="0x6b360000" /> - <baseadress name="BASEADDRESS_GLU32" value="0x6b370000" /> - <baseadress name="BASEADDRESS_MESA32" value="0x6b380000" /> - <baseadress name="BASEADDRESS_OPENGL32" value="0x6b390000" /> - <baseadress name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> - <baseadress name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> - <baseadress name="BASEADDRESS_URLMON" value="0x6b3c0000" /> - <baseadress name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> - <baseadress name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> - <baseadress name="BASEADDRESS_DESKMON" value="0x6d400000" /> - <baseadress name="BASEADDRESS_DESKADP" value="0x6d410000" /> - <baseadress name="BASEADDRESS_WLDAP32" value="0x6e130000" /> - <baseadress name="BASEADDRESS_CLB" value="0x6f2b0000" /> - <baseadress name="BASEADDRESS_CARDS" value="0x701a0000" /> - <baseadress name="BASEADDRESS_WININET" value="0x70200000" /> - <baseadress name="BASEADDRESS_ACLUI" value="0x71550000" /> - <baseadress name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> - <baseadress name="BASEADDRESS_SHDOCVW" value="0x71700000" /> - <baseadress name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> - <baseadress name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> - <baseadress name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> - <baseadress name="BASEADDRESS_NETAPI32" value="0x71c00000" /> - <baseadress name="BASEADDRESS_DPLAY" value="0x71e80000" /> - <baseadress name="BASEADDRESS_SECURITY" value="0x71f10000" /> - <baseadress name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> - <baseadress name="BASEADDRESS_WINFAX" value="0x722C0000" /> - <baseadress name="BASEADDRESS_WINSCARD" value="0x723d0000" /> - <baseadress name="BASEADDRESS_DEVMGR" value="0x72a90000" /> - <baseadress name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> - <baseadress name="BASEADDRESS_LZ32" value="0x73d80000" /> - <baseadress name="BASEADDRESS_COREDLL" value="0x73d80000" /> - <baseadress name="BASEADDRESS_ICMP" value="0x741f0000" /> - <baseadress name="BASEADDRESS_UFAT" value="0x741f0000" /> - <baseadress name="BASEADDRESS_USERENV" value="0x74850000" /> - <baseadress name="BASEADDRESS_WS2_32" value="0x74aa0000" /> - <baseadress name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> - <baseadress name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> - <baseadress name="BASEADDRESS_MMDRV" value="0x74c30000" /> - <baseadress name="BASEADDRESS_OLEDLG" value="0x74d00000" /> - <baseadress name="BASEADDRESS_SAMSRV" value="0x74f30000" /> - <baseadress name="BASEADDRESS_SAMLIB" value="0x750C0000" /> - <baseadress name="BASEADDRESS_CABINET" value="0x75120000" /> - <baseadress name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> - <baseadress name="BASEADDRESS_MSGINA" value="0x75970000" /> - <baseadress name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> - <baseadress name="BASEADDRESS_RPCRT4" value="0x76000000" /> - <baseadress name="BASEADDRESS_SHLWAPI" value="0x76120000" /> - <baseadress name="BASEADDRESS_COMCTL32" value="0x76160000" /> - <baseadress name="BASEADDRESS_COMDLG32" value="0x76210000" /> - <baseadress name="BASEADDRESS_OLEAUT32" value="0x76290000" /> - <baseadress name="BASEADDRESS_RICHED32" value="0x76340000" /> - <baseadress name="BASEADDRESS_D3D8THK" value="0x76340000" /> - <baseadress name="BASEADDRESS_RICHED20" value="0x76360000" /> - <baseadress name="BASEADDRESS_TWAIN_32" value="0x76380000" /> - <baseadress name="BASEADDRESS_IMM32" value="0x76390000" /> - <baseadress name="BASEADDRESS_LSASRV" value="0x76540000" /> - <baseadress name="BASEADDRESS_MIDIMAP" value="0x76600000" /> - <baseadress name="BASEADDRESS_ODBC32" value="0x76660000" /> - <baseadress name="BASEADDRESS_ODBCCP32" value="0x76380000" /> - <baseadress name="BASEADDRESS_WAVEMAP" value="0x76610000" /> - <baseadress name="BASEADDRESS_MPR" value="0x76620000" /> - <baseadress name="BASEADDRESS_SETUPAPI" value="0x76660000" /> - <baseadress name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <baseadress name="BASEADDRESS_SHFOLDER" value="0x76780000" /> - <baseadress name="BASEADDRESS_NTMARTA" value="0x768A0000" /> - <baseadress name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> - <baseadress name="BASEADDRESS_WINTRUST" value="0x76c30000" /> - <baseadress name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> - <baseadress name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> - <baseadress name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> - <baseadress name="BASEADDRESS_FMIFS" value="0x76df0000" /> - <baseadress name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> - <baseadress name="BASEADDRESS_MSVFW32" value="0x77400000" /> - <baseadress name="BASEADDRESS_MSACM32" value="0x77400000" /> - <baseadress name="BASEADDRESS_CRTDLL" value="0x77630000" /> - <baseadress name="BASEADDRESS_AUTHZ" value="0x77690000" /> - <baseadress name="BASEADDRESS_CFGMGR32" value="0x77700000" /> - <baseadress name="BASEADDRESS_SENSAPI" value="0x77700000" /> - <baseadress name="BASEADDRESS_PACKET" value="0x77780000" /> - <baseadress name="BASEADDRESS_MSAFD" value="0x77780000" /> - <baseadress name="BASEADDRESS_WINSPOOL" value="0x77800000" /> - <baseadress name="BASEADDRESS_MSI" value="0x77790000" /> - <baseadress name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> - <baseadress name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> - <baseadress name="BASEADDRESS_WS2HELP" value="0x777e0000" /> - <baseadress name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> - <baseadress name="BASEADDRESS_VERSION" value="0x77a40000" /> - <baseadress name="BASEADDRESS_OLE32" value="0x77a50000" /> - <baseadress name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> - <baseadress name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> - <baseadress name="BASEADDRESS_USER32" value="0x77e30000" /> - <baseadress name="BASEADDRESS_GDI32" value="0x77f70000" /> - <baseadress name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> - <baseadress name="BASEADDRESS_MSVCRT" value="0x78000000" /> - <baseadress name="BASEADDRESS_MSVCRT20" value="0x78500000" /> - <baseadress name="BASEADDRESS_KERNEL32" value="0x7c800000" /> - <baseadress name="BASEADDRESS_NTDLL" value="0x7c900000" /> - <baseadress name="BASEADDRESS_HHCTRL" value="0x7e410000" /> - <baseadress name="BASEADDRESS_FREETYPE" value="0x7f000000" /> + <baseaddress name="BASEADDRESS_REGTESTS" value="0x07000000" /> + <baseaddress name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <baseaddress name="BASEADDRESS_COMCAT" value="0x20A50000" /> + <baseaddress name="BASEADDRESS_DEVENUM" value="0x35680000" /> + <baseaddress name="BASEADDRESS_PWRCFG" value="0x587e0000" /> + <baseaddress name="BASEADDRESS_MMSYS" value="0x588a0000" /> + <baseaddress name="BASEADDRESS_JOY" value="0x589b0000" /> + <baseaddress name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> + <baseaddress name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> + <baseaddress name="BASEADDRESS_OBJSEL" value="0x5b400000" /> + <baseaddress name="BASEADDRESS_TAPIUI" value="0x5b770000" /> + <baseaddress name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> + <baseaddress name="BASEADDRESS_USRMGR" value="0x5c900000" /> + <baseaddress name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> + <baseaddress name="BASEADDRESS_DPLAYX" value="0x5e080000" /> + <baseaddress name="BASEADDRESS_INPUT" value ="0x5e400000" /> + <baseaddress name="BASEADDRESS_DINPUT" value="0x5f580000" /> + <baseaddress name="BASEADDRESS_NETID" value="0x5f660000" /> + <baseaddress name="BASEADDRESS_MAPI32" value="0x62250000" /> + <baseaddress name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> + <baseaddress name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> + <baseaddress name="BASEADDRESS_SYSDM" value="0x64dd0000" /> + <baseaddress name="BASEADDRESS_NCPL" value="0x64ea0000" /> + <baseaddress name="BASEADDRESS_MAIN" value="0x64f40000" /> + <baseaddress name="BASEADDRESS_INTL" value="0x64fb0000" /> + <baseaddress name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> + <baseaddress name="BASEADDRESS_DESK" value="0x65080000" /> + <baseaddress name="BASEADDRESS_APPWIZ" value="0x65100000" /> + <baseaddress name="BASEADDRESS_MLANG" value="0x65140000" /> + <baseaddress name="BASEADDRESS_ACCESS" value="0x65180000" /> + <baseaddress name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> + <baseaddress name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> + <baseaddress name="BASEADDRESS_HID" value="0x688f0000" /> + <baseaddress name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> + <baseaddress name="BASEADDRESS_PSAPI" value="0x68f70000" /> + <baseaddress name="BASEADDRESS_OLEACC" value="0x69640000" /> + <baseaddress name="BASEADDRESS_WINMM" value="0x697d0000" /> + <baseaddress name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> + <baseaddress name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> + <baseaddress name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> + <baseaddress name="BASEADDRESS_SHELL32" value="0x6a360000" /> + <baseaddress name="BASEADDRESS_UNICODE" value="0x6b200000" /> + <baseaddress name="BASEADDRESS_ADVPACK" value="0x6b300000" /> + <baseaddress name="BASEADDRESS_CONTROL" value="0x6b310000" /> + <baseaddress name="BASEADDRESS_NCPA" value="0x6b320000" /> + <baseaddress name="BASEADDRESS_DBGHELP" value="0x6b330000" /> + <baseaddress name="BASEADDRESS_DINPUT8" value="0x6b340000" /> + <baseaddress name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> + <baseaddress name="BASEADDRESS_DSOUND" value="0x6b360000" /> + <baseaddress name="BASEADDRESS_GLU32" value="0x6b370000" /> + <baseaddress name="BASEADDRESS_MESA32" value="0x6b380000" /> + <baseaddress name="BASEADDRESS_OPENGL32" value="0x6b390000" /> + <baseaddress name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> + <baseaddress name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> + <baseaddress name="BASEADDRESS_URLMON" value="0x6b3c0000" /> + <baseaddress name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> + <baseaddress name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> + <baseaddress name="BASEADDRESS_DESKMON" value="0x6d400000" /> + <baseaddress name="BASEADDRESS_DESKADP" value="0x6d410000" /> + <baseaddress name="BASEADDRESS_WLDAP32" value="0x6e130000" /> + <baseaddress name="BASEADDRESS_CLB" value="0x6f2b0000" /> + <baseaddress name="BASEADDRESS_CARDS" value="0x701a0000" /> + <baseaddress name="BASEADDRESS_WININET" value="0x70200000" /> + <baseaddress name="BASEADDRESS_ACLUI" value="0x71550000" /> + <baseaddress name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> + <baseaddress name="BASEADDRESS_SHDOCVW" value="0x71700000" /> + <baseaddress name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> + <baseaddress name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> + <baseaddress name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> + <baseaddress name="BASEADDRESS_NETAPI32" value="0x71c00000" /> + <baseaddress name="BASEADDRESS_DPLAY" value="0x71e80000" /> + <baseaddress name="BASEADDRESS_SECURITY" value="0x71f10000" /> + <baseaddress name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> + <baseaddress name="BASEADDRESS_WINFAX" value="0x722C0000" /> + <baseaddress name="BASEADDRESS_WINSCARD" value="0x723d0000" /> + <baseaddress name="BASEADDRESS_DEVMGR" value="0x72a90000" /> + <baseaddress name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> + <baseaddress name="BASEADDRESS_LZ32" value="0x73d80000" /> + <baseaddress name="BASEADDRESS_COREDLL" value="0x73d80000" /> + <baseaddress name="BASEADDRESS_ICMP" value="0x741f0000" /> + <baseaddress name="BASEADDRESS_UFAT" value="0x741f0000" /> + <baseaddress name="BASEADDRESS_USERENV" value="0x74850000" /> + <baseaddress name="BASEADDRESS_WS2_32" value="0x74aa0000" /> + <baseaddress name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> + <baseaddress name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> + <baseaddress name="BASEADDRESS_MMDRV" value="0x74c30000" /> + <baseaddress name="BASEADDRESS_OLEDLG" value="0x74d00000" /> + <baseaddress name="BASEADDRESS_SAMSRV" value="0x74f30000" /> + <baseaddress name="BASEADDRESS_SAMLIB" value="0x750C0000" /> + <baseaddress name="BASEADDRESS_CABINET" value="0x75120000" /> + <baseaddress name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> + <baseaddress name="BASEADDRESS_MSGINA" value="0x75970000" /> + <baseaddress name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> + <baseaddress name="BASEADDRESS_RPCRT4" value="0x76000000" /> + <baseaddress name="BASEADDRESS_SHLWAPI" value="0x76120000" /> + <baseaddress name="BASEADDRESS_COMCTL32" value="0x76160000" /> + <baseaddress name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <baseaddress name="BASEADDRESS_OLEAUT32" value="0x76290000" /> + <baseaddress name="BASEADDRESS_RICHED32" value="0x76340000" /> + <baseaddress name="BASEADDRESS_D3D8THK" value="0x76340000" /> + <baseaddress name="BASEADDRESS_RICHED20" value="0x76360000" /> + <baseaddress name="BASEADDRESS_TWAIN_32" value="0x76380000" /> + <baseaddress name="BASEADDRESS_IMM32" value="0x76390000" /> + <baseaddress name="BASEADDRESS_LSASRV" value="0x76540000" /> + <baseaddress name="BASEADDRESS_MIDIMAP" value="0x76600000" /> + <baseaddress name="BASEADDRESS_ODBC32" value="0x76660000" /> + <baseaddress name="BASEADDRESS_ODBCCP32" value="0x76380000" /> + <baseaddress name="BASEADDRESS_WAVEMAP" value="0x76610000" /> + <baseaddress name="BASEADDRESS_MPR" value="0x76620000" /> + <baseaddress name="BASEADDRESS_SETUPAPI" value="0x76660000" /> + <baseaddress name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> + <baseaddress name="BASEADDRESS_SHFOLDER" value="0x76780000" /> + <baseaddress name="BASEADDRESS_NTMARTA" value="0x768A0000" /> + <baseaddress name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> + <baseaddress name="BASEADDRESS_WINTRUST" value="0x76c30000" /> + <baseaddress name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> + <baseaddress name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> + <baseaddress name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> + <baseaddress name="BASEADDRESS_FMIFS" value="0x76df0000" /> + <baseaddress name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> + <baseaddress name="BASEADDRESS_MSVFW32" value="0x77400000" /> + <baseaddress name="BASEADDRESS_MSACM32" value="0x77400000" /> + <baseaddress name="BASEADDRESS_CRTDLL" value="0x77630000" /> + <baseaddress name="BASEADDRESS_AUTHZ" value="0x77690000" /> + <baseaddress name="BASEADDRESS_CFGMGR32" value="0x77700000" /> + <baseaddress name="BASEADDRESS_SENSAPI" value="0x77700000" /> + <baseaddress name="BASEADDRESS_PACKET" value="0x77780000" /> + <baseaddress name="BASEADDRESS_MSAFD" value="0x77780000" /> + <baseaddress name="BASEADDRESS_WINSPOOL" value="0x77800000" /> + <baseaddress name="BASEADDRESS_MSI" value="0x77790000" /> + <baseaddress name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> + <baseaddress name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> + <baseaddress name="BASEADDRESS_WS2HELP" value="0x777e0000" /> + <baseaddress name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> + <baseaddress name="BASEADDRESS_VERSION" value="0x77a40000" /> + <baseaddress name="BASEADDRESS_OLE32" value="0x77a50000" /> + <baseaddress name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> + <baseaddress name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> + <baseaddress name="BASEADDRESS_USER32" value="0x77e30000" /> + <baseaddress name="BASEADDRESS_GDI32" value="0x77f70000" /> + <baseaddress name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> + <baseaddress name="BASEADDRESS_MSVCRT" value="0x78000000" /> + <baseaddress name="BASEADDRESS_MSVCRT20" value="0x78500000" /> + <baseaddress name="BASEADDRESS_KERNEL32" value="0x7c800000" /> + <baseaddress name="BASEADDRESS_NTDLL" value="0x7c900000" /> + <baseaddress name="BASEADDRESS_HHCTRL" value="0x7e410000" /> + <baseaddress name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group> Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Tue Dec 18 22:02:09 2007 @@ -2024,12 +2024,12 @@ { } -BaseAdress::BaseAdress ( const XMLElement& node_, - const Project& project_, - const Module* module_ ) +BaseAddress::BaseAddress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ) : Property( node_ , project_, module_) { - //TODO: Add code to validate baseadress + //TODO: Add code to validate baseaddress } PchFile::PchFile ( Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Tue Dec 18 22:02:09 2007 @@ -606,13 +606,13 @@ else non_if_data.properties.push_back ( property ); } - else if ( e.name == "baseadress" ) - { - BaseAdress* baseadress = new BaseAdress ( e, *this, NULL ); + else if ( e.name == "baseaddress" ) + { + BaseAddress* baseaddress = new BaseAddress ( e, *this, NULL ); if ( parseContext.ifData ) - parseContext.ifData->data.properties.push_back ( baseadress ); - else - non_if_data.properties.push_back ( baseadress ); + parseContext.ifData->data.properties.push_back ( baseaddress ); + else + non_if_data.properties.push_back ( baseaddress ); } if ( subs_invalid && e.subElements.size() ) { Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Tue Dec 18 22:02:09 2007 @@ -119,7 +119,7 @@ class AutoResource; class InstallComponent; class InstallFolder; -class BaseAdress; +class BaseAddress; class BuildFamily; class Family; class PlatformLanguage; @@ -876,12 +876,12 @@ void ProcessXML(); }; -class BaseAdress : public Property -{ -public: - BaseAdress ( const XMLElement& node_, - const Project& project_, - const Module* module_ ); +class BaseAddress : public Property +{ +public: + BaseAddress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ); }; class TestSupportCode

16 years, 9 months

[dchapyshev] 31308: - Add itself rasman.dll (Part 3/3)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Dec 18 19:47:49 2007 New Revision: 31308 URL: http://svn.reactos.org/svn/reactos?rev=31308&view=rev Log: - Add itself rasman.dll (Part 3/3) Added: trunk/reactos/dll/win32/rasman/ trunk/reactos/dll/win32/rasman/rasman.c (with props) trunk/reactos/dll/win32/rasman/rasman.rbuild (with props) trunk/reactos/dll/win32/rasman/rasman.rc (with props) trunk/reactos/dll/win32/rasman/rasman.spec (with props) Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/rasman/rasman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.c?… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.c (added) +++ trunk/reactos/dll/win32/rasman/rasman.c Tue Dec 18 19:47:49 2007 @@ -1,0 +1,91 @@ +/* + * RASMAN + * + * Copyright 2007 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include <windows.h> +#include <ras.h> +#include "wine/debug.h" +#include <rasshost.h> + +static HINSTANCE hDllInstance; + +WINE_DEFAULT_DEBUG_CHANNEL(rasman); + +VOID WINAPI +RasSecurityDialogComplete(SECURITY_MESSAGE* pSecMsg) +{ + FIXME("(%p),stub!\n",pSecMsg); +} + +DWORD WINAPI +RasSecurityDialogBegin(HPORT hPort, PBYTE pSendBuf, + DWORD SendBufSize, PBYTE pRecvBuf, DWORD RecvBufSize, + VOID (WINAPI *RasSecurityDialogComplete)()) +{ + FIXME("(%p,%p,0x%08x,%p,0x%08x,%p),stub!\n",hPort,pSendBuf,SendBufSize, + pRecvBuf,RecvBufSize,*RasSecurityDialogComplete); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogSend(HPORT hPort, PBYTE pBuffer, WORD BufferLength) +{ + FIXME("(%p,%p,%x),stub!\n",hPort, pBuffer, BufferLength); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogReceive(HPORT hPort, PBYTE pBuffer, PWORD pBufferLength, DWORD Timeout, HANDLE hEvent) +{ + FIXME("(%p,%p,%p,%x,%p),stub!\n",hPort, pBuffer, pBufferLength, Timeout, hEvent); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogEnd(HPORT hPort) +{ + FIXME("(%p),stub!\n",hPort); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogGetInfo(HPORT hPort, RAS_SECURITY_INFO* pBuffer) +{ + FIXME("(%p,%p),stub!\n",hPort,pBuffer); + return NO_ERROR; +} + +BOOL WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hDllInstance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/win32/rasman/rasman.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasman/rasman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.rb… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.rbuild (added) +++ trunk/reactos/dll/win32/rasman/rasman.rbuild Tue Dec 18 19:47:49 2007 @@ -1,0 +1,12 @@ +<module name="rasman" type="win32dll" baseaddress="${BASEADDRESS_RASMAN}" installbase="system32" installname="rasman.dll"> + <importlibrary definition="rasman.spec.def" /> + <include base="rasman">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <library>uuid</library> + <file>rasman.c</file> + <file>rasman.rc</file> + <file>rasman.spec</file> +</module> Propchange: trunk/reactos/dll/win32/rasman/rasman.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasman/rasman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.rc… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.rc (added) +++ trunk/reactos/dll/win32/rasman/rasman.rc Tue Dec 18 19:47:49 2007 @@ -1,0 +1,9 @@ +#include <windows.h> +#include <reactos/resource.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Remote Access Connection Manager\0" +#define REACTOS_STR_INTERNAL_NAME "rasman\0" +#define REACTOS_STR_ORIGINAL_FILENAME "rasman.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/rasman/rasman.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasman/rasman.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.sp… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.spec (added) +++ trunk/reactos/dll/win32/rasman/rasman.spec Tue Dec 18 19:47:49 2007 @@ -1,0 +1,164 @@ +@ stub DwRasGetHostByName +@ stub IsRasmanProcess +@ stub RasActivateRoute +@ stub RasActivateRouteEx +@ stub RasAddConnectionPort +@ stub RasAddNotification +@ stub RasAllocateRoute +@ stub RasBundleClearStatistics +@ stub RasBundleClearStatisticsEx +@ stub RasBundleGetPort +@ stub RasBundleGetStatistics +@ stub RasBundleGetStatisticsEx +@ stub RasCompressionGetInfo +@ stub RasCompressionSetInfo +@ stub RasConnectionEnum +@ stub RasConnectionGetStatistics +@ stub RasCreateConnection +@ stub RasDeAllocateRoute +@ stub RasDestroyConnection +@ stub RasDeviceConnect +@ stub RasDeviceEnum +@ stub RasDeviceGetInfo +@ stub RasDeviceSetInfo +@ stub RasDoIke +@ stub RasEnableIpSec +@ stub RasEnableRasAudio +@ stub RasEnumConnectionPorts +@ stub RasEnumLanNets +@ stub RasFindPrerequisiteEntry +@ stub RasFreeBuffer +@ stub RasGetBandwidthUtilization +@ stub RasGetBuffer +@ stub RasGetCalledIdInfo +@ stub RasGetConnectInfo +@ stub RasGetConnectionParams +@ stub RasGetConnectionUserData +@ stub RasGetCustomScriptDll +@ stub RasGetDevConfig +@ stub RasGetDevConfigEx +@ stub RasGetDeviceConfigInfo +@ stub RasGetDeviceName +@ stub RasGetDeviceNameW +@ stub RasGetDialParams +@ stub RasGetEapUserInfo +@ stub RasGetFramingCapabilities +@ stub RasGetHConnFromEntry +@ stub RasGetHportFromConnection +@ stub RasGetInfo +@ stub RasGetInfoEx +@ stub RasGetKey +@ stub RasGetNdiswanDriverCaps +@ stub RasGetNumPortOpen +@ stub RasGetPortUserData +@ stub RasGetProtocolInfo +@ stub RasGetTimeSinceLastActivity +@ stub RasGetUnicodeDeviceName +@ stub RasGetUserCredentials +@ stub RasInitialize +@ stub RasInitializeNoWait +@ stub RasIsIpSecEnabled +@ stub RasIsTrustedCustomDll +@ stub RasLinkGetStatistics +@ stub RasPnPControl +@ stub RasPortBundle +@ stub RasPortCancelReceive +@ stub RasPortClearStatistics +@ stub RasPortClose +@ stub RasPortConnectComplete +@ stub RasPortDisconnect +@ stub RasPortEnum +@ stub RasPortEnumProtocols +@ stub RasPortFree +@ stub RasPortGetBundle +@ stub RasPortGetBundledPort +@ stub RasPortGetFramingEx +@ stub RasPortGetInfo +@ stub RasPortGetProtocolCompression +@ stub RasPortGetStatistics +@ stub RasPortGetStatisticsEx +@ stub RasPortListen +@ stub RasPortOpen +@ stub RasPortOpenEx +@ stub RasPortReceive +@ stub RasPortReceiveEx +@ stub RasPortRegisterSlip +@ stub RasPortReserve +@ stub RasPortRetrieveUserData +@ stub RasPortSend +@ stub RasPortSetFraming +@ stub RasPortSetFramingEx +@ stub RasPortSetInfo +@ stub RasPortSetProtocolCompression +@ stub RasPortStoreUserData +@ stub RasPppCallback +@ stub RasPppChangePassword +@ stub RasPppGetEapInfo +@ stub RasPppGetInfo +@ stub RasPppRetry +@ stub RasPppSetEapInfo +@ stub RasPppStart +@ stub RasPppStarted +@ stub RasPppStop +@ stub RasProtocolEnum +@ stub RasRPCBind +@ stub RasRefConnection +@ stub RasReferenceCustomCount +@ stub RasReferenceRasman +@ stub RasRefreshKerbCreds +@ stub RasRegisterPnPEvent +@ stub RasRegisterPnPHandler +@ stub RasRegisterRedialCallback +@ stub RasRequestNotification +@ stub RasRpcConnect +@ stub RasRpcConnectServer +@ stub RasRpcDeleteEntry +@ stub RasRpcDeviceEnum +@ stub RasRpcDisconnect +@ stub RasRpcDisconnectServer +@ stub RasRpcEnumConnections +@ stub RasRpcGetCountryInfo +@ stub RasRpcGetDevConfig +@ stub RasRpcGetErrorString +@ stub RasRpcGetInstalledProtocols +@ stub RasRpcGetInstalledProtocolsEx +@ stub RasRpcGetSystemDirectory +@ stub RasRpcGetUserPreferences +@ stub RasRpcGetVersion +@ stub RasRpcPortEnum +@ stub RasRpcPortGetInfo +@ stub RasRpcRemoteGetSystemDirectory +@ stub RasRpcRemoteGetUserPreferences +@ stub RasRpcRemoteRasDeleteEntry +@ stub RasRpcRemoteSetUserPreferences +@ stub RasRpcSetUserPreferences +@ stub RasRpcUnloadDll +@ stdcall RasSecurityDialogBegin(ptr ptr long ptr long ptr) +@ stdcall RasSecurityDialogComplete(ptr) +@ stdcall RasSecurityDialogGetInfo(ptr ptr) +@ stdcall RasSecurityDialogReceive(ptr ptr ptr long ptr) +@ stdcall RasSecurityDialogSend(ptr ptr long) +@ stub RasSendCreds +@ stub RasSendNotification +@ stub RasSendPppMessageToRasman +@ stub RasServerPortClose +@ stub RasSetAddressDisable +@ stub RasSetBapPolicy +@ stub RasSetCachedCredentials +@ stub RasSetCalledIdInfo +@ stub RasSetCommSettings +@ stub RasSetConnectionParams +@ stub RasSetConnectionUserData +@ stub RasSetDevConfig +@ stub RasSetDeviceConfigInfo +@ stub RasSetDialParams +@ stub RasSetEapLogonInfo +@ stub RasSetEapUserInfo +@ stub RasSetIoCompletionPort +@ stub RasSetKey +@ stub RasSetPortUserData +@ stub RasSetRasdialInfo +@ stub RasSetRouterUsage +@ stub RasSignalNewConnection +@ stub RasStartRasAutoIfRequired +@ stub RasmanUninitialize Propchange: trunk/reactos/dll/win32/rasman/rasman.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Dec 18 19:47:49 2007 @@ -208,6 +208,9 @@ <directory name="rasdlg"> <xi:include href="rasdlg/rasdlg.rbuild" /> </directory> +<directory name="rasman"> + <xi:include href="rasman/rasman.rbuild" /> +</directory> <directory name="riched20"> <xi:include href="riched20/riched20.rbuild" /> </directory>

16 years, 9 months

[dchapyshev] 31307: - Add baseaddress for rasman.dll (Part 2/3)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Dec 18 19:41:37 2007 New Revision: 31307 URL: http://svn.reactos.org/svn/reactos?rev=31307&view=rev Log: - Add baseaddress for rasman.dll (Part 2/3) Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=313… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Tue Dec 18 19:41:37 2007 @@ -126,6 +126,7 @@ <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" /> <property name="BASEADDRESS_RASAPI32" value="0x76ee0000" /> + <property name="BASEADDRESS_RASMAN" value="0x76e90000h" /> <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> <property name="BASEADDRESS_MSVFW32" value="0x76f60000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" />

16 years, 9 months

[dchapyshev] 31306: - Add header for rasman.dll (Part 1/3)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Dec 18 19:40:32 2007 New Revision: 31306 URL: http://svn.reactos.org/svn/reactos?rev=31306&view=rev Log: - Add header for rasman.dll (Part 1/3) Added: trunk/reactos/include/psdk/rasshost.h (with props) Added: trunk/reactos/include/psdk/rasshost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rasshost.h?re… ============================================================================== --- trunk/reactos/include/psdk/rasshost.h (added) +++ trunk/reactos/include/psdk/rasshost.h Tue Dec 18 19:40:32 2007 @@ -1,0 +1,44 @@ +#ifndef _RASSHOST_H_ +#define _RASSHOST_H_ +#ifdef __cplusplus +extern "C" { +#endif + +#include <ras.h> +#include <mprapi.h> + +#define SECURITYMSG_SUCCESS 1 +#define SECURITYMSG_FAILURE 2 +#define SECURITYMSG_ERROR 3 + +typedef DWORD HPORT; + +typedef struct _SECURITY_MESSAGE +{ + DWORD dwMsgId; + HPORT hPort; + DWORD dwError; + CHAR UserName[UNLEN + 1]; + CHAR Domain[DNLEN + 1]; +} SECURITY_MESSAGE, *PSECURITY_MESSAGE; + +typedef struct _RAS_SECURITY_INFO +{ + DWORD LastError; + DWORD BytesReceived; + CHAR DeviceName[MAX_DEVICE_NAME + 1]; +} RAS_SECURITY_INFO, *PRAS_SECURITY_INFO; + +typedef DWORD (WINAPI *RASSECURITYPROC)(); + +VOID WINAPI RasSecurityDialogComplete(IN SECURITY_MESSAGE* pSecMsg); +DWORD WINAPI RasSecurityDialogBegin(IN HPORT hPort, IN PBYTE pSendBuf, IN DWORD SendBufSize, IN PBYTE pRecvBuf, IN DWORD RecvBufSize, IN VOID (WINAPI* RasSecurityDialogComplete)(SECURITY_MESSAGE*)); +DWORD WINAPI RasSecurityDialogEnd(IN HPORT hPort); +DWORD WINAPI RasSecurityDialogSend(IN HPORT hPort, IN PBYTE pBuffer, IN WORD BufferLength); +DWORD WINAPI RasSecurityDialogReceive(IN HPORT hPort, IN PBYTE pBuffer, IN PWORD pBufferLength, IN DWORD Timeout, IN HANDLE hEvent); +DWORD WINAPI RasSecurityDialogGetInfo(IN HPORT hPort, IN RAS_SECURITY_INFO* pBuffer); + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/psdk/rasshost.h ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 9 months

[gedmurphy] 31305: add LR_COPYDELETEORG and ignore LR_COPYFROMRESOURCE

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Dec 18 17:56:01 2007 New Revision: 31305 URL: http://svn.reactos.org/svn/reactos?rev=31305&view=rev Log: add LR_COPYDELETEORG and ignore LR_COPYFROMRESOURCE Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Tue Dec 18 17:56:01 2007 @@ -797,9 +797,9 @@ if (!hIconCur) return NULL; - if (flags & LR_COPYFROMRESOURCE || flags & LR_CREATEDIBSECTION) + if (flags & LR_COPYFROMRESOURCE) { - FIXME("FIXME: LR_COPYFROMRESOURCE and LR_CREATEDIBSECTION are yet not implemented for icons\n"); + FIXME("FIXME: LR_COPYFROMRESOURCE is yet not implemented for icons\n"); } if (NtUserGetIconSize(hIconCur, 0, &origSize.cx, &origSize.cy)) @@ -833,6 +833,10 @@ } } + if (hNewIcon && (flags & LR_COPYDELETEORG)) + { + DestroyCursor((HCURSOR)hIconCur); + } return hNewIcon; }

16 years, 9 months

[gedmurphy] 31304: return the icon bpp in the call to NtUserGetIconInfo

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Dec 18 17:28:56 2007 New Revision: 31304 URL: http://svn.reactos.org/svn/reactos?rev=31304&view=rev Log: return the icon bpp in the call to NtUserGetIconInfo Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Dec 18 17:28:56 2007 @@ -668,6 +668,24 @@ { ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); + + if (pbpp) + { + PBITMAPOBJ bmp; + int colorBpp = 0; + + ProbeForWrite(pbpp, sizeof(DWORD), 1); + + bmp = BITMAPOBJ_LockBitmap(CurIcon->IconInfo.hbmColor); + if (bmp) + { + colorBpp = BitsPerFormat(bmp->SurfObj.iBitmapFormat); + BITMAPOBJ_UnlockBitmap(bmp); + } + + RtlCopyMemory(pbpp, &colorBpp, sizeof(DWORD)); + } + } _SEH_HANDLE {

16 years, 9 months

[gedmurphy] 31303: update ntuser header

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Dec 18 16:50:56 2007 New Revision: 31303 URL: http://svn.reactos.org/svn/reactos?rev=31303&view=rev Log: update ntuser header Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Dec 18 16:50:56 2007 @@ -1212,12 +1212,12 @@ BOOL NTAPI NtUserGetIconInfo( - HANDLE Handle, - PICONINFO IconInfo, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6); + HANDLE hCurIcon, + PICONINFO IconInfo, + PUNICODE_STRING lpInstName, + PUNICODE_STRING lpResName, + LPDWORD pbpp, + BOOL bInternal); BOOL NTAPI @@ -2066,11 +2066,9 @@ NTAPI NtUserSetCursorIconData( HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc); + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo); DWORD NTAPI

16 years, 9 months

[gedmurphy] 31302: - Add a very bare bones implementation of IMAGE_ICON for CopyImage. - Move the IMAGE_BITMAP stuff to a seperate function which will eventually be rewritten.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Dec 18 16:49:38 2007 New Revision: 31302 URL: http://svn.reactos.org/svn/reactos?rev=31302&view=rev Log: - Add a very bare bones implementation of IMAGE_ICON for CopyImage. - Move the IMAGE_BITMAP stuff to a seperate function which will eventually be rewritten. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Tue Dec 18 16:49:38 2007 @@ -268,8 +268,15 @@ if (hIcon && 0 != (fuLoad & LR_SHARED)) { +#if 0 NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); +#else + ICONINFO iconInfo; + + if(NtUserGetIconInfo(ResIcon, &iconInfo, NULL, NULL, NULL, FALSE)) + NtUserSetCursorIconData((HICON)hIcon, hinst, NULL, &iconInfo); +#endif } return hIcon; @@ -558,6 +565,276 @@ LoadBitmapW(HINSTANCE hInstance, LPCWSTR lpBitmapName) { return LoadImageW(hInstance, lpBitmapName, IMAGE_BITMAP, 0, 0, 0); +} + + +static HANDLE +CopyBmp(HANDLE hnd, + UINT type, + INT desiredx, + INT desiredy, + UINT flags) +{ + HBITMAP res = NULL; + DIBSECTION ds; + int objSize; + BITMAPINFO * bi; + + objSize = GetObjectW( hnd, sizeof(ds), &ds ); + if (!objSize) return 0; + if ((desiredx < 0) || (desiredy < 0)) return 0; + + if (flags & LR_COPYFROMRESOURCE) + { + FIXME("FIXME: The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n"); + } + + if (desiredx == 0) desiredx = ds.dsBm.bmWidth; + if (desiredy == 0) desiredy = ds.dsBm.bmHeight; + + /* Allocate memory for a BITMAPINFOHEADER structure and a + color table. The maximum number of colors in a color table + is 256 which corresponds to a bitmap with depth 8. + Bitmaps with higher depths don't have color tables. */ + bi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!bi) return 0; + + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biPlanes = ds.dsBm.bmPlanes; + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + bi->bmiHeader.biCompression = BI_RGB; + + if (flags & LR_CREATEDIBSECTION) + { + /* Create a DIB section. LR_MONOCHROME is ignored */ + void * bits; + HDC dc = CreateCompatibleDC(NULL); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB. + Get its attributes to create an exact copy */ + memcpy(bi, &ds.dsBmih, sizeof(BITMAPINFOHEADER)); + } + + /* Get the color table or the color masks */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + + bi->bmiHeader.biWidth = desiredx; + bi->bmiHeader.biHeight = desiredy; + bi->bmiHeader.biSizeImage = 0; + + res = CreateDIBSection(dc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + DeleteDC(dc); + } + else + { + /* Create a device-dependent bitmap */ + + BOOL monochrome = (flags & LR_MONOCHROME); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB section. + Get its attributes */ + HDC dc = CreateCompatibleDC(NULL); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + DeleteDC(dc); + + if (!monochrome && ds.dsBm.bmBitsPixel == 1) + { + /* Look if the colors of the DIB are black and white */ + + monochrome = + (bi->bmiColors[0].rgbRed == 0xff + && bi->bmiColors[0].rgbGreen == 0xff + && bi->bmiColors[0].rgbBlue == 0xff + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0 + && bi->bmiColors[1].rgbGreen == 0 + && bi->bmiColors[1].rgbBlue == 0 + && bi->bmiColors[1].rgbReserved == 0) + || + (bi->bmiColors[0].rgbRed == 0 + && bi->bmiColors[0].rgbGreen == 0 + && bi->bmiColors[0].rgbBlue == 0 + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0xff + && bi->bmiColors[1].rgbGreen == 0xff + && bi->bmiColors[1].rgbBlue == 0xff + && bi->bmiColors[1].rgbReserved == 0); + } + } + else if (!monochrome) + { + monochrome = ds.dsBm.bmBitsPixel == 1; + } + + if (monochrome) + { + res = CreateBitmap(desiredx, desiredy, 1, 1, NULL); + } + else + { + HDC screenDC = GetDC(NULL); + res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); + ReleaseDC(NULL, screenDC); + } + } + + if (res) + { + /* Only copy the bitmap if it's a DIB section or if it's + compatible to the screen */ + BOOL copyContents; + + if (objSize == sizeof(DIBSECTION)) + { + copyContents = TRUE; + } + else + { + HDC screenDC = GetDC(NULL); + int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); + ReleaseDC(NULL, screenDC); + + copyContents = (ds.dsBm.bmBitsPixel == 1 || ds.dsBm.bmBitsPixel == screen_depth); + } + + if (copyContents) + { + /* The source bitmap may already be selected in a device context, + use GetDIBits/StretchDIBits and not StretchBlt */ + + HDC dc; + void * bits; + + dc = CreateCompatibleDC(NULL); + + bi->bmiHeader.biWidth = ds.dsBm.bmWidth; + bi->bmiHeader.biHeight = ds.dsBm.bmHeight; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biClrUsed = 0; + bi->bmiHeader.biClrImportant = 0; + + /* Fill in biSizeImage */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); + + if (bits) + { + HBITMAP oldBmp; + + /* Get the image bits of the source bitmap */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, bits, bi, DIB_RGB_COLORS); + + /* Copy it to the destination bitmap */ + oldBmp = SelectObject(dc, res); + StretchDIBits(dc, 0, 0, desiredx, desiredy, + 0, 0, ds.dsBm.bmWidth, ds.dsBm.bmHeight, + bits, bi, DIB_RGB_COLORS, SRCCOPY); + SelectObject(dc, oldBmp); + + HeapFree(GetProcessHeap(), 0, bits); + } + + DeleteDC(dc); + } + + if (flags & LR_COPYDELETEORG) + { + DeleteObject(hnd); + } + } + HeapFree(GetProcessHeap(), 0, bi); + return res; +} + + +INT +GetIconCurBpp(PICONINFO pIconInfo) +{ + PBITMAPINFO pbi; + + pbi = (PBITMAPINFO)pIconInfo->hbmColor; + return pbi->bmiHeader.biBitCount; +} + + +static BOOL +SetCursorIconData( + HANDLE Handle, + HINSTANCE hMod, + LPWSTR lpResName, + PICONINFO pIconInfo) +{ + UNICODE_STRING Res; + + if (!Handle || !pIconInfo) + return FALSE; + + RtlInitUnicodeString(&Res, lpResName); + + return NtUserSetCursorIconData(Handle, hMod, &Res, pIconInfo); +} + + +/* bare bones icon copy implementation */ +static HANDLE +CopyIcoCur(HANDLE hIconCur, + UINT type, + INT desiredx, + INT desiredy, + UINT flags) +{ + HANDLE hNewIcon = NULL; + ICONINFO origIconInfo, newIconInfo; + SIZE origSize; + DWORD origBpp; + + if (!hIconCur) + return NULL; + + if (flags & LR_COPYFROMRESOURCE || flags & LR_CREATEDIBSECTION) + { + FIXME("FIXME: LR_COPYFROMRESOURCE and LR_CREATEDIBSECTION are yet not implemented for icons\n"); + } + + if (NtUserGetIconSize(hIconCur, 0, &origSize.cx, &origSize.cy)) + { + if (desiredx == 0) desiredx = origSize.cx; + if (desiredx == 0) desiredy = origSize.cy; + + if (NtUserGetIconInfo(hIconCur, &origIconInfo, NULL, NULL, &origBpp, TRUE)) + { + hNewIcon = (HANDLE)NtUserCallOneParam(0, ONEPARAM_ROUTINE_CREATECURICONHANDLE); + + if (hNewIcon) + { + /* the bitmaps returned from the NtUserGetIconInfo are copies of the original, + * so we can use these directly to build up our icon/cursor copy */ + RtlCopyMemory(&newIconInfo, &origIconInfo, sizeof(ICONINFO)); + + if (!SetCursorIconData(hNewIcon, NULL, NULL, &newIconInfo)) + { + if (newIconInfo.fIcon) + DestroyIcon(hNewIcon); + else + DestroyCursor(hNewIcon); + + hNewIcon = NULL; + } + } + + DeleteObject(origIconInfo.hbmMask); + DeleteObject(origIconInfo.hbmColor); + } + } + + + return hNewIcon; } @@ -589,195 +866,10 @@ switch (type) { case IMAGE_BITMAP: - { - HBITMAP res = NULL; - DIBSECTION ds; - int objSize; - BITMAPINFO * bi; - - objSize = GetObjectW( hnd, sizeof(ds), &ds ); - if (!objSize) return 0; - if ((desiredx < 0) || (desiredy < 0)) return 0; - - if (flags & LR_COPYFROMRESOURCE) - { - FIXME("FIXME: The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n"); - } - - if (desiredx == 0) desiredx = ds.dsBm.bmWidth; - if (desiredy == 0) desiredy = ds.dsBm.bmHeight; - - /* Allocate memory for a BITMAPINFOHEADER structure and a - color table. The maximum number of colors in a color table - is 256 which corresponds to a bitmap with depth 8. - Bitmaps with higher depths don't have color tables. */ - bi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!bi) return 0; - - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biPlanes = ds.dsBm.bmPlanes; - bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; - bi->bmiHeader.biCompression = BI_RGB; - - if (flags & LR_CREATEDIBSECTION) - { - /* Create a DIB section. LR_MONOCHROME is ignored */ - void * bits; - HDC dc = CreateCompatibleDC(NULL); - - if (objSize == sizeof(DIBSECTION)) - { - /* The source bitmap is a DIB. - Get its attributes to create an exact copy */ - memcpy(bi, &ds.dsBmih, sizeof(BITMAPINFOHEADER)); - } - - /* Get the color table or the color masks */ - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - - bi->bmiHeader.biWidth = desiredx; - bi->bmiHeader.biHeight = desiredy; - bi->bmiHeader.biSizeImage = 0; - - res = CreateDIBSection(dc, bi, DIB_RGB_COLORS, &bits, NULL, 0); - DeleteDC(dc); - } - else - { - /* Create a device-dependent bitmap */ - - BOOL monochrome = (flags & LR_MONOCHROME); - - if (objSize == sizeof(DIBSECTION)) - { - /* The source bitmap is a DIB section. - Get its attributes */ - HDC dc = CreateCompatibleDC(NULL); - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - DeleteDC(dc); - - if (!monochrome && ds.dsBm.bmBitsPixel == 1) - { - /* Look if the colors of the DIB are black and white */ - - monochrome = - (bi->bmiColors[0].rgbRed == 0xff - && bi->bmiColors[0].rgbGreen == 0xff - && bi->bmiColors[0].rgbBlue == 0xff - && bi->bmiColors[0].rgbReserved == 0 - && bi->bmiColors[1].rgbRed == 0 - && bi->bmiColors[1].rgbGreen == 0 - && bi->bmiColors[1].rgbBlue == 0 - && bi->bmiColors[1].rgbReserved == 0) - || - (bi->bmiColors[0].rgbRed == 0 - && bi->bmiColors[0].rgbGreen == 0 - && bi->bmiColors[0].rgbBlue == 0 - && bi->bmiColors[0].rgbReserved == 0 - && bi->bmiColors[1].rgbRed == 0xff - && bi->bmiColors[1].rgbGreen == 0xff - && bi->bmiColors[1].rgbBlue == 0xff - && bi->bmiColors[1].rgbReserved == 0); - } - } - else if (!monochrome) - { - monochrome = ds.dsBm.bmBitsPixel == 1; - } - - if (monochrome) - { - res = CreateBitmap(desiredx, desiredy, 1, 1, NULL); - } - else - { - HDC screenDC = GetDC(NULL); - res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); - ReleaseDC(NULL, screenDC); - } - } - - if (res) - { - /* Only copy the bitmap if it's a DIB section or if it's - compatible to the screen */ - BOOL copyContents; - - if (objSize == sizeof(DIBSECTION)) - { - copyContents = TRUE; - } - else - { - HDC screenDC = GetDC(NULL); - int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); - ReleaseDC(NULL, screenDC); - - copyContents = (ds.dsBm.bmBitsPixel == 1 || ds.dsBm.bmBitsPixel == screen_depth); - } - - if (copyContents) - { - /* The source bitmap may already be selected in a device context, - use GetDIBits/StretchDIBits and not StretchBlt */ - - HDC dc; - void * bits; - - dc = CreateCompatibleDC(NULL); - - bi->bmiHeader.biWidth = ds.dsBm.bmWidth; - bi->bmiHeader.biHeight = ds.dsBm.bmHeight; - bi->bmiHeader.biSizeImage = 0; - bi->bmiHeader.biClrUsed = 0; - bi->bmiHeader.biClrImportant = 0; - - /* Fill in biSizeImage */ - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); - - if (bits) - { - HBITMAP oldBmp; - - /* Get the image bits of the source bitmap */ - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, bits, bi, DIB_RGB_COLORS); - - /* Copy it to the destination bitmap */ - oldBmp = SelectObject(dc, res); - StretchDIBits(dc, 0, 0, desiredx, desiredy, - 0, 0, ds.dsBm.bmWidth, ds.dsBm.bmHeight, - bits, bi, DIB_RGB_COLORS, SRCCOPY); - SelectObject(dc, oldBmp); - - HeapFree(GetProcessHeap(), 0, bits); - } - - DeleteDC(dc); - } - - if (flags & LR_COPYDELETEORG) - { - DeleteObject(hnd); - } - } - HeapFree(GetProcessHeap(), 0, bi); - return res; - } + return CopyBmp(hnd, type, desiredx, desiredy, flags); + case IMAGE_ICON: - { - static BOOL IconMsgDisplayed = FALSE; - /* FIXME: support loading the image as shared from an instance */ - if (!IconMsgDisplayed) - { - FIXME("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n"); - IconMsgDisplayed = TRUE; - } - return CopyIcon(hnd); -// return CURSORICON_ExtCopy(hnd,type, desiredx, desiredy, flags); - } + return CopyIcoCur(hnd, type, desiredx, desiredy, flags); case IMAGE_CURSOR: { @@ -795,6 +887,6 @@ return CopyCursor(hnd); } } + return NULL; } -

16 years, 9 months

[gedmurphy] 31301: - Fix NtUserGetIconInfo and use SEH directly. - Fix the NtUserSetCursorIconData definition and rewrite it (not fully complete)

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Dec 18 16:49:00 2007 New Revision: 31301 URL: http://svn.reactos.org/svn/reactos?rev=31301&view=rev Log: - Fix NtUserGetIconInfo and use SEH directly. - Fix the NtUserSetCursorIconData definition and rewrite it (not fully complete) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Dec 18 16:49:00 2007 @@ -623,12 +623,16 @@ STDCALL NtUserGetIconInfo( HANDLE hCurIcon, - PICONINFO IconInfo, DWORD UnkOne, DWORD UnkTwo, DWORD UnkThree, DWORD UnkFour ) + PICONINFO IconInfo, + PUNICODE_STRING lpInstName, // optional + PUNICODE_STRING lpResName, // optional + LPDWORD pbpp, // optional + BOOL bInternal) { ICONINFO ii; PCURICON_OBJECT CurIcon; PWINSTATION_OBJECT WinSta; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; DECLARE_RETURN(BOOL); @@ -656,12 +660,22 @@ RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); /* Copy bitmaps */ - ii.hbmMask = BITMAPOBJ_CopyBitmap(ii.hbmMask); - ii.hbmColor = BITMAPOBJ_CopyBitmap(ii.hbmColor); + ii.hbmMask = BITMAPOBJ_CopyBitmap(CurIcon->IconInfo.hbmMask); + ii.hbmColor = BITMAPOBJ_CopyBitmap(CurIcon->IconInfo.hbmColor); /* Copy fields */ - Status = MmCopyToCaller(IconInfo, &ii, sizeof(ICONINFO)); - if(NT_SUCCESS(Status)) + _SEH_TRY + { + ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); + RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (NT_SUCCESS(Status)) Ret = TRUE; else SetLastNtError(Status); @@ -1156,19 +1170,17 @@ * @implemented */ BOOL -STDCALL +NTAPI NtUserSetCursorIconData( - HANDLE hCurIcon, - PBOOL fIcon, - POINT *Hotspot, - HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc) + HANDLE Handle, + HMODULE hModule, + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo) { PCURICON_OBJECT CurIcon; PWINSTATION_OBJECT WinSta; - NTSTATUS Status; - POINT SafeHotspot; + PBITMAPOBJ pBmpObj; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; DECLARE_RETURN(BOOL); @@ -1181,55 +1193,61 @@ RETURN( FALSE); } - if(!(CurIcon = UserGetCurIconObject(hCurIcon))) + if(!(CurIcon = UserGetCurIconObject(Handle))) { ObDereferenceObject(WinSta); RETURN(FALSE); } CurIcon->hModule = hModule; - CurIcon->hRsrc = hRsrc; - CurIcon->hGroupRsrc = hGroupRsrc; - - /* Copy fields */ - if(fIcon) - { - Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto done; - } - } + CurIcon->hRsrc = NULL; //hRsrc; + CurIcon->hGroupRsrc = NULL; //hGroupRsrc; + + _SEH_TRY + { + ProbeForRead(pIconInfo, sizeof(ICONINFO), 1); + RtlCopyMemory(&CurIcon->IconInfo, pIconInfo, sizeof(ICONINFO)); + + CurIcon->IconInfo.hbmMask = BITMAPOBJ_CopyBitmap(pIconInfo->hbmMask); + CurIcon->IconInfo.hbmColor = BITMAPOBJ_CopyBitmap(pIconInfo->hbmColor); + + if (CurIcon->IconInfo.hbmColor) + { + if ((pBmpObj = BITMAPOBJ_LockBitmap(CurIcon->IconInfo.hbmColor))) + { + CurIcon->Size.cx = pBmpObj->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = pBmpObj->SurfObj.sizlBitmap.cy; + BITMAPOBJ_UnlockBitmap(pBmpObj); + GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); + } + } + if (CurIcon->IconInfo.hbmMask) + { + if (CurIcon->IconInfo.hbmColor == NULL) + { + if ((pBmpObj = BITMAPOBJ_LockBitmap(CurIcon->IconInfo.hbmMask))) + { + CurIcon->Size.cx = pBmpObj->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = pBmpObj->SurfObj.sizlBitmap.cy; + BITMAPOBJ_UnlockBitmap(pBmpObj); + } + } + GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + SetLastNtError(Status); else - { - if(!Hotspot) - Ret = TRUE; - } - - if(Hotspot) - { - Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT)); - if(NT_SUCCESS(Status)) - { - CurIcon->IconInfo.xHotspot = SafeHotspot.x; - CurIcon->IconInfo.yHotspot = SafeHotspot.y; - - Ret = TRUE; - } - else - SetLastNtError(Status); - } - - if(!fIcon && !Hotspot) - { Ret = TRUE; - } - -done: + ObDereferenceObject(WinSta); RETURN( Ret); - CLEANUP: DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Dec 18 16:49:00 2007 @@ -519,7 +519,7 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -# NtUserSetCursorIconData 4 Wrong number of param ? +NtUserSetCursorIconData 4 NtUserSetCursorIconData 6 NtUserSetDbgTag 2 NtUserSetFocus 1

16 years, 9 months

[fireball] 31300: - Recommit the fixed winebuild. The fix was to: * remove Colin's 31297. * spec32.c:625, substitute odp->name check with (odp->name || odp->export_name) check.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Dec 18 14:00:37 2007 New Revision: 31300 URL: http://svn.reactos.org/svn/reactos?rev=31300&view=rev Log: - Recommit the fixed winebuild. The fix was to: * remove Colin's 31297. * spec32.c:625, substitute odp->name check with (odp->name || odp->export_name) check. Modified: trunk/reactos/tools/winebuild/Makefile.in trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winebuild.man.in trunk/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/Makefile.i… Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… Modified: trunk/reactos/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…

16 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
61
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 December 2007