[ATL][SHELL32] Add basic support for _ATL_NO_EXCEPTIONS in CString, use it in shell32...
authorMark Jansen <mark.jansen@reactos.org>
Mon, 29 Aug 2016 12:29:45 +0000 (12:29 +0000)
committerMark Jansen <mark.jansen@reactos.org>
Mon, 29 Aug 2016 12:29:45 +0000 (12:29 +0000)
svn path=/trunk/; revision=72499

reactos/dll/win32/shell32/CMakeLists.txt
reactos/sdk/lib/atl/atlexcept.h [new file with mode: 0644]
reactos/sdk/lib/atl/atlsimpstr.h

index 1a53a9e..7acb71f 100644 (file)
@@ -4,7 +4,7 @@ add_subdirectory(shelldesktop)
 add_subdirectory(shellmenu)
 add_subdirectory(shellrecyclebin)
 
-set_cpp(WITH_RUNTIME WITH_EXCEPTIONS)
+set_cpp(WITH_RUNTIME)
 spec2def(shell32.dll shell32.spec ADD_IMPORTLIB)
 
 if(NOT MSVC)
@@ -17,7 +17,8 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(
     -D_SHELL32_
-    -D_WINE)
+    -D_WINE
+    -D_ATL_NO_EXCEPTIONS)
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/lib/atl
diff --git a/reactos/sdk/lib/atl/atlexcept.h b/reactos/sdk/lib/atl/atlexcept.h
new file mode 100644 (file)
index 0000000..b81c655
--- /dev/null
@@ -0,0 +1,38 @@
+
+#ifndef __ATLEXCEPT_H__
+#define __ATLEXCEPT_H__
+
+
+//FIXME: Enable when RaiseException is marked as NORETURN
+//DECLSPEC_NORETURN
+inline void AtlThrowImp(HRESULT hr)
+{
+#ifdef ATLTRACE
+    ATLTRACE(hr);
+#endif
+
+#ifdef _ATL_NO_EXCEPTIONS
+
+    ATLASSERT(false);
+
+    RaiseException(
+        hr == E_OUTOFMEMORY ? STATUS_NO_MEMORY : EXCEPTION_ILLEGAL_INSTRUCTION,
+        EXCEPTION_NONCONTINUABLE, 0, NULL
+        );
+
+#else
+
+    // FIXME: This is horribly wrong, we should implement CException!
+    throw;
+
+#endif
+
+}
+
+
+
+#ifndef AtlThrow
+#define AtlThrow(x) AtlThrowImp(x)
+#endif
+
+#endif
index ea4434c..1132e60 100644 (file)
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <atlcore.h>
-
+#include <atlexcept.h>
 
 namespace ATL
 {
@@ -485,7 +485,7 @@ private:
         CStringData* pNewData = pOldData->pStringMgr->Clone()->Allocate(nLength, sizeof(XCHAR));
         if (pNewData == NULL)
         {
-            throw; // ThrowMemoryException();
+            ThrowMemoryException();
         }
         int nCharsToCopy = ((nOldLength < nLength) ? nOldLength : nLength) + 1;
         CopyChars(PXSTR(pNewData->data()), nCharsToCopy,
@@ -550,7 +550,7 @@ private:
         CStringData* pNewData = pStringMgr->Reallocate(pOldData, nLength, sizeof(XCHAR));
         if (pNewData == NULL)
         {
-            throw; // ThrowMemoryException();
+            ThrowMemoryException();
         }
 
         Attach(pNewData);
@@ -562,7 +562,9 @@ private:
         ATLASSERT(nLength <= GetData()->nAllocLength);
 
         if (nLength < 0 || nLength > GetData()->nAllocLength)
-            throw;
+        {
+            AtlThrow(E_INVALIDARG);
+        }
 
         GetData()->nDataLength = nLength;
         m_pszData[nLength] = 0;
@@ -583,7 +585,7 @@ private:
             pNewData = pNewStringMgr->Allocate(pData->nDataLength, sizeof(XCHAR));
             if (pNewData == NULL)
             {
-                throw; // ThrowMemoryException();
+                ThrowMemoryException();
             }
 
             pNewData->nDataLength = pData->nDataLength;
@@ -594,6 +596,12 @@ private:
         return pNewData;
     }
 
+
+    static void ThrowMemoryException()
+    {
+        AtlThrow(E_OUTOFMEMORY);
+    }
+
 };
 }