[PSDK]

- Add a workaround to dispex.idl to prevent sal annotations to be generated. A better solution would be to have definitions in pur headers, but they conflict with external c++ headers.
- Add a number of missing interfaces
- Fix MIDL compilation of mlang, by adding adding a library definition

svn path=/branches/cmake-bringup/; revision=49762

include/psdk/CMakeLists.txt

@@ -41,7 +41,9 @@ LIST(APPEND SOURCE
     indexsrv.idl
     mimeinfo.idl
     mimeole.idl
+    mlang.idl
     mscoree.idl
+    msctf.idl
     msdadc.idl
     mshtmhst.idl
     mshtml.idl
@@ -95,13 +97,11 @@ LIST(APPEND SOURCE
     wtypes.idl
     xmldom.idl
     xmldso.idl
+    ctfutb.idl
     xmllite.idl)
 
 if(NOT MSVC)
   LIST(APPEND SOURCE
-    ctfutb.idl
-    mlang.idl
-    msctf.idl
     wincodec.idl
     wuapi.idl
 )

include/psdk/activdbg.idl

@@ -615,7 +615,7 @@ interface IEnumDebugExpressionContexts : IUnknown
 
 [
     object,
-    uuid(51973C38-CB0C-11d0-B5C9-00A0244A0E7A),
+    uuid(51973c38-cb0c-11d0-b5c9-00a0244a0e7a),
     pointer_default(unique),
     local
 ]
@@ -624,6 +624,69 @@ interface IDebugApplicationThread : IRemoteDebugApplicationThread
     /* FIXME: fill me! */
 }
 
+[
+    object,
+    uuid(51973C1a-cb0c-11d0-b5c9-00a0244a0e7a),
+    pointer_default(unique),
+    local
+]
+interface IDebugSyncOperation : IUnknown
+{
+    /* FIXME: fill me! */
+}
+
+[
+    object,
+    uuid(51973c1b-cb0c-11d0-b5c9-00a0244a0e7a),
+    pointer_default(unique),
+    local
+]
+interface IDebugAsyncOperation : IUnknown
+{
+    /* FIXME: fill me! */
+}
+
+[
+    object,
+    uuid(51973c18-cb0c-11d0-b5c9-00a0244a0e7a),
+    pointer_default(unique)
+]
+interface IDebugStackFrameSniffer : IUnknown
+{
+    /* FIXME: fill me! */
+}
+
+[
+    object,
+    uuid(51973C36-CB0C-11d0-B5C9-00A0244A0E7A),
+    pointer_default(unique),
+    local
+]
+interface IDebugThreadCall32 : IUnknown
+{
+    /* FIXME: fill me! */
+}
+
+[
+    object,
+    uuid(51973C12-CB0C-11d0-B5C9-00A0244A0E7A),
+    pointer_default(unique)
+]
+interface IActiveScriptErrorDebug : IActiveScriptError
+{
+    /* FIXME: fill me! */
+}
+
+[
+    object,
+    uuid(51973C41-CB0C-11d0-B5C9-00A0244A0E7A),
+    pointer_default(unique)
+]
+interface IProvideExpressionContexts : IUnknown
+{
+    /* FIXME: fill me! */
+}
+
 cpp_quote("#ifndef DISABLE_ACTIVDBG_INTERFACE_WRAPPERS")
 cpp_quote("#ifdef _WIN64")
 

include/psdk/ctfutb.idl

@@ -18,11 +18,15 @@
 
 #ifndef DO_NO_IMPORTS
 import "oaidl.idl";
+import "msctf.idl";
 #endif
 
 interface ITfLangBarEventSink;
 interface ITfLangBarItemMgr;
 interface ITfInputProcessorProfiles;
+interface IEnumTfLangBarItems;
+interface ITfLangBarItem;
+interface ITfLangBarItemSink;
 
 [
     object,
@@ -71,3 +75,156 @@ interface ITfLangBarMgr: IUnknown
     HRESULT GetShowFloatingStatus(
         [out] DWORD *pdwFlags);
 };
