mshtml: Change long to LONG in mshtml.idl (remaining stuff).

dlls/mshtml/htmlcomment.c

@@ -107,14 +107,14 @@ static HRESULT WINAPI HTMLCommentElement_get_text(IHTMLCommentElement *iface, BS
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLCommentElement_put_atomic(IHTMLCommentElement *iface, long v)
+static HRESULT WINAPI HTMLCommentElement_put_atomic(IHTMLCommentElement *iface, LONG v)
 {
     HTMLCommentElement *This = HTMLCOMMENT_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, v);
+    FIXME("(%p)->(%d)\n", This, v);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLCommentElement_get_atomic(IHTMLCommentElement *iface, long *p)
+static HRESULT WINAPI HTMLCommentElement_get_atomic(IHTMLCommentElement *iface, LONG *p)
 {
     HTMLCommentElement *This = HTMLCOMMENT_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);

dlls/mshtml/htmldoc.c

@@ -1366,11 +1366,11 @@ static HRESULT WINAPI HTMLDocument_get_onselectstart(IHTMLDocument2 *iface, VARI
     return get_doc_event(This, EVENTID_SELECTSTART, p);
 }
 
-static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, long x, long y,
+static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG x, LONG y,
                                                         IHTMLElement **elementHit)
 {
     HTMLDocument *This = HTMLDOC_THIS(iface);
-    FIXME("(%p)->(%ld %ld %p)\n", This, x, y, elementHit);
+    FIXME("(%p)->(%d %d %p)\n", This, x, y, elementHit);
     return E_NOTIMPL;
 }
 
@@ -1452,11 +1452,11 @@ static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String)
 }
 
 static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref,
-                                            long lIndex, IHTMLStyleSheet **ppnewStyleSheet)
+                                            LONG lIndex, IHTMLStyleSheet **ppnewStyleSheet)
 {
     HTMLDocument *This = HTMLDOC_THIS(iface);
 
-    FIXME("(%p)->(%s %ld %p) semi-stub\n", This, debugstr_w(bstrHref), lIndex, ppnewStyleSheet);
+    FIXME("(%p)->(%s %d %p) semi-stub\n", This, debugstr_w(bstrHref), lIndex, ppnewStyleSheet);
 
     *ppnewStyleSheet = HTMLStyleSheet_Create(NULL);
     return S_OK;

dlls/mshtml/htmlevent.c

@@ -289,21 +289,21 @@ static HRESULT WINAPI HTMLEventObj_get_toElement(IHTMLEventObj *iface, IHTMLElem
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, long v)
+static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, v);
+    FIXME("(%p)->(%d)\n", This, v);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
@@ -324,63 +324,63 @@ static HRESULT WINAPI HTMLEventObj_get_qualifier(IHTMLEventObj *iface, BSTR *p)
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_reason(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_reason(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_offsetX(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_offsetX(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, long *p)
+static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p)
 {
     HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);

dlls/mshtml/htmlnode.c

@@ -129,7 +129,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_Invoke(IHTMLDOMChildrenCollectio
             wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 }
 
-static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenCollection *iface, long *p)
+static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenCollection *iface, LONG *p)
 {
     HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface);
     PRUint32 length=0;
@@ -148,14 +148,14 @@ static HRESULT WINAPI HTMLDOMChildrenCollection__newEnum(IHTMLDOMChildrenCollect
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection *iface, long index, IDispatch **ppItem)
+static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection *iface, LONG index, IDispatch **ppItem)
 {
     HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface);
     nsIDOMNode *nsnode = NULL;
     PRUint32 length=0;
     nsresult nsres;
 
-    TRACE("(%p)->(%ld %p)\n", This, index, ppItem);
+    TRACE("(%p)->(%d %p)\n", This, index, ppItem);
 
     nsIDOMNodeList_GetLength(This->nslist, &length);
     if(index < 0 || index >= length)
@@ -338,7 +338,7 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe
             wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 }
 
-static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, long *p)
+static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, LONG *p)
 {
     HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
     PRUint16 type = -1;

dlls/mshtml/htmlstyle.c

@@ -2097,56 +2097,56 @@ static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p)
     return S_OK;
 }
 
