January 2013 - Wine-commits

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

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 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 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

Hans Leidekker : fusion: No longer prefer native.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d366642519e908556a9c425285d21e78f0a1e101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d366642519e908556a9c42528… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 18 09:17:45 2013 +0100 fusion: No longer prefer native. --- dlls/fusion/fusion_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c index 8f0906b..3c7958b 100644 --- a/dlls/fusion/fusion_main.c +++ b/dlls/fusion/fusion_main.c @@ -34,8 +34,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Alexandre Julliard : fusion: Remove an unneeded file.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 1b03bc6645ab74902d0da00687e804abdc56d10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b03bc6645ab74902d0da0068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 13:04:51 2013 +0100 fusion: Remove an unneeded file. --- dlls/fusion/Makefile.in | 3 +- dlls/fusion/fusion.c | 10 ++++++++ dlls/fusion/fusion_main.c | 53 --------------------------------------------- 3 files changed, 11 insertions(+), 55 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 63b1b73..314aba9 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -6,8 +6,7 @@ C_SRCS = \ asmenum.c \ asmname.c \ assembly.c \ - fusion.c \ - fusion_main.c + fusion.c RC_SRCS = version.rc diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index e79fa3a..e638208 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -32,6 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); + +/****************************************************************** + * InitializeFusion (FUSION.@) + */ +HRESULT WINAPI InitializeFusion(void) +{ + FIXME("\n"); + return E_NOTIMPL; +} + /****************************************************************** * ClearDownloadCache (FUSION.@) */ diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c deleted file mode 100644 index 3c7958b..0000000 --- a/dlls/fusion/fusion_main.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * fusion main - * - * Copyright 2008 James Hawkins - * - * 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 - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(fusion); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - - return TRUE; -} - -HRESULT WINAPI InitializeFusion(void) -{ - FIXME("\n"); - return E_NOTIMPL; -}

1 0

