March 2009 - Wine-commits - list.winehq.org

Aric Stewart : msi: Reorder the condition operators so that longer strings are matched first.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 39600d9d2e3e5fb7cd34d913f1870d8d6f0362de URL: http://source.winehq.org/git/wine.git/?a=commit;h=39600d9d2e3e5fb7cd34d913f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 16 11:05:11 2009 -0500 msi: Reorder the condition operators so that longer strings are matched first. This allows ~<< to be properly matched. --- dlls/msi/cond.y | 4 ++-- dlls/msi/tests/package.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 7eb48c5..8831208 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -553,14 +553,14 @@ static int COND_GetOperator( COND_input *cond ) const WCHAR str[4]; int id; } table[] = { - { {'~','=',0}, COND_IEQ }, { {'~','<','=',0}, COND_ILE }, { {'~','>','<',0}, COND_ISS }, { {'~','>','>',0}, COND_IRHS }, { {'~','<','>',0}, COND_INE }, - { {'~','<',0}, COND_ILT }, { {'~','>','=',0}, COND_IGE }, { {'~','<','<',0}, COND_ILHS }, + { {'~','=',0}, COND_IEQ }, + { {'~','<',0}, COND_ILT }, { {'~','>',0}, COND_IGT }, { {'>','=',0}, COND_GE }, { {'>','<',0}, COND_SS }, diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3cb5d1d..2696dc2 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1072,6 +1072,15 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "not LicView"); ok( r == MSICONDITION_TRUE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "\"Testing\" ~<< \"Testing\""); + ok (r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "LicView ~<< \"Testing\""); + ok (r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "Not LicView ~<< \"Testing\""); + ok (r == MSICONDITION_TRUE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "not \"A\""); ok( r == MSICONDITION_FALSE, "wrong return val\n");

1 0

