August 2013 - Wine-commits - list.winehq.org

Frédéric Delanoy : winedev: Add/fix some ' filename' tags.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: docs Branch: master Commit: c909823806246b3c4cd77a9ef609db6ccd96b7e6 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c909823806246b3c4cd77a9ef… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:40 2013 +0200 winedev: Add/fix some 'filename' tags. --- en/winedev-architecture.sgml | 8 ++++---- en/winedev-debugger.sgml | 13 +++++++------ en/winedev-documentation.sgml | 18 ++++++++++-------- en/winedev-kernel.sgml | 8 ++++---- en/winedev-multimedia.sgml | 18 +++++++++--------- en/winedev-ole.sgml | 10 +++++----- en/winedev-opengl.sgml | 10 +++++----- en/winedev-testing.sgml | 21 +++++++++++---------- en/winedev-windowing.sgml | 6 +++--- 9 files changed, 58 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=c909823806246b3c4cd77…

1 0

Frédéric Delanoy : winedev: Use 'replaceable' tags for data placeholders.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: docs Branch: master Commit: f0d643aad55c32e34521be1c241ea17a92337ede URL: http://source.winehq.org/git/docs.git/?a=commit;h=f0d643aad55c32e34521be1c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:41 2013 +0200 winedev: Use 'replaceable' tags for data placeholders. --- en/winedev-coding.sgml | 25 ++-- en/winedev-debugger.sgml | 407 +++++++++++++++++++---------------------- en/winedev-debugging.sgml | 34 ++-- en/winedev-documentation.sgml | 4 +- en/winedev-kernel.sgml | 99 +++++----- en/winedev-multimedia.sgml | 10 +- en/winedev-ole.sgml | 14 +- en/winedev-otherdebug.sgml | 34 ++-- en/winedev-testing.sgml | 2 +- 9 files changed, 302 insertions(+), 327 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=f0d643aad55c32e34521b…

1 0

Jeremy Newman : CVS page removed, redirect to Git Wiki page
by Jeremy Newman 16 Aug '13

16 Aug '13

Module: website Branch: master Commit: 647b56ff8ec101c5d6a60c6ad14ec58caa8300fa URL: http://source.winehq.org/git/website.git/?a=commit;h=647b56ff8ec101c5d6a60c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 16 16:06:03 2013 -0500 CVS page removed, redirect to Git Wiki page --- templates/en/cvs.template | 21 --------------------- templates/he/cvs.template | 21 --------------------- templates/tr/cvs.template | 19 ------------------- templates/zh-cn/cvs.template | 21 --------------------- 4 files changed, 0 insertions(+), 82 deletions(-) diff --git a/templates/en/cvs.template b/templates/en/cvs.template deleted file mode 100644 index 202cf60..0000000 --- a/templates/en/cvs.template +++ /dev/null @@ -1,21 +0,0 @@ - - - -<h1 class="title">The Wine CVS Tree</h1> - -<p><strong>Note: We have switched development from CVS to <a href="http://git.or.cz">Git</a>. - Wine can no longer be downloaded via CVS. - Instructions for using the <a href="{$root}/site/git">Wine Git tree</a> - can be found on the <a href="http://wiki.winehq.org/GitWine">GitWine</a> - page on the <a href="http://wiki.winehq.org">Wine Wiki</a>.</strong></p> - -<hr /> - -<h1 id="sourcetree">Source Tree Browsing via the Web</h1> - -<p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) - cross-referenced and available for browsing, including a search engine. - This cross-references source is based on the snapshot-releases and is made available at:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul> diff --git a/templates/he/cvs.template b/templates/he/cvs.template deleted file mode 100644 index 5d500c8..0000000 --- a/templates/he/cvs.template +++ /dev/null @@ -1,21 +0,0 @@ - - - -<h1 class="title">עץ ה־CVS של Wine</h1> - -<p><strong>נא לשים לב: הפיתוח הועבר ממערכת CVS ל־<a href="http://git.or.cz">Git</a>. - לא ניתן עוד להוריד את Wine דרך ה־CVS. - ניתן למצוא הנחיות לשימוש ב<a href="{$root}/site/git">עץ ה־Git של Wine</a> - בעמוד <a href="http://wiki.winehq.org/GitWine">GitWine</a> - שב<a href="http://wiki.winehq.org">וויקי של Wine</a>.</strong></p> - -<hr /> - -<h1 id="sourcetree">עיון בעץ המקור באמצעות דפדפן</h1> - -<p>קוד המקור של כל העץ של Wine (מבוסס <a href="http://lxr.linux.no/">LXR</a>) הוא בעל הפניות צולבות - וזמין לעיון לרבות מנוע חיפוש. - הקוד בעל ההפניות הצולבות מבוסס על הפצת הפיתוח אותה ניתן להוריד בכתובת:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul> diff --git a/templates/tr/cvs.template b/templates/tr/cvs.template deleted file mode 100644 index 0fff643..0000000 --- a/templates/tr/cvs.template +++ /dev/null @@ -1,19 +0,0 @@ - - - -<h1 class="title">Wine CVS Ağacı</h1> - -<p><strong>Not: Geliştirme olarak CVS'den <a href="http://git.or.cz">Git</a>'e geçtik. - Wine artık CVS ile indirilemez. - <a href="{$root}/site/git">Wine Git ağacı</a> kullanımı hakkında talimatlar <a href="http://wiki.winehq.org">Wine Wiki</a> içerisinde - <a href="http://wiki.winehq.org/GitWine">GitWine</a> sayfasında bulunabilir.</strong></p> - -<hr /> - -<h1 id="sourcetree">Web Yardımıyla Kaynak Ağaç Gezintisi</h1> - -<p>Tüm Wine ağacının kaynak kodu (<a href="http://lxr.linux.no/">LXR</a> tabanlıdır) arama motoru da dahil olan çapraz referanslı ve gezinti için kullanılabilir. - Bu çapraz referans kaynak, günlük dağıtım tabanlıdır ve şuradan bulunabilir:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul> diff --git a/templates/zh-cn/cvs.template b/templates/zh-cn/cvs.template deleted file mode 100644 index ba10a25..0000000 --- a/templates/zh-cn/cvs.template +++ /dev/null @@ -1,21 +0,0 @@ - - - -<h1 class="title">The Wine CVS Tree</h1> - -<p><strong>注意：我们已经把开发从 CVS 切换到 <a href="http://git.or.cz">Git</a> 了。 - 不可以再通过 CVS 来获取 Wine 了。 - <a href="{$root}/site/git">Wine Git tree</a> 的使用说明可以从 - <a href="http://wiki.winehq.org">Wine Wiki</a> 上的 - <a href="http://wiki.winehq.org/GitWine">GitWine</a> 页面找到。</strong></p> - -<hr /> - -<h1 id="sourcetree">通过 Web 方式浏览源码树</h1> - -<p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) - cross-referenced and available for browsing, including a search engine. - This cross-references source is based on the snapshot-releases and is made available at:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul>

