February 2013 - Wine-Commits

Francois Gouget : ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 3e6d0a373d38b84efe26506348005346838fd702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d0a373d38b84efe2650634… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 20 00:14:40 2013 +0100 ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver. --- dlls/ddraw/tests/ddrawmodes.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 82fae5b..68deea4a 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -473,7 +473,10 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - U2(ddsd).dwRefreshRate = 1; + /* Ask for a refresh rate that could not possibly be used. But note that + * the Windows 'Standard VGA' driver claims to run the display at 1Hz! + */ + U2(ddsd).dwRefreshRate = 2; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc);

1 0

Nozomi Kodama : d3dx9: Add a missing trace.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: f9347a8f0ea4c356d8cbed7b2c2e3f35f57d87c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9347a8f0ea4c356d8cbed7b2… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:52:42 2013 -1000 d3dx9: Add a missing trace. --- dlls/d3dx9_36/math.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 0afb36b..10623f7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1743,6 +1743,9 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2* out, UINT outstride D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { const D3DXVECTOR2 v = *pv; + + TRACE("pout %p, pv %p, pm %p", pout, pv, pm); + pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y; pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y; return pout;

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC for font enumeration.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 97b92fe12c35673a9234f990b8f66797cc58c603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b92fe12c35673a9234f990b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:17:36 2013 +0800 gdiplus: Use an off-screen DC for font enumeration. --- dlls/gdiplus/font.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6e31331..51c7aec 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -979,12 +979,12 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, *IsStyleAvailable = FALSE; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); if(!EnumFontFamiliesW(hdc, family->FamilyName, font_has_style_proc, (LPARAM)style)) *IsStyleAvailable = TRUE; - ReleaseDC(0, hdc); + DeleteDC(hdc); return Ok; } @@ -1276,7 +1276,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); @@ -1288,7 +1288,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } return Ok; } @@ -1403,7 +1403,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lfw.lfFaceName[0] = 0; @@ -1416,7 +1416,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } *fontCollection = &installedFontCollection;

1 0

Jacek Caban : mshtml: Addeed IHTMLDocument5::createAttribute implementation .
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: a9136b56f7b65ebe94d64e7ec0c1e9cbb73f0203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9136b56f7b65ebe94d64e7ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:15 2013 +0100 mshtml: Addeed IHTMLDocument5::createAttribute implementation. --- dlls/mshtml/htmlattr.c | 48 ++++++++++++++++++++++++++++------------- dlls/mshtml/htmldoc5.c | 13 +++++++++- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 6 +++- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 5d4c2b4..4c4d8a4 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -81,6 +81,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) if(!ref) { assert(!This->elem); release_dispex(&This->dispex); + heap_free(This->name); heap_free(This); } @@ -124,6 +125,11 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS TRACE("(%p)->(%p)\n", This, p); + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p); } @@ -163,16 +169,16 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { - *p = VARIANT_TRUE; - return S_OK; - } - if(!This->elem || !This->elem->nselem) { FIXME("NULL This->elem\n"); return E_UNEXPECTED; } + if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { + *p = VARIANT_TRUE; + return S_OK; + } + hres = IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, &name); if(FAILED(hres)) return hres; @@ -221,7 +227,7 @@ static dispex_static_data_t HTMLDOMAttribute_dispex = { HTMLDOMAttribute_iface_tids }; -HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) +HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) { HTMLAttributeCollection *col; HTMLDOMAttribute *ret; @@ -231,23 +237,35 @@ HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribu if(!ret) return E_OUTOFMEMORY; - hres = HTMLElement_get_attr_col(&elem->node, &col); - if(FAILED(hres)) { - heap_free(ret); - return hres; - } - IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); - ret->IHTMLDOMAttribute_iface.lpVtbl = &HTMLDOMAttributeVtbl; ret->ref = 1; - ret->dispid = dispid; ret->elem = elem; - list_add_tail(&elem->attrs->attrs, &ret->entry); init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, &HTMLDOMAttribute_dispex); + /* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */ + if(elem) { + hres = HTMLElement_get_attr_col(&elem->node, &col); + if(FAILED(hres)) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return hres; + } + IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); + + list_add_tail(&elem->attrs->attrs, &ret->entry); + } + + /* For detached attributes we may still do most operations if we have its name available. */ + if(name) { + ret->name = heap_strdupW(name); + if(!ret->name) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return E_OUTOFMEMORY; + } + } + *attr = ret; return S_OK; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index edf8109..8871934 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -120,8 +120,17 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR IHTMLDOMAttribute **ppattribute) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); + + hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, &attr); + if(FAILED(hres)) + return hres; + + *ppattribute = &attr->IHTMLDOMAttribute_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bstrdata, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6867a17..8239973 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2246,7 +2246,7 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - hres = HTMLDOMAttribute_Create(This->elem, id, attr); + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, attr); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 75200c4..38aaa24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -852,12 +852,14 @@ typedef struct { LONG ref; - DISPID dispid; + WCHAR *name; + HTMLElement *elem; + DISPID dispid; struct list entry; } HTMLDOMAttribute; -HRESULT HTMLDOMAttribute_Create(HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; +HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onfocus property implementation.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 2a0fd1c95606c7fa0c2a619d130543a83d4477cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0fd1c95606c7fa0c2a619d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:59 2013 +0100 mshtml: Added IHTMLWindow2::onfocus property implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9e3cb72..2a2b5ca 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -949,15 +949,19 @@ static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_FOCUS, &v); } static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_FOCUS, p); } static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Forward IHTMLDocument3:: get_childNodes to IHTMLDOMNode implemnentation.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: c2cfc4cf8b25a2ac3f155725ffffdbcf806282cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cfc4cf8b25a2ac3f155725f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:51 2013 +0100 mshtml: Forward IHTMLDocument3::get_childNodes to IHTMLDOMNode implemnentation. --- dlls/mshtml/htmldoc3.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index e1efa7a..4b9b12e 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -496,8 +496,10 @@ static HRESULT WINAPI HTMLDocument3_get_baseUrl(IHTMLDocument3 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument3_get_childNodes(IHTMLDocument3 *iface, IDispatch **p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDOMNode_get_childNodes(&This->doc_node->node.IHTMLDOMNode_iface, p); } static HRESULT WINAPI HTMLDocument3_put_inheritStyleSheets(IHTMLDocument3 *iface,

1 0

Huw Davies : usp10: Clusters are represented by glyph indices not character positions.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 5e5d8d215b60c83d3919711c17a73fa719b6bb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5d8d215b60c83d3919711c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 20 09:51:10 2013 +0000 usp10: Clusters are represented by glyph indices not character positions. --- dlls/usp10/usp10.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8bfe156..5287556 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2534,8 +2534,9 @@ HRESULT WINAPI ScriptCPtoX(int iCP, if (check >= cChars && !iMaxPos) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, 1); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, 1); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2666,8 +2667,9 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (check >= cChars && direction > 0) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, direction); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, direction); iSpecial = item; special_size /= (cChars - item); iPosX += special_size;

