From 5e93a74478442d3a0534aa19547cd4f81e907f96 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 13 Dec 2017 20:18:14 +0330 Subject: [PATCH] include: Remove some superfluous semicolons. Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- include/access.idl | 2 +- include/amstream.idl | 2 +- include/asptlb.idl | 2 +- include/audiopolicy.idl | 12 +++--- include/axextend.idl | 8 ++-- include/bits3_0.idl | 2 +- include/cmdbas.idl | 2 +- include/cmdtxt.idl | 2 +- include/comsvcs.idl | 2 +- include/cordebug.idl | 76 ++++++++++++++++----------------- include/d3d10sdklayers.idl | 2 +- include/d3dx10core.idl | 6 +-- include/d3dx11core.idl | 6 +-- include/devicetopology.idl | 2 +- include/docobjectservice.idl | 2 +- include/dwrite.idl | 2 +- include/dwrite_1.idl | 18 ++++---- include/dwrite_2.idl | 2 +- include/dxva2api.idl | 12 +++--- include/iads.idl | 10 ++--- include/mediaobj.idl | 2 +- include/metahost.idl | 4 +- include/mfreadwrite.idl | 4 +- include/mftransform.idl | 2 +- include/mlang.idl | 2 +- include/mscoree.idl | 2 +- include/msdadc.idl | 4 +- include/msinkaut.idl | 40 +++++++++--------- include/mstask.idl | 4 +- include/msxml2.idl | 78 +++++++++++++++++----------------- include/msxml6.idl | 82 ++++++++++++++++++------------------ include/netcfgx.idl | 8 ++-- include/netcon.idl | 2 +- include/oleacc.idl | 2 +- include/pstore.idl | 2 +- include/qedit.idl | 24 +++++------ include/shdeprecated.idl | 8 ++-- include/shobjidl.idl | 2 +- include/stdole2.idl | 16 +++---- include/textstor.idl | 4 +- include/transact.idl | 14 +++--- include/txcoord.idl | 28 ++++++------ include/txdtc.idl | 76 ++++++++++++++++----------------- include/urlmon.idl | 2 +- include/vmr9.idl | 28 ++++++------ include/vmrender.idl | 28 ++++++------ include/wbemcli.idl | 12 +++--- include/wbemdisp.idl | 38 ++++++++--------- include/wincodec.idl | 4 +- include/wmdrmsdk.idl | 4 +- include/wmiutils.idl | 6 +-- include/wmsbuffer.idl | 2 +- include/wmsdkidl.idl | 44 +++++++++---------- include/wsdxml.idl | 2 +- 54 files changed, 376 insertions(+), 376 deletions(-) diff --git a/include/access.idl b/include/access.idl index a1585f23b2e..5ade09b85ce 100644 --- a/include/access.idl +++ b/include/access.idl @@ -80,4 +80,4 @@ interface IAccessor : IUnknown [in, out, unique] DBREFCOUNT *pcRefCount, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/amstream.idl b/include/amstream.idl index d4e5e357a61..36e77931904 100644 --- a/include/amstream.idl +++ b/include/amstream.idl @@ -79,7 +79,7 @@ interface IDirectShowStream : IDispatch [propput, id(2), helpstring("property Video")] HRESULT Video([in] OUTPUT_STATE newVal); [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); [propput, id(3), helpstring("property Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); -}; +} [ object, diff --git a/include/asptlb.idl b/include/asptlb.idl index d0109083847..b38bc5d1fe9 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -38,7 +38,7 @@ interface IRequestDictionary : IDispatch [propget] HRESULT Key([in] VARIANT key, [retval, out] VARIANT *value); -}; +} [ object, diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index d1832bb523e..6299c9d908d 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -144,7 +144,7 @@ interface IAudioSessionControl2 : IAudioSessionControl HRESULT SetDuckingPreferences( [in] BOOL optOut ); -}; +} [ local, @@ -164,7 +164,7 @@ interface IAudioSessionManager : IUnknown [in] DWORD StreamFlags, [out] ISimpleAudioVolume **AudioVolume ); -}; +} [ local, @@ -181,7 +181,7 @@ interface IAudioVolumeDuckNotification : IUnknown HRESULT OnVolumeUnduckNotification( [in] LPCWSTR sessionID ); -}; +} [ local, @@ -194,7 +194,7 @@ interface IAudioSessionNotification : IUnknown HRESULT OnSessionCreated( [in] IAudioSessionControl *NewSession ); -}; +} [ local, @@ -211,7 +211,7 @@ interface IAudioSessionEnumerator : IUnknown [in] INT SessionCount, [out] IAudioSessionControl **Session ); -}; +} [ local, @@ -237,4 +237,4 @@ interface IAudioSessionManager2 : IAudioSessionManager HRESULT UnregisterDuckNotification( [in] IAudioVolumeDuckNotification *duckNotification ); -}; +} diff --git a/include/axextend.idl b/include/axextend.idl index 63eb542ea2b..ae891c7a539 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -851,7 +851,7 @@ interface IAMCertifiedOutputProtection : IUnknown HRESULT ProtectionStatus( [in] const AMCOPPStatusInput* pStatusInput, [out] AMCOPPStatusOutput* pStatusOutput); -}; +} enum _AM_RENSDEREXFLAGS { @@ -1246,7 +1246,7 @@ enum _AM_FILTER_MISC_FLAGS interface IAMFilterMiscFlags : IUnknown { ULONG GetMiscFlags(); -}; +} [ local, @@ -1261,7 +1261,7 @@ interface IAMGraphBuilderCallback : IUnknown HRESULT CreatedFilter( [in] IBaseFilter *pFil); -}; +} [ local, @@ -1281,4 +1281,4 @@ interface IAMVfwCaptureDialogs : IUnknown [in] int msg, [in] long data1, [in] long data2); -}; +} diff --git a/include/bits3_0.idl b/include/bits3_0.idl index cb6c309b365..4c786e6c20d 100644 --- a/include/bits3_0.idl +++ b/include/bits3_0.idl @@ -50,7 +50,7 @@ cpp_quote("#define BG_JOB_DISABLE_BRANCH_CACHE 0x0004") HRESULT GetOwnerElevationState([out, ref] BOOL *elevated); HRESULT SetMaximumDownloadTime(ULONG timeout); HRESULT GetMaximumDownloadTime([out,ref] ULONG *timeout); -}; +} [ uuid(659cdea6-489e-11d9-a9cd-000d56965251), diff --git a/include/cmdbas.idl b/include/cmdbas.idl index 5ac9bb47d19..129c31741dd 100644 --- a/include/cmdbas.idl +++ b/include/cmdbas.idl @@ -63,4 +63,4 @@ interface ICommand : IUnknown HRESULT RemoteGetDBSession([in] REFIID riid, [out, iid_is(riid)] IUnknown **ppSession, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/cmdtxt.idl b/include/cmdtxt.idl index 1d68d7a4245..6df8ae831d5 100644 --- a/include/cmdtxt.idl +++ b/include/cmdtxt.idl @@ -45,4 +45,4 @@ interface ICommandText : ICommand [in, unique] LPCOLESTR pwszCommand, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/comsvcs.idl b/include/comsvcs.idl index 2c510f8e6ad..d64af1f5a85 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -96,4 +96,4 @@ library COMSVCSLib { [default] interface IDispenserManager; }; -}; +} diff --git a/include/cordebug.idl b/include/cordebug.idl index 0488fd9c1b7..225f7265b76 100644 --- a/include/cordebug.idl +++ b/include/cordebug.idl @@ -149,7 +149,7 @@ interface ICorDebugValue : IUnknown HRESULT GetSize([out] ULONG32 *pSize); HRESULT GetAddress([out] CORDB_ADDRESS *pAddress); HRESULT CreateBreakpoint([out] ICorDebugValueBreakpoint **ppBreakpoint); -}; +} [ object, @@ -189,7 +189,7 @@ interface ICorDebugThread : IUnknown HRESULT GetRegisterSet([out] ICorDebugRegisterSet **ppRegisters); HRESULT CreateEval([out] ICorDebugEval **ppEval); HRESULT GetObject([out] ICorDebugValue **ppObject); -}; +} [ object, @@ -216,7 +216,7 @@ interface ICorDebugController : IUnknown HRESULT CommitChanges([in] ULONG cSnapshots, [in] ICorDebugEditAndContinueSnapshot *pSnapshots[], [out] ICorDebugErrorInfoEnum **pError); -}; +} [ object, @@ -245,7 +245,7 @@ interface ICorDebugProcess : ICorDebugController HRESULT GetObject([out] ICorDebugValue **ppObject); HRESULT ThreadForFiberCookie([in] DWORD fiberCookie, [out] ICorDebugThread **ppThread); HRESULT GetHelperThreadID([out] DWORD *pThreadID); -}; +} [ object, @@ -266,7 +266,7 @@ interface ICorDebugAppDomain : ICorDebugController HRESULT GetObject([out] ICorDebugValue **ppObject); HRESULT Attach(); HRESULT GetID([out] ULONG32 *pId); -}; +} [ object, @@ -354,7 +354,7 @@ interface ICorDebugManagedCallback : IUnknown HRESULT BreakpointSetError([in] ICorDebugAppDomain *pAppDomain, [in] ICorDebugThread *pThread, [in] ICorDebugBreakpoint *pBreakpoint, [in] DWORD dwError); -}; +} [ object, @@ -410,7 +410,7 @@ interface ICorDebugManagedCallback2 : IUnknown [in] ICorDebugThread *pThread, [in] ICorDebugMDA * pMDA ); -}; +} [ object, local, @@ -438,7 +438,7 @@ interface ICorDebug : IUnknown HRESULT EnumerateProcesses([out] ICorDebugProcessEnum **ppProcess); HRESULT GetProcess([in] DWORD dwProcessId, [out] ICorDebugProcess **ppProcess); HRESULT CanLaunchOrAttach([in] DWORD dwProcessId, [in] BOOL win32DebuggingEnabled); -}; +} [ @@ -451,7 +451,7 @@ interface ICorDebugBreakpoint : IUnknown { HRESULT Activate([in] BOOL bActive); HRESULT IsActive([out] BOOL *pbActive); -}; +} [ object, @@ -463,7 +463,7 @@ interface ICorDebugFunctionBreakpoint : ICorDebugBreakpoint { HRESULT GetFunction([out] ICorDebugFunction **ppFunction); HRESULT GetOffset([out] ULONG32 *pnOffset); -}; +} [ object, @@ -474,7 +474,7 @@ interface ICorDebugFunctionBreakpoint : ICorDebugBreakpoint interface ICorDebugModuleBreakpoint : ICorDebugBreakpoint { HRESULT GetModule([out] ICorDebugModule **ppModule); -}; +} [ object, @@ -485,7 +485,7 @@ interface ICorDebugModuleBreakpoint : ICorDebugBreakpoint interface ICorDebugValueBreakpoint : ICorDebugBreakpoint { HRESULT GetValue([out] ICorDebugValue **ppValue); -}; +} [ object, @@ -535,7 +535,7 @@ interface ICorDebugStepper : IUnknown HRESULT StepRange([in] BOOL bStepIn, [in] COR_DEBUG_STEP_RANGE ranges[], [in] ULONG32 cRangeCount); HRESULT StepOut(); HRESULT SetRangeIL([in] BOOL bIL); -}; +} [ object, @@ -549,7 +549,7 @@ interface ICorDebugEnum : IUnknown HRESULT Reset(); HRESULT Clone([out] ICorDebugEnum **ppEnum); HRESULT GetCount([out] ULONG *pcelt); -}; +} [ object, @@ -562,7 +562,7 @@ interface ICorDebugAppDomainEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugAppDomain *values[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -574,7 +574,7 @@ interface ICorDebugAssemblyEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugAssembly *values[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -585,7 +585,7 @@ interface ICorDebugAssemblyEnum : ICorDebugEnum interface ICorDebugBreakpointEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugBreakpoint *breakpoints[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -596,7 +596,7 @@ interface ICorDebugBreakpointEnum : ICorDebugEnum interface ICorDebugChainEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugChain *chains[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -608,7 +608,7 @@ interface ICorDebugErrorInfoEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugEditAndContinueErrorInfo *errors[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -619,7 +619,7 @@ interface ICorDebugErrorInfoEnum : ICorDebugEnum interface ICorDebugFrameEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugFrame *frames[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -630,7 +630,7 @@ interface ICorDebugFrameEnum : ICorDebugEnum interface ICorDebugModuleEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugModule *modules[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -641,7 +641,7 @@ interface ICorDebugModuleEnum : ICorDebugEnum interface ICorDebugObjectEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] CORDB_ADDRESS objects[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -652,7 +652,7 @@ interface ICorDebugObjectEnum : ICorDebugEnum interface ICorDebugProcessEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugProcess *processes[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -663,7 +663,7 @@ interface ICorDebugProcessEnum : ICorDebugEnum interface ICorDebugStepperEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugStepper *steppers[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -674,7 +674,7 @@ interface ICorDebugStepperEnum : ICorDebugEnum interface ICorDebugThreadEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugThread *threads[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -713,7 +713,7 @@ interface ICorDebugChain : IUnknown } CorDebugChainReason; HRESULT GetReason([out] CorDebugChainReason *pReason); -}; +} [ object, @@ -731,7 +731,7 @@ interface ICorDebugFrame : IUnknown HRESULT GetCaller([out] ICorDebugFrame **ppFrame); HRESULT GetCallee([out] ICorDebugFrame **ppFrame); HRESULT CreateStepper([out] ICorDebugStepper **ppStepper); -}; +} [ @@ -846,7 +846,7 @@ interface ICorDebugEval : IUnknown HRESULT GetThread([out] ICorDebugThread **ppThread); HRESULT CreateValue([in] CorElementType elementType, [in] ICorDebugClass *pElementClass, [out] ICorDebugValue **ppValue); -}; +} [ object, @@ -863,7 +863,7 @@ interface ICorDebugEditAndContinueSnapshot : IUnknown HRESULT SetPEBytes([in] IStream *pIStream); HRESULT SetILMap([in] mdToken mdFunction, [in] ULONG cMapSize, [in] COR_IL_MAP map[]); HRESULT SetPESymbolBytes([in] IStream *pIStream); -}; +} [ object, @@ -890,7 +890,7 @@ interface ICorDebugModule : IUnknown HRESULT GetGlobalVariableValue([in] mdFieldDef fieldDef, [out] ICorDebugValue **ppValue); HRESULT GetSize([out] ULONG32 *pcBytes); HRESULT IsInMemory([out] BOOL *pInMemory); -}; +} [ object, @@ -904,7 +904,7 @@ interface ICorDebugClass : IUnknown HRESULT GetToken([out] mdTypeDef *pTypeDef); HRESULT GetStaticFieldValue([in] mdFieldDef fieldDef, [in] ICorDebugFrame *pFrame, [out] ICorDebugValue **ppValue); -}; +} [ object, @@ -919,7 +919,7 @@ interface ICorDebugAssembly : IUnknown HRESULT EnumerateModules([out] ICorDebugModuleEnum **ppModules); HRESULT GetCodeBase([in] ULONG32 cchName, [out] ULONG32 *pcchName, [out] WCHAR szName[]); HRESULT GetName([in] ULONG32 cchName, [out] ULONG32 *pcchName, [out] WCHAR szName[]); -}; +} [ @@ -938,7 +938,7 @@ interface ICorDebugFunction : IUnknown HRESULT CreateBreakpoint([out] ICorDebugFunctionBreakpoint **ppBreakpoint); HRESULT GetLocalVarSigToken([out] mdSignature *pmdSig); HRESULT GetCurrentVersionNumber([out] ULONG32 *pnCurrentVersion); -}; +} [ object, @@ -949,7 +949,7 @@ interface ICorDebugFunction : IUnknown interface ICorDebugUnmanagedCallback : IUnknown { HRESULT DebugEvent([in] LPDEBUG_EVENT pDebugEvent, [in] BOOL fOutOfBand); -}; +} [ object, @@ -982,7 +982,7 @@ interface ICorDebugObjectValue : ICorDebugValue HRESULT IsValueClass([out] BOOL *pbIsValueClass); HRESULT GetManagedCopy([out] IUnknown **ppObject); HRESULT SetFromManagedCopy([in] IUnknown *pObject); -}; +} [ object, @@ -992,7 +992,7 @@ interface ICorDebugObjectValue : ICorDebugValue ] interface ICorDebugContext : ICorDebugObjectValue { -}; +} [ object, @@ -1014,7 +1014,7 @@ interface ICorDebugCode : IUnknown [out] COR_DEBUG_IL_TO_NATIVE_MAP map[]); HRESULT GetEnCRemapSequencePoints([in] ULONG32 cMap,[out] ULONG32 *pcMap, [out] ULONG32 offsets[]); -}; +} [ object, @@ -1038,4 +1038,4 @@ interface ICorDebugMDA : IUnknown HRESULT GetFlags([in] CorDebugMDAFlags * pFlags); HRESULT GetOSThreadId([out] DWORD * pOsTid); -}; +} diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index be00876230b..c6606d2fd6f 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -673,4 +673,4 @@ interface ID3D10InfoQueue : IUnknown [in] BOOL mute ); BOOL GetMuteDebugOutput(); -}; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 40d132c01e2..c99ab82eb71 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -31,7 +31,7 @@ interface ID3DX10DataLoader HRESULT Load(); HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); HRESULT Destroy(); -}; +} [ object, @@ -43,7 +43,7 @@ interface ID3DX10DataProcessor HRESULT Process([in] void *data, [in] SIZE_T bytes); HRESULT CreateDeviceObject([out] void **dataobject); HRESULT Destroy(); -}; +} [ @@ -63,7 +63,7 @@ interface ID3DX10ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); -}; +} cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") diff --git a/include/d3dx11core.idl b/include/d3dx11core.idl index d47463cc8fc..f619e3b1b02 100644 --- a/include/d3dx11core.idl +++ b/include/d3dx11core.idl @@ -31,7 +31,7 @@ interface ID3DX11DataLoader HRESULT Load(); HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); HRESULT Destroy(); -}; +} [ object, @@ -43,7 +43,7 @@ interface ID3DX11DataProcessor HRESULT Process([in] void *data, [in] SIZE_T bytes); HRESULT CreateDeviceObject([out] void **data_object); HRESULT Destroy(); -}; +} [ object, @@ -62,4 +62,4 @@ interface ID3DX11ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *io_queue, [in] UINT *process_queue, [in] UINT *device_queue); -}; +} diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 3ff30275711..7e89d541ad6 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -604,7 +604,7 @@ interface IPart : IUnknown HRESULT UnregisterControlChangeCallback( [in] IControlChangeNotify *pNotify ); -}; +} [ pointer_default(unique), diff --git a/include/docobjectservice.idl b/include/docobjectservice.idl index 7478551b363..4e931351b49 100644 --- a/include/docobjectservice.idl +++ b/include/docobjectservice.idl @@ -64,4 +64,4 @@ interface IDocObjectService : IUnknown HRESULT IsErrorUrl( [in] LPCWSTR lpszUrl, [out] BOOL *pfIsError); -}; +} diff --git a/include/dwrite.idl b/include/dwrite.idl index 115f958649a..e6ab2b7ead4 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -620,7 +620,7 @@ interface IDWriteFontFileEnumerator : IUnknown { HRESULT MoveNext(BOOL *has_current_file); HRESULT GetCurrentFontFile(IDWriteFontFile **font_file); -}; +} [ local, diff --git a/include/dwrite_1.idl b/include/dwrite_1.idl index 4015c1232c1..c00e922076f 100644 --- a/include/dwrite_1.idl +++ b/include/dwrite_1.idl @@ -584,7 +584,7 @@ interface IDWriteFactory1 : IDWriteFactory DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams1** params); -}; +} [ local, @@ -633,7 +633,7 @@ interface IDWriteFontFace1 : IDWriteFontFace const UINT16 *nominal_indices, UINT16 *vertical_indices); BOOL HasVerticalGlyphVariants(); -}; +} [ local, @@ -648,7 +648,7 @@ interface IDWriteFont1 : IDWriteFont DWRITE_UNICODE_RANGE *ranges, UINT32 *count); BOOL IsMonospacedFont(); -}; +} [ local, @@ -658,7 +658,7 @@ uuid(94413cf4-a6fc-4248-8b50-6674348fcad3) interface IDWriteRenderingParams1 : IDWriteRenderingParams { FLOAT GetGrayscaleEnhancedContrast(); -}; +} [ local, @@ -744,7 +744,7 @@ interface IDWriteTextAnalyzer1 : IDWriteTextAnalyzer UINT16 *modified_indices, FLOAT *modified_advances, DWRITE_GLYPH_OFFSET *modified_offsets); -}; +} [ local, @@ -758,7 +758,7 @@ interface IDWriteTextAnalysisSource1 : IDWriteTextAnalysisSource UINT32 *length, DWRITE_VERTICAL_GLYPH_ORIENTATION *orientation, UINT8 *bidi_level); -}; +} [ local, @@ -774,7 +774,7 @@ interface IDWriteTextAnalysisSink1 : IDWriteTextAnalysisSink UINT8 adjusted_bidilevel, BOOL is_sideways, BOOL is_rtl); -}; +} [ local, @@ -804,7 +804,7 @@ interface IDWriteTextLayout1 : IDWriteTextLayout FLOAT* trailing_spacing, FLOAT* minimum_advance_width, [defaultvalue(NULL)] DWRITE_TEXT_RANGE *range); -}; +} typedef enum DWRITE_TEXT_ANTIALIAS_MODE { @@ -821,4 +821,4 @@ interface IDWriteBitmapRenderTarget1 : IDWriteBitmapRenderTarget { DWRITE_TEXT_ANTIALIAS_MODE GetTextAntialiasMode(); HRESULT SetTextAntialiasMode(DWRITE_TEXT_ANTIALIAS_MODE mode); -}; +} diff --git a/include/dwrite_2.idl b/include/dwrite_2.idl index d2960eb2bca..5401cf35c5b 100644 --- a/include/dwrite_2.idl +++ b/include/dwrite_2.idl @@ -288,7 +288,7 @@ interface IDWriteColorGlyphRunEnumerator : IUnknown interface IDWriteRenderingParams2 : IDWriteRenderingParams1 { DWRITE_GRID_FIT_MODE GetGridFitMode(); -}; +} [ local, diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 8dd1d961335..88c586fa088 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -341,7 +341,7 @@ interface IDirect3DDeviceManager9 : IUnknown [in] HANDLE hDevice, [in] REFIID riid, [out] void** ppService); -}; +} /***************************************************************************** * IDirectXVideoAccelerationService interface @@ -363,7 +363,7 @@ interface IDirectXVideoAccelerationService : IUnknown [in] DWORD dxvaType, [out] IDirect3DSurface9 **ppSurface, [in, out] HANDLE *pSharedHandle); -}; +} /***************************************************************************** * IDirectXVideoDecoderService interface @@ -398,7 +398,7 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService [in] IDirect3DSurface9 **ppDecoderRenderTargets, [in] UINT NumSurfaces, [out] IDirectXVideoDecoder **ppDecode); -}; +} /***************************************************************************** * IDirectXVideoDecoder interface @@ -437,7 +437,7 @@ interface IDirectXVideoDecoder : IUnknown HRESULT Execute( [in] const DXVA2_DecodeExecuteParams* pExecuteParams); -}; +} /***************************************************************************** * IDirectXVideoProcessorService interface @@ -496,7 +496,7 @@ interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService [in] D3DFORMAT RenderTargetFormat, [in] UINT MaxNumSubStreams, [out] IDirectXVideoProcessor** ppVidProcess); -}; +} /***************************************************************************** * IDirectXVideoProcessor interface @@ -534,7 +534,7 @@ interface IDirectXVideoProcessor : IUnknown [in] const DXVA2_VideoSample* pSamples, [in] UINT NumSamples, [out] HANDLE* pHandleCompleteIDirect3DDeviceManager9); -}; +} /***************************************************************************** * IDirectXVideoMemoryConfiguration interface diff --git a/include/iads.idl b/include/iads.idl index de5730db645..e7ad5fb549b 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -414,7 +414,7 @@ interface IADs : IDispatch [id(0x0000000e)] HRESULT GetInfoEx( [in] VARIANT vProperties, [in] long lnReserved); -}; +} /***************************************************************************** * IADsMembers interface @@ -438,7 +438,7 @@ interface IADsMembers : IDispatch [id(0x00000003), propput] HRESULT Filter([in] VARIANT pvFilter); -}; +} /***************************************************************************** * IADsGroup interface @@ -467,7 +467,7 @@ interface IADsGroup : IADs { [id(0x00000013)] HRESULT Remove([in] BSTR bstrItemToBeRemoved); -}; +} /***************************************************************************** * IADsUser interface @@ -752,7 +752,7 @@ interface IADsUser : IADs [id(0x00000044)] HRESULT ChangePassword([in] BSTR bstrOldPassword, [in] BSTR bstrNewPassword); -}; +} /***************************************************************************** * IDirectorySearch interface @@ -776,4 +776,4 @@ interface IDirectorySearch : IUnknown [out] PADS_SEARCH_COLUMN pSearchColumn); HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); -}; +} diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 04c82e890a0..3c426f727d4 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -213,7 +213,7 @@ interface IMediaObject : IUnknown ); HRESULT Lock(LONG bLock); -}; +} /***************************************************************************** * IMediaObjectInPlace interface diff --git a/include/metahost.idl b/include/metahost.idl index 549d664c5fa..5022c74557c 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -104,7 +104,7 @@ interface ICLRRuntimeInfo : IUnknown HRESULT IsStarted( [out] BOOL *pbStarted, [out] DWORD *pdwStartupFlags); -}; +} typedef HRESULT (__stdcall *CallbackThreadSetFnPtr)(); typedef HRESULT (__stdcall *CallbackThreadUnsetFnPtr)(); @@ -150,7 +150,7 @@ interface ICLRMetaHost : IUnknown HRESULT ExitProcess( [in] INT32 iExitCode); -}; +} [ object, diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 834aa093bdf..ad1cef6784a 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -98,7 +98,7 @@ interface IMFSourceReader : IUnknown HRESULT Flush([in] DWORD index); HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); -}; +} [ object, @@ -118,7 +118,7 @@ interface IMFSinkWriter : IUnknown HRESULT Finalize(void); HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); -}; +} [ object, diff --git a/include/mftransform.idl b/include/mftransform.idl index 165cad4afd1..14f74a3eb9f 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -110,4 +110,4 @@ interface IMFTransform : IUnknown [local] HRESULT ProcessOutput([in] DWORD flags, [in] DWORD count, [in,out,size_is(count)] MFT_OUTPUT_DATA_BUFFER *samples, [out] DWORD *status); -}; +} diff --git a/include/mlang.idl b/include/mlang.idl index a4970928609..5867648b04f 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -437,7 +437,7 @@ interface IMLangConvertCharset : IUnknown coclass CMLangConvertCharset { [default] interface IMLangConvertCharset; -}; +} [ object, diff --git a/include/mscoree.idl b/include/mscoree.idl index 41602649cf1..d7e3227e6c7 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -183,7 +183,7 @@ interface ICorRuntimeHost : IUnknown HRESULT UnloadDomain([in] IUnknown* appDomain); HRESULT CurrentDomain([out] IUnknown** appDomain); -}; +} cpp_quote("DEFINE_GUID(CLSID_CLRRuntimeHost, 0x90f1a06e,0x7712,0x4762,0x86,0xb5,0x7a,0x5e,0xba,0x6b,0xdb,0x02);") diff --git a/include/msdadc.idl b/include/msdadc.idl index b1954c2072f..e13457abf26 100644 --- a/include/msdadc.idl +++ b/include/msdadc.idl @@ -61,7 +61,7 @@ interface IDataConvert : IUnknown [in] DBLENGTH *pcbSrcLength, [out] DBLENGTH *pcbDstLength, [in, size_is(*pcbSrcLength)] void *pSrc); -}; +} [ object, @@ -89,4 +89,4 @@ interface IDCInfo : IUnknown HRESULT SetInfo([in] ULONG cInfo, [in, size_is(cInfo)] DCINFO prgInfo[]); -}; +} diff --git a/include/msinkaut.idl b/include/msinkaut.idl index 58ae86c811a..743dec82a40 100644 --- a/include/msinkaut.idl +++ b/include/msinkaut.idl @@ -118,7 +118,7 @@ library MSINKAUTLib [id(0x00000001), propget] HRESULT Guid([out, retval] BSTR* Guid); [id(0x00000002), propget] HRESULT Data([out, retval] VARIANT* Data); [id(0x00000002), propput] HRESULT Data([in] VARIANT Data); - }; + } [ odl, @@ -141,7 +141,7 @@ library MSINKAUTLib HRESULT DoesPropertyExist( [in] BSTR Guid, [out, retval] VARIANT_BOOL* DoesPropertyExist); - }; + } [ odl, @@ -184,7 +184,7 @@ library MSINKAUTLib [out, retval] IInkExtendedProperties** Properties); [id(0x0000000a)] HRESULT Clone( [out, retval] IInkDrawingAttributes** DrawingAttributes); - }; + } cpp_quote("#ifndef _WINGDI_") /* already defined in wingdi.h but needed for WIDL */ @@ -257,7 +257,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x0000000f), propget, hidden] HRESULT Data( [out, retval] XFORM* XFORM); [id(0x0000000f), propput, hidden] HRESULT Data([in] XFORM XFORM); - }; + } interface IInkDisp; @@ -289,7 +289,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] long Left, [in] long Bottom, [in] long Right); - }; + } interface IInkStrokes; @@ -410,7 +410,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x00000021)] HRESULT ScaleTransform( [in] single HorizontalMultiplier, [in] single VerticalMultiplier); - }; + } interface IInkRecognitionResult; @@ -468,7 +468,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Clip( [in] IInkRectangle *Rectangle); HRESULT RemoveRecognitionResult(); - }; + } [ odl, @@ -490,7 +490,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Remove( [in] VARIANT Identifier); HRESULT Clear(); - }; + } interface IInkRecognitionAlternate; interface IInkRecognitionAlternates; @@ -518,7 +518,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT ModifyTopAlternate( [in] IInkRecognitionAlternate *Alternate); HRESULT SetResultOnStrokes(); - }; + } [ odl, @@ -564,7 +564,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT GetPropertyValue( [in] BSTR PropertyType, [out, retval] VARIANT *PropertyValue); - }; + } [ odl, @@ -582,7 +582,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] long Index, [out, retval] IInkRecognitionAlternate **InkRecoAlternate); - }; + } [ odl, @@ -674,7 +674,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] long y, [in, unique] IDataObject *DataObject, [out, retval] IInkStrokes **Strokes); - }; + } [ odl, @@ -727,7 +727,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] single HorizontalMultiplier, [in] single VerticalMultiplier, [in, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth); - }; + } typedef enum { ICM_InkOnly, @@ -782,7 +782,7 @@ cpp_quote("#endif /* _WINGDI_ */") [out] long* Maximum, [out] TabletPropertyMetricUnit* Units, [out] single* Resolution); - }; + } typedef enum { ICBS_Unavailable, @@ -800,7 +800,7 @@ cpp_quote("#endif /* _WINGDI_ */") [propget] HRESULT Name([out, retval] BSTR* Name); [propget] HRESULT Id([out, retval] BSTR* Id); [propget] HRESULT State([out, retval] InkCursorButtonState* CurrentState); - }; + } [ odl, @@ -814,7 +814,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] VARIANT Identifier, [out, retval] IInkCursorButton** Button); - }; + } [ odl, @@ -835,7 +835,7 @@ cpp_quote("#endif /* _WINGDI_ */") [out, retval] IInkTablet** Tablet); [id(0x00000003), propget] HRESULT Buttons( [out, retval] IInkCursorButtons** Buttons); - }; + } [ odl, @@ -849,7 +849,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] long Index, [out, retval] IInkCursor** Cursor); - }; + } typedef enum { IAG_AllGestures = 0, @@ -1005,5 +1005,5 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x0000000a)] HRESULT SetEventInterest( [in] InkCollectorEventInterest EventId, [in] VARIANT_BOOL Listen); - }; -}; + } +} diff --git a/include/mstask.idl b/include/mstask.idl index ecff641e23a..0a79b79118d 100644 --- a/include/mstask.idl +++ b/include/mstask.idl @@ -380,7 +380,7 @@ interface ITaskScheduler : IUnknown coclass CTaskScheduler { [default] interface ITaskScheduler; -}; +} [ @@ -390,4 +390,4 @@ coclass CTaskScheduler coclass CTask { [default] interface ITask; -}; +} diff --git a/include/msxml2.idl b/include/msxml2.idl index b9cead8622a..cfafc421336 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -684,7 +684,7 @@ interface IXMLDOMSchemaCollection2 : IXMLDOMSchemaCollection HRESULT getDeclaration( [in] IXMLDOMNode* node, [out,retval]ISchemaItem** item); -}; +} [ local, @@ -1369,7 +1369,7 @@ interface IXMLHTTPRequest : IDispatch [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); -}; +} [ object, @@ -1897,7 +1897,7 @@ interface ISAXAttributes : IUnknown [in] int nQName, [out] const WCHAR ** pValue, [out] int * nValue); -}; +} [ object, @@ -1957,7 +1957,7 @@ interface ISAXContentHandler : IUnknown HRESULT skippedEntity( [in] const WCHAR * pName, [in] int nName); -}; +} [ object, @@ -1997,7 +1997,7 @@ interface ISAXDeclHandler : IUnknown [in] int nPublicId, [in] const WCHAR * pSystemId, [in] int nSystemId); -}; +} [ object, @@ -2023,7 +2023,7 @@ interface ISAXDTDHandler : IUnknown [in] int nSystemId, [in] const WCHAR * pNotationName, [in] int nNotationName); -}; +} [ object, @@ -2036,7 +2036,7 @@ interface ISAXEntityResolver : IUnknown [in] const WCHAR * pPublicId, [in] const WCHAR * pSystemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2059,7 +2059,7 @@ interface ISAXErrorHandler : IUnknown [in] ISAXLocator * pLocator, [in] const WCHAR * pErrorMessage, [in] HRESULT hrErrorCode); -}; +} [ object, @@ -2093,7 +2093,7 @@ interface ISAXLexicalHandler : IUnknown HRESULT comment( [in] const WCHAR * pChars, [in] int nChars); -}; +} [ object, @@ -2113,7 +2113,7 @@ interface ISAXLocator : IUnknown HRESULT getSystemId( [out, retval] const WCHAR ** systemId); -}; +} [ local, @@ -2126,7 +2126,7 @@ interface ISAXXMLFilter : ISAXXMLReader [out, retval] ISAXXMLReader ** pReader); HRESULT putParent( [in] ISAXXMLReader * reader); -}; +} [ local, @@ -2232,7 +2232,7 @@ interface IVBSAXAttributes : IDispatch [id(DISPID_SAX_ATTRIBUTES_GETVALUEFROMQNAME)] HRESULT getValueFromQName( [in] BSTR QName, [out, retval] BSTR * value); -}; +} [ object, @@ -2279,7 +2279,7 @@ interface IVBSAXContentHandler : IDispatch [id(DISPID_SAX_CONTENTHANDLER_SKIPPEDENTITY)] HRESULT skippedEntity( [in, out] BSTR * name); -}; +} [ object, @@ -2312,7 +2312,7 @@ interface IVBSAXDeclHandler : IDispatch [in, out] BSTR * name, [in, out] BSTR * publicId, [in, out] BSTR * systemId); -}; +} [ object, @@ -2334,7 +2334,7 @@ interface IVBSAXDTDHandler : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [in, out] BSTR * notationName); -}; +} [ object, @@ -2349,7 +2349,7 @@ interface IVBSAXEntityResolver : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2376,7 +2376,7 @@ interface IVBSAXErrorHandler : IDispatch [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, [in] LONG errorCode); -}; +} [ object, @@ -2406,7 +2406,7 @@ interface IVBSAXLexicalHandler : IDispatch [id(DISPID_SAX_LEXICALHANDLER_COMMENT)] HRESULT comment( [in, out] BSTR * chars); -}; +} [ object, @@ -2427,7 +2427,7 @@ interface IVBSAXLocator : IDispatch [propget, id(DISPID_SAX_LOCATOR_SYSTEMID)] HRESULT systemId( [out, retval] BSTR * systemId); -}; +} [ object, @@ -2442,7 +2442,7 @@ interface IVBSAXXMLFilter : IDispatch [propputref, id(DISPID_SAX_XMLFILTER_PARENT)] HRESULT parent( [in] IVBSAXXMLReader * reader); -}; +} [ dual, @@ -2558,7 +2558,7 @@ interface IMXAttributes : IDispatch [id(DISPID_MX_ATTRIBUTES_SETVALUE)] HRESULT setValue([in] int index, [in] BSTR value); -}; +} [ local, @@ -2589,7 +2589,7 @@ interface IMXReaderControl : IDispatch [id(DISPID_MX_READER_CONTROL_SUSPEND)] HRESULT suspend(); -}; +} [ object, @@ -2641,7 +2641,7 @@ interface IMXWriter : IDispatch [id(DISPID_MX_WRITER_FLUSH)] HRESULT flush(); -}; +} [ local, @@ -2837,7 +2837,7 @@ interface ISchemaStringCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval] IUnknown** ppunk); -}; +} [ local, @@ -2871,7 +2871,7 @@ interface ISchemaItemCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval]IUnknown** ppunk); -}; +} [ local, @@ -2910,7 +2910,7 @@ interface ISchemaItem : IDispatch HRESULT writeAnnotation( [in] IUnknown* annotationSink, [out,retval] VARIANT_BOOL* isWritten); -}; +} [ local, @@ -2956,7 +2956,7 @@ interface ISchema : ISchemaItem [id(DISPID_SOM_SCHEMALOCATIONS), propget] HRESULT schemaLocations( [out,retval] ISchemaStringCollection** schemaLocations); -}; +} [ local, @@ -2974,7 +2974,7 @@ interface ISchemaParticle : ISchemaItem [id(DISPID_SOM_MAXOCCURS), propget] HRESULT maxOccurs( [out,retval] VARIANT* maxOccurs); -}; +} [ object, @@ -3007,7 +3007,7 @@ interface ISchemaAttribute : ISchemaItem [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3061,7 +3061,7 @@ interface ISchemaElement : ISchemaParticle [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3140,7 +3140,7 @@ interface ISchemaType : ISchemaItem [id(DISPID_SOM_PATTERNS), propget] HRESULT patterns( [out,retval] ISchemaStringCollection** patterns); -}; +} [ local, @@ -3174,7 +3174,7 @@ interface ISchemaComplexType : ISchemaType [id(DISPID_SOM_PROHIBITED), propget] HRESULT prohibitedSubstitutions( [out,retval] SCHEMADERIVATIONMETHOD* prohibited); -}; +} [ local, @@ -3192,7 +3192,7 @@ interface ISchemaAttributeGroup : ISchemaItem [id(DISPID_SOM_ATTRIBUTES), propget] HRESULT attributes( [out,retval] ISchemaItemCollection** attributes); -}; +} [ local, @@ -3206,7 +3206,7 @@ interface ISchemaModelGroup : ISchemaParticle [id(DISPID_SOM_PARTICLES), propget] HRESULT particles( [out,retval] ISchemaItemCollection** particles); -}; +} [ local, @@ -3224,7 +3224,7 @@ interface ISchemaAny : ISchemaParticle [id(DISPID_SOM_PROCESSCONTENTS), propget] HRESULT processContents( [out,retval] SCHEMAPROCESSCONTENTS* processContents); -}; +} [ local, @@ -3246,7 +3246,7 @@ interface ISchemaIdentityConstraint : ISchemaItem [id(DISPID_SOM_REFERENCEDKEY), propget] HRESULT referencedKey( [out,retval] ISchemaIdentityConstraint** key); -}; +} [ local, @@ -3264,7 +3264,7 @@ interface ISchemaNotation : ISchemaItem [id(DISPID_SOM_PUBLICIDENTIFIER), propget] HRESULT publicIdentifier( [out,retval] BSTR* uri); -}; +} [ @@ -3279,7 +3279,7 @@ coclass SAXXMLReader30 [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f) @@ -3415,7 +3415,7 @@ coclass MXXMLWriter30 interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(88d969c8-f192-11d4-a65f-0040963251e5), diff --git a/include/msxml6.idl b/include/msxml6.idl index 1169e13fdbc..1f657a8cde9 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -605,7 +605,7 @@ interface IXMLDOMSchemaCollection2 : IXMLDOMSchemaCollection HRESULT getDeclaration( [in] IXMLDOMNode* node, [out,retval]ISchemaItem** item); -}; +} [ local, @@ -1263,7 +1263,7 @@ interface IXMLHTTPRequest : IDispatch [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); -}; +} [ object, @@ -1761,7 +1761,7 @@ interface ISAXAttributes : IUnknown [in] int nQName, [out] const WCHAR ** pValue, [out] int * nValue); -}; +} [ object, @@ -1821,7 +1821,7 @@ interface ISAXContentHandler : IUnknown HRESULT skippedEntity( [in] const WCHAR * pName, [in] int nName); -}; +} [ object, @@ -1861,7 +1861,7 @@ interface ISAXDeclHandler : IUnknown [in] int nPublicId, [in] const WCHAR * pSystemId, [in] int nSystemId); -}; +} [ object, @@ -1887,7 +1887,7 @@ interface ISAXDTDHandler : IUnknown [in] int nSystemId, [in] const WCHAR * pNotationName, [in] int nNotationName); -}; +} [ object, @@ -1900,7 +1900,7 @@ interface ISAXEntityResolver : IUnknown [in] const WCHAR * pPublicId, [in] const WCHAR * pSystemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -1923,7 +1923,7 @@ interface ISAXErrorHandler : IUnknown [in] ISAXLocator * pLocator, [in] const WCHAR * pErrorMessage, [in] HRESULT hrErrorCode); -}; +} [ object, @@ -1957,7 +1957,7 @@ interface ISAXLexicalHandler : IUnknown HRESULT comment( [in] const WCHAR * pChars, [in] int nChars); -}; +} [ object, @@ -1977,7 +1977,7 @@ interface ISAXLocator : IUnknown HRESULT getSystemId( [out, retval] const WCHAR ** systemId); -}; +} [ local, @@ -1990,7 +1990,7 @@ interface ISAXXMLFilter : ISAXXMLReader [out, retval] ISAXXMLReader ** pReader); HRESULT putParent( [in] ISAXXMLReader * reader); -}; +} [ local, @@ -2096,7 +2096,7 @@ interface IVBSAXAttributes : IDispatch [id(DISPID_SAX_ATTRIBUTES_GETVALUEFROMQNAME)] HRESULT getValueFromQName( [in] BSTR QName, [out, retval] BSTR * value); -}; +} [ object, @@ -2143,7 +2143,7 @@ interface IVBSAXContentHandler : IDispatch [id(DISPID_SAX_CONTENTHANDLER_SKIPPEDENTITY)] HRESULT skippedEntity( [in, out] BSTR * name); -}; +} [ object, @@ -2176,7 +2176,7 @@ interface IVBSAXDeclHandler : IDispatch [in, out] BSTR * name, [in, out] BSTR * publicId, [in, out] BSTR * systemId); -}; +} [ object, @@ -2198,7 +2198,7 @@ interface IVBSAXDTDHandler : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [in, out] BSTR * notationName); -}; +} [ object, @@ -2213,7 +2213,7 @@ interface IVBSAXEntityResolver : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2240,7 +2240,7 @@ interface IVBSAXErrorHandler : IDispatch [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, [in] LONG errorCode); -}; +} [ object, @@ -2270,7 +2270,7 @@ interface IVBSAXLexicalHandler : IDispatch [id(DISPID_SAX_LEXICALHANDLER_COMMENT)] HRESULT comment( [in, out] BSTR * chars); -}; +} [ object, @@ -2291,7 +2291,7 @@ interface IVBSAXLocator : IDispatch [propget, id(DISPID_SAX_LOCATOR_SYSTEMID)] HRESULT systemId( [out, retval] BSTR * systemId); -}; +} [ object, @@ -2306,7 +2306,7 @@ interface IVBSAXXMLFilter : IDispatch [propputref, id(DISPID_SAX_XMLFILTER_PARENT)] HRESULT parent( [in] IVBSAXXMLReader * reader); -}; +} [ dual, @@ -2422,7 +2422,7 @@ interface IMXAttributes : IDispatch [id(DISPID_MX_ATTRIBUTES_SETVALUE)] HRESULT setValue([in] int index, [in] BSTR value); -}; +} [ local, @@ -2453,7 +2453,7 @@ interface IMXReaderControl : IDispatch [id(DISPID_MX_READER_CONTROL_SUSPEND)] HRESULT suspend(); -}; +} [ object, @@ -2505,7 +2505,7 @@ interface IMXWriter : IDispatch [id(DISPID_MX_WRITER_FLUSH)] HRESULT flush(); -}; +} [ local, @@ -2701,7 +2701,7 @@ interface ISchemaStringCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval] IUnknown** ppunk); -}; +} [ local, @@ -2735,7 +2735,7 @@ interface ISchemaItemCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval]IUnknown** ppunk); -}; +} [ local, @@ -2774,7 +2774,7 @@ interface ISchemaItem : IDispatch HRESULT writeAnnotation( [in] IUnknown* annotationSink, [out,retval] VARIANT_BOOL* isWritten); -}; +} [ local, @@ -2820,7 +2820,7 @@ interface ISchema : ISchemaItem [id(DISPID_SOM_SCHEMALOCATIONS), propget] HRESULT schemaLocations( [out,retval] ISchemaStringCollection** schemaLocations); -}; +} [ local, @@ -2838,7 +2838,7 @@ interface ISchemaParticle : ISchemaItem [id(DISPID_SOM_MAXOCCURS), propget] HRESULT maxOccurs( [out,retval] VARIANT* maxOccurs); -}; +} [ object, @@ -2871,7 +2871,7 @@ interface ISchemaAttribute : ISchemaItem [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -2925,7 +2925,7 @@ interface ISchemaElement : ISchemaParticle [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3004,7 +3004,7 @@ interface ISchemaType : ISchemaItem [id(DISPID_SOM_PATTERNS), propget] HRESULT patterns( [out,retval] ISchemaStringCollection** patterns); -}; +} [ local, @@ -3038,7 +3038,7 @@ interface ISchemaComplexType : ISchemaType [id(DISPID_SOM_PROHIBITED), propget] HRESULT prohibitedSubstitutions( [out,retval] SCHEMADERIVATIONMETHOD* prohibited); -}; +} [ local, @@ -3056,7 +3056,7 @@ interface ISchemaAttributeGroup : ISchemaItem [id(DISPID_SOM_ATTRIBUTES), propget] HRESULT attributes( [out,retval] ISchemaItemCollection** attributes); -}; +} [ local, @@ -3070,7 +3070,7 @@ interface ISchemaModelGroup : ISchemaParticle [id(DISPID_SOM_PARTICLES), propget] HRESULT particles( [out,retval] ISchemaItemCollection** particles); -}; +} [ local, @@ -3088,7 +3088,7 @@ interface ISchemaAny : ISchemaParticle [id(DISPID_SOM_PROCESSCONTENTS), propget] HRESULT processContents( [out,retval] SCHEMAPROCESSCONTENTS* processContents); -}; +} [ local, @@ -3110,7 +3110,7 @@ interface ISchemaIdentityConstraint : ISchemaItem [id(DISPID_SOM_REFERENCEDKEY), propget] HRESULT referencedKey( [out,retval] ISchemaIdentityConstraint** key); -}; +} [ local, @@ -3128,7 +3128,7 @@ interface ISchemaNotation : ISchemaItem [id(DISPID_SOM_PUBLICIDENTIFIER), propget] HRESULT publicIdentifier( [out,retval] BSTR* uri); -}; +} [ @@ -3139,7 +3139,7 @@ coclass SAXXMLReader [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(3124c396-fb13-4836-a6ad-1317f1713688) @@ -3149,7 +3149,7 @@ coclass SAXXMLReader30 [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f) @@ -3273,7 +3273,7 @@ coclass MXXMLWriter interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c) @@ -3293,7 +3293,7 @@ coclass MXXMLWriter30 interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(88d969c8-f192-11d4-a65f-0040963251e5), diff --git a/include/netcfgx.idl b/include/netcfgx.idl index d51407fe2ef..aa487423caa 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -74,7 +74,7 @@ interface INetCfgComponent : IUnknown HRESULT GetDeviceStatus ([out] ULONG* pulStatus); HRESULT OpenParamKey ([out] HKEY* phkey); HRESULT RaisePropertyUi ([in] HWND hwndParent, [in] DWORD dwFlags, [in] IUnknown* punkContext); -}; +} [ @@ -89,7 +89,7 @@ interface IEnumNetCfgComponent : IUnknown HRESULT Skip ([in] ULONG celt); HRESULT Reset (); HRESULT Clone ([out] IEnumNetCfgComponent** ppenum); -}; +} [ local, @@ -103,7 +103,7 @@ interface INetCfgLock : IUnknown [out] LPWSTR* ppszwClientDescription); HRESULT ReleaseWriteLock (); HRESULT IsWriteLocked ([out] LPWSTR* ppszwClientDescription); -}; +} [ local, @@ -120,7 +120,7 @@ interface INetCfg : IUnknown HRESULT EnumComponents ([in] const GUID* pguidClass, [out] IEnumNetCfgComponent** ppenumComponent); HRESULT FindComponent ([in] LPCWSTR pszwInfId, [out] INetCfgComponent** pComponent); HRESULT QueryNetCfgClass ([in] const GUID* pguidClass, [in] REFIID riid,[out] void** ppvObject); -}; +} [ helpstring("Network Configuration Component Object"), diff --git a/include/netcon.idl b/include/netcon.idl index eecc1d2af3e..3db238214f8 100644 --- a/include/netcon.idl +++ b/include/netcon.idl @@ -179,7 +179,7 @@ interface INetSharingPortMapping : IDispatch [id(4)] HRESULT Delete(); -}; +} [ object, uuid(02e4a2de-da20-4e34-89c8-ac22275a010b), diff --git a/include/oleacc.idl b/include/oleacc.idl index 33285487ce8..fd9c0786d1b 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -355,7 +355,7 @@ library Accessibility { interface IAccPropServices; } -}; +} cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);") diff --git a/include/pstore.idl b/include/pstore.idl index a963b251347..f9731d300b5 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -273,4 +273,4 @@ interface IPStore : IUnknown [in] IEnumPStoreItems** ppenum ); } -}; +} diff --git a/include/qedit.idl b/include/qedit.idl index d42e691f528..753ac15bf43 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -78,7 +78,7 @@ interface ISampleGrabber: IUnknown ISampleGrabberCB * pCallback, LONG WhichMethodToCallback ); -}; +} [ object, @@ -157,7 +157,7 @@ interface IMediaDet : IUnknown HRESULT EnterBitmapGrabMode( double SeekTime ); -}; +} [ uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), @@ -165,7 +165,7 @@ interface IMediaDet : IUnknown coclass MediaDet { [default] interface IMediaDet; -}; +} [ object, @@ -185,7 +185,7 @@ interface IMediaLocator : IUnknown HRESULT AddFoundLocation( BSTR dir ); -}; +} typedef struct { @@ -258,7 +258,7 @@ interface IPropertySetter : IUnknown [in] IUnknown * target, [in] REFERENCE_TIME now ); -}; +} [ object, @@ -275,7 +275,7 @@ interface IAMErrorLog : IUnknown long hresult, [in] VARIANT * extra ); -}; +} [ object, @@ -292,7 +292,7 @@ interface IAMSetErrorLog : IUnknown [propput] HRESULT ErrorLog( [in] IAMErrorLog * log ); -}; +} interface IAMTimeline; interface IAMTimelineGroup; @@ -439,7 +439,7 @@ interface IAMTimeline : IUnknown HRESULT GetDefaultEffectB( [out,retval] BSTR * guidb ); -}; +} [ uuid(78530B75-61F9-11D2-8CAD-00A024580902) @@ -449,7 +449,7 @@ coclass AMTimeline [default] interface IAMTimeline; interface IPersistStream; interface IAMSetErrorLog; -}; +} [ object, @@ -536,7 +536,7 @@ interface IAMTimelineGroup : IUnknown HRESULT SetRecompFormatFromSource( IAMTimelineSrc * source ); -}; +} [ object, @@ -701,7 +701,7 @@ interface IAMTimelineObj : IUnknown HRESULT GetEmbedDepth( long * depth ); -}; +} [ object, @@ -804,7 +804,7 @@ interface IAMTimelineSrc : IUnknown HRESULT SetStretchMode( int mode ); -}; +} enum { diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 1f001fd6f0d..3e1e5e70f55 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -51,7 +51,7 @@ interface ITravelEntry : IUnknown HRESULT GetPidl( [out] LPITEMIDLIST *ppidl); -}; +} [ hidden, @@ -109,7 +109,7 @@ interface ITravelLog : IUnknown [in] IUnknown *punk); HRESULT Revert(); -}; +} typedef void *CIE4ConnectionPoint; @@ -137,7 +137,7 @@ interface IExpDispSupport : IUnknown VARIANT *pVarResult, EXCEPINFO *pexcepinfo, UINT *puArgErr); -}; +} typedef enum tagBNSTATE { @@ -601,4 +601,4 @@ interface IBrowserService2 : IBrowserService HRESULT v_CheckZoneCrossing( [in, out] LPCITEMIDLIST pidl); -}; +} diff --git a/include/shobjidl.idl b/include/shobjidl.idl index f1b85a864ee..141ac78975b 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1512,7 +1512,7 @@ interface IDockingWindow : IOleWindow [in] LPCRECT prcBorder, [in] IUnknown *punkToolbarSite, [in] BOOL fReserved); -}; +} /***************************************************************************** diff --git a/include/stdole2.idl b/include/stdole2.idl index 9839c4c09a1..18c402abf42 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -268,7 +268,7 @@ library stdole HRESULT AddRefHfont([in] OLE_HANDLE hFont); HRESULT ReleaseHfont([in] OLE_HANDLE hFont); - }; + } [ @@ -299,7 +299,7 @@ library stdole appear at the end of the typelib. */ /* [default, source] dispinterface FontEvents;*/ interface IFont; - }; + } [ odl, @@ -349,7 +349,7 @@ library stdole [propget] HRESULT Attributes([out, retval] long *pdwAttr); HRESULT SetHdc([in] OLE_HANDLE hdc); - }; + } [ uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) @@ -373,7 +373,7 @@ library stdole OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, void *prcWBounds); - }; + } typedef [public] Picture IPictureDisp; @@ -383,7 +383,7 @@ library stdole coclass StdPicture { [default] dispinterface Picture; interface IPicture; - }; + } [ uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) @@ -419,7 +419,7 @@ library stdole ] HRESULT SavePicture([in] IPictureDisp *Picture, [in] BSTR filename); - }; + } [ @@ -431,9 +431,9 @@ library stdole properties: methods: [id(DISPID_FONT_CHANGED)] void FontChanged([in] BSTR PropertyName); - }; + } typedef [public] FontEvents IFontEventsDisp; -}; +} diff --git a/include/textstor.idl b/include/textstor.idl index e79443d54bb..c6d88c7d04a 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -154,7 +154,7 @@ interface ITextStoreACPSink : IUnknown HRESULT OnStartEditTransaction(); HRESULT OnEndEditTransaction(); -}; +} [ object, @@ -311,4 +311,4 @@ interface ITextStoreACP : IUnknown HRESULT GetWnd( [in] TsViewCookie vcView, [out] HWND *phwnd); -}; +} diff --git a/include/transact.idl b/include/transact.idl index c9dbc69b2ae..fb3bd42de11 100644 --- a/include/transact.idl +++ b/include/transact.idl @@ -157,7 +157,7 @@ interface ITransaction : IUnknown { [in] BOOL fRetaining, [in] BOOL fAsync); HRESULT GetTransactionInfo([out] XACTTRANSINFO *pinfo); -}; +} [ object, @@ -165,7 +165,7 @@ interface ITransaction : IUnknown { ] interface ITransactionCloner : ITransaction { HRESULT CloneWithCommitDisabled([out] ITransaction **ppITransaction); -}; +} [ object, @@ -173,7 +173,7 @@ interface ITransactionCloner : ITransaction { ] interface ITransaction2 : ITransactionCloner { HRESULT GetTransactionInfo2([out] XACTTRANSINFO *pinfo); -}; +} [ object, @@ -186,7 +186,7 @@ interface ITransactionDispenser : IUnknown { [in] ULONG isoFlags, [in, unique] ITransactionOptions *pOptions, [out] ITransaction **ppTransaction); -}; +} [ object, @@ -195,7 +195,7 @@ interface ITransactionDispenser : IUnknown { interface ITransactionOptions : IUnknown { HRESULT SetOptions([in] XACTOPT *pOptions); HRESULT GetOptions([in, out] XACTOPT *pOptions); -}; +} [ object, @@ -213,7 +213,7 @@ interface ITransactionOutcomeEvents : IUnknown { [in, unique] BOID *pboidReason, [in] HRESULT hr); HRESULT Indoubt(void); -}; +} [ object, @@ -223,4 +223,4 @@ interface ITmNodeName : IUnknown { HRESULT GetNodeNameSize([out] ULONG *pcbNodeNameSize); HRESULT GetNodeName([in] ULONG cbNodeNameBufferSize, [in, out] LPWSTR pNodeNameBuffer); -}; +} diff --git a/include/txcoord.idl b/include/txcoord.idl index fd17d58bad6..e4a578494c7 100644 --- a/include/txcoord.idl +++ b/include/txcoord.idl @@ -43,7 +43,7 @@ interface ITransactionResourceAsync : IUnknown { HRESULT CommitRequest([in]DWORD grfRM,[in]XACTUOW *pNewUOW); HRESULT AbortRequest([in]BOID *pboidReason,[in]BOOL fRetaining,[in]XACTUOW *pNewUOW); HRESULT TMDown(void); -}; +} [ object, @@ -52,7 +52,7 @@ interface ITransactionResourceAsync : IUnknown { interface ITransactionLastResourceAsync : IUnknown { HRESULT DelegateCommit([in]DWORD grfRM); HRESULT ForgetRequest([in]XACTUOW *pNewUOW); -}; +} [ object, @@ -63,7 +63,7 @@ interface ITransactionResource : IUnknown { HRESULT CommitRequest([in]DWORD grfRM,[in]XACTUOW *pNewUOW); HRESULT AbortRequest([in]BOID *pboidReason,[in]BOOL fRetaining,[in]XACTUOW *pNewUOW); HRESULT TMDown(void); -}; +} [ object, @@ -73,7 +73,7 @@ interface ITransactionEnlistmentAsync : IUnknown { HRESULT PrepareRequestDone([in]HRESULT hr,[in]IMoniker *pmk,[in]BOID *pboidReason); HRESULT CommitRequestDone([in]HRESULT hr); HRESULT AbortRequestDone([in]HRESULT hr); -}; +} [ object, @@ -81,7 +81,7 @@ interface ITransactionEnlistmentAsync : IUnknown { ] interface ITransactionLastEnlistmentAsync : IUnknown { HRESULT TransactionOutcome([in]XACTSTAT XactStat,[in]BOID *pboidReason); -}; +} [ object, @@ -90,7 +90,7 @@ interface ITransactionLastEnlistmentAsync : IUnknown { interface ITransactionExportFactory : IUnknown { HRESULT GetRemoteClassId([in]CLSID *pclsid); HRESULT Create([in]ULONG cbWhereabouts,[in]byte *rgbWhereabouts,[out]ITransactionExport **ppExport); -}; +} [ object, @@ -99,7 +99,7 @@ interface ITransactionExportFactory : IUnknown { interface ITransactionImportWhereabouts : IUnknown { HRESULT GetWhereaboutsSize([out]ULONG *pcbWhereabouts); HRESULT GetWhereabouts([in]ULONG cbWhereabouts,[out]byte *rgbWhereabouts,[out]ULONG *pcbUsed); -}; +} [ object, @@ -108,7 +108,7 @@ interface ITransactionImportWhereabouts : IUnknown { interface ITransactionExport : IUnknown { HRESULT Export([in]IUnknown *punkTransaction,[out]ULONG *pcbTransactionCookie); HRESULT GetTransactionCookie([in]IUnknown *punkTransaction,[in]ULONG cbTransactionCookie,[out]byte *rgbTransactionCookie,[out]ULONG *pcbUsed); -}; +} [ object, @@ -116,7 +116,7 @@ interface ITransactionExport : IUnknown { ] interface ITransactionImport : IUnknown { HRESULT Import([in]ULONG cbTransactionCookie,[in]byte *rgbTransactionCookie,[in]IID *piid,[out,iid_is(piid)]void **ppvTransaction); -}; +} [ object, uuid(17cf72d0-bac5-11d1-b1bf-00c04fc2f3ef) @@ -124,7 +124,7 @@ interface ITransactionImport : IUnknown { interface ITipTransaction : IUnknown { HRESULT Push([in]char *i_pszRemoteTmUrl,[out]char **o_ppszRemoteTxUrl); HRESULT GetTransactionUrl([out]char **o_ppszLocalTxUrl); -}; +} [ object, uuid(17cf72d1-bac5-11d1-b1bf-00c04fc2f3ef) @@ -133,14 +133,14 @@ interface ITipHelper : IUnknown { HRESULT Pull([in]char *i_pszTxUrl,[out]ITransaction **o_ppITransaction); HRESULT PullAsync([in]char *i_pszTxUrl,[in]ITipPullSink *i_pTipPullSink,[out]ITransaction **o_ppITransaction); HRESULT GetLocalTmUrl([out]char **o_ppszLocalTmUrl); -}; +} [ object, uuid(17cf72d2-bac5-11d1-b1bf-00c04fc2f3ef) ] interface ITipPullSink : IUnknown { HRESULT PullComplete([in]HRESULT i_hrPull); -}; +} [ object, uuid(9797c15d-a428-4291-87b6-0995031a678d) @@ -159,7 +159,7 @@ interface IDtcNetworkAccessConfig : IUnknown { HRESULT GetXAAccess([out]BOOL *pbXAAccess); HRESULT SetXAAccess([in]BOOL bXAAccess); HRESULT RestartDtcService(void); -}; +} typedef enum AUTHENTICATION_LEVEL { NO_AUTHENTICATION_REQUIRED, @@ -178,4 +178,4 @@ interface IDtcNetworkAccessConfig2 : IDtcNetworkAccessConfig { HRESULT SetNetworkOutboundAccess([in]BOOL bOutbound); HRESULT GetAuthenticationLevel([out]AUTHENTICATION_LEVEL *pAuthLevel); HRESULT SetAuthenticationLevel([in]AUTHENTICATION_LEVEL AuthLevel); -}; +} diff --git a/include/txdtc.idl b/include/txdtc.idl index 60f35a6aa84..c29447047ad 100644 --- a/include/txdtc.idl +++ b/include/txdtc.idl @@ -119,21 +119,21 @@ cpp_quote("#endif") ] interface IXATransLookup : IUnknown { HRESULT Lookup([out]ITransaction **ppTransaction); -}; +} [ object, uuid(bf193c85-0d1a-4290-b88f-d2cb8873d1e7) ] interface IXATransLookup2 : IUnknown { HRESULT Lookup([in]XID *pXID,[out]ITransaction **ppTransaction); -}; +} [ object, uuid(0d563181-defb-11ce-aed1-00aa0051e2c4) ] interface IResourceManagerSink : IUnknown { HRESULT TMDown(void); -}; +} [ object, uuid(13741d21-87eb-11ce-8081-0080c758527e) @@ -143,7 +143,7 @@ interface IResourceManager : IUnknown { HRESULT Reenlist([in]byte *pPrepInfo,[in]ULONG cbPrepInfo,[in]DWORD lTimeout,[out]XACTSTAT *pXactStat); HRESULT ReenlistmentComplete(void); HRESULT GetDistributedTransactionManager([in]REFIID iid,[out,iid_is(iid)]void **ppvObject); -}; +} [ object, uuid(4d964ad4-5b33-11d3-8a91-00c04f79eb6d) @@ -151,7 +151,7 @@ interface IResourceManager : IUnknown { interface ILastResourceManager : IUnknown { HRESULT TransactionCommitted([in]byte *pPrepInfo,[in]ULONG cbPrepInfo); HRESULT RecoveryDone(void); -}; +} [ object, uuid(d136c69a-f749-11d1-8f47-00c04f8ee57d) @@ -159,7 +159,7 @@ interface ILastResourceManager : IUnknown { interface IResourceManager2 : IResourceManager { HRESULT Enlist2([in]ITransaction *pTransaction,[in]ITransactionResourceAsync *pResAsync,[out]XACTUOW *pUOW,[out]LONG *pisoLevel,[out]XID *pXid,[out]ITransactionEnlistmentAsync **ppEnlist); HRESULT Reenlist2([in]XID *pXid,[in]DWORD dwTimeout,[out]XACTSTAT *pXactStat); -}; +} [ object, uuid(c8a6e3a1-9a8c-11cf-a308-00a0c905416e) @@ -167,7 +167,7 @@ interface IResourceManager2 : IResourceManager { interface IXAConfig : IUnknown { HRESULT Initialize([in]GUID clsidHelperDll); HRESULT Terminate(void); -}; +} /* commented out because idl doesn't accept xa_switch_t type [ object, @@ -176,28 +176,28 @@ interface IXAConfig : IUnknown { interface IRMHelper : IUnknown { HRESULT RMCount([in]DWORD dwcTotalNumberOfRMs); HRESULT RMInfo([in]xa_switch_t *pXa_Switch,[in]BOOL fCDeclCallingConv,[in]char *pszOpenString,[in]char *pszCloseString,[in]GUID guidRMRecovery); -}; +} [ object, uuid(E793F6D2-F53D-11cf-A60D-00A0C905416E) ] interface IXAObtainRMInfo : IUnknown { HRESULT ObtainRMInfo([in]IRMHelper *pIRMHelper); -};*/ +}*/ [ object, uuid(13741d20-87eb-11ce-8081-0080c758527e) ] interface IResourceManagerFactory : IUnknown { HRESULT Create([in]GUID *pguidRM,[in]CHAR *pszRMName,[in]IResourceManagerSink *pIResMgrSink,[out]IResourceManager **ppResMgr); -}; +} [ object, uuid(6b369c21-fbd2-11d1-8f47-00c04f8ee57d) ] interface IResourceManagerFactory2 : IResourceManagerFactory { HRESULT CreateEx([in]GUID *pguidRM,[in]CHAR *pszRMName,[in]IResourceManagerSink *pIResMgrSink,[in]REFIID riidRequested,[out, iid_is(riidRequested)]void **ppvResMgr); -}; +} [ object, @@ -206,7 +206,7 @@ interface IResourceManagerFactory2 : IResourceManagerFactory { interface IPrepareInfo : IUnknown { HRESULT GetPrepareInfoSize([out]ULONG *pcbPrepInfo); HRESULT GetPrepareInfo([out]byte *pPrepInfo); -}; +} [ object, uuid(5fab2547-9779-11d1-b886-00c04fb9618a) @@ -214,35 +214,35 @@ interface IPrepareInfo : IUnknown { interface IPrepareInfo2 : IUnknown { HRESULT GetPrepareInfoSize([out]ULONG *pcbPrepInfo); HRESULT GetPrepareInfo([in]ULONG cbPrepareInfo,[out]byte *pPrepInfo); -}; +} [ object, uuid(c23cc370-87ef-11ce-8081-0080c758527e) ] interface IGetDispenser : IUnknown { HRESULT GetDispenser([in]REFIID iid,[out,iid_is(iid)]void **ppvObject); -}; +} [ object, uuid(5433376c-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterBallotAsync2 : IUnknown { HRESULT VoteRequestDone([in]HRESULT hr,[in]BOID *pboidReason); -}; +} [ object, uuid(5433376b-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterNotifyAsync2 : ITransactionOutcomeEvents { HRESULT VoteRequest(void); -}; +} [ object, uuid(5433376a-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterFactory2 : IUnknown { HRESULT Create([in]ITransaction *pTransaction,[in]ITransactionVoterNotifyAsync2 *pVoterNotify,[out]ITransactionVoterBallotAsync2 **ppVoterBallot); -}; +} [ object, uuid(82dc88e1-a954-11d1-8f88-00600895e7d5) @@ -253,7 +253,7 @@ interface ITransactionPhase0EnlistmentAsync : IUnknown { HRESULT Phase0Done(void); HRESULT Unenlist(void); HRESULT GetTransaction([out]ITransaction **ppITransaction); -}; +} [ object, uuid(ef081809-0c76-11d2-87a6-00c04f990f34) @@ -261,14 +261,14 @@ interface ITransactionPhase0EnlistmentAsync : IUnknown { interface ITransactionPhase0NotifyAsync : IUnknown { HRESULT Phase0Request([in]BOOL fAbortingHint); HRESULT EnlistCompleted([in]HRESULT status); -}; +} [ object, uuid(82dc88e0-a954-11d1-8f88-00600895e7d5) ] interface ITransactionPhase0Factory : IUnknown { HRESULT Create([in]ITransactionPhase0NotifyAsync *pPhase0Notify,[out]ITransactionPhase0EnlistmentAsync **ppPhase0Enlistment); -}; +} [ object, uuid(59313e01-b36c-11cf-a539-00aa006887c3) @@ -279,14 +279,14 @@ interface ITransactionTransmitter : IUnknown { HRESULT MarshalPropagationToken([in]ULONG cbToken,[out]byte *rgbToken,[out]ULONG *pcbUsed); HRESULT UnmarshalReturnToken([in]ULONG cbReturnToken,[in]byte *rgbReturnToken); HRESULT Reset(void); -}; +} [ object, uuid(59313e00-b36c-11cf-a539-00aa006887c3) ] interface ITransactionTransmitterFactory : IUnknown { HRESULT Create([out]ITransactionTransmitter **ppTransmitter); -}; +} [ object, uuid(59313e03-b36c-11cf-a539-00aa006887c3) @@ -296,14 +296,14 @@ interface ITransactionReceiver : IUnknown { HRESULT GetReturnTokenSize([out]ULONG *pcbReturnToken); HRESULT MarshalReturnToken([in]ULONG cbReturnToken,[out]byte *rgbReturnToken,[out]ULONG *pcbUsed); HRESULT Reset(void); -}; +} [ object, uuid(59313e02-b36c-11cf-a539-00aa006887c3) ] interface ITransactionReceiverFactory : IUnknown { HRESULT Create([out]ITransactionReceiver **ppReceiver); -}; +} typedef struct _ProxyConfigParams { WORD wcThreadsMax; @@ -316,20 +316,20 @@ typedef struct _ProxyConfigParams { interface IDtcLuConfigure : IUnknown { HRESULT Add([in]byte *pucLuPair,[in]DWORD cbLuPair); HRESULT Delete([in]byte *pucLuPair,[in]DWORD cbLuPair); -}; +} [ object, uuid(ac2b8ad2-d6f0-11d0-b386-00a0c9083365) ] interface IDtcLuRecovery : IUnknown { -}; +} [ object, uuid(4131e762-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryFactory : IUnknown { HRESULT Create([in]byte *pucLuPair,[in]DWORD cbLuPair,[out]IDtcLuRecovery **ppRecovery); -}; +} typedef enum _DtcLu_LocalRecovery_Work { DTCINITIATEDRECOVERYWORK_CHECKLUSTATUS = 1, @@ -403,21 +403,21 @@ interface IDtcLuRecoveryInitiatedByDtcTransWork : IUnknown { HRESULT ConversationLost(void); HRESULT GetRecoverySeqNum([out]LONG *plRecoverySeqNum); HRESULT ObsoleteRecoverySeqNum([in]LONG lNewRecoverySeqNum); -}; +} [ object, uuid(4131e766-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryInitiatedByDtcStatusWork : IUnknown { HRESULT HandleCheckLuStatus([in]LONG lRecoverySeqNum); -}; +} [ object, uuid(4131e764-1aea-11d0-944b-00a0c905416e) ] [local] interface IDtcLuRecoveryInitiatedByDtc : IUnknown { HRESULT GetWork([in,out]DTCINITIATEDRECOVERYWORK *pWork,[in,out]void **ppv); -}; +} [ object, uuid(ac2b8ad1-d6f0-11d0-b386-00a0c9083365) @@ -431,14 +431,14 @@ interface IDtcLuRecoveryInitiatedByLuWork : IUnknown { HRESULT HandleConfirmationOfOurCompareStates([in]DTCLUCOMPARESTATESCONFIRMATION Confirmation); HRESULT HandleErrorFromOurCompareStates([in]DTCLUCOMPARESTATESERROR Error); HRESULT ConversationLost(void); -}; +} [ object, uuid(4131e768-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryInitiatedByLu : IUnknown { HRESULT GetObjectToHandleWorkFromLu([out]IDtcLuRecoveryInitiatedByLuWork **ppWork); -}; +} [ object, uuid(4131e769-1aea-11d0-944b-00a0c905416e) @@ -450,7 +450,7 @@ interface IDtcLuRmEnlistment : IUnknown { HRESULT Committed(void); HRESULT Forget(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e770-1aea-11d0-944b-00a0c905416e) @@ -465,14 +465,14 @@ interface IDtcLuRmEnlistmentSink : IUnknown { HRESULT Forget(void); HRESULT Prepare(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e771-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRmEnlistmentFactory : IUnknown { HRESULT Create([in]unsigned char *pucLuPair,[in]DWORD cbLuPair,[in]ITransaction *pITransaction,[in]unsigned char *pTransId,[in]DWORD cbTransId,[in]IDtcLuRmEnlistmentSink *pRmEnlistmentSink,[in,out]IDtcLuRmEnlistment **ppRmEnlistment); -}; +} [ object, uuid(4131e773-1aea-11d0-944b-00a0c905416e) @@ -485,7 +485,7 @@ interface IDtcLuSubordinateDtc : IUnknown { HRESULT Forget(void); HRESULT Prepare(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e774-1aea-11d0-944b-00a0c905416e) @@ -499,14 +499,14 @@ interface IDtcLuSubordinateDtcSink : IUnknown { HRESULT Committed(void); HRESULT Forget(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e775-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuSubordinateDtcFactory : IUnknown { HRESULT Create([in]unsigned char *pucLuPair,[in]DWORD cbLuPair,[in]IUnknown *punkTransactionOuter,[in]ISOLEVEL isoLevel,[in]ULONG isoFlags,[in]ITransactionOptions *pOptions,[out]ITransaction **ppTransaction,[in]unsigned char *pTransId,[in]DWORD cbTransId,[in]IDtcLuSubordinateDtcSink *pSubordinateDtcSink,[in,out]IDtcLuSubordinateDtc **ppSubordinateDtc); -}; +} /* these GUIDs were found in mingw header, but without corresponding interface definitions DEFINE_GUID(IID_IXAResourceManager,0x4131e751,0x1aea,0x11d0,0x94,0x4b,0x00,0xa0,0xc9,0x05,0x41,0x6e); diff --git a/include/urlmon.idl b/include/urlmon.idl index 9a39a7c1a6e..f1088e7c997 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2015,7 +2015,7 @@ interface IUriBuilder: IUnknown HRESULT HasBeenModified( [out] BOOL *pfModified); -}; +} cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**);") diff --git a/include/vmr9.idl b/include/vmr9.idl index bb3681cd22d..5340273f919 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -78,7 +78,7 @@ interface IVMRImagePresenter9 : IUnknown HRESULT StartPresenting([in] DWORD_PTR id); HRESULT StopPresenting([in] DWORD_PTR id); HRESULT PresentImage([in] DWORD_PTR id, [in] VMR9PresentationInfo *info); -}; +} typedef enum _VMR9SurfaceAllocationFlags { @@ -116,7 +116,7 @@ interface IVMRSurfaceAllocator9 : IUnknown HRESULT TerminateDevice([in] DWORD_PTR id); HRESULT GetSurface([in] DWORD_PTR id, [in] DWORD surfaceindex, [in] DWORD flags, [out] IDirect3DSurface9 **surface); HRESULT AdviseNotify([in] IVMRSurfaceAllocatorNotify9 *allocnotify); -}; +} [ local, @@ -128,7 +128,7 @@ interface IVMRSurfaceAllocator9 : IUnknown interface IVMRSurfaceAllocatorEx9 : IVMRSurfaceAllocator9 { HRESULT GetSurfaceEx([in] DWORD_PTR id, [in] DWORD surfaceindex, [in] DWORD flags, [out] IDirect3DSurface9 **surface, [out] RECT *dest); -}; +} [ local, @@ -144,7 +144,7 @@ interface IVMRSurfaceAllocatorNotify9 : IUnknown HRESULT ChangeD3DDevice([in] IDirect3DDevice9 *device, [in] HMONITOR monitor); HRESULT AllocateSurfaceHelper([in] VMR9AllocationInfo *allocinfo, [in, out] DWORD *numbuffers, [out] IDirect3DSurface9 **surface); HRESULT NotifyEvent([in] LONG code, [in] LONG_PTR param1, [in] LONG_PTR param2); -}; +} typedef enum _VMR9AspectRatioMode { @@ -174,7 +174,7 @@ interface IVMRWindowlessControl9 : IUnknown HRESULT GetCurrentImage([out] BYTE **dib); HRESULT SetBorderColor([in] COLORREF color); HRESULT GetBorderColor([out] COLORREF *color); -}; +} typedef enum _VMR9MixerPrefs { @@ -264,7 +264,7 @@ interface IVMRMixerControl9 : IUnknown HRESULT SetProcAmpControl([in] DWORD streamid, [in] VMR9ProcAmpControl *control); HRESULT GetProcAmpControl([in] DWORD streamid, [in, out] VMR9ProcAmpControl *control); HRESULT GetProcAmpControlRange([in] DWORD streamid, [in, out] VMR9ProcAmpControlRange *controlrange); -}; +} typedef struct _VMR9AlphaBitmap { @@ -300,7 +300,7 @@ interface IVMRMixerBitmap9 : IUnknown HRESULT SetAlphaBitmap([in] const VMR9AlphaBitmap *bitmap); HRESULT UpdateAlphaBitmapParameters([in] const VMR9AlphaBitmap *bitmap); HRESULT GetAlphaBitmapParameters([out] VMR9AlphaBitmap *bitmap); -}; +} [ local, @@ -315,7 +315,7 @@ interface IVMRSurface9 : IUnknown HRESULT LockSurface([out] BYTE **surface); HRESULT UnlockSurface(); HRESULT GetSurface([out] IDirect3DSurface9 **surface); -}; +} typedef enum _VMR9RenderPrefs { @@ -334,7 +334,7 @@ interface IVMRImagePresenterConfig9 : IUnknown { HRESULT SetRenderingPrefs([in] DWORD renderflags); HRESULT GetRenderingPrefs([out] DWORD *renderflags); -}; +} [ local, @@ -347,7 +347,7 @@ interface IVMRVideoStreamControl9: IUnknown { HRESULT SetStreamActiveState([in] BOOL active); HRESULT GetStreamActiveState([out] BOOL *active); -}; +} typedef enum _VMR9Mode { @@ -373,7 +373,7 @@ interface IVMRFilterConfig9 : IUnknown HRESULT GetRenderingPrefs([out] DWORD *renderflags); HRESULT SetRenderingMode([in] DWORD mode); HRESULT GetRenderingMode([out] DWORD *mode); -}; +} [ local, @@ -420,7 +420,7 @@ interface IVMRMonitorConfig9 : IUnknown HRESULT SetDefaultMonitor([in] UINT uDev); HRESULT GetDefaultMonitor([out] UINT *uDev); HRESULT GetAvailableMonitors([out, size_is(arraysize)] VMR9MonitorInfo *info, [in] DWORD arraysize, [out] DWORD *numdev); -}; +} typedef enum _VMR9DeinterlacePrefs { @@ -493,7 +493,7 @@ interface IVMRDeinterlaceControl9 : IUnknown HRESULT GetDeinterlacePrefs([out] DWORD *prefs); HRESULT SetDeinterlacePrefs([in] DWORD prefs); HRESULT GetActualDeinterlaceMode([in] DWORD streamid, [out] GUID *mode); -}; +} typedef struct _VMR9VideoStreamInfo { IDirect3DSurface9 *pddsVideoSurface; @@ -521,4 +521,4 @@ interface IVMRImageCompositor9 : IUnknown HRESULT CompositeImage([in] IUnknown *d3ddev, [in] IDirect3DSurface9 *d3dtarget, [in] AM_MEDIA_TYPE *mttarget, [in] REFERENCE_TIME start, [in] REFERENCE_TIME stop, D3DCOLOR back, [in] VMR9VideoStreamInfo *info, [in] UINT streams); -}; +} diff --git a/include/vmrender.idl b/include/vmrender.idl index c3d053dbb01..c81a1acead3 100644 --- a/include/vmrender.idl +++ b/include/vmrender.idl @@ -76,7 +76,7 @@ interface IVMRImagePresenter : IUnknown HRESULT StartPresenting([in] DWORD_PTR id); HRESULT StopPresenting([in] DWORD_PTR id); HRESULT PresentImage([in] DWORD_PTR id, [in] VMRPRESENTATIONINFO *info); -}; +} typedef enum _VMRSurfaceAllocationFlags { @@ -113,7 +113,7 @@ interface IVMRSurfaceAllocator : IUnknown HRESULT FreeSurface([in] DWORD_PTR id); HRESULT PrepareSurface([in] DWORD_PTR id, [in] IDirectDrawSurface7 *surface, [in] DWORD dwSurfaceFlags); HRESULT AdviseNotify([in] IVMRSurfaceAllocatorNotify *notify); -}; +} [ local, @@ -130,7 +130,7 @@ interface IVMRSurfaceAllocatorNotify : IUnknown HRESULT RestoreDDrawSurfaces(); HRESULT NotifyEvent([in] LONG EventCode, [in] LONG_PTR p1, [in] LONG_PTR p2); HRESULT SetBorderColor([in] COLORREF border); -}; +} typedef enum _VMR_ASPECT_RATIO_MODE { @@ -162,7 +162,7 @@ interface IVMRWindowlessControl : IUnknown HRESULT GetBorderColor([out] COLORREF *border); HRESULT SetColorKey([in] COLORREF key); HRESULT GetColorKey([out] COLORREF *key); -}; +} typedef enum _VMRMixerPrefs { @@ -213,7 +213,7 @@ interface IVMRMixerControl : IUnknown HRESULT GetBackgroundClr([out] COLORREF *background); HRESULT SetMixingPrefs([in] DWORD prefs); HRESULT GetMixingPrefs([out] DWORD *prefs); -}; +} typedef struct tagVMRGUID { @@ -293,7 +293,7 @@ interface IVMRFilterConfig : IUnknown HRESULT GetRenderingPrefs([out] DWORD *prefs); HRESULT SetRenderingMode([in] DWORD mode); HRESULT GetRenderingMode([out] DWORD *mode); -}; +} [ local, @@ -306,7 +306,7 @@ interface IVMRAspectRatioControl : IUnknown { HRESULT GetAspectRatioMode([out] DWORD *armode); HRESULT SetAspectRatioMode([in] DWORD armode); -}; +} typedef enum _VMRDeinterlacePrefs { @@ -369,7 +369,7 @@ interface IVMRDeinterlaceControl : IUnknown HRESULT GetDeinterlacePrefs([out] DWORD *prefs); HRESULT SetDeinterlacePrefs([in] DWORD prefs); HRESULT GetActualDeinterlaceMode([in] DWORD id, [out] GUID *mode); -}; +} typedef struct _VMRALPHABITMAP { @@ -400,7 +400,7 @@ interface IVMRMixerBitmap : IUnknown HRESULT SetAlphaBitmap([in] const VMRALPHABITMAP *params); HRESULT UpdateAlphaBitmapParameters([in] VMRALPHABITMAP *params); HRESULT GetAlphaBitmapParameters([out] VMRALPHABITMAP *params); -}; +} typedef struct _VMRVIDEOSTREAMINFO { @@ -428,7 +428,7 @@ interface IVMRImageCompositor : IUnknown HRESULT CompositeImage([in] IUnknown *d3ddev, [in] IDirectDrawSurface7 *rendertarget, [in] AM_MEDIA_TYPE *pmt, [in] REFERENCE_TIME start, [in] REFERENCE_TIME stop, [in] DWORD backgrnd, [in] VMRVIDEOSTREAMINFO *info, [in] UINT streams); -}; +} [ local, @@ -443,7 +443,7 @@ interface IVMRVideoStreamControl : IUnknown HRESULT GetColorKey([out] DDCOLORKEY *key); HRESULT SetStreamActiveState([in] BOOL active); HRESULT GetStreamActiveState([out] BOOL *active); -}; +} [ local, @@ -456,7 +456,7 @@ interface IVMRImagePresenterConfig : IUnknown { HRESULT SetRenderingPrefs([in] DWORD prefs); HRESULT GetRenderingPrefs([out] DWORD *prefs); -}; +} [ local, @@ -469,7 +469,7 @@ interface IVMRImagePresenterExclModeConfig : IVMRImagePresenterConfig { HRESULT SetXlcModeDDObjAndPrimarySurface([in] IDirectDraw7 *dddev, [in] IDirectDrawSurface7 *ddsurface); HRESULT GetXlcModeDDObjAndPrimarySurface([out] IDirectDraw7 **dddev, [out] IDirectDrawSurface7 **ddsurface); -}; +} [ local, @@ -482,4 +482,4 @@ interface IVPManager : IUnknown { HRESULT SetVideoPortIndex([in] DWORD index); HRESULT GetVideoPortIndex([out] DWORD *index); -}; +} diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 7a309e8d3a3..4a0f4e2c73e 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -275,7 +275,7 @@ interface IWbemLocator : IUnknown [in] const BSTR strAuthority, [in] IWbemContext *pCtx, [out] IWbemServices **ppNamespace); -}; +} [ object, @@ -295,7 +295,7 @@ interface IWbemStatusCodeText : IUnknown [in] LCID LocaleId, [in] LONG lFlags, [out] BSTR *MessageText); -}; +} [ object, @@ -313,7 +313,7 @@ interface IWbemObjectSink : IUnknown [in] HRESULT hResult, [in] BSTR strParam, [in] IWbemClassObject *pObjParam); -}; +} typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE { @@ -484,7 +484,7 @@ interface IWbemServices : IUnknown [in] IWbemContext *pCtx, [in] IWbemClassObject *pInParams, [in] IWbemObjectSink *pResponseHandler); -}; +} [ object, @@ -511,7 +511,7 @@ interface IEnumWbemClassObject : IUnknown HRESULT Skip( [in] long lTimeout, [in] ULONG nCount); -}; +} [ object, @@ -659,4 +659,4 @@ interface IWbemQualifierSet : IUnknown [out] long *plFlavor); HRESULT EndEnumeration(); -}; +} diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index b7e7a37f662..8ccdd0ca5e2 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -151,7 +151,7 @@ interface ISWbemEventSource : IDispatch [ id(2), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -178,7 +178,7 @@ interface ISWbemLocator : IDispatch [ id(2), propget ] HRESULT Security_([out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -211,7 +211,7 @@ interface ISWbemMethod : IDispatch [ id(5), propget ] HRESULT Qualifiers_( [out, retval] ISWbemQualifierSet **objWbemQualifierSet); -}; +} [ object, @@ -237,7 +237,7 @@ interface ISWbemMethodSet : IDispatch [ id(1), propget ] HRESULT Count( [out, retval] long *iCount); -}; +} [ object, @@ -260,7 +260,7 @@ interface ISWbemNamedValue : IDispatch [ id(2), propget ] HRESULT Name( [out, retval] BSTR *strName); -}; +} [ object, @@ -304,7 +304,7 @@ interface ISWbemNamedValueSet : IDispatch [ id(5) ] HRESULT DeleteAll(); -}; +} [ object, @@ -484,7 +484,7 @@ interface ISWbemObject : IDispatch [ id(25), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -586,7 +586,7 @@ interface ISWbemObjectPath : IDispatch [ id(14), propput ] HRESULT Authority( [in] BSTR strAuthority); -}; +} [ object, @@ -621,7 +621,7 @@ interface ISWbemObjectSet : IDispatch HRESULT ItemIndex( [in] long lIndex, [out, retval] ISWbemObject **objWbemObject); -}; +} typedef [ @@ -689,7 +689,7 @@ interface ISWbemPrivilege : IDispatch [ id(3), propget ] HRESULT Identifier( [out, retval] WbemPrivilegeEnum *iPrivilege); -}; +} [ object, @@ -733,7 +733,7 @@ interface ISWbemPrivilegeSet : IDispatch [in] BSTR strPrivilege, [in, defaultvalue(TRUE)] VARIANT_BOOL bIsEnabled, [out, retval] ISWbemPrivilege **objWbemPrivilege); -}; +} typedef [ @@ -802,7 +802,7 @@ interface ISWbemProperty : IDispatch [ id(6), propget ] HRESULT IsArray( [out, retval] VARIANT_BOOL *bIsArray); -}; +} [ object, @@ -840,7 +840,7 @@ interface ISWbemPropertySet : IDispatch HRESULT Remove( [in] BSTR strName, [in, defaultvalue(0)] long iFlags); -}; +} [ object, @@ -897,7 +897,7 @@ interface ISWbemQualifier : IDispatch [ id(6), propget ] HRESULT IsAmended( [out, retval] VARIANT_BOOL *bIsAmended); -}; +} [ object, @@ -938,7 +938,7 @@ interface ISWbemQualifierSet : IDispatch HRESULT Remove( [in] BSTR strName, [in, defaultvalue(0)] long iFlags); -}; +} typedef [ @@ -999,7 +999,7 @@ interface ISWbemSecurity : IDispatch [ id(3), propget ] HRESULT Privileges( [out, retval] ISWbemPrivilegeSet **objWbemPrivilegeSet); -}; +} [ object, @@ -1183,7 +1183,7 @@ interface ISWbemServices : IDispatch [ id(19), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ threading(apartment), @@ -1194,6 +1194,6 @@ interface ISWbemServices : IDispatch coclass SWbemLocator { interface ISWbemLocator; -}; +} -}; /* WbemScripting */ +} /* WbemScripting */ diff --git a/include/wincodec.idl b/include/wincodec.idl index e727cbdd5bb..f2c5a9e6269 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -890,7 +890,7 @@ interface IWICImageEncoder : IUnknown [in] ID2D1Image *image, [in] IWICBitmapEncoder *encoder, [in, unique] const WICImageParameters *parameters); -}; +} cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory1, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") @@ -1032,7 +1032,7 @@ interface IWICImagingFactory2 : IWICImagingFactory HRESULT CreateImageEncoder( [in] ID2D1Device *device, [out] IWICImageEncoder **encoder); -}; +} [ local, diff --git a/include/wmdrmsdk.idl b/include/wmdrmsdk.idl index 8de3b35aa52..35d1a89ac6e 100644 --- a/include/wmdrmsdk.idl +++ b/include/wmdrmsdk.idl @@ -77,5 +77,5 @@ library WMDRMContentEnablerLib coclass WMDRMContentEnablerActivate { [default] interface IPersistStream; - }; -}; + } +} diff --git a/include/wmiutils.idl b/include/wmiutils.idl index fa790c83460..5753c97d317 100644 --- a/include/wmiutils.idl +++ b/include/wmiutils.idl @@ -117,7 +117,7 @@ interface IWbemPathKeyList : IUnknown [in] long lFlags, [in,out] ULONG *puBuffLength, [in,out,string] LPWSTR pszText); -}; +} cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetClassName") @@ -225,7 +225,7 @@ interface IWbemPath : IUnknown BOOL IsSameClassName( [in,string] LPCWSTR wszClass); -}; +} [ uuid(cf4cc405-e2c5-4ddd-b3ce-5e7582d8c9fa) @@ -233,4 +233,4 @@ interface IWbemPath : IUnknown coclass WbemDefPath { interface IWbemPath; -}; +} diff --git a/include/wmsbuffer.idl b/include/wmsbuffer.idl index fceff5c6633..6ec9dfc7c3b 100644 --- a/include/wmsbuffer.idl +++ b/include/wmsbuffer.idl @@ -40,4 +40,4 @@ interface INSSBuffer : IUnknown HRESULT GetBufferAndLength( [out] BYTE **ppdwBuffer, [out] DWORD *pdwLength); -}; +} diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index b4bd600288f..d1cbcd22769 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -233,7 +233,7 @@ interface IWMStatusCallback : IUnknown [in] WMT_ATTR_DATATYPE dwType, [in] BYTE *pValue, [in] void *pvContext); -}; +} [ object, @@ -250,7 +250,7 @@ interface IWMReaderCallback : IWMStatusCallback [in] DWORD dwFlags, [in] INSSBuffer *pSample, [in] void *pvContext); -}; +} [ object, @@ -298,7 +298,7 @@ interface IWMBandwidthSharing : IWMStreamList HRESULT SetBandwidth( [in] DWORD bitrate, [in] DWORD buffer); -}; +} [ object, @@ -460,7 +460,7 @@ interface IWMProfile3 : IWMProfile2 HRESULT GetExpectedPacketCount( [in] QWORD duration, [out] QWORD *packets); -}; +} [ object, @@ -514,7 +514,7 @@ interface IWMMediaProps : IUnknown HRESULT SetMediaType( [in] WM_MEDIA_TYPE *pType); -}; +} [ object, @@ -531,7 +531,7 @@ interface IWMOutputMediaProps : IWMMediaProps HRESULT GetConnectionName( [out, size_is(*pcchName)] WCHAR *pwszName, [in, out] WORD *pcchName); -}; +} [ object, @@ -547,7 +547,7 @@ interface IWMMetadataEditor : IUnknown HRESULT Close(); HRESULT Flush(); -}; +} [ object, @@ -595,7 +595,7 @@ interface IWMReader : IUnknown HRESULT Pause(); HRESULT Resume(); -}; +} [ object, @@ -950,7 +950,7 @@ interface IWMSyncReader : IUnknown HRESULT OpenStream( [in] IStream *pStream); -}; +} [ object, @@ -1203,7 +1203,7 @@ interface IWMHeaderInfo : IUnknown HRESULT RemoveScript( [in] WORD index ); -}; +} [ object, @@ -1225,7 +1225,7 @@ interface IWMHeaderInfo2 : IWMHeaderInfo [out] WMT_CODEC_INFO_TYPE *codec_type, [in, out] WORD *codec_info_cnt, [out, size_is( *codec_info_cnt )] BYTE *codec_info ); -}; +} [ object, @@ -1283,7 +1283,7 @@ interface IWMHeaderInfo3 : IWMHeaderInfo2 [in] WMT_CODEC_INFO_TYPE codec_type, [in] WORD codec_info_cnt, [in, size_is( codec_info_cnt )] BYTE *codec_info ); -}; +} [ object, @@ -1442,7 +1442,7 @@ interface IWMPacketSize : IUnknown { HRESULT GetMaxPacketSize([out] DWORD *size); HRESULT SetMaxPacketSize([in] DWORD size); -}; +} [ object, @@ -1454,7 +1454,7 @@ interface IWMPacketSize2 : IWMPacketSize { HRESULT GetMinPacketSize([out] DWORD *size); HRESULT SetMinPacketSize([in] DWORD size); -}; +} [ object, @@ -1484,7 +1484,7 @@ interface IWMDRMReader : IUnknown [out] WMT_ATTR_DATATYPE *type, [out, size_is( *length )] BYTE *value, [in, out] WORD *length); -}; +} [ object, @@ -1506,7 +1506,7 @@ interface IWMDRMReader2 : IWMDRMReader [out] DWORD *level); HRESULT TryNextLicense(); -}; +} [ object, @@ -1519,7 +1519,7 @@ interface IWMDRMReader3 : IWMDRMReader2 HRESULT GetInclusionList( [out] GUID **guids, [out] DWORD *count); -}; +} [ object, @@ -1537,7 +1537,7 @@ interface IWMReaderAccelerator : IUnknown HRESULT Notify( [in] DWORD output, [in] WM_MEDIA_TYPE *subtype); -}; +} [ object, @@ -1556,7 +1556,7 @@ interface IWMReaderTimecode : IUnknown [in] WORD range, [out] DWORD *start_timecode, [out] DWORD *end_timecode); -}; +} [ object, @@ -1569,7 +1569,7 @@ interface IWMReaderTypeNegotiation : IUnknown HRESULT TryOutputProps( [in] DWORD output, [in] IWMOutputMediaProps *props); -}; +} [ object, @@ -1590,7 +1590,7 @@ interface IWMLanguageList : IUnknown HRESULT AddLanguageByRFC1766String( [in] LPCWSTR_WMSDK_TYPE_SAFE language, [out] WORD *index); -}; +} [ object, @@ -1613,7 +1613,7 @@ interface IWMReaderPlaylistBurn : IUnknown HRESULT Cancel(); HRESULT EndPlaylistBurn([in] HRESULT result); -}; +} cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") diff --git a/include/wsdxml.idl b/include/wsdxml.idl index 33bd1d932f9..1fb3bbd745f 100644 --- a/include/wsdxml.idl +++ b/include/wsdxml.idl @@ -38,6 +38,6 @@ interface IWSDXMLContext : IUnknown HRESULT SetNamespaces([in, size_is(wNamespacesCount)] const PCWSDXML_NAMESPACE* pNamespaces, [in] WORD wNamespacesCount, [in] BYTE bLayerNumber); HRESULT SetTypes([in, size_is(dwTypesCount)] const PCWSDXML_TYPE* pTypes, [in] DWORD dwTypesCount, [in] BYTE bLayerNumber); -}; +} cpp_quote("HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext);")