Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tfaber] 64782: [PING] - Remove a broken "optimization" CORE-7509 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 17 13:21:06 2014 New Revision: 64782 URL: http://svn.reactos.org/svn/reactos?rev=64782&view=rev Log: [PING] - Remove a broken "optimization" CORE-7509 #resolve Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/CMakeLists.txt [iso-8859-1] Fri Oct 17 13:21:06 2014 @@ -2,7 +2,7 @@ add_definitions(-D__USE_W32_SOCKETS) add_executable(ping ping.c ping.rc) set_module_type(ping win32cui UNICODE) -add_importlibs(ping ws2_32 msvcrt kernel32) +add_importlibs(ping user32 ws2_32 msvcrt kernel32) if(MSVC) add_importlibs(ping ntdll) endif() Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Fri Oct 17 13:21:06 2014 @@ -114,30 +114,6 @@ } #endif /* !NDEBUG */ -LPWSTR -MyLoadString(UINT uID) -{ - HRSRC hres; - HGLOBAL hResData; - WCHAR *pwsz; - UINT string_num, i; - - hres = FindResourceW(NULL, MAKEINTRESOURCEW((LOWORD(uID) >> 4) + 1), RT_STRING); - if (!hres) return NULL; - - hResData = LoadResource(NULL, hres); - if (!hResData) return NULL; - - pwsz = LockResource(hResData); - if (!pwsz) return NULL; - - string_num = uID & 15; - for (i = 0; i < string_num; i++) - pwsz += *pwsz + 1; - - return pwsz + 1; -} - void FormatOutput(UINT uID, ...) { va_list valist; @@ -146,15 +122,18 @@ CHAR AnsiBuf[1024]; LPWSTR pBuf = Buf; PCHAR pAnsiBuf = AnsiBuf; - LPWSTR Format; + WCHAR Format[1024]; DWORD written; UINT DataLength; int AnsiLength; va_start(valist, uID); - Format = MyLoadString(uID); - if (!Format) return; + if (!LoadString(GetModuleHandle(NULL), uID, + Format, sizeof(Format) / sizeof(WCHAR))) + { + return; + } DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING, Format, 0, 0, Buf,\ sizeof(Buf) / sizeof(WCHAR), &valist); @@ -272,7 +251,7 @@ if (i + 1 < argc) { DataSize = wcstoul(argv[++i], NULL, 0); - + if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET) - sizeof(IPv4_HEADER)) { FormatOutput(IDS_BAD_VALUE_OPTION_L, ICMP_MAXSIZE - \ @@ -484,7 +463,7 @@ } } -static VOID TimeToMsString(LPWSTR String, LARGE_INTEGER Time) +static VOID TimeToMsString(LPWSTR String, ULONG Length, LARGE_INTEGER Time) { WCHAR Convstr[40]; LARGE_INTEGER LargeTime; @@ -494,8 +473,8 @@ _i64tow(LargeTime.QuadPart, Convstr, 10); wcscpy(String, Convstr); - ms = MyLoadString(IDS_MS); - wcscat(String, ms); + ms = String + wcslen(String); + LoadString(GetModuleHandle(NULL), IDS_MS, ms, Length - (ms - String)); } /* Locate the ICMP data and print it. Returns TRUE if the packet was good, @@ -555,16 +534,13 @@ if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) { - LPWSTR ms1; - wcscpy(Sign, L"<"); - ms1 = MyLoadString(IDS_1MS); - wcscpy(Time, ms1); + LoadString(GetModuleHandle(NULL), IDS_1MS, Time, sizeof(Time) / sizeof(WCHAR)); } else { wcscpy(Sign, L"="); - TimeToMsString(Time, RelativeTime); + TimeToMsString(Time, sizeof(Time) / sizeof(WCHAR), RelativeTime); } @@ -740,9 +716,9 @@ if (!MinRTTSet) MinRTT = MaxRTT; - TimeToMsString(MinTime, MinRTT); - TimeToMsString(MaxTime, MaxRTT); - TimeToMsString(AvgTime, AvgRTT); + TimeToMsString(MinTime, sizeof(MinTime) / sizeof(WCHAR), MinRTT); + TimeToMsString(MaxTime, sizeof(MaxTime) / sizeof(WCHAR), MaxRTT); + TimeToMsString(AvgTime, sizeof(AvgTime) / sizeof(WCHAR), AvgRTT); /* Print statistics */ FormatOutput(IDS_PING_STATISTICS, TargetIP);

