wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Paul Vriens : dinput: Don't check a parameter twice (Coccinelle).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: ff4047a956ab6da62b11ed765b9dd636e06af5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4047a956ab6da62b11ed765… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 12 13:52:23 2010 +0100 dinput: Don't check a parameter twice (Coccinelle). --- dlls/dinput/joystick_osx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 57a8559..bc6908b 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -257,9 +257,6 @@ static int get_osx_device_name(int id, char *name, int length) tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, id ); - if (!tIOHIDDeviceRef) - return 0; - if (name) name[0] = 0;

1 0

Paul Vriens : winealsa.drv: Don't check input parameter twice (Coccinelle).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 46abd44f0eda75ab619c42c94a67e58ac509be07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46abd44f0eda75ab619c42c94… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 12 13:47:04 2010 +0100 winealsa.drv: Don't check input parameter twice (Coccinelle). --- dlls/winealsa.drv/waveout.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 3476f59..5c3787b 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -1069,9 +1069,6 @@ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) wwo = &WOutDev[wDevID]; - if (lpdwVol == NULL) - return MMSYSERR_NOTENABLED; - rc = ALSA_CheckSetVolume(wwo->hctl, &left, &right, &min, &max, NULL, NULL, NULL); if (rc == MMSYSERR_NOERROR) {

1 0

Paul Vriens : rsaenh/tests: Don't check result twice (Coccinelle).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 8a737bc1ba305cc664f7bf85425251269f571274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a737bc1ba305cc664f7bf854… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 12 13:42:51 2010 +0100 rsaenh/tests: Don't check result twice (Coccinelle). --- dlls/rsaenh/tests/rsaenh.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 83ec872..94da116 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -275,7 +275,6 @@ static BOOL derive_key(ALG_ID aiAlgid, HCRYPTKEY *phKey, DWORD len) return FALSE; } ok(result, "%08x\n", GetLastError()); - if (!result) return FALSE; result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); if (!result) return FALSE;

1 0