1 0

Nikolay Sivov : shell32: Remove unused parameters from conversion helper.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 15cd338d597cbf1323bf8754368e9a19bd2707f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cd338d597cbf1323bf87543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:33:38 2013 +0400 shell32: Remove unused parameters from conversion helper. --- dlls/shell32/shelllink.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 3e59aef..9664df9 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -208,10 +208,10 @@ static inline IShellLinkImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ -static inline LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) +static inline LPWSTR heap_strdupAtoW( LPCSTR str) { INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + LPWSTR p = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); @@ -1420,7 +1420,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA *iface, LPCSTR ps if (pszName) { - descrW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszName); + descrW = heap_strdupAtoW(pszName); if (!descrW) return E_OUTOFMEMORY; } else @@ -1456,7 +1456,7 @@ static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA *iface, LPCS TRACE("(%p)->(dir=%s)\n",This, pszDir); - dirW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszDir); + dirW = heap_strdupAtoW(pszDir); if (!dirW) return E_OUTOFMEMORY; hr = IShellLinkW_SetWorkingDirectory(&This->IShellLinkW_iface, dirW); @@ -1490,7 +1490,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA *iface, LPCSTR pszA if (pszArgs) { - argsW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszArgs); + argsW = heap_strdupAtoW(pszArgs); if (!argsW) return E_OUTOFMEMORY; } else @@ -1552,7 +1552,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA *iface, LPCSTR p TRACE("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon); - pathW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszIconPath); + pathW = heap_strdupAtoW(pszIconPath); if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetIconLocation(&This->IShellLinkW_iface, pathW, iIcon); @@ -1570,7 +1570,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA *iface, LPCSTR p TRACE("(%p)->(path=%s %x)\n",This, pszPathRel, dwReserved); - pathW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); + pathW = heap_strdupAtoW(pszPathRel); if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetRelativePath(&This->IShellLinkW_iface, pathW, dwReserved); @@ -1598,7 +1598,7 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) if (!pszFile) return E_INVALIDARG; - str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); + str = heap_strdupAtoW(pszFile); if( !str ) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : shell32: Forward GetClassID() to IPersistFile.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: d64697a34ea7cedb63fa6c0572a6b50bba4a8f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64697a34ea7cedb63fa6c057… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:34:10 2013 +0400 shell32: Forward GetClassID() to IPersistFile. --- dlls/shell32/shelllink.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 9664df9..3ee06bc 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -280,14 +280,6 @@ static HRESULT ShellLink_QueryInterface( IShellLinkImpl *This, REFIID riid, LPV return E_NOINTERFACE; } -static HRESULT ShellLink_GetClassID( IShellLinkImpl *This, CLSID *pclsid ) -{ - TRACE("%p %p\n", This, pclsid); - - *pclsid = CLSID_ShellLink; - return S_OK; -} - /************************************************************************** * IPersistFile_QueryInterface */ @@ -321,7 +313,12 @@ static ULONG WINAPI IPersistFile_fnRelease(IPersistFile* iface) static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile* iface, CLSID *pClassID) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - return ShellLink_GetClassID( This, pClassID ); + + TRACE("(%p)->(%p)\n", This, pClassID); + + *pClassID = CLSID_ShellLink; + + return S_OK; } static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile* iface) @@ -545,7 +542,7 @@ static HRESULT WINAPI IPersistStream_fnGetClassID( CLSID* pClassID) { IShellLinkImpl *This = impl_from_IPersistStream(iface); - return ShellLink_GetClassID( This, pClassID ); + return IPersistFile_GetClassID(&This->IPersistFile_iface, pClassID); } /************************************************************************

1 0

Nikolay Sivov : shell32: Remove unnecessary WINAPI and some casts.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 81b9a83d838ecb83ab9bb94f4a4611bd748df2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b9a83d838ecb83ab9bb94f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:36:42 2013 +0400 shell32: Remove unnecessary WINAPI and some casts. --- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shelllink.c | 6 +++--- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 29439c5..ed112f2 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -617,7 +617,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl,(LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree(pidl); } else { hr = E_NOINTERFACE; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index ece1863..c50330b 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -86,7 +86,6 @@ HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * HRESULT WINAPI IShellDispatch_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI IShellItem_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI IShellLink_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; -HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ISF_NetworkPlaces_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; @@ -109,6 +108,7 @@ HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIco HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 3ee06bc..5fd4820 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1295,8 +1295,8 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor /************************************************************************** * IShellLink_ConstructFromFile */ -HRESULT WINAPI IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, - LPCITEMIDLIST pidl, LPVOID* ppv) +HRESULT IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, + LPCITEMIDLIST pidl, IUnknown **ppv) { IShellLinkW* psl; @@ -1318,7 +1318,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, hr = E_FAIL; if (SUCCEEDED(hr)) - *ppv = psl; + *ppv = (IUnknown*)psl; IPersistFile_Release(ppf); } diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 227982e..e2b73d0 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -562,7 +562,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree (pidl); } else diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 6730733..4bd964c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -690,7 +690,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree (pidl); } else { hr = E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 766e8d8..a21a2f3 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -563,7 +563,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*) &pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree (pidl); } else