Robert Reif : dsound: Fix uninitialized variable.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: c2d6ce85d058b8496b9177b62afce491fd5d3a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d6ce85d058b8496b9177b62… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Mar 17 10:20:05 2009 -0400 dsound: Fix uninitialized variable. I missed one case when converting over to static GUIDs in a previous patch. Pointed out by Andrew Talbot. --- dlls/dsound/propset.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 4b6d77e..85bbbae 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -405,7 +405,7 @@ static HRESULT DSPROPERTY_Description1( PULONG pcbReturned ) { HRESULT err; - GUID guid, dev_guid; + GUID dev_guid; PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA ppd; TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); @@ -474,7 +474,7 @@ static HRESULT DSPROPERTY_Description1( ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; widn = waveInGetNumDevs(); for (wid = 0; wid < widn; wid++) { - if (IsEqualGUID( &dev_guid, &guid) ) { + if (IsEqualGUID( &dev_guid, &DSOUND_capture_guids[wid] ) ) { DSDRIVERDESC desc; ppd->WaveDeviceId = wid; ppd->Devnode = wid;

1 0

Henri Verbeet : d3d9: Get rid of basetexture.c.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 82dd5bc2a107fbe8baa4ea7e421d63a502dc06d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd5bc2a107fbe8baa4ea7e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d9: Get rid of basetexture.c. --- dlls/d3d9/Makefile.in | 1 - dlls/d3d9/basetexture.c | 172 ---------------------------------------------- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 2 - 4 files changed, 1 insertions(+), 176 deletions(-) diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in index f581b68..a9ec68d 100644 --- a/dlls/d3d9/Makefile.in +++ b/dlls/d3d9/Makefile.in @@ -7,7 +7,6 @@ IMPORTLIB = d3d9 IMPORTS = dxguid uuid wined3d kernel32 C_SRCS = \ - basetexture.c \ cubetexture.c \ d3d9_main.c \ device.c \ diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c deleted file mode 100644 index b349f51..0000000 --- a/dlls/d3d9/basetexture.c +++ /dev/null @@ -1,172 +0,0 @@ -/* - * IDirect3DBaseTexture9 implementation - * - * Copyright 2002-2004 Jason Edmeades - * Raphael Junqueira - * - * 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 "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); - -/* IDirect3DBaseTexture9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DBaseTexture9Impl_QueryInterface(LPDIRECT3DBASETEXTURE9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)) { - IDirect3DBaseTexture9_AddRef(iface); - *ppobj = This; - return S_OK; - } - - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - *ppobj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirect3DBaseTexture9Impl_AddRef(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - return ref; -} - -static ULONG WINAPI IDirect3DBaseTexture9Impl_Release(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) : ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - IWineD3DBaseTexture_Release(This->wineD3DBaseTexture); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} - -/* IDirect3DBaseTexture9 IDirect3DResource9 Interface follow: */ -static HRESULT WINAPI IDirect3DBaseTexture9Impl_GetDevice(LPDIRECT3DBASETEXTURE9 iface, IDirect3DDevice9** ppDevice) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_SetPrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetPrivateData(This->wineD3DBaseTexture, refguid, pData, SizeOfData, Flags); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_GetPrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetPrivateData(This->wineD3DBaseTexture, refguid, pData, pSizeOfData); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_FreePrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_FreePrivateData(This->wineD3DBaseTexture, refguid); -} - -static DWORD WINAPI IDirect3DBaseTexture9Impl_SetPriority(LPDIRECT3DBASETEXTURE9 iface, DWORD PriorityNew) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetPriority(This->wineD3DBaseTexture, PriorityNew); -} - -static DWORD WINAPI IDirect3DBaseTexture9Impl_GetPriority(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetPriority(This->wineD3DBaseTexture); -} - -static void WINAPI IDirect3DBaseTexture9Impl_PreLoad(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - IWineD3DBaseTexture_PreLoad(This->wineD3DBaseTexture); - return ; -} - -static D3DRESOURCETYPE WINAPI IDirect3DBaseTexture9Impl_GetType(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetType(This->wineD3DBaseTexture); -} - -/* IDirect3DBaseTexture9 Interface follow: */ -static DWORD WINAPI IDirect3DBaseTexture9Impl_SetLOD(LPDIRECT3DBASETEXTURE9 iface, DWORD LODNew) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetLOD(This->wineD3DBaseTexture, LODNew); -} - -DWORD WINAPI IDirect3DBaseTexture9Impl_GetLOD(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetLOD(This->wineD3DBaseTexture); -} - -static DWORD WINAPI IDirect3DBaseTexture9Impl_GetLevelCount(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetLevelCount(This->wineD3DBaseTexture); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_SetAutoGenFilterType(LPDIRECT3DBASETEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetAutoGenFilterType(This->wineD3DBaseTexture, (WINED3DTEXTUREFILTERTYPE) FilterType); -} - -static D3DTEXTUREFILTERTYPE WINAPI IDirect3DBaseTexture9Impl_GetAutoGenFilterType(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return (D3DTEXTUREFILTERTYPE) IWineD3DBaseTexture_GetAutoGenFilterType(This->wineD3DBaseTexture); -} - -static void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - IWineD3DBaseTexture_GenerateMipSubLevels(This->wineD3DBaseTexture); -} - -const IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl = -{ - IDirect3DBaseTexture9Impl_QueryInterface, - IDirect3DBaseTexture9Impl_AddRef, - IDirect3DBaseTexture9Impl_Release, - IDirect3DBaseTexture9Impl_GetDevice, - IDirect3DBaseTexture9Impl_SetPrivateData, - IDirect3DBaseTexture9Impl_GetPrivateData, - IDirect3DBaseTexture9Impl_FreePrivateData, - IDirect3DBaseTexture9Impl_SetPriority, - IDirect3DBaseTexture9Impl_GetPriority, - IDirect3DBaseTexture9Impl_PreLoad, - IDirect3DBaseTexture9Impl_GetType, - IDirect3DBaseTexture9Impl_SetLOD, - IDirect3DBaseTexture9Impl_GetLOD, - IDirect3DBaseTexture9Impl_GetLevelCount, - IDirect3DBaseTexture9Impl_SetAutoGenFilterType, - IDirect3DBaseTexture9Impl_GetAutoGenFilterType, - IDirect3DBaseTexture9Impl_GenerateMipSubLevels -}; diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 430d5de..77a5070 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -176,7 +176,7 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLOD(LPDIRECT3DCUBETEXTURE9 ifac TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d9_cs); - ret = IDirect3DBaseTexture9Impl_GetLOD((LPDIRECT3DBASETEXTURE9) This); + ret = IWineD3DCubeTexture_GetLOD(This->wineD3DCubeTexture); LeaveCriticalSection(&d3d9_cs); return ret; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 2a4b10d..1885ead 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -389,8 +389,6 @@ typedef struct IDirect3DBaseTexture9Impl } IDirect3DBaseTexture9Impl; -extern DWORD WINAPI IDirect3DBaseTexture9Impl_GetLOD(LPDIRECT3DBASETEXTURE9 iface); - /* --------------------- */ /* IDirect3DCubeTexture9 */ /* --------------------- */

