From ce054e32c0f8fe2c80cf8b2ec3a5e8414d0c4614 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 21 May 2011 12:39:48 +0000
Subject: [PATCH] [CMAKE] * Merge more msvc fixes from the cmake branch.

svn path=/trunk/; revision=51838
---
 reactos/include/dxsdk/amvideo.idl           | 10 +++++-----
 reactos/include/dxsdk/bdatif.idl            |  2 ++
 reactos/include/dxsdk/qedit.idl             | 13 ++++++++++---
 reactos/include/dxsdk/videoacc.idl          |  2 +-
 reactos/include/reactos/idl/eventlogrpc.acf |  2 +-
 reactos/include/reactos/idl/lsa.acf         |  2 +-
 reactos/include/reactos/wine/irot.idl       |  2 ++
 reactos/include/reactos/wine/wined3d.idl    |  8 ++++++++
 8 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/reactos/include/dxsdk/amvideo.idl b/reactos/include/dxsdk/amvideo.idl
index ea486d5e887..8c0cb9c370e 100644
--- a/reactos/include/dxsdk/amvideo.idl
+++ b/reactos/include/dxsdk/amvideo.idl
@@ -61,7 +61,7 @@ cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)")
 
 [
     object,
-    /* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a)  conflicts with uuids.h */
+    uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a),
     pointer_default(unique),
     local
 ]
@@ -87,7 +87,7 @@ interface IDirectDrawVideo : IUnknown
 
 [
     object,
-    /* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3)  conflicts with uuids.h */
+    uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3),
     pointer_default(unique),
     local
 ]
@@ -103,7 +103,7 @@ interface IQualProp : IUnknown
 
 [
     object,
-    /* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a)  conflicts with uuids.h */
+    uuid(dd1d7110-7836-11cf-bf47-00aa0055595a),
     pointer_default(unique)
 ]
 interface IFullScreenVideo : IUnknown
@@ -129,7 +129,7 @@ interface IFullScreenVideo : IUnknown
 
 [
     object,
-    /* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6)  conflicts with uuids.h */
+    uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6),
     pointer_default(unique),
     local
 ]
@@ -144,7 +144,7 @@ interface IFullScreenVideoEx : IFullScreenVideo
 
 [
     object,
-    /* uuid(61ded640-e912-11ce-a099-00aa00479a58)  conflicts with uuids.h */
+    uuid(61ded640-e912-11ce-a099-00aa00479a58),
     pointer_default(unique),
     local
 ]
diff --git a/reactos/include/dxsdk/bdatif.idl b/reactos/include/dxsdk/bdatif.idl
index 6c8887eb7cf..0d7c84c6a3e 100644
--- a/reactos/include/dxsdk/bdatif.idl
+++ b/reactos/include/dxsdk/bdatif.idl
@@ -254,7 +254,9 @@ interface IGuideDataLoader : IUnknown
 ]
 library PSISLOADLib
 {
+#ifndef __midl
     importlib("stdole32.tlb");
+#endif
     importlib("stdole2.tlb");
 
     [
diff --git a/reactos/include/dxsdk/qedit.idl b/reactos/include/dxsdk/qedit.idl
index ea1e593ad65..4327ce93d12 100644
--- a/reactos/include/dxsdk/qedit.idl
+++ b/reactos/include/dxsdk/qedit.idl
@@ -160,9 +160,16 @@ interface IMediaDet : IUnknown
 };
 
 [
-    uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA),
+    uuid(78530B68-61F9-11D2-8CAD-00A024580902),
+    version(1.0),
 ]
-coclass MediaDet
+library DexterLib
 {
-    [default] interface IMediaDet;
+    [
+        uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA),
+    ]
+    coclass MediaDet
+    {
+        [default] interface IMediaDet;
+    };
 };
diff --git a/reactos/include/dxsdk/videoacc.idl b/reactos/include/dxsdk/videoacc.idl
index 930a0ffc15c..b0586143d90 100644
--- a/reactos/include/dxsdk/videoacc.idl
+++ b/reactos/include/dxsdk/videoacc.idl
@@ -53,4 +53,4 @@ interface IAMVideoAcceleratorNotify : IUnknown
     HRESULT GetUncompSurfacesInfo([in] const GUID *pGuid, [in] [out] LPAMVAUncompBufferInfo pUncompBufferInfo);
     HRESULT SetUncompSurfacesInfo([in] DWORD dwActualUncompSurfacesAllocated);
     HRESULT GetCreateVideoAcceleratorData([in] const GUID *pGuid, [out] LPDWORD pdwSizeMiscData, [out] LPVOID *ppMiscData);
-};
\ No newline at end of file
+};
diff --git a/reactos/include/reactos/idl/eventlogrpc.acf b/reactos/include/reactos/idl/eventlogrpc.acf
index 935f30ff944..b9655c789fa 100644
--- a/reactos/include/reactos/idl/eventlogrpc.acf
+++ b/reactos/include/reactos/idl/eventlogrpc.acf
@@ -3,4 +3,4 @@
 ]
 interface eventlog
 {
-}
\ No newline at end of file
+}
diff --git a/reactos/include/reactos/idl/lsa.acf b/reactos/include/reactos/idl/lsa.acf
index b3e0cf4b7ad..1360a7704be 100644
--- a/reactos/include/reactos/idl/lsa.acf
+++ b/reactos/include/reactos/idl/lsa.acf
@@ -1,6 +1,6 @@
 [
    explicit_handle
 ]
-interface svcctl
+interface lsarpc
 {
 }
\ No newline at end of file
diff --git a/reactos/include/reactos/wine/irot.idl b/reactos/include/reactos/wine/irot.idl
index 54d86531ef1..cdd209dc5df 100644
--- a/reactos/include/reactos/wine/irot.idl
+++ b/reactos/include/reactos/wine/irot.idl
@@ -29,7 +29,9 @@ typedef struct tagMonikerComparisonData {
 [
     uuid(7a98c254-6808-11cf-b73b-00aa00b677a8),
     version(0.2),
+#ifndef _MSC_VER
     strict_context_handle
+#endif
 ]
 interface Irot
 {
diff --git a/reactos/include/reactos/wine/wined3d.idl b/reactos/include/reactos/wine/wined3d.idl
index 83e2bae9740..99f29763b72 100644
--- a/reactos/include/reactos/wine/wined3d.idl
+++ b/reactos/include/reactos/wine/wined3d.idl
@@ -3374,7 +3374,15 @@ interface IWineD3DDevice : IUnknown
     );
 }
 
+#ifdef __midl
+IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, void *parent);
+IWineD3DClipper * __stdcall WineDirect3DCreateClipper(void);
+void __stdcall wined3d_mutex_lock(void);
+void __stdcall wined3d_mutex_unlock(void);
+#else
 IWineD3D *WineDirect3DCreate(UINT dxVersion, void *parent);
 IWineD3DClipper *WineDirect3DCreateClipper(void);
 void wined3d_mutex_lock(void);
 void wined3d_mutex_unlock(void);
+#endif
+