Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 08/12: [DXG] Define GUIDs only once

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a78dd4b3158cd535d561… commit 3a78dd4b3158cd535d561e7a95fbb55863a1a669 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:37:56 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [DXG] Define GUIDs only once --- win32ss/reactx/dxg/dxg_int.h | 1 - win32ss/reactx/dxg/main.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/win32ss/reactx/dxg/dxg_int.h b/win32ss/reactx/dxg/dxg_int.h index fa9c3170a8..b2dd3b7d4d 100644 --- a/win32ss/reactx/dxg/dxg_int.h +++ b/win32ss/reactx/dxg/dxg_int.h @@ -19,7 +19,6 @@ #include <wingdi.h> #include <winddi.h> #include <ddkernel.h> -#include <initguid.h> #include <ddrawi.h> #include <ntgdityp.h> #include <psfuncs.h> diff --git a/win32ss/reactx/dxg/main.c b/win32ss/reactx/dxg/main.c index 7bcd329b9e..deeb49260c 100644 --- a/win32ss/reactx/dxg/main.c +++ b/win32ss/reactx/dxg/main.c @@ -8,6 +8,20 @@ * 15/10-2007 Magnus Olsen */ +#include <ntifs.h> + +/* Win32 Headers */ +#define WINBASEAPI +#define STARTF_USESIZE 2 +#define STARTF_USEPOSITION 4 +#define INTERNAL_CALL NTAPI +#define NT_BUILD_ENVIRONMENT + +#include <windef.h> +#include <winerror.h> +#include <wingdi.h> +#include <winddi.h> +#include <initguid.h> #include <dxg_int.h> #include "dxg_driver.h"

5 years, 6 months

