Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CLT-2017]: Add the lstrlenA/W fixes from r74117,r74118,r74119.

Browse source 
svn path=/branches/ReactOS-0.4.4-CLT2017/; revision=74130
This commit is contained in:
Hermès Bélusca-Maïto 2017-03-08 22:22:13 +00:00
parent 46c0880849
commit c036b65fcd
3 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/kernel32/winnls/string/lstring.c
View file

@ -27,7 +27,8 @@ lstrcmpA(LPCSTR lpString1, LPCSTR lpString2)
return 1; return 1;
Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1);
if (Result) Result -= 2; if (Result)
Result -= 2;
return Result; return Result;
} }
@ -56,6 +57,7 @@ lstrcmpiA(LPCSTR lpString1, LPCSTR lpString2)
return Result; return Result;
} }
/* /*
* @implemented * @implemented
*/ */
@ -144,6 +146,9 @@ lstrlenA(LPCSTR lpString)
{ {
INT Ret = 0; INT Ret = 0;
if (lpString == NULL)
return 0;
_SEH2_TRY _SEH2_TRY
{ {
Ret = strlen(lpString); Ret = strlen(lpString);
@ -292,6 +297,9 @@ lstrlenW(LPCWSTR lpString)
{ {
INT Ret = 0; INT Ret = 0;
if (lpString == NULL)
return 0;
_SEH2_TRY _SEH2_TRY
{ {
Ret = wcslen(lpString); Ret = wcslen(lpString);

36
reactos/sdk/include/ndk/rtlfuncs.h
View file

@ -619,15 +619,26 @@ RtlAddVectoredExceptionHandler(
_In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler
); );
__analysis_noreturn
NTSYSAPI NTSYSAPI
VOID ULONG
NTAPI NTAPI
RtlAssert( RtlRemoveVectoredExceptionHandler(
_In_ PVOID FailedAssertion, _In_ PVOID VectoredHandlerHandle
_In_ PVOID FileName, );
_In_ ULONG LineNumber,
_In_opt_z_ PCHAR Message NTSYSAPI
PVOID
NTAPI
RtlAddVectoredContinueHandler(
_In_ ULONG FirstHandler,
_In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler
);
NTSYSAPI
ULONG
NTAPI
RtlRemoveVectoredContinueHandler(
_In_ PVOID VectoredHandlerHandle
); );
NTSYSAPI NTSYSAPI
@ -644,6 +655,17 @@ RtlUnhandledExceptionFilter(
_In_ struct _EXCEPTION_POINTERS* ExceptionInfo _In_ struct _EXCEPTION_POINTERS* ExceptionInfo
); );
__analysis_noreturn
NTSYSAPI
VOID
NTAPI
RtlAssert(
_In_ PVOID FailedAssertion,
_In_ PVOID FileName,
_In_ ULONG LineNumber,
_In_opt_z_ PCHAR Message
);
NTSYSAPI NTSYSAPI
PVOID PVOID
NTAPI NTAPI

2
reactos/sdk/include/psdk/winbase.h
View file

@ -1467,6 +1467,7 @@ void WINAPI AddRefActCtx(_Inout_ HANDLE);
#endif #endif
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
_Ret_maybenull_ PVOID WINAPI AddVectoredExceptionHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); _Ret_maybenull_ PVOID WINAPI AddVectoredExceptionHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER);
_Ret_maybenull_ PVOID WINAPI AddVectoredContinueHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER);
#endif #endif
BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL);
BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD); BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD);
@ -2882,6 +2883,7 @@ BOOL WINAPI RemoveDirectoryA(LPCSTR);
BOOL WINAPI RemoveDirectoryW(LPCWSTR); BOOL WINAPI RemoveDirectoryW(LPCWSTR);
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
ULONG WINAPI RemoveVectoredExceptionHandler(_In_ PVOID); ULONG WINAPI RemoveVectoredExceptionHandler(_In_ PVOID);
ULONG WINAPI RemoveVectoredContinueHandler(_In_ PVOID);
#endif #endif
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI ReplaceFileA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _Reserved_ LPVOID, _Reserved_ LPVOID); BOOL WINAPI ReplaceFileA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _Reserved_ LPVOID, _Reserved_ LPVOID);