wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Hans Leidekker : wmiutils: Add locking to the path object.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 585dbbfc62122466121d95ef472b31ef21071a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585dbbfc62122466121d95ef4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 18 16:21:04 2013 +0100 wmiutils: Add locking to the path object. --- dlls/wmiutils/path.c | 147 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 116 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=585dbbfc62122466121d9…

1 0

Aric Stewart : usp10: MarkToMark calculations may need to happen even if the offset is 0.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 6b8c910b37aa9b7d6f798157d8e2435d25c0079e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8c910b37aa9b7d6f798157d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 18 07:13:20 2013 -0600 usp10: MarkToMark calculations may need to happen even if the offset is 0. --- dlls/usp10/opentype.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3bec2d3..ca4050c 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1548,10 +1548,11 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A } } -static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, +static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT pt) { int j; + BOOL rc = FALSE; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; TRACE("MarkToMark Attachment Positioning Subtable\n"); @@ -1589,7 +1590,7 @@ static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY if (mark_index > GET_BE_WORD(ma->MarkCount)) { ERR("Mark index exeeded mark count\n"); - return; + return FALSE; } mr = &ma->MarkRecord[mark_index]; mark_class = GET_BE_WORD(mr->Class); @@ -1607,12 +1608,14 @@ static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY pt->x += mark2_pt.x - mark_pt.x; pt->y += mark2_pt.y - mark_pt.y; TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + rc = TRUE; } } } else FIXME("Unhandled Mark To Mark Format %i\n",GET_BE_WORD(mmpf1->PosFormat)); } + return rc; } static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, @@ -1832,8 +1835,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c double devX, devY; POINT desU = {0,0}; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; - GPOS_apply_MarkToMark(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); - if (desU.x || desU.y) + if (GPOS_apply_MarkToMark(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU)) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1;

1 0

Jacek Caban : mshtml: Get rid of PRInt16 type.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: f071d9b3c1931e8e25cf39db6136a39ceabf9f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f071d9b3c1931e8e25cf39db6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:06:09 2013 +0100 mshtml: Get rid of PRInt16 type. --- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/txtrange.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 13a156b..8973701 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -45,7 +45,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; typedef WORD PRUint16; -typedef INT16 PRInt16; typedef BYTE PRUint8; typedef LONGLONG PRInt64; typedef ULONGLONG PRUint64; @@ -55,7 +54,7 @@ typedef ULONGLONG PRUint64; * more similar to original declarations. Note that it's only a widl trick, we can't * use stdint.h types in C. */ -#define int16_t PRInt16 +#define int16_t short #define int32_t LONG #define int64_t PRInt64 diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 42e49b1..085aa84 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1236,7 +1236,7 @@ static HRESULT WINAPI HTMLTxtRange_inRange(IHTMLTxtRange *iface, IHTMLTxtRange * { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; - PRInt16 nsret = 0; + short nsret = 0; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, Range, InRange); @@ -1267,7 +1267,7 @@ static HRESULT WINAPI HTMLTxtRange_isEqual(IHTMLTxtRange *iface, IHTMLTxtRange * { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; - PRInt16 nsret = 0; + short nsret = 0; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, Range, IsEqual); @@ -1599,7 +1599,7 @@ static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR h { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; - PRInt16 nsret = 0; + short nsret = 0; int nscmpt; nsresult nsres;

1 0