-static HRESULT WINAPI HTMLStyle_put_pixelTop(IHTMLStyle *iface, long v)
+static HRESULT WINAPI HTMLStyle_put_pixelTop(IHTMLStyle *iface, LONG v)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle_get_pixelTop(IHTMLStyle *iface, long *p)
+static HRESULT WINAPI HTMLStyle_get_pixelTop(IHTMLStyle *iface, LONG *p)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle_put_pixelLeft(IHTMLStyle *iface, long v)
+static HRESULT WINAPI HTMLStyle_put_pixelLeft(IHTMLStyle *iface, LONG v)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle_get_pixelLeft(IHTMLStyle *iface, long *p)
+static HRESULT WINAPI HTMLStyle_get_pixelLeft(IHTMLStyle *iface, LONG *p)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle_put_pixelWidth(IHTMLStyle *iface, long v)
+static HRESULT WINAPI HTMLStyle_put_pixelWidth(IHTMLStyle *iface, LONG v)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle_get_pixelWidth(IHTMLStyle *iface, long *p)
+static HRESULT WINAPI HTMLStyle_get_pixelWidth(IHTMLStyle *iface, LONG *p)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle_put_pixelHeight(IHTMLStyle *iface, long v)
+static HRESULT WINAPI HTMLStyle_put_pixelHeight(IHTMLStyle *iface, LONG v)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle_get_pixelHeight(IHTMLStyle *iface, long *p)
+static HRESULT WINAPI HTMLStyle_get_pixelHeight(IHTMLStyle *iface, LONG *p)
 {
     HTMLStyle *This = HTMLSTYLE_THIS(iface);
     FIXME("(%p)->()\n", This);

dlls/mshtml/htmlstyle2.c

@@ -223,28 +223,28 @@ static HRESULT WINAPI HTMLStyle2_get_right(IHTMLStyle2 *iface, VARIANT *p)
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle2_put_pixelBottom(IHTMLStyle2 *iface, long v)
+static HRESULT WINAPI HTMLStyle2_put_pixelBottom(IHTMLStyle2 *iface, LONG v)
 {
     HTMLStyle *This = HTMLSTYLE2_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, v);
+    FIXME("(%p)->(%d)\n", This, v);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle2_get_pixelBottom(IHTMLStyle2 *iface, long *p)
+static HRESULT WINAPI HTMLStyle2_get_pixelBottom(IHTMLStyle2 *iface, LONG *p)
 {
     HTMLStyle *This = HTMLSTYLE2_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle2_put_pixelRight(IHTMLStyle2 *iface, long v)
+static HRESULT WINAPI HTMLStyle2_put_pixelRight(IHTMLStyle2 *iface, LONG v)
 {
     HTMLStyle *This = HTMLSTYLE2_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, v);
+    FIXME("(%p)->(%d)\n", This, v);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyle2_get_pixelRight(IHTMLStyle2 *iface, long *p)
+static HRESULT WINAPI HTMLStyle2_get_pixelRight(IHTMLStyle2 *iface, LONG *p)
 {
     HTMLStyle *This = HTMLSTYLE2_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);

dlls/mshtml/htmlstylesheet.c

@@ -147,7 +147,7 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_Invoke(IHTMLStyleSheetRulesC
 }
 
 static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRulesCollection *iface,
-        long *p)
+        LONG *p)
 {
     HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface);
     PRUint32 len = 0;
@@ -167,10 +167,10 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRu
 }
 
 static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCollection *iface,
-        long index, IHTMLStyleSheetRule **ppHTMLStyleSheetRule)
+        LONG index, IHTMLStyleSheetRule **ppHTMLStyleSheetRule)
 {
     HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface);
-    FIXME("(%p)->(%ld %p)\n", This, index, ppHTMLStyleSheetRule);
+    FIXME("(%p)->(%d %p)\n", This, index, ppHTMLStyleSheetRule);
     return E_NOTIMPL;
 }
 
@@ -295,7 +295,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_Invoke(IHTMLStyleSheetsCollectio
 }
 
 static HRESULT WINAPI HTMLStyleSheetsCollection_get_length(IHTMLStyleSheetsCollection *iface,
-        long *p)
+        LONG *p)
 {
     HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface);
     PRUint32 len = 0;
@@ -557,33 +557,33 @@ static HRESULT WINAPI HTMLStyleSheet_get_id(IHTMLStyleSheet *iface, BSTR *p)
 }
 
 static HRESULT WINAPI HTMLStyleSheet_addImport(IHTMLStyleSheet *iface, BSTR bstrURL,
-                                               long lIndex, long *plIndex)
+                                               LONG lIndex, LONG *plIndex)
 {
     HTMLStyleSheet *This = HTMLSTYLESHEET_THIS(iface);
-    FIXME("(%p)->(%s %ld %p)\n", This, debugstr_w(bstrURL), lIndex, plIndex);
+    FIXME("(%p)->(%s %d %p)\n", This, debugstr_w(bstrURL), lIndex, plIndex);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI HTMLStyleSheet_addRule(IHTMLStyleSheet *iface, BSTR bstrSelector,
-                                             BSTR bstrStyle, long lIndex, long *plIndex)
+                                             BSTR bstrStyle, LONG lIndex, LONG *plIndex)
 {
     HTMLStyleSheet *This = HTMLSTYLESHEET_THIS(iface);
-    FIXME("(%p)->(%s %s %ld %p)\n", This, debugstr_w(bstrSelector), debugstr_w(bstrStyle),
+    FIXME("(%p)->(%s %s %d %p)\n", This, debugstr_w(bstrSelector), debugstr_w(bstrStyle),
           lIndex, plIndex);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyleSheet_removeImport(IHTMLStyleSheet *iface, long lIndex)
+static HRESULT WINAPI HTMLStyleSheet_removeImport(IHTMLStyleSheet *iface, LONG lIndex)
 {
     HTMLStyleSheet *This = HTMLSTYLESHEET_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, lIndex);
+    FIXME("(%p)->(%d)\n", This, lIndex);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLStyleSheet_removeRule(IHTMLStyleSheet *iface, long lIndex)
+static HRESULT WINAPI HTMLStyleSheet_removeRule(IHTMLStyleSheet *iface, LONG lIndex)
 {
     HTMLStyleSheet *This = HTMLSTYLESHEET_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, lIndex);
+    FIXME("(%p)->(%d)\n", This, lIndex);
     return E_NOTIMPL;
 }
 

dlls/mshtml/htmltable.c

@@ -96,14 +96,14 @@ static HRESULT WINAPI HTMLTable_Invoke(IHTMLTable *iface, DISPID dispIdMember,
             pVarResult, pExcepInfo, puArgErr);
 }
 
-static HRESULT WINAPI HTMLTable_put_cols(IHTMLTable *iface, long v)
+static HRESULT WINAPI HTMLTable_put_cols(IHTMLTable *iface, LONG v)
 {
     HTMLTable *This = HTMLTABLE_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, v);
