Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[mkupfer] 40658: add win32 library sections
by mkupfer＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: mkupfer Date: Wed Apr 22 23:57:53 2009 New Revision: 40658 URL: http://svn.reactos.org/svn/reactos?rev=40658&view=rev Log: add win32 library sections Modified: trunk/tools/changelog/sections Modified: trunk/tools/changelog/sections URL: http://svn.reactos.org/svn/reactos/trunk/tools/changelog/sections?rev=40658… ============================================================================== --- trunk/tools/changelog/sections [iso-8859-1] (original) +++ trunk/tools/changelog/sections [iso-8859-1] Wed Apr 22 23:57:53 2009 @@ -46,7 +46,9 @@ /trunk/reactos/base/applications == Win32™ Applications == /trunk/reactos/base/applications/calc === Calc === /trunk/reactos/base/applications/charmap === CharMap === +/trunk/reactos/base/shell/cmd === Command Prompt === /trunk/reactos/base/applications/downloader === Downloader === +/trunk/reactos/base/shell/explorer === Explorer === /trunk/reactos/base/applications/fontview === FontView === /trunk/reactos/base/applications/kbswitch === KbSwitch === /trunk/reactos/base/applications/magnify === Magnify === @@ -57,5 +59,215 @@ /trunk/reactos/base/applications/taskmgr === Taskmgr === /trunk/reactos/base/applications/games/winmine === Winmine === /trunk/reactos/base/applications/wordpad === Wordpad === -/trunk/reactos/base/dll/win32 == Win32™ Libraries == +/trunk/reactos/dll/win32 == Win32™ Libraries == +/trunk/reactos/dll/win32/acledit === ACLEDIT === +/trunk/reactos/dll/win32/aclui === ACLUI === +/trunk/reactos/dll/win32/activeds === ACTIVEDS === +/trunk/reactos/dll/win32/actxprxy === ACTXPRXY === +/trunk/reactos/dll/win32/advapi32 === ADVAPI32 === +/trunk/reactos/dll/win32/advpack === ADVPACK === +/trunk/reactos/dll/win32/atl === ATL === +/trunk/reactos/dll/win32/authz === AUTHZ === +/trunk/reactos/dll/win32/avifil32 === AVIFIL32 === +/trunk/reactos/dll/win32/beepmidi === BEEPMIDI === +/trunk/reactos/dll/win32/browseui === BROWSEUI === +/trunk/reactos/dll/win32/cabinet === CABINET === +/trunk/reactos/dll/win32/cards === CARDS === +/trunk/reactos/dll/win32/cfgmgr32 === CFGMGR32 === +/trunk/reactos/dll/win32/clusapi === CLUSAPI === +/trunk/reactos/dll/win32/comcat === COMCAT === +/trunk/reactos/dll/win32/comctl32 === COMCTL32 === +/trunk/reactos/dll/win32/comdlg32 === COMDLG32 === +/trunk/reactos/dll/win32/compstui === COMPSTUI === +/trunk/reactos/dll/win32/credui === CREDUI === +/trunk/reactos/dll/win32/crtdll === CRTDLL === +/trunk/reactos/dll/win32/crypt32 === CRYPT32 === +/trunk/reactos/dll/win32/cryptdlg === CRYPTDLG === +/trunk/reactos/dll/win32/cryptdll === CRYPTDLL === +/trunk/reactos/dll/win32/cryptnet === CRYPTNET === +/trunk/reactos/dll/win32/cryptui === CRYPTUI === +/trunk/reactos/dll/win32/dbghelp === DBGHELP === +/trunk/reactos/dll/win32/dciman32 === DCIMAN32 === +/trunk/reactos/dll/win32/devmgr === DEVMGR === +/trunk/reactos/dll/win32/dhcpcsvc === DHCPCSVC === +/trunk/reactos/dll/win32/dnsapi === DNSAPI === +/trunk/reactos/dll/win32/dwmapi === DWMAPI === +/trunk/reactos/dll/win32/fmifs === FMIFS === +/trunk/reactos/dll/win32/fusion === FUSION === +/trunk/reactos/dll/win32/gdi32 === GDI32 === +/trunk/reactos/dll/win32/gdiplus === GDIPLUS === +/trunk/reactos/dll/win32/getuname === GETUNAME === +/trunk/reactos/dll/win32/glu32 === GLU32 === +/trunk/reactos/dll/win32/hhctrl.ocx === HHCTRL.OCX === +/trunk/reactos/dll/win32/hid === HID === +/trunk/reactos/dll/win32/hlink === HLINK === +/trunk/reactos/dll/win32/httpapi === HTTPAPI === +/trunk/reactos/dll/win32/iccvid === ICCVID === +/trunk/reactos/dll/win32/icmp === ICMP === +/trunk/reactos/dll/win32/imaadp32.acm === IMAADP32.ACM === +/trunk/reactos/dll/win32/imagehlp === IMAGEHLP === +/trunk/reactos/dll/win32/imm32 === IMM32 === +/trunk/reactos/dll/win32/inetcomm === INETCOMM === +/trunk/reactos/dll/win32/inetmib1 === INETMIB1 === +/trunk/reactos/dll/win32/initpki === INITPKI === +/trunk/reactos/dll/win32/inseng === INSENG === +/trunk/reactos/dll/win32/iphlpapi === IPHLPAPI === +/trunk/reactos/dll/win32/iprtprio === IPRTPRIO === +/trunk/reactos/dll/win32/itircl === ITIRCL === +/trunk/reactos/dll/win32/itss === ITSS === +/trunk/reactos/dll/win32/jscript === JSCRIPT === +/trunk/reactos/dll/win32/kernel32 === KERNEL32 === +/trunk/reactos/dll/win32/loadperf === LOADPERF === +/trunk/reactos/dll/win32/localspl === LOCALSPL === +/trunk/reactos/dll/win32/localui === LOCALUI === +/trunk/reactos/dll/win32/lpk === LPK === +/trunk/reactos/dll/win32/lsasrv === LSASRV === +/trunk/reactos/dll/win32/lz32 === LZ32 === +/trunk/reactos/dll/win32/mapi32 === MAPI32 === +/trunk/reactos/dll/win32/mciavi32 === MCIAVI32 === +/trunk/reactos/dll/win32/mcicda === MCICDA === +/trunk/reactos/dll/win32/mciqtz32 === MCIQTZ32 === +/trunk/reactos/dll/win32/mciseq === MCISEQ === +/trunk/reactos/dll/win32/mciwave === MCIWAVE === +/trunk/reactos/dll/win32/mlang === MLANG === +/trunk/reactos/dll/win32/mmdrv === MMDRV === +/trunk/reactos/dll/win32/modemui === MODEMUI === +/trunk/reactos/dll/win32/mpr === MPR === +/trunk/reactos/dll/win32/mprapi === MPRAPI === +/trunk/reactos/dll/win32/msacm32 === MSACM32 === +/trunk/reactos/dll/win32/msadp32.acm === MSADP32.ACM === +/trunk/reactos/dll/win32/msafd === MSAFD === +/trunk/reactos/dll/win32/mscat32 === MSCAT32 === +/trunk/reactos/dll/win32/mscms === MSCMS === +/trunk/reactos/dll/win32/mscoree === MSCOREE === +/trunk/reactos/dll/win32/msctf === MSCTF === +/trunk/reactos/dll/win32/msftedit === MSFTEDIT === +/trunk/reactos/dll/win32/msg711.acm === MSG711.ACM === +/trunk/reactos/dll/win32/msgina === MSGINA === +/trunk/reactos/dll/win32/mshtml === MSHTML === +/trunk/reactos/dll/win32/mshtml.tlb === MSHTML.TLB === +/trunk/reactos/dll/win32/msi === MSI === +/trunk/reactos/dll/win32/msimg32 === MSIMG32 === +/trunk/reactos/dll/win32/msimtf === MSIMTF === +/trunk/reactos/dll/win32/msisip === MSISIP === +/trunk/reactos/dll/win32/msisys.ocx === MSISYS.OCX === +/trunk/reactos/dll/win32/msnet32 === MSNET32 === +/trunk/reactos/dll/win32/msrle32 === MSRLE32 === +/trunk/reactos/dll/win32/mssign32 === MSSIGN32 === +/trunk/reactos/dll/win32/mssip32 === MSSIP32 === +/trunk/reactos/dll/win32/mstask === MSTASK === +/trunk/reactos/dll/win32/msvcrt === MSVCRT === +/trunk/reactos/dll/win32/msvcrt20 === MSVCRT20 === +/trunk/reactos/dll/win32/msvcrt40 === MSVCRT40 === +/trunk/reactos/dll/win32/msvfw32 === MSVFW32 === +/trunk/reactos/dll/win32/msvidc32 === MSVIDC32 === +/trunk/reactos/dll/win32/mswsock === MSWSOCK === +/trunk/reactos/dll/win32/msxml3 === MSXML3 === +/trunk/reactos/dll/win32/nddeapi === NDDEAPI === +/trunk/reactos/dll/win32/netapi32 === NETAPI32 === +/trunk/reactos/dll/win32/netcfgx === NETCFGX === +/trunk/reactos/dll/win32/netid === NETID === +/trunk/reactos/dll/win32/netshell === NETSHELL === +/trunk/reactos/dll/win32/newdev === NEWDEV === +/trunk/reactos/dll/win32/ntdsapi === NTDSAPI === +/trunk/reactos/dll/win32/ntmarta === NTMARTA === +/trunk/reactos/dll/win32/ntprint === NTPRINT === +/trunk/reactos/dll/win32/objsel === OBJSEL === +/trunk/reactos/dll/win32/odbc32 === ODBC32 === +/trunk/reactos/dll/win32/odbccp32 === ODBCCP32 === +/trunk/reactos/dll/win32/ole32 === OLE32 === +/trunk/reactos/dll/win32/oleacc === OLEACC === +/trunk/reactos/dll/win32/oleaut32 === OLEAUT32 === +/trunk/reactos/dll/win32/olecli32 === OLECLI32 === +/trunk/reactos/dll/win32/oledlg === OLEDLG === +/trunk/reactos/dll/win32/olepro32 === OLEPRO32 === +/trunk/reactos/dll/win32/olesvr32 === OLESVR32 === +/trunk/reactos/dll/win32/olethk32 === OLETHK32 === +/trunk/reactos/dll/win32/opengl32 === OPENGL32 === +/trunk/reactos/dll/win32/packet === PACKET === +/trunk/reactos/dll/win32/pdh === PDH === +/trunk/reactos/dll/win32/pidgen === PIDGEN === +/trunk/reactos/dll/win32/powrprof === POWRPROF === +/trunk/reactos/dll/win32/printui === PRINTUI === +/trunk/reactos/dll/win32/psapi === PSAPI === +/trunk/reactos/dll/win32/pstorec === PSTOREC === +/trunk/reactos/dll/win32/qmgr === QMGR === +/trunk/reactos/dll/win32/qmgrprxy === QMGRPRXY === +/trunk/reactos/dll/win32/query === QUERY === +/trunk/reactos/dll/win32/rasapi32 === RASAPI32 === +/trunk/reactos/dll/win32/rasdlg === RASDLG === +/trunk/reactos/dll/win32/rasman === RASMAN === +/trunk/reactos/dll/win32/resutils === RESUTILS === +/trunk/reactos/dll/win32/riched20 === RICHED20 === +/trunk/reactos/dll/win32/riched32 === RICHED32 === +/trunk/reactos/dll/win32/rpcrt4 === RPCRT4 === +/trunk/reactos/dll/win32/rsabase === RSABASE === +/trunk/reactos/dll/win32/rsaenh === RSAENH === +/trunk/reactos/dll/win32/samlib === SAMLIB === +/trunk/reactos/dll/win32/samsrv === SAMSRV === +/trunk/reactos/dll/win32/sccbase === SCCBASE === +/trunk/reactos/dll/win32/schannel === SCHANNEL === +/trunk/reactos/dll/win32/secur32 === SECUR32 === +/trunk/reactos/dll/win32/security === SECURITY === +/trunk/reactos/dll/win32/sensapi === SENSAPI === +/trunk/reactos/dll/win32/serialui === SERIALUI === +/trunk/reactos/dll/win32/setupapi === SETUPAPI === +/trunk/reactos/dll/win32/sfc === SFC === +/trunk/reactos/dll/win32/sfc_os === SFC_OS === +/trunk/reactos/dll/win32/shdoclc === SHDOCLC === +/trunk/reactos/dll/win32/shdocvw === SHDOCVW === +/trunk/reactos/dll/win32/shell32 === SHELL32 === +/trunk/reactos/dll/win32/shfolder === SHFOLDER === +/trunk/reactos/dll/win32/shimgvw === SHIMGVW === +/trunk/reactos/dll/win32/shlwapi === SHLWAPI === +/trunk/reactos/dll/win32/slbcsp === SLBCSP === +/trunk/reactos/dll/win32/smdll === SMDLL === +/trunk/reactos/dll/win32/sndblst === SNDBLST === +/trunk/reactos/dll/win32/snmpapi === SNMPAPI === +/trunk/reactos/dll/win32/softpub === SOFTPUB === +/trunk/reactos/dll/win32/spoolss === SPOOLSS === +/trunk/reactos/dll/win32/srclient === SRCLIENT === +/trunk/reactos/dll/win32/stdole2.tlb === STDOLE2.TLB === +/trunk/reactos/dll/win32/stdole32.tlb === STDOLE32.TLB === +/trunk/reactos/dll/win32/sti === STI === +/trunk/reactos/dll/win32/sxs === SXS === +/trunk/reactos/dll/win32/syssetup === SYSSETUP === +/trunk/reactos/dll/win32/tapi32 === TAPI32 === +/trunk/reactos/dll/win32/tapiui === TAPIUI === +/trunk/reactos/dll/win32/traffic === TRAFFIC === +/trunk/reactos/dll/win32/twain_32 === TWAIN_32 === +/trunk/reactos/dll/win32/uext2 === UEXT2 === +/trunk/reactos/dll/win32/ufat === UFAT === +/trunk/reactos/dll/win32/ufatx === UFATX === +/trunk/reactos/dll/win32/untfs === UNTFS === +/trunk/reactos/dll/win32/updspapi === UPDSPAPI === +/trunk/reactos/dll/win32/url === URL === +/trunk/reactos/dll/win32/urlmon === URLMON === +/trunk/reactos/dll/win32/user32 === USER32 === +/trunk/reactos/dll/win32/userenv === USERENV === +/trunk/reactos/dll/win32/usp10 === USP10 === +/trunk/reactos/dll/win32/uxtheme === UXTHEME === +/trunk/reactos/dll/win32/vdmdbg === VDMDBG === +/trunk/reactos/dll/win32/version === VERSION === +/trunk/reactos/dll/win32/wdmaud.drv === WDMAUD.DRV === +/trunk/reactos/dll/win32/winemp3.acm === WINEMP3.ACM === +/trunk/reactos/dll/win32/winfax === WINFAX === +/trunk/reactos/dll/win32/winhttp === WINHTTP === +/trunk/reactos/dll/win32/wininet === WININET === +/trunk/reactos/dll/win32/winmm === WINMM === +/trunk/reactos/dll/win32/winscard === WINSCARD === +/trunk/reactos/dll/win32/winspool === WINSPOOL === +/trunk/reactos/dll/win32/winsta === WINSTA === +/trunk/reactos/dll/win32/wintab32 === WINTAB32 === +/trunk/reactos/dll/win32/wintrust === WINTRUST === +/trunk/reactos/dll/win32/wlanapi === WLANAPI === +/trunk/reactos/dll/win32/wldap32 === WLDAP32 === +/trunk/reactos/dll/win32/wmi === WMI === +/trunk/reactos/dll/win32/ws2_32 === WS2_32 === +/trunk/reactos/dll/win32/ws2help === WS2HELP === +/trunk/reactos/dll/win32/wshirda === WSHIRDA === +/trunk/reactos/dll/win32/wshtcpip === WSHTCPIP === +/trunk/reactos/dll/win32/wsock32 === WSOCK32 === +/trunk/reactos/dll/win32/wtsapi32 === WTSAPI32 === +/trunk/reactos/dll/win32/wuapi === WUAPI === /trunk/reactos == uncategorized ==

