From dd30516f729b25fab11f52499513c144d5c39900 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 13 Dec 2004 13:15:39 +0000 Subject: [PATCH] Added CMultiLanguage and AMMultiMediaStream coclass declarations. --- include/amstream.idl | 9 ++++++++- include/mlang.idl | 12 +++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/amstream.idl b/include/amstream.idl index 002b87a7c23..410804ce4ba 100644 --- a/include/amstream.idl +++ b/include/amstream.idl @@ -303,7 +303,14 @@ interface IAMMediaTypeSample : IStreamSample [in] LONGLONG * pTimeEnd); }; -cpp_quote("DEFINE_GUID(CLSID_AMMultiMediaStream, 0x49c47ce5, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") +[ + uuid(49C47CE5-9BA4-11d0-8212-00C04FC32C45) +] +coclass AMMultiMediaStream +{ + [default] dispinterface IDirectShowStream; +}; + cpp_quote("DEFINE_GUID(CLSID_AMDirectDrawStream, 0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") cpp_quote("DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") cpp_quote("DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") diff --git a/include/mlang.idl b/include/mlang.idl index b06e30f5271..7942084a7d0 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -537,6 +537,17 @@ interface IMultiLanguage2 : IUnknown [in] DWORD dwfIODControl); }; +[ + uuid(275C23E2-3747-11d0-9FEA-00AA003f8646) +] +coclass CMultiLanguage +{ + [default] interface IMultiLanguage; + interface IMLangCodePages; + interface IMLangFontLink; + /* interface IMLangLineBreakConsole; */ +}; + cpp_quote("STDAPI LcidToRfc1766A(LCID, LPSTR, INT);") cpp_quote("STDAPI LcidToRfc1766W(LCID, LPWSTR, INT);") cpp_quote("#define LcidToRfc1766 WINELIB_NAME_AW(LcidToRfc1766)") @@ -550,7 +561,6 @@ cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);") cpp_quote("STDAPI ConvertINetUnicodeToMultiByte(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT);") -cpp_quote("DEFINE_GUID(CLSID_CMultiLanguage, 0x275c23e2, 0x3747, 0x11d0, 0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);") cpp_quote("DEFINE_GUID(IID_IMLangCodePages, 0x359F3443,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") cpp_quote("DEFINE_GUID(IID_IMLangFontLink, 0x359F3441,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") cpp_quote("DEFINE_GUID(IID_IMultiLanguage2, 0xDCCFC164,0x2B38,0x11d2,0xB7,0xEC,0x00,0xC0,0x4F,0x8F,0x5D,0x9A);")