1 0

Michael Stefaniuc : shell32: COM clean up for the inner IUnknown of ShellFSFolder.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: df56b233e0ce02c9b48fe5f8f7c80ad5b19c5a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df56b233e0ce02c9b48fe5f8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:13:49 2013 +0100 shell32: COM clean up for the inner IUnknown of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 89 +++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 8439da1..1ccd2ef 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -59,14 +59,13 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - const IUnknownVtbl *lpVtbl; - LONG ref; + IUnknown IUnknown_inner; + LONG ref; const IShellFolder2Vtbl *lpvtblShellFolder; const IPersistFolder3Vtbl *lpvtblPersistFolder3; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; - - IUnknown *pUnkOuter; /* used for aggregation */ + IUnknown *outer_unk; CLSID *pclsid; @@ -79,12 +78,16 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IUnknownVtbl unkvt; static const IShellFolder2Vtbl sfvt; static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; +static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); +} + static inline IGenericSFImpl *impl_from_IShellFolder2( IShellFolder2 *iface ) { return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblShellFolder)); @@ -109,7 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) #define _IShellFolder_(This) ((IShellFolder*)&(This)->lpvtblShellFolder) #define _IShellFolder2_(This) ((IShellFolder2*)&(This)->lpvtblShellFolder) #define _IPersist_(This) (&(This)->lpvtblPersistFolder3) @@ -132,19 +134,18 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This) } /************************************************************************** -* we need a separate IUnknown to handle aggregation -* (inner IUnknown) +* inner IUnknown */ -static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, void **ppvObj) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; + IGenericSFImpl *This = impl_from_IUnknown(iface); - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; if (IsEqualIID (riid, &IID_IUnknown)) - *ppvObj = _IUnknown_ (This); + *ppvObj = &This->IUnknown_inner; else if (IsEqualIID (riid, &IID_IShellFolder)) *ppvObj = _IShellFolder_ (This); else if (IsEqualIID (riid, &IID_IShellFolder2)) @@ -165,7 +166,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, } if (*ppvObj) { - IUnknown_AddRef ((IUnknown *) (*ppvObj)); + IUnknown_AddRef((IUnknown *)*ppvObj); TRACE ("-- Interface = %p\n", *ppvObj); return S_OK; } @@ -173,31 +174,31 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) +static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%d\n", This, ref); - return refCount; + return ref; } -static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) +static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%d\n", This, ref); - if (!refCount) { - TRACE ("-- destroying IShellFolder(%p)\n", This); + if (!ref) { + TRACE("-- destroying IShellFolder(%p)\n", This); - SHFree (This->pidlRoot); - SHFree (This->sPathTarget); - LocalFree (This); + SHFree(This->pidlRoot); + SHFree(This->sPathTarget); + LocalFree(This); } - return refCount; + return ref; } static const IUnknownVtbl unkvt = @@ -239,16 +240,16 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) return E_OUTOFMEMORY; sf->ref = 0; - sf->lpVtbl = &unkvt; + sf->IUnknown_inner.lpVtbl = &unkvt; sf->lpvtblShellFolder = &sfvt; sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); + sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { - IUnknown_Release (_IUnknown_ (sf)); + if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { + IUnknown_Release(&sf->IUnknown_inner); return E_NOINTERFACE; } @@ -271,7 +272,7 @@ IShellFolder_fnQueryInterface (IShellFolder2 * iface, REFIID riid, TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } /************************************************************************** @@ -284,7 +285,7 @@ static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************** @@ -296,7 +297,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************** @@ -1136,7 +1137,7 @@ ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) @@ -1145,7 +1146,7 @@ static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) @@ -1154,7 +1155,7 @@ static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /**************************************************************************** @@ -1450,7 +1451,7 @@ IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); } /************************************************************************ @@ -1464,7 +1465,7 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************ @@ -1478,7 +1479,7 @@ IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************ @@ -1673,7 +1674,7 @@ ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) @@ -1682,7 +1683,7 @@ static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) @@ -1691,7 +1692,7 @@ static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI

