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

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10PixelShader iface.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: f196050f289121b26cdadb9c572a6a29a791ed14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f196050f289121b26cdadb9c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 01:56:39 2011 +0200 d3d10core: COM cleanup for the ID3D10PixelShader iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/shader.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 17c3bae..457ba09 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -194,7 +194,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct /* ID3D10PixelShader */ struct d3d10_pixel_shader { - const struct ID3D10PixelShaderVtbl *vtbl; + ID3D10PixelShader ID3D10PixelShader_iface; LONG refcount; struct wined3d_shader *wined3d_shader; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 149afa9..4df04f1 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -952,7 +952,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if } TRACE("Created pixel shader %p.\n", object); - *shader = (ID3D10PixelShader *)object; + *shader = &object->ID3D10PixelShader_iface; return S_OK; } diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 79131e1..57c26bc 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -421,7 +421,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { - return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, vtbl); + return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, ID3D10PixelShader_iface); } /* IUnknown methods */ @@ -448,7 +448,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelSh static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface; + struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -461,7 +461,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *ifac static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface; + struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -536,7 +536,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ struct d3d10_shader_info shader_info; HRESULT hr; - shader->vtbl = &d3d10_pixel_shader_vtbl; + shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl; shader->refcount = 1; shader_info.output_signature = &shader->output_signature;

1 0