1 0

[cgutman] 40657: - Fix a typo
by cgutman＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: cgutman Date: Wed Apr 22 23:51:29 2009 New Revision: 40657 URL: http://svn.reactos.org/svn/reactos?rev=40657&view=rev Log: - Fix a typo Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=406… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Wed Apr 22 23:51:29 2009 @@ -2151,7 +2151,7 @@ * NdisReinitializePacket( * IN OUT PNDIS_PACKET Packet); */ -#define NdisReinitializePacketCounts(Packet) \ +#define NdisReinitializePacket(Packet) \ { \ (Packet)->Private.Head = (PNDIS_BUFFER)NULL; \ (Packet)->Private.ValidCounts = FALSE; \

1 0

[cfinck] 40656: Fix the size passed to MultiByteToWideChar. This fixes downloading the correct Gecko version for mshtml. (our version from Downloader isn't compatible anymore though) The patch was already submitted to Wine as well.
by cfinck＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: cfinck Date: Wed Apr 22 23:42:33 2009 New Revision: 40656 URL: http://svn.reactos.org/svn/reactos?rev=40656&view=rev Log: Fix the size passed to MultiByteToWideChar. This fixes downloading the correct Gecko version for mshtml. (our version from Downloader isn't compatible anymore though) The patch was already submitted to Wine as well. Modified: branches/ros-branch-0_3_9/reactos/dll/win32/mshtml/install.c Modified: branches/ros-branch-0_3_9/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_9/reactos/dll/win32/mshtml/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/dll/win32/mshtml/install.c [iso-8859-1] Wed Apr 22 23:42:33 2009 @@ -425,6 +425,7 @@ HKEY hkey; DWORD res, type; DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); + DWORD returned_size; LPWSTR url; static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; @@ -437,15 +438,16 @@ return NULL; url = heap_alloc(size); - - res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &size); + returned_size = size; + + res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &returned_size); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ) { heap_free(url); return NULL; } - if(size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { + if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { strcatW(url, v_formatW); MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), size/sizeof(WCHAR)-strlenW(url)); }

1 0

[mkupfer] 40655: sections and paths added
by mkupfer＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: mkupfer Date: Wed Apr 22 23:41:58 2009 New Revision: 40655 URL: http://svn.reactos.org/svn/reactos?rev=40655&view=rev Log: sections and paths added Modified: trunk/tools/changelog/sections Modified: trunk/tools/changelog/sections URL: http://svn.reactos.org/svn/reactos/trunk/tools/changelog/sections?rev=40655… ============================================================================== --- trunk/tools/changelog/sections [iso-8859-1] (original) +++ trunk/tools/changelog/sections [iso-8859-1] Wed Apr 22 23:41:58 2009 @@ -10,10 +10,15 @@ /trunk/reactos/ntoskrnl/cm === CM === /trunk/reactos/ntoskrnl/dbgk === DBGK === /trunk/reactos/ntoskrnl/ex === EX === +/trunk/reactos/ntoskrnl/fsrtl === FSRTL === +/trunk/reactos/ntoskrnl/fstub === FSTUB === /trunk/reactos/ntoskrnl/io === IO === /trunk/reactos/ntoskrnl/kd === KD === +/trunk/reactos/ntoskrnl/kdbg === KDBG === +/trunk/reactos/ntoskrnl/ke === KE === /trunk/reactos/ntoskrnl/mm === MM === -/trunk/reactos/dll/cpl == CPL == +/trunk/reactos/ntoskrnl/ob === OB === +/trunk/reactos/ntoskrnl/ps === PS === /trunk/reactos/subsystems == Subsystems == /trunk/reactos/drivers == Kernel Mode Drivers == /trunk/reactos/drivers/bus/acpi === ACPI === @@ -37,6 +42,20 @@ /trunk/reactos/dll/cpl/intl === INTL === /trunk/reactos/dll/cpl/sysdm === SYSDM === /trunk/reactos/dll/cpl/timedate === TIMEDATE === +/trunk/reactos/dll/cpl/powercfg === POWERCFG === /trunk/reactos/base/applications == Win32™ Applications == +/trunk/reactos/base/applications/calc === Calc === +/trunk/reactos/base/applications/charmap === CharMap === +/trunk/reactos/base/applications/downloader === Downloader === +/trunk/reactos/base/applications/fontview === FontView === +/trunk/reactos/base/applications/kbswitch === KbSwitch === +/trunk/reactos/base/applications/magnify === Magnify === +/trunk/reactos/base/applications/notepad === Notepad === +/trunk/reactos/base/applications/regedit === Regedit === +/trunk/reactos/base/applications/screensavers === Screensavers === +/trunk/reactos/base/applications/games/sol === Solitaire === +/trunk/reactos/base/applications/taskmgr === Taskmgr === +/trunk/reactos/base/applications/games/winmine === Winmine === +/trunk/reactos/base/applications/wordpad === Wordpad === /trunk/reactos/base/dll/win32 == Win32™ Libraries == /trunk/reactos == uncategorized ==

1 0

[cwittich] 40654: import strcpy_s from wine
by cwittich＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: cwittich Date: Wed Apr 22 22:53:21 2009 New Revision: 40654 URL: http://svn.reactos.org/svn/reactos?rev=40654&view=rev Log: import strcpy_s from wine Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/lib/sdk/crt/string/string.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Wed Apr 22 22:53:21 2009 @@ -852,5 +852,6 @@ _ftol2=_ftol _ftol2_sse=_ftol strcat_s + strcpy_s _swprintf=swprintf Modified: trunk/reactos/lib/sdk/crt/string/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/string.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/string.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/string.c [iso-8859-1] Wed Apr 22 22:53:21 2009 @@ -62,3 +62,26 @@ dst[0] = '\0'; return ERANGE; } + +/********************************************************************* + * strcpy_s (MSVCRT.@) + */ +int CDECL strcpy_s( char* dst, size_t elem, const char* src ) +{ + size_t i; + if(!elem) return EINVAL; + if(!dst) return EINVAL; + if(!src) + { + dst[0] = '\0'; + return EINVAL; + } + + for(i = 0; i < elem; i++) + { + if((dst[i] = src[i]) == '\0') return 0; + } + dst[0] = '\0'; + return ERANGE; +} +

1 0

[dreimer] 40653: First commit to rewrite RosBE in Brainfuck to give it the logic, which Batch lacks... jkjkjk Remove setlocal crap because it somehow works now without...
by dreimer＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: dreimer Date: Wed Apr 22 22:36:01 2009 New Revision: 40653 URL: http://svn.reactos.org/svn/reactos?rev=40653&view=rev Log: First commit to rewrite RosBE in Brainfuck to give it the logic, which Batch lacks... jkjkjk Remove setlocal crap because it somehow works now without... Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Wed Apr 22 22:36:01 2009 @@ -27,46 +27,42 @@ goto :main ) -setlocal enabledelayedexpansion +set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% +set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% -set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! -set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! +if not "%ROS_ARCH%" == "" ( + set ROS_PREFIX=%ROS_ARCH%-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% -if not "!ROS_ARCH!" == "" ( - set ROS_PREFIX=!ROS_ARCH!-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\!ROS_ARCH! - - if "!ROS_ARCH!" == "arm" ( - set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH! + if "%ROS_ARCH%" == "arm" ( + set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH% ) - if "!ROS_ARCH!" == "ppc" ( - set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH! + if "%ROS_ARCH%" == "ppc" ( + set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH% ) - if "!ROS_ARCH!" == "amd64" ( - set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH! + if "%ROS_ARCH%" == "amd64" ( + set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH% set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 ) ) REM Check if existant arch -if not exist "!_ROSBE_TARGET_MINGWPATH!\." ( +if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( echo Unsupported arch specified. Fallback to Default. pause - set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! + set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% set ROS_ARCH= set ROS_PREFIX= - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_HOST_MINGWPATH! + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_HOST_MINGWPATH% ) REM HAXX - -endlocal & set ROS_ARCH=%ROS_ARCH%& set ROS_PREFIX=%ROS_PREFIX%& set _ROSBE_OBJPATH=%_ROSBE_OBJPATH%& set _ROSBE_OUTPATH=%_ROSBE_OUTPATH%& set _ROSBE_TARGET_MINGWPATH=%_ROSBE_TARGET_MINGWPATH%& set _ROSBE_HOST_MINGWPATH=%_ROSBE_HOST_MINGWPATH%& set _ROSBE_MODE=%_ROSBE_MODE%& set _ROSBE_ORIGINALPATH=%_ROSBE_ORIGINALPATH% :: :: Set up the GCC 4.x.x build environment.

1 0

[dgorbachev] 40652: - Add "log2lines" tool by Jan Roeloffzen. Bug #4342. - Fix indentation in rsym.h.
by dgorbachev＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: dgorbachev Date: Wed Apr 22 20:50:44 2009 New Revision: 40652 URL: http://svn.reactos.org/svn/reactos?rev=40652&view=rev Log: - Add "log2lines" tool by Jan Roeloffzen. Bug #4342. - Fix indentation in rsym.h. Added: trunk/reactos/tools/log2lines.c (with props) trunk/reactos/tools/log2lines.mak (with props) Modified: trunk/reactos/tools/rsym.h trunk/reactos/tools/tools.mak Added: trunk/reactos/tools/log2lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines.c?rev=4065… ============================================================================== --- trunk/reactos/tools/log2lines.c (added) +++ trunk/reactos/tools/log2lines.c [iso-8859-1] Wed Apr 22 20:50:44 2009 @@ -1,0 +1,1034 @@ +/* + * Usage: log2lines [-cd:fFhmrv] [<exefile> <offset>] + * Try log2lines -h + * + * This is a tool and is compiled using the host compiler, + * i.e. on Linux gcc and not mingw-gcc (cross-compiler). + * Therefore we can't include SDK headers and we have to + * duplicate some definitions here. + * Also note that the internal functions are "old C-style", + * returning an int, where a return of 0 means success and + * non-zero is failure. + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <getopt.h> + +#include "rsym.h" + +#define LOG2LINES_VERSION "0.5" + +#define INVALID_BASE 0xFFFFFFFFL + +#define DEF_OPT_DIR "output-i386" + +#if defined (__DJGPP__) || defined (__WIN32__) + +#define DEV_NULL "NUL" +#define DOS_PATHS +#define PATH_CHAR '\\' +#define PATH_STR "\\" +#define PATHCMP strcasecmp + +#else /* not defined (__DJGPP__) || defined (__WIN32__) */ + +#include <errno.h> +#include <limits.h> + +#define MAX_PATH PATH_MAX +#define DEV_NULL "/dev/null" +#define UNIX_PATHS +#define PATH_CHAR '/' +#define PATH_STR "/" +#define PATHCMP strcmp + +#endif /* not defined (__DJGPP__) || defined (__WIN32__) */ + +#define UNZIP_FMT "7z x -y -r %s -o%s > " DEV_NULL +#define UNZIP_FMT_CAB \ +"7z x -y -r %s" PATH_STR "reactos" PATH_STR "reactos.cab -o%s" PATH_STR "reactos" PATH_STR "reactos > " DEV_NULL + +#define LINESIZE 1024 + +struct entry_struct +{ + char *buf; + char *name; + char *path; + size_t ImageBase; + struct entry_struct *pnext; +}; + +typedef struct entry_struct CACHE_ENTRY; + +struct cache_struct +{ + off_t st_size; + CACHE_ENTRY *phead; + CACHE_ENTRY *ptail; +}; + +typedef struct cache_struct CACHE; + +static CACHE cache; + +static char *optchars = "cd:fFhl:mMrv"; +static int opt_help = 0; // -h +static int opt_force = 0; // -f +static int opt_exit = 0; // -e +static int opt_verbose = 0; // -v +static int opt_console = 0; // -c +static int opt_mark = 0; // -m +static int opt_Mark = 0; // -M +static int opt_raw = 0; // -r +static char opt_dir[MAX_PATH]; // -d +static char opt_logFile[MAX_PATH]; // -l +static FILE *logFile = NULL; + +static char *cache_name; +static char *tmp_name; + +static char * +basename(char *path) +{ + char *base; + + base = strrchr(path, PATH_CHAR); + if (base) + { + return ++base; + } + return path; +} + +static size_t +fixup_offset(size_t ImageBase, size_t offset) +{ + if (offset >= ImageBase) + offset -= ImageBase; + return offset; +} + +static PIMAGE_SECTION_HEADER +find_rossym_section(PIMAGE_FILE_HEADER PEFileHeader, PIMAGE_SECTION_HEADER PESectionHeaders) +{ + size_t i; + for (i = 0; i < PEFileHeader->NumberOfSections; i++) + { + if (0 == strcmp((char *)PESectionHeaders[i].Name, ".rossym")) + return &PESectionHeaders[i]; + } + return NULL; +} + +static int +find_and_print_offset(void *data, size_t offset, char *toString) +{ + PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER) data; + PROSSYM_ENTRY Entries = (PROSSYM_ENTRY) ((char *)data + RosSymHeader->SymbolsOffset); + char *Strings = (char *)data + RosSymHeader->StringsOffset; + size_t symbols = RosSymHeader->SymbolsLength / sizeof (ROSSYM_ENTRY); + size_t i; + + //if (RosSymHeader->SymbolsOffset) + + for (i = 0; i < symbols; i++) + { + if (Entries[i].Address > offset) + { + if (!i--) + return 1; + else + { + PROSSYM_ENTRY e = &Entries[i]; + if (toString) + { // put in toString if provided + snprintf(toString, LINESIZE, "%s:%u (%s)", + &Strings[e->FileOffset], + (unsigned int)e->SourceLine, + &Strings[e->FunctionOffset]); + return 0; + } + else + { // to stdout + printf("%s:%u (%s)\n", &Strings[e->FileOffset], + (unsigned int)e->SourceLine, + &Strings[e->FunctionOffset]); + return 0; + } + } + } + } + return 1; +} + +static int +process_data(const void *FileData, size_t FileSize, size_t offset, char *toString) +{ + PIMAGE_DOS_HEADER PEDosHeader; + PIMAGE_FILE_HEADER PEFileHeader; + PIMAGE_OPTIONAL_HEADER PEOptHeader; + PIMAGE_SECTION_HEADER PESectionHeaders; + PIMAGE_SECTION_HEADER PERosSymSectionHeader; + size_t ImageBase; + int res; + + /* Check if MZ header exists */ + PEDosHeader = (PIMAGE_DOS_HEADER) FileData; + if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) + { + perror("Input file is not a PE image.\n"); + return 1; + } + + /* Locate PE file header */ + /* sizeof(ULONG) = sizeof(MAGIC) */ + PEFileHeader = (PIMAGE_FILE_HEADER) ((char *)FileData + PEDosHeader->e_lfanew + sizeof (ULONG)); + + /* Locate optional header */ + PEOptHeader = (PIMAGE_OPTIONAL_HEADER) (PEFileHeader + 1); + ImageBase = PEOptHeader->ImageBase; + + /* Locate PE section headers */ + PESectionHeaders = (PIMAGE_SECTION_HEADER) ((char *)PEOptHeader + PEFileHeader->SizeOfOptionalHeader); + + /* make sure offset is what we want */ + offset = fixup_offset(ImageBase, offset); + + /* find rossym section */ + PERosSymSectionHeader = find_rossym_section(PEFileHeader, PESectionHeaders); + if (!PERosSymSectionHeader) + { + fprintf(stderr, "Couldn't find rossym section in executable\n"); + return 1; + } + res = find_and_print_offset((char *)FileData + PERosSymSectionHeader->PointerToRawData, offset, toString); + if (res) + { + if (toString) + { + sprintf(toString, "??:0\n"); + } + else + { + printf("??:0\n"); + } + } + + return res; +} + +static long +my_atoi(const char *a) +{ + int i = 0; + const char *fmt = "%x"; + + if (*a == '0') + { + switch (*++a) + { + case 'x': + fmt = "%x"; + ++a; + break; + case 'd': + fmt = "%d"; + ++a; + break; + default: + fmt = "%o"; + break; + } + } + sscanf(a, fmt, &i); + return i; +} + +static int +file_exists(char *name) +{ + FILE *f; + + f = fopen(name, "r"); + if (!f) + { + return 0; + } + fclose(f); + return 1; +} + +static int +process_file(const char *file_name, size_t offset, char *toString) +{ + void *FileData; + size_t FileSize; + int res = 1; + + FileData = load_file(file_name, &FileSize); + if (!FileData) + { + fprintf(stderr, "An error occured loading '%s'\n", file_name); + } + else + { + res = process_data(FileData, FileSize, offset, toString); + free(FileData); + } + return res; +} + +static int +get_ImageBase(char *fname, size_t *ImageBase) +{ + IMAGE_DOS_HEADER PEDosHeader; + IMAGE_FILE_HEADER PEFileHeader; + IMAGE_OPTIONAL_HEADER PEOptHeader; + + FILE *fr; + off_t readLen; + int res; + + *ImageBase = INVALID_BASE; + fr = fopen(fname, "rb"); + if (!fr) + { + if (opt_verbose) + fprintf(stderr, "get_ImageBase, cannot open '%s' (%s)\n", fname, strerror(errno)); + return 1; + } + + readLen = fread(&PEDosHeader, sizeof (IMAGE_DOS_HEADER), 1, fr); + if (1 != readLen) + { + if (opt_verbose) + fprintf(stderr, "get_ImageBase %s, read error IMAGE_DOS_HEADER (%s)\n", fname, strerror(errno)); + fclose(fr); + return 2; + } + + /* Check if MZ header exists */ + if (PEDosHeader.e_magic != IMAGE_DOS_MAGIC || PEDosHeader.e_lfanew == 0L) + { + if (opt_verbose > 1) + fprintf(stderr, "get_ImageBase %s, MZ header missing\n", fname); + fclose(fr); + return 3; + } + + /* Locate PE file header */ + res = fseek(fr, PEDosHeader.e_lfanew + sizeof (ULONG), SEEK_SET); + readLen = fread(&PEFileHeader, sizeof (IMAGE_FILE_HEADER), 1, fr); + if (1 != readLen) + { + if (opt_verbose) + fprintf(stderr, "get_ImageBase %s, read error IMAGE_FILE_HEADER (%s)\n", fname, strerror(errno)); + return 4; + } + + /* Locate optional header */ + readLen = fread(&PEOptHeader, sizeof (IMAGE_OPTIONAL_HEADER), 1, fr); + if (1 != readLen) + { + if (opt_verbose) + fprintf(stderr, "get_ImageBase %s, read error IMAGE_OPTIONAL_HEADER (%s)\n", fname, strerror(errno)); + fclose(fr); + return 5; + } + + /* Check if it's really an IMAGE_OPTIONAL_HEADER we are interested in */ + if ((PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) && + (PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC)) + { + if (opt_verbose > 1) + fprintf(stderr, "get_ImageBase %s, not an IMAGE_NT_OPTIONAL_HDR<32|64>\n", fname); + fclose(fr); + return 6; + } + + *ImageBase = PEOptHeader.ImageBase; + fclose(fr); + return 0; +} + +static CACHE_ENTRY * +entry_delete(CACHE_ENTRY *pentry) +{ + if (!pentry) + return NULL; + if (pentry->buf) + free(pentry->buf); + free(pentry); + return NULL; +} + +static CACHE_ENTRY * +entry_insert(CACHE_ENTRY *pentry) +{ + if (!pentry) + return NULL; + pentry->pnext = cache.phead; + cache.phead = pentry; + if (!cache.ptail) + cache.ptail = pentry; + return pentry; +} + +#if 0 +static CACHE_ENTRY * +entry_append(CACHE_ENTRY *pentry) +{ + if (!pentry) + return NULL; + if (!cache.ptail) + return entry_insert(pentry); + cache.ptail->pnext = pentry; + pentry->pnext = NULL; + cache.ptail = pentry; + return pentry; +} +#endif + +static CACHE_ENTRY * +entry_create(char *Line) +{ + CACHE_ENTRY *pentry; + char *s = NULL; + int l; + + if (!Line) + return NULL; + + pentry = malloc(sizeof (CACHE_ENTRY)); + if (!pentry) + return NULL; + + l = strlen(Line); + pentry->buf = s = malloc(l + 1); + if (!s) + { + if (opt_verbose) + fprintf(stderr, "Alloc entry failed\n"); + return entry_delete(pentry); + } + + strcpy(s, Line); + if (s[l] == '\n') + s[l] = '\0'; + + pentry->name = s; + s = strchr(s, '|'); + if (!s) + { + if (opt_verbose) + fprintf(stderr, "Name field missing\n"); + return entry_delete(pentry); + } + *s++ = '\0'; + + pentry->path = s; + s = strchr(s, '|'); + if (!s) + { + if (opt_verbose) + fprintf(stderr, "Path field missing\n"); + return entry_delete(pentry); + } + *s++ = '\0'; + if (1 != sscanf(s, "%x", &pentry->ImageBase)) + { + if (opt_verbose) + fprintf(stderr, "ImageBase field missing\n"); + return entry_delete(pentry); + } + return pentry; +} + +static CACHE_ENTRY * +entry_lookup(char *name) +{ + CACHE_ENTRY *pprev = NULL; + CACHE_ENTRY *pnext; + + pnext = cache.phead; + while (pnext != NULL) + { + if (PATHCMP(name, pnext->name) == 0) + { + if (pprev) + { // move to head for faster lookup next time + pprev->pnext = pnext->pnext; + pnext->pnext = cache.phead; + cache.phead = pnext; + } + return pnext; + } + pprev = pnext; + pnext = pnext->pnext; + } + return NULL; +} + +static int +read_cache(void) +{ + FILE *fr; + CACHE_ENTRY *pentry; + char *Line = NULL; + int result = 0; + + //fprintf(stderr, "Reading cache ...\n"); + Line = malloc(LINESIZE + 1); + if (!Line) + { + if (opt_verbose) + fprintf(stderr, "Alloc Line failed\n"); + return 1; + } + Line[LINESIZE] = '\0'; + + fr = fopen(cache_name, "r"); + if (!fr) + { + if (opt_verbose) + fprintf(stderr, "Open %s failed\n", cache_name); + free(Line); + return 2; + } + cache.phead = cache.ptail = NULL; + + while (fgets(Line, LINESIZE, fr) != NULL) + { + pentry = entry_create(Line); + if (!pentry) + { + if (opt_verbose > 1) + fprintf(stderr, "** FAILED: %s\n", Line); + } + else + { + entry_insert(pentry); + } + } + + fclose(fr); + free(Line); + return result; +} + +static int +create_cache(int force, int skipImageBase) +{ + FILE *fr, *fw; + char *Line = NULL, *Fname = NULL; + int len, err; + size_t ImageBase; + + if ((fw = fopen(tmp_name, "w")) == NULL) + { + if (opt_verbose) + fprintf(stderr, "Apparently %s is not writable (mounted ISO?), using current dir\n", tmp_name); + cache_name = basename(cache_name); + tmp_name = basename(tmp_name); + } + else + { + if (opt_verbose > 2) + fprintf(stderr, "%s is writable\n", tmp_name); + fclose(fw); + remove(tmp_name); + } + + if (force) + { + if (opt_verbose > 2) + fprintf(stderr, "Removing %s ...\n", cache_name); + remove(cache_name); + } + else + { + if (file_exists(cache_name)) + { + if (opt_verbose > 2) + fprintf(stderr, "Cache %s already exists\n", cache_name); + return 0; + } + } + + Line = malloc(LINESIZE + 1); + if (!Line) + return 1; + Line[LINESIZE] = '\0'; + + remove(tmp_name); + fprintf(stderr, "Scanning %s ...\n", opt_dir); + snprintf(Line, LINESIZE, "dir /a:-d /s /b %s > %s", opt_dir, tmp_name); + system(Line); + fprintf(stderr, "Creating cache ..."); + + if ((fr = fopen(tmp_name, "r")) != NULL) + { + if ((fw = fopen(cache_name, "w")) != NULL) + { + while (fgets(Line, LINESIZE, fr) != NULL) + { + len = strlen(Line); + if (!len) + continue; + + Fname = Line + len - 1; + if (*Fname == '\n') + *Fname = '\0'; + + while ((Fname > Line) && (*Fname != PATH_CHAR)) + Fname--; + if (*Fname == PATH_CHAR) + Fname++; + if (*Fname && !skipImageBase) + { + if ((err = get_ImageBase(Line, &ImageBase)) != 0) + { + if (opt_verbose > 2) + fprintf(stderr, "%s|%s|%0x, ERR=%d\n", Fname, Line, ImageBase, err); + } + else + { + fprintf(fw, "%s|%s|%0x\n", Fname, Line, ImageBase); + } + } + } + fclose(fw); + } + fprintf(stderr, "... done\n"); + fclose(fr); + } + remove(tmp_name); + free(Line); + return 0; +} + +static int +translate_file(const char *cpath, size_t offset, char *toString) +{ + size_t base = 0; + CACHE_ENTRY *pentry = NULL; + int res = 0; + char *path; + + /* First get the ImageBase of the File. If its smaller than the given + * Parameter, everything is ok, because it was already added onto the + * adress and can be given directly to process_file. If not, add it and + * give the result to process_file. + */ + path = convert_path(cpath); + if (!path) + { + return 1; + } + + // The path could be absolute: + if (get_ImageBase(path, &base)) + { + pentry = entry_lookup(path); + if (pentry) + { + path = pentry->path; + base = pentry->ImageBase; + if (base == INVALID_BASE) + { + if (opt_verbose) + fprintf(stderr, "No, or invalid base address: %s\n", path); + res = 2; + } + } + else + { + if (opt_verbose) + fprintf(stderr, "Not found in cache: %s\n", path); + res = 3; + } + } + + if (!res) + { + offset = (base < offset) ? offset : base + offset; + res = process_file(path, offset, toString); + } + + free(path); + return res; +} + +static void +translate_char(int c, FILE *outFile) +{ + fputc(c, outFile); + if (logFile) + fputc(c, logFile); +} + +static void +translate_line(FILE *outFile, char *Line, char *path, char *LineOut) +{ + size_t offset; + int cnt, res; + char *sep, *tail, *mark; + unsigned char ch; + + if (!*Line) + return; + res = 1; + mark = ""; + sep = strchr(Line, ':'); + if (sep) + { + *sep = ' '; + cnt = sscanf(Line, "<%s %x%c", path, &offset, &ch); + if (cnt == 3 && ch == '>') + { + tail = strchr(Line, '>') + 1; + if (!(res = translate_file(path, offset, LineOut))) + { + mark = opt_mark ? "* " : ""; + fprintf(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); + if (logFile) + fprintf(logFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); + } + else + { + *sep = ':'; // restore because not translated + mark = opt_Mark ? "? " : ""; + } + } + } + if (res) + { + fprintf(outFile, "%s%s", mark, Line); // just copy + if (logFile) + fprintf(logFile, "%s%s", mark, Line); // just copy + } + memset(Line, '\0', LINESIZE); // flushed +} + +static int +translate_files(FILE * inFile, FILE * outFile) +{ + char *Line = malloc(LINESIZE + 1); + char *path = malloc(LINESIZE + 1); + char *LineOut = malloc(LINESIZE + 1); + int c; + unsigned char ch; + int i = 0; + + if (Line && path && LineOut) + { + memset(Line, '\0', LINESIZE + 1); + if (opt_console) + { + while ((c = fgetc(inFile)) != EOF) + { + ch = (unsigned char)c; + if (!opt_raw) + { + switch (ch) + { + case '\n': + translate_line(outFile, Line, path, LineOut); + i = 0; + translate_char(c, outFile); + break; + case '<': + i = 0; + Line[i++] = ch; + break; + case '>': + if (i) + { + if (i < LINESIZE) + { + Line[i++] = ch; + translate_line(outFile, Line, path, LineOut); + } + else + { + translate_line(outFile, Line, path, LineOut); + translate_char(c, outFile); + } + i = 0; + } + else + { + translate_char(c, outFile); + } + i = 0; + break; + default: + if (i) + { + if (i < LINESIZE) + { + Line[i++] = ch; + } + else + { + translate_line(outFile, Line, path, LineOut); + translate_char(c, outFile); + i = 0; + } + } + else + { + translate_char(c, outFile); + } + } + } + else + { + translate_char(c, outFile); + } + } + } + else + { // Line by line, slightly faster but less interactive + while (fgets(Line, LINESIZE, inFile) != NULL) + { + if (!opt_raw) + { + translate_line(outFile, Line, path, LineOut); + } + else + { + fprintf(outFile, "%s", Line); // just copy + if (logFile) + fprintf(logFile, "%s", Line); // just copy + } + } + } + } + free(LineOut); + free(Line); + free(path); + return 0; +} + +static char *verboseUsage = +"\n" +"Description:\n" +" When <exefile> <offset> are given, log2lines works just like raddr2line\n" +" Otherwise it reads stdin and tries to translate lines of the form:\n" +" <IMAGENAME:ADDRESS>\n\n" +" The result is written to stdout.\n" +" log2lines uses a cache in order to avoid a directory scan at each\n" +" image lookup, greatly increasing performance. Only image path and its\n" +" base address are cached.\n\n" +"Options:\n" +" -c Console mode. Outputs text per character instead of per line.\n" +" This is slightly slower but enables to see what you type.\n\n" +" -d <directory>|<ISO image>\n" +" Directory to scan for images. (Do not append a '" PATH_STR "')\n" +" This option also takes an ISO image as argument:\n" +" - The image is recognized by the '.iso' extension.\n" +" - The image will be unpacked to a directory with the same name.\n" +" - The embedded reactos.cab file will also be unpacked.\n" +" - Combined with -f the file will be re-unpacked.\n" +" - NOTE: this ISO unpack feature needs 7z to be in the current PATH.\n" +" Default: " DEF_OPT_DIR "\n\n" +" -f Force creating new cache.\n\n" +" -F As -f but exits immediately after creating cache.\n\n" +" -h This text.\n\n" +" -l <logFile>\n" +" Append copy to specified logFile.\n" +" Default: no logFile\n\n" +" -m Prefix (mark) each translated line with '* '.\n\n" +" -M Prefix (mark) each NOT translated line with '? '.\n" +" ( Only for lines of the form: <IMAGENAME:ADDRESS> )\n\n" +" -r Raw output without translation.\n\n" +" -v Show detailed errors and tracing.\n" +" Repeating this option adds more verbosity.\n" +" Default: only (major) errors\n" "\n" +"Examples:\n" +" Setup is a VMware machine with its serial port set to: '\\\\.\\pipe\\kdbg'.\n\n" +" Just recreate cache after a svn update or a new module has been added:\n" +" log2lines -F\n\n" " Use kdbg debugger via console (interactive):\n" +" log2lines -c < \\\\.\\pipe\\kdbg\n\n" +" Use kdbg debugger via console, and append copy to logFile:\n" +" log2lines -c -l dbg.log < \\\\.\\pipe\\kdbg\n\n" +" Use kdbg debugger to send output to logfile:\n" +" log2lines < \\\\.\\pipe\\kdbg > dbg.log\n\n" +" Re-translate a debug log:\n" +" log2lines -d bootcd-38701-dbg.iso < bugxxxx.log\n\n" +"\n"; + +static void +usage(int verbose) +{ + fprintf(stderr, "log2lines " LOG2LINES_VERSION "\n\n"); + fprintf(stderr, "Usage: log2lines [-%s] [<exefile> <offset>]\n", optchars); + if (verbose) + { + fprintf(stderr, verboseUsage); + } + else + { + fprintf(stderr, "Try log2lines -h\n"); + } +} + +static int +unpack_iso(char *dir, char *iso) +{ + char Line[LINESIZE]; + int res = 0; + + sprintf(Line, UNZIP_FMT, iso, dir); + if (system(Line) < 0) + { + fprintf(stderr, "Cannot unpack %s (check 7z path!)\n", iso); + if (opt_verbose) + fprintf(stderr, "Failed to execute: '%s'\n", Line); + res = 1; + } + else + { + if (opt_verbose > 1) + fprintf(stderr, "Unpacking reactos.cab in %s\n", dir); + sprintf(Line, UNZIP_FMT_CAB, dir, dir); + if (system(Line) < 0) + { + fprintf(stderr, "Cannot unpack reactos.cab in %s\n", dir); + if (opt_verbose) + fprintf(stderr, "Failed to execute: '%s'\n", Line); + res = 2; + } + } + return res; +} + +static void +check_directory(int force) +{ + char freeldr_path[MAX_PATH]; + char iso_path[MAX_PATH]; + + char *check_iso = strrchr(opt_dir, '.'); + if (check_iso && PATHCMP(check_iso, ".iso") == 0) + { + if (opt_verbose) + fprintf(stderr, "Using ISO image: %s\n", opt_dir); + if (file_exists(opt_dir)) + { + if (opt_verbose > 1) + fprintf(stderr, "ISO image exists: %s\n", opt_dir); + + strcpy(iso_path, opt_dir); + *check_iso = '\0'; + sprintf(freeldr_path, "%s" PATH_STR "freeldr.ini", opt_dir); + if (!file_exists(freeldr_path) || force) + { + fprintf(stderr, "Unpacking %s to: %s ...", iso_path, opt_dir); + unpack_iso(opt_dir, iso_path); + fprintf(stderr, "... done\n"); + } + else + { + if (opt_verbose > 1) + fprintf(stderr, "%s already unpacked in: %s\n", iso_path, opt_dir); + } + } + } + cache_name = malloc(MAX_PATH); + tmp_name = malloc(MAX_PATH); + strcpy(cache_name, opt_dir); + strcat(cache_name, PATH_STR "log2lines.cache"); + strcpy(tmp_name, cache_name); + strcat(tmp_name, "~"); +} + +int +main(int argc, const char **argv) +{ + int res = 0; + int opt; + int optCount = 0; + + strcpy(opt_dir, DEF_OPT_DIR); + strcpy(opt_logFile, ""); + while (-1 != (opt = getopt(argc, (char **const)argv, optchars))) + { + switch (opt) + { + case 'c': + opt_console++; + break; + case 'd': + optCount++; + strcpy(opt_dir, optarg); + break; + case 'f': + opt_force++; + break; + case 'h': + opt_help++; + usage(1); + exit(0); + break; + case 'F': + opt_exit++; + opt_force++; + break; + case 'l': + optCount++; + strcpy(opt_logFile, optarg); + break; + case 'm': + opt_mark++; + break; + case 'M': + opt_Mark++; + break; + case 'r': + opt_raw++; + break; + case 'v': + opt_verbose++; + break; + default: + usage(0); + exit(2); + break; + } + optCount++; + } + + argc -= optCount; + if (argc != 1 && argc != 3) + { + usage(0); + exit(1); + } + + check_directory(opt_force); + create_cache(opt_force, 0); + if (opt_exit) + exit(0); + + read_cache(); + + if (*opt_logFile) + logFile = fopen(opt_logFile, "a"); + if (argc == 3) + { // translate <exefile> <offset> + translate_file(argv[optCount + 1], my_atoi(argv[optCount + 2]), NULL); + } + else + { // translate logging from stdin + translate_files(stdin, stdout); + } + + if (logFile) + fclose(logFile); + return res; +} Propchange: trunk/reactos/tools/log2lines.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/log2lines.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines.mak?rev=40… ============================================================================== --- trunk/reactos/tools/log2lines.mak (added) +++ trunk/reactos/tools/log2lines.mak [iso-8859-1] Wed Apr 22 20:50:44 2009 @@ -1,0 +1,41 @@ +LOG2LINES_BASE = $(TOOLS_BASE) +LOG2LINES_BASE_ = $(LOG2LINES_BASE)$(SEP) + +LOG2LINES_INT = $(INTERMEDIATE_)$(LOG2LINES_BASE) +LOG2LINES_INT_ = $(LOG2LINES_INT)$(SEP) +LOG2LINES_OUT = $(OUTPUT_)$(LOG2LINES_BASE) +LOG2LINES_OUT_ = $(LOG2LINES_OUT)$(SEP) + +LOG2LINES_TARGET = \ + $(LOG2LINES_OUT_)log2lines$(EXEPOSTFIX) + +LOG2LINES_SOURCES = \ + $(LOG2LINES_BASE_)log2lines.c \ + $(LOG2LINES_BASE_)rsym_common.c + +LOG2LINES_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(LOG2LINES_SOURCES:.c=.o)) + +LOG2LINES_HOST_CFLAGS = $(TOOLS_CFLAGS) + +LOG2LINES_HOST_LFLAGS = $(TOOLS_LFLAGS) + +.PHONY: log2lines +log2lines: $(LOG2LINES_TARGET) + +$(LOG2LINES_TARGET): $(LOG2LINES_OBJECTS) | $(LOG2LINES_OUT) + $(ECHO_HOSTLD) + ${host_gcc} $(LOG2LINES_OBJECTS) $(LOG2LINES_HOST_LFLAGS) -o $@ + +$(LOG2LINES_INT_)log2lines.o: $(LOG2LINES_BASE_)log2lines.c | $(LOG2LINES_INT) + $(ECHO_HOSTCC) + ${host_gcc} $(LOG2LINES_HOST_CFLAGS) -c $< -o $@ + +#$(LOG2LINES_INT_)rsym_common.o: $(LOG2LINES_BASE_)rsym_common.c | $(LOG2LINES_INT) +# $(ECHO_HOSTCC) +# ${host_gcc} $(LOG2LINES_HOST_CFLAGS) -c $< -o $@ + +.PHONY: log2lines_clean +log2lines_clean: + -@$(rm) $(LOG2LINES_TARGET) $(LOG2LINES_OBJECTS) 2>$(NUL) +clean: log2lines_clean Propchange: trunk/reactos/tools/log2lines.mak ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=40652&r1=… ============================================================================== --- trunk/reactos/tools/rsym.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym.h [iso-8859-1] Wed Apr 22 20:50:44 2009 @@ -4,19 +4,21 @@ #define RSYM_H #define IMAGE_DOS_MAGIC 0x5a4d -#define IMAGE_PE_MAGIC 0x00004550 +#define IMAGE_PE_MAGIC 0x00004550 #define IMAGE_SIZEOF_SHORT_NAME 8 +#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b +#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b #define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 #define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 -#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 - -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 - -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 -#define IMAGE_SCN_LNK_REMOVE 0x00000800 -#define IMAGE_SCN_MEM_READ 0x40000000 -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 + +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 + +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 +#define IMAGE_SCN_LNK_REMOVE 0x00000800 +#define IMAGE_SCN_MEM_READ 0x40000000 +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 @@ -38,121 +40,119 @@ typedef unsigned __int64 ULONG_PTR; #else #if defined(__x86_64__) && defined(unix) -typedef unsigned int ULONG_PTR; +typedef unsigned int ULONG_PTR; #else -typedef unsigned long ULONG_PTR; +typedef unsigned long ULONG_PTR; #endif #endif #pragma pack(push,2) - typedef struct _IMAGE_DOS_HEADER { - WORD e_magic; - WORD e_cblp; - WORD e_cp; - WORD e_crlc; - WORD e_cparhdr; - WORD e_minalloc; - WORD e_maxalloc; - WORD e_ss; - WORD e_sp; - WORD e_csum; - WORD e_ip; - WORD e_cs; - WORD e_lfarlc; - WORD e_ovno; - WORD e_res[4]; - WORD e_oemid; - WORD e_oeminfo; - WORD e_res2[10]; - LONG e_lfanew; -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; + WORD e_magic; + WORD e_cblp; + WORD e_cp; + WORD e_crlc; + WORD e_cparhdr; + WORD e_minalloc; + WORD e_maxalloc; + WORD e_ss; + WORD e_sp; + WORD e_csum; + WORD e_ip; + WORD e_cs; + WORD e_lfarlc; + WORD e_ovno; + WORD e_res[4]; + WORD e_oemid; + WORD e_oeminfo; + WORD e_res2[10]; + LONG e_lfanew; +} IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER; #pragma pack(pop) #pragma pack(push,4) typedef struct _IMAGE_FILE_HEADER { - WORD Machine; - WORD NumberOfSections; - DWORD TimeDateStamp; - DWORD PointerToSymbolTable; - DWORD NumberOfSymbols; - WORD SizeOfOptionalHeader; - WORD Characteristics; + WORD Machine; + WORD NumberOfSections; + DWORD TimeDateStamp; + DWORD PointerToSymbolTable; + DWORD NumberOfSymbols; + WORD SizeOfOptionalHeader; + WORD Characteristics; } IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; #pragma pack(pop) typedef struct _IMAGE_DATA_DIRECTORY { - DWORD VirtualAddress; - DWORD Size; -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; + DWORD VirtualAddress; + DWORD Size; +} IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY; typedef struct _IMAGE_OPTIONAL_HEADER32 { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - DWORD BaseOfData; - DWORD ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Win32VersionValue; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - DWORD SizeOfStackReserve; - DWORD SizeOfStackCommit; - DWORD SizeOfHeapReserve; - DWORD SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; + WORD Magic; + BYTE MajorLinkerVersion; + BYTE MinorLinkerVersion; + DWORD SizeOfCode; + DWORD SizeOfInitializedData; + DWORD SizeOfUninitializedData; + DWORD AddressOfEntryPoint; + DWORD BaseOfCode; + DWORD BaseOfData; + DWORD ImageBase; + DWORD SectionAlignment; + DWORD FileAlignment; + WORD MajorOperatingSystemVersion; + WORD MinorOperatingSystemVersion; + WORD MajorImageVersion; + WORD MinorImageVersion; + WORD MajorSubsystemVersion; + WORD MinorSubsystemVersion; + DWORD Win32VersionValue; + DWORD SizeOfImage; + DWORD SizeOfHeaders; + DWORD CheckSum; + WORD Subsystem; + WORD DllCharacteristics; + DWORD SizeOfStackReserve; + DWORD SizeOfStackCommit; + DWORD SizeOfHeapReserve; + DWORD SizeOfHeapCommit; + DWORD LoaderFlags; + DWORD NumberOfRvaAndSizes; + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; +} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32; typedef struct _IMAGE_OPTIONAL_HEADER64 { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - ULONGLONG ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Win32VersionValue; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - ULONGLONG SizeOfStackReserve; - ULONGLONG SizeOfStackCommit; - ULONGLONG SizeOfHeapReserve; - ULONGLONG SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; - + WORD Magic; + BYTE MajorLinkerVersion; + BYTE MinorLinkerVersion; + DWORD SizeOfCode; + DWORD SizeOfInitializedData; + DWORD SizeOfUninitializedData; + DWORD AddressOfEntryPoint; + DWORD BaseOfCode; + ULONGLONG ImageBase; + DWORD SectionAlignment; + DWORD FileAlignment; + WORD MajorOperatingSystemVersion; + WORD MinorOperatingSystemVersion; + WORD MajorImageVersion; + WORD MinorImageVersion; + WORD MajorSubsystemVersion; + WORD MinorSubsystemVersion; + DWORD Win32VersionValue; + DWORD SizeOfImage; + DWORD SizeOfHeaders; + DWORD CheckSum; + WORD Subsystem; + WORD DllCharacteristics; + ULONGLONG SizeOfStackReserve; + ULONGLONG SizeOfStackCommit; + ULONGLONG SizeOfHeapReserve; + ULONGLONG SizeOfHeapCommit; + DWORD LoaderFlags; + DWORD NumberOfRvaAndSizes; + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; +} IMAGE_OPTIONAL_HEADER64, *PIMAGE_OPTIONAL_HEADER64; #ifdef _TARGET_PE64 typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; @@ -163,195 +163,192 @@ #endif typedef struct _IMAGE_SECTION_HEADER { - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; - union { - DWORD PhysicalAddress; - DWORD VirtualSize; - } Misc; - DWORD VirtualAddress; - DWORD SizeOfRawData; - DWORD PointerToRawData; - DWORD PointerToRelocations; - DWORD PointerToLinenumbers; - WORD NumberOfRelocations; - WORD NumberOfLinenumbers; - DWORD Characteristics; -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; + BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; + union { + DWORD PhysicalAddress; + DWORD VirtualSize; + } Misc; + DWORD VirtualAddress; + DWORD SizeOfRawData; + DWORD PointerToRawData; + DWORD PointerToRelocations; + DWORD PointerToLinenumbers; + WORD NumberOfRelocations; + WORD NumberOfLinenumbers; + DWORD Characteristics; +} IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER; #pragma pack(push,4) typedef struct _IMAGE_BASE_RELOCATION { - DWORD VirtualAddress; - DWORD SizeOfBlock; - WORD TypeOffset[1]; -} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; + DWORD VirtualAddress; + DWORD SizeOfBlock; + WORD TypeOffset[1]; +} IMAGE_BASE_RELOCATION, *PIMAGE_BASE_RELOCATION; #pragma pack(pop) typedef struct { - USHORT f_magic; /* magic number */ - USHORT f_nscns; /* number of sections */ - ULONG f_timdat; /* time & date stamp */ - ULONG f_symptr; /* file pointer to symtab */ - ULONG f_nsyms; /* number of symtab entries */ - USHORT f_opthdr; /* sizeof(optional hdr) */ - USHORT f_flags; /* flags */ + USHORT f_magic; /* magic number */ + USHORT f_nscns; /* number of sections */ + ULONG f_timdat; /* time & date stamp */ + ULONG f_symptr; /* file pointer to symtab */ + ULONG f_nsyms; /* number of symtab entries */ + USHORT f_opthdr; /* sizeof(optional hdr) */ + USHORT f_flags; /* flags */ } FILHDR; typedef struct { - char s_name[8]; /* section name */ - ULONG s_paddr; /* physical address, aliased s_nlib */ - ULONG s_vaddr; /* virtual address */ - ULONG s_size; /* section size */ - ULONG s_scnptr; /* file ptr to raw data for section */ - ULONG s_relptr; /* file ptr to relocation */ - ULONG s_lnnoptr; /* file ptr to line numbers */ - USHORT s_nreloc; /* number of relocation entries */ - USHORT s_nlnno; /* number of line number entries */ - ULONG s_flags; /* flags */ + char s_name[8]; /* section name */ + ULONG s_paddr; /* physical address, aliased s_nlib */ + ULONG s_vaddr; /* virtual address */ + ULONG s_size; /* section size */ + ULONG s_scnptr; /* file ptr to raw data for section */ + ULONG s_relptr; /* file ptr to relocation */ + ULONG s_lnnoptr; /* file ptr to line numbers */ + USHORT s_nreloc; /* number of relocation entries */ + USHORT s_nlnno; /* number of line number entries */ + ULONG s_flags; /* flags */ } SCNHDR; #pragma pack(4) typedef struct _SYMBOLFILE_HEADER { - ULONG SymbolsOffset; - ULONG SymbolsLength; - ULONG StringsOffset; - ULONG StringsLength; + ULONG SymbolsOffset; + ULONG SymbolsLength; + ULONG StringsOffset; + ULONG StringsLength; } SYMBOLFILE_HEADER, *PSYMBOLFILE_HEADER; typedef struct _STAB_ENTRY { - ULONG n_strx; /* index into string table of name */ - UCHAR n_type; /* type of symbol */ - UCHAR n_other; /* misc info (usually empty) */ - USHORT n_desc; /* description field */ - ULONG n_value; /* value of symbol */ + ULONG n_strx; /* index into string table of name */ + UCHAR n_type; /* type of symbol */ + UCHAR n_other; /* misc info (usually empty) */ + USHORT n_desc; /* description field */ + ULONG n_value; /* value of symbol */ } STAB_ENTRY, *PSTAB_ENTRY; /* http://www.math.utah.edu/docs/info/stabs_12.html */ -#define N_GYSM 0x20 -#define N_FNAME 0x22 -#define N_FUN 0x24 -#define N_STSYM 0x26 -#define N_LCSYM 0x28 -#define N_MAIN 0x2A -#define N_PC 0x30 -#define N_NSYMS 0x32 -#define N_NOMAP 0x34 -#define N_RSYM 0x40 -#define N_M2C 0x42 -#define N_SLINE 0x44 -#define N_DSLINE 0x46 -#define N_BSLINE 0x48 -#define N_BROWS 0x48 -#define N_DEFD 0x4A -#define N_EHDECL 0x50 -#define N_MOD2 0x50 -#define N_CATCH 0x54 -#define N_SSYM 0x60 -#define N_SO 0x64 -#define N_LSYM 0x80 -#define N_BINCL 0x82 -#define N_SOL 0x84 -#define N_PSYM 0xA0 -#define N_EINCL 0xA2 -#define N_ENTRY 0xA4 -#define N_LBRAC 0xC0 -#define N_EXCL 0xC2 -#define N_SCOPE 0xC4 -#define N_RBRAC 0xE0 -#define N_BCOMM 0xE2 -#define N_ECOMM 0xE4 -#define N_ECOML 0xE8 -#define N_LENG 0xFE + +#define N_GYSM 0x20 +#define N_FNAME 0x22 +#define N_FUN 0x24 +#define N_STSYM 0x26 +#define N_LCSYM 0x28 +#define N_MAIN 0x2A +#define N_PC 0x30 +#define N_NSYMS 0x32 +#define N_NOMAP 0x34 +#define N_RSYM 0x40 +#define N_M2C 0x42 +#define N_SLINE 0x44 +#define N_DSLINE 0x46 +#define N_BSLINE 0x48 +#define N_BROWS 0x48 +#define N_DEFD 0x4A +#define N_EHDECL 0x50 +#define N_MOD2 0x50 +#define N_CATCH 0x54 +#define N_SSYM 0x60 +#define N_SO 0x64 +#define N_LSYM 0x80 +#define N_BINCL 0x82 +#define N_SOL 0x84 +#define N_PSYM 0xA0 +#define N_EINCL 0xA2 +#define N_ENTRY 0xA4 +#define N_LBRAC 0xC0 +#define N_EXCL 0xC2 +#define N_SCOPE 0xC4 +#define N_RBRAC 0xE0 +#define N_BCOMM 0xE2 +#define N_ECOMM 0xE4 +#define N_ECOML 0xE8 +#define N_LENG 0xFE /* COFF symbol table */ -#define E_SYMNMLEN 8 /* # characters in a symbol name */ -#define E_FILNMLEN 14 /* # characters in a file name */ -#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ - -#define N_BTMASK (0xf) -#define N_TMASK (0x30) -#define N_BTSHFT (4) -#define N_TSHIFT (2) +#define E_SYMNMLEN 8 /* # characters in a symbol name */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ + +#define N_BTMASK (0xf) +#define N_TMASK (0x30) +#define N_BTSHFT (4) +#define N_TSHIFT (2) /* derived types, in e_type */ -#define DT_NON (0) /* no derived type */ -#define DT_PTR (1) /* pointer */ -#define DT_FCN (2) /* function */ -#define DT_ARY (3) /* array */ - -#define BTYPE(x) ((x) & N_BTMASK) - -#define ISPTR(x) (((x) & N_TMASK) == (DT_PTR << N_BTSHFT)) -#define ISFCN(x) (((x) & N_TMASK) == (DT_FCN << N_BTSHFT)) -#define ISARY(x) (((x) & N_TMASK) == (DT_ARY << N_BTSHFT)) -#define ISTAG(x) ((x)==C_STRTAG||(x)==C_UNTAG||(x)==C_ENTAG) -#define DECREF(x) ((((x)>>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK)) - -#define C_EFCN 0xff /* physical end of function */ -#define C_NULL 0 -#define C_AUTO 1 /* automatic variable */ -#define C_EXT 2 /* external symbol */ -#define C_STAT 3 /* static */ -#define C_REG 4 /* register variable */ -#define C_EXTDEF 5 /* external definition */ -#define C_LABEL 6 /* label */ -#define C_ULABEL 7 /* undefined label */ -#define C_MOS 8 /* member of structure */ -#define C_ARG 9 /* function argument */ -#define C_STRTAG 10 /* structure tag */ -#define C_MOU 11 /* member of union */ -#define C_UNTAG 12 /* union tag */ -#define C_TPDEF 13 /* type definition */ -#define C_USTATIC 14 /* undefined static */ -#define C_ENTAG 15 /* enumeration tag */ -#define C_MOE 16 /* member of enumeration */ -#define C_REGPARM 17 /* register parameter */ -#define C_FIELD 18 /* bit field */ -#define C_AUTOARG 19 /* auto argument */ -#define C_LASTENT 20 /* dummy entry (end of block) */ -#define C_BLOCK 100 /* ".bb" or ".eb" */ -#define C_FCN 101 /* ".bf" or ".ef" */ -#define C_EOS 102 /* end of structure */ -#define C_FILE 103 /* file name */ -#define C_LINE 104 /* line # reformatted as symbol table entry */ -#define C_ALIAS 105 /* duplicate tag */ -#define C_HIDDEN 106 /* ext symbol in dmert public lib */ + +#define DT_NON (0) /* no derived type */ +#define DT_PTR (1) /* pointer */ +#define DT_FCN (2) /* function */ +#define DT_ARY (3) /* array */ + +#define BTYPE(x) ((x) & N_BTMASK) + +#define ISPTR(x) (((x) & N_TMASK) == (DT_PTR << N_BTSHFT)) +#define ISFCN(x) (((x) & N_TMASK) == (DT_FCN << N_BTSHFT)) +#define ISARY(x) (((x) & N_TMASK) == (DT_ARY << N_BTSHFT)) +#define ISTAG(x) ((x) == C_STRTAG || (x) == C_UNTAG || (x) == C_ENTAG) +#define DECREF(x) ((((x) >> N_TSHIFT) & ~N_BTMASK) | ((x) & N_BTMASK)) + +#define C_EFCN 0xff /* physical end of function */ +#define C_NULL 0 +#define C_AUTO 1 /* automatic variable */ +#define C_EXT 2 /* external symbol */ +#define C_STAT 3 /* static */ +#define C_REG 4 /* register variable */ +#define C_EXTDEF 5 /* external definition */ +#define C_LABEL 6 /* label */ +#define C_ULABEL 7 /* undefined label */ +#define C_MOS 8 /* member of structure */ +#define C_ARG 9 /* function argument */ +#define C_STRTAG 10 /* structure tag */ +#define C_MOU 11 /* member of union */ +#define C_UNTAG 12 /* union tag */ +#define C_TPDEF 13 /* type definition */ +#define C_USTATIC 14 /* undefined static */ +#define C_ENTAG 15 /* enumeration tag */ +#define C_MOE 16 /* member of enumeration */ +#define C_REGPARM 17 /* register parameter */ +#define C_FIELD 18 /* bit field */ +#define C_AUTOARG 19 /* auto argument */ +#define C_LASTENT 20 /* dummy entry (end of block) */ +#define C_BLOCK 100 /* ".bb" or ".eb" */ +#define C_FCN 101 /* ".bf" or ".ef" */ +#define C_EOS 102 /* end of structure */ +#define C_FILE 103 /* file name */ +#define C_LINE 104 /* line# reformatted as symbol table entry */ +#define C_ALIAS 105 /* duplicate tag */ +#define C_HIDDEN 106 /* ext symbol in dmert public lib */ #pragma pack(1) -typedef struct _COFF_SYMENT -{ - union - { - char e_name[E_SYMNMLEN]; - struct - { - ULONG e_zeroes; - ULONG e_offset; - } - e; - } - e; - ULONG e_value; - short e_scnum; - USHORT e_type; - UCHAR e_sclass; - UCHAR e_numaux; +typedef struct _COFF_SYMENT { + union { + char e_name[E_SYMNMLEN]; + struct { + ULONG e_zeroes; + ULONG e_offset; + } e; + } e; + ULONG e_value; + short e_scnum; + USHORT e_type; + UCHAR e_sclass; + UCHAR e_numaux; } COFF_SYMENT, *PCOFF_SYMENT; #pragma pack(4) typedef struct _ROSSYM_ENTRY { - ULONG_PTR Address; - ULONG FunctionOffset; - ULONG FileOffset; - ULONG SourceLine; + ULONG_PTR Address; + ULONG FunctionOffset; + ULONG FileOffset; + ULONG SourceLine; } ROSSYM_ENTRY, *PROSSYM_ENTRY; #define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1)) -extern char* -convert_path(const char* origpath); - -extern void* -load_file ( const char* file_name, size_t* file_size ); - -#endif/*RSYM_H*/ +extern char * +convert_path(const char *origpath); + +extern void * +load_file(const char *file_name, size_t *file_size); + +#endif /* RSYM_H */ Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=40652&… ============================================================================== --- trunk/reactos/tools/tools.mak [iso-8859-1] (original) +++ trunk/reactos/tools/tools.mak [iso-8859-1] Wed Apr 22 20:50:44 2009 @@ -43,10 +43,11 @@ include tools/bin2c.mak include tools/buildno/buildno.mak include tools/gendib/gendib.mak +include tools/log2lines.mak +include tools/nci/nci.mak ifeq ($(ARCH),powerpc) include tools/ofw_interface/ofw_interface.mak endif -include tools/nci/nci.mak include tools/pefixup.mak include tools/raddr2line.mak include tools/rbuild/rbuild.mak

1 0

[cwittich] 40651: sync advapi32/cred.c to wine 1.1.19
by cwittich＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: cwittich Date: Wed Apr 22 19:58:37 2009 New Revision: 40651 URL: http://svn.reactos.org/svn/reactos?rev=40651&view=rev Log: sync advapi32/cred.c to wine 1.1.19 Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Wed Apr 22 19:58:37 2009 @@ -67,7 +67,7 @@ struct ustring data; struct ustring key; - ret = RegQueryValueExW(hkey, wszPasswordValue, 0, &type, (LPVOID)credential_blob, + ret = RegQueryValueExW(hkey, wszPasswordValue, 0, &type, credential_blob, credential_blob_size); if (ret != ERROR_SUCCESS) return ret; @@ -161,10 +161,7 @@ ret = RegQueryValueExW(hkey, wszUserNameValue, 0, &type, (LPVOID)credential->UserName, &count); if (ret == ERROR_FILE_NOT_FOUND) - { credential->UserName = NULL; - ret = ERROR_SUCCESS; - } else if (ret != ERROR_SUCCESS) return ret; else if (type != REG_SZ) @@ -182,10 +179,7 @@ credential->CredentialBlob = (LPBYTE)buffer; ret = read_credential_blob(hkey, key_data, credential->CredentialBlob, &count); if (ret == ERROR_FILE_NOT_FOUND) - { credential->CredentialBlob = NULL; - ret = ERROR_SUCCESS; - } else if (ret != ERROR_SUCCESS) return ret; credential->CredentialBlobSize = count; @@ -459,7 +453,7 @@ data.Buffer = encrypted_credential_blob; SystemFunction032(&data, &key); - ret = RegSetValueExW(hkey, wszPasswordValue, 0, REG_BINARY, (LPVOID)encrypted_credential_blob, credential_blob_size); + ret = RegSetValueExW(hkey, wszPasswordValue, 0, REG_BINARY, encrypted_credential_blob, credential_blob_size); HeapFree(GetProcessHeap(), 0, encrypted_credential_blob); return ret; @@ -646,7 +640,7 @@ memcpy(key_data, my_key_data, KEY_SIZE); count = KEY_SIZE; - ret = RegQueryValueExW(hkeyMgr, wszEncryptionKeyValue, NULL, &type, (LPVOID)key_data, + ret = RegQueryValueExW(hkeyMgr, wszEncryptionKeyValue, NULL, &type, key_data, &count); if (ret == ERROR_SUCCESS) { @@ -667,14 +661,14 @@ *(DWORD *)(key_data + 4) = value; ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, - (LPVOID)key_data, KEY_SIZE); + key_data, KEY_SIZE); if (ret == ERROR_ACCESS_DENIED) { ret = open_cred_mgr_key(&hkeyMgr, TRUE); if (ret == ERROR_SUCCESS) { ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, - (LPVOID)key_data, KEY_SIZE); + key_data, KEY_SIZE); RegCloseKey(hkeyMgr); } }

1 0

[janderwald] 40650: - Add SMPlayer 0.6.7
by janderwald＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: janderwald Date: Wed Apr 22 19:22:46 2009 New Revision: 40650 URL: http://svn.reactos.org/svn/reactos?rev=40650&view=rev Log: - Add SMPlayer 0.6.7 Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Wed Apr 22 19:22:46 2009 @@ -172,6 +172,12 @@ </application> </category> <category name="Multimedia" icon="4"> + <application name="SMPlayer 0.6.7"> + <regname>smplayer</regname> + <version>0.6.7</version> + <description>SMPlayer</description> + <location>http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe</location> + </application> </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment">

1 0

[janderwald] 40649: - Increase importance of the audio dpc which finishes irps - Once one second of audio data has been buffered, always queue audio irps and dont complete them imediately. Greatly improves the playback of SMPlayer and probably many other audio players which act strictly on the timing of completed irps - Add debug traces when KsCreatePin fails
by janderwald＠svn.reactos.org 22 Apr '09

22 Apr '09

Author: janderwald Date: Wed Apr 22 19:01:18 2009 New Revision: 40649 URL: http://svn.reactos.org/svn/reactos?rev=40649&view=rev Log: - Increase importance of the audio dpc which finishes irps - Once one second of audio data has been buffered, always queue audio irps and dont complete them imediately. Greatly improves the playback of SMPlayer and probably many other audio players which act strictly on the timing of completed irps - Add debug traces when KsCreatePin fails Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Wed Apr 22 19:01:18 2009 @@ -30,6 +30,7 @@ ULONG CurrentOffset; LONG NumMappings; ULONG NumDataAvailable; + BOOL StartStream; KSPIN_CONNECT *ConnectDetails; PKSDATAFORMAT_WAVEFORMATEX DataFormat; @@ -159,6 +160,7 @@ Mapping->Header = (KSSTREAM_HEADER*)Buffer; Mapping->Irp = Irp; KeInitializeDpc(&Mapping->Dpc, DpcRoutine, (PVOID)Mapping); + KeSetImportanceDpc(&Mapping->Dpc, HighImportance); if (This->MaxFrameSize) { @@ -258,8 +260,14 @@ BOOL Result; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + if (This->StartStream) + return TRUE; + if (This->DataFormat->WaveFormatEx.nAvgBytesPerSec < This->NumDataAvailable) + { + This->StartStream = TRUE; Result = TRUE; + } else Result = FALSE; @@ -282,6 +290,7 @@ { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; + This->StartStream = FALSE; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Wed Apr 22 19:01:18 2009 @@ -203,13 +203,16 @@ This = (IPortPinWaveCyclicImpl*)Ctx->Pin; + IoFreeWorkItem(Ctx->WorkItem); + FreeItem(Ctx, TAG_PORTCLASS); + + if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)) + return; + /* Set the state to stop */ This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); /* Set internal state to stop */ This->State = KSSTATE_STOP; - - IoFreeWorkItem(Ctx->WorkItem); - FreeItem(Ctx, TAG_PORTCLASS); DPRINT1("Stopping %p %u Irql %u\n", This, This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), KeGetCurrentIrql()); } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Wed Apr 22 19:01:18 2009 @@ -263,13 +263,18 @@ Status = KsCreatePin(WorkerContext->Entry->Handle, MixerPinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); if (!NT_SUCCESS(Status)) { + /* This should not fail */ DPRINT1("KsCreatePin failed with %x\n", Status); - /* This should not fail */ - KeBugCheck(0); + DPRINT1(" InputFormat: SampleRate %u Bits %u Channels %u\n", InputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, InputFormat->WaveFormatEx.nChannels); + DPRINT1("OutputFormat: SampleRate %u Bits %u Channels %u\n", OutputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.nChannels); + + SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); + ExFreePool(WorkerContext->DispatchContext); + ExFreePool(MixerPinConnect); + IoFreeWorkItem(WorkerContext->WorkItem); + ExFreePool(WorkerContext); return; } - DPRINT(" InputFormat: SampleRate %u Bits %u Channels %u\n", InputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, InputFormat->WaveFormatEx.nChannels); - DPRINT("OutputFormat: SampleRate %u Bits %u Channels %u\n", OutputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.nChannels); } /* get pin file object */

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009