+    FIXME("(%p)->(%d)\n", This, v);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTable_get_cols(IHTMLTable *iface, long *p)
+static HRESULT WINAPI HTMLTable_get_cols(IHTMLTable *iface, LONG *p)
 {
     HTMLTable *This = HTMLTABLE_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
@@ -319,14 +319,14 @@ static HRESULT WINAPI HTMLTable_get_height(IHTMLTable *iface, VARIANT *p)
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTable_put_dataPageSize(IHTMLTable *iface, long v)
+static HRESULT WINAPI HTMLTable_put_dataPageSize(IHTMLTable *iface, LONG v)
 {
     HTMLTable *This = HTMLTABLE_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, v);
+    FIXME("(%p)->(%d)\n", This, v);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTable_get_dataPageSize(IHTMLTable *iface, long *p)
+static HRESULT WINAPI HTMLTable_get_dataPageSize(IHTMLTable *iface, LONG *p)
 {
     HTMLTable *This = HTMLTABLE_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
@@ -417,17 +417,17 @@ static HRESULT WINAPI HTMLTable_deleteCaption(IHTMLTable *iface)
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTable_insertRow(IHTMLTable *iface, long index, IDispatch **row)
+static HRESULT WINAPI HTMLTable_insertRow(IHTMLTable *iface, LONG index, IDispatch **row)
 {
     HTMLTable *This = HTMLTABLE_THIS(iface);
-    FIXME("(%p)->(%ld %p)\n", This, index, row);
+    FIXME("(%p)->(%d %p)\n", This, index, row);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTable_deleteRow(IHTMLTable *iface, long index)
+static HRESULT WINAPI HTMLTable_deleteRow(IHTMLTable *iface, LONG index)
 {
     HTMLTable *This = HTMLTABLE_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, index);
+    FIXME("(%p)->(%d)\n", This, index);
     return E_NOTIMPL;
 }
 

dlls/mshtml/htmltablerow.c

@@ -179,14 +179,14 @@ static HRESULT WINAPI HTMLTableRow_get_borderColorDark(IHTMLTableRow *iface, VAR
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTableRow_get_rowIndex(IHTMLTableRow *iface, long *p)
+static HRESULT WINAPI HTMLTableRow_get_rowIndex(IHTMLTableRow *iface, LONG *p)
 {
     HTMLTableRow *This = HTMLTABLEROW_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTableRow_get_selectionRowIndex(IHTMLTableRow *iface, long *p)
+static HRESULT WINAPI HTMLTableRow_get_selectionRowIndex(IHTMLTableRow *iface, LONG *p)
 {
     HTMLTableRow *This = HTMLTABLEROW_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
@@ -213,17 +213,17 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC
     return S_OK;
 }
 
-static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, long index, IDispatch **row)
+static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row)
 {
     HTMLTableRow *This = HTMLTABLEROW_THIS(iface);
-    FIXME("(%p)->(%ld %p)\n", This, index, row);
+    FIXME("(%p)->(%d %p)\n", This, index, row);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, long index)
+static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index)
 {
     HTMLTableRow *This = HTMLTABLEROW_THIS(iface);
-    FIXME("(%p)->(%ld)\n", This, index);
+    FIXME("(%p)->(%d)\n", This, index);
     return E_NOTIMPL;
 }
 

dlls/mshtml/htmltextnode.c

@@ -116,17 +116,17 @@ static HRESULT WINAPI HTMLDOMTextNode_toString(IHTMLDOMTextNode *iface, BSTR *St
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, long *p)
+static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG *p)
 {
     HTMLDOMTextNode *This = HTMLTEXT_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, long offset, IHTMLDOMNode **pRetNode)
+static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG offset, IHTMLDOMNode **pRetNode)
 {
     HTMLDOMTextNode *This = HTMLTEXT_THIS(iface);
-    FIXME("(%p)->(%ld %p)\n", This, offset, pRetNode);
+    FIXME("(%p)->(%d %p)\n", This, offset, pRetNode);
     return E_NOTIMPL;
 }
 

dlls/mshtml/omnavigator.c

@@ -270,7 +270,7 @@ static HRESULT WINAPI OmNavigator_get_appMinorVersion(IOmNavigator *iface, BSTR
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI OmNavigator_get_connectionSpeed(IOmNavigator *iface, long *p)
+static HRESULT WINAPI OmNavigator_get_connectionSpeed(IOmNavigator *iface, LONG *p)
 {
     OmNavigator *This = OMNAVIGATOR_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);

dlls/mshtml/tests/dom.c

@@ -576,7 +576,7 @@ static void _test_elem_type(unsigned line, IUnknown *unk, elem_type_t type)
 static long _get_node_type(unsigned line, IUnknown *unk)
 {
     IHTMLDOMNode *node = _get_node_iface(line, unk);
-    long type = -1;
+    LONG type = -1;
     HRESULT hres;
 
     hres = IHTMLDOMNode_get_nodeType(node, &type);
@@ -905,12 +905,12 @@ static void _test_range_expand(unsigned line, IHTMLTxtRange *range, LPWSTR unit,
 #define test_range_move(r,u,c,e) _test_range_move(__LINE__,r,u,c,e)
 static void _test_range_move(unsigned line, IHTMLTxtRange *range, LPWSTR unit, long cnt, long excnt)
 {
-    long c = 0xdeadbeef;
+    LONG c = 0xdeadbeef;
     HRESULT hres;
 
     hres = IHTMLTxtRange_move(range, unit, cnt, &c);
     ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres);
-    ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt);
+    ok_(__FILE__,line) (c == excnt, "count=%d, expected %ld\n", c, excnt);
     _test_range_text(line, range, NULL);
 }
 
@@ -918,23 +918,23 @@ static void _test_range_move(unsigned line, IHTMLTxtRange *range, LPWSTR unit, l
 static void _test_range_movestart(unsigned line, IHTMLTxtRange *range,
         LPWSTR unit, long cnt, long excnt)
 {
-    long c = 0xdeadbeef;
+    LONG c = 0xdeadbeef;
     HRESULT hres;
 
     hres = IHTMLTxtRange_moveStart(range, unit, cnt, &c);
     ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres);
-    ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt);
+    ok_(__FILE__,line) (c == excnt, "count=%d, expected %ld\n", c, excnt);
 }
 
 #define test_range_moveend(r,u,c,e) _test_range_moveend(__LINE__,r,u,c,e)
 static void _test_range_moveend(unsigned line, IHTMLTxtRange *range, LPWSTR unit, long cnt, long excnt)
 {
-    long c = 0xdeadbeef;
+    LONG c = 0xdeadbeef;
     HRESULT hres;
 
     hres = IHTMLTxtRange_moveEnd(range, unit, cnt, &c);
     ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres);