+
+[
+  object,
+  uuid(18a4e900-e0ae-11d2-afdd-00105a2799b5),
+  pointer_default(unique)
+]
+interface ITfLangBarEventSink: IUnknown
+{
+    HRESULT OnSetFocus(
+        [in] DWORD dwThreadId);
+
+    HRESULT OnThreadTerminate(
+        [in] DWORD dwThreadId);
+
+    HRESULT OnThreadItemChange(
+        [in] DWORD dwThreadId);
+
+    HRESULT OnModalInput(
+        [in] DWORD dwThreadId,
+        [in] UINT uMsg, 
+        [in] WPARAM wParam, 
+        [in] LPARAM lParam);
+
+    HRESULT ShowFloating(
+        [in] DWORD dwFlags);
+
+    HRESULT GetItemFloatingRect(
+        [in] DWORD dwThreadId,
+        [in] REFGUID rguid,
+        [out] RECT *prc);
+}
+
+const ULONG TF_LBI_DESC_MAXLEN = 32;
+
+typedef [uuid(12a1d29f-a065-440c-9746-eb2002c8bd19)] struct TF_LANGBARITEMINFO
+{
+    CLSID clsidService;
+    GUID guidItem;
+    DWORD dwStyle;
+    ULONG ulSort;
+    WCHAR szDescription[TF_LBI_DESC_MAXLEN];
+} TF_LANGBARITEMINFO;
+
+[
+  object,
+  uuid(ba468c55-9956-4fb1-a59d-52a7dd7cc6aa),
+  pointer_default(unique),
+]
+interface ITfLangBarItemMgr : IUnknown
+{
+    HRESULT EnumItems(
+        [out] IEnumTfLangBarItems **ppEnum);
+
+    HRESULT GetItem(
+        [in] REFGUID rguid, 
+        [out] ITfLangBarItem **ppItem);
+
+    HRESULT AddItem(
+        [in] ITfLangBarItem *punk);
+
+    HRESULT RemoveItem(
+        [in] ITfLangBarItem *punk);
+
+    HRESULT AdviseItemSink(
+        [in] ITfLangBarItemSink *punk, 
+        [out] DWORD *pdwCookie, 
+        [in] REFGUID rguidItem);
+
+    HRESULT UnadviseItemSink(
+        [in] DWORD dwCookie);
+
+    HRESULT GetItemFloatingRect(
+        [in] DWORD dwThreadId,
+        [in] REFGUID rguid,
+        [out] RECT *prc);
+
+    HRESULT GetItemsStatus(
+        [in] ULONG ulCount,
+        [in, size_is(ulCount)] const GUID *prgguid,
+        [out, size_is(ulCount)] DWORD *pdwStatus);
+
+    HRESULT GetItemNum(
+        [out] ULONG *pulCount);
+
+    HRESULT GetItems(
+        [in] ULONG ulCount, 
+        [out, size_is(ulCount), length_is(*pcFetched)] ITfLangBarItem **ppItem, 
+        [out, size_is(ulCount), length_is(*pcFetched)] TF_LANGBARITEMINFO *pInfo,
+        [out, size_is(ulCount), length_is(*pcFetched)] DWORD *pdwStatus,
+        [in, out, unique] ULONG *pcFetched);
+
+    HRESULT AdviseItemsSink(
+        [in] ULONG ulCount,
+        [in, size_is(ulCount)] ITfLangBarItemSink **ppunk, 
+        [in, size_is(ulCount)] const GUID *pguidItem,
+        [out, size_is(ulCount)] DWORD *pdwCookie);
+
+    HRESULT UnadviseItemsSink(
+        [in] ULONG ulCount,
+        [in, size_is(ulCount)] DWORD *pdwCookie);
+};
+
+[
+  object,
+  uuid(583f34d0-de25-11d2-afdd-00105a2799b5),
+  pointer_default(unique),
+]
+interface IEnumTfLangBarItems : IUnknown
+{
+    HRESULT Clone(
+        [out] IEnumTfLangBarItems **ppEnum);
+
+    HRESULT Next(
+        [in] ULONG ulCount, 
+        [out, size_is(ulCount)] ITfLangBarItem **ppItem, 
+        [in, out, unique] ULONG *pcFetched);
+
+    HRESULT Reset();
+
+    HRESULT Skip(
+        [in] ULONG ulCount);
+}
+
+[
+  object,
+  uuid(73540d69-edeb-4ee9-96c9-23aa30b25916),
+  pointer_default(unique),
+]
+interface ITfLangBarItem : IUnknown
+{
+    HRESULT GetInfo(
+        [out] TF_LANGBARITEMINFO *pInfo);
+
+    HRESULT GetStatus(
+        [out] DWORD *pdwStatus);
+
+    HRESULT Show(
+        [in] BOOL fShow);
+
+    HRESULT GetTooltipString(
+        [out] BSTR *pbstrToolTip);
+}
+
+[
+  object,
+  uuid(57dbe1a0-de25-11d2-afdd-00105a2799b5),
+  pointer_default(unique),
+]
+interface ITfLangBarItemSink : IUnknown
+{
+    HRESULT OnUpdate(
+        [in] DWORD dwFlags);
+}

