Author: akhaldi
Date: Sat May 21 12:30:26 2011
New Revision: 51837
URL: http://svn.reactos.org/svn/reactos?rev=51837&view=rev
Log:
[CMAKE]
* Merge some msvc fixes from the cmake branch.
Modified:
trunk/reactos/include/psdk/activdbg.idl
trunk/reactos/include/psdk/asptlb.idl
trunk/reactos/include/psdk/ctfutb.idl
trunk/reactos/include/psdk/dimm.idl
trunk/reactos/include/psdk/dispex.idl
trunk/reactos/include/psdk/ksproxy.h
trunk/reactos/include/psdk/mlang.idl
trunk/reactos/include/psdk/msctf.idl
trunk/reactos/include/psdk/mshtml.idl
trunk/reactos/include/psdk/mstask.idl
trunk/reactos/include/psdk/richole.idl
trunk/reactos/include/psdk/shobjidl.idl
trunk/reactos/include/psdk/stdole2.idl
trunk/reactos/include/reactos/idl/svcctl.idl
trunk/reactos/include/reactos/idl/wlansvc.idl
Modified: trunk/reactos/include/psdk/activdbg.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activdbg.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/activdbg.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/activdbg.idl [iso-8859-1] Sat May 21 12:30:26
2011
@@ -553,6 +553,140 @@
[out] BOOL *pfCallOnScriptErrorWhenContinuing);
}
+[
+ object,
+ uuid(51973C17-CB0C-11d0-B5C9-00A0244A0E7A),
+ pointer_default(unique)
+]
+interface IDebugStackFrame : IUnknown
+{
+ /* FIXME: fill me! */
+}
+
+[
+ object,
+ uuid(51973C1e-CB0C-11d0-B5C9-00A0244A0E7A),
+ pointer_default(unique)
+]
+interface IEnumDebugStackFrames : IUnknown
+{
+ /* FIXME: fill me! */
+}
+
+[
+ object,
+ uuid(51973C2a-CB0C-11d0-B5C9-00A0244A0E7A),
+ pointer_default(unique)
+]
+interface IApplicationDebugger : IUnknown
+{
+ /* FIXME: fill me! */
+};
+
+[
+ object,
+ uuid(51973C3c-CB0C-11d0-B5C9-00A0244A0E7A),
+ pointer_default(unique)
+]
+interface IEnumRemoteDebugApplicationThreads : IUnknown
+{
+ /* FIXME: fill me! */
+}
+
+[
+ object,
+ uuid(51973C34-CB0C-11d0-B5C9-00A0244A0E7A),
+ pointer_default(unique)
+]
+interface IDebugApplicationNode : IUnknown
+{
+ /* FIXME: fill me! */
+}
+
+[
+ object,
+ uuid(51973C40-CB0C-11d0-B5C9-00A0244A0E7A),
+ pointer_default(unique)
+]
+interface IEnumDebugExpressionContexts : IUnknown
+{
+ /* FIXME: fill me! */
+}
+
+[
+ object,
+ uuid(51973c38-cb0c-11d0-b5c9-00a0244a0e7a),
+ pointer_default(unique),
+ local
+]
+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")
Modified: trunk/reactos/include/psdk/asptlb.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/asptlb.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/asptlb.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/asptlb.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -23,7 +23,7 @@
[
object,
dual,
- uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8)
+ uuid(D97A6DA0-A85F-11df-83AE-00A0C90C2BD8)
]
interface IRequestDictionary : IDispatch
{
Modified: trunk/reactos/include/psdk/ctfutb.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ctfutb.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/ctfutb.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ctfutb.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -18,11 +18,17 @@
#ifndef DO_NO_IMPORTS
import "oaidl.idl";
+#ifdef __midl
+import "msctf.idl";
+#endif
#endif
interface ITfLangBarEventSink;
interface ITfLangBarItemMgr;
interface ITfInputProcessorProfiles;
+interface IEnumTfLangBarItems;
+interface ITfLangBarItem;
+interface ITfLangBarItemSink;
[
object,
@@ -71,3 +77,156 @@
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);
+}
Modified: trunk/reactos/include/psdk/dimm.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dimm.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/dimm.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/dimm.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -21,7 +21,9 @@
#endif
cpp_quote("#include <imm.h>")
-
+#ifdef _MSC_VER
+cpp_quote("DEFINE_GUID(CLSID_CActiveIMM, 0x4955dd33, 0xb159, 0x11d0,
0x8f,0xcf, 0x00,0xaa,0x00,0x6b,0xcc,0x59);")
+#endif
cpp_quote("#if 0")
typedef struct {
@@ -588,3 +590,4 @@
/* interface IActiveIMMRegistrar; */
/* interface IActiveIMMMessagePumpOwner; */
}
+
Modified: trunk/reactos/include/psdk/dispex.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dispex.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/dispex.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/dispex.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -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";
Modified: trunk/reactos/include/psdk/ksproxy.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksproxy.h?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] Sat May 21 12:30:26 2011
@@ -772,7 +772,7 @@
#ifndef _IKsTopology_
#define _IKsTopology_
-DEFINE_GUID(IID_IKsAggregateControl, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A,
0x00, 0A0, 0xC9, 0x22, 0x31, 0x96);
+DEFINE_GUID(IID_IKsTopology, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00,
0A0, 0xC9, 0x22, 0x31, 0x96);
#undef INTERFACE
#define INTERFACE IKsTopology
Modified: trunk/reactos/include/psdk/mlang.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/mlang.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/mlang.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -24,6 +24,15 @@
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,
@@ -308,17 +317,17 @@
}
[
- 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 @@
MIMECONTF_MIME_IE4 = 0x10000000,
MIMECONTF_MIME_LATEST = 0x20000000,
MIMECONTF_MIME_REGISTRY = 0x40000000
- } MIMECONTF;
+ } MIMECONTF;
typedef struct tagMIMECPINFO {
DWORD dwFlags;
@@ -347,12 +356,12 @@
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 @@
[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 @@
};
[
- 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 @@
}
[
- 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 @@
}
[
- 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 @@
}
[
- 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 @@
[in, out] UINT *pnDetectedCodePages,
[in] WCHAR *lpSpecialChar);
- HRESULT DetectOutboundCodePageInIStream(
+ HRESULT DetectOutboundCodePageInIStream(
[in] DWORD dwFlags,
[in] IStream *pStrIn,
[in] UINT *puiPreferredCodePages,
@@ -724,12 +733,14 @@
]
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);")
Modified: trunk/reactos/include/psdk/msctf.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -1359,3 +1359,142 @@
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);
+};
Modified: trunk/reactos/include/psdk/mshtml.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -20,6 +20,10 @@
#include <mshtmdid.h>
#include <mshtmcid.h>
#include <olectl.h>
+
+#if defined(_MSC_VER) && (__midl >= 501)
+midl_pragma warning(disable: 2362)
+#endif
import "ocidl.idl";
import "dimm.idl";
@@ -6933,7 +6937,7 @@
[
noncreatable,
- uuid(3050F24D-98B5-11CF-BB82-00AA00BDCE0B)
+ uuid(3050F251-98B5-11CF-BB82-00AA00BDCE0B)
]
coclass HTMLFormElement
{
@@ -12497,13 +12501,13 @@
HRESULT onstorage([in] VARIANT v);
[propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable]
- HRESULT onstorage([out] VARIANT *p);
+ HRESULT onstorage([retval, out] VARIANT *p);
[propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable]
HRESULT onstoragecommit([in] VARIANT v);
[propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable]
- HRESULT onstoragecommit([out] VARIANT *p);
+ HRESULT onstoragecommit([retval, out] VARIANT *p);
[id(DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID)]
HRESULT getElementById(
Modified: trunk/reactos/include/psdk/mstask.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstask.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/mstask.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/mstask.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -58,6 +58,11 @@
cpp_quote("#define TASK_TRIGGER_FLAG_HAS_END_DATE 0x1")
cpp_quote("#define TASK_TRIGGER_FLAG_KILL_AT_DURATION_END 0x2")
cpp_quote("#define TASK_TRIGGER_FLAG_DISABLED 0x4")
+
+#ifdef _MSC_VER
+cpp_quote("DEFINE_GUID(CLSID_CTaskScheduler, 0x148bd52a, 0xa2ab, 0x11ce,
0xb1,0x1f, 0x00,0xaa,0x00,0x53,0x05,0x03);")
+cpp_quote("DEFINE_GUID(CLSID_CTask, 0x148bd520, 0xa2ab, 0x11ce, 0xb1,0x1f,
0x00,0xaa,0x00,0x53,0x05,0x03);")
+#endif
[
local,
Modified: trunk/reactos/include/psdk/richole.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richole.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/richole.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/richole.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -131,3 +131,8 @@
HRESULT GetDragDropEffect(BOOL fDrag, DWORD grfKeyState, LPDWORD
pdwEffect);
HRESULT GetContextMenu(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE
*lpchrg, HMENU *lphmenu);
}
+
+#ifndef __WIDL__
+cpp_quote("DEFINE_GUID(IID_IRichEditOle, 0x00020D00, 0, 0,
0xC0,0,0,0,0,0,0,0x46);")
+cpp_quote("DEFINE_GUID(IID_IRichEditOleCallback, 0x00020D03, 0, 0,
0xC0,0,0,0,0,0,0,0x46);")
+#endif
Modified: trunk/reactos/include/psdk/shobjidl.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Sat May 21 12:30:26
2011
@@ -2224,7 +2224,7 @@
* ITravelLog interface
*/
[
- uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F),
+ uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8),
object,
pointer_default(unique),
local
Modified: trunk/reactos/include/psdk/stdole2.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/stdole2.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] Sat May 21 12:30:26 2011
@@ -61,7 +61,7 @@
void *pfnDeferredFillIn;
SCODE scode;
} EXCEPINFO;
-
+#ifndef __midl
[
odl,
uuid(00000000-0000-0000-C000-000000000046),
@@ -139,7 +139,7 @@
HRESULT Clone(
[out] IEnumVARIANT **ppenum);
}
-
+#endif /* !__midl */
typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public]
unsigned long OLE_COLOR;
Modified: trunk/reactos/include/reactos/idl/svcctl.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat May 21
12:30:26 2011
@@ -434,7 +434,7 @@
/* Function 17 */
DWORD RQueryServiceConfigW(
[in] SC_RPC_HANDLE hService,
- [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig,
+ [out, size_is(cbBufSize)] LPBYTE lpServiceConfig,
/* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */
[in, range(0, 1024*8)] DWORD cbBufSize,
[out] LPBOUNDED_DWORD_8K pcbBytesNeeded);
@@ -546,7 +546,7 @@
/* Function 29 */
DWORD RQueryServiceConfigA(
[in] SC_RPC_HANDLE hService,
- [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig,
+ [out, size_is(cbBufSize)] LPBYTE lpServiceConfig,
/* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */
[in, range(0, 1024*8)] DWORD cbBufSize,
[out] LPBOUNDED_DWORD_8K pcbBytesNeeded);
Modified: trunk/reactos/include/reactos/idl/wlansvc.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansvc.idl?rev=51837&r1=51836&r2=51837&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Sat May 21
12:30:26 2011
@@ -72,7 +72,7 @@
DWORD _RpcQueryAutoConfigParameter(
[in] WLANSVC_RPC_HANDLE hClientHandle,
[in] /* enum32 */ DWORD OpCode,
- [out] LPDWORD pdwDataSize,
+ [in, out] LPDWORD pdwDataSize,
[out][ref][size_is(*pdwDataSize)] char ** ppData,
[out] /* enum32 */ DWORD * pWlanOpcodeValueType);
@@ -95,7 +95,7 @@
[in] WLANSVC_RPC_HANDLE hClientHandle,
[in] GUID* pInterfaceGuid,
[in] /* enum32 */ long OpCode,
- [out] LPDWORD pdwDataSize,
+ [in, out] LPDWORD pdwDataSize,
[out][ref][size_is(*pdwDataSize)] LPBYTE* ppData,
[out] /* enum32 */ LPDWORD pWlanOpcodeValueType);
@@ -131,7 +131,7 @@
[in][unique] PDOT11_SSID pDot11Ssid,
[in] /* enum16 */ short dot11BssType,
[in] DWORD bSecurityEnabled,
- [out] LPDWORD dwBssListSize,
+ [in, out] LPDWORD dwBssListSize,
[out][ref][size_is(*dwBssListSize)] LPBYTE *ppWlanBssList);
/* Function: 0x0C */
@@ -231,7 +231,7 @@
[in] WLANSVC_RPC_HANDLE hClientHandle,
[in] GUID* pInterfaceGuid,
[in][string] wchar_t * strProfileName,
- [out] LPDWORD dwDataSize,
+ [in, out] LPDWORD dwDataSize,
[out][ref][size_is(*dwDataSize)] LPBYTE *pData);
/* Function: 0x1A */
@@ -325,7 +325,7 @@
/* Function: 0x26 */
DWORD _RpcQueryPlapCredentials(
[in] wchar_t * arg_1,
- [out] LPDWORD dwSize,
+ [in, out] LPDWORD dwSize,
[out][ref][size_is(*dwSize)] struct_E ** arg_3,
[out][ref][string] wchar_t ** arg_4,
[out] GUID* pInterfaceGuid,
@@ -353,4 +353,4 @@
[out][ref][string] wchar_t ** pstrCurrentSDDL,
[out] LPDWORD pdwGrantedAccess);
-}
+}