-    ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt);
+    ok_(__FILE__,line) (c == excnt, "count=%d, expected %ld\n", c, excnt);
 }
 
 #define test_range_put_text(r,t) _test_range_put_text(__LINE__,r,t)
@@ -1110,18 +1110,18 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const ch
     col = _get_child_nodes(line, (IUnknown*)elem);
     ok(col != NULL, "col == NULL\n");
     if(col) {
-        long length = 0, type;
+        LONG length = 0, type;
         IHTMLDOMNode *node;
 
         hres = IHTMLDOMChildrenCollection_get_length(col, &length);
         ok(hres == S_OK, "get_length failed: %08x\n", hres);
-        ok(length == 1, "length = %ld\n", length);
+        ok(length == 1, "length = %d\n", length);
 
         node = _get_child_item(line, col, 0);
         ok(node != NULL, "node == NULL\n");
         if(node) {
             type = _get_node_type(line, (IUnknown*)node);
-            ok(type == 3, "type=%ld\n", type);
+            ok(type == 3, "type=%d\n", type);
             IHTMLDOMNode_Release(node);
         }
 
@@ -3777,7 +3777,7 @@ static void test_defaults(IHTMLDocument2 *doc)
     IHTMLElement2 *elem2;
     IHTMLElement *elem;
     IHTMLStyle *style;
-    long l;
+    LONG l;
     HRESULT hres;
     IHTMLElementCollection *collection;
 
@@ -3874,7 +3874,7 @@ static void test_defaults(IHTMLDocument2 *doc)
     l = 0xdeadbeef;
     hres = IHTMLStyleSheetsCollection_get_length(stylesheetcol, &l);
     ok(hres == S_OK, "get_length failed: %08x\n", hres);
-    ok(l == 0, "length = %ld\n", l);
+    ok(l == 0, "length = %d\n", l);
 
     IHTMLStyleSheetsCollection_Release(stylesheetcol);
 
@@ -4032,7 +4032,7 @@ static void test_stylesheets(IHTMLDocument2 *doc)
 {
     IHTMLStyleSheetsCollection *col = NULL;
     VARIANT idx, res;
-    long len = 0;
+    LONG len = 0;
     HRESULT hres;
 
     hres = IHTMLDocument2_get_styleSheets(doc, &col);
@@ -4041,7 +4041,7 @@ static void test_stylesheets(IHTMLDocument2 *doc)
 
     hres = IHTMLStyleSheetsCollection_get_length(col, &len);
     ok(hres == S_OK, "get_length failed: %08x\n", hres);
-    ok(len == 1, "len=%ld\n", len);
+    ok(len == 1, "len=%d\n", len);
 
     VariantInit(&res);
     V_VT(&idx) = VT_I4;
@@ -4420,7 +4420,7 @@ static void test_elems(IHTMLDocument2 *doc)
     child_col = get_child_nodes((IUnknown*)elem);
     ok(child_col != NULL, "child_coll == NULL\n");
     if(child_col) {
-        long length = 0;
+        LONG length = 0;
 
         test_disp((IUnknown*)child_col, &DIID_DispDOMChildrenCollection);
 

dlls/mshtml/txtrange.c

@@ -1372,12 +1372,12 @@ static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIA
 }
 
 static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit,
-        long Count, long *ActualCount)
+        LONG Count, LONG *ActualCount)
 {
     HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
     range_unit_t unit;
 
-    TRACE("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount);
+    TRACE("(%p)->(%s %d %p)\n", This, debugstr_w(Unit), Count, ActualCount);
 
     unit = string_to_unit(Unit);
     if(unit == RU_UNKNOWN)
@@ -1436,17 +1436,17 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit,
         FIXME("unimplemented unit %s\n", debugstr_w(Unit));
     }
 
-    TRACE("ret %ld\n", *ActualCount);
+    TRACE("ret %d\n", *ActualCount);
     return S_OK;
 }
 
 static HRESULT WINAPI HTMLTxtRange_moveStart(IHTMLTxtRange *iface, BSTR Unit,
-        long Count, long *ActualCount)
+        LONG Count, LONG *ActualCount)
 {
     HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
     range_unit_t unit;
 
-    TRACE("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount);
+    TRACE("(%p)->(%s %d %p)\n", This, debugstr_w(Unit), Count, ActualCount);
 
     unit = string_to_unit(Unit);
     if(unit == RU_UNKNOWN)
@@ -1492,12 +1492,12 @@ static HRESULT WINAPI HTMLTxtRange_moveStart(IHTMLTxtRange *iface, BSTR Unit,
 }
 
 static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit,
-        long Count, long *ActualCount)
+        LONG Count, LONG *ActualCount)
 {
     HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
     range_unit_t unit;
 
-    TRACE("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount);
+    TRACE("(%p)->(%s %d %p)\n", This, debugstr_w(Unit), Count, ActualCount);
 
     unit = string_to_unit(Unit);
     if(unit == RU_UNKNOWN)
@@ -1588,7 +1588,7 @@ static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how,
 }
 
 static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR how,
-        IHTMLTxtRange *SourceRange, long *ret)
+        IHTMLTxtRange *SourceRange, LONG *ret)
 {
     HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
     HTMLTxtRange *src_range;
@@ -1615,17 +1615,17 @@ static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR h
 }
 
 static HRESULT WINAPI HTMLTxtRange_findText(IHTMLTxtRange *iface, BSTR String,
-        long count, long Flags, VARIANT_BOOL *Success)
+        LONG count, LONG Flags, VARIANT_BOOL *Success)
 {
     HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
-    FIXME("(%p)->(%s %ld %08lx %p)\n", This, debugstr_w(String), count, Flags, Success);
+    FIXME("(%p)->(%s %d %08x %p)\n", This, debugstr_w(String), count, Flags, Success);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLTxtRange_moveToPoint(IHTMLTxtRange *iface, long x, long y)
+static HRESULT WINAPI HTMLTxtRange_moveToPoint(IHTMLTxtRange *iface, LONG x, LONG y)
 {
     HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
-    FIXME("(%p)->(%ld %ld)\n", This, x, y);
+    FIXME("(%p)->(%d %d)\n", This, x, y);
     return E_NOTIMPL;
 }
 

include/mshtml.idl

@@ -599,28 +599,28 @@ interface IHTMLStyle : IDispatch
     HRESULT cssText([retval, out] BSTR *p);
 
     [propput, id(DISPID_IHTMLSTYLE_PIXELTOP), bindable, displaybind, hidden]
-    HRESULT pixelTop([in] long v);
+    HRESULT pixelTop([in] LONG v);
 
     [propget, id(DISPID_IHTMLSTYLE_PIXELTOP), bindable, displaybind, hidden]
-    HRESULT pixelTop([retval, out] long *p);
+    HRESULT pixelTop([retval, out] LONG *p);
 
     [propput, id(DISPID_IHTMLSTYLE_PIXELLEFT), bindable, displaybind, hidden]
-    HRESULT pixelLeft([in] long v);
+    HRESULT pixelLeft([in] LONG v);
 
     [propget, id(DISPID_IHTMLSTYLE_PIXELLEFT), bindable, displaybind, hidden]
-    HRESULT pixelLeft([retval, out] long *p);
+    HRESULT pixelLeft([retval, out] LONG *p);
 
     [propput, id(DISPID_IHTMLSTYLE_PIXELWIDTH), bindable, displaybind, hidden]
-    HRESULT pixelWidth([in] long v);
+    HRESULT pixelWidth([in] LONG v);
 
     [propget, id(DISPID_IHTMLSTYLE_PIXELWIDTH), bindable, displaybind, hidden]
-    HRESULT pixelWidth([retval, out] long *p);
+    HRESULT pixelWidth([retval, out] LONG *p);
 
     [propput, id(DISPID_IHTMLSTYLE_PIXELHEIGHT), bindable, displaybind, hidden]
-    HRESULT pixelHeight([in] long v);
+    HRESULT pixelHeight([in] LONG v);
 
     [propget, id(DISPID_IHTMLSTYLE_PIXELHEIGHT), bindable, displaybind, hidden]
-    HRESULT pixelHeight([retval, out] long *p);
+    HRESULT pixelHeight([retval, out] LONG *p);
 
     [propput, id(DISPID_IHTMLSTYLE_POSTOP), bindable, displaybind]
     HRESULT posTop([in] float v);
@@ -763,16 +763,16 @@ interface IHTMLStyle2 : IDispatch
     HRESULT right([out, retval] VARIANT *p);
 
     [propput, id(DISPID_IHTMLSTYLE2_PIXELBOTTOM), displaybind, bindable, hidden]
-    HRESULT pixelBottom([in] long v);
+    HRESULT pixelBottom([in] LONG v);
 
     [propget, id(DISPID_IHTMLSTYLE2_PIXELBOTTOM), displaybind, bindable, hidden]
-    HRESULT pixelBottom([out, retval] long *p);
+    HRESULT pixelBottom([out, retval] LONG *p);
 
     [propput, id(DISPID_IHTMLSTYLE2_PIXELRIGHT), displaybind, bindable, hidden]
-    HRESULT pixelRight([in] long v);
+    HRESULT pixelRight([in] LONG v);
 
     [propget, id(DISPID_IHTMLSTYLE2_PIXELRIGHT), displaybind, bindable, hidden]
-    HRESULT pixelRight([out, retval] long *p);
+    HRESULT pixelRight([out, retval] LONG *p);
 
     [propput, id(DISPID_IHTMLSTYLE2_POSBOTTOM), displaybind, bindable]
     HRESULT posBottom([in] float v);
@@ -3303,7 +3303,7 @@ interface IHTMLRectCollection : IDispatch
 interface IHTMLDOMNode : IDispatch
 {
     [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)]
-    HRESULT nodeType([retval, out] long *p);
+    HRESULT nodeType([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)]
     HRESULT parentNode([retval, out] IHTMLDOMNode **p);
@@ -3441,11 +3441,11 @@ interface IHTMLDOMTextNode : IDispatch
     HRESULT toString([out, retval] BSTR *String);
 
     [propget, id(DISPID_IHTMLDOMTEXTNODE_LENGTH)]
-    HRESULT length([out, retval] long *p);
+    HRESULT length([out, retval] LONG *p);
 
     [id(DISPID_IHTMLDOMTEXTNODE_SPLITTEXT)]
     HRESULT splitText(
-            [in] long offset,
+            [in] LONG offset,
             [out, retval] IHTMLDOMNode **pRetNode);
 }
 