1 0

Henri Verbeet : d3d9: Get rid of resource.c.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 435b528e8314ce878eead89901a058915bbae347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435b528e8314ce878eead8990… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d9: Get rid of resource.c. --- dlls/d3d9/Makefile.in | 1 - dlls/d3d9/cubetexture.c | 8 ++- dlls/d3d9/d3d9_private.h | 20 ------- dlls/d3d9/indexbuffer.c | 8 ++- dlls/d3d9/resource.c | 135 --------------------------------------------- dlls/d3d9/stateblock.c | 8 ++- dlls/d3d9/surface.c | 8 ++- dlls/d3d9/texture.c | 8 ++- dlls/d3d9/vertexbuffer.c | 8 ++- dlls/d3d9/volumetexture.c | 15 +++++- 10 files changed, 56 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=435b528e8314ce878eead…

1 0

Henri Verbeet : d3d9: Fix locking.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: fd3d769a12b018a29ccdcc4779f2f227d4a41904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3d769a12b018a29ccdcc477… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d9: Fix locking. It appears there are some calls to wined3d missing critical sections. --- dlls/d3d9/device.c | 35 +++++---- dlls/d3d9/directx.c | 3 + dlls/d3d9/indexbuffer.c | 2 + dlls/d3d9/pixelshader.c | 9 ++- dlls/d3d9/swapchain.c | 9 ++- dlls/d3d9/vertexbuffer.c | 9 ++- dlls/d3d9/volume.c | 69 ++++++++++++++++- dlls/d3d9/volumetexture.c | 184 +++++++++++++++++++++++++++++++++++++++++---- 8 files changed, 283 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd3d769a12b018a29ccdc…

1 0

