September 2012 - Wine-Commits

Andrew Eikum : dsound: Don' t require WAVE_FORMAT_EXTENSIBLE for non-16-bit formats.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: b202b9f72dbdd3ff31ac732521d705c126feed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b202b9f72dbdd3ff31ac73252… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 17 15:44:06 2012 -0500 dsound: Don't require WAVE_FORMAT_EXTENSIBLE for non-16-bit formats. Fix proposed by Andrew Nguyen. --- dlls/dsound/dsound.c | 5 ----- dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 023ef8b..a7a6f13 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -940,11 +940,6 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( } pwfxe = (WAVEFORMATEXTENSIBLE*)dsbd->lpwfxFormat; - if (pwfxe->Format.wBitsPerSample != 16 && pwfxe->Format.wBitsPerSample != 8 && pwfxe->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE) - { - WARN("wBitsPerSample=%d needs a WAVEFORMATEXTENSIBLE\n", dsbd->lpwfxFormat->wBitsPerSample); - return DSERR_CONTROLUNAVAIL; - } if (pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) { /* check if cbSize is at least 22 bytes */ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index f86464b..5b941a3 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -753,7 +753,7 @@ static HRESULT test_secondary(LPGUID lpGuid) if (gotdx8 || wfx.wBitsPerSample <= 16 || wfx.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { if (wfx.wBitsPerSample > 16) - ok(((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) + ok(broken((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) || rc == DS_OK, /* driver dependent? */ "IDirectSound_CreateSoundBuffer() " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) "

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_EMIT in the GLSL shader backend.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 0932129993f30037b1dbb4ceba8a08dbe84cb367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0932129993f30037b1dbb4ceb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 21:48:53 2012 +0200 wined3d: Implement WINED3DSIH_EMIT in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 97a6109..afbdb22 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2989,6 +2989,11 @@ static void shader_glsl_else(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "} else {\n"); } +static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) +{ + shader_addline(ins->ctx->buffer, "EmitVertex();\n"); +} + static void shader_glsl_break(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "break;\n"); @@ -5050,7 +5055,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX */ shader_glsl_map2gl, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_ELSE */ shader_glsl_else, - /* WINED3DSIH_EMIT */ NULL, + /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end,

1 0

Henri Verbeet : wined3d: wined3d_device_set_material() never fails.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 2669feeb8c27f3e4714c8a1969f637c51acf3c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2669feeb8c27f3e4714c8a196… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 21:48:51 2012 +0200 wined3d: wined3d_device_set_material() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 6 ++---- include/wine/wined3d.h | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e5c2605..7ff67ab 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1333,16 +1333,15 @@ static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPO static HRESULT WINAPI d3d8_device_SetMaterial(IDirect3DDevice8 *iface, const D3DMATERIAL8 *material) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, material %p.\n", iface, material); /* Note: D3DMATERIAL8 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - hr = wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetMaterial(IDirect3DDevice8 *iface, D3DMATERIAL8 *material) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3bbdd78..ef51f25 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1399,16 +1399,15 @@ static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEW static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D3DMATERIAL9 *material) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, material %p.\n", iface, material); /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - hr = wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATERIAL9 *material) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f0bd56a..9162e92 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5089,7 +5089,6 @@ static HRESULT WINAPI d3d_device7_GetViewport_FPUPreserve(IDirect3DDevice7 *ifac static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *material) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; TRACE("iface %p, material %p.\n", iface, material); @@ -5098,10 +5097,10 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - hr = wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material); wined3d_mutex_unlock(); - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_SetMaterial_FPUSetup(IDirect3DDevice7 *iface, D3DMATERIAL7 *material) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 903d589..e4da126 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2168,7 +2168,7 @@ HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material) +void CDECL wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material) { TRACE("device %p, material %p.\n", device, material); @@ -2179,12 +2179,10 @@ HRESULT CDECL wined3d_device_set_material(struct wined3d_device *device, const s if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } device_invalidate_state(device, STATE_MATERIAL); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c3e1c19..2bc112a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2207,7 +2207,7 @@ void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, UINT light_idx, const struct wined3d_light *light); HRESULT __cdecl wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable); -HRESULT __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material); +void __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material); void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device); HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments); HRESULT __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSGetViewports().
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 9fb039bb01a7bcafbd2be55936f7fd68346bedd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb039bb01a7bcafbd2be5593… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 21:48:50 2012 +0200 d3d10core: Implement d3d10_device_RSGetViewports(). --- dlls/d3d10core/device.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8aeffcc..1e54db2 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -582,7 +582,31 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device *iface, ID3D1 static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device *iface, UINT *viewport_count, D3D10_VIEWPORT *viewports) { - FIXME("iface %p, viewport_count %p, viewports %p stub!\n", iface, viewport_count, viewports); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_viewport wined3d_vp; + + TRACE("iface %p, viewport_count %p, viewports %p.\n", iface, viewport_count, viewports); + + if (!viewports) + { + *viewport_count = 1; + return; + } + + if (!*viewport_count) + return; + + wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); + + viewports[0].TopLeftX = wined3d_vp.x; + viewports[0].TopLeftY = wined3d_vp.y; + viewports[0].Width = wined3d_vp.width; + viewports[0].Height = wined3d_vp.height; + viewports[0].MinDepth = wined3d_vp.min_z; + viewports[0].MaxDepth = wined3d_vp.max_z; + + if (*viewport_count > 1) + memset(&viewports[1], 0, (*viewport_count - 1) * sizeof(*viewports)); } static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device *iface, UINT *rect_count, D3D10_RECT *rects)