@@ -3461,19 +3461,19 @@ interface IHTMLDOMTextNode : IDispatch
 interface IHTMLDOMTextNode2 : IDispatch
 {
     [id(DISPID_IHTMLDOMTEXTNODE2_SUBSTRINGDATA)]
-    HRESULT substringData([in] long offset,[in] long Count,[retval, out] BSTR* pbstrsubString);
+    HRESULT substringData([in] LONG offset,[in] LONG Count,[retval, out] BSTR* pbstrsubString);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_APPENDDATA)]
     HRESULT appendData([in] BSTR bstrstring);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_INSERTDATA)]
-    HRESULT insertData([in] long offset,[in] BSTR bstrstring);
+    HRESULT insertData([in] LONG offset,[in] BSTR bstrstring);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_DELETEDATA)]
-    HRESULT deleteData([in] long offset,[in] long Count);
+    HRESULT deleteData([in] LONG offset,[in] LONG Count);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_REPLACEDATA)]
-    HRESULT replaceData([in] long offset,[in] long Count,[in] BSTR bstrstring);
+    HRESULT replaceData([in] LONG offset,[in] LONG Count,[in] BSTR bstrstring);
 }
 
 [
@@ -3528,37 +3528,37 @@ methods:
     BSTR toString();
 
     [propget, id(DISPID_IHTMLDOMTEXTNODE_LENGTH)]
-    long length();
+    LONG length();
 
     [id(DISPID_IHTMLDOMTEXTNODE_SPLITTEXT)]
-    IHTMLDOMNode *splitText([in] long offset);
+    IHTMLDOMNode *splitText([in] LONG offset);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_SUBSTRINGDATA)]
     BSTR substringData(
-            [in] long offset,
-            [in] long Count);
+            [in] LONG offset,
+            [in] LONG Count);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_APPENDDATA)]
     void appendData([in] BSTR bstrstring);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_INSERTDATA)]
     void insertData(
-            [in] long offset,
+            [in] LONG offset,
             [in] BSTR bstrstring);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_DELETEDATA)]
     void deleteData(
-            [in] long offset,
-            [in] long Count);
+            [in] LONG offset,
+            [in] LONG Count);
 
     [id(DISPID_IHTMLDOMTEXTNODE2_REPLACEDATA)]
     void replaceData(
-            [in] long offset,
-            [in] long Count,
+            [in] LONG offset,
+            [in] LONG Count,
             [in] BSTR bstrstring);
 
     [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)]