Jacek Caban : mshtml: Get rid of remaining PRInt32 usage.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: cf2a24df07c69985e8dc715be6ccffee672c61ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2a24df07c69985e8dc715be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:05:59 2013 +0100 mshtml: Get rid of remaining PRInt32 usage. --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/mutation.c | 12 ++++++------ dlls/mshtml/nsembed.c | 8 ++++---- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/nsservice.c | 4 ++-- dlls/mshtml/selection.c | 2 +- dlls/mshtml/txtrange.c | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 94fa7ac..6fee9c7 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -333,7 +333,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) cpp_bool collapsed; nsIDOMHTMLElement *elem; nsIDOMRange *range; - PRInt32 range_cnt = 0; + LONG range_cnt = 0; nsAString size_str; nsAString val_str; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index a00f81a..aeee77f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -525,32 +525,32 @@ static void NSAPI nsDocumentObserver_CharacterDataChanged(nsIDocumentObserver *i } static void NSAPI nsDocumentObserver_AttributeWillChange(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType) + nsIContent *aContent, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType) { } static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType) + nsIContent *aContent, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType) { } static void NSAPI nsDocumentObserver_AttributeSetToCurrentValue(nsIDocumentObserver *iface, nsIDocument *aDocument, - void *aElement, PRInt32 aNameSpaceID, nsIAtom *aAttribute) + void *aElement, LONG aNameSpaceID, nsIAtom *aAttribute) { } static void NSAPI nsDocumentObserver_ContentAppended(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContainer, nsIContent *aFirstNewContent, PRInt32 aNewIndexInContainer) + nsIContent *aContainer, nsIContent *aFirstNewContent, LONG aNewIndexInContainer) { } static void NSAPI nsDocumentObserver_ContentInserted(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContainer, nsIContent *aChild, PRInt32 aIndexInContainer) + nsIContent *aContainer, nsIContent *aChild, LONG aIndexInContainer) { } static void NSAPI nsDocumentObserver_ContentRemoved(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContainer, nsIContent *aChild, PRInt32 aIndexInContainer, + nsIContent *aContainer, nsIContent *aChild, LONG aIndexInContainer, nsIContent *aProviousSibling) { } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fdb11ed..6086846 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1333,7 +1333,7 @@ static nsresult NSAPI nsWebBrowserChrome_DestroyBrowserWindow(nsIWebBrowserChrom } static nsresult NSAPI nsWebBrowserChrome_SizeBrowserTo(nsIWebBrowserChrome *iface, - PRInt32 aCX, PRInt32 aCY) + LONG aCX, LONG aCY) { NSContainer *This = impl_from_nsIWebBrowserChrome(iface); WARN("(%p)->(%d %d)\n", This, aCX, aCY); @@ -1667,7 +1667,7 @@ static nsrefcnt NSAPI nsEmbeddingSiteWindow_Release(nsIEmbeddingSiteWindow *ifac } static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow *iface, - PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) + PRUint32 flags, LONG x, LONG y, LONG cx, LONG cy) { NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface); WARN("(%p)->(%08x %d %d %d %d)\n", This, flags, x, y, cx, cy); @@ -1675,7 +1675,7 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow } static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow *iface, - PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) + PRUint32 flags, LONG *x, LONG *y, LONG *cx, LONG *cy) { NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface); WARN("(%p)->(%08x %p %p %p %p)\n", This, flags, x, y, cx, cy); @@ -1778,7 +1778,7 @@ static nsrefcnt NSAPI nsTooltipListener_Release(nsITooltipListener *iface) } static nsresult NSAPI nsTooltipListener_OnShowTooltip(nsITooltipListener *iface, - PRInt32 aXCoord, PRInt32 aYCoord, const PRUnichar *aTipText) + LONG aXCoord, LONG aYCoord, const PRUnichar *aTipText) { NSContainer *This = impl_from_nsITooltipListener(iface); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ee29c58..13a156b 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -44,7 +44,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; -typedef LONG PRInt32; typedef WORD PRUint16; typedef INT16 PRInt16; typedef BYTE PRUint8; @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; * use stdint.h types in C. */ #define int16_t PRInt16 -#define int32_t PRInt32 +#define int32_t LONG #define int64_t PRInt64 #define uint8_t PRUint8 diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 141ece1..2eefcbe 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -126,7 +126,7 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface, nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText, PRUint32 aButtonFlags, const PRUnichar *aButton0Title, const PRUnichar *aButton1Title, const PRUnichar *aButton2Title, - const PRUnichar *aCheckMsg, cpp_bool *aCheckState, PRInt32 *_retval) + const PRUnichar *aCheckMsg, cpp_bool *aCheckState, LONG *_retval) { static const PRUnichar wszContinue[] = {'C','o','n','t','i','n','u','e',0}; @@ -186,7 +186,7 @@ static nsresult NSAPI nsPromptService_PromptPassword(nsIPromptService *iface, static nsresult NSAPI nsPromptService_Select(nsIPromptService *iface, nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText, PRUint32 aCount, const PRUnichar **aSelectList, - PRInt32 *aOutSelection, cpp_bool *_retval) + LONG *aOutSelection, cpp_bool *_retval) { FIXME("(%p %s %s %d %p %p %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText), aCount, aSelectList, aOutSelection, _retval); diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 9add1e6..db3b7b3 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -147,7 +147,7 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac TRACE("(%p)->(%p)\n", This, range); if(This->nsselection) { - PRInt32 nsrange_cnt = 0; + LONG nsrange_cnt = 0; nsresult nsres; nsISelection_GetRangeCount(This->nsselection, &nsrange_cnt); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 86e9f0b..42e49b1 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -392,7 +392,7 @@ static nsIDOMNode *get_child_node(nsIDOMNode *node, PRUint32 off) static void get_cur_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) { nsIDOMNode *node; - PRInt32 off; + LONG off; pos->p = NULL;

1 0

Jacek Caban : mshtml: Don't use PRInt32 in property getters implementations .
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d83822adbe88e59589d7387c15e44f68c95620d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83822adbe88e59589d7387c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:05:50 2013 +0100 mshtml: Don't use PRInt32 in property getters implementations. --- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlform.c | 4 +--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlobject.c | 4 +--- dlls/mshtml/htmlselect.c | 8 ++++---- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 13095fb..68a3942 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -641,7 +641,7 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 x = 0; + LONG x = 0; TRACE("(%p)->(%p)\n", This, p); @@ -663,7 +663,7 @@ static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 y = 0; + LONG y = 0; TRACE("(%p)->(%p)\n", This, p); @@ -705,7 +705,7 @@ static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 x = 0; + LONG x = 0; TRACE("(%p)->(%p)\n", This, p); @@ -727,7 +727,7 @@ static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 y = 0; + LONG y = 0; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 6459093..c48415a 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -391,18 +391,16 @@ static HRESULT WINAPI HTMLFormElement_put_length(IHTMLFormElement *iface, LONG v static HRESULT WINAPI HTMLFormElement_get_length(IHTMLFormElement *iface, LONG *p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - PRInt32 length; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, &length); + nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, p); if(NS_FAILED(nsres)) { ERR("GetLength failed: %08x\n", nsres); return E_FAIL; } - *p = length; return S_OK; } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index fb0e80b..7937161 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLInputElement_put_maxLength(IHTMLInputElement *iface, L static HRESULT WINAPI HTMLInputElement_get_maxLength(IHTMLInputElement *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - PRInt32 max_length; + LONG max_length; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 9e9bbdd..bcfbbe5 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -433,18 +433,16 @@ static HRESULT WINAPI HTMLObjectElement_put_vspace(IHTMLObjectElement *iface, LO static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LONG *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - PRInt32 vspace; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, &vspace); + nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, p); if(NS_FAILED(nsres)) { ERR("GetVspace failed: %08x\n", nsres); return E_FAIL; } - *p = vspace; return S_OK; } diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 8fceedf..ff609dd 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -250,16 +250,16 @@ static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *if static HRESULT WINAPI HTMLSelectElement_get_selectedIndex(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - PRInt32 idx = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLSelectElement_GetSelectedIndex(This->nsselect, &idx); - if(NS_FAILED(nsres)) + nsres = nsIDOMHTMLSelectElement_GetSelectedIndex(This->nsselect, p); + if(NS_FAILED(nsres)) { ERR("GetSelectedIndex failed: %08x\n", nsres); + return E_FAIL; + } - *p = idx; return S_OK; }

1 0

Jacek Caban : mshtml: Don't use PRInt32 in htmlelem*.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: c55b777c7c3ea609bed8c99cb12e3baae39fb18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55b777c7c3ea609bed8c99cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:05:31 2013 +0100 mshtml: Don't use PRInt32 in htmlelem*. --- dlls/mshtml/htmlelem.c | 16 +++--------- dlls/mshtml/htmlelem2.c | 58 +++++++++++++++++------------------------------ 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 2e7b18c..8fba26d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -846,72 +846,64 @@ static HRESULT WINAPI HTMLElement_get_lang(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_get_offsetLeft(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - PRInt32 off_left = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetOffsetLeft(This->nselem, &off_left); + nsres = nsIDOMHTMLElement_GetOffsetLeft(This->nselem, p); if(NS_FAILED(nsres)) { ERR("GetOffsetLeft failed: %08x\n", nsres); return E_FAIL; } - *p = off_left; return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - PRInt32 top = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetOffsetTop(This->nselem, &top); + nsres = nsIDOMHTMLElement_GetOffsetTop(This->nselem, p); if(NS_FAILED(nsres)) { ERR("GetOffsetTop failed: %08x\n", nsres); return E_FAIL; } - *p = top; return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - PRInt32 offset = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetOffsetWidth(This->nselem, &offset); + nsres = nsIDOMHTMLElement_GetOffsetWidth(This->nselem, p); if(NS_FAILED(nsres)) { ERR("GetOffsetWidth failed: %08x\n", nsres); return E_FAIL; } - *p = offset; return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetHeight(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - PRInt32 offset = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetOffsetHeight(This->nselem, &offset); + nsres = nsIDOMHTMLElement_GetOffsetHeight(This->nselem, p); if(NS_FAILED(nsres)) { ERR("GetOffsetHeight failed: %08x\n", nsres); return E_FAIL; } - *p = offset; return S_OK; } diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 2877a78..16d5056 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #include <math.h> #define COBJMACROS @@ -674,7 +675,7 @@ static HRESULT WINAPI HTMLElement2_put_tabIndex(IHTMLElement2 *iface, short v) static HRESULT WINAPI HTMLElement2_get_tabIndex(IHTMLElement2 *iface, short *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 index = 0; + LONG index; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -807,42 +808,37 @@ static HRESULT WINAPI HTMLElement2_removeFilter(IHTMLElement2 *iface, IUnknown * static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 height=0; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsIDOMHTMLElement_GetClientHeight(This->nselem, &height); - - *p = height; + nsres = nsIDOMHTMLElement_GetClientHeight(This->nselem, p); + assert(nsres == NS_OK); return S_OK; } static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 width=0; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsIDOMHTMLElement_GetClientWidth(This->nselem, &width); - - *p = width; + nsres = nsIDOMHTMLElement_GetClientWidth(This->nselem, p); + assert(nsres == NS_OK); return S_OK; } static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 client_top = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetClientTop(This->nselem, &client_top); - if(NS_FAILED(nsres)) - ERR("GetScrollHeight failed: %08x\n", nsres); + nsres = nsIDOMHTMLElement_GetClientTop(This->nselem, p); + assert(nsres == NS_OK); - *p = client_top; TRACE("*p = %d\n", *p); return S_OK; } @@ -850,16 +846,13 @@ static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p) static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 client_left = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetClientLeft(This->nselem, &client_left); - if(NS_FAILED(nsres)) - ERR("GetScrollHeight failed: %08x\n", nsres); + nsres = nsIDOMHTMLElement_GetClientLeft(This->nselem, p); + assert(nsres == NS_OK); - *p = client_left; TRACE("*p = %d\n", *p); return S_OK; } @@ -1003,16 +996,13 @@ static HRESULT WINAPI HTMLElement2_createControlRange(IHTMLElement2 *iface, IDis static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 height = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetScrollHeight(This->nselem, &height); - if(NS_FAILED(nsres)) - ERR("GetScrollHeight failed: %08x\n", nsres); + nsres = nsIDOMHTMLElement_GetScrollHeight(This->nselem, p); + assert(nsres == NS_OK); - *p = height; TRACE("*p = %d\n", *p); return S_OK; } @@ -1020,16 +1010,13 @@ static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, LONG * static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 width = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetScrollWidth(This->nselem, &width); - if(NS_FAILED(nsres)) - ERR("GetScrollWidth failed: %08x\n", nsres); + nsres = nsIDOMHTMLElement_GetScrollWidth(This->nselem, p); + assert(nsres == NS_OK); - *p = width; TRACE("*p = %d\n", *p); return S_OK; } @@ -1052,16 +1039,13 @@ static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, LONG v) static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 top = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLElement_GetScrollTop(This->nselem, &top); - if(NS_FAILED(nsres)) - ERR("GetScrollTop failed: %08x\n", nsres); + nsres = nsIDOMHTMLElement_GetScrollTop(This->nselem, p); + assert(nsres == NS_OK); - *p = top; TRACE("*p = %d\n", *p); return S_OK; } @@ -1084,7 +1068,7 @@ static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, LONG v) static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - PRInt32 left = 0; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1097,9 +1081,9 @@ static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, LONG *p) return E_NOTIMPL; } - nsIDOMHTMLElement_GetScrollLeft(This->nselem, &left); + nsres = nsIDOMHTMLElement_GetScrollLeft(This->nselem, p); + assert(nsres == NS_OK); - *p = left; TRACE("*p = %d\n", *p); return S_OK; }

1 0

Piotr Caban : vbscript: Added VBScript.RegExp version 1.0 typelib.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d8f4070b980c4263cb3f147fda5fbd955cd3e4d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f4070b980c4263cb3f147fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 12:40:42 2013 +0100 vbscript: Added VBScript.RegExp version 1.0 typelib. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/vbsregexp10.idl | 145 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 070fb9c..015c9a9 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -22,6 +22,7 @@ IDL_H_SRCS = \ IDL_TLB_SRCS = \ vbsglobal.idl \ + vbsregexp10.idl \ vbsregexp55.idl IDL_R_SRCS = vbscript_classes.idl diff --git a/dlls/vbscript/vbsregexp10.idl b/dlls/vbscript/vbsregexp10.idl new file mode 100644 index 0000000..0eb28fa --- /dev/null +++ b/dlls/vbscript/vbsregexp10.idl @@ -0,0 +1,145 @@ +/* + * Copyright 2013 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +#include "vbscript_defs.h" + +[ + helpstring("Microsoft VBScript Regular Expressions 1.0"), + id(2), + uuid(3f4daca7-160d-11d2-a8e9-00104b365c9f), + version(1.0) +] +library VBScript_RegExp_10 +{ + importlib("stdole2.tlb"); + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4daca0-160d-11d2-a8e9-00104b365c9f), + ] + interface IRegExp : IDispatch + { + [id(DISPID_REGEXP_PATTERN), propget] + HRESULT Pattern([out, retval] BSTR *pPattern); + + [id(DISPID_REGEXP_PATTERN), propput] + HRESULT Pattern([in] BSTR pPattern); + + [id(DISPID_REGEXP_IGNORECASE), propget] + HRESULT IgnoreCase([out, retval] VARIANT_BOOL *pIgnoreCase); + + [id(DISPID_REGEXP_IGNORECASE), propput] + HRESULT IgnoreCase([in] VARIANT_BOOL pIgnoreCase); + + [id(DISPID_REGEXP_GLOBAL), propget] + HRESULT Global([out, retval] VARIANT_BOOL *pGlobal); + + [id(DISPID_REGEXP_GLOBAL), propput] + HRESULT Global([in] VARIANT_BOOL pGlobal); + + [id(DISPID_REGEXP_EXECUTE)] + HRESULT Execute( + [in] BSTR sourceString, + [out, retval] IDispatch **ppMatches); + + [id(DISPID_REGEXP_TEST)] + HRESULT Test( + [in] BSTR sourceString, + [out, retval] VARIANT_BOOL *pMatch); + + [id(DISPID_REGEXP_REPLACE)] + HRESULT Replace( + [in] BSTR sourceString, + [in] BSTR replaceString, + [out, retval] BSTR *pDestString); + } + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4daca1-160d-11d2-a8e9-00104b365c9f) + ] + interface IMatch : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Value([out, retval] BSTR *pValue); + + [id(DISPID_MATCH_FIRSTINDEX), propget] + HRESULT FirstIndex([out, retval] LONG *pFirstIndex); + + [id(DISPID_MATCH_LENGTH), propget] + HRESULT Length([out, retval] LONG *pLength); + } + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4daca2-160d-11d2-a8e9-00104b365c9f) + ] + interface IMatchCollection : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] LONG index, + [out, retval] IDispatch **ppMatch); + + [id(DISPID_MATCHCOLLECTION_COUNT), propget] + HRESULT Count([out, retval] LONG *pCount); + + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **ppEnum); + } + + [ + uuid(3f4daca4-160d-11d2-a8e9-00104b365c9f) + ] + coclass RegExp + { + [default] interface IRegExp; + } + + [ + noncreatable, + uuid(3f4daca5-160d-11d2-a8e9-00104b365c9f) + ] + coclass Match + { + [default] interface IMatch; + } + + [ + noncreatable, + uuid(3f4daca6-160d-11d2-a8e9-00104b365c9f) + ] + coclass MatchCollection + { + [default] interface IMatchCollection; + } +}

1 0

Jacek Caban : mshtml: Don't use PRInt32 in nsio.c.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: fa5f513eedf059641ddeba02f85a0dc66e1b3536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5f513eedf059641ddeba02f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:05:15 2013 +0100 mshtml: Don't use PRInt32 in nsio.c. --- dlls/mshtml/nsio.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0c12670..af57750 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -834,7 +834,7 @@ static nsresult NSAPI nsChannel_SetContentCharset(nsIHttpChannel *iface, return NS_OK; } -static nsresult NSAPI nsChannel_GetContentLength(nsIHttpChannel *iface, PRInt32 *aContentLength) +static nsresult NSAPI nsChannel_GetContentLength(nsIHttpChannel *iface, LONG *aContentLength) { nsChannel *This = impl_from_nsIHttpChannel(iface); @@ -843,7 +843,7 @@ static nsresult NSAPI nsChannel_GetContentLength(nsIHttpChannel *iface, PRInt32 return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsChannel_SetContentLength(nsIHttpChannel *iface, PRInt32 aContentLength) +static nsresult NSAPI nsChannel_SetContentLength(nsIHttpChannel *iface, LONG aContentLength) { nsChannel *This = impl_from_nsIHttpChannel(iface); @@ -1661,7 +1661,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetLocalAddress(nsIHttpChannelIntern return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsHttpChannelInternal_GetLocalPort(nsIHttpChannelInternal *iface, PRInt32 *aLocalPort) +static nsresult NSAPI nsHttpChannelInternal_GetLocalPort(nsIHttpChannelInternal *iface, LONG *aLocalPort) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); @@ -1679,7 +1679,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetRemoteAddress(nsIHttpChannelInter return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsHttpChannelInternal_GetRemotePort(nsIHttpChannelInternal *iface, PRInt32 *aRemotePort) +static nsresult NSAPI nsHttpChannelInternal_GetRemotePort(nsIHttpChannelInternal *iface, LONG *aRemotePort) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); @@ -2197,7 +2197,7 @@ static nsresult NSAPI nsURI_SetHost(nsIFileURL *iface, const nsACString *aHost) return NS_OK; } -static nsresult NSAPI nsURI_GetPort(nsIFileURL *iface, PRInt32 *aPort) +static nsresult NSAPI nsURI_GetPort(nsIFileURL *iface, LONG *aPort) { nsWineURI *This = impl_from_nsIFileURL(iface); DWORD port; @@ -2218,7 +2218,7 @@ static nsresult NSAPI nsURI_GetPort(nsIFileURL *iface, PRInt32 *aPort) return NS_OK; } -static nsresult NSAPI nsURI_SetPort(nsIFileURL *iface, PRInt32 aPort) +static nsresult NSAPI nsURI_SetPort(nsIFileURL *iface, LONG aPort) { nsWineURI *This = impl_from_nsIFileURL(iface); HRESULT hres; @@ -2862,7 +2862,7 @@ static nsresult NSAPI nsStandardURL_SetMutable(nsIStandardURL *iface, cpp_bool a return NS_OK; } -static nsresult NSAPI nsStandardURL_Init(nsIStandardURL *iface, PRUint32 aUrlType, PRInt32 aDefaultPort, +static nsresult NSAPI nsStandardURL_Init(nsIStandardURL *iface, PRUint32 aUrlType, LONG aDefaultPort, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI) { nsWineURI *This = impl_from_nsIStandardURL(iface); @@ -3097,7 +3097,7 @@ static nsresult NSAPI nsProtocolHandler_GetScheme(nsIProtocolHandler *iface, nsA } static nsresult NSAPI nsProtocolHandler_GetDefaultPort(nsIProtocolHandler *iface, - PRInt32 *aDefaultPort) + LONG *aDefaultPort) { nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); @@ -3146,7 +3146,7 @@ static nsresult NSAPI nsProtocolHandler_NewChannel(nsIProtocolHandler *iface, } static nsresult NSAPI nsProtocolHandler_AllowPort(nsIProtocolHandler *iface, - PRInt32 port, const char *scheme, cpp_bool *_retval) + LONG port, const char *scheme, cpp_bool *_retval) { nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); @@ -3359,7 +3359,7 @@ static nsresult NSAPI nsIOService_SetOffline(nsIIOService *iface, cpp_bool aOffl return nsIIOService_SetOffline(nsio, aOffline); } -static nsresult NSAPI nsIOService_AllowPort(nsIIOService *iface, PRInt32 aPort, +static nsresult NSAPI nsIOService_AllowPort(nsIIOService *iface, LONG aPort, const char *aScheme, cpp_bool *_retval) { TRACE("(%d %s %p)\n", aPort, debugstr_a(aScheme), _retval); @@ -3473,7 +3473,7 @@ static nsresult NSAPI nsNetUtil_UnescapeString(nsINetUtil *iface, const nsACStri } static nsresult NSAPI nsNetUtil_ExtractCharsetFromContentType(nsINetUtil *iface, const nsACString *aTypeHeader, - nsACString *aCharset, PRInt32 *aCharsetStart, PRInt32 *aCharsetEnd, cpp_bool *_retval) + nsACString *aCharset, LONG *aCharsetStart, LONG *aCharsetEnd, cpp_bool *_retval) { TRACE("(%s %p %p %p %p)\n", debugstr_nsacstr(aTypeHeader), aCharset, aCharsetStart, aCharsetEnd, _retval);

1 0

Piotr Caban : vbscript: Added VBScript.RegExp version 5.5 typelib.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 8de70b313b4bed6dacd213153c060637cec0ae3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de70b313b4bed6dacd213153… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 12:40:30 2013 +0100 vbscript: Added VBScript.RegExp version 5.5 typelib. --- dlls/vbscript/Makefile.in | 4 +- dlls/vbscript/vbscript_defs.h | 16 +++ dlls/vbscript/vbsregexp55.idl | 271 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 290 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 6f91958..070fb9c 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -20,7 +20,9 @@ IDL_H_SRCS = \ vbscript_classes.idl \ vbsglobal.idl -IDL_TLB_SRCS = vbsglobal.idl +IDL_TLB_SRCS = \ + vbsglobal.idl \ + vbsregexp55.idl IDL_R_SRCS = vbscript_classes.idl diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h index d9061c1..b4b904a 100644 --- a/dlls/vbscript/vbscript_defs.h +++ b/dlls/vbscript/vbscript_defs.h @@ -218,3 +218,19 @@ #define DISPID_ERR_SOURCE 4 #define DISPID_ERR_CLEAR 100 #define DISPID_ERR_RAISE 101 + +#define DISPID_SUBMATCHES_COUNT 1 + +#define DISPID_MATCHCOLLECTION_COUNT 1 + +#define DISPID_MATCH_FIRSTINDEX 10001 +#define DISPID_MATCH_LENGTH 10002 +#define DISPID_MATCH_SUBMATCHES 10003 + +#define DISPID_REGEXP_PATTERN 10001 +#define DISPID_REGEXP_IGNORECASE 10002 +#define DISPID_REGEXP_GLOBAL 10003 +#define DISPID_REGEXP_EXECUTE 10004 +#define DISPID_REGEXP_TEST 10005 +#define DISPID_REGEXP_REPLACE 10006 +#define DISPID_REGEXP_MULTILINE 10007 diff --git a/dlls/vbscript/vbsregexp55.idl b/dlls/vbscript/vbsregexp55.idl new file mode 100644 index 0000000..0e016b2 --- /dev/null +++ b/dlls/vbscript/vbsregexp55.idl @@ -0,0 +1,271 @@ +/* + * Copyright 2013 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +#include "vbscript_defs.h" + +[ + helpstring("Microsoft VBScript Regular Expressions 5.5"), + id(3), + uuid(3f4daca7-160d-11d2-a8e9-00104b365c9f), + version(5.5) +] +library VBScript_RegExp_55 +{ + importlib("stdole2.tlb"); + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4daca0-160d-11d2-a8e9-00104b365c9f), + ] + interface IRegExp : IDispatch + { + [id(DISPID_REGEXP_PATTERN), propget] + HRESULT Pattern([out, retval] BSTR *pPattern); + + [id(DISPID_REGEXP_PATTERN), propput] + HRESULT Pattern([in] BSTR pPattern); + + [id(DISPID_REGEXP_IGNORECASE), propget] + HRESULT IgnoreCase([out, retval] VARIANT_BOOL *pIgnoreCase); + + [id(DISPID_REGEXP_IGNORECASE), propput] + HRESULT IgnoreCase([in] VARIANT_BOOL pIgnoreCase); + + [id(DISPID_REGEXP_GLOBAL), propget] + HRESULT Global([out, retval] VARIANT_BOOL *pGlobal); + + [id(DISPID_REGEXP_GLOBAL), propput] + HRESULT Global([in] VARIANT_BOOL pGlobal); + + [id(DISPID_REGEXP_EXECUTE)] + HRESULT Execute( + [in] BSTR sourceString, + [out, retval] IDispatch **ppMatches); + + [id(DISPID_REGEXP_TEST)] + HRESULT Test( + [in] BSTR sourceString, + [out, retval] VARIANT_BOOL *pMatch); + + [id(DISPID_REGEXP_REPLACE)] + HRESULT Replace( + [in] BSTR sourceString, + [in] BSTR replaceString, + [out, retval] BSTR *pDestString); + } + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4dacb0-160d-11d2-a8e9-00104b365c9f) + ] + interface IRegExp2 : IDispatch + { + [id(DISPID_REGEXP_PATTERN), propget] + HRESULT Pattern([out, retval] BSTR *pPattern); + + [id(DISPID_REGEXP_PATTERN), propput] + HRESULT Pattern([in] BSTR pPattern); + + [id(DISPID_REGEXP_IGNORECASE), propget] + HRESULT IgnoreCase([out, retval] VARIANT_BOOL *pIgnoreCase); + + [id(DISPID_REGEXP_IGNORECASE), propput] + HRESULT IgnoreCase([in] VARIANT_BOOL pIgnoreCase); + + [id(DISPID_REGEXP_GLOBAL), propget] + HRESULT Global([out, retval] VARIANT_BOOL *pGlobal); + + [id(DISPID_REGEXP_GLOBAL), propput] + HRESULT Global([in] VARIANT_BOOL pGlobal); + + [id(DISPID_REGEXP_MULTILINE), propget] + HRESULT Multiline([out, retval] VARIANT_BOOL *pMultiline); + + [id(DISPID_REGEXP_MULTILINE), propput] + HRESULT Multiline([in] VARIANT_BOOL pMultiline); + + [id(DISPID_REGEXP_EXECUTE)] + HRESULT Execute( + [in] BSTR sourceString, + [out, retval] IDispatch **ppMatches); + + [id(DISPID_REGEXP_TEST)] + HRESULT Test( + [in] BSTR sourceString, + [out, retval] VARIANT_BOOL *pMatch); + + [id(DISPID_REGEXP_REPLACE)] + HRESULT Replace( + [in] BSTR sourceString, + [in] VARIANT *replaceVar, + [out, retval] BSTR *pDestString); + } + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4daca1-160d-11d2-a8e9-00104b365c9f) + ] + interface IMatch : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Value([out, retval] BSTR *pValue); + + [id(DISPID_MATCH_FIRSTINDEX), propget] + HRESULT FirstIndex([out, retval] LONG *pFirstIndex); + + [id(DISPID_MATCH_LENGTH), propget] + HRESULT Length([out, retval] LONG *pLength); + } + + [ + odl, + uuid(3f4dacb1-160d-11d2-a8e9-00104b365c9f), + hidden, + dual, + nonextensible, + oleautomation + ] + interface IMatch2 : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Value([out, retval] BSTR *pValue); + + [id(DISPID_MATCH_FIRSTINDEX), propget] + HRESULT FirstIndex([out, retval] LONG *pFirstIndex); + + [id(DISPID_MATCH_LENGTH), propget] + HRESULT Length([out, retval] LONG *pLength); + + [id(DISPID_MATCH_SUBMATCHES), propget] + HRESULT SubMatches([out, retval] IDispatch **ppSubMatches); + } + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4daca2-160d-11d2-a8e9-00104b365c9f) + ] + interface IMatchCollection : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] LONG index, + [out, retval] IDispatch **ppMatch); + + [id(DISPID_MATCHCOLLECTION_COUNT), propget] + HRESULT Count([out, retval] LONG *pCount); + + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **ppEnum); + } + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4dacb2-160d-11d2-a8e9-00104b365c9f) + ] + interface IMatchCollection2 : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] LONG index, + [out, retval] IDispatch **ppMatch); + + [id(DISPID_MATCHCOLLECTION_COUNT), propget] + HRESULT Count([out, retval] LONG *pCount); + + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **ppEnum); + } + + [ + dual, + hidden, + nonextensible, + odl, + oleautomation, + uuid(3f4dacb3-160d-11d2-a8e9-00104b365c9f) + ] + interface ISubMatches : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] LONG index, + [out, retval] VARIANT *pSubMatch); + + [id(DISPID_SUBMATCHES_COUNT), propget] + HRESULT Count([out, retval] LONG *pCount); + + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **ppEnum); + } + + [ + uuid(3f4daca4-160d-11d2-a8e9-00104b365c9f) + ] + coclass RegExp + { + [default] interface IRegExp2; + } + + [ + noncreatable, + uuid(3f4daca5-160d-11d2-a8e9-00104b365c9f) + ] + coclass Match + { + [default] interface IMatch2; + } + + [ + noncreatable, + uuid(3f4daca6-160d-11d2-a8e9-00104b365c9f) + ] + coclass MatchCollection + { + [default] interface IMatchCollection2; + } + + [ + noncreatable, + uuid(3f4dacc0-160d-11d2-a8e9-00104b365c9f) + ] + coclass SubMatches { + [default] interface ISubMatches; + } +}

1 0

Piotr Caban : widl: Make it possible to set typelib resource id with id attribute.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 3d9454bc8f514192735c6b37c28dcae7f77f667f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9454bc8f514192735c6b37c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 12:40:20 2013 +0100 widl: Make it possible to set typelib resource id with id attribute. --- tools/widl/parser.y | 2 +- tools/widl/write_msft.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9c2281f..d8435b9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2057,7 +2057,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, - /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "id" }, + /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" }, /* ATTR_IIDIS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "iid_is" }, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 918923b..53e1feb 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2547,7 +2547,12 @@ static void save_all_changes(msft_typelib_t *typelib) if (strendswith( typelib_name, ".res" )) /* create a binary resource file */ { - add_output_to_resources( "TYPELIB", "#1" ); + char typelib_id[13] = "#1"; + + expr_t *expr = get_attrp( typelib->typelib->attrs, ATTR_ID ); + if (expr) + sprintf( typelib_id, "#%d", expr->cval ); + add_output_to_resources( "TYPELIB", typelib_id ); output_typelib_regscript( typelib->typelib ); flush_output_resources( typelib_name ); }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013