Author: akhaldi
Date: Sat May 21 12:39:48 2011
New Revision: 51838
URL: http://svn.reactos.org/svn/reactos?rev=51838&view=rev
Log:
[CMAKE]
* Merge more msvc fixes from the cmake branch.
Modified:
trunk/reactos/include/dxsdk/amvideo.idl
trunk/reactos/include/dxsdk/bdatif.idl
trunk/reactos/include/dxsdk/qedit.idl
trunk/reactos/include/dxsdk/videoacc.idl
trunk/reactos/include/reactos/idl/eventlogrpc.acf
trunk/reactos/include/reactos/idl/lsa.acf
trunk/reactos/include/reactos/wine/irot.idl
trunk/reactos/include/reactos/wine/wined3d.idl
Modified: trunk/reactos/include/dxsdk/amvideo.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.idl?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/dxsdk/amvideo.idl [iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/amvideo.idl [iso-8859-1] Sat May 21 12:39:48
2011
@@ -61,7 +61,7 @@
[
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 @@
[
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 @@
[
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 @@
[
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 @@
[
object,
- /* uuid(61ded640-e912-11ce-a099-00aa00479a58) conflicts with uuids.h */
+ uuid(61ded640-e912-11ce-a099-00aa00479a58),
pointer_default(unique),
local
]
Modified: trunk/reactos/include/dxsdk/bdatif.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdatif.idl?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/dxsdk/bdatif.idl [iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/bdatif.idl [iso-8859-1] Sat May 21 12:39:48 2011
@@ -254,7 +254,9 @@
]
library PSISLOADLib
{
+#ifndef __midl
importlib("stdole32.tlb");
+#endif
importlib("stdole2.tlb");
[
Modified: trunk/reactos/include/dxsdk/qedit.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/qedit.idl?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] Sat May 21 12:39:48 2011
@@ -160,9 +160,16 @@
};
[
- 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;
+ };
};
Modified: trunk/reactos/include/dxsdk/videoacc.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/videoacc.idl?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/dxsdk/videoacc.idl [iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/videoacc.idl [iso-8859-1] Sat May 21 12:39:48
2011
@@ -53,4 +53,4 @@
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);
-};
+};
Modified: trunk/reactos/include/reactos/idl/eventlogrpc.acf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventlogrpc.acf?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/eventlogrpc.acf [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/eventlogrpc.acf [iso-8859-1] Sat May 21
12:39:48 2011
@@ -3,4 +3,4 @@
]
interface eventlog
{
-}
+}
Modified: trunk/reactos/include/reactos/idl/lsa.acf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.acf?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/lsa.acf [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/lsa.acf [iso-8859-1] Sat May 21 12:39:48
2011
@@ -1,6 +1,6 @@
[
explicit_handle
]
-interface svcctl
+interface lsarpc
{
}
Modified: trunk/reactos/include/reactos/wine/irot.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/irot.idl?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/irot.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/irot.idl [iso-8859-1] Sat May 21
12:39:48 2011
@@ -29,7 +29,9 @@
[
uuid(7a98c254-6808-11cf-b73b-00aa00b677a8),
version(0.2),
+#ifndef _MSC_VER
strict_context_handle
+#endif
]
interface Irot
{
Modified: trunk/reactos/include/reactos/wine/wined3d.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined3d.idl?rev=51838&r1=51837&r2=51838&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] Sat May 21
12:39:48 2011
@@ -3374,7 +3374,15 @@
);
}
+#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
+
