diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index ee8ea600a68..326ecc537d5 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -524,7 +524,7 @@ ITextDocument_fnGetSelection(ITextDocument* me, ITextSelection** ppSel)
 }
 
 static HRESULT WINAPI
-ITextDocument_fnGetStoryCount(ITextDocument* me, long* pCount)
+ITextDocument_fnGetStoryCount(ITextDocument* me, LONG* pCount)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -541,7 +541,7 @@ ITextDocument_fnGetStoryRanges(ITextDocument* me,
 }
 
 static HRESULT WINAPI
-ITextDocument_fnGetSaved(ITextDocument* me, long* pValue)
+ITextDocument_fnGetSaved(ITextDocument* me, LONG* pValue)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -549,7 +549,7 @@ ITextDocument_fnGetSaved(ITextDocument* me, long* pValue)
 }
 
 static HRESULT WINAPI
-ITextDocument_fnSetSaved(ITextDocument* me, long Value)
+ITextDocument_fnSetSaved(ITextDocument* me, LONG Value)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -581,8 +581,8 @@ ITextDocument_fnNew(ITextDocument* me)
 }
 
 static HRESULT WINAPI
-ITextDocument_fnOpen(ITextDocument* me, VARIANT* pVar, long Flags,
-    long CodePage)
+ITextDocument_fnOpen(ITextDocument* me, VARIANT* pVar, LONG Flags,
+    LONG CodePage)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -590,8 +590,8 @@ ITextDocument_fnOpen(ITextDocument* me, VARIANT* pVar, long Flags,
 }
 
 static HRESULT WINAPI
-ITextDocument_fnSave(ITextDocument* me, VARIANT* pVar, long Flags,
-    long CodePage)
+ITextDocument_fnSave(ITextDocument* me, VARIANT* pVar, LONG Flags,
+    LONG CodePage)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -599,7 +599,7 @@ ITextDocument_fnSave(ITextDocument* me, VARIANT* pVar, long Flags,
 }
 
 static HRESULT WINAPI
-ITextDocument_fnFreeze(ITextDocument* me, long* pCount)
+ITextDocument_fnFreeze(ITextDocument* me, LONG* pCount)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -607,7 +607,7 @@ ITextDocument_fnFreeze(ITextDocument* me, long* pCount)
 }
 
 static HRESULT WINAPI
-ITextDocument_fnUnfreeze(ITextDocument* me, long* pCount)
+ITextDocument_fnUnfreeze(ITextDocument* me, LONG* pCount)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -631,7 +631,7 @@ ITextDocument_fnEndEditCollection(ITextDocument* me)
 }
 
 static HRESULT WINAPI
-ITextDocument_fnUndo(ITextDocument* me, long Count, long* prop)
+ITextDocument_fnUndo(ITextDocument* me, LONG Count, LONG* prop)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -639,7 +639,7 @@ ITextDocument_fnUndo(ITextDocument* me, long Count, long* prop)
 }
 
 static HRESULT WINAPI
-ITextDocument_fnRedo(ITextDocument* me, long Count, long* prop)
+ITextDocument_fnRedo(ITextDocument* me, LONG Count, LONG* prop)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
     FIXME("stub %p\n",This);
@@ -647,7 +647,7 @@ ITextDocument_fnRedo(ITextDocument* me, long Count, long* prop)
 }
 
 static HRESULT WINAPI
-ITextDocument_fnRange(ITextDocument* me, long cp1, long cp2,
+ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
     ITextRange** ppRange)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
@@ -656,7 +656,7 @@ ITextDocument_fnRange(ITextDocument* me, long cp1, long cp2,
 }
 
 static HRESULT WINAPI