Paul Vriens : dsound: Fix a typo.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 0d302bb60c84059a28ddf55f1ac62eb09b260b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d302bb60c84059a28ddf55f1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 12 11:28:33 2010 +0100 dsound: Fix a typo. --- dlls/dsound/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 26c86b8..f089313 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1249,7 +1249,7 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( /* FIXME: We can only have one buffer so what do we do here? */ if (This->device->capture_buffer) { - WARN("lnvalid parameter: already has buffer\n"); + WARN("invalid parameter: already has buffer\n"); return DSERR_INVALIDPARAM; /* DSERR_GENERIC ? */ }

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMDevice3.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 5b3d53394a242dcd95a4f7ace0575cd6f4565098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3d53394a242dcd95a4f7ace… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 12 11:30:11 2010 +0100 d3drm: Add definitions for IDirect3DRMDevice3. --- include/d3drmobj.h | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b3d53394a242dcd95a4f…

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMDevice2.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: d0221af7cee904e8efb6cbbc7a15c4cc67ee491c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0221af7cee904e8efb6cbbc7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 12 11:30:04 2010 +0100 d3drm: Add definitions for IDirect3DRMDevice2. --- include/d3drmobj.h | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0221af7cee904e8efb6c…

1 0

Christian Costa : d3drm: Fix IDirect3DRMDevice macros.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 08a053a7e99d5dffec21a5ef1ac4a8b11bef9e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a053a7e99d5dffec21a5ef1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 12 11:29:58 2010 +0100 d3drm: Fix IDirect3DRMDevice macros. --- include/d3drmobj.h | 136 ++++++++++++++++++++++++++-------------------------- 1 files changed, 68 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08a053a7e99d5dffec21a…

1 0

Christian Costa : d3drm: Fix IDirect3DRMObject2 macros.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: a2dcf654af4d3c2d7144dc8c39af74147b0791f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2dcf654af4d3c2d7144dc8c3… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 12 11:29:52 2010 +0100 d3drm: Fix IDirect3DRMObject2 macros. --- include/d3drmobj.h | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7921eb9..86cac7e 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -193,34 +193,34 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown) #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ -#define IDirect3DRMObject_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirect3DRMObject_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirect3DRMObject_Release(p) (p)->lpVtbl->Release(p) +#define IDirect3DRMObject2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DRMObject2_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DRMObject2_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRMObject2 methods ***/ -#define IDirect3DRMObject_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) -#define IDirect3DRMObject_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) -#define IDirect3DRMObject_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) -#define IDirect3DRMObject_GetClientData(p,a,b) (p)->lpVtbl->SetClientData(p,a,b) -#define IDirect3DRMObject_GetDirect3DRM(p,a) (p)->lpVtbl->GetDirect3DRM(p,a) -#define IDirect3DRMObject_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) -#define IDirect3DRMObject_SetClientData(p,a,b,c) (p)->lpVtbl->SetClientData(p,a,b,c) -#define IDirect3DRMObject_SetName(p,a) (p)->lpVtbl->SetName(p,a) -#define IDirect3DRMObject_GetAge(p,a,b) (p)->lpVtbl->GetAge(p,a,b) +#define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) +#define IDirect3DRMObject2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) +#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) +#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->lpVtbl->SetClientData(p,a,b) +#define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->lpVtbl->GetDirect3DRM(p,a) +#define IDirect3DRMObject2_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) +#define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->lpVtbl->SetClientData(p,a,b,c) +#define IDirect3DRMObject2_SetName(p,a) (p)->lpVtbl->SetName(p,a) +#define IDirect3DRMObject2_GetAge(p,a,b) (p)->lpVtbl->GetAge(p,a,b) #else /*** IUnknown methods ***/ -#define IDirect3DRMObject_QueryInterface(p,a,b) (p)->QueryInterface(a,b) -#define IDirect3DRMObject_AddRef(p) (p)->AddRef() -#define IDirect3DRMObject_Release(p) (p)->Release() +#define IDirect3DRMObject2_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirect3DRMObject2_AddRef(p) (p)->AddRef() +#define IDirect3DRMObject2_Release(p) (p)->Release() /*** IDirect3DRMObject2 methods ***/ -#define IDirect3DRMObject_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b) -#define IDirect3DRMObject_Clone(p,a,b,c) (p)->Clone(a,b,c) -#define IDirect3DRMObject_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b) -#define IDirect3DRMObject_GetClientData(p,a,b) (p)->SetClientData(a,b) -#define IDirect3DRMObject_GetDirect3DRM(p,a) (p)->GetDirect3DRM(a) -#define IDirect3DRMObject_GetName(p,a,b) (p)->GetName(a,b) -#define IDirect3DRMObject_SetClientData(p,a,b,c) (p)->SetClientData(a,b,c) -#define IDirect3DRMObject_SetName(p,a) (p)->SetName(a) -#define IDirect3DRMObject_GetAge(p,a,b) (p)->GetAge(a,b) +#define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b) +#define IDirect3DRMObject2_Clone(p,a,b,c) (p)->Clone(a,b,c) +#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b) +#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->SetClientData(a,b) +#define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->GetDirect3DRM(a) +#define IDirect3DRMObject2_GetName(p,a,b) (p)->GetName(a,b) +#define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->SetClientData(a,b,c) +#define IDirect3DRMObject2_SetName(p,a) (p)->SetName(a) +#define IDirect3DRMObject2_GetAge(p,a,b) (p)->GetAge(a,b) #endif /*****************************************************************************

1 0

Christian Costa : amstream: Simplify declaration of VTable members.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: d32ada8fa595d05d8af4f0050ff5390751d626e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32ada8fa595d05d8af4f0050… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 12 09:55:36 2010 +0100 amstream: Simplify declaration of VTable members. --- dlls/amstream/amstream.c | 4 ++-- dlls/amstream/mediastream.c | 8 ++++---- dlls/amstream/mediastreamfilter.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 81584d6..f8ae2a6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IAMMultiMediaStream lpVtbl; + const IAMMultiMediaStreamVtbl *lpVtbl; LONG ref; IGraphBuilder* pFilterGraph; IPin* ipin; @@ -63,7 +63,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &AM_Vtbl; + object->lpVtbl = &AM_Vtbl; object->ref = 1; *ppObj = object; diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 697b03b..dc4ec64 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IMediaStream lpVtbl; + const IMediaStreamVtbl *lpVtbl; LONG ref; IMultiMediaStream* Parent; MSPID PurposeId; @@ -44,7 +44,7 @@ typedef struct { } IMediaStreamImpl; typedef struct { - IDirectDrawMediaStream lpVtbl; + const IDirectDrawMediaStreamVtbl *lpVtbl; LONG ref; IMultiMediaStream* Parent; MSPID PurposeId; @@ -67,7 +67,7 @@ HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, S return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &MediaStream_Vtbl; + object->lpVtbl = &MediaStream_Vtbl; object->ref = 1; object->Parent = Parent; @@ -207,7 +207,7 @@ HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPu return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &DirectDrawMediaStream_Vtbl; + object->lpVtbl = &DirectDrawMediaStream_Vtbl; object->ref = 1; object->Parent = Parent; diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index af335fd..4a4d712 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IMediaStreamFilter lpVtbl; + const IMediaStreamFilterVtbl *lpVtbl; LONG ref; CRITICAL_SECTION csFilter; FILTER_STATE state; @@ -63,7 +63,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &MediaStreamFilter_Vtbl; + object->lpVtbl = &MediaStreamFilter_Vtbl; object->ref = 1; *ppObj = object; @@ -120,7 +120,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter * iface) if (!refCount) { - This->lpVtbl.lpVtbl = NULL; + This->lpVtbl = NULL; HeapFree(GetProcessHeap(), 0, This); }