9 years, 11 months

[akhaldi] 64781: [KDCOM] * Use set_module_type() instead of combining set_entrypoint() and set_image_base().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 11:12:03 2014 New Revision: 64781 URL: http://svn.reactos.org/svn/reactos?rev=64781&view=rev Log: [KDCOM] * Use set_module_type() instead of combining set_entrypoint() and set_image_base(). Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Fri Oct 17 11:12:03 2014 @@ -12,10 +12,8 @@ kdcom.rc ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) -set_entrypoint(kdcom 0) +set_module_type(kdcom module IMAGEBASE 0x00010000) set_subsystem(kdcom native) -set_image_base(kdcom 0x00010000) - add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_dependencies(kdcom psdk bugcodes)

9 years, 11 months

[akhaldi] 64780: [CMAKE] * Fix IMAGEBASE handling.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 11:10:47 2014 New Revision: 64780 URL: http://svn.reactos.org/svn/reactos?rev=64780&view=rev Log: [CMAKE] * Fix IMAGEBASE handling. Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Oct 17 11:10:47 2014 @@ -618,7 +618,7 @@ #set base address if(__module_IMAGEBASE) - set_image_base(${MODULE} __module_IMAGEBASE) + set_image_base(${MODULE} ${__module_IMAGEBASE}) elseif(${TYPE} STREQUAL win32dll) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}})

9 years, 11 months