1 0

Nikolay Sivov : shell32: Move QueryInterface to IShellLinkW.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 17ad6aa28aaafd7a45f713cb8e4208e96b2babdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ad6aa28aaafd7a45f713cb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:37:35 2013 +0400 shell32: Move QueryInterface to IShellLinkW. --- dlls/shell32/shelllink.c | 123 ++++++++++++++++++++++------------------------ 1 files changed, 58 insertions(+), 65 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5fd4820..4000a1d 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -229,58 +229,6 @@ static inline LPWSTR strdupW( LPCWSTR src ) } /************************************************************************** - * ShellLink::QueryInterface implementation - */ -static HRESULT ShellLink_QueryInterface( IShellLinkImpl *This, REFIID riid, LPVOID *ppvObj) -{ - TRACE("(%p)->(\n\tIID:\t%s)\n",This,debugstr_guid(riid)); - - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IShellLinkA)) - { - *ppvObj = &This->IShellLinkA_iface; - } - else if(IsEqualIID(riid, &IID_IShellLinkW)) - { - *ppvObj = &This->IShellLinkW_iface; - } - else if(IsEqualIID(riid, &IID_IPersistFile)) - { - *ppvObj = &This->IPersistFile_iface; - } - else if(IsEqualIID(riid, &IID_IPersistStream)) - { - *ppvObj = &This->IPersistStream_iface; - } - else if(IsEqualIID(riid, &IID_IShellLinkDataList)) - { - *ppvObj = &This->IShellLinkDataList_iface; - } - else if(IsEqualIID(riid, &IID_IShellExtInit)) - { - *ppvObj = &This->IShellExtInit_iface; - } - else if(IsEqualIID(riid, &IID_IContextMenu)) - { - *ppvObj = &This->IContextMenu_iface; - } - else if(IsEqualIID(riid, &IID_IObjectWithSite)) - { - *ppvObj = &This->IObjectWithSite_iface; - } - - if(*ppvObj) - { - IUnknown_AddRef((IUnknown*)(*ppvObj)); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - ERR("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -/************************************************************************** * IPersistFile_QueryInterface */ static HRESULT WINAPI IPersistFile_fnQueryInterface( @@ -289,7 +237,7 @@ static HRESULT WINAPI IPersistFile_fnQueryInterface( LPVOID *ppvObj) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObj); } /****************************************************************************** @@ -307,7 +255,7 @@ static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile* iface) static ULONG WINAPI IPersistFile_fnRelease(IPersistFile* iface) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - return IShellLinkA_Release(&This->IShellLinkA_iface); + return IShellLinkW_Release(&This->IShellLinkW_iface); } static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile* iface, CLSID *pClassID) @@ -510,7 +458,7 @@ static HRESULT WINAPI IPersistStream_fnQueryInterface( VOID** ppvObj) { IShellLinkImpl *This = impl_from_IPersistStream(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObj); } /************************************************************************ @@ -520,7 +468,7 @@ static ULONG WINAPI IPersistStream_fnRelease( IPersistStream* iface) { IShellLinkImpl *This = impl_from_IPersistStream(iface); - return IShellLinkA_Release(&This->IShellLinkA_iface); + return IShellLinkW_Release(&This->IShellLinkW_iface); } /************************************************************************ @@ -1336,7 +1284,7 @@ HRESULT IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, static HRESULT WINAPI IShellLinkA_fnQueryInterface(IShellLinkA *iface, REFIID riid, void **ppvObj) { IShellLinkImpl *This = impl_from_IShellLinkA(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObj); } /****************************************************************************** @@ -1642,7 +1590,52 @@ static HRESULT WINAPI IShellLinkW_fnQueryInterface( IShellLinkW * iface, REFIID riid, LPVOID *ppvObj) { IShellLinkImpl *This = impl_from_IShellLinkW(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + + TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IShellLinkA)) + { + *ppvObj = &This->IShellLinkA_iface; + } + else if(IsEqualIID(riid, &IID_IShellLinkW)) + { + *ppvObj = &This->IShellLinkW_iface; + } + else if(IsEqualIID(riid, &IID_IPersistFile)) + { + *ppvObj = &This->IPersistFile_iface; + } + else if(IsEqualIID(riid, &IID_IPersistStream)) + { + *ppvObj = &This->IPersistStream_iface; + } + else if(IsEqualIID(riid, &IID_IShellLinkDataList)) + { + *ppvObj = &This->IShellLinkDataList_iface; + } + else if(IsEqualIID(riid, &IID_IShellExtInit)) + { + *ppvObj = &This->IShellExtInit_iface; + } + else if(IsEqualIID(riid, &IID_IContextMenu)) + { + *ppvObj = &This->IContextMenu_iface; + } + else if(IsEqualIID(riid, &IID_IObjectWithSite)) + { + *ppvObj = &This->IObjectWithSite_iface; + } + + if(*ppvObj) + { + IUnknown_AddRef((IUnknown*)*ppvObj); + TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); + return S_OK; + } + ERR("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; } /****************************************************************************** @@ -2186,14 +2179,14 @@ static HRESULT WINAPI ShellLink_DataList_QueryInterface( IShellLinkDataList* iface, REFIID riid, void** ppvObject) { IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); - return IShellLinkA_QueryInterface(&This->IShellLinkA_iface, riid, ppvObject); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject); } static ULONG WINAPI ShellLink_DataList_AddRef( IShellLinkDataList* iface ) { IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); - return IShellLinkA_AddRef(&This->IShellLinkA_iface); + return IShellLinkW_AddRef(&This->IShellLinkW_iface); } static ULONG WINAPI @@ -2296,14 +2289,14 @@ static HRESULT WINAPI ShellLink_ExtInit_QueryInterface( IShellExtInit* iface, REFIID riid, void** ppvObject ) { IShellLinkImpl *This = impl_from_IShellExtInit(iface); - return IShellLinkA_QueryInterface(&This->IShellLinkA_iface, riid, ppvObject); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject); } static ULONG WINAPI ShellLink_ExtInit_AddRef( IShellExtInit* iface ) { IShellLinkImpl *This = impl_from_IShellExtInit(iface); - return IShellLinkA_AddRef(&This->IShellLinkA_iface); + return IShellLinkW_AddRef(&This->IShellLinkW_iface); } static ULONG WINAPI @@ -2376,14 +2369,14 @@ static HRESULT WINAPI ShellLink_ContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void** ppvObject ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); - return IShellLinkA_QueryInterface(&This->IShellLinkA_iface, riid, ppvObject); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject); } static ULONG WINAPI ShellLink_ContextMenu_AddRef( IContextMenu* iface ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); - return IShellLinkA_AddRef(&This->IShellLinkA_iface); + return IShellLinkW_AddRef(&This->IShellLinkW_iface); } static ULONG WINAPI @@ -2552,7 +2545,7 @@ static HRESULT WINAPI ShellLink_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) { IShellLinkImpl *This = impl_from_IObjectWithSite(iface); - return ShellLink_QueryInterface( This, riid, ppvObject ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject ); } static ULONG WINAPI

1 0

Alistair Leslie-Hughes : mscoree: Redirect .NET 1.0 to .NET 2.0.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 9dbeaf25867312266c0c1facd40ff5a8bc300507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbeaf25867312266c0c1facd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 14:08:31 2013 +1000 mscoree: Redirect .NET 1.0 to .NET 2.0. --- dlls/mscoree/metahost.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index eabdcf5..519e991 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -50,9 +50,10 @@ static const WCHAR net_40_subdir[] = {'4','.','0',0}; static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; -#define NUM_RUNTIMES 3 +#define NUM_RUNTIMES 4 static struct CLRRuntimeInfo runtimes[NUM_RUNTIMES] = { + {{&CLRRuntimeInfoVtbl}, net_20_subdir, 1, 0, 3705, 0}, {{&CLRRuntimeInfoVtbl}, net_20_subdir, 1, 1, 4322, 0}, {{&CLRRuntimeInfoVtbl}, net_20_subdir, 2, 0, 50727, 0}, {{&CLRRuntimeInfoVtbl}, net_40_subdir, 4, 0, 30319, 0} @@ -1390,7 +1391,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, find_runtimes(); if (legacy) - i = 2; + i = 3; else i = NUM_RUNTIMES;

1 0

Nikolay Sivov : ntdll: Fix hash collision check condition for string keys.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 30425ece6cddc9427b456618bfa6425b50856317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30425ece6cddc9427b456618b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 17:40:30 2013 +0400 ntdll: Fix hash collision check condition for string keys. --- dlls/ntdll/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 7280b4c..56a28fa 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2336,7 +2336,7 @@ static struct string_index *find_string_index(const struct strsection_header *se { const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); - if (!strcmpW(nameW, name->Buffer)) + if (!strcmpiW(nameW, name->Buffer)) { index = iter; break;

1 0

Hans Leidekker : wbemdisp: Add a stub dll.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: acb1ff4af0be881813e8fbd85679d65199dedd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb1ff4af0be881813e8fbd85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 16 14:18:52 2013 +0200 wbemdisp: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/wbemdisp/Makefile.in | 6 ++++++ dlls/wbemdisp/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wbemdisp/wbemdisp.spec | 4 ++++ tools/wine.inf.in | 1 + 6 files changed, 49 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0cdfd36..c149359 100755 --- a/configure +++ b/configure @@ -16449,6 +16449,7 @@ wine_fn_config_dll vtdapi.vxd enable_win16 wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 +wine_fn_config_dll wbemdisp enable_wbemdisp wine_fn_config_dll wbemprox enable_wbemprox wine_fn_config_test dlls/wbemprox/tests wbemprox_test wine_fn_config_dll webservices enable_webservices implib diff --git a/configure.ac b/configure.ac index 07ee2f0..b9de304 100644 --- a/configure.ac +++ b/configure.ac @@ -3089,6 +3089,7 @@ WINE_CONFIG_DLL(vtdapi.vxd,enable_win16) WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) +WINE_CONFIG_DLL(wbemdisp) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_TEST(dlls/wbemprox/tests) WINE_CONFIG_DLL(webservices,,[implib]) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in new file mode 100644 index 0000000..93812cb --- /dev/null +++ b/dlls/wbemdisp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wbemdisp.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c new file mode 100644 index 0000000..83bd1eb --- /dev/null +++ b/dlls/wbemdisp/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2013 Hans Leidekker 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 + */ + +#include "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} diff --git a/dlls/wbemdisp/wbemdisp.spec b/dlls/wbemdisp/wbemdisp.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/wbemdisp/wbemdisp.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 75172f9..fcd32cf 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2535,6 +2535,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,shdocvw.dll 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe +11,wbem,wbemdisp.dll 11,wbem,wbemprox.dll 11,wbem,wmic.exe 11,wbem,wmiutils.dll

1 0