Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-19 17:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Merge more msvc fixes from the cmake branch.

svn path=/trunk/; revision=51838
This commit is contained in:
Amine Khaldi 2011-05-21 12:39:48 +00:00
parent 33febbe6a1
commit ce054e32c0
8 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/include/dxsdk/amvideo.idl
View file

@ -61,7 +61,7 @@ cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)")
[ [
object, object,
/* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a) conflicts with uuids.h */ uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a),
pointer_default(unique), pointer_default(unique),
local local
] ]
@ -87,7 +87,7 @@ interface IDirectDrawVideo : IUnknown
[ [
object, object,
/* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3) conflicts with uuids.h */ uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3),
pointer_default(unique), pointer_default(unique),
local local
] ]
@ -103,7 +103,7 @@ interface IQualProp : IUnknown
[ [
object, object,
/* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a) conflicts with uuids.h */ uuid(dd1d7110-7836-11cf-bf47-00aa0055595a),
pointer_default(unique) pointer_default(unique)
] ]
interface IFullScreenVideo : IUnknown interface IFullScreenVideo : IUnknown
@ -129,7 +129,7 @@ interface IFullScreenVideo : IUnknown
[ [
object, object,
/* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6) conflicts with uuids.h */ uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6),
pointer_default(unique), pointer_default(unique),
local local
] ]
@ -144,7 +144,7 @@ interface IFullScreenVideoEx : IFullScreenVideo
[ [
object, object,
/* uuid(61ded640-e912-11ce-a099-00aa00479a58) conflicts with uuids.h */ uuid(61ded640-e912-11ce-a099-00aa00479a58),
pointer_default(unique), pointer_default(unique),
local local
] ]

2
reactos/include/dxsdk/bdatif.idl
View file

@ -254,7 +254,9 @@ interface IGuideDataLoader : IUnknown
] ]
library PSISLOADLib library PSISLOADLib
{ {
#ifndef __midl
importlib("stdole32.tlb"); importlib("stdole32.tlb");
#endif
importlib("stdole2.tlb"); importlib("stdole2.tlb");
[ [

13
reactos/include/dxsdk/qedit.idl
View file

@ -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;
};
}; };

2
reactos/include/dxsdk/videoacc.idl
View file

@ -53,4 +53,4 @@ interface IAMVideoAcceleratorNotify : IUnknown
HRESULT GetUncompSurfacesInfo([in] const GUID *pGuid, [in] [out] LPAMVAUncompBufferInfo pUncompBufferInfo); HRESULT GetUncompSurfacesInfo([in] const GUID *pGuid, [in] [out] LPAMVAUncompBufferInfo pUncompBufferInfo);
HRESULT SetUncompSurfacesInfo([in] DWORD dwActualUncompSurfacesAllocated); HRESULT SetUncompSurfacesInfo([in] DWORD dwActualUncompSurfacesAllocated);
HRESULT GetCreateVideoAcceleratorData([in] const GUID *pGuid, [out] LPDWORD pdwSizeMiscData, [out] LPVOID *ppMiscData); HRESULT GetCreateVideoAcceleratorData([in] const GUID *pGuid, [out] LPDWORD pdwSizeMiscData, [out] LPVOID *ppMiscData);
}; };

2
reactos/include/reactos/idl/eventlogrpc.acf
View file

@ -3,4 +3,4 @@
] ]
interface eventlog interface eventlog
{ {
} }

2
reactos/include/reactos/idl/lsa.acf
View file

@ -1,6 +1,6 @@
[ [
explicit_handle explicit_handle
] ]
interface svcctl interface lsarpc
{ {
} }

2
reactos/include/reactos/wine/irot.idl
View file

@ -29,7 +29,9 @@ typedef struct tagMonikerComparisonData {
[ [
uuid(7a98c254-6808-11cf-b73b-00aa00b677a8), uuid(7a98c254-6808-11cf-b73b-00aa00b677a8),
version(0.2), version(0.2),
#ifndef _MSC_VER
strict_context_handle strict_context_handle
#endif
] ]
interface Irot interface Irot
{ {

8
reactos/include/reactos/wine/wined3d.idl
View file

@ -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); IWineD3D *WineDirect3DCreate(UINT dxVersion, void *parent);
IWineD3DClipper *WineDirect3DCreateClipper(void); IWineD3DClipper *WineDirect3DCreateClipper(void);
void wined3d_mutex_lock(void); void wined3d_mutex_lock(void);
void wined3d_mutex_unlock(void); void wined3d_mutex_unlock(void);
#endif