-    long nodeType();
+    LONG nodeType();
 
     [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)]
     IHTMLDOMNode *parentNode();
@@ -3637,14 +3637,14 @@ methods:
 interface IHTMLDOMChildrenCollection : IDispatch
 {
     [propget, id(DISPID_IHTMLDOMCHILDRENCOLLECTION_LENGTH)]
-    HRESULT length([out, retval] long *p);
+    HRESULT length([out, retval] LONG *p);
 
     [propget, id(DISPID_IHTMLDOMCHILDRENCOLLECTION__NEWENUM), hidden, restricted]
     HRESULT _newEnum([out, retval] IUnknown **p);
 
     [id(DISPID_IHTMLDOMCHILDRENCOLLECTION_ITEM)]
     HRESULT item(
-            [in] long index,
+            [in] LONG index,
             [out, retval] IDispatch **ppItem);
 }
 
@@ -3660,13 +3660,13 @@ dispinterface DispDOMChildrenCollection
 properties:
 methods:
     [propget, id(DISPID_IHTMLDOMCHILDRENCOLLECTION_LENGTH)]
-    long length();
+    LONG length();
 
     [propget, id(DISPID_IHTMLDOMCHILDRENCOLLECTION__NEWENUM), hidden, restricted]
     IUnknown *_newEnum();
 
     [id(DISPID_IHTMLDOMCHILDRENCOLLECTION_ITEM)]
-    IDispatch *item([in] long index);
+    IDispatch *item([in] LONG index);
 }
 
 interface IHTMLElementCollection;
@@ -5389,11 +5389,11 @@ interface IHTMLStyleSheetRule : IDispatch
 interface IHTMLStyleSheetRulesCollection : IDispatch
 {
     [propget, id(DISPID_IHTMLSTYLESHEETRULESCOLLECTION_LENGTH)]
-    HRESULT length([retval, out] long *p);
+    HRESULT length([retval, out] LONG *p);
 
     [id(DISPID_IHTMLSTYLESHEETRULESCOLLECTION_ITEM)]
     HRESULT item(
-        [in] long index,
+        [in] LONG index,
         [retval, out] IHTMLStyleSheetRule **ppHTMLStyleSheetRule);
 }
 