Henri Verbeet : d3d8: Get rid of basetexture.c.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 7c0931b7c2beccb73d7a1674ca2414d717684130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0931b7c2beccb73d7a1674c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d8: Get rid of basetexture.c. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/basetexture.c | 164 ----------------------------------------------- 2 files changed, 0 insertions(+), 165 deletions(-) diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index 11a46fc..3d6c3cf 100644 --- a/dlls/d3d8/Makefile.in +++ b/dlls/d3d8/Makefile.in @@ -7,7 +7,6 @@ IMPORTLIB = d3d8 IMPORTS = dxguid uuid wined3d kernel32 C_SRCS = \ - basetexture.c \ cubetexture.c \ d3d8_main.c \ device.c \ diff --git a/dlls/d3d8/basetexture.c b/dlls/d3d8/basetexture.c deleted file mode 100644 index 122c22d..0000000 --- a/dlls/d3d8/basetexture.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * IDirect3DBaseTexture8 implementation - * - * Copyright 2005 Oliver Stieber - * - * 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 "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8); - -/* IDirect3DBaseTexture8 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DBaseTexture8Impl_QueryInterface(LPDIRECT3DBASETEXTURE8 iface, REFIID riid, LPVOID *ppobj) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - - *ppobj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirect3DBaseTexture8Impl_AddRef(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - return ref; -} - -static ULONG WINAPI IDirect3DBaseTexture8Impl_Release(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) : ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - IWineD3DBaseTexture_Release(This->wineD3DBaseTexture); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -/* IDirect3DBaseTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DBaseTexture8Impl_GetDevice(LPDIRECT3DBASETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); -} - -static HRESULT WINAPI IDirect3DBaseTexture8Impl_SetPrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_SetPrivateData(This->wineD3DBaseTexture, refguid, pData, SizeOfData, Flags); -} - -static HRESULT WINAPI IDirect3DBaseTexture8Impl_GetPrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetPrivateData(This->wineD3DBaseTexture, refguid, pData, pSizeOfData); -} - -static HRESULT WINAPI IDirect3DBaseTexture8Impl_FreePrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_FreePrivateData(This->wineD3DBaseTexture, refguid); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_SetPriority(LPDIRECT3DBASETEXTURE8 iface, DWORD PriorityNew) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_SetPriority(This->wineD3DBaseTexture, PriorityNew); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_GetPriority(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetPriority(This->wineD3DBaseTexture); -} - -static void WINAPI IDirect3DBaseTexture8Impl_PreLoad(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - IWineD3DBaseTexture_PreLoad(This->wineD3DBaseTexture); - return; -} - -static D3DRESOURCETYPE WINAPI IDirect3DBaseTexture8Impl_GetType(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetType(This->wineD3DBaseTexture); -} - -/* IDirect3DBaseTexture8 Interface follow: */ -static DWORD WINAPI IDirect3DBaseTexture8Impl_SetLOD(LPDIRECT3DBASETEXTURE8 iface, DWORD LODNew) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_SetLOD(This->wineD3DBaseTexture, LODNew); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_GetLOD(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetLOD(This->wineD3DBaseTexture); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_GetLevelCount(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetLevelCount(This->wineD3DBaseTexture); -} - -const IDirect3DBaseTexture8Vtbl Direct3DBaseTexture8_Vtbl = -{ - IDirect3DBaseTexture8Impl_QueryInterface, - IDirect3DBaseTexture8Impl_AddRef, - IDirect3DBaseTexture8Impl_Release, - IDirect3DBaseTexture8Impl_GetDevice, - IDirect3DBaseTexture8Impl_SetPrivateData, - IDirect3DBaseTexture8Impl_GetPrivateData, - IDirect3DBaseTexture8Impl_FreePrivateData, - IDirect3DBaseTexture8Impl_SetPriority, - IDirect3DBaseTexture8Impl_GetPriority, - IDirect3DBaseTexture8Impl_PreLoad, - IDirect3DBaseTexture8Impl_GetType, - - IDirect3DBaseTexture8Impl_SetLOD, - IDirect3DBaseTexture8Impl_GetLOD, - IDirect3DBaseTexture8Impl_GetLevelCount -};

1 0

Henri Verbeet : d3d8: Get rid of resource.c.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 72b53787582dbeb31bf090aab360e65c722f3cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b53787582dbeb31bf090aab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d8: Get rid of resource.c. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/cubetexture.c | 8 +++- dlls/d3d8/d3d8_private.h | 1 - dlls/d3d8/indexbuffer.c | 8 +++- dlls/d3d8/resource.c | 133 --------------------------------------------- dlls/d3d8/stateblock.c | 19 ++++++- dlls/d3d8/surface.c | 8 +++- dlls/d3d8/texture.c | 8 +++- dlls/d3d8/vertexbuffer.c | 8 +++- dlls/d3d8/volumetexture.c | 8 +++- 10 files changed, 59 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72b53787582dbeb31bf09…

1 0

Roderick Colenbrander : wined3d: Add WGL_ARB_pixel_format detection.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 9181ddcd167b01983ac1682968ab4be427b35d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9181ddcd167b01983ac168296… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 15 10:01:43 2009 +0100 wined3d: Add WGL_ARB_pixel_format detection. Right now we assume that the extension is there but this isn't always the case. The next patch in this series will add a non-WGL_ARB_pixel_format codepath to help VirtualBox and others. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2ec60d4..4a6a1b1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1434,6 +1434,10 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->supported[WGL_ARB_PBUFFER] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_ARB_pbuffer support\n"); } + if (!strcmp(ThisExtn, "WGL_ARB_pixel_format")) { + gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); + } if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3aa23e1..06d2f47 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3462,6 +3462,7 @@ typedef enum _GL_SupportedExt { /* WGL extensions */ WGL_ARB_PBUFFER, + WGL_ARB_PIXEL_FORMAT, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, OPENGL_SUPPORTED_EXT_END

1 0

Roderick Colenbrander : wined3d: Add a classic WGL pixel format backend as not all OpenGL implementations support WGL_ARB_pixel_format .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 4544efc9724fd49e2dec9544971bd8069f1ee145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4544efc9724fd49e2dec95449… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 15 11:30:10 2009 +0100 wined3d: Add a classic WGL pixel format backend as not all OpenGL implementations support WGL_ARB_pixel_format. This should help for instance VirtualBox. --- dlls/wined3d/directx.c | 170 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 114 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4544efc9724fd49e2dec9…