1 0

Christian Costa : d3dxof: Simplify declaration of VTable members.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 9dba65092145a0a10cf9a2e9e84a567febe9accc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dba65092145a0a10cf9a2e9e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 12 09:54:36 2010 +0100 d3dxof: Simplify declaration of VTable members. --- dlls/d3dxof/d3dxof.c | 12 ++++++------ dlls/d3dxof/d3dxof_private.h | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 67e4f61..b1df558 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -71,7 +71,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) return DXFILEERR_BADALLOC; } - object->lpVtbl.lpVtbl = &IDirectXFile_Vtbl; + object->lpVtbl = &IDirectXFile_Vtbl; object->ref = 1; *ppObj = object; @@ -451,7 +451,7 @@ static HRESULT IDirectXFileBinaryImpl_Create(IDirectXFileBinaryImpl** ppObj) return DXFILEERR_BADALLOC; } - object->lpVtbl.lpVtbl = &IDirectXFileBinary_Vtbl; + object->lpVtbl = &IDirectXFileBinary_Vtbl; object->ref = 1; *ppObj = object; @@ -579,7 +579,7 @@ static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj) return DXFILEERR_BADALLOC; } - object->lpVtbl.lpVtbl = &IDirectXFileData_Vtbl; + object->lpVtbl = &IDirectXFileData_Vtbl; object->ref = 1; *ppObj = object; @@ -822,7 +822,7 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp return DXFILEERR_BADALLOC; } - object->lpVtbl.lpVtbl = &IDirectXFileDataReference_Vtbl; + object->lpVtbl = &IDirectXFileDataReference_Vtbl; object->ref = 1; *ppObj = object; @@ -955,7 +955,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp return DXFILEERR_BADALLOC; } - object->lpVtbl.lpVtbl = &IDirectXFileEnumObject_Vtbl; + object->lpVtbl = &IDirectXFileEnumObject_Vtbl; object->ref = 1; *ppObj = object; @@ -1148,7 +1148,7 @@ static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** pp return DXFILEERR_BADALLOC; } - object->lpVtbl.lpVtbl = &IDirectXFileSaveObject_Vtbl; + object->lpVtbl = &IDirectXFileSaveObject_Vtbl; object->ref = 1; *ppObj = object; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index ffa27d2..8f3b53e 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -88,19 +88,19 @@ struct _xobject { typedef struct _xobject xobject; typedef struct { - IDirectXFile lpVtbl; + const IDirectXFileVtbl *lpVtbl; LONG ref; ULONG nb_xtemplates; xtemplate xtemplates[MAX_TEMPLATES]; } IDirectXFileImpl; typedef struct { - IDirectXFileBinary lpVtbl; + const IDirectXFileBinaryVtbl *lpVtbl; LONG ref; } IDirectXFileBinaryImpl; typedef struct { - IDirectXFileData lpVtbl; + const IDirectXFileDataVtbl *lpVtbl; LONG ref; xobject* pobj; int cur_enum_object; @@ -110,13 +110,13 @@ typedef struct { } IDirectXFileDataImpl; typedef struct { - IDirectXFileDataReference lpVtbl; + const IDirectXFileDataReferenceVtbl *lpVtbl; LONG ref; xobject* ptarget; } IDirectXFileDataReferenceImpl; typedef struct { - IDirectXFileObject lpVtbl; + const IDirectXFileObjectVtbl *lpVtbl; LONG ref; } IDirectXFileObjectImpl; @@ -144,7 +144,7 @@ typedef struct { } parse_buffer; typedef struct { - IDirectXFileEnumObject lpVtbl; + const IDirectXFileEnumObjectVtbl *lpVtbl; LONG ref; DXFILELOADOPTIONS source; HANDLE hFile; @@ -159,7 +159,7 @@ typedef struct { } IDirectXFileEnumObjectImpl; typedef struct { - IDirectXFileSaveObject lpVtbl; + const IDirectXFileSaveObjectVtbl *lpVtbl; LONG ref; } IDirectXFileSaveObjectImpl;

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010