@@ -5479,21 +5479,21 @@ interface IHTMLStyleSheet : IDispatch
     [id(DISPID_IHTMLSTYLESHEET_ADDIMPORT)]
     HRESULT addImport(
         [in] BSTR bstrURL,
-        [defaultvalue(-1), in] long lIndex,
-        [retval, out] long *plIndex);
+        [defaultvalue(-1), in] LONG lIndex,
+        [retval, out] LONG *plIndex);
 
     [id(DISPID_IHTMLSTYLESHEET_ADDRULE)]
     HRESULT addRule(
         [in] BSTR bstrSelector,
         [in] BSTR bstrStyle,
-        [defaultvalue(-1), in] long lIndex,
-        [retval, out] long *plNewIndex);
+        [defaultvalue(-1), in] LONG lIndex,
+        [retval, out] LONG *plNewIndex);
 
     [id(DISPID_IHTMLSTYLESHEET_REMOVEIMPORT)]
-    HRESULT removeImport([in] long lIndex);
+    HRESULT removeImport([in] LONG lIndex);
 
     [id(DISPID_IHTMLSTYLESHEET_REMOVERULE)]
-    HRESULT removeRule([in] long lIndex);
+    HRESULT removeRule([in] LONG lIndex);
 
     [propput, id(DISPID_IHTMLSTYLESHEET_MEDIA)]
     HRESULT media([in] BSTR v);
@@ -5642,7 +5642,7 @@ coclass HTMLStyleSheet
 interface IHTMLStyleSheetsCollection : IDispatch
 {
     [propget, id(DISPID_IHTMLSTYLESHEETSCOLLECTION_LENGTH)]
-    HRESULT length([retval, out] long *p);
+    HRESULT length([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLSTYLESHEETSCOLLECTION__NEWENUM)]
     HRESULT _newEnum([retval, out] IUnknown **p);
@@ -5703,20 +5703,20 @@ interface IHTMLTxtRange : IDispatch
     [id(DISPID_IHTMLTXTRANGE_MOVE)]
     HRESULT move(
         [in] BSTR Unit,
-        [defaultvalue(1), in] long Count,
-        [retval, out] long *ActualCount);
+        [defaultvalue(1), in] LONG Count,
+        [retval, out] LONG *ActualCount);
 
     [id(DISPID_IHTMLTXTRANGE_MOVESTART)]
     HRESULT moveStart(
         [in] BSTR Unit,
-        [defaultvalue(1), in] long Count,
-        [retval, out] long *ActualCount);
+        [defaultvalue(1), in] LONG Count,
+        [retval, out] LONG *ActualCount);
 
     [id(DISPID_IHTMLTXTRANGE_MOVEEND)]
     HRESULT moveEnd(
         [in] BSTR Unit,
-        [defaultvalue(1), in] long Count,
-        [retval, out] long *ActualCount);
+        [defaultvalue(1), in] LONG Count,
+        [retval, out] LONG *ActualCount);
 
     [id(DISPID_IHTMLTXTRANGE_SELECT)]
     HRESULT select();
@@ -5736,19 +5736,19 @@ interface IHTMLTxtRange : IDispatch
     HRESULT compareEndPoints(
         [in] BSTR how,
         [in] IHTMLTxtRange *SourceRange,
-        [retval, out] long *ret);
+        [retval, out] LONG *ret);
 
     [id(DISPID_IHTMLTXTRANGE_FINDTEXT)]
     HRESULT findText(
         [in] BSTR String,
-        [defaultvalue(1073741823), in] long count,
-        [defaultvalue(0), in] long Flags,
+        [defaultvalue(1073741823), in] LONG count,
+        [defaultvalue(0), in] LONG Flags,
         [retval, out] VARIANT_BOOL *Success);
 
     [id(DISPID_IHTMLTXTRANGE_MOVETOPOINT)]
     HRESULT moveToPoint(
-        [in] long x,
-        [in] long y);
+        [in] LONG x,
+        [in] LONG y);
 
     [id(DISPID_IHTMLTXTRANGE_GETBOOKMARK)]
     HRESULT getBookmark([retval, out] BSTR *Boolmark);
@@ -13008,7 +13008,7 @@ interface IOmNavigator : IDispatch
     HRESULT appMinorVersion([retval, out] BSTR *p);
 
     [propget, id(DISPID_IOMNAVIGATOR_CONNECTIONSPEED)]
-    HRESULT connectionSpeed([retval, out] long *p);
+    HRESULT connectionSpeed([retval, out] LONG *p);
 
     [propget, id(DISPID_IOMNAVIGATOR_ONLINE)]
     HRESULT onLine([retval, out] VARIANT_BOOL *p);
@@ -13209,13 +13209,13 @@ interface IHTMLEventObj : IDispatch
     HRESULT toElement([retval, out] IHTMLElement **p);
 
     [propput, id(DISPID_IHTMLEVENTOBJ_KEYCODE)]
-    HRESULT keyCode([in] long v);
+    HRESULT keyCode([in] LONG v);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_KEYCODE)]
-    HRESULT keyCode([retval, out] long *p);
+    HRESULT keyCode([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_BUTTON)]
-    HRESULT button([retval, out] long *p);
+    HRESULT button([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_TYPE)]
     HRESULT type([retval, out] BSTR *p);
@@ -13224,31 +13224,31 @@ interface IHTMLEventObj : IDispatch
     HRESULT qualifier([retval, out] BSTR *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_REASON)]