1 0

Dylan Smith : richedit: Add bounds checks for EM_GETTEXTRANGE with tests.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: caca4860290013b8fcf63a101d314346f870cbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caca4860290013b8fcf63a101… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Mar 23 00:14:33 2009 -0400 richedit: Add bounds checks for EM_GETTEXTRANGE with tests. Wine was not doing bounds checks for EM_GETTEXTRANGE, which was causing a crash in Bug 17822. The added tests would cause a crash without the added bounds checks in the richedit code. The bounds checks I put in HandleMessage, since ME_GetTextRange is also called for ME_GETSELTEXT which should not have bounds checks, since it uses the selection range. When the ME_GETTEXTRANGE message returns 0, no text is copied, not even the NULL terminating charter. This differs from EM_GETSELTEXT which will copy the NULL terminating character when no text is selected. This behaviour is consistent with native richedit controls. --- dlls/riched20/editor.c | 36 ++++++++++++++++++------------------ dlls/riched20/tests/editor.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c9cb244..00fc38e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1906,20 +1906,16 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) } } -static int ME_GetTextRange(ME_TextEditor *editor, TEXTRANGEW *rng, BOOL unicode) +static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, + int start, int nLen, BOOL unicode) { - if (unicode) - return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, - rng->chrg.cpMax-rng->chrg.cpMin, 0); - else - { - int nLen = rng->chrg.cpMax-rng->chrg.cpMin; + if (unicode) { + return ME_GetTextW(editor, strText, start, nLen, 0); + } else { WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); - int nChars = ME_GetTextW(editor, p, rng->chrg.cpMin, nLen, 0); - /* FIXME this is a potential security hole (buffer overrun) - if you know more about wchar->mbyte conversion please explain - */ - WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)rng->lpstrText, nLen+1, NULL, NULL); + int nChars = ME_GetTextW(editor, p, start, nLen, 0); + WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, + nLen+1, NULL, NULL); FREE_OBJ(p); return nChars; } @@ -3580,12 +3576,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETSELTEXT: { int from, to; - TEXTRANGEW tr; /* W and A differ only by rng->lpstrText */ ME_GetSelection(editor, &from, &to); - tr.chrg.cpMin = from; - tr.chrg.cpMax = to; - tr.lpstrText = (WCHAR *)lParam; - return ME_GetTextRange(editor, &tr, unicode); + return ME_GetTextRange(editor, (WCHAR *)lParam, from, + to - from, unicode); } case EM_GETSCROLLPOS: { @@ -3597,10 +3590,17 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETTEXTRANGE: { TEXTRANGEW *rng = (TEXTRANGEW *)lParam; + int start = rng->chrg.cpMin; + int end = rng->chrg.cpMax; + int textlength = ME_GetTextLength(editor); TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d emul1.0=%d length=%d\n", rng->chrg.cpMin, rng->chrg.cpMax, unicode, editor->bEmulateVersion10, ME_GetTextLength(editor)); - return ME_GetTextRange(editor, rng, unicode); + if (start < 0) return 0; + if ((start == 0 && end == -1) || end > textlength) + end = textlength; + if (start >= end) return 0; + return ME_GetTextRange(editor, rng->lpstrText, start, end - start, unicode); } case EM_GETLINE: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 331fd69..40d0045 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1420,6 +1420,46 @@ static void test_EM_GETTEXTRANGE(void) ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* cpMax of text length is used instead of -1 in this case */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 0; + textRange.chrg.cpMax = -1; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == strlen(text2), "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* cpMin < 0 causes no text to be copied, and 0 to be returned */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = -1; + textRange.chrg.cpMax = 1; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 0, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* cpMax of -1 is not replaced with text length if cpMin != 0 */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 1; + textRange.chrg.cpMax = -1; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 0, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* no end character is copied if cpMax - cpMin < 0 */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 5; + textRange.chrg.cpMax = 5; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 0, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* cpMax of text length is used if cpMax > text length*/ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 0; + textRange.chrg.cpMax = 1000; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == strlen(text2), "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + DestroyWindow(hwndRichEdit); }

1 0