1 0

André Hentschel : kernel32: Add stub for GetCurrentPackageId.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 2976b6342fdcf1f4c1e9a4dd38bf14083f5c8ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2976b6342fdcf1f4c1e9a4dd3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 19 23:19:34 2013 +0100 kernel32: Add stub for GetCurrentPackageId. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 6 +++ include/winerror.h | 78 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f2f039b..93bfb77 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -498,6 +498,7 @@ @ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) +@ stdcall GetCurrentPackageId(ptr ptr) @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 9f21435..b9d13e4 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -201,3 +201,9 @@ BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD return RtlGetProductInfo(dwOSMajorVersion, dwOSMinorVersion, dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); } + +LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) +{ + FIXME("(%p %p): stub\n", len, buffer); + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/include/winerror.h b/include/winerror.h index b6281f8..edd8af0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1934,6 +1934,84 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_RESOURCE_ENUM_USER_STOP 15106 #define ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED 15107 #define ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME 15108 +#define ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE 15110 +#define ERROR_MRM_INVALID_PRICONFIG 15111 +#define ERROR_MRM_INVALID_FILE_TYPE 15112 +#define ERROR_MRM_UNKNOWN_QUALIFIER 15113 +#define ERROR_MRM_INVALID_QUALIFIER_VALUE 15114 +#define ERROR_MRM_NO_CANDIDATE 15115 +#define ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE 15116 +#define ERROR_MRM_RESOURCE_TYPE_MISMATCH 15117 +#define ERROR_MRM_DUPLICATE_MAP_NAME 15118 +#define ERROR_MRM_DUPLICATE_ENTRY 15119 +#define ERROR_MRM_INVALID_RESOURCE_IDENTIFIER 15120 +#define ERROR_MRM_FILEPATH_TOO_LONG 15121 +#define ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE 15122 +#define ERROR_MRM_INVALID_PRI_FILE 15126 +#define ERROR_MRM_NAMED_RESOURCE_NOT_FOUND 15127 +#define ERROR_MRM_MAP_NOT_FOUND 15135 +#define ERROR_MRM_UNSUPPORTED_PROFILE_TYPE 15136 +#define ERROR_MRM_INVALID_QUALIFIER_OPERATOR 15137 +#define ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE 15138 +#define ERROR_MRM_AUTOMERGE_ENABLED 15139 +#define ERROR_MRM_TOO_MANY_RESOURCES 15140 +#define ERROR_MCA_INVALID_CAPABILITIES_STRING 15200 +#define ERROR_MCA_INVALID_VCP_VERSION 15201 +#define ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION 15202 +#define ERROR_MCA_MCCS_VERSION_MISMATCH 15203 +#define ERROR_MCA_UNSUPPORTED_MCCS_VERSION 15204 +#define ERROR_MCA_INTERNAL_ERROR 15205 +#define ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED 15206 +#define ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE 15207 +#define ERROR_AMBIGUOUS_SYSTEM_DEVICE 15250 +#define ERROR_SYSTEM_DEVICE_NOT_FOUND 15299 +#define ERROR_HASH_NOT_SUPPORTED 15300 +#define ERROR_HASH_NOT_PRESENT 15301 +#define ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED 15321 +#define ERROR_GPIO_CLIENT_INFORMATION_INVALID 15322 +#define ERROR_GPIO_VERSION_NOT_SUPPORTED 15323 +#define ERROR_GPIO_INVALID_REGISTRATION_PACKET 15324 +#define ERROR_GPIO_OPERATION_DENIED 15325 +#define ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE 15326 +#define ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED 15327 +#define ERROR_CANNOT_SWITCH_RUNLEVEL 15400 +#define ERROR_INVALID_RUNLEVEL_SETTING 15401 +#define ERROR_RUNLEVEL_SWITCH_TIMEOUT 15402 +#define ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT 15403 +#define ERROR_RUNLEVEL_SWITCH_IN_PROGRESS 15404 +#define ERROR_SERVICES_FAILED_AUTOSTART 15405 +#define ERROR_COM_TASK_STOP_PENDING 15501 +#define ERROR_INSTALL_OPEN_PACKAGE_FAILED 15600 +#define ERROR_INSTALL_PACKAGE_NOT_FOUND 15601 +#define ERROR_INSTALL_INVALID_PACKAGE 15602 +#define ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED 15603 +#define ERROR_INSTALL_OUT_OF_DISK_SPACE 15604 +#define ERROR_INSTALL_NETWORK_FAILURE 15605 +#define ERROR_INSTALL_REGISTRATION_FAILURE 15606 +#define ERROR_INSTALL_DEREGISTRATION_FAILURE 15607 +#define ERROR_INSTALL_CANCEL 15608 +#define ERROR_INSTALL_FAILED 15609 +#define ERROR_REMOVE_FAILED 15610 +#define ERROR_PACKAGE_ALREADY_EXISTS 15611 +#define ERROR_NEEDS_REMEDIATION 15612 +#define ERROR_INSTALL_PREREQUISITE_FAILED 15613 +#define ERROR_PACKAGE_REPOSITORY_CORRUPTED 15614 +#define ERROR_INSTALL_POLICY_FAILURE 15615 +#define ERROR_PACKAGE_UPDATING 15616 +#define ERROR_DEPLOYMENT_BLOCKED_BY_POLICY 15617 +#define ERROR_PACKAGES_IN_USE 15618 +#define ERROR_RECOVERY_FILE_CORRUPT 15619 +#define ERROR_INVALID_STAGED_SIGNATURE 15620 +#define ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED 15621 +#define ERROR_INSTALL_PACKAGE_DOWNGRADE 15622 +#define ERROR_SYSTEM_NEEDS_REMEDIATION 15623 +#define ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN 15624 +#define ERROR_RESILIENCY_FILE_CORRUPT 15625 +#define ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING 15626 +#define APPMODEL_ERROR_NO_PACKAGE 15700 +#define APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT 15701 +#define APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT 15702 +#define APPMODEL_ERROR_NO_APPLICATION 15703 /* HRESULT values for OLE, SHELL and other Interface stuff */ /* the codes 4000-40ff are reserved for OLE */

1 0

Lucas Zawacki : Portuguese translation for release 1.5.24
by Jeremy Newman Feb. 20, 2013

Feb. 20, 2013

Module: website Branch: master Commit: 75bffd54131db74adb0ee7380c6c95a6f9fea6c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=75bffd54131db74adb0ee7… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 19 13:50:05 2013 -0300 Portuguese translation for release 1.5.24 --- news/pt/2013021501.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013021501.xml b/news/pt/2013021501.xml new file mode 100644 index 0000000..884e9ed --- /dev/null +++ b/news/pt/2013021501.xml @@ -0,0 +1,14 @@ +<news> +<date>15 de Fevereiro de 2013</date> +<title>Wine 1.5.24 lançado</title> +<body> + A versão de desenvolvimento 1.5.24 já está disponível agora. + <a href="{$root}/announce/1.5.24">Novidades</a> desta versão: +<ul> + <li>Suporte a teclado e rodinha do mouse no driver de Mac.</li> + <li>Suporte a expressões regulares em VB Script.</li> + <li>Diversas limpezas no código do RichEdit.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0