[reactos] 07/12: [UDFS] Really use 'logical or' when meant to

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12c70fb4cf17ab6a6d7a2… commit 12c70fb4cf17ab6a6d7a246eb210e88f54546b20 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 31 08:39:22 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [UDFS] Really use 'logical or' when meant to 'binary or' was also working, but it is less clear. --- drivers/filesystems/udfs/Include/wcache_lib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/Include/wcache_lib.cpp b/drivers/filesystems/udfs/Include/wcache_lib.cpp index b00dc50357..e23ae295de 100644 --- a/drivers/filesystems/udfs/Include/wcache_lib.cpp +++ b/drivers/filesystems/udfs/Include/wcache_lib.cpp @@ -1113,7 +1113,7 @@ WCacheUpdatePacket( // If we didn't read packet from media, we can't // perform comparison to assure that packet was really modified. // Thus, assume that it is modified in this case. - mod = !read | Cache->DoNotCompare; + mod = !read || Cache->DoNotCompare; Lba0 = Lba - firstLba; for(i=0; i<PSs; i++, Lba0++) { if( WCacheGetModFlag(block_array, Lba0) ||

5 years, 6 months

[reactos] 06/12: [EXT2] Correctly zero memory before using it

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76910c358f7197a6b8e28… commit 76910c358f7197a6b8e283ea267faf7b5c1812ff Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 23:06:27 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [EXT2] Correctly zero memory before using it --- drivers/filesystems/ext2/src/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/filesystems/ext2/src/memory.c b/drivers/filesystems/ext2/src/memory.c index 8915dfeccb..cf569f40cd 100644 --- a/drivers/filesystems/ext2/src/memory.c +++ b/drivers/filesystems/ext2/src/memory.c @@ -2072,9 +2072,9 @@ Ext2ParseRegistryVolumeParams( USHORT i, j, k; - RtlZeroMemory(Codepage, CODEPAGE_MAXLEN); - RtlZeroMemory(Prefix, HIDINGPAT_LEN); - RtlZeroMemory(Suffix, HIDINGPAT_LEN); + RtlZeroMemory(Codepage, sizeof(WCHAR) * CODEPAGE_MAXLEN); + RtlZeroMemory(Prefix, sizeof(WCHAR) * HIDINGPAT_LEN); + RtlZeroMemory(Suffix, sizeof(WCHAR) * HIDINGPAT_LEN); RtlZeroMemory(MountPoint, sizeof(USHORT) * 4); RtlZeroMemory(DrvLetter, sizeof(CHAR) * 4);

5 years, 6 months

[reactos] 05/12: [CRT] Correctly share get_ioinfo()/release_ioinfo() functions between code units

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8719ee865e429b130ee3… commit c8719ee865e429b130ee3823c3c981c23aeafe05 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:33:33 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [CRT] Correctly share get_ioinfo()/release_ioinfo() functions between code units This fixes the following compiler errors: ../sdk/lib/crt/stdio/stat64.c:7:13: error: inline function 'release_ioinfo' declared but never defined [-Werror] inline void release_ioinfo(ioinfo *info); ^~~~~~~~~~~~~~ ../sdk/lib/crt/stdio/stat64.c:6:16: error: inline function 'get_ioinfo' declared but never defined [-Werror] inline ioinfo* get_ioinfo(int fd); ^~~~~~~~~~ ../sdk/lib/crt/stdio/file.c:186:5: error: 'init_ioinfo_cs' is static but used in inline function 'get_ioinfo' which is not static [-Werror] init_ioinfo_cs(ret); ^~~~~~~~~~~~~~ ../sdk/lib/crt/stdio/file.c:183:19: error: 'get_ioinfo_nolock' is static but used in inline function 'get_ioinfo' which is not static [-Werror] ioinfo *ret = get_ioinfo_nolock(fd); --- sdk/lib/crt/stdio/file.c | 4 ++-- sdk/lib/crt/stdio/stat64.c | 4 ++-- sdk/lib/crt/time/futime.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/lib/crt/stdio/file.c b/sdk/lib/crt/stdio/file.c index 2357d99bfc..0793a3fffa 100644 --- a/sdk/lib/crt/stdio/file.c +++ b/sdk/lib/crt/stdio/file.c @@ -178,7 +178,7 @@ static inline void init_ioinfo_cs(ioinfo *info) } } -/*static*/ inline ioinfo* get_ioinfo(int fd) +ioinfo* get_ioinfo(int fd) { ioinfo *ret = get_ioinfo_nolock(fd); if(ret == &__badioinfo) @@ -260,7 +260,7 @@ static inline ioinfo* get_ioinfo_alloc(int *fd) return &__badioinfo; } -/*static*/ inline void release_ioinfo(ioinfo *info) +void release_ioinfo(ioinfo *info) { if(info!=&__badioinfo && info->exflag & EF_CRIT_INIT) LeaveCriticalSection(&info->crit); diff --git a/sdk/lib/crt/stdio/stat64.c b/sdk/lib/crt/stdio/stat64.c index 26feb528a5..b0791c5700 100644 --- a/sdk/lib/crt/stdio/stat64.c +++ b/sdk/lib/crt/stdio/stat64.c @@ -3,8 +3,8 @@ #include <direct.h> #include <internal/wine/msvcrt.h> -inline ioinfo* get_ioinfo(int fd); -inline void release_ioinfo(ioinfo *info); +ioinfo* get_ioinfo(int fd); +void release_ioinfo(ioinfo *info); #define ALL_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) #define ALL_S_IWRITE (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) diff --git a/sdk/lib/crt/time/futime.c b/sdk/lib/crt/time/futime.c index 535012c05e..3c6a20409a 100644 --- a/sdk/lib/crt/time/futime.c +++ b/sdk/lib/crt/time/futime.c @@ -41,8 +41,8 @@ #include "bitsfixup.h" #include <internal/wine/msvcrt.h> -inline ioinfo* get_ioinfo(int fd); -inline void release_ioinfo(ioinfo *info); +ioinfo* get_ioinfo(int fd); +void release_ioinfo(ioinfo *info); /****************************************************************************** * \name _futime

5 years, 6 months

[reactos] 04/12: [SDK] Fix compilation error

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3e2a547897d28754668b… commit c3e2a547897d28754668baa4ffde00a2cf3db658 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:49:16 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [SDK] Fix compilation error ../sdk/include/reactos/rosctrls.h:283:59: error: no matching function for call to 'CToolbar<TItemData>::SendMessageW(int, HWND__*&, int)' return SendMessageW(TB_SETTOOLTIPS, hWndTooltip, 0); ../sdk/include/psdk/winuser.h:5543:21: note: candidate: LRESULT ATL::CWindow::SendMessageW(UINT, WPARAM, LPARAM) <near match> ../sdk/include/psdk/winuser.h:5543:21: note: conversion of argument 2 would be ill-formed --- sdk/include/reactos/rosctrls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/rosctrls.h index 6d3481a042..e81a0c4cfb 100644 --- a/sdk/include/reactos/rosctrls.h +++ b/sdk/include/reactos/rosctrls.h @@ -280,7 +280,7 @@ public: // Configuration methods DWORD SetTooltip(HWND hWndTooltip) { - return SendMessageW(TB_SETTOOLTIPS, hWndTooltip, 0); + return SendMessageW(TB_SETTOOLTIPS, reinterpret_cast<WPARAM>(hWndTooltip), 0); } INT GetHotItem()

5 years, 6 months

[reactos] 03/12: [FREELDR] Prevent a warning in Xbox memory initialization

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a15160cd4550bd19b53c6… commit a15160cd4550bd19b53c6cfc6de451a2bc8c24cd Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 31 10:30:45 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [FREELDR] Prevent a warning in Xbox memory initialization --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 74a9b444c2..1030710479 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -195,6 +195,10 @@ if(USE_CLANG_CL) # We need to reduce the binary size add_target_compile_flags(freeldr_common "/Os") endif() +if(NOT MSVC AND ARCH STREQUAL "i386") + # Prevent a warning when doing a memcmp with address 0 + set_source_files_properties(arch/i386/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") +endif() set(PCH_SOURCE ${FREELDR_BOOTLIB_SOURCE}

5 years, 6 months

[reactos] 02/12: [CMAKE] Add -fno-aggressive-loop-optimizations flag

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95671c25ecbec6d69f7e5… commit 95671c25ecbec6d69f7e55d9a7f74707798154fd Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 31 08:40:36 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [CMAKE] Add -fno-aggressive-loop-optimizations flag ReactOS/Windows headers contain lots of structures whose last field is fieldName[ANYSIZE] or fieldName[1]. Starting with GCC 4.8, gcc considers that accessing items [2], [3], ... are undefined operation, and may optimize those accesses by removing them! Add flag -fno-aggressive-loop-optimizations to prevent this unwanted behaviour. --- sdk/cmake/gcc.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 4c83f508f7..bd29a0f98e 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -46,6 +46,7 @@ add_compile_flags("-nostdinc") if(GCC_VERSION VERSION_GREATER 4.7) add_compile_flags("-mstackrealign") + add_compile_flags("-fno-aggressive-loop-optimizations") endif() if(CMAKE_C_COMPILER_ID STREQUAL "Clang")

5 years, 6 months

[reactos] 01/12: [PSDK] Remove throw specifiers, deprecated in C++11

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6668178cff88e04a9fe39… commit 6668178cff88e04a9fe3933d52b887040cf90ccc Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:30:22 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [PSDK] Remove throw specifiers, deprecated in C++11 --- dll/win32/framedyn/chstring.cpp | 98 ++++++++++++++++++++--------------------- sdk/include/psdk/chstring.h | 98 ++++++++++++++++++++--------------------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/dll/win32/framedyn/chstring.cpp b/dll/win32/framedyn/chstring.cpp index f8779c0b27..59bbec6cfa 100644 --- a/dll/win32/framedyn/chstring.cpp +++ b/dll/win32/framedyn/chstring.cpp @@ -107,7 +107,7 @@ CHString::CHString() /* * @implemented */ -CHString::CHString(WCHAR ch, int nRepeat) throw (CHeap_Exception) +CHString::CHString(WCHAR ch, int nRepeat) { // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -131,7 +131,7 @@ CHString::CHString(WCHAR ch, int nRepeat) throw (CHeap_Exception) /* * @implemented */ -CHString::CHString(LPCWSTR lpsz) throw (CHeap_Exception) +CHString::CHString(LPCWSTR lpsz) { // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -154,7 +154,7 @@ CHString::CHString(LPCWSTR lpsz) throw (CHeap_Exception) /* * @implemented */ -CHString::CHString(LPCWSTR lpch, int nLength) throw (CHeap_Exception) +CHString::CHString(LPCWSTR lpch, int nLength) { // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -171,7 +171,7 @@ CHString::CHString(LPCWSTR lpch, int nLength) throw (CHeap_Exception) /* * @implemented */ -CHString::CHString(LPCSTR lpsz) throw (CHeap_Exception) +CHString::CHString(LPCSTR lpsz) { // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -250,7 +250,7 @@ CHString::~CHString() /* * @implemented */ -void CHString::AllocBeforeWrite(int nLen) throw (CHeap_Exception) +void CHString::AllocBeforeWrite(int nLen) { // In case we have several strings pointing to our memory zone // Or we need bigger buffer than actual @@ -266,7 +266,7 @@ void CHString::AllocBeforeWrite(int nLen) throw (CHeap_Exception) /* * @implemented */ -void CHString::AllocBuffer(int nSize) throw (CHeap_Exception) +void CHString::AllocBuffer(int nSize) { // Here we have to allocate a buffer for the string // It actually consists in: CHStringData structure @@ -316,7 +316,7 @@ void CHString::AllocBuffer(int nSize) throw (CHeap_Exception) /* * @implemented */ -void CHString::AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtraLen) const throw (CHeap_Exception) +void CHString::AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtraLen) const { // Once again, we cannot deal with negative lens if (nCopyLen < 0) @@ -354,7 +354,7 @@ void CHString::AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtr /* * @implemented */ -BSTR CHString::AllocSysString() const throw (CHeap_Exception) +BSTR CHString::AllocSysString() const { BSTR SysString; @@ -371,7 +371,7 @@ BSTR CHString::AllocSysString() const throw (CHeap_Exception) /* * @implemented */ -void CHString::AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) throw (CHeap_Exception) +void CHString::AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) { // Don't allow negative len if (nSrcLen < 0) @@ -476,7 +476,7 @@ void CHString::ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData) /* * @implemented */ -void CHString::ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data) throw (CHeap_Exception) +void CHString::ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data) { int TotalLen; @@ -502,7 +502,7 @@ void CHString::ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCW /* * @implemented */ -void CHString::CopyBeforeWrite() throw (CHeap_Exception) +void CHString::CopyBeforeWrite() { CHStringData* Data; @@ -609,7 +609,7 @@ int CHString::FindOneOf(LPCWSTR lpszCharSet) const /* * @implemented */ -void CHString::Format(UINT nFormatID, ...) throw (CHeap_Exception) +void CHString::Format(UINT nFormatID, ...) { // Deprecated and not implemented any longer - well, this is its implementation return; @@ -618,7 +618,7 @@ void CHString::Format(UINT nFormatID, ...) throw (CHeap_Exception) /* * @implemented */ -void CHString::Format(LPCWSTR lpszFormat, ...) throw (CHeap_Exception) +void CHString::Format(LPCWSTR lpszFormat, ...) { // Forward to FormatV va_list ArgsList; @@ -631,7 +631,7 @@ void CHString::Format(LPCWSTR lpszFormat, ...) throw (CHeap_Exception) /* * @implemented */ -void CHString::FormatMessageW(UINT nFormatID, ...) throw (CHeap_Exception) +void CHString::FormatMessageW(UINT nFormatID, ...) { // Deprecated and not implemented any longer - well, this is its implementation return; @@ -640,7 +640,7 @@ void CHString::FormatMessageW(UINT nFormatID, ...) throw (CHeap_Exception) /* * @unimplemented */ -void CHString::FormatMessageW(LPCWSTR lpszFormat, ...) throw (CHeap_Exception) +void CHString::FormatMessageW(LPCWSTR lpszFormat, ...) { UNIMPLEMENTED; } @@ -656,7 +656,7 @@ void CHString::FormatV(LPCWSTR lpszFormat, va_list argList) /* * @implemented */ -void CHString::FreeExtra() throw (CHeap_Exception) +void CHString::FreeExtra() { CHStringData* OldData; @@ -695,7 +695,7 @@ WCHAR CHString::GetAt(int nIndex) const /* * @implemented */ -LPWSTR CHString::GetBuffer(int nMinBufLength) throw (CHeap_Exception) +LPWSTR CHString::GetBuffer(int nMinBufLength) { LPWSTR OldBuffer = m_pchData; @@ -730,7 +730,7 @@ LPWSTR CHString::GetBuffer(int nMinBufLength) throw (CHeap_Exception) /* * @implemented */ -LPWSTR CHString::GetBufferSetLength(int nNewLength) throw (CHeap_Exception) +LPWSTR CHString::GetBufferSetLength(int nNewLength) { // Get a buffer big enough // We don't care about the return, it will be set in the string @@ -783,7 +783,7 @@ BOOL CHString::IsEmpty() const /* * @implemented */ -CHString CHString::Left(int nCount) const throw (CHeap_Exception) +CHString CHString::Left(int nCount) const { CHString NewString; @@ -804,7 +804,7 @@ CHString CHString::Left(int nCount) const throw (CHeap_Exception) /* * @implemented */ -int CHString::LoadStringW(UINT nID) throw (CHeap_Exception) +int CHString::LoadStringW(UINT nID) { // Deprecated and not implemented any longer - well, this is its implementation return 0; @@ -813,7 +813,7 @@ int CHString::LoadStringW(UINT nID) throw (CHeap_Exception) /* * @implemented */ -int CHString::LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) throw (CHeap_Exception) +int CHString::LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) { // Deprecated and not implemented any longer - well, this is its implementation return 0; @@ -836,7 +836,7 @@ LPWSTR CHString::LockBuffer() /* * @implemented */ -void CHString::MakeLower() throw (CHeap_Exception) +void CHString::MakeLower() { // We'll modify string, duplicate it first if needed CopyBeforeWrite(); @@ -848,7 +848,7 @@ void CHString::MakeLower() throw (CHeap_Exception) /* * @implemented */ -void CHString::MakeReverse() throw (CHeap_Exception) +void CHString::MakeReverse() { // We'll modify string, duplicate it first if needed CopyBeforeWrite(); @@ -860,7 +860,7 @@ void CHString::MakeReverse() throw (CHeap_Exception) /* * @implemented */ -void CHString::MakeUpper() throw (CHeap_Exception) +void CHString::MakeUpper() { // We'll modify string, duplicate it first if needed CopyBeforeWrite(); @@ -872,7 +872,7 @@ void CHString::MakeUpper() throw (CHeap_Exception) /* * @implemented */ -CHString CHString::Mid(int nFirst) const throw (CHeap_Exception) +CHString CHString::Mid(int nFirst) const { // Take string from nFirst up to the end return Mid(nFirst, GetData()->nDataLength - nFirst); @@ -881,7 +881,7 @@ CHString CHString::Mid(int nFirst) const throw (CHeap_Exception) /* * @implemented */ -CHString CHString::Mid(int nFirst, int nCount) const throw (CHeap_Exception) +CHString CHString::Mid(int nFirst, int nCount) const { CHString NewString; @@ -958,7 +958,7 @@ void WINAPI CHString::Release(CHStringData* pData) /* * @implemented */ -void CHString::ReleaseBuffer(int nNewLength) throw (CHeap_Exception) +void CHString::ReleaseBuffer(int nNewLength) { CHStringData* Data; @@ -999,7 +999,7 @@ int CHString::ReverseFind(WCHAR ch) const /* * @implemented */ -CHString CHString::Right(int nCount) const throw (CHeap_Exception) +CHString CHString::Right(int nCount) const { CHString NewString; @@ -1037,7 +1037,7 @@ int CHString::SafeStrlen(LPCWSTR lpsz) /* * @implemented */ -void CHString::SetAt(int nIndex, WCHAR ch) throw (CHeap_Exception) +void CHString::SetAt(int nIndex, WCHAR ch) { CopyBeforeWrite(); @@ -1047,7 +1047,7 @@ void CHString::SetAt(int nIndex, WCHAR ch) throw (CHeap_Exception) /* * @implemented */ -CHString CHString::SpanExcluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception) +CHString CHString::SpanExcluding(LPCWSTR lpszCharSet) const { int Count; @@ -1059,7 +1059,7 @@ CHString CHString::SpanExcluding(LPCWSTR lpszCharSet) const throw (CHeap_Excepti /* * @implemented */ -CHString CHString::SpanIncluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception) +CHString CHString::SpanIncluding(LPCWSTR lpszCharSet) const { int Count; @@ -1071,7 +1071,7 @@ CHString CHString::SpanIncluding(LPCWSTR lpszCharSet) const throw (CHeap_Excepti /* * @implemented */ -void CHString::TrimLeft() throw (CHeap_Exception) +void CHString::TrimLeft() { int NewBegin; int NewLength; @@ -1104,7 +1104,7 @@ void CHString::TrimLeft() throw (CHeap_Exception) /* * @implemented */ -void CHString::TrimRight() throw (CHeap_Exception) +void CHString::TrimRight() { WCHAR *CurrentChar; WCHAR *CanBeEaten; @@ -1165,7 +1165,7 @@ void CHString::UnlockBuffer() /* * @implemented */ -const CHString& CHString::operator=(char ch) throw (CHeap_Exception) +const CHString& CHString::operator=(char ch) { *this = (WCHAR)ch; return *this; @@ -1174,7 +1174,7 @@ const CHString& CHString::operator=(char ch) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator=(WCHAR ch) throw (CHeap_Exception) +const CHString& CHString::operator=(WCHAR ch) { AssignCopy(1, &ch); return *this; @@ -1183,7 +1183,7 @@ const CHString& CHString::operator=(WCHAR ch) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator=(CHString *p) throw (CHeap_Exception) +const CHString& CHString::operator=(CHString *p) { *this = *p; return *this; @@ -1192,7 +1192,7 @@ const CHString& CHString::operator=(CHString *p) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator=(LPCSTR lpsz) throw (CHeap_Exception) +const CHString& CHString::operator=(LPCSTR lpsz) { int Len; @@ -1225,7 +1225,7 @@ const CHString& CHString::operator=(LPCSTR lpsz) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator=(LPCWSTR lpsz) throw (CHeap_Exception) +const CHString& CHString::operator=(LPCWSTR lpsz) { int Len; @@ -1238,7 +1238,7 @@ const CHString& CHString::operator=(LPCWSTR lpsz) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator=(const CHString& stringSrc) throw (CHeap_Exception) +const CHString& CHString::operator=(const CHString& stringSrc) { // Don't copy string on itself if (&stringSrc == this) @@ -1268,7 +1268,7 @@ const CHString& CHString::operator=(const CHString& stringSrc) throw (CHeap_Exce /* * @implemented */ -const CHString& CHString::operator=(const unsigned char* lpsz) throw (CHeap_Exception) +const CHString& CHString::operator=(const unsigned char* lpsz) { *this = (LPCSTR)lpsz; return *this; @@ -1277,7 +1277,7 @@ const CHString& CHString::operator=(const unsigned char* lpsz) throw (CHeap_Exce /* * @implemented */ -const CHString& CHString::operator+=(char ch) throw (CHeap_Exception) +const CHString& CHString::operator+=(char ch) { *this += (WCHAR)ch; return *this; @@ -1286,7 +1286,7 @@ const CHString& CHString::operator+=(char ch) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator+=(WCHAR ch) throw (CHeap_Exception) +const CHString& CHString::operator+=(WCHAR ch) { ConcatInPlace(1, &ch); return *this; @@ -1295,7 +1295,7 @@ const CHString& CHString::operator+=(WCHAR ch) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator+=(LPCWSTR lpsz) throw (CHeap_Exception) +const CHString& CHString::operator+=(LPCWSTR lpsz) { int Len; @@ -1308,7 +1308,7 @@ const CHString& CHString::operator+=(LPCWSTR lpsz) throw (CHeap_Exception) /* * @implemented */ -const CHString& CHString::operator+=(const CHString& string) throw (CHeap_Exception) +const CHString& CHString::operator+=(const CHString& string) { ConcatInPlace(string.GetData()->nDataLength, string.m_pchData); @@ -1334,7 +1334,7 @@ CHString::operator LPCWSTR() const /* * @implemented */ -CHString WINAPI operator+(WCHAR ch, const CHString& string) throw (CHeap_Exception) +CHString WINAPI operator+(WCHAR ch, const CHString& string) { CHString NewString; @@ -1347,7 +1347,7 @@ CHString WINAPI operator+(WCHAR ch, const CHString& string) throw (CHeap_Excepti /* * @implemented */ -CHString WINAPI operator+(const CHString& string, WCHAR ch) throw (CHeap_Exception) +CHString WINAPI operator+(const CHString& string, WCHAR ch) { CHString NewString; @@ -1360,7 +1360,7 @@ CHString WINAPI operator+(const CHString& string, WCHAR ch) throw (CHeap_Excepti /* * @implemented */ -CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) throw (CHeap_Exception) +CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) { int Len; CHString NewString; @@ -1376,7 +1376,7 @@ CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) throw (CHeap_Exc /* * @implemented */ -CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string) throw (CHeap_Exception) +CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string) { int Len; CHString NewString; @@ -1392,7 +1392,7 @@ CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string) throw (CHeap_Exc /* * @implemented */ -CHString WINAPI operator+(const CHString& string1, const CHString& string2) throw (CHeap_Exception) +CHString WINAPI operator+(const CHString& string1, const CHString& string2) { CHString NewString; diff --git a/sdk/include/psdk/chstring.h b/sdk/include/psdk/chstring.h index a50fe796db..2db344a226 100644 --- a/sdk/include/psdk/chstring.h +++ b/sdk/include/psdk/chstring.h @@ -22,15 +22,15 @@ class CHString { public: CHString(); - CHString(WCHAR ch, int nRepeat = 1) throw (CHeap_Exception); - CHString(LPCWSTR lpsz) throw (CHeap_Exception); - CHString(LPCWSTR lpch, int nLength) throw (CHeap_Exception); - CHString(LPCSTR lpsz) throw (CHeap_Exception); + CHString(WCHAR ch, int nRepeat = 1); + CHString(LPCWSTR lpsz); + CHString(LPCWSTR lpch, int nLength); + CHString(LPCSTR lpsz); CHString(const CHString& stringSrc); CHString(const unsigned char* lpsz); ~CHString(); - BSTR AllocSysString() const throw (CHeap_Exception); + BSTR AllocSysString() const; int Collate(LPCWSTR lpsz) const; int Compare(LPCWSTR lpsz) const; int CompareNoCase(LPCWSTR lpsz) const; @@ -38,72 +38,72 @@ public: int Find(WCHAR ch) const; int Find(LPCWSTR lpszSub) const; int FindOneOf(LPCWSTR lpszCharSet) const; - void Format(UINT nFormatID, ...) throw (CHeap_Exception); - void Format(LPCWSTR lpszFormat, ...) throw (CHeap_Exception); - void FormatMessageW(UINT nFormatID, ...) throw (CHeap_Exception); - void FormatMessageW(LPCWSTR lpszFormat, ...) throw (CHeap_Exception); + void Format(UINT nFormatID, ...); + void Format(LPCWSTR lpszFormat, ...); + void FormatMessageW(UINT nFormatID, ...); + void FormatMessageW(LPCWSTR lpszFormat, ...); void FormatV(LPCWSTR lpszFormat, va_list argList); - void FreeExtra() throw (CHeap_Exception); + void FreeExtra(); int GetAllocLength() const; WCHAR GetAt(int nIndex) const; - LPWSTR GetBuffer(int nMinBufLength) throw (CHeap_Exception); - LPWSTR GetBufferSetLength(int nNewLength) throw (CHeap_Exception); + LPWSTR GetBuffer(int nMinBufLength); + LPWSTR GetBufferSetLength(int nNewLength); int GetLength() const; BOOL IsEmpty() const; - CHString Left(int nCount) const throw (CHeap_Exception); - int LoadStringW(UINT nID) throw (CHeap_Exception); + CHString Left(int nCount) const; + int LoadStringW(UINT nID); LPWSTR LockBuffer(); - void MakeLower() throw (CHeap_Exception); - void MakeReverse() throw (CHeap_Exception); - void MakeUpper() throw (CHeap_Exception); - CHString Mid(int nFirst) const throw (CHeap_Exception); - CHString Mid(int nFirst, int nCount) const throw (CHeap_Exception); - void ReleaseBuffer(int nNewLength = -1) throw (CHeap_Exception); + void MakeLower(); + void MakeReverse(); + void MakeUpper(); + CHString Mid(int nFirst) const; + CHString Mid(int nFirst, int nCount) const; + void ReleaseBuffer(int nNewLength = -1); int ReverseFind(WCHAR ch) const; - CHString Right(int nCount) const throw (CHeap_Exception); - void SetAt(int nIndex, WCHAR ch) throw (CHeap_Exception); - CHString SpanExcluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception); - CHString SpanIncluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception); - void TrimLeft() throw (CHeap_Exception); - void TrimRight() throw (CHeap_Exception); + CHString Right(int nCount) const; + void SetAt(int nIndex, WCHAR ch); + CHString SpanExcluding(LPCWSTR lpszCharSet) const; + CHString SpanIncluding(LPCWSTR lpszCharSet) const; + void TrimLeft(); + void TrimRight(); void UnlockBuffer(); - const CHString& operator=(char ch) throw (CHeap_Exception); - const CHString& operator=(WCHAR ch) throw (CHeap_Exception); - const CHString& operator=(CHString *p) throw (CHeap_Exception); - const CHString& operator=(LPCSTR lpsz) throw (CHeap_Exception); - const CHString& operator=(LPCWSTR lpsz) throw (CHeap_Exception); - const CHString& operator=(const CHString& stringSrc) throw (CHeap_Exception); - const CHString& operator=(const unsigned char* lpsz) throw (CHeap_Exception); + const CHString& operator=(char ch); + const CHString& operator=(WCHAR ch); + const CHString& operator=(CHString *p); + const CHString& operator=(LPCSTR lpsz); + const CHString& operator=(LPCWSTR lpsz); + const CHString& operator=(const CHString& stringSrc); + const CHString& operator=(const unsigned char* lpsz); - const CHString& operator+=(char ch) throw (CHeap_Exception); - const CHString& operator+=(WCHAR ch) throw (CHeap_Exception); - const CHString& operator+=(LPCWSTR lpsz) throw (CHeap_Exception); - const CHString& operator+=(const CHString& string) throw (CHeap_Exception); + const CHString& operator+=(char ch); + const CHString& operator+=(WCHAR ch); + const CHString& operator+=(LPCWSTR lpsz); + const CHString& operator+=(const CHString& string); WCHAR operator[](int nIndex) const; operator LPCWSTR() const; - friend CHString WINAPI operator+(WCHAR ch, const CHString& string) throw (CHeap_Exception); - friend CHString WINAPI operator+(const CHString& string, WCHAR ch) throw (CHeap_Exception); - friend CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) throw (CHeap_Exception); - friend CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string) throw (CHeap_Exception); - friend CHString WINAPI operator+(const CHString& string1, const CHString& string2) throw (CHeap_Exception); + friend CHString WINAPI operator+(WCHAR ch, const CHString& string); + friend CHString WINAPI operator+(const CHString& string, WCHAR ch); + friend CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz); + friend CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string); + friend CHString WINAPI operator+(const CHString& string1, const CHString& string2); protected: LPWSTR m_pchData; - void AllocBeforeWrite(int nLen) throw (CHeap_Exception); - void AllocBuffer(int nLen) throw (CHeap_Exception); - void AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtraLen) const throw (CHeap_Exception); - void AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) throw (CHeap_Exception); - void ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data) throw (CHeap_Exception); + void AllocBeforeWrite(int nLen); + void AllocBuffer(int nLen); + void AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtraLen) const; + void AssignCopy(int nSrcLen, LPCWSTR lpszSrcData); + void ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data); void ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData); - void CopyBeforeWrite() throw (CHeap_Exception); + void CopyBeforeWrite(); CHStringData* GetData() const; void Init(); - int LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) throw (CHeap_Exception); + int LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf); void Release(); static void WINAPI Release(CHStringData* pData); static int WINAPI SafeStrlen(LPCWSTR lpsz);

5 years, 6 months

[reactos] 02/02: [NTOSKRNL] Do not try to access OldBackTracking[-1]

by Bartosz Brachaczek

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d256ff60068cafca0d3dc… commit d256ff60068cafca0d3dc78f518b6617b786efe0 Author: Bartosz Brachaczek <b.brachaczek(a)gmail.com> AuthorDate: Mon Apr 1 02:09:23 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 1 08:28:00 2019 +0200 [NTOSKRNL] Do not try to access OldBackTracking[-1] It can be triggered by the existing "F<", "FILE.TXT" case in the tests. CORE-15902 --- ntoskrnl/fsrtl/dbcsname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/fsrtl/dbcsname.c b/ntoskrnl/fsrtl/dbcsname.c index 3b1afd801e..362549e30b 100644 --- a/ntoskrnl/fsrtl/dbcsname.c +++ b/ntoskrnl/fsrtl/dbcsname.c @@ -248,7 +248,7 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, if (NamePosition >= Name->Length) { EndOfName = TRUE; - if (OldBackTracking[MatchingChars - 1] == Expression->Length * 2) + if (MatchingChars && OldBackTracking[MatchingChars - 1] == Expression->Length * 2) break; } else @@ -422,7 +422,7 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, } /* Store result value */ - Result = (OldBackTracking[MatchingChars - 1] == Expression->Length * 2); + Result = MatchingChars && (OldBackTracking[MatchingChars - 1] == Expression->Length * 2); Exit:

5 years, 6 months

[reactos] 01/02: [NTOSKRNL] Unify buffer size calculation in FsRtlIs{Name, Dbcs}InExpression

by Bartosz Brachaczek

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=695e00fbbd17f4a30201d… commit 695e00fbbd17f4a30201d262381a553da0d0805a Author: Bartosz Brachaczek <b.brachaczek(a)gmail.com> AuthorDate: Mon Apr 1 01:58:21 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 1 08:27:59 2019 +0200 [NTOSKRNL] Unify buffer size calculation in FsRtlIs{Name,Dbcs}InExpression It better captures the intent now in FsRtlIsNameInExpressionPrivate and fixes a slight overallotion by 4 bytes in FsRtlIsDbcsInExpression. While at it, use the ANSI_DOS_DOT macro in the Dbcs version. CORE-15902 --- ntoskrnl/fsrtl/dbcsname.c | 4 ++-- ntoskrnl/fsrtl/name.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/fsrtl/dbcsname.c b/ntoskrnl/fsrtl/dbcsname.c index 2c7300f388..3b1afd801e 100644 --- a/ntoskrnl/fsrtl/dbcsname.c +++ b/ntoskrnl/fsrtl/dbcsname.c @@ -291,7 +291,7 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, ASSERT((OldBackTracking == BackTrackingBuffer) || (OldBackTracking == OldBackTrackingBuffer)); /* Calculate buffer size */ - BackTrackingBufferSize = (Expression->Length + 1) * 2; + BackTrackingBufferSize = Expression->Length * 2 + 1; /* Allocate memory for both back-tracking buffers */ AllocatedBuffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, @@ -386,7 +386,7 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, continue; } /* Check DOS_DOT */ - else if (ExpressionChar == DOS_DOT) + else if (ExpressionChar == ANSI_DOS_DOT) { if (EndOfName) continue; diff --git a/ntoskrnl/fsrtl/name.c b/ntoskrnl/fsrtl/name.c index ef760c3bf5..3d2b33ea83 100644 --- a/ntoskrnl/fsrtl/name.c +++ b/ntoskrnl/fsrtl/name.c @@ -143,7 +143,7 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, ASSERT((OldBackTracking == BackTrackingBuffer) || (OldBackTracking == OldBackTrackingBuffer)); /* Calculate buffer size */ - BackTrackingBufferSize = Expression->Length + 1; + BackTrackingBufferSize = Expression->Length / sizeof(WCHAR) * 2 + 1; /* Allocate memory for both back-tracking buffers */ AllocatedBuffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,

5 years, 6 months

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 April 2019