Dmitry Timoshkov : windowscodecs: Add a test for CreateBitmapFromHBITMAP.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 89f044db1552df1e2e3ba7a59d30cc541b6e9c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f044db1552df1e2e3ba7a59… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 18 17:59:48 2013 +0800 windowscodecs: Add a test for CreateBitmapFromHBITMAP. --- dlls/windowscodecs/tests/bitmap.c | 188 +++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 189 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index fb7183b..742f45f 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #include <math.h> #define COBJMACROS @@ -42,6 +43,51 @@ static const char *debugstr_guid(const GUID *guid) return buf; } +static HBITMAP create_dib(int width, int height, int bpp, LOGPALETTE *pal, const void *data) +{ + char bmibuf[sizeof(BITMAPINFO) + sizeof(RGBQUAD) * 255]; + BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + void *bits; + HBITMAP hdib; + BITMAP bm; + + memset(bmibuf, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biHeight = -height; + bmi->bmiHeader.biBitCount = bpp; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + if (pal) + { + WORD i; + + assert(pal->palNumEntries <= 256); + for (i = 0; i < pal->palNumEntries; i++) + { + bmi->bmiColors[i].rgbRed = pal->palPalEntry[i].peRed; + bmi->bmiColors[i].rgbGreen = pal->palPalEntry[i].peGreen; + bmi->bmiColors[i].rgbBlue = pal->palPalEntry[i].peBlue; + bmi->bmiColors[i].rgbReserved = 0; + } + + bmi->bmiHeader.biClrUsed = pal->palNumEntries; + bmi->bmiHeader.biClrImportant = pal->palNumEntries; + } + hdib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(hdib != 0, "CreateDIBSection(%dx%d,%d bpp) failed\n", width, height, bpp); + + GetObject(hdib, sizeof(bm), &bm); + ok(bm.bmWidth == width, "expected %d, got %d\n", width, bm.bmWidth); + ok(bm.bmHeight == height, "expected %d, got %d\n", height, bm.bmHeight); + ok(bm.bmPlanes == 1, "expected 1, got %d\n", bm.bmPlanes); + ok(bm.bmBitsPixel == bpp, "expected %d, got %d\n", bpp, bm.bmBitsPixel); + + if (data) memcpy(bits, data, bm.bmWidthBytes * bm.bmHeight); + + return hdib; +} + static void test_createbitmap(void) { HRESULT hr; @@ -582,6 +628,147 @@ static void test_CreateBitmapFromHICON(void) IWICBitmap_Release(bitmap); } +static void test_CreateBitmapFromHBITMAP(void) +{ + /* 8 bpp data must be aligned to a DWORD boundary for a DIB */ + static const BYTE data_8bpp_pal_dib[12] = { 0,1,2,0, 1,2,0,0, 2,1,0,0 }; + static const BYTE data_8bpp_rgb_dib[12] = { 0xf0,0x0f,0xff,0, 0x0f,0xff,0xf0,0, 0xf0,0x0f,0xff,0 }; + static const BYTE data_8bpp_pal_wic[12] = { 0xd,0xe,0x10,0, 0xe,0x10,0xd,0, 0x10,0xe,0xd,0 }; + static const PALETTEENTRY pal_data[3] = { {0xff,0,0,0}, {0,0xff,0,0}, {0,0,0xff,0} }; + char pal_buf[sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 255]; + LOGPALETTE *pal = (LOGPALETTE *)pal_buf; + HBITMAP hbmp; + HPALETTE hpal; + BYTE data[12]; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height, i, count; + WICPixelFormatGUID format; + IWICPalette *palette; + WICBitmapPaletteType type; + + /* 8 bpp without palette */ + hbmp = create_dib(3, 3, 8, NULL, data_8bpp_rgb_dib); + ok(hbmp != 0, "failed to create bitmap\n"); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapCacheOnLoad, &bitmap); +todo_wine + ok(hr == WINCODEC_ERR_WIN32ERROR || hr == 0x88980003 /*XP*/, "expected WINCODEC_ERR_WIN32ERROR, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, NULL); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, &bitmap); +todo_wine + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + if (hr != S_OK) return; + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data_8bpp_rgb_dib[i], "%u: expected %#x, got %#x\n", i, data_8bpp_rgb_dib[i], data[i]); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + + /* 8 bpp with a 3 entries palette */ + memset(pal_buf, 0, sizeof(pal_buf)); + pal->palVersion = 0x300; + pal->palNumEntries = 3; + memcpy(pal->palPalEntry, pal_data, sizeof(pal_data)); + hpal = CreatePalette(pal); + ok(hpal != 0, "CreatePalette failed\n"); + + hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmap_CopyPalette(bitmap, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "%u: GetType error %#x\n", i, hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + + IWICPalette_Release(palette); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + DeleteObject(hpal); + + /* 8 bpp with a 256 entries palette */ + memset(pal_buf, 0, sizeof(pal_buf)); + pal->palVersion = 0x300; + pal->palNumEntries = 256; + memcpy(pal->palPalEntry, pal_data, sizeof(pal_data)); + hpal = CreatePalette(pal); + ok(hpal != 0, "CreatePalette failed\n"); + + hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmap_CopyPalette(bitmap, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "%u: GetType error %#x\n", i, hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + IWICPalette_Release(palette); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + DeleteObject(hpal); +} + START_TEST(bitmap) { HRESULT hr; @@ -596,6 +783,7 @@ START_TEST(bitmap) test_createbitmapfromsource(); test_CreateBitmapFromMemory(); test_CreateBitmapFromHICON(); + test_CreateBitmapFromHBITMAP(); IWICImagingFactory_Release(factory); diff --git a/include/wincodec.idl b/include/wincodec.idl index c727bf3..ba58db7 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -219,6 +219,7 @@ cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") +cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94") interface IWICPalette;

1 0

