Author: hbelusca Date: Wed Mar 8 22:22:13 2017 New Revision: 74130
URL: http://svn.reactos.org/svn/reactos?rev=74130&view=rev Log: [CLT-2017]: Add the lstrlenA/W fixes from r74117,r74118,r74119.
Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h
Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 8 22:22:13 2017 @@ -24,4 +24,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74083,74112 +/trunk/reactos:74083,74112,74117-74119
Modified: branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/dl... ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c [iso-8859-1] Wed Mar 8 22:22:13 2017 @@ -27,7 +27,8 @@ return 1;
Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; + if (Result) + Result -= 2;
return Result; } @@ -55,6 +56,7 @@
return Result; } +
/* * @implemented @@ -144,6 +146,9 @@ { INT Ret = 0;
+ if (lpString == NULL) + return 0; + _SEH2_TRY { Ret = strlen(lpString); @@ -292,6 +297,9 @@ { INT Ret = 0;
+ if (lpString == NULL) + return 0; + _SEH2_TRY { Ret = wcslen(lpString);
Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/sd... ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Wed Mar 8 22:22:13 2017 @@ -619,6 +619,42 @@ _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler );
+NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredExceptionHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +PVOID +NTAPI +RtlAddVectoredContinueHandler( + _In_ ULONG FirstHandler, + _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler +); + +NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +VOID +NTAPI +RtlSetUnhandledExceptionFilter( + _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter +); + +NTSYSAPI +LONG +NTAPI +RtlUnhandledExceptionFilter( + _In_ struct _EXCEPTION_POINTERS* ExceptionInfo +); + __analysis_noreturn NTSYSAPI VOID @@ -628,20 +664,6 @@ _In_ PVOID FileName, _In_ ULONG LineNumber, _In_opt_z_ PCHAR Message -); - -NTSYSAPI -VOID -NTAPI -RtlSetUnhandledExceptionFilter( - _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter -); - -NTSYSAPI -LONG -NTAPI -RtlUnhandledExceptionFilter( - _In_ struct _EXCEPTION_POINTERS* ExceptionInfo );
NTSYSAPI
Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/sd... ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h [iso-8859-1] Wed Mar 8 22:22:13 2017 @@ -1467,6 +1467,7 @@ #endif #if (_WIN32_WINNT >= 0x0500) _Ret_maybenull_ PVOID WINAPI AddVectoredExceptionHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); +_Ret_maybenull_ PVOID WINAPI AddVectoredContinueHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); #endif 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); @@ -2882,6 +2883,7 @@ BOOL WINAPI RemoveDirectoryW(LPCWSTR); #if (_WIN32_WINNT >= 0x0500) ULONG WINAPI RemoveVectoredExceptionHandler(_In_ PVOID); +ULONG WINAPI RemoveVectoredContinueHandler(_In_ PVOID); #endif #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI ReplaceFileA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _Reserved_ LPVOID, _Reserved_ LPVOID);