[akhaldi] 64779: [LIBXML2] * Update to v2.9.2. CORE-8642

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 10:58:01 2014 New Revision: 64779 URL: http://svn.reactos.org/svn/reactos?rev=64779&view=rev Log: [LIBXML2] * Update to v2.9.2. CORE-8642 Modified: trunk/reactos/include/reactos/libs/libxml/SAX2.h trunk/reactos/include/reactos/libs/libxml/entities.h trunk/reactos/include/reactos/libs/libxml/globals.h trunk/reactos/include/reactos/libs/libxml/relaxng.h trunk/reactos/include/reactos/libs/libxml/tree.h trunk/reactos/include/reactos/libs/libxml/xmlIO.h trunk/reactos/include/reactos/libs/libxml/xmlerror.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h trunk/reactos/lib/3rdparty/libxml2/COPYING trunk/reactos/lib/3rdparty/libxml2/ChangeLog trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c trunk/reactos/lib/3rdparty/libxml2/NEWS trunk/reactos/lib/3rdparty/libxml2/SAX2.c trunk/reactos/lib/3rdparty/libxml2/buf.c trunk/reactos/lib/3rdparty/libxml2/buf.h trunk/reactos/lib/3rdparty/libxml2/c14n.c trunk/reactos/lib/3rdparty/libxml2/catalog.c trunk/reactos/lib/3rdparty/libxml2/config.h trunk/reactos/lib/3rdparty/libxml2/debugXML.c trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h trunk/reactos/lib/3rdparty/libxml2/encoding.c trunk/reactos/lib/3rdparty/libxml2/entities.c trunk/reactos/lib/3rdparty/libxml2/hash.c trunk/reactos/lib/3rdparty/libxml2/include/win32config.h trunk/reactos/lib/3rdparty/libxml2/legacy.c trunk/reactos/lib/3rdparty/libxml2/nanoftp.c trunk/reactos/lib/3rdparty/libxml2/nanohttp.c trunk/reactos/lib/3rdparty/libxml2/parser.c trunk/reactos/lib/3rdparty/libxml2/parserInternals.c trunk/reactos/lib/3rdparty/libxml2/relaxng.c trunk/reactos/lib/3rdparty/libxml2/schematron.c trunk/reactos/lib/3rdparty/libxml2/threads.c trunk/reactos/lib/3rdparty/libxml2/timsort.h trunk/reactos/lib/3rdparty/libxml2/tree.c trunk/reactos/lib/3rdparty/libxml2/trio.c trunk/reactos/lib/3rdparty/libxml2/trio.h trunk/reactos/lib/3rdparty/libxml2/triodef.h trunk/reactos/lib/3rdparty/libxml2/triostr.c trunk/reactos/lib/3rdparty/libxml2/uri.c trunk/reactos/lib/3rdparty/libxml2/valid.c trunk/reactos/lib/3rdparty/libxml2/xinclude.c trunk/reactos/lib/3rdparty/libxml2/xlink.c trunk/reactos/lib/3rdparty/libxml2/xmlIO.c trunk/reactos/lib/3rdparty/libxml2/xmlcatalog.c trunk/reactos/lib/3rdparty/libxml2/xmllint.c trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c trunk/reactos/lib/3rdparty/libxml2/xmlmodule.c trunk/reactos/lib/3rdparty/libxml2/xmlreader.c trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c trunk/reactos/lib/3rdparty/libxml2/xmlschemastypes.c trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c trunk/reactos/lib/3rdparty/libxml2/xpath.c trunk/reactos/lib/3rdparty/libxml2/xpointer.c trunk/reactos/lib/3rdparty/libxml2/xzlib.c trunk/reactos/lib/3rdparty/libxml2/xzlib.h trunk/reactos/media/doc/3rd Party Files.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/libs/libxml/SAX2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/entities.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/relaxng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/tree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlIO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/COPYI… Modified: trunk/reactos/lib/3rdparty/libxml2/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Chang… Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLp… Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLt… Modified: trunk/reactos/lib/3rdparty/libxml2/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/NEWS?… Modified: trunk/reactos/lib/3rdparty/libxml2/SAX2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/SAX2.… Modified: trunk/reactos/lib/3rdparty/libxml2/buf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/buf.c… Modified: trunk/reactos/lib/3rdparty/libxml2/buf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/buf.h… Modified: trunk/reactos/lib/3rdparty/libxml2/c14n.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/c14n.… Modified: trunk/reactos/lib/3rdparty/libxml2/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/catal… Modified: trunk/reactos/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/debugXML.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/debug… Modified: trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/elfgc… Modified: trunk/reactos/lib/3rdparty/libxml2/encoding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/encod… Modified: trunk/reactos/lib/3rdparty/libxml2/entities.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/entit… Modified: trunk/reactos/lib/3rdparty/libxml2/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/hash.… Modified: trunk/reactos/lib/3rdparty/libxml2/include/win32config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/inclu… Modified: trunk/reactos/lib/3rdparty/libxml2/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/legac… Modified: trunk/reactos/lib/3rdparty/libxml2/nanoftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanof… Modified: trunk/reactos/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanoh… Modified: trunk/reactos/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/parserInternals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/relaxng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/relax… Modified: trunk/reactos/lib/3rdparty/libxml2/schematron.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/schem… Modified: trunk/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/threa… Modified: trunk/reactos/lib/3rdparty/libxml2/timsort.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/timso… Modified: trunk/reactos/lib/3rdparty/libxml2/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/tree.… Modified: trunk/reactos/lib/3rdparty/libxml2/trio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trio.… Modified: trunk/reactos/lib/3rdparty/libxml2/trio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trio.… Modified: trunk/reactos/lib/3rdparty/libxml2/triodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/triod… Modified: trunk/reactos/lib/3rdparty/libxml2/triostr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trios… Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c… Modified: trunk/reactos/lib/3rdparty/libxml2/valid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/valid… Modified: trunk/reactos/lib/3rdparty/libxml2/xinclude.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xincl… Modified: trunk/reactos/lib/3rdparty/libxml2/xlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xlink… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlIO… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlca… Modified: trunk/reactos/lib/3rdparty/libxml2/xmllint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlli… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlme… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlmo… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsc… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlschemastypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsc… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlwr… Modified: trunk/reactos/lib/3rdparty/libxml2/xpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpath… Modified: trunk/reactos/lib/3rdparty/libxml2/xpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpoin… Modified: trunk/reactos/lib/3rdparty/libxml2/xzlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xzlib… Modified: trunk/reactos/lib/3rdparty/libxml2/xzlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xzlib… Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…

