July 2011 - Wine-commits - list.winehq.org

Jay Yang : shell32: Implement SHEmptyRecycleBin.
by Alexandre Julliard 11 Jul '11

11 Jul '11

1 0

Jay Yang : shell32: Have RecycleBin implement ISFHelper.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 47ca9b5c9e0d0f43d719b9686e4682f0c04a8678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ca9b5c9e0d0f43d719b9686… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Fri Jul 8 10:46:57 2011 -0400 shell32: Have RecycleBin implement ISFHelper. --- dlls/shell32/recyclebin.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 89befde..d199dec 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -35,6 +35,7 @@ #include "shlwapi.h" #include "shlobj.h" #include "shresdef.h" +#include "shellfolder.h" #include "shellapi.h" #include "knownfolders.h" #include "wine/debug.h" @@ -104,6 +105,7 @@ typedef struct tagRecycleBin { IShellFolder2 IShellFolder2_iface; IPersistFolder2 IPersistFolder2_iface; + ISFHelper ISFHelper_iface; LONG refCount; LPITEMIDLIST pidl; @@ -111,6 +113,7 @@ typedef struct tagRecycleBin static const IShellFolder2Vtbl recycleBinVtbl; static const IPersistFolder2Vtbl recycleBinPersistVtbl; +static const ISFHelperVtbl sfhelperVtbl; static inline RecycleBin *impl_from_IShellFolder2(IShellFolder2 *iface) { @@ -122,6 +125,11 @@ static RecycleBin *impl_from_IPersistFolder2(IPersistFolder2 *iface) return CONTAINING_RECORD(iface, RecycleBin, IPersistFolder2_iface); } +static RecycleBin *impl_from_ISFHelper(ISFHelper *iface) +{ + return CONTAINING_RECORD(iface, RecycleBin, ISFHelper_iface); +} + static void RecycleBin_Destructor(RecycleBin *This); HRESULT WINAPI RecycleBin_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput) @@ -137,6 +145,7 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID * ZeroMemory(obj, sizeof(RecycleBin)); obj->IShellFolder2_iface.lpVtbl = &recycleBinVtbl; obj->IPersistFolder2_iface.lpVtbl = &recycleBinPersistVtbl; + obj->ISFHelper_iface.lpVtbl = &sfhelperVtbl; if (FAILED(ret = IPersistFolder2_QueryInterface(&obj->IPersistFolder2_iface, riid, ppOutput))) { RecycleBin_Destructor(obj); @@ -166,6 +175,8 @@ static HRESULT WINAPI RecycleBin_QueryInterface(IShellFolder2 *iface, REFIID rii if (IsEqualGUID(riid, &IID_IPersist) || IsEqualGUID(riid, &IID_IPersistFolder) || IsEqualGUID(riid, &IID_IPersistFolder2)) *ppvObject = &This->IPersistFolder2_iface; + if (IsEqualGUID(riid, &IID_ISFHelper)) + *ppvObject = &This->ISFHelper_iface; if (*ppvObject != NULL) { @@ -527,6 +538,42 @@ static const IPersistFolder2Vtbl recycleBinPersistVtbl = RecycleBin_GetCurFolder }; +static HRESULT WINAPI RecycleBin_ISFHelper_QueryInterface(ISFHelper *iface, REFIID riid, + void **ppvObject) +{ + RecycleBin *This = impl_from_ISFHelper(iface); + + return RecycleBin_QueryInterface(&This->IShellFolder2_iface, riid, ppvObject); +} + +static ULONG WINAPI RecycleBin_ISFHelper_AddRef(ISFHelper *iface) +{ + RecycleBin *This = impl_from_ISFHelper(iface); + + return RecycleBin_AddRef(&This->IShellFolder2_iface); +} + +static ULONG WINAPI RecycleBin_ISFHelper_Release(ISFHelper *iface) +{ + RecycleBin *This = impl_from_ISFHelper(iface); + + return RecycleBin_Release(&This->IShellFolder2_iface); +} + +static HRESULT WINAPI RecycleBin_GetUniqueName(ISFHelper *iface,LPWSTR lpName, + UINT uLen) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI RecycleBin_AddFolder(ISFHelper * iface, HWND hwnd, + LPCWSTR pwszName, + LPITEMIDLIST * ppidlOut) +{ + /*Adding folders doesn't make sense in the recycle bin*/ + return E_NOTIMPL; +} + HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, BOOL confirm) { UINT i=0; @@ -579,6 +626,31 @@ HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, BOOL con return S_OK; } +static HRESULT WINAPI RecycleBin_DeleteItems(ISFHelper * iface, UINT cidl, + LPCITEMIDLIST * apidl) +{ + TRACE("(%p,%u,%p)\n",iface,cidl,apidl); + return erase_items(GetActiveWindow(),apidl,cidl,TRUE); +} + +static HRESULT WINAPI RecycleBin_CopyItems(ISFHelper * iface, + IShellFolder * pSFFrom, + UINT cidl, LPCITEMIDLIST * apidl) +{ + return E_NOTIMPL; +} + +static const ISFHelperVtbl sfhelperVtbl = +{ + RecycleBin_ISFHelper_QueryInterface, + RecycleBin_ISFHelper_AddRef, + RecycleBin_ISFHelper_Release, + RecycleBin_GetUniqueName, + RecycleBin_AddFolder, + RecycleBin_DeleteItems, + RecycleBin_CopyItems +}; + HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) { WCHAR wszRootPath[MAX_PATH];

