[UCRT] Make SEH blocks ReactOS PSEH compatible

Author: tkreuzer

sdk/lib/ucrt/conio/cgets.cpp

@@ -91,6 +91,7 @@ extern "C" errno_t __cdecl _cgets_s(char* const source_string, size_t const size
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
 
     *string++ = '\0';
 

sdk/lib/ucrt/conio/cgetws.cpp

@@ -121,6 +121,7 @@ extern "C" errno_t __cdecl _cgetws_s(wchar_t* const string_buffer, size_t const
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
 
     return retval;
 }

sdk/lib/ucrt/conio/cputs.cpp

@@ -34,5 +34,6 @@ extern "C" int __cdecl _cputs(char const* const string)
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }

sdk/lib/ucrt/conio/cputws.cpp

@@ -58,6 +58,7 @@ extern "C" int __cdecl _cputws(wchar_t const* string)
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
 
     return result;
 }

sdk/lib/ucrt/conio/getch.cpp

@@ -254,6 +254,7 @@ extern "C" int __cdecl _getch()
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }
 
@@ -269,6 +270,7 @@ extern "C" int __cdecl _getche()
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }
 
@@ -353,6 +355,7 @@ extern "C" int __cdecl _getch_nolock()
         // Restore the previous console mode:
         __dcrt_set_input_console_mode(old_console_mode);
     }
+    __endtry
     return result;
 }
 
@@ -394,6 +397,7 @@ extern "C" int __cdecl _kbhit()
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }
 
@@ -472,6 +476,7 @@ extern "C" int __cdecl _ungetch(int const c)
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }
 

sdk/lib/ucrt/conio/getwch.cpp

@@ -51,6 +51,7 @@ extern "C" wint_t __cdecl _getwch()
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }
 
@@ -67,6 +68,7 @@ extern "C" wint_t __cdecl _getwche()
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }
 
@@ -140,6 +142,7 @@ extern "C" wint_t __cdecl _getwch_nolock()
         // Restore the previous console mode:
         __dcrt_set_input_console_mode(old_console_mode);
     }
+    __endtry
     return result;
 }
 
@@ -185,6 +188,7 @@ extern "C" wint_t __cdecl _ungetwch(wint_t const c)
     {
         __acrt_unlock(__acrt_conio_lock);
     }
+    __endtry
     return result;
 }
 

sdk/lib/ucrt/conio/pipe.cpp

@@ -61,6 +61,7 @@ extern "C" int __cdecl _pipe(int* const phandles, unsigned const psize, int cons
     {
         __acrt_lowio_unlock_fh(crt_read_handle);
     }
+    __endtry
 
     // Create the CRT write handle for the pipe:
     int const crt_write_handle = _alloc_osfhnd();
@@ -84,6 +85,7 @@ extern "C" int __cdecl _pipe(int* const phandles, unsigned const psize, int cons
     {
         __acrt_lowio_unlock_fh(crt_write_handle);
     }
+    __endtry
 
     // Figure out which textmode the file gets:
     int fmode = 0;

sdk/lib/ucrt/conio/popen.cpp

@@ -400,6 +400,7 @@ static FILE* __cdecl common_popen(
     {
         __acrt_unlock(__acrt_popen_lock);
     }
+    __endtry
 
     return return_value;
 }
@@ -483,6 +484,7 @@ extern "C" int __cdecl _pclose(FILE* const stream)
     {
         __acrt_unlock(__acrt_popen_lock);
     }
+    __endtry
 
     return return_value;
 }

sdk/lib/ucrt/env/getenv.cpp

@@ -76,6 +76,7 @@ static Character* __cdecl common_getenv(Character const* const name) throw()
     {
         __acrt_unlock(__acrt_environment_lock);
     }
+    __endtry
 
     return result;
 }
@@ -160,6 +161,7 @@ static errno_t __cdecl common_getenv_s(
     {
         __acrt_unlock(__acrt_environment_lock);
     }
+    __endtry
 
     return status;
 }
@@ -275,6 +277,7 @@ static errno_t __cdecl common_dupenv_s(
     {
         __acrt_unlock(__acrt_environment_lock);
     }
+    __endtry
 
     return status;
 }

sdk/lib/ucrt/env/putenv.cpp

@@ -212,6 +212,7 @@ static int __cdecl common_putenv(
     {
         __acrt_unlock(__acrt_environment_lock);
     }
+    __endtry
 
     return status;
 }