9 years, 11 months

[tfaber] 64778: [NPFS] - Arch, pool tags are specified in reverse order

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 17 10:04:57 2014 New Revision: 64778 URL: http://svn.reactos.org/svn/reactos?rev=64778&view=rev Log: [NPFS] - Arch, pool tags are specified in reverse order Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Fri Oct 17 10:04:57 2014 @@ -50,18 +50,18 @@ // NpFs - npfs.sys - Client security context // NpFw - npfs.sys - Write block // NpFW - npfs.sys - Write block -#define NPFS_CCB_TAG 'NpFc' -#define NPFS_ROOT_DCB_CCB_TAG 'NpFC' -#define NPFS_DCB_TAG 'NpFD' -#define NPFS_FCB_TAG 'NpFf' -#define NPFS_GLOBAL_TAG 'NpFg' -#define NPFS_CLIENT_INFO_TAG 'NpFi' -#define NPFS_NAME_BLOCK_TAG 'NpFn' -#define NPFS_QUERY_TEMPLATE_TAG 'NpFq' -#define NPFS_DATA_ENTRY_TAG 'NpFr' -#define NPFS_CLIENT_SEC_CTX_TAG 'NpFs' -#define NPFS_WAIT_BLOCK_TAG 'NpFt' -#define NPFS_WRITE_BLOCK_TAG 'NpFw' +#define NPFS_CCB_TAG 'cFpN' +#define NPFS_ROOT_DCB_CCB_TAG 'CFpN' +#define NPFS_DCB_TAG 'DFpN' +#define NPFS_FCB_TAG 'fFpN' +#define NPFS_GLOBAL_TAG 'gFpN' +#define NPFS_CLIENT_INFO_TAG 'iFpN' +#define NPFS_NAME_BLOCK_TAG 'nFpN' +#define NPFS_QUERY_TEMPLATE_TAG 'qFpN' +#define NPFS_DATA_ENTRY_TAG 'rFpN' +#define NPFS_CLIENT_SEC_CTX_TAG 'sFpN' +#define NPFS_WAIT_BLOCK_TAG 'tFpN' +#define NPFS_WRITE_BLOCK_TAG 'wFpN' // // NPFS bugchecking support

9 years, 11 months