include/psdk/dispex.idl

@@ -15,6 +15,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+// HACK
+#define annotation(x)
 
 #ifndef DO_NO_IMPORTS
 import "ocidl.idl";

include/psdk/mlang.idl

@@ -25,6 +25,15 @@ interface IStream;
 cpp_quote("#define CPIOD_PEEK          0x40000000")
 cpp_quote("#define CPIOD_FORCE_PROMPT  0x80000000")
 
+[
+    uuid(275c23e0-3747-11d0-9fea-00aa003f8646),
+    lcid(0x0000),
+    version(0.2)
+]
+library MultiLanguage
+{
+    importlib("stdole2.tlb");
+
 [
   object,
   uuid(359f3443-bd4a-11d0-b188-00aa0038c969),
@@ -308,17 +317,17 @@ interface IMLangLineBreakConsole : IUnknown
 }
 
 [
-  object,
-  uuid(275c23e3-3747-11d0-9fea-00aa003f8646),
-  pointer_default(unique)
+      object,
+      uuid(275c23e3-3747-11d0-9fea-00aa003f8646),
+      pointer_default(unique)
 ]
 interface IEnumCodePage : IUnknown
 {
     const USHORT MAX_MIMECP_NAME = 64;
     const USHORT MAX_MIMECSET_NAME = 50;
 
-    typedef enum tagMIMECONTF
-    {
+        typedef enum tagMIMECONTF
+        {
         MIMECONTF_MAILNEWS = 0x00000001,
         MIMECONTF_BROWSER = 0x00000002,
         MIMECONTF_MINIMAL = 0x00000004,
@@ -332,7 +341,7 @@ interface IEnumCodePage : IUnknown
         MIMECONTF_MIME_IE4 = 0x10000000,
         MIMECONTF_MIME_LATEST = 0x20000000,
         MIMECONTF_MIME_REGISTRY = 0x40000000
-    } MIMECONTF;
+        } MIMECONTF;
 
     typedef struct tagMIMECPINFO {
         DWORD dwFlags;
@@ -347,12 +356,12 @@ interface IEnumCodePage : IUnknown
         BYTE bGDICharset;
     } MIMECPINFO, *PMIMECPINFO;
 
-    typedef struct tagMIMECSETINFO
-    {
+        typedef struct tagMIMECSETINFO
+        {
         UINT uiCodePage;
         UINT uiInternetEncoding;
         WCHAR wszCharset[MAX_MIMECSET_NAME];
-    } MIMECSETINFO, *PMIMECSETINFO;
+        } MIMECSETINFO, *PMIMECSETINFO;
 
     HRESULT Clone( 
         [out] IEnumCodePage **ppEnum);
@@ -362,16 +371,16 @@ interface IEnumCodePage : IUnknown
         [out] PMIMECPINFO rgelt,
         [out] ULONG *pceltFetched);
 
-    HRESULT Reset();
+        HRESULT Reset();
 
     HRESULT Skip(      
         [in] ULONG celt);
 }
 
 [
-  object,
-  uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f),
-  pointer_default(unique)
+      object,
+      uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f),
+      pointer_default(unique)
 ]
 interface IMLangConvertCharset : IUnknown
 {
@@ -417,21 +426,21 @@ coclass CMLangConvertCharset
 };
 
 [
-  object,
-  uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f),
-  pointer_default(unique)
+      object,
+      uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f),
+      pointer_default(unique)
 ]
 interface IEnumRfc1766 : IUnknown
 {
     const USHORT MAX_RFC1766_NAME = 6;
     const USHORT MAX_LOCALE_NAME = 32;
 
-    typedef struct tagRFC1766INFO
-    {
+        typedef struct tagRFC1766INFO
+        {
         LCID lcid;
         WCHAR wszRfc1766[MAX_RFC1766_NAME];
         WCHAR wszLocaleName[MAX_LOCALE_NAME];
-    } RFC1766INFO, *PRFC1766INFO;
+        } RFC1766INFO, *PRFC1766INFO;
 
     HRESULT Clone( 
         [out] IEnumRfc1766 **ppEnum);
@@ -448,9 +457,9 @@ interface IEnumRfc1766 : IUnknown
 }
 
 [
-  object,
-  uuid(275c23e1-3747-11d0-9fea-00aa003f8646),
-  pointer_default(unique)
+      object,
+      uuid(275c23e1-3747-11d0-9fea-00aa003f8646),
+      pointer_default(unique)
 ]
 interface IMultiLanguage : IUnknown
 {
@@ -528,19 +537,19 @@ interface IMultiLanguage : IUnknown
 }
 
 [
-  object,
+      object,
   uuid(dccfc164-2b38-11d2-b7ec-00c04f8f5d9a),
   pointer_default(unique)
 ]
 interface IMultiLanguage2 : IUnknown
 {
-    typedef struct tagDetectEncodingInfo
-    {
+        typedef struct tagDetectEncodingInfo
+        {
         UINT nLangID;
         UINT nCodePage;
         INT nDocPercent;
         INT nConfidence;
-    } DetectEncodingInfo, *pDetectEncodingInfo;
+        } DetectEncodingInfo, *pDetectEncodingInfo;
 
     HRESULT GetNumberOfCodePageInfo(      
         [out] UINT *pcCodePage);
@@ -692,14 +701,14 @@ interface IMultiLanguage2 : IUnknown
 }
 
 [
-    object,
-    uuid(4e5868ab-b157-4623-9acc-6a1d9caebe04),
-    pointer_default(unique)
+      object,
+      uuid(4e5868ab-b157-4623-9acc-6a1d9caebe04),
+      pointer_default(unique)
 ]
 interface IMultiLanguage3 : IMultiLanguage2
 {
-    typedef [unique] IMultiLanguage3 *LPMULTILANGUAGE3;
-    HRESULT DetectOutboundCodePage(
+       typedef [unique] IMultiLanguage3 *LPMULTILANGUAGE3;
+       HRESULT DetectOutboundCodePage(
         [in] DWORD dwFlags,
         [in] LPCWSTR lpWideCharStr,
         [in] UINT cchWideChar,
@@ -709,7 +718,7 @@ interface IMultiLanguage3 : IMultiLanguage2
         [in, out] UINT *pnDetectedCodePages,
         [in] WCHAR *lpSpecialChar);
 
-    HRESULT DetectOutboundCodePageInIStream(
+       HRESULT DetectOutboundCodePageInIStream(
         [in] DWORD dwFlags,
         [in] IStream *pStrIn,
         [in] UINT *puiPreferredCodePages,
@@ -724,12 +733,14 @@ interface IMultiLanguage3 : IMultiLanguage2
 ]
 coclass CMultiLanguage
 {
-    [default] interface IMultiLanguage;
-    interface IMLangCodePages;
-    interface IMLangFontLink;
+        [default] interface IMultiLanguage;
+        interface IMLangCodePages;
+        interface IMLangFontLink;
     /* interface IMLangLineBreakConsole; */
-    interface IMLangFontLink2;
-}
+        interface IMLangFontLink2;
+};
+
+} // library MultiLanguage
 
 cpp_quote("STDAPI LcidToRfc1766A(LCID, LPSTR, INT);")
 cpp_quote("STDAPI LcidToRfc1766W(LCID, LPWSTR, INT);")

include/psdk/msctf.idl

@@ -1359,3 +1359,142 @@ interface ITfThreadFocusSink : IUnknown
 
     HRESULT OnKillThreadFocus();
 };