Piotr Caban : msvcrt: Added support for commit flag in fopen.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 7f4e1c65b1b5697ce7e9b4198e2f72997d1d44b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4e1c65b1b5697ce7e9b4198… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 11:03:13 2013 +0100 msvcrt: Added support for commit flag in fopen. --- dlls/msvcrt/file.c | 67 +++++++++++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 3 ++ 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index dedfa30..0df6a86 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -764,6 +764,34 @@ int CDECL MSVCRT__wunlink(const MSVCRT_wchar_t *path) return -1; } +/********************************************************************* + * _commit (MSVCRT.@) + */ +int CDECL MSVCRT__commit(int fd) +{ + HANDLE hand = msvcrt_fdtoh(fd); + + TRACE(":fd (%d) handle (%p)\n",fd,hand); + if (hand == INVALID_HANDLE_VALUE) + return -1; + + if (!FlushFileBuffers(hand)) + { + if (GetLastError() == ERROR_INVALID_HANDLE) + { + /* FlushFileBuffers fails for console handles + * so we ignore this error. + */ + return 0; + } + TRACE(":failed-last error (%d)\n",GetLastError()); + msvcrt_set_errno(GetLastError()); + return -1; + } + TRACE(":ok\n"); + return 0; +} + /* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file); @@ -811,6 +839,9 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) MSVCRT__lock_file(file); res = msvcrt_flush_buffer(file); + + if(!res && (file->_flag & MSVCRT__IOCOMMIT)) + res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0; MSVCRT__unlock_file(file); return res; @@ -852,34 +883,6 @@ int CDECL MSVCRT__close(int fd) } /********************************************************************* - * _commit (MSVCRT.@) - */ -int CDECL MSVCRT__commit(int fd) -{ - HANDLE hand = msvcrt_fdtoh(fd); - - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return -1; - - if (!FlushFileBuffers(hand)) - { - if (GetLastError() == ERROR_INVALID_HANDLE) - { - /* FlushFileBuffers fails for console handles - * so we ignore this error. - */ - return 0; - } - TRACE(":failed-last error (%d)\n",GetLastError()); - msvcrt_set_errno(GetLastError()); - return -1; - } - TRACE(":ok\n"); - return 0; -} - -/********************************************************************* * _dup2 (MSVCRT.@) * NOTES * MSDN isn't clear on this point, but the remarks for _pipe @@ -1284,6 +1287,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st return -1; } + *stream_flags |= MSVCRT__commode; + while (*mode && *mode!=',') switch (*mode++) { @@ -1301,6 +1306,12 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st case 'T': *open_flags |= MSVCRT__O_SHORT_LIVED; break; + case 'c': + *stream_flags |= MSVCRT__IOCOMMIT; + break; + case 'n': + *stream_flags &= ~MSVCRT__IOCOMMIT; + break; case '+': case ' ': case 'a': diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9b88d32..4915309 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -238,6 +238,8 @@ extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **) DECLSP MSVCRT_wchar_t *msvcrt_wstrdupa(const char *) DECLSPEC_HIDDEN; +extern unsigned int MSVCRT__commode; + /* FIXME: This should be declared in new.h but it's not an extern "C" so * it would not be much use anyway. Even for Winelib applications. */ @@ -713,6 +715,7 @@ struct MSVCRT__stat64 { #define MSVCRT__IOERR 0x0020 #define MSVCRT__IOSTRG 0x0040 #define MSVCRT__IORW 0x0080 +#define MSVCRT__IOCOMMIT 0x4000 #define MSVCRT__S_IEXEC 0x0040 #define MSVCRT__S_IWRITE 0x0080

1 0

Piotr Caban : msvcrt: Return child exit code in _pclose function.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: a968a1ad6dccd85548b62b43d7a0e41d2a4058d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a968a1ad6dccd85548b62b43d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 11:03:51 2013 +0100 msvcrt: Return child exit code in _pclose function. Based on a patch by Borut Ražem. --- dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/process.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index ca761ad..6df9ccf 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -118,6 +118,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_THREAD_ATTACH: break; case DLL_PROCESS_DETACH: + msvcrt_free_popen_data(); msvcrt_free_io(); msvcrt_free_mt_locks(); msvcrt_free_console(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4915309..ba67b65 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -269,6 +269,7 @@ extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; extern void msvcrt_init_signals(void) DECLSPEC_HIDDEN; extern void msvcrt_free_signals(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_popen_data(void) DECLSPEC_HIDDEN; extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index d1e8e21..cc64c2d 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -31,6 +31,7 @@ #include <stdarg.h> #include "msvcrt.h" +#include "mtdll.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1022,6 +1023,17 @@ MSVCRT_intptr_t CDECL _wspawnvp(int flags, const MSVCRT_wchar_t* name, const MSV return MSVCRT__wspawnvpe(flags, name, argv, NULL); } +static struct popen_handle { + MSVCRT_FILE *f; + HANDLE proc; +} *popen_handles; +static DWORD popen_handles_size; + +void msvcrt_free_popen_data(void) +{ + MSVCRT_free(popen_handles); +} + /********************************************************************* * _wpopen (MSVCRT.@) * @@ -1036,6 +1048,8 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc MSVCRT_wchar_t *comspec, *fullcmd; unsigned int len; static const MSVCRT_wchar_t flag[] = {' ','/','c',' ',0}; + struct popen_handle *container; + DWORD i; TRACE("(command=%s, mode=%s)\n", debugstr_w(command), debugstr_w(mode)); @@ -1069,6 +1083,25 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc fdToDup = readPipe ? 1 : 0; fdToOpen = readPipe ? 0 : 1; + _mlock(_POPEN_LOCK); + for(i=0; i<popen_handles_size; i++) + { + if (!popen_handles[i].f) + break; + } + if (i==popen_handles_size) + { + i = (popen_handles_size ? popen_handles_size*2 : 8); + container = MSVCRT_realloc(popen_handles, i*sizeof(*container)); + if (!container) goto error; + + popen_handles = container; + container = popen_handles+popen_handles_size; + memset(container, 0, (i-popen_handles_size)*sizeof(*container)); + popen_handles_size = i; + } + else container = popen_handles+i; + if ((fdStdHandle = MSVCRT__dup(fdToDup)) == -1) goto error; if (MSVCRT__dup2(fds[fdToDup], fdToDup) != 0) @@ -1089,7 +1122,8 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc strcatW(fullcmd, flag); strcatW(fullcmd, command); - if (msvcrt_spawn(MSVCRT__P_NOWAIT, comspec, fullcmd, NULL, 1) == -1) + if ((container->proc = (HANDLE)msvcrt_spawn(MSVCRT__P_NOWAIT, comspec, fullcmd, NULL, 1)) + == INVALID_HANDLE_VALUE) { MSVCRT__close(fds[fdToOpen]); ret = NULL; @@ -1099,7 +1133,9 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc ret = MSVCRT__wfdopen(fds[fdToOpen], mode); if (!ret) MSVCRT__close(fds[fdToOpen]); + container->f = ret; } + _munlock(_POPEN_LOCK); HeapFree(GetProcessHeap(), 0, comspec); HeapFree(GetProcessHeap(), 0, fullcmd); MSVCRT__dup2(fdStdHandle, fdToDup); @@ -1107,6 +1143,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc return ret; error: + _munlock(_POPEN_LOCK); if (fdStdHandle != -1) MSVCRT__close(fdStdHandle); MSVCRT__close(fds[0]); MSVCRT__close(fds[1]); @@ -1145,7 +1182,38 @@ MSVCRT_FILE* CDECL MSVCRT__popen(const char* command, const char* mode) */ int CDECL MSVCRT__pclose(MSVCRT_FILE* file) { - return MSVCRT_fclose(file); + HANDLE h; + DWORD i; + + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + _mlock(_POPEN_LOCK); + for(i=0; i<popen_handles_size; i++) + { + if (popen_handles[i].f == file) + break; + } + if(i == popen_handles_size) + { + _munlock(_POPEN_LOCK); + *MSVCRT__errno() = MSVCRT_EBADF; + return -1; + } + + h = popen_handles[i].proc; + popen_handles[i].f = NULL; + _munlock(_POPEN_LOCK); + + MSVCRT_fclose(file); + if(WaitForSingleObject(h, INFINITE)==WAIT_FAILED || !GetExitCodeProcess(h, &i)) + { + msvcrt_set_errno(GetLastError()); + CloseHandle(h); + return -1; + } + + CloseHandle(h); + return i; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added basic _popen tests.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 0d0f705048aa5e56a17b9318ee0d3373ed20477f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0f705048aa5e56a17b9318e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 11:05:46 2013 +0100 msvcrt: Added basic _popen tests. --- dlls/msvcrt/tests/misc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index a2bf0cb..26225f3 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include <errno.h> +#include <stdio.h> #include "msvcrt.h" static int (__cdecl *prand_s)(unsigned int *); @@ -309,10 +310,54 @@ static void test__set_errno(void) ok(errno == 0xdeadbeef, "Expected errno to be 0xdeadbeef, got %d\n", errno); } +static void test__popen_child(void) +{ + /* don't execute any tests here */ + /* ExitProcess is used to set return code of _pclose */ + printf("child output\n"); + ExitProcess(0x37); +} + +static void test__popen(const char *name) +{ + FILE *pipe; + char buf[1024]; + int ret; + + sprintf(buf, "%s misc popen", name); + pipe = _popen(buf, "r"); + ok(pipe != NULL, "_popen failed with error: %d\n", errno); + + fgets(buf, sizeof(buf), pipe); + ok(!strcmp(buf, "child output\n"), "buf = %s\n", buf); + + ret = _pclose(pipe); + ok(ret == 0x37, "_pclose returned %x, expected 0x37\n", ret); + + errno = 0xdeadbeef; + ret = _pclose((FILE*)0xdeadbeef); + ok(ret == -1, "_pclose returned %x, expected -1\n", ret); + if(p_set_errno) + ok(errno == EBADF, "errno = %d\n", errno); +} + START_TEST(misc) { + int arg_c; + char** arg_v; + init(); + arg_c = winetest_get_mainargs(&arg_v); + if(arg_c >= 3) { + if(!strcmp(arg_v[2], "popen")) + test__popen_child(); + else + ok(0, "invalid argument '%s'\n", arg_v[2]); + + return; + } + test_rand_s(); test_I10_OUTPUT(); test_strerror_s(); @@ -320,4 +365,5 @@ START_TEST(misc) test__get_errno(); test__set_doserrno(); test__set_errno(); + test__popen(arg_v[0]); }

1 0