[akhaldi] 64777: [WIN32K] * Workaround for CORE-8525, CORE-6023, CORE-7735 and CORE-8635. * Brought to you by V and Amine. Thanks to Timo and Jerome for the reviews. CORE-8525 CORE-6023 CORE-7735 C...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 07:59:29 2014 New Revision: 64777 URL: http://svn.reactos.org/svn/reactos?rev=64777&view=rev Log: [WIN32K] * Workaround for CORE-8525, CORE-6023, CORE-7735 and CORE-8635. * Brought to you by V and Amine. Thanks to Timo and Jerome for the reviews. CORE-8525 CORE-6023 CORE-7735 CORE-8635 #comment Please retest with r64777 or later. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Oct 17 07:59:29 2014 @@ -2664,15 +2664,42 @@ Status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); if (NT_SUCCESS(Status)) { + static const UNICODE_STRING MarlettFaceNameW = RTL_CONSTANT_STRING(L"Marlett"); + static const UNICODE_STRING SymbolFaceNameW = RTL_CONSTANT_STRING(L"Symbol"); + static const UNICODE_STRING VGAFaceNameW = RTL_CONSTANT_STRING(L"VGA"); + if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) { EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; } - if (0 == RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE)) + + if (!RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE)) { Score += 49; } + + /* FIXME: this is a work around to counter weird fonts on weird places. + A proper fix would be to score fonts on more attributes than + the ones in this function */ + if (!RtlCompareUnicodeString(&MarlettFaceNameW, &EntryFaceNameW, TRUE) && + RtlCompareUnicodeString(&MarlettFaceNameW, FaceName, TRUE)) + { + Score = 0; + } + + if (!RtlCompareUnicodeString(&SymbolFaceNameW, &EntryFaceNameW, TRUE) && + RtlCompareUnicodeString(&SymbolFaceNameW, FaceName, TRUE)) + { + Score = 0; + } + + if (!RtlCompareUnicodeString(&VGAFaceNameW, &EntryFaceNameW, TRUE) && + RtlCompareUnicodeString(&VGAFaceNameW, FaceName, TRUE)) + { + Score = 0; + } + RtlFreeUnicodeString(&EntryFaceNameW); }

9 years, 11 months

[pschweitzer] 64776: [NTFS] Bugfixing... Part 3/X: - Really release the allocated memory in NtfsFindFileAt() and NtfsLookupFileAt(). Don't attempt to release caller pointer! This fixes crashes on d...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Oct 17 06:55:52 2014 New Revision: 64776 URL: http://svn.reactos.org/svn/reactos?rev=64776&view=rev Log: [NTFS] Bugfixing... Part 3/X: - Really release the allocated memory in NtfsFindFileAt() and NtfsLookupFileAt(). Don't attempt to release caller pointer! This fixes crashes on directory enumeration failure. Even though this latter still doesn't work. Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Fri Oct 17 06:55:52 2014 @@ -397,6 +397,8 @@ { ULONGLONG BytesRead; + DPRINT1("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + BytesRead = ReadAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (PCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord); if (BytesRead != Vcb->NtfsInfo.BytesPerFileRecord) { @@ -714,7 +716,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtfsLookupFileAt: Can't read MFT record\n"); - ExFreePoolWithTag(FileRecord, TAG_NTFS); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); return Status; } @@ -724,7 +726,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtfsLookupFileAt: Can't find data attribute\n"); - ExFreePoolWithTag(FileRecord, TAG_NTFS); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); return Status; } @@ -775,7 +777,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtfsFindFileAt: Can't read MFT record\n"); - ExFreePoolWithTag(FileRecord, TAG_NTFS); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); return Status; } @@ -785,7 +787,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtfsFindFileAt: Can't find data attribute\n"); - ExFreePoolWithTag(FileRecord, TAG_NTFS); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); return Status; }

9 years, 11 months

[hbelusca] 64775: [FAST486]: Use psh/poppack.h here too.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Oct 17 02:31:14 2014 New Revision: 64775 URL: http://svn.reactos.org/svn/reactos?rev=64775&view=rev Log: [FAST486]: Use psh/poppack.h here too. Modified: trunk/reactos/lib/fast486/common.h Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Fri Oct 17 02:31:14 2014 @@ -85,7 +85,7 @@ }; } FAST486_MOD_REG_RM, *PFAST486_MOD_REG_RM; -#pragma pack(push, 1) +#include <pshpack1.h> typedef union _FAST486_PAGE_DIR { @@ -128,7 +128,7 @@ C_ASSERT(sizeof(FAST486_PAGE_DIR) == sizeof(ULONG)); -#pragma pack(pop) +#include <poppack.h> /* FUNCTIONS ******************************************************************/

9 years, 11 months

