Bug 1026893 - mingw fixup.
authorJacek Caban <jacek@codeweavers.com>
Thu, 27 Nov 2014 10:58:26 +0100
changeset 242153 193801221d25e5fee34a94e7660c512afe5166de
parent 242152 7b05e0d1c60e39c0075905e743637d88ac7fa0d2
child 242154 6486de06f9587f8717a5d22db040b3b88108e2f5
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1026893
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1026893 - mingw fixup.
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -1691,48 +1691,48 @@ gfxWindowsPlatform::InitD3D11Devices()
 
   RefPtr<IDXGIAdapter1> adapter = GetDXGIAdapter();
 
   if (!adapter) {
     return;
   }
 
   HRESULT hr = E_INVALIDARG;
-  __try {
+  MOZ_SEH_TRY {
     hr = d3d11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
                            // Use
                            // D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS
                            // to prevent bug 1092260. IE 11 also uses this flag.
                            D3D11_CREATE_DEVICE_BGRA_SUPPORT |
                            D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
                            featureLevels.Elements(), featureLevels.Length(),
                            D3D11_SDK_VERSION, byRef(mD3D11Device),
                            nullptr, nullptr);
-  } __except (EXCEPTION_EXECUTE_HANDLER) {
+  } MOZ_SEH_EXCEPT (EXCEPTION_EXECUTE_HANDLER) {
     mD3D11Device = nullptr;
     return;
   }
 
   if (FAILED(hr)) {
     mD3D11Device = nullptr;
     return;
   }
 
   mD3D11Device->SetExceptionMode(0);
 
 #ifdef USE_D2D1_1
   if (Factory::SupportsD2D1()) {
     hr = E_INVALIDARG;
-    __try {
+    MOZ_SEH_TRY {
       hr = d3d11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
                              D3D11_CREATE_DEVICE_BGRA_SUPPORT,
                              featureLevels.Elements(), featureLevels.Length(),
                              D3D11_SDK_VERSION, byRef(mD3D11ContentDevice),
                              nullptr, nullptr);
-    } __except(EXCEPTION_EXECUTE_HANDLER) {
+    } MOZ_SEH_EXCEPT (EXCEPTION_EXECUTE_HANDLER) {
       mD3D11Device = nullptr;
       return;
     }
 
     if (FAILED(hr)) {
       mD3D11Device = nullptr;
       return;
     }