Bug 689870 - mingw fix
authorJacek Caban <jacek@codeweavers.com>
Fri, 03 May 2013 15:01:49 +0200
changeset 141675 85249bddf0a65860354b279a9ff8fd2181f513c0
parent 141674 eb04c9a69ac912cd0511ca79cf98fd0f805cf6a0
child 141676 5565fd265415bf8f1aabc67fd3a4a3916b8c90d9
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs689870
milestone23.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 689870 - mingw fix
gfx/thebes/d3dkmtQueryStatistics.h
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/d3dkmtQueryStatistics.h
+++ b/gfx/thebes/d3dkmtQueryStatistics.h
@@ -135,23 +135,23 @@ typedef union _D3DKMTQS_RESULT
 
 typedef struct _D3DKMTQS_QUERY_SEGMENT
 {
     ULONG SegmentId;
 } D3DKMTQS_QUERY_SEGMENT;
 
 typedef struct _D3DKMTQS
 {
-    __in D3DKMTQS_TYPE Type;
-    __in LUID AdapterLuid;
-    __in_opt HANDLE hProcess;
-    __out D3DKMTQS_RESULT QueryResult;
+    D3DKMTQS_TYPE Type;
+    LUID AdapterLuid;
+    HANDLE hProcess;
+    D3DKMTQS_RESULT QueryResult;
 
     union
     {
-        __in D3DKMTQS_QUERY_SEGMENT QuerySegment;
-        __in D3DKMTQS_QUERY_SEGMENT QueryProcessSegment;
+        D3DKMTQS_QUERY_SEGMENT QuerySegment;
+        D3DKMTQS_QUERY_SEGMENT QueryProcessSegment;
     };
 } D3DKMTQS;
 
 extern "C" {
-typedef __checkReturn NTSTATUS (APIENTRY *PFND3DKMTQS)(__in const D3DKMTQS *);
+typedef __checkReturn NTSTATUS (APIENTRY *PFND3DKMTQS)(const D3DKMTQS *);
 }
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -163,17 +163,17 @@ typedef HRESULT(WINAPI*CreateDXGIFactory
   REFIID riid,
   void **ppFactory
 );
 #endif
 
 class GPUAdapterMultiReporter : public nsIMemoryMultiReporter {
 
     // Callers must Release the DXGIAdapter after use or risk mem-leak
-    static bool GetDXGIAdapter(__out IDXGIAdapter **DXGIAdapter)
+    static bool GetDXGIAdapter(IDXGIAdapter **DXGIAdapter)
     {
         ID3D10Device1 *D2D10Device;
         IDXGIDevice *DXGIDevice;
         bool result = false;
         
         if (D2D10Device = mozilla::gfx::Factory::GetDirect3D10Device()) {
             if (D2D10Device->QueryInterface(__uuidof(IDXGIDevice), (void **)&DXGIDevice) == S_OK) {
                 result = (DXGIDevice->GetAdapter(DXGIAdapter) == S_OK);