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

Henri Verbeet : wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader().
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: d1b650e9595d0d5aa7c1887c139d620d198de7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b650e9595d0d5aa7c1887c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:30 2011 +0200 wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader(). --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 66f1695..aef4fab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5952,9 +5952,8 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta } } -static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, struct wined3d_stateblock *stateblock) +static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &stateblock->device->adapter->gl_info; unsigned int stage; struct wined3d_shader_buffer buffer; BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; @@ -6280,7 +6279,7 @@ static void fragment_prog_arbfp(DWORD state_id, struct wined3d_stateblock *state } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); - new_desc->shader = gen_arbfp_ffp_shader(&settings, stateblock); + new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); desc = new_desc;

1 0

Lucas Fialho Zawacki : dinput: EnumDevicesBySemantics enumerating all kinds of joysticks.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Lucas Fialho Zawacki : dinput: BuildActionMap and SetActionMap stubs for generic joystick.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

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

July 11, 2011

1 0

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

July 11, 2011

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 July 11, 2011

July 11, 2011

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 July 11, 2011

July 11, 2011

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 : winhlp32: Remove dead assignment (Clang).
by Alexandre Julliard July 11, 2011

July 11, 2011

Module: wine Branch: master Commit: dcf9d74be7ade2a71d8a787a104b561120138d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf9d74be7ade2a71d8a787a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 14:49:50 2011 +0200 winhlp32: Remove dead assignment (Clang). --- programs/winhlp32/hlpfile.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 5146c38..cf7bcdc 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -2646,7 +2646,6 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_Uncompress_Topic(hlpfile)) return FALSE; if (!HLPFILE_ReadFont(hlpfile)) return FALSE; - buf = hlpfile->topic_map[0]; old_index = -1; offs = 0; do

1 0

Jacek Caban : d3d10.idl: Added CD3D10_TEXTURE1D_DESC declaration.
by Alexandre Julliard July 11, 2011

July 11, 2011

Module: wine Branch: master Commit: 7b49ddbababa22eb3dd8ac59c29293afb6ece0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b49ddbababa22eb3dd8ac59c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 12:13:23 2011 +0200 d3d10.idl: Added CD3D10_TEXTURE1D_DESC declaration. --- include/d3d10.idl | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index f8a83ef..51b92bd 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -514,6 +514,29 @@ typedef struct D3D10_TEXTURE1D_DESC { UINT MiscFlags; } D3D10_TEXTURE1D_DESC; +cpp_quote("#if !defined(D3D10_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("struct CD3D10_TEXTURE1D_DESC : public D3D10_TEXTURE1D_DESC {") +cpp_quote(" CD3D10_TEXTURE1D_DESC() {}") +cpp_quote(" explicit CD3D10_TEXTURE1D_DESC(const D3D10_TEXTURE1D_DESC &o) : D3D10_TEXTURE1D_DESC(o) {}") +cpp_quote(" explicit CD3D10_TEXTURE1D_DESC(DXGI_FORMAT format, UINT width, UINT arraySize = 1, UINT mipLevels = 0,") +cpp_quote(" UINT bindFlags = D3D10_BIND_SHADER_RESOURCE, D3D10_USAGE usage = D3D10_USAGE_DEFAULT, UINT cpuaccessFlags = 0,") +cpp_quote(" UINT miscFlags = 0) {") +cpp_quote(" Width = width;") +cpp_quote(" MipLevels = mipLevels;") +cpp_quote(" ArraySize = arraySize;") +cpp_quote(" Format = format;") +cpp_quote(" Usage = usage;") +cpp_quote(" BindFlags = bindFlags;") +cpp_quote(" CPUAccessFlags = cpuaccessFlags;") +cpp_quote(" MiscFlags = miscFlags;") +cpp_quote(" }") +cpp_quote(" ~CD3D10_TEXTURE1D_DESC() {}") +cpp_quote(" operator const D3D10_TEXTURE1D_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D10_TEXTURE2D_DESC { UINT Width; UINT Height;

1 0

Francois Gouget : d3dx9_36/tests: Fix compilation on systems that don' t support nameless structs/unions.
by Alexandre Julliard July 11, 2011

July 11, 2011

Module: wine Branch: master Commit: 076e1cf085244359a2f8d50d142fcc02eef28c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076e1cf085244359a2f8d50d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 11 12:07:19 2011 +0200 d3dx9_36/tests: Fix compilation on systems that don't support nameless structs/unions. --- dlls/d3dx9_36/tests/line.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index e03fce5..52c153d 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -90,7 +90,7 @@ static void test_create_line(IDirect3DDevice9* device) D3DXMatrixIdentity(&world); D3DXMatrixIdentity(&identity); - world._11 = r11; world._12 = r12; world._13 = r13; world._14 = r14; + S(U(world))._11 = r11; S(U(world))._12 = r12; S(U(world))._13 = r13; S(U(world))._14 = r14; hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &world); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK);

1 0