Lucas Fialho Zawacki : dinput: BuildActionMap and SetActionMap stubs for generic joystick.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: dc044e156d35708ceb4dcbc76e30fca6c1fd0a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc044e156d35708ceb4dcbc76… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 11 22:36:56 2011 -0300 dinput: BuildActionMap and SetActionMap stubs for generic joystick. --- dlls/dinput/joystick.c | 60 +++++++++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 8 ++-- dlls/dinput/joystick_linuxinput.c | 8 ++-- dlls/dinput/joystick_osx.c | 8 ++-- dlls/dinput/joystick_private.h | 6 ++++ 5 files changed, 78 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 1be6f31..68dcc6a 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -426,6 +426,66 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, return JoystickWGenericImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); } + +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, + LPDIACTIONFORMATW lpdiaf, + LPCWSTR lpszUserName, + DWORD dwFlags) +{ + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + + return DI_NOEFFECT; +} + +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, + LPDIACTIONFORMATA lpdiaf, + LPCSTR lpszUserName, + DWORD dwFlags) +{ + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); + DIACTIONFORMATW diafW; + HRESULT hr; + + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); + _copy_diactionformatAtoW(&diafW, lpdiaf); + + hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + + _copy_diactionformatWtoA(lpdiaf, &diafW); + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + + return hr; +} + +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, + LPDIACTIONFORMATW lpdiaf, + LPCWSTR lpszUserName, + DWORD dwFlags) +{ + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + + return DI_NOEFFECT; +} + +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, + LPDIACTIONFORMATA lpdiaf, + LPCSTR lpszUserName, + DWORD dwFlags) +{ + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); + DIACTIONFORMATW diafW; + HRESULT hr; + + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); + _copy_diactionformatAtoW(&diafW, lpdiaf); + + hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + + return hr; +} + /* * This maps the read value (from the input event) to a value in the * 'wanted' range. diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5541522..3ad592d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -682,8 +682,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, + JoystickAGenericImpl_BuildActionMap, + JoystickAGenericImpl_SetActionMap, IDirectInputDevice8AImpl_GetImageInfo }; @@ -718,8 +718,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, + JoystickWGenericImpl_BuildActionMap, + JoystickWGenericImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c11edc7..afdee1e 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1417,8 +1417,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, + JoystickAGenericImpl_BuildActionMap, + JoystickAGenericImpl_SetActionMap, IDirectInputDevice8AImpl_GetImageInfo }; @@ -1453,8 +1453,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, + JoystickWGenericImpl_BuildActionMap, + JoystickWGenericImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 439c8ad..756a682 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -972,8 +972,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, + JoystickAGenericImpl_BuildActionMap, + JoystickAGenericImpl_SetActionMap, IDirectInputDevice8AImpl_GetImageInfo }; @@ -1008,8 +1008,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, + JoystickWGenericImpl_BuildActionMap, + JoystickWGenericImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index a332e24..71d91f1 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -86,4 +86,10 @@ HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_H HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; + +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; + #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Lucas Fialho Zawacki : dinput: EnumDevicesBySemantics enumerating all kinds of joysticks.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: bc5d32bec6c37271769c66dd59c15a5d1aab37ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5d32bec6c37271769c66dd5… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 11 22:37:36 2011 -0300 dinput: EnumDevicesBySemantics enumerating all kinds of joysticks. --- dlls/dinput/dinput_main.c | 54 +++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/device.c | 3 ++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0f84e7c..821a9a0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -847,6 +847,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); DIDEVICEINSTANCEA didevi; LPDIRECTINPUTDEVICE8A lpdid; + DWORD callbackFlags; int i, j; @@ -865,12 +866,36 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); + /* Enumerate all the joysticks */ + for (i = 0; i < NB_DINPUT_DEVICES; i++) + { + BOOL enumSuccess; + + if (!dinput_devices[i]->enum_deviceA) continue; + + for (j = 0, enumSuccess = -1; enumSuccess != 0; j++) + { + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); + + callbackFlags = 0; + /* Default behavior is to enumerate attached game controllers */ + enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); + if (enumSuccess) + { + IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); + + if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) + return DI_OK; + } + } + } + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - DWORD callbackFlags = 0; + callbackFlags = 0; IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); @@ -898,6 +923,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( IDirectInputImpl *This = impl_from_IDirectInput8W(iface); DIDEVICEINSTANCEW didevi; LPDIRECTINPUTDEVICE8W lpdid; + DWORD callbackFlags; int i, j; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, @@ -905,12 +931,36 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); + /* Enumerate all the joysticks */ + for (i = 0; i < NB_DINPUT_DEVICES; i++) + { + BOOL enumSuccess; + + if (!dinput_devices[i]->enum_deviceW) continue; + + for (j = 0, enumSuccess = -1; enumSuccess != 0; j++) + { + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); + + callbackFlags = 0; + /* Default behavior is to enumerate attached game controllers */ + enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); + if (enumSuccess) + { + IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); + + if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) + return DI_OK; + } + } + } + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - DWORD callbackFlags = 0; + callbackFlags = 0; IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 94b1f2d..cedad80 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -166,6 +166,9 @@ static BOOL CALLBACK enumeration_callback( hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + /* Some joysticks may have no suitable actions and thus should not be tested */ + if (hr == DI_NOEFFECT) return DIENUM_CONTINUE; + /* Test buffer size */ memset(&dp, 0, sizeof(dp)); dp.diph.dwSize = sizeof(dp);

1 0

Frédéric Delanoy : mmdevapi/tests: Remove dead assignment (Clang).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: d473d02c64dc1f78363bfdef4bf978f7ce07dc30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d473d02c64dc1f78363bfdef4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 17:26:55 2011 +0200 mmdevapi/tests: Remove dead assignment (Clang). --- dlls/mmdevapi/tests/render.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 6e83f5c..ad81709 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -618,7 +618,6 @@ static void test_clock(void) hr = IAudioClock_GetPosition(acl, &pos, NULL); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); - last = pos; hr = IAudioRenderClient_GetBuffer(arc, pwfx->nSamplesPerSec / 2., &data); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr);

1 0