1 0

Aric Stewart : usp10: Add missing Bengali entry.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 94e057dde557cc38fd7f73c4645bff3776b55783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e057dde557cc38fd7f73c46… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 8 11:40:24 2011 -0500 usp10: Add missing Bengali entry. --- dlls/usp10/shape.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 334a063..01154d9 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -553,6 +553,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ devanagari_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, {{ devanagari_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ devanagari_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, {{ devanagari_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, {{ devanagari_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, {{ devanagari_features, 6}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati},

1 0

Christian Inci : setupapi: Fix return behaviour when the device key doesn' t exist.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 309914f315ff95b8b5af36e0cb76a5513bedbc73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=309914f315ff95b8b5af36e0c… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Fri Jul 8 18:43:59 2011 +0200 setupapi: Fix return behaviour when the device key doesn't exist. --- dlls/setupapi/devinst.c | 7 ++++++- dlls/setupapi/tests/devinst.c | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9176554..73a67ee 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3728,8 +3728,13 @@ static HKEY SETUPDI_OpenDrvKey(struct DeviceInfo *devInfo, REGSAM samDesired) WCHAR devId[10]; sprintfW(devId, fmt, devInfo->devId); - RegOpenKeyExW(classKey, devId, 0, samDesired, &key); + l = RegOpenKeyExW(classKey, devId, 0, samDesired, &key); RegCloseKey(classKey); + if (l) + { + SetLastError(ERROR_KEY_DOES_NOT_EXIST); + return INVALID_HANDLE_VALUE; + } } return key; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3c01f32..df4a407 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -974,7 +974,6 @@ static void testDevRegKey(void) key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); /* The software key isn't created by default */ - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Expected ERROR_KEY_DOES_NOT_EXIST, got %08x\n", GetLastError());

1 0

Ričardas Barkauskas : wined3d: Introduce quirk for proper RGBA16 support.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 6c5e109af7184ee557aa24c676cc78f3e92e6782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5e109af7184ee557aa24c67… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Jul 8 22:11:29 2011 +0300 wined3d: Introduce quirk for proper RGBA16 support. --- dlls/wined3d/directx.c | 50 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8453af1..1430444 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -753,6 +753,36 @@ static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const ch return *(DWORD *)data == 0x11111111; } +/* Context activation is done by the caller. */ +static BOOL match_broken_rgba16(const struct wined3d_gl_info *gl_info, const char *gl_renderer, + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + /* GL_RGBA16 uses GL_RGBA8 internally on Geforce 7 and older cards. + * This leads to graphical bugs in Half Life 2 and Unreal engine games. */ + GLuint tex; + GLint size; + + ENTER_GL(); + + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16, 4, 4, 0, GL_RGBA, GL_UNSIGNED_SHORT, NULL); + checkGLcall("glTexImage2D"); + + glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_RED_SIZE, &size); + checkGLcall("glGetTexLevelParameteriv"); + TRACE("Real color depth is %d\n", size); + + glBindTexture(GL_TEXTURE_2D, 0); + checkGLcall("glBindTexture"); + glDeleteTextures(1, &tex); + checkGLcall("glDeleteTextures"); + + LEAVE_GL(); + + return size < 16; +} + static void quirk_arb_constants(struct wined3d_gl_info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->limits.arb_vs_native_constants); @@ -886,6 +916,11 @@ static void quirk_fbo_tex_update(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_FBO_TEX_UPDATE; } +static void quirk_broken_rgba16(struct wined3d_gl_info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_BROKEN_RGBA16; +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, @@ -970,6 +1005,11 @@ static const struct driver_quirk quirk_table[] = quirk_fbo_tex_update, "FBO rebind for attachment updates" }, + { + match_broken_rgba16, + quirk_broken_rgba16, + "True RGBA16 is not available" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, @@ -3504,8 +3544,16 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const TRACE_(d3d_caps)("[FAILED]\n"); return FALSE; - /* Not supported */ case WINED3DFMT_R16G16B16A16_UNORM: + if (gl_info->quirks & WINED3D_QUIRK_BROKEN_RGBA16) + { + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + + /* Not supported */ case WINED3DFMT_B2G3R3A8_UNORM: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 374c631..c2cb075 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -51,6 +51,7 @@ #define WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA 0x00000008 #define WINED3D_QUIRK_NV_CLIP_BROKEN 0x00000010 #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 +#define WINED3D_QUIRK_BROKEN_RGBA16 0x00000040 /* Texture format fixups */

1 0

Frédéric Delanoy : French translation for release 1.3.24
by Jeremy Newman 08 Jul '11

08 Jul '11

Module: website Branch: master Commit: b5a769548cc5051af9172c76bdb0401b728e6f9a URL: http://source.winehq.org/git/website.git/?a=commit;h=b5a769548cc5051af9172c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 8 21:38:13 2011 +0200 French translation for release 1.3.24 --- news/fr/2011070801.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011070801.xml b/news/fr/2011070801.xml new file mode 100644 index 0000000..055c600 --- /dev/null +++ b/news/fr/2011070801.xml @@ -0,0 +1,20 @@ +<news> +<date>8 juillet 2011</date> +<title>Sortie de Wine 1.3.24</title> +<body> + La version de développement 1.3.24 de Wine est disponible. + <a href="{$root}/announce/1.3.24">Nouveautés</a> de cette version : +<ul> + <li>Diverses améliorations dans DirectInput.</li> + <li>Prise en charge du retour à la ligne automatique dans Uniscribe.</li> + <li>Éléments d'interface graphique additionnels dans le shell Explorer intégré.</li> + <li>Davantage de fonctions D3DX9.</li> + <li>Prise en charge améliorée des dossiers shell bien connus.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.24.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.3.24 freigegeben
by Jeremy Newman 08 Jul '11

08 Jul '11

Module: website Branch: master Commit: aae8ea254d3a7810f460f405c19b9aa4d148163c URL: http://source.winehq.org/git/website.git/?a=commit;h=aae8ea254d3a7810f460f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 8 21:01:22 2011 +0200 Wine 1.3.24 freigegeben --- news/de/2011070801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011070801.xml b/news/de/2011070801.xml new file mode 100644 index 0000000..f532d04 --- /dev/null +++ b/news/de/2011070801.xml @@ -0,0 +1,17 @@ +<news> +<date>8. Juli 2011</date> +<title>Wine 1.3.24 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verschiedene DirectInput Verbesserungen.</li> + <li>Unterstützung für Zeilenumbruch in Uniscribe.</li> + <li>Mehr UI Elemente im eigenen Shell Explorer.</li> + <li>Ein paar neue D3DX9 Funktionen.</li> + <li>Verbesserte Unterstützung für Shell Known Folders.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.24.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.24
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: website Branch: master Commit: 8f82d65920c91e2c74ca3b22d54b4221dc164fe8 URL: http://source.winehq.org/git/website.git/?a=commit;h=8f82d65920c91e2c74ca3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 20:46:33 2011 +0200 Wine release 1.3.24 --- news/en/2011070801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011070801.xml b/news/en/2011070801.xml new file mode 100644 index 0000000..e1bb456 --- /dev/null +++ b/news/en/2011070801.xml @@ -0,0 +1,17 @@ +<news> +<date>July 8, 2011</date> +<title>Wine 1.3.24 Released</title> +<body> + The Wine development release 1.3.24 is now available. + <a href="{$root}/announce/1.3.24">What's new</a> in this release: +<ul> + <li>Various DirectInput improvements.</li> + <li>Support for line breaking in Uniscribe.</li> + <li>More UI elements in builtin Shell Explorer.</li> + <li>Some more D3DX9 functions.</li> + <li>Improved support for shell known folders.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.24.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.24.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: a3965c7ea017480a21ec934753bf4135c571a9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3965c7ea017480a21ec93475… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 20:37:06 2011 +0200 Release 1.3.24. --- ANNOUNCE | 1039 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 505 insertions(+), 554 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3965c7ea017480a21ec9…

1 0

Tag wine-1.3.24 : Alexandre Julliard : Release 1.3.24
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: refs/tags/wine-1.3.24 Tag: 9e7e938fd6614a07f4270feb4a47da90975bded7 URL: http://source.winehq.org/git/wine.git/?a=tag;h=9e7e938fd6614a07f4270feb4a47… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 20:37:07 2011 +0200 Release 1.3.24

1 0