-    HRESULT reason([retval, out] long *p);
+    HRESULT reason([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_X)]
-    HRESULT x([retval, out] long *p);
+    HRESULT x([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_Y)]
-    HRESULT y([retval, out] long *p);
+    HRESULT y([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_CLIENTX)]
-    HRESULT clientX([retval, out] long *p);
+    HRESULT clientX([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_CLIENTY)]
-    HRESULT clientY([retval, out] long *p);
+    HRESULT clientY([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_OFFSETX)]
-    HRESULT offsetX([retval, out] long *p);
+    HRESULT offsetX([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_OFFSETY)]
-    HRESULT offsetY([retval, out] long *p);
+    HRESULT offsetY([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_SCREENX)]
-    HRESULT screenX([retval, out] long *p);
+    HRESULT screenX([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_SCREENY)]
-    HRESULT screenY([retval, out] long *p);
+    HRESULT screenY([retval, out] LONG *p);
 
     [propget, id(DISPID_IHTMLEVENTOBJ_SRCFILTER)]
     HRESULT srcFilter([retval, out] IDispatch **p);
@@ -15182,8 +15182,8 @@ interface IHTMLDocument2 : IHTMLDocument
 
     [id(DISPID_IHTMLDOCUMENT2_ELEMENTFROMPOINT)]
     HRESULT elementFromPoint(
-        [in] long x,
-        [in] long y,
+        [in] LONG x,
+        [in] LONG y,
         [retval, out] IHTMLElement **elementHit);
 
     [propget, id(DISPID_IHTMLDOCUMENT2_PARENTWINDOW)]
@@ -15210,7 +15210,7 @@ interface IHTMLDocument2 : IHTMLDocument
     [id(DISPID_IHTMLDOCUMENT2_CREATESTYLESHEET)]
     HRESULT createStyleSheet(
         [defaultvalue(""), in] BSTR bstrHref,
-        [defaultvalue(-1), in] long lIndex,
+        [defaultvalue(-1), in] LONG lIndex,
         [retval, out] IHTMLStyleSheet **ppnewStyleSheet);
 }
 
@@ -16180,10 +16180,10 @@ interface IHTMLCommentElement : IDispatch
     HRESULT text([out, retval] BSTR *p);
 
     [propput, id(DISPID_IHTMLCOMMENTELEMENT_ATOMIC), displaybind, bindable]
-    HRESULT atomic([in] long v);
+    HRESULT atomic([in] LONG v);
 
     [propget, id(DISPID_IHTMLCOMMENTELEMENT_ATOMIC), displaybind, bindable]
-    HRESULT atomic([out, retval] long *p);
+    HRESULT atomic([out, retval] LONG *p);
 }
 
 /*****************************************************************************
@@ -17958,10 +17958,10 @@ interface IHTMLTableSection;
 interface IHTMLTable : IDispatch
 {
     [propput, id(DISPID_IHTMLTABLE_COLS)]
-    HRESULT cols([in] long v);
+    HRESULT cols([in] LONG v);
 
     [propget, id(DISPID_IHTMLTABLE_COLS)]
-    HRESULT cols([retval, out] long *p);
+    HRESULT cols([retval, out] LONG *p);
 
     [propput, id(DISPID_IHTMLTABLE_BORDER)]
     HRESULT border([in] VARIANT v);
@@ -18048,10 +18048,10 @@ interface IHTMLTable : IDispatch
     HRESULT height([retval, out] VARIANT *p);
 
     [propput, id(DISPID_IHTMLTABLE_DATAPAGESIZE)]
-    HRESULT dataPageSize([in] long v);
+    HRESULT dataPageSize([in] LONG v);
 
     [propget, id(DISPID_IHTMLTABLE_DATAPAGESIZE)]
-    HRESULT dataPageSize([retval, out] long *p);
+    HRESULT dataPageSize([retval, out] LONG *p);
 
     [id(DISPID_IHTMLTABLE_NEXTPAGE)]
     HRESULT nextPage();
@@ -18091,11 +18091,11 @@ interface IHTMLTable : IDispatch
 
     [id(DISPID_IHTMLTABLE_INSERTROW)]
     HRESULT insertRow(
-            [defaultvalue(-1), in] long index,
+            [defaultvalue(-1), in] LONG index,
             [retval, out] IDispatch **row);
 
     [id(DISPID_IHTMLTABLE_DELETEROW)]
-    HRESULT deleteRow([defaultvalue(-1), in] long index);
+    HRESULT deleteRow([defaultvalue(-1), in] LONG index);
 
     [propget, id(DISPID_IHTMLTABLE_READYSTATE)]
     HRESULT readyState([retval, out] BSTR *p);
@@ -18254,21 +18254,21 @@ interface IHTMLTableRow : IDispatch
     HRESULT borderColorDark([out, retval] VARIANT *p);
 
     [propget, id(DISPID_IHTMLTABLEROW_ROWINDEX)]
-    HRESULT rowIndex([out, retval] long *p);
+    HRESULT rowIndex([out, retval] LONG *p);
 
     [propget, id(DISPID_IHTMLTABLEROW_SECTIONROWINDEX)]
-    HRESULT sectionRowIndex([out, retval] long *p);
+    HRESULT sectionRowIndex([out, retval] LONG *p);
 
     [propget, id(DISPID_IHTMLTABLEROW_CELLS)]
     HRESULT cells([out, retval] IHTMLElementCollection **p);
 
     [id(DISPID_IHTMLTABLEROW_INSERTCELL)]
     HRESULT insertCell(
-            [in, defaultvalue(-1)] long index,
+            [in, defaultvalue(-1)] LONG index,
             [out, retval] IDispatch **row);
 
     [id(DISPID_IHTMLTABLEROW_DELETECELL)]
-    HRESULT deleteCell([in, defaultvalue(-1)] long index);
+    HRESULT deleteCell([in, defaultvalue(-1)] LONG index);
 }
 
 /*****************************************************************************