Andrew Eikum : winecoreaudio.drv: Make AudioSessionManager methods static.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 05df7e0b94ea0cfba375823dc9e1a4902c4f980e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05df7e0b94ea0cfba375823dc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 11 08:37:30 2011 -0500 winecoreaudio.drv: Make AudioSessionManager methods static. --- dlls/winecoreaudio.drv/mmdevdrv.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 261bb2b..0f73095 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2790,7 +2790,7 @@ static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl = ChannelAudioVolume_GetAllVolumes }; -HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, +static HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, REFIID riid, void **ppv) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -2812,7 +2812,7 @@ HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, return E_NOINTERFACE; } -ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -2821,7 +2821,7 @@ ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) return ref; } -ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -2832,7 +2832,7 @@ ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) return ref; } -HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( +static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, IAudioSessionControl **out) { @@ -2859,7 +2859,7 @@ HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( +static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, ISimpleAudioVolume **out) { @@ -2886,7 +2886,7 @@ HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( +static HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( IAudioSessionManager2 *iface, IAudioSessionEnumerator **out) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2894,7 +2894,7 @@ HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2902,7 +2902,7 @@ HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2910,7 +2910,7 @@ HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( IAudioSessionManager2 *iface, const WCHAR *session_id, IAudioVolumeDuckNotification *notification) { @@ -2919,7 +2919,7 @@ HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( IAudioSessionManager2 *iface, IAudioVolumeDuckNotification *notification) {

1 0

Frédéric Delanoy : ole32/tests: Remove dead assignment (Clang).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 8f32948d9afd1b9a29a79bb25b62c103a02ec5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f32948d9afd1b9a29a79bb25… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 16:58:46 2011 +0200 ole32/tests: Remove dead assignment (Clang). --- dlls/ole32/tests/usrmarshal.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 7fdbdb6..ed09558 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -580,7 +580,6 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) ok(size == 0, "size should be 0 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); - wireip = buffer; HeapFree(GetProcessHeap(), 0, buffer); /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then

1 0

Frédéric Delanoy : start: Add support for /? command line parameter.
by Alexandre Julliard 11 Jul '11

11 Jul '11

1 0

Alexandre Julliard : gdi32: Pass the source/ dest visible rectangles to the AlphaBlend driver entry point.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: bfc12c0c948c7d07d1c776375604b4a489f73f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc12c0c948c7d07d1c776375… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 14:17:04 2011 +0200 gdi32: Pass the source/dest visible rectangles to the AlphaBlend driver entry point. --- dlls/gdi32/bitblt.c | 31 ++++++-- dlls/gdi32/driver.c | 5 +- dlls/gdi32/gdi_private.h | 2 +- dlls/winex11.drv/bitblt.c | 148 ++---------------------------------- dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 4 +- 7 files changed, 41 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfc12c0c948c7d07d1c77…

1 0

Francois Gouget : winealsa.drv: Make the AudioSessionManager methods static .
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 84fca0017a5623aa4510f853023dba49586b4815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fca0017a5623aa4510f8530… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 11 11:52:33 2011 +0200 winealsa.drv: Make the AudioSessionManager methods static. --- dlls/winealsa.drv/mmdevdrv.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6889b2e..eda8435 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2965,7 +2965,7 @@ static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl = ChannelAudioVolume_GetAllVolumes }; -HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, +static HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, REFIID riid, void **ppv) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -2987,7 +2987,7 @@ HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, return E_NOINTERFACE; } -ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -2996,7 +2996,7 @@ ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) return ref; } -ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -3007,7 +3007,7 @@ ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) return ref; } -HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( +static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, IAudioSessionControl **out) { @@ -3034,7 +3034,7 @@ HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( +static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, ISimpleAudioVolume **out) { @@ -3061,7 +3061,7 @@ HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( +static HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( IAudioSessionManager2 *iface, IAudioSessionEnumerator **out) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -3069,7 +3069,7 @@ HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -3077,7 +3077,7 @@ HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -3085,7 +3085,7 @@ HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( IAudioSessionManager2 *iface, const WCHAR *session_id, IAudioVolumeDuckNotification *notification) { @@ -3094,7 +3094,7 @@ HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( IAudioSessionManager2 *iface, IAudioVolumeDuckNotification *notification) {

1 0

Francois Gouget : wineoss.drv: Make the AudioSessionManager methods static.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 5e6d17384fd2eab60de4128b15e4541f7d5442b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6d17384fd2eab60de4128b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 11 11:52:43 2011 +0200 wineoss.drv: Make the AudioSessionManager methods static. --- dlls/wineoss.drv/mmdevdrv.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7ff33a9..2b631f9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2755,7 +2755,7 @@ static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl = ChannelAudioVolume_GetAllVolumes }; -HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, +static HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, REFIID riid, void **ppv) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -2777,7 +2777,7 @@ HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, return E_NOINTERFACE; } -ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -2786,7 +2786,7 @@ ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) return ref; } -ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -2797,7 +2797,7 @@ ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) return ref; } -HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( +static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, IAudioSessionControl **out) { @@ -2824,7 +2824,7 @@ HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( +static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, ISimpleAudioVolume **out) { @@ -2851,7 +2851,7 @@ HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( +static HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( IAudioSessionManager2 *iface, IAudioSessionEnumerator **out) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2859,7 +2859,7 @@ HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2867,7 +2867,7 @@ HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2875,7 +2875,7 @@ HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( IAudioSessionManager2 *iface, const WCHAR *session_id, IAudioVolumeDuckNotification *notification) { @@ -2884,7 +2884,7 @@ HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( IAudioSessionManager2 *iface, IAudioVolumeDuckNotification *notification) {

1 0