Corrected error handling and aded checks for exceptions.

Author: Lastique

test/issues/reparse_tag_file_placeholder.cpp

@@ -11,10 +11,12 @@
 
 #if defined(BOOST_FILESYSTEM_HAS_MKLINK)
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/core/lightweight_test.hpp>
 
 #include <cstddef>
+#include <exception>
 
 #include <windows.h>
 #include <winnt.h>
@@ -76,15 +78,17 @@ bool obtain_restore_privilege()
     HANDLE hToken;
     if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken))
     {
-        std::cout << "OpenProcessToken() failed with: " << GetLastError() << std::endl;
+        DWORD err = GetLastError();
+        std::cout << "OpenProcessToken() failed with: " << err << std::endl;
         return false;
     }
 
     TOKEN_PRIVILEGES tp;
     if (!LookupPrivilegeValue(NULL, SE_RESTORE_NAME, &tp.Privileges[0].Luid))
     {
+        DWORD err = GetLastError();
         CloseHandle(hToken);
-        std::cout << "LookupPrivilegeValue() failed with: " << GetLastError() << std::endl;
+        std::cout << "LookupPrivilegeValue() failed with: " << err << std::endl;
         return false;
     }
 
@@ -93,8 +97,9 @@ bool obtain_restore_privilege()
 
     if (!AdjustTokenPrivileges(hToken, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL))
     {
+        DWORD err = GetLastError();
         CloseHandle(hToken);
-        std::cout << "AdjustTokenPrivileges() failed with: " << GetLastError() << std::endl;
+        std::cout << "AdjustTokenPrivileges() failed with: " << err << std::endl;
         return false;
     }
 
@@ -110,23 +115,30 @@ bool create_io_reparse_file_placeholder(const wchar_t* name)
     }
 
     HANDLE hHandle = CreateFileW(name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_FLAG_OPEN_REPARSE_POINT, 0);
-
     if (hHandle == INVALID_HANDLE_VALUE)
     {
-        std::cout << "CreateFile() failed with: " << GetLastError() << std::endl;
+        DWORD err = GetLastError();
+        std::cout << "CreateFile() failed with: " << err << std::endl;
         return false;
     }
 
     PREPARSE_DATA_BUFFER pReparse = reinterpret_cast< PREPARSE_DATA_BUFFER >(GlobalAlloc(GPTR, MAXIMUM_REPARSE_DATA_BUFFER_SIZE));
+    if (!pReparse)
+    {
+        DWORD err = GetLastError();
+        CloseHandle(hHandle);
+        std::cout << "GlobalAlloc() failed with: " << err << std::endl;
+        return false;
+    }
     //note: IO_REPARSE_TAG_FILE_PLACEHOLDER - just to show that reparse point could be not only symlink or junction
     pReparse->ReparseTag = IO_REPARSE_TAG_FILE_PLACEHOLDER;
 
     DWORD dwLen;
-    bool ret = DeviceIoControl(hHandle, FSCTL_SET_REPARSE_POINT, pReparse, pReparse->ReparseDataLength + REPARSE_DATA_BUFFER_HEADER_SIZE, NULL, 0, &dwLen, NULL) != 0;
-
+    bool ret = !!DeviceIoControl(hHandle, FSCTL_SET_REPARSE_POINT, pReparse, pReparse->ReparseDataLength + REPARSE_DATA_BUFFER_HEADER_SIZE, NULL, 0, &dwLen, NULL);
     if (!ret)
     {
-        std::cout << "DeviceIoControl() failed with: " << GetLastError() << std::endl;
+        DWORD err = GetLastError();
+        std::cout << "DeviceIoControl() failed with: " << err << std::endl;
     }
 
     CloseHandle(hHandle);
@@ -139,8 +151,9 @@ int main()
     boost::filesystem::path rpt = boost::filesystem::temp_directory_path() / "reparse_point_test.txt";
 
     BOOST_TEST(create_io_reparse_file_placeholder(rpt.native().c_str()));
-    BOOST_TEST(boost::filesystem::status(rpt).type() == boost::filesystem::reparse_file);
-    BOOST_TEST(boost::filesystem::remove(rpt));
+    std::cout << "Created file placeholder reparse point: " << rpt.string() << std::endl;
+    BOOST_TEST_NO_THROW(BOOST_TEST(boost::filesystem::status(rpt).type() == boost::filesystem::reparse_file));
+    BOOST_TEST_NO_THROW(BOOST_TEST(boost::filesystem::remove(rpt)));
 
     return boost::report_errors();
 }