-ITextDocument_fnRangeFromPoint(ITextDocument* me, long x, long y,
+ITextDocument_fnRangeFromPoint(ITextDocument* me, LONG x, LONG y,
     ITextRange** ppRange)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
@@ -813,7 +813,7 @@ static HRESULT WINAPI ITextSelection_fnSetText(
 
 static HRESULT WINAPI ITextSelection_fnGetChar(
     ITextSelection *me,
-    long *pch)
+    LONG *pch)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -825,7 +825,7 @@ static HRESULT WINAPI ITextSelection_fnGetChar(
 
 static HRESULT WINAPI ITextSelection_fnSetChar(
     ITextSelection *me,
-    long ch)
+    LONG ch)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -873,7 +873,7 @@ static HRESULT WINAPI ITextSelection_fnSetFormattedText(
 
 static HRESULT WINAPI ITextSelection_fnGetStart(
     ITextSelection *me,
-    long *pcpFirst)
+    LONG *pcpFirst)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -885,7 +885,7 @@ static HRESULT WINAPI ITextSelection_fnGetStart(
 
 static HRESULT WINAPI ITextSelection_fnSetStart(
     ITextSelection *me,
-    long cpFirst)
+    LONG cpFirst)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -897,7 +897,7 @@ static HRESULT WINAPI ITextSelection_fnSetStart(
 
 static HRESULT WINAPI ITextSelection_fnGetEnd(
     ITextSelection *me,
-    long *pcpLim)
+    LONG *pcpLim)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -909,7 +909,7 @@ static HRESULT WINAPI ITextSelection_fnGetEnd(
 
 static HRESULT WINAPI ITextSelection_fnSetEnd(
     ITextSelection *me,
-    long cpLim)
+    LONG cpLim)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -969,7 +969,7 @@ static HRESULT WINAPI ITextSelection_fnSetPara(
 
 static HRESULT WINAPI ITextSelection_fnGetStoryLength(
     ITextSelection *me,
-    long *pcch)
+    LONG *pcch)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -981,7 +981,7 @@ static HRESULT WINAPI ITextSelection_fnGetStoryLength(
 
 static HRESULT WINAPI ITextSelection_fnGetStoryType(
     ITextSelection *me,
-    long *pValue)
+    LONG *pValue)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -993,7 +993,7 @@ static HRESULT WINAPI ITextSelection_fnGetStoryType(
 
 static HRESULT WINAPI ITextSelection_fnCollapse(
     ITextSelection *me,
-    long bStart)
+    LONG bStart)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1005,8 +1005,8 @@ static HRESULT WINAPI ITextSelection_fnCollapse(
 
 static HRESULT WINAPI ITextSelection_fnExpand(
     ITextSelection *me,
-    long Unit,
-    long *pDelta)
+    LONG Unit,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1018,8 +1018,8 @@ static HRESULT WINAPI ITextSelection_fnExpand(
 
 static HRESULT WINAPI ITextSelection_fnGetIndex(
     ITextSelection *me,
-    long Unit,
-    long *pIndex)
+    LONG Unit,
+    LONG *pIndex)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1031,9 +1031,9 @@ static HRESULT WINAPI ITextSelection_fnGetIndex(
 
 static HRESULT WINAPI ITextSelection_fnSetIndex(
     ITextSelection *me,
-    long Unit,
-    long Index,
-    long Extend)
+    LONG Unit,
+    LONG Index,
+    LONG Extend)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1045,8 +1045,8 @@ static HRESULT WINAPI ITextSelection_fnSetIndex(
 
 static HRESULT WINAPI ITextSelection_fnSetRange(
     ITextSelection *me,
-    long cpActive,
-    long cpOther)
+    LONG cpActive,
+    LONG cpOther)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1059,7 +1059,7 @@ static HRESULT WINAPI ITextSelection_fnSetRange(
 static HRESULT WINAPI ITextSelection_fnInRange(
     ITextSelection *me,
     ITextRange *pRange,
-    long *pb)
+    LONG *pb)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1072,7 +1072,7 @@ static HRESULT WINAPI ITextSelection_fnInRange(
 static HRESULT WINAPI ITextSelection_fnInStory(
     ITextSelection *me,
     ITextRange *pRange,
-    long *pb)
+    LONG *pb)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1085,7 +1085,7 @@ static HRESULT WINAPI ITextSelection_fnInStory(
 static HRESULT WINAPI ITextSelection_fnIsEqual(
     ITextSelection *me,
     ITextRange *pRange,
-    long *pb)
+    LONG *pb)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1108,9 +1108,9 @@ static HRESULT WINAPI ITextSelection_fnSelect(
 
 static HRESULT WINAPI ITextSelection_fnStartOf(
     ITextSelection *me,
-    long Unit,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1122,9 +1122,9 @@ static HRESULT WINAPI ITextSelection_fnStartOf(
 
 static HRESULT WINAPI ITextSelection_fnEndOf(
     ITextSelection *me,
-    long Unit,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1136,9 +1136,9 @@ static HRESULT WINAPI ITextSelection_fnEndOf(
 
 static HRESULT WINAPI ITextSelection_fnMove(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1150,9 +1150,9 @@ static HRESULT WINAPI ITextSelection_fnMove(
 
 static HRESULT WINAPI ITextSelection_fnMoveStart(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1164,9 +1164,9 @@ static HRESULT WINAPI ITextSelection_fnMoveStart(
 
 static HRESULT WINAPI ITextSelection_fnMoveEnd(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1179,8 +1179,8 @@ static HRESULT WINAPI ITextSelection_fnMoveEnd(
 static HRESULT WINAPI ITextSelection_fnMoveWhile(
     ITextSelection *me,
     VARIANT *Cset,
-    long Count,
-    long *pDelta)
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1193,8 +1193,8 @@ static HRESULT WINAPI ITextSelection_fnMoveWhile(
 static HRESULT WINAPI ITextSelection_fnMoveStartWhile(
     ITextSelection *me,
     VARIANT *Cset,
-    long Count,
-    long *pDelta)
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1207,8 +1207,8 @@ static HRESULT WINAPI ITextSelection_fnMoveStartWhile(
 static HRESULT WINAPI ITextSelection_fnMoveEndWhile(
     ITextSelection *me,
     VARIANT *Cset,
-    long Count,
-    long *pDelta)
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1221,8 +1221,8 @@ static HRESULT WINAPI ITextSelection_fnMoveEndWhile(
 static HRESULT WINAPI ITextSelection_fnMoveUntil(
     ITextSelection *me,
     VARIANT *Cset,
-    long Count,
-    long *pDelta)
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1235,8 +1235,8 @@ static HRESULT WINAPI ITextSelection_fnMoveUntil(
 static HRESULT WINAPI ITextSelection_fnMoveStartUntil(
     ITextSelection *me,
     VARIANT *Cset,
-    long Count,
-    long *pDelta)
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1249,8 +1249,8 @@ static HRESULT WINAPI ITextSelection_fnMoveStartUntil(
 static HRESULT WINAPI ITextSelection_fnMoveEndUntil(
     ITextSelection *me,
     VARIANT *Cset,
-    long Count,
-    long *pDelta)
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1263,9 +1263,9 @@ static HRESULT WINAPI ITextSelection_fnMoveEndUntil(
 static HRESULT WINAPI ITextSelection_fnFindText(
     ITextSelection *me,
     BSTR bstr,
-    long cch,
-    long Flags,
-    long *pLength)
+    LONG cch,
+    LONG Flags,
+    LONG *pLength)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1278,9 +1278,9 @@ static HRESULT WINAPI ITextSelection_fnFindText(
 static HRESULT WINAPI ITextSelection_fnFindTextStart(
     ITextSelection *me,
     BSTR bstr,
-    long cch,
-    long Flags,
-    long *pLength)
+    LONG cch,
+    LONG Flags,
+    LONG *pLength)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1293,9 +1293,9 @@ static HRESULT WINAPI ITextSelection_fnFindTextStart(
 static HRESULT WINAPI ITextSelection_fnFindTextEnd(
     ITextSelection *me,
     BSTR bstr,
-    long cch,
-    long Flags,
-    long *pLength)
+    LONG cch,
+    LONG Flags,
+    LONG *pLength)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1307,9 +1307,9 @@ static HRESULT WINAPI ITextSelection_fnFindTextEnd(
 
 static HRESULT WINAPI ITextSelection_fnDelete(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1346,7 +1346,7 @@ static HRESULT WINAPI ITextSelection_fnCopy(
 static HRESULT WINAPI ITextSelection_fnPaste(
     ITextSelection *me,
     VARIANT *pVar,
-    long Format)
+    LONG Format)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1359,8 +1359,8 @@ static HRESULT WINAPI ITextSelection_fnPaste(
 static HRESULT WINAPI ITextSelection_fnCanPaste(
     ITextSelection *me,
     VARIANT *pVar,
-    long Format,
-    long *pb)
+    LONG Format,
+    LONG *pb)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1372,7 +1372,7 @@ static HRESULT WINAPI ITextSelection_fnCanPaste(
 
 static HRESULT WINAPI ITextSelection_fnCanEdit(
     ITextSelection *me,
-    long *pb)
+    LONG *pb)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1384,7 +1384,7 @@ static HRESULT WINAPI ITextSelection_fnCanEdit(
 
 static HRESULT WINAPI ITextSelection_fnChangeCase(
     ITextSelection *me,
-    long Type)
+    LONG Type)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1396,9 +1396,9 @@ static HRESULT WINAPI ITextSelection_fnChangeCase(
 
 static HRESULT WINAPI ITextSelection_fnGetPoint(
     ITextSelection *me,
-    long Type,
-    long *cx,
-    long *cy)
+    LONG Type,
+    LONG *cx,
+    LONG *cy)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1410,10 +1410,10 @@ static HRESULT WINAPI ITextSelection_fnGetPoint(
 
 static HRESULT WINAPI ITextSelection_fnSetPoint(
     ITextSelection *me,
-    long x,
-    long y,
-    long Type,
-    long Extend)
+    LONG x,
+    LONG y,
+    LONG Type,
+    LONG Extend)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1425,7 +1425,7 @@ static HRESULT WINAPI ITextSelection_fnSetPoint(
 
 static HRESULT WINAPI ITextSelection_fnScrollIntoView(
     ITextSelection *me,
-    long Value)
+    LONG Value)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1450,7 +1450,7 @@ static HRESULT WINAPI ITextSelection_fnGetEmbeddedObject(
 /*** ITextSelection methods ***/
 static HRESULT WINAPI ITextSelection_fnGetFlags(
     ITextSelection *me,
-    long *pFlags)
+    LONG *pFlags)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1462,7 +1462,7 @@ static HRESULT WINAPI ITextSelection_fnGetFlags(
 
 static HRESULT WINAPI ITextSelection_fnSetFlags(
     ITextSelection *me,
-    long Flags)
+    LONG Flags)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1474,7 +1474,7 @@ static HRESULT WINAPI ITextSelection_fnSetFlags(
 
 static HRESULT WINAPI ITextSelection_fnGetType(
     ITextSelection *me,
-    long *pType)
+    LONG *pType)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1486,10 +1486,10 @@ static HRESULT WINAPI ITextSelection_fnGetType(
 
 static HRESULT WINAPI ITextSelection_fnMoveLeft(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1501,10 +1501,10 @@ static HRESULT WINAPI ITextSelection_fnMoveLeft(
 
 static HRESULT WINAPI ITextSelection_fnMoveRight(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1516,10 +1516,10 @@ static HRESULT WINAPI ITextSelection_fnMoveRight(
 
 static HRESULT WINAPI ITextSelection_fnMoveUp(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1531,10 +1531,10 @@ static HRESULT WINAPI ITextSelection_fnMoveUp(
 
 static HRESULT WINAPI ITextSelection_fnMoveDown(
     ITextSelection *me,
-    long Unit,
-    long Count,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Count,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1546,9 +1546,9 @@ static HRESULT WINAPI ITextSelection_fnMoveDown(
 
 static HRESULT WINAPI ITextSelection_fnHomeKey(
     ITextSelection *me,
-    long Unit,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
@@ -1560,9 +1560,9 @@ static HRESULT WINAPI ITextSelection_fnHomeKey(
 
 static HRESULT WINAPI ITextSelection_fnEndKey(
     ITextSelection *me,
-    long Unit,
-    long Extend,
-    long *pDelta)
+    LONG Unit,
+    LONG Extend,
+    LONG *pDelta)
 {
     ITextSelectionImpl *This = (ITextSelectionImpl *) me;
     if (!This->reOle)
diff --git a/include/tom.idl b/include/tom.idl
index f86c885c5b7..35be7f70dbd 100644
--- a/include/tom.idl
+++ b/include/tom.idl
@@ -204,23 +204,23 @@ interface ITextDocument : IDispatch
 {
     HRESULT GetName([retval, out]BSTR *pName);
     HRESULT GetSelection([retval, out]ITextSelection **ppSel);
-    HRESULT GetStoryCount([retval, out]long *pCount);
+    HRESULT GetStoryCount([retval, out]LONG *pCount);
     HRESULT GetStoryRanges([retval, out]ITextStoryRanges **ppStories);
-    HRESULT GetSaved([retval, out]long *pValue);
-    HRESULT SetSaved([in]long Value);
+    HRESULT GetSaved([retval, out]LONG *pValue);
+    HRESULT SetSaved([in]LONG Value);
     HRESULT GetDefaultTabStop([retval, out]float *pValue);
     HRESULT SetDefaultTabStop([in]float Value);
     HRESULT New();
-    HRESULT Open([in]VARIANT *pVar, [in]long Flags, [in]long CodePage);
-    HRESULT Save([in]VARIANT *pVar, [in]long Flags, [in]long CodePage);
-    HRESULT Freeze([retval, out]long *pCount);
-    HRESULT Unfreeze([retval, out]long *pCount);
+    HRESULT Open([in]VARIANT *pVar, [in]LONG Flags, [in]LONG CodePage);
+    HRESULT Save([in]VARIANT *pVar, [in]LONG Flags, [in]LONG CodePage);
+    HRESULT Freeze([retval, out]LONG *pCount);
+    HRESULT Unfreeze([retval, out]LONG *pCount);
     HRESULT BeginEditCollection();
     HRESULT EndEditCollection();
-    HRESULT Undo([in]long Count, [retval, out]long *prop);
-    HRESULT Redo([in]long Count, [retval, out]long *prop);
-    HRESULT Range([in]long cp1, [in]long cp2, [retval, out]ITextRange**ppRange);
-    HRESULT RangeFromPoint([in]long x, [in]long y, [retval, out]ITextRange**ppRange);
+    HRESULT Undo([in]LONG Count, [retval, out]LONG *prop);
+    HRESULT Redo([in]LONG Count, [retval, out]LONG *prop);
+    HRESULT Range([in]LONG cp1, [in]LONG cp2, [retval, out]ITextRange **ppRange);
+    HRESULT RangeFromPoint([in]LONG x, [in]LONG y, [retval, out]ITextRange **ppRange);
 }
 
 interface ITextFont;
@@ -234,54 +234,54 @@ interface ITextRange : IDispatch
 {
     HRESULT GetText([retval, out]BSTR *pbstr);
     HRESULT SetText([in]BSTR bstr);
-    HRESULT GetChar([retval, out]long *pch);
-    HRESULT SetChar([in]long ch);
+    HRESULT GetChar([retval, out]LONG *pch);
+    HRESULT SetChar([in]LONG ch);
     HRESULT GetDuplicate([retval, out]ITextRange **ppRange);
     HRESULT GetFormattedText([retval, out]ITextRange **ppRange);
     HRESULT SetFormattedText([in]ITextRange *pRange);
-    HRESULT GetStart([retval, out]long *pcpFirst);
-    HRESULT SetStart([in]long cpFirst);
-    HRESULT GetEnd([retval, out]long *pcpLim);
-    HRESULT SetEnd([in]long cpLim);
+    HRESULT GetStart([retval, out]LONG *pcpFirst);
+    HRESULT SetStart([in]LONG cpFirst);
+    HRESULT GetEnd([retval, out]LONG *pcpLim);
+    HRESULT SetEnd([in]LONG cpLim);
     HRESULT GetFont([retval, out]ITextFont **pFont);
     HRESULT SetFont([in]ITextFont *pFont);
     HRESULT GetPara([retval, out]ITextPara **ppPara);
     HRESULT SetPara([in]ITextPara *pPara);
-    HRESULT GetStoryLength([retval, out]long *pcch);
-    HRESULT GetStoryType([retval, out]long *pValue);
-    HRESULT Collapse([in]long bStart);
-    HRESULT Expand([in]long Unit, [retval, out]long *pDelta);
-    HRESULT GetIndex([in]long Unit, [retval, out]long *pIndex);
-    HRESULT SetIndex([in]long Unit, [in]long Index, [in]long Extend);
-    HRESULT SetRange([in]long cpActive, [in]long cpOther);
-    HRESULT InRange([in]ITextRange *pRange, [retval, out]long *pb);
-    HRESULT InStory([in]ITextRange *pRange, [retval, out]long *pb);
-    HRESULT IsEqual([in]ITextRange *pRange, [retval, out]long *pb);
+    HRESULT GetStoryLength([retval, out]LONG *pcch);
+    HRESULT GetStoryType([retval, out]LONG *pValue);
+    HRESULT Collapse([in]LONG bStart);
+    HRESULT Expand([in]LONG Unit, [retval, out]LONG *pDelta);
+    HRESULT GetIndex([in]LONG Unit, [retval, out]LONG *pIndex);
+    HRESULT SetIndex([in]LONG Unit, [in]LONG Index, [in]LONG Extend);
+    HRESULT SetRange([in]LONG cpActive, [in]LONG cpOther);
+    HRESULT InRange([in]ITextRange *pRange, [retval, out]LONG *pb);
+    HRESULT InStory([in]ITextRange *pRange, [retval, out]LONG *pb);
+    HRESULT IsEqual([in]ITextRange *pRange, [retval, out]LONG *pb);
     HRESULT Select();
-    HRESULT StartOf([in]long Unit, [in]long Extend, [retval, out]long *pDelta);
-    HRESULT EndOf([in]long Unit, [in]long Extend, [retval, out]long *pDelta);
-    HRESULT Move([in]long Unit, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveStart([in]long Unit, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveEnd([in]long Unit, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveWhile([in]VARIANT *Cset, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveStartWhile([in]VARIANT *Cset, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveEndWhile([in]VARIANT *Cset, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveUntil([in]VARIANT *Cset, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveStartUntil([in]VARIANT *Cset, [in]long Count, [retval, out]long *pDelta);
-    HRESULT MoveEndUntil([in]VARIANT *Cset, [in]long Count, [retval, out]long *pDelta);
-    HRESULT FindText([in]BSTR bstr, [in]long cch, [in]long Flags, [retval, out]long *pLength);
-    HRESULT FindTextStart([in]BSTR bstr, [in]long cch, [in]long Flags, [retval, out]long *pLength);
-    HRESULT FindTextEnd([in]BSTR bstr, [in]long cch, [in]long Flags, [retval, out]long *pLength);
-    HRESULT Delete([in]long Unit, [in]long Count, [retval, out]long *pDelta);
+    HRESULT StartOf([in]LONG Unit, [in]LONG Extend, [retval, out]LONG *pDelta);
+    HRESULT EndOf([in]LONG Unit, [in]LONG Extend, [retval, out]LONG *pDelta);
+    HRESULT Move([in]LONG Unit, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveStart([in]LONG Unit, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveEnd([in]LONG Unit, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveWhile([in]VARIANT *Cset, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveStartWhile([in]VARIANT *Cset, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveEndWhile([in]VARIANT *Cset, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveUntil([in]VARIANT *Cset, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveStartUntil([in]VARIANT *Cset, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT MoveEndUntil([in]VARIANT *Cset, [in]LONG Count, [retval, out]LONG *pDelta);
+    HRESULT FindText([in]BSTR bstr, [in]LONG cch, [in]LONG Flags, [retval, out]LONG *pLength);
+    HRESULT FindTextStart([in]BSTR bstr, [in]LONG cch, [in]LONG Flags, [retval, out]LONG *pLength);
+    HRESULT FindTextEnd([in]BSTR bstr, [in]LONG cch, [in]LONG Flags, [retval, out]LONG *pLength);
+    HRESULT Delete([in]LONG Unit, [in]LONG Count, [retval, out]LONG *pDelta);
     HRESULT Cut([out]VARIANT *pVar);
     HRESULT Copy([out]VARIANT *pVar);
-    HRESULT Paste([in]VARIANT *pVar, [in]long Format);
-    HRESULT CanPaste([in]VARIANT *pVar, [in]long Format, [retval, out]long *pb);
-    HRESULT CanEdit([retval, out]long *pb);
-    HRESULT ChangeCase([in]long Type);
-    HRESULT GetPoint([in]long Type, [out]long *cx, [out]long *cy);
-    HRESULT SetPoint([in]long x, [in]long y, [in]long Type, [in]long Extend);
-    HRESULT ScrollIntoView([in]long Value);
+    HRESULT Paste([in]VARIANT *pVar, [in]LONG Format);
+    HRESULT CanPaste([in]VARIANT *pVar, [in]LONG Format, [retval, out]LONG *pb);
+    HRESULT CanEdit([retval, out]LONG *pb);
+    HRESULT ChangeCase([in]LONG Type);
+    HRESULT GetPoint([in]LONG Type, [out]LONG *cx, [out]LONG *cy);
+    HRESULT SetPoint([in]LONG x, [in]LONG y, [in]LONG Type, [in]LONG Extend);
+    HRESULT ScrollIntoView([in]LONG Value);
     HRESULT GetEmbeddedObject([retval, out]IUnknown **ppv);
 }
 
@@ -291,15 +291,15 @@ interface ITextRange : IDispatch
 ]
 interface ITextSelection : ITextRange
 {
-    HRESULT GetFlags([retval, out]long *pFlags);
-    HRESULT SetFlags([in]long Flags);
-    HRESULT GetType([retval, out]long *pType);
-    HRESULT MoveLeft([in]long Unit, [in]long Count, [in]long Extend, [retval, out]long *pDelta);
-    HRESULT MoveRight([in]long Unit, [in]long Count, [in]long Extend, [retval, out]long *pDelta);
-    HRESULT MoveUp([in]long Unit, [in]long Count, [in]long Extend, [retval, out]long *pDelta);
-    HRESULT MoveDown([in]long Unit, [in]long Count, [in]long Extend, [retval, out]long *pDelta);
-    HRESULT HomeKey([in]long Unit, [in]long Extend, [retval, out]long *pDelta);
-    HRESULT EndKey([in]long Unit, [in]long Extend, [retval, out]long *pDelta);
+    HRESULT GetFlags([retval, out]LONG *pFlags);
+    HRESULT SetFlags([in]LONG Flags);
+    HRESULT GetType([retval, out]LONG *pType);
+    HRESULT MoveLeft([in]LONG Unit, [in]LONG Count, [in]LONG Extend, [retval, out]LONG *pDelta);
+    HRESULT MoveRight([in]LONG Unit, [in]LONG Count, [in]LONG Extend, [retval, out]LONG *pDelta);
+    HRESULT MoveUp([in]LONG Unit, [in]LONG Count, [in]LONG Extend, [retval, out]LONG *pDelta);
+    HRESULT MoveDown([in]LONG Unit, [in]LONG Count, [in]LONG Extend, [retval, out]LONG *pDelta);
+    HRESULT HomeKey([in]LONG Unit, [in]LONG Extend, [retval, out]LONG *pDelta);
+    HRESULT EndKey([in]LONG Unit, [in]LONG Extend, [retval, out]LONG *pDelta);
     HRESULT TypeText([in]BSTR bstr);
 }
 
@@ -311,59 +311,59 @@ interface ITextFont : IDispatch
 {
     HRESULT GetDuplicate([retval, out]ITextFont **ppFont);
     HRESULT SetDuplicate([in]ITextFont *pFont);
-    HRESULT CanChange([out]long *pB);
-    HRESULT IsEqual([in]ITextFont *pFont, [retval, out]long *pB);
-    HRESULT Reset([in]long Value);
-    HRESULT GetStyle([retval, out]long *pValue);
-    HRESULT SetStyle([in]long Value);
-    HRESULT GetAllCaps([retval, out]long *pValue);
-    HRESULT SetAllCaps([in]long Value);
-    HRESULT GetAnimation([retval, out]long *pValue);
-    HRESULT SetAnimation([in]long Value);
-    HRESULT GetBackColor([retval, out]long *pValue);
-    HRESULT SetBackColor([in]long Value);
-    HRESULT GetBold([retval, out]long *pValue);
-    HRESULT SetBold([in]long Value);
-    HRESULT GetEmboss([retval, out]long *pValue);
-    HRESULT SetEmboss([in]long Value);
-    HRESULT GetForeColor([retval, out]long *pValue);
-    HRESULT SetForeColor([in]long Value);
-    HRESULT GetHidden([retval, out]long *pValue);
-    HRESULT SetHidden([in]long Value);
-    HRESULT GetEngrave([retval, out]long *pValue);
-    HRESULT SetEngrave([in]long Value);
-    HRESULT GetItalic([retval, out]long *pValue);
-    HRESULT SetItalic([in]long Value);
-    HRESULT GetKerning([retval, out]long *pValue);
-    HRESULT SetKerning([in]long Value);
-    HRESULT GetLanguageID([retval, out]long *pValue);
-    HRESULT SetLanguageID([in]long Value);
+    HRESULT CanChange([out]LONG *pB);
+    HRESULT IsEqual([in]ITextFont *pFont, [retval, out]LONG *pB);
+    HRESULT Reset([in]LONG Value);
+    HRESULT GetStyle([retval, out]LONG *pValue);
+    HRESULT SetStyle([in]LONG Value);
+    HRESULT GetAllCaps([retval, out]LONG *pValue);
+    HRESULT SetAllCaps([in]LONG Value);
+    HRESULT GetAnimation([retval, out]LONG *pValue);
+    HRESULT SetAnimation([in]LONG Value);
+    HRESULT GetBackColor([retval, out]LONG *pValue);
+    HRESULT SetBackColor([in]LONG Value);
+    HRESULT GetBold([retval, out]LONG *pValue);
+    HRESULT SetBold([in]LONG Value);
+    HRESULT GetEmboss([retval, out]LONG *pValue);
+    HRESULT SetEmboss([in]LONG Value);
+    HRESULT GetForeColor([retval, out]LONG *pValue);
+    HRESULT SetForeColor([in]LONG Value);
+    HRESULT GetHidden([retval, out]LONG *pValue);
+    HRESULT SetHidden([in]LONG Value);
+    HRESULT GetEngrave([retval, out]LONG *pValue);
+    HRESULT SetEngrave([in]LONG Value);
+    HRESULT GetItalic([retval, out]LONG *pValue);
+    HRESULT SetItalic([in]LONG Value);
+    HRESULT GetKerning([retval, out]LONG *pValue);
+    HRESULT SetKerning([in]LONG Value);
+    HRESULT GetLanguageID([retval, out]LONG *pValue);
+    HRESULT SetLanguageID([in]LONG Value);
     HRESULT GetName([retval, out]BSTR *pValue);
     HRESULT SetName([in]BSTR Value);
-    HRESULT GetOutline([retval, out]long *pValue);
-    HRESULT SetOutline([in]long Value);
-    HRESULT GetPosition([retval, out]long *pValue);
-    HRESULT SetPosition([in]long Value);
-    HRESULT GetProtected([retval, out]long *pValue);
-    HRESULT SetProtected([in]long Value);
-    HRESULT GetShadow([retval, out]long *pValue);
-    HRESULT SetShadow([in]long Value);
-    HRESULT GetSize([retval, out]long *pValue);
-    HRESULT SetSize([in]long Value);
-    HRESULT GetSmallCaps([retval, out]long *pValue);
-    HRESULT SetSmallCaps([in]long Value);
+    HRESULT GetOutline([retval, out]LONG *pValue);
+    HRESULT SetOutline([in]LONG Value);
+    HRESULT GetPosition([retval, out]LONG *pValue);
+    HRESULT SetPosition([in]LONG Value);
+    HRESULT GetProtected([retval, out]LONG *pValue);
+    HRESULT SetProtected([in]LONG Value);
+    HRESULT GetShadow([retval, out]LONG *pValue);
+    HRESULT SetShadow([in]LONG Value);
+    HRESULT GetSize([retval, out]LONG *pValue);
+    HRESULT SetSize([in]LONG Value);
+    HRESULT GetSmallCaps([retval, out]LONG *pValue);
+    HRESULT SetSmallCaps([in]LONG Value);
     HRESULT GetSpacing([retval, out]float *pValue);
     HRESULT SetSpacing([in]float Value);
-    HRESULT GetStrikeThrough([retval, out]long *pValue);
-    HRESULT SetStrikeThrough([in]long Value);
-    HRESULT GetSubscript([retval, out]long *pValue);
-    HRESULT SetSubscript([in]long Value);
-    HRESULT GetSuperscript([retval, out]long *pValue);
-    HRESULT SetSuperscript([in]long Value);
-    HRESULT GetUnderline([retval, out]long *pValue);
-    HRESULT SetUnderline([in]long Value);
-    HRESULT GetWeight([retval, out]long *pValue);
-    HRESULT SetWeight([in]long Value);
+    HRESULT GetStrikeThrough([retval, out]LONG *pValue);
+    HRESULT SetStrikeThrough([in]LONG Value);
+    HRESULT GetSubscript([retval, out]LONG *pValue);
+    HRESULT SetSubscript([in]LONG Value);
+    HRESULT GetSuperscript([retval, out]LONG *pValue);
+    HRESULT SetSuperscript([in]LONG Value);
+    HRESULT GetUnderline([retval, out]LONG *pValue);
+    HRESULT SetUnderline([in]LONG Value);
+    HRESULT GetWeight([retval, out]LONG *pValue);
+    HRESULT SetWeight([in]LONG Value);
 }
 
 [
@@ -374,52 +374,52 @@ interface ITextPara : IDispatch
 {
     HRESULT GetDuplicate([retval, out]ITextPara **ppPara);
     HRESULT SetDuplicate([in]ITextPara *pPara);
-    HRESULT CanChange([out]long *pB);
-    HRESULT IsEqual([in]ITextPara *pPara, [retval, out]long *pB);
-    HRESULT Reset([in]long Value);
-    HRESULT GetStyle([retval, out]long *pValue);
-    HRESULT SetStyle([in]long Value);
-    HRESULT GetAlignment([retval, out]long *pValue);
-    HRESULT SetAlignment([in]long Value);
-    HRESULT GetHyphenation([retval, out]long *pValue);
-    HRESULT SetHyphenation([in]long Value);
+    HRESULT CanChange([out]LONG *pB);
+    HRESULT IsEqual([in]ITextPara *pPara, [retval, out]LONG *pB);
+    HRESULT Reset([in]LONG Value);
+    HRESULT GetStyle([retval, out]LONG *pValue);
+    HRESULT SetStyle([in]LONG Value);
+    HRESULT GetAlignment([retval, out]LONG *pValue);
+    HRESULT SetAlignment([in]LONG Value);
+    HRESULT GetHyphenation([retval, out]LONG *pValue);
+    HRESULT SetHyphenation([in]LONG Value);
     HRESULT GetFirstLineIndent([retval, out]float *pValue);
-    HRESULT GetKeepTogether([retval, out]long *pValue);
-    HRESULT SetKeepTogether([in]long Value);
-    HRESULT GetKeepWithNext([retval, out]long *pValue);
-    HRESULT SetKeepWithNext([in]long Value);
+    HRESULT GetKeepTogether([retval, out]LONG *pValue);
+    HRESULT SetKeepTogether([in]LONG Value);
+    HRESULT GetKeepWithNext([retval, out]LONG *pValue);
+    HRESULT SetKeepWithNext([in]LONG Value);
     HRESULT GetLeftIndent([retval, out]float *pValue);
     HRESULT GetLineSpacing([retval, out]float *pValue);
-    HRESULT GetLineSpacingRule([retval, out]long *pValue);
-    HRESULT GetListAlignment([retval, out]long *pValue);
-    HRESULT SetListAlignment([in]long Value);
-    HRESULT GetListLevelIndex([retval, out]long *pValue);
-    HRESULT SetListLevelIndex([in]long Value);
-    HRESULT GetListStart([retval, out]long *pValue);
-    HRESULT SetListStart([in]long Value);
-    HRESULT GetListTab([retval, out]long *pValue);
-    HRESULT SetListTab([in]long Value);
-    HRESULT GetListType([retval, out]long *pValue);
-    HRESULT SetListType([in]long Value);
-    HRESULT GetNoLineNumber([retval, out]long *pValue);
-    HRESULT SetNoLineNumber([in]long Value);
-    HRESULT GetPageBreakBefore([retval, out]long *pValue);
-    HRESULT SetPageBreakBefore([in]long Value);
+    HRESULT GetLineSpacingRule([retval, out]LONG *pValue);
+    HRESULT GetListAlignment([retval, out]LONG *pValue);
+    HRESULT SetListAlignment([in]LONG Value);
+    HRESULT GetListLevelIndex([retval, out]LONG *pValue);
+    HRESULT SetListLevelIndex([in]LONG Value);
+    HRESULT GetListStart([retval, out]LONG *pValue);
+    HRESULT SetListStart([in]LONG Value);
+    HRESULT GetListTab([retval, out]LONG *pValue);
+    HRESULT SetListTab([in]LONG Value);
+    HRESULT GetListType([retval, out]LONG *pValue);
+    HRESULT SetListType([in]LONG Value);
+    HRESULT GetNoLineNumber([retval, out]LONG *pValue);
+    HRESULT SetNoLineNumber([in]LONG Value);
+    HRESULT GetPageBreakBefore([retval, out]LONG *pValue);
+    HRESULT SetPageBreakBefore([in]LONG Value);
     HRESULT GetRightIndent([retval, out]float *pValue);
     HRESULT SetRightIndent([in]float Value);
     HRESULT SetIndents([in]float StartIndent, [in]float LeftIndent, [in]float RightIndent);
-    HRESULT SetLineSpacing([in]long LineSpacingRule, [in]float LineSpacing);
+    HRESULT SetLineSpacing([in]LONG LineSpacingRule, [in]float LineSpacing);
     HRESULT GetSpaceAfter([retval, out]float *pValue);
     HRESULT SetSpaceAfter([in]float Value);
     HRESULT GetSpaceBefore([retval, out]float *pValue);
     HRESULT SetSpaceBefore([in]float Value);
     HRESULT GetWindowControl([retval, out]float *pValue);
     HRESULT SetWindowControl([in]float Value);
-    HRESULT GetTabCount([retval, out]long *pCount);
-    HRESULT AddTab([in]float tbPos, [in]long tbAlign, [in]long tbLeader);
+    HRESULT GetTabCount([retval, out]LONG *pCount);
+    HRESULT AddTab([in]float tbPos, [in]LONG tbAlign, [in]LONG tbLeader);
     HRESULT ClearAllTabs();
     HRESULT DeleteTab([in]float tbPos);
-    HRESULT GetTab([in]long iTab, [out]float *ptbPos, [out]long *ptbAlign, [out]long *ptbLeader);
+    HRESULT GetTab([in]LONG iTab, [out]float *ptbPos, [out]LONG *ptbAlign, [out]LONG *ptbLeader);
 }
 
 [
@@ -429,6 +429,6 @@ interface ITextPara : IDispatch
 interface ITextStoryRanges : IDispatch
 {
     HRESULT _NewEnum([retval, out]IUnknown **ppUnkEnum);
-    HRESULT Item([in]long Index, [retval, out]ITextRange **ppRange);
-    HRESULT GetCount([retval, out]long *pCount);
+    HRESULT Item([in]LONG Index, [retval, out]ITextRange **ppRange);
+    HRESULT GetCount([retval, out]LONG *pCount);
 }