[hbelusca] 64774: [FAST486]: rename some structs and use #include <pshpack/poppack.h> for portability purposes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Oct 17 02:29:48 2014 New Revision: 64774 URL: http://svn.reactos.org/svn/reactos?rev=64774&view=rev Log: [FAST486]: rename some structs and use #include <pshpack/poppack.h> for portability purposes. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Oct 17 02:29:48 2014 @@ -261,14 +261,14 @@ ULONG Base; } FAST486_SEG_REG, *PFAST486_SEG_REG; -typedef struct +typedef struct _FAST486_LDT_REG { USHORT Selector; ULONG Base; ULONG Limit; -} FAST486_LDT_REG; - -typedef struct +} FAST486_LDT_REG, *PFAST486_LDT_REG; + +typedef struct _FAST486_TASK_REG { USHORT Selector; ULONG Base; @@ -276,7 +276,7 @@ BOOLEAN Busy; } FAST486_TASK_REG, *PFAST486_TASK_REG; -#pragma pack(push, 1) +#include <pshpack1.h> typedef struct { @@ -350,7 +350,7 @@ /* Verify the structure size */ C_ASSERT(sizeof(FAST486_IDT_ENTRY) == sizeof(ULONGLONG)); -#pragma pack(pop) +#include <poppack.h> typedef struct _FAST486_TABLE_REG {

9 years, 11 months

[hbelusca] 64773: [FAST486]: Do not call RtlCopyMemory for copying few bytes (2 and 4).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Oct 16 21:48:18 2014 New Revision: 64773 URL: http://svn.reactos.org/svn/reactos?rev=64773&view=rev Log: [FAST486]: Do not call RtlCopyMemory for copying few bytes (2 and 4). Modified: trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opgroups.c Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Thu Oct 16 21:48:18 2014 @@ -117,7 +117,6 @@ Fast486MemReadCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); - RtlMoveMemory(Buffer, (PVOID)Address, Size); } @@ -126,7 +125,6 @@ Fast486MemWriteCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); - RtlMoveMemory((PVOID)Address, Buffer, Size); } Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Thu Oct 16 21:48:18 2014 @@ -2016,6 +2016,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F01) { + // FAST486_TABLE_REG TableReg; UCHAR TableReg[6]; FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; @@ -2054,8 +2055,9 @@ } /* Fill the 6-byte table register */ - RtlCopyMemory(TableReg, &State->Gdtr.Size, sizeof(USHORT)); - RtlCopyMemory(&TableReg[sizeof(USHORT)], &State->Gdtr.Address, sizeof(ULONG)); + // TableReg = State->Gdtr; + *((PUSHORT)&TableReg) = State->Gdtr.Size; + *((PULONG)&TableReg[sizeof(USHORT)]) = State->Gdtr.Address; /* Store the GDTR */ return Fast486WriteMemory(State, @@ -2076,8 +2078,9 @@ } /* Fill the 6-byte table register */ - RtlCopyMemory(TableReg, &State->Idtr.Size, sizeof(USHORT)); - RtlCopyMemory(&TableReg[sizeof(USHORT)], &State->Idtr.Address, sizeof(ULONG)); + // TableReg = State->Idtr; + *((PUSHORT)&TableReg) = State->Idtr.Size; + *((PULONG)&TableReg[sizeof(USHORT)]) = State->Idtr.Address; /* Store the IDTR */ return Fast486WriteMemory(State, @@ -2117,7 +2120,8 @@ } /* Load the new GDT */ - State->Gdtr.Size = *((PUSHORT)TableReg); + // State->Gdtr = TableReg; + State->Gdtr.Size = *((PUSHORT)&TableReg); State->Gdtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); /* In 16-bit mode the highest byte is masked out */ @@ -2156,7 +2160,8 @@ } /* Load the new IDT */ - State->Idtr.Size = *((PUSHORT)TableReg); + // State->Idtr = TableReg; + State->Idtr.Size = *((PUSHORT)&TableReg); State->Idtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); /* In 16-bit mode the highest byte is masked out */

9 years, 11 months

← Newer
1
...
36
37
38
39
40
41
42
...
73
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 October 2014