+
+[
+  object,
+  uuid(101d6610-0990-11d3-8df0-00105a2799b5),
+  pointer_default(unique)
+]
+interface ITfFunctionProvider : IUnknown
+{
+    HRESULT GetType(
+        [out] GUID *pguid);
+
+    HRESULT GetDescription(
+        [out] BSTR *pbstrDesc);
+
+    HRESULT GetFunction(
+        [in] REFGUID rguid,
+        [in] REFIID riid,
+        [out, iid_is(riid)] IUnknown **ppunk);
+}
+
+[
+  object,
+  uuid(e4b24db0-0990-11d3-8df0-00105a2799b5),
+  pointer_default(unique)
+]
+interface IEnumTfFunctionProviders : IUnknown
+{
+    HRESULT Clone(
+        [out] IEnumTfFunctionProviders **ppEnum);
+
+    HRESULT Next(
+        [in] ULONG ulCount,
+        [out, size_is(ulCount), length_is(*pcFetch)] ITfFunctionProvider **ppCmdobj,
+        [out] ULONG *pcFetch);
+
+    HRESULT Reset();
+
+    HRESULT Skip(
+        [in] ULONG ulCount);
+};
+
+[
+  object,
+  uuid(2433bf8e-0f9b-435c-ba2c-180611978c30),
+  pointer_default(unique)
+]
+interface ITfContextView : IUnknown
+{
+    HRESULT GetRangeFromPoint(
+        [in] TfEditCookie ec,
+        [in] const POINT *ppt,
+        [in] DWORD dwFlags,
+        [out] ITfRange **ppRange);
+
+    HRESULT GetTextExt(
+        [in] TfEditCookie ec,
+        [in] ITfRange *pRange,
+        [out] RECT *prc,
+        [out] BOOL *pfClipped);
+
+    HRESULT GetScreenExt(
+        [out] RECT *prc);
+
+    HRESULT GetWnd(
+        [out] HWND *phwnd);
+};
+
+[
+  object,
+  uuid(f0c0f8dd-cf38-44e1-bb0f-68cf0d551c78),
+  pointer_default(unique)
+]
+interface IEnumTfContextViews : IUnknown
+{
+    HRESULT Clone(
+        [out] IEnumTfContextViews **ppEnum);
+
+    HRESULT Next(
+        [in] ULONG ulCount,
+        [out, size_is(ulCount), length_is(*pcFetched)] ITfContextView **rgViews,
+        [out] ULONG *pcFetched);
+
+    HRESULT Reset();
+
+    HRESULT Skip(
+        [in] ULONG ulCount);
+};
+
+[
+  object,
+  uuid(19188cb0-aca9-11d2-afc5-00105a2799b5),
+  pointer_default(unique)
+]
+interface IEnumTfProperties : IUnknown
+{
+    HRESULT Clone(
+        [out] IEnumTfProperties **ppEnum);
+
+    HRESULT Next(
+        [in] ULONG ulCount,
+        [out, size_is(ulCount), length_is(*pcFetched)] ITfProperty **ppProp,
+        [out] ULONG *pcFetched);
+
+    HRESULT Reset();
+
+    HRESULT Skip(
+        [in] ULONG ulCount);
+}
+
+[
+  object,
+  uuid(463a506d-6992-49d2-9b88-93d55e70bb16),
+  pointer_default(unique)
+]
+interface ITfRangeBackup : IUnknown
+{
+    HRESULT Restore(
+        [in] TfEditCookie ec,
+        [in] ITfRange *pRange);
+};
+
+[
+  object,
+  uuid(42d4d099-7c1a-4a89-b836-6c6f22160df0),
+  pointer_default(unique)
+]
+interface ITfEditRecord : IUnknown
+{
+    const DWORD TF_GTP_INCL_TEXT = 0x1;
+
+    HRESULT GetSelectionStatus(
+        [out] BOOL *pfChanged);
+
+    HRESULT GetTextAndPropertyUpdates(
+        [in] DWORD dwFlags,
+        [in, size_is(cProperties)] const GUID **prgProperties,
+        [in] ULONG cProperties,
+        [out] IEnumTfRanges **ppEnum);
+};