1 0

Michael Stefaniuc : dsound: Improve the IDirectSoundCaptureBuffer:: GetObjectInPath stub.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 34b7e83357f539647aa56274d337de07cfac99dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b7e83357f539647aa56274d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 17 21:06:51 2012 +0200 dsound: Improve the IDirectSoundCaptureBuffer::GetObjectInPath stub. --- dlls/dsound/capture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 309702a..5336b59 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -583,7 +583,11 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetObjectInPath(IDirectSound FIXME( "(%p,%s,%u,%s,%p): stub\n", This, debugstr_guid(rguidObject), dwIndex, debugstr_guid(rguidInterface), ppObject ); - return DS_OK; + if (!ppObject) + return DSERR_INVALIDPARAM; + + *ppObject = NULL; + return DSERR_CONTROLUNAVAIL; } static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFXStatus(IDirectSoundCaptureBuffer8 *iface,

1 0

Christian Costa : dmusic: Display new ref in AddRef and Release methods.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: d46f8e316a136d9667672b8668a075255cc2d6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46f8e316a136d9667672b866… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Sep 17 22:32:06 2012 +0200 dmusic: Display new ref in AddRef and Release methods. --- dlls/dmusic/port.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 2530fb9..0626518 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -67,30 +67,29 @@ static HRESULT WINAPI IDirectMusicPortImpl_QueryInterface(LPDIRECTMUSICPORT ifac static ULONG WINAPI IDirectMusicPortImpl_AddRef(LPDIRECTMUSICPORT iface) { - IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicPortImpl_Release(LPDIRECTMUSICPORT iface) { - IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); - return refCount; + return ref; } /* IDirectMusicPortImpl IDirectMusicPort part: */

1 0

Christian Costa : dmusic: Use system ports list to create port in CreatePort and rename params.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 142c527b4bb7fabd3f43834cdcbefb64a4788fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142c527b4bb7fabd3f43834cd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Sep 17 22:31:58 2012 +0200 dmusic: Use system ports list to create port in CreatePort and rename params. --- dlls/dmusic/dmusic.c | 107 +++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 52 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index bb1eb96..36e9516 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -117,59 +117,62 @@ static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, return DMUSIC_CreateDirectMusicBufferImpl(buffer_desc, (LPVOID)buffer); } -static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter) +static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSID rclsid_port, LPDMUS_PORTPARAMS port_params, LPDIRECTMUSICPORT* port, LPUNKNOWN unkouter) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - int i; - DMUS_PORTCAPS PortCaps; - IDirectMusicPort* pNewPort = NULL; - HRESULT hr; - GUID default_port; - const GUID *request_port = rclsidPort; - - TRACE("(%p, %s, %p, %p, %p)\n", This, debugstr_dmguid(rclsidPort), pPortParams, ppPort, pUnkOuter); - - if (TRACE_ON(dmusic)) - dump_DMUS_PORTPARAMS(pPortParams); - - if (!rclsidPort) - return E_POINTER; - if (!pPortParams) - return E_INVALIDARG; - if (!ppPort) - return E_POINTER; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - if (TRACE_ON(dmusic)) - dump_DMUS_PORTPARAMS(pPortParams); - - ZeroMemory(&PortCaps, sizeof(DMUS_PORTCAPS)); - PortCaps.dwSize = sizeof(DMUS_PORTCAPS); - - if(IsEqualGUID(request_port, &GUID_NULL)){ - hr = IDirectMusic8_GetDefaultPort(iface, &default_port); - if(FAILED(hr)) - return hr; - request_port = &default_port; - } + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + int i; + DMUS_PORTCAPS port_caps; + IDirectMusicPort* new_port = NULL; + HRESULT hr; + GUID default_port; + const GUID *request_port = rclsid_port; - for (i = 0; S_FALSE != IDirectMusic8Impl_EnumPort(iface, i, &PortCaps); i++) { - if (IsEqualCLSID (request_port, &PortCaps.guidPort)) { - hr = DMUSIC_CreateDirectMusicPortImpl(&IID_IDirectMusicPort, (LPVOID*) &pNewPort, (LPUNKNOWN) This, pPortParams, &PortCaps, 0); - if (FAILED(hr)) { - *ppPort = NULL; - return hr; - } - This->nrofports++; - if (!This->ppPorts) This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); - else This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); - This->ppPorts[This->nrofports - 1] = pNewPort; - *ppPort = pNewPort; - return S_OK; - } - } - return E_NOINTERFACE; + TRACE("(%p)->(%s, %p, %p, %p)\n", This, debugstr_dmguid(rclsid_port), port_params, port, unkouter); + + if (TRACE_ON(dmusic)) + dump_DMUS_PORTPARAMS(port_params); + + if (!rclsid_port) + return E_POINTER; + if (!port_params) + return E_INVALIDARG; + if (!port) + return E_POINTER; + if (unkouter) + return CLASS_E_NOAGGREGATION; + + if (TRACE_ON(dmusic)) + dump_DMUS_PORTPARAMS(port_params); + + ZeroMemory(&port_caps, sizeof(DMUS_PORTCAPS)); + port_caps.dwSize = sizeof(DMUS_PORTCAPS); + + if (IsEqualGUID(request_port, &GUID_NULL)) { + hr = IDirectMusic8_GetDefaultPort(iface, &default_port); + if(FAILED(hr)) + return hr; + request_port = &default_port; + } + + for (i = 0; S_FALSE != IDirectMusic8Impl_EnumPort(iface, i, &port_caps); i++) { + if (IsEqualCLSID(request_port, &port_caps.guidPort)) { + hr = This->system_ports[i].create(&IID_IDirectMusicPort, (LPVOID*)&new_port, (LPUNKNOWN)This, port_params, &port_caps, This->system_ports[i].device); + if (FAILED(hr)) { + *port = NULL; + return hr; + } + This->nrofports++; + if (!This->ppPorts) + This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); + else + This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); + This->ppPorts[This->nrofports - 1] = new_port; + *port = new_port; + return S_OK; + } + } + + return E_NOINTERFACE; } static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info)

1 0

Charles Davis : urlmon: Fix potential use of uninitialized variable (Clang) .
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 7c83bd84fd95620cbd29d745c90809927d7760fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c83bd84fd95620cbd29d745c… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Sep 17 23:49:50 2012 -0600 urlmon: Fix potential use of uninitialized variable (Clang). --- dlls/urlmon/http.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 18a99ae..b2c3d10 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -215,10 +215,9 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); IWindowForBindingUI_Release(wfb_ui); - if(FAILED(hres)) - hwnd = NULL; } + if(FAILED(hres)) hwnd = NULL; dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA; if(This->base.bindf & BINDF_NO_UI)

1 0

Henri Verbeet : wined3d: wined3d_device_get_material() never fails.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 343974e2fdad5db1d76d8281185118ab3e40b62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=343974e2fdad5db1d76d82811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 21:48:52 2012 +0200 wined3d: wined3d_device_get_material() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7ff67ab..f6f0501 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1347,16 +1347,15 @@ static HRESULT WINAPI d3d8_device_SetMaterial(IDirect3DDevice8 *iface, const D3D static HRESULT WINAPI d3d8_device_GetMaterial(IDirect3DDevice8 *iface, D3DMATERIAL8 *material) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, material %p.\n", iface, material); /* Note: D3DMATERIAL8 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - hr = wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetLight(IDirect3DDevice8 *iface, DWORD index, const D3DLIGHT8 *light) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ef51f25..fcdfc6f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1413,16 +1413,15 @@ static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATERIAL9 *material) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, material %p.\n", iface, material); /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - hr = wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetLight(IDirect3DDevice9Ex *iface, DWORD index, const D3DLIGHT9 *light) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9162e92..996fca8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5139,16 +5139,15 @@ static HRESULT WINAPI d3d_device7_SetMaterial_FPUPreserve(IDirect3DDevice7 *ifac static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *material) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; TRACE("iface %p, material %p.\n", iface, material); wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - hr = wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); wined3d_mutex_unlock(); - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_GetMaterial_FPUSetup(IDirect3DDevice7 *iface, D3DMATERIAL7 *material) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e4da126..a8bb403 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2185,7 +2185,7 @@ void CDECL wined3d_device_set_material(struct wined3d_device *device, const stru device_invalidate_state(device, STATE_MATERIAL); } -HRESULT CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) +void CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) { TRACE("device %p, material %p.\n", device, material); @@ -2204,8 +2204,6 @@ HRESULT CDECL wined3d_device_get_material(const struct wined3d_device *device, s material->emissive.r, material->emissive.g, material->emissive.b, material->emissive.a); TRACE("power %.8e.\n", material->power); - - return WINED3D_OK; } void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2bc112a..4d10fd6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2129,7 +2129,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct win HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable); -HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material); +void __cdecl wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material); float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device,

1 0

Michael Stefaniuc : dsound/tests: Avoid a crash on a Win2k box.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 15456454843301752ad520f2c9b2a5ad5bbbe051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15456454843301752ad520f2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 17 21:08:05 2012 +0200 dsound/tests: Avoid a crash on a Win2k box. --- dlls/dsound/tests/duplex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 170b552..b688803 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -285,7 +285,7 @@ static void test_COM(void) "IDirectSoundFullDuplex_Initialize failed: %08x, expected E_INVALIDARG\n", hr); hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), DSSCL_EXCLUSIVE, &dscb8, &dsb8); - if (hr == DSERR_NODRIVER) { + if (hr == DSERR_NODRIVER || hr == DSERR_INVALIDCALL) { skip("No driver\n"); return; }

1 0