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

Jörg Höhle : winmm: Assign to structs instead of using memcpy.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 7fed738353c201c59e4befa0b891e72c6340956f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fed738353c201c59e4befa0b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Assign to structs instead of using memcpy. --- dlls/winmm/waveform.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index d1c685e..72eec27 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1445,7 +1445,7 @@ static void WOD_PushData(WINMM_Device *device) device->played_frames += avail_frames; exit: - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -1625,7 +1625,7 @@ static void WID_PullData(WINMM_Device *device) } exit: - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -1718,7 +1718,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) device->loop_counter = 0; device->last_clock_pos = 0; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -2367,7 +2367,7 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -3015,7 +3015,7 @@ UINT WINAPI waveInClose(HWAVEIN hWaveIn) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -3169,7 +3169,7 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn) }else buf = NULL; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock);

1 0

Jörg Höhle : winmm: Fix memory leak in msacm error path.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 961683704bd13194b22e34147fcdad885bdf241f URL: http://source.winehq.org/git/wine.git/?a=commit;h=961683704bd13194b22e34147… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Fix memory leak in msacm error path. --- dlls/winmm/waveform.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 72eec27..160395c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1195,6 +1195,7 @@ static LRESULT WINMM_PrepareHeader(HWAVE hwave, WAVEHDR *header) mr = acmStreamPrepareHeader(device->acm_handle, ash, 0); if(mr != MMSYSERR_NOERROR){ + HeapFree(GetProcessHeap(), 0, ash); LeaveCriticalSection(&device->lock); return mr; }

1 0

Jörg Höhle : winmm: Fix logic conditions.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: b9de906ac10176f956333dadb3a18d03690085df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9de906ac10176f956333dadb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Fix logic conditions. --- dlls/winmm/waveform.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 160395c..a571fb8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -706,9 +706,9 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) } /* no direct match, so set up the ACM stream */ - if(info->format->wFormatTag != WAVE_FORMAT_PCM || - (info->format->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - !IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + if(info->format->wFormatTag != WAVE_FORMAT_PCM && + !(info->format->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ /* convert to PCM format if it's not already */ mr = WINMM_TryDeviceMapping(info, info->format->nChannels, info->format->nSamplesPerSec, 16, is_out); @@ -889,6 +889,8 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, goto error; } + /* As the devices thread is waiting on g_device_handles, it can + * only be modified from within this same thread. */ if(g_device_handles){ g_device_handles = HeapReAlloc(GetProcessHeap(), 0, g_device_handles, sizeof(HANDLE) * (g_devhandle_count + 1)); @@ -2087,11 +2089,11 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) DWORD wait; wait = MsgWaitForMultipleObjects(g_devhandle_count, g_device_handles, FALSE, INFINITE, QS_ALLINPUT); - if(wait == g_devhandle_count - WAIT_OBJECT_0){ + if(wait == g_devhandle_count + WAIT_OBJECT_0){ MSG msg; if(PeekMessageW(&msg, g_devices_hwnd, 0, 0, PM_REMOVE)) ERR("Unexpected message: 0x%x\n", msg.message); - }else if(wait < g_devhandle_count){ + }else if(wait < g_devhandle_count + WAIT_OBJECT_0){ WINMM_Device *device = g_handle_devices[wait - WAIT_OBJECT_0]; if(device->render) WOD_PushData(device); @@ -2149,7 +2151,7 @@ static BOOL WINMM_StartDevicesThread(void) wait = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); if(wait != WAIT_OBJECT_0){ - if(wait == 1 - WAIT_OBJECT_0){ + if(wait == 1 + WAIT_OBJECT_0){ CloseHandle(g_devices_thread); g_devices_thread = NULL; g_devices_hwnd = NULL;

1 0

Jörg Höhle : winmm: Restore checking of callback flags.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 547f4cace9e654e4cdd3db2949337a5df4285322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547f4cace9e654e4cdd3db294… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Restore checking of callback flags. --- dlls/winmm/waveform.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a571fb8..bdac0a8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -300,19 +300,11 @@ static WINMM_Device *WINMM_GetDeviceFromHWAVE(HWAVE hwave) /* Note: NotifyClient should never be called while holding the device lock * since the client may call wave* functions from within the callback. */ -static DWORD WINMM_NotifyClient(WINMM_CBInfo *info, WORD msg, DWORD_PTR param1, +static inline void WINMM_NotifyClient(WINMM_CBInfo *info, WORD msg, DWORD_PTR param1, DWORD_PTR param2) { - TRACE("(%p, %u, %lx, %lx)\n", info->hwave, msg, param1, param2); - - if((info->flags & DCB_TYPEMASK) == DCB_NULL) - return MMSYSERR_NOERROR; - - if(!DriverCallback(info->callback, info->flags, (HDRVR)info->hwave, - msg, info->user, param1, param2)) - return MMSYSERR_ERROR; - - return MMSYSERR_NOERROR; + DriverCallback(info->callback, info->flags, (HDRVR)info->hwave, + msg, info->user, param1, param2); } static HRESULT WINMM_GetFriendlyName(IMMDevice *device, WCHAR *out, @@ -2330,6 +2322,9 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, ERR("Couldn't start the device thread: %08x\n", hr); return MMSYSERR_ERROR; } + res = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if(res != MMSYSERR_NOERROR) + return res; info.format = (WAVEFORMATEX*)lpFormat; info.callback = dwCallback; @@ -2978,6 +2973,9 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, ERR("Couldn't start the device thread: %08x\n", hr); return MMSYSERR_ERROR; } + res = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if(res != MMSYSERR_NOERROR) + return res; info.format = (WAVEFORMATEX*)lpFormat; info.callback = dwCallback; @@ -3347,13 +3345,13 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, if(!lphMix) return MMSYSERR_INVALPARAM; - if(uDeviceID >= g_outmmdevices_count + g_inmmdevices_count) - return MMSYSERR_BADDEVICEID; - mr = WINMM_CheckCallback(dwCallback, fdwOpen, TRUE); if(mr != MMSYSERR_NOERROR) return mr; + if(uDeviceID >= g_outmmdevices_count + g_inmmdevices_count) + return MMSYSERR_BADDEVICEID; + if(uDeviceID < g_outmmdevices_count){ mmdevice = &g_out_mmdevices[uDeviceID]; *lphMix = (HMIXER)WINMM_MakeHWAVE(uDeviceID, TRUE,

1 0

Jörg Höhle : winmm: Remove redundant code.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 2e01ea4bda091cad35b851b269887cff007502eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e01ea4bda091cad35b851b26… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Remove redundant code. --- dlls/winmm/waveform.c | 43 ------------------------------------------- 1 files changed, 0 insertions(+), 43 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index bdac0a8..820d228 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -940,7 +940,6 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; WINMM_Device *device = NULL; - WINMM_CBInfo cb_info; LRESULT ret = MMSYSERR_ERROR; HRESULT hr; @@ -980,8 +979,6 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) goto error; } - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); - LeaveCriticalSection(&device->lock); return MMSYSERR_NOERROR; @@ -1016,7 +1013,6 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; WINMM_Device *device = NULL; - WINMM_CBInfo cb_info; LRESULT ret = MMSYSERR_ERROR; HRESULT hr; @@ -1049,8 +1045,6 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) goto error; } - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); - LeaveCriticalSection(&device->lock); return MMSYSERR_NOERROR; @@ -1106,7 +1100,6 @@ static HRESULT WINMM_CloseDevice(WINMM_Device *device) static LRESULT WOD_Close(HWAVEOUT hwave) { WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); - WINMM_CBInfo cb_info; TRACE("(%p)\n", hwave); @@ -1121,8 +1114,6 @@ static LRESULT WOD_Close(HWAVEOUT hwave) IAudioStreamVolume_Release(device->volume); device->volume = NULL; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); - LeaveCriticalSection(&device->lock); return MMSYSERR_NOERROR; @@ -1131,7 +1122,6 @@ static LRESULT WOD_Close(HWAVEOUT hwave) static LRESULT WID_Close(HWAVEIN hwave) { WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); - WINMM_CBInfo cb_info; TRACE("(%p)\n", hwave); @@ -1143,8 +1133,6 @@ static LRESULT WID_Close(HWAVEIN hwave) IAudioCaptureClient_Release(device->capture); device->capture = NULL; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); - LeaveCriticalSection(&device->lock); return MMSYSERR_NOERROR; @@ -1637,8 +1625,6 @@ static HRESULT WINMM_BeginPlaying(WINMM_Device *device) TRACE("(%p)\n", device->handle); - EnterCriticalSection(&device->lock); - if(device->render) /* prebuffer data before starting */ WOD_PushData(device); @@ -1649,14 +1635,11 @@ static HRESULT WINMM_BeginPlaying(WINMM_Device *device) hr = IAudioClient_Start(device->client); if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ device->stopped = TRUE; - LeaveCriticalSection(&device->lock); ERR("Start failed: %08x\n", hr); return hr; } } - LeaveCriticalSection(&device->lock); - return S_OK; } @@ -2304,7 +2287,6 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, DWORD_PTR dwInstance, DWORD dwFlags) { LRESULT res; - HRESULT hr; WINMM_OpenInfo info; WINMM_CBInfo cb_info; @@ -2317,11 +2299,6 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, if(!lphWaveOut && !(dwFlags & WAVE_FORMAT_QUERY)) return MMSYSERR_INVALPARAM; - hr = WINMM_StartDevicesThread(); - if(FAILED(hr)){ - ERR("Couldn't start the device thread: %08x\n", hr); - return MMSYSERR_ERROR; - } res = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); if(res != MMSYSERR_NOERROR) return res; @@ -2955,7 +2932,6 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, DWORD_PTR dwInstance, DWORD dwFlags) { LRESULT res; - HRESULT hr; WINMM_OpenInfo info; WINMM_CBInfo cb_info; @@ -2968,11 +2944,6 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, if(!lphWaveIn && !(dwFlags & WAVE_FORMAT_QUERY)) return MMSYSERR_INVALPARAM; - hr = WINMM_StartDevicesThread(); - if(FAILED(hr)){ - ERR("Couldn't start the device thread: %08x\n", hr); - return MMSYSERR_ERROR; - } res = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); if(res != MMSYSERR_NOERROR) return res; @@ -3409,7 +3380,6 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW DWORD fdwDetails) { WINMM_ControlDetails details; - HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmcdW, fdwDetails); @@ -3421,12 +3391,6 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW TRACE("dwControlID: %u\n", lpmcdW->dwControlID); - hr = WINMM_StartDevicesThread(); - if(FAILED(hr)){ - ERR("Couldn't start the device thread: %08x\n", hr); - return MMSYSERR_ERROR; - } - details.hmix = hmix; details.details = lpmcdW; details.flags = fdwDetails; @@ -3944,7 +3908,6 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails) { WINMM_ControlDetails details; - HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmcd, fdwDetails); @@ -3960,12 +3923,6 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, TRACE("dwControlID: %u\n", lpmcd->dwControlID); - hr = WINMM_StartDevicesThread(); - if(FAILED(hr)){ - ERR("Couldn't start the device thread: %08x\n", hr); - return MMSYSERR_ERROR; - } - details.hmix = hmix; details.details = lpmcd; details.flags = fdwDetails;

1 0

Frédéric Delanoy : winedbg: Remove dead assignment (Clang).
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: a2e8d6145344d5a1e4b65b3f5fa3d6ba56a5e36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e8d6145344d5a1e4b65b3f5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 19:26:00 2011 +0200 winedbg: Remove dead assignment (Clang). --- programs/winedbg/symbol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 6b689c2..8d7af5d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -293,7 +293,6 @@ enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_d } do { - i = 0; if (input_read_line("=> ", buffer, sizeof(buffer))) { if (buffer[0] == '\0') return sglv_aborted;

1 0

Henri Verbeet : wined3d: Implement wined3d_surface_bltfast() on top of wined3d_surface_blt().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: a84275075d4a20a9a7f42eda01585d34f31b56d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84275075d4a20a9a7f42eda0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:27 2011 +0200 wined3d: Implement wined3d_surface_bltfast() on top of wined3d_surface_blt(). --- dlls/wined3d/surface.c | 358 ++-------------------------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 18 insertions(+), 342 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a84275075d4a20a9a7f42…

1 0

Henri Verbeet : ddraw: Remove rectangle validation from ddraw_surface7_BltFast().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 831801dd60ffee59f9f3c7532d0a3e18a5a3ef96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831801dd60ffee59f9f3c7532… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:28 2011 +0200 ddraw: Remove rectangle validation from ddraw_surface7_BltFast(). This is already done by wined3d_surface_blt(). --- dlls/ddraw/surface.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b51c360..2b06cb9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3622,14 +3622,6 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d */ if(rsrc) { - if(rsrc->top > rsrc->bottom || rsrc->left > rsrc->right || - rsrc->right > src->surface_desc.dwWidth || - rsrc->bottom > src->surface_desc.dwHeight) - { - WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); - return DDERR_INVALIDRECT; - } - src_w = rsrc->right - rsrc->left; src_h = rsrc->bottom - rsrc->top; }

1 0

Henri Verbeet : wined3d: Always pass a non-NULL rectangle to surface_color_fill() in wined3d_device_color_fill().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 7e8e7ecebb2b2574cf185fa92e171844efe895bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8e7ecebb2b2574cf185fa92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:29 2011 +0200 wined3d: Always pass a non-NULL rectangle to surface_color_fill() in wined3d_device_color_fill(). --- dlls/wined3d/device.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19aa3d0..ee08b7d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4981,6 +4981,8 @@ HRESULT CDECL wined3d_device_delete_patch(struct wined3d_device *device, UINT ha HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, const WINED3DCOLORVALUE *color) { + RECT r; + TRACE("device %p, surface %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", device, surface, wine_dbgstr_rect(rect), color->r, color->g, color->b, color->a); @@ -4991,6 +4993,12 @@ HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + if (!rect) + { + SetRect(&r, 0, 0, surface->resource.width, surface->resource.height); + rect = &r; + } + return surface_color_fill(surface, rect, color); }

1 0

Henri Verbeet : wined3d: Pass a non-NULL rectangle to surface_color_fill() in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 293bf961ed7e161b29069f99a737d6249ca25365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293bf961ed7e161b29069f99a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:30 2011 +0200 wined3d: Pass a non-NULL rectangle to surface_color_fill() in wined3d_device_clear_rendertarget_view(). --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee08b7d..66f89f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5008,6 +5008,7 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, { struct wined3d_resource *resource; HRESULT hr; + RECT rect; resource = rendertarget_view->resource; if (resource->resourceType != WINED3DRTYPE_SURFACE) @@ -5016,7 +5017,8 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, return; } - hr = surface_color_fill(surface_from_resource(resource), NULL, color); + SetRect(&rect, 0, 0, resource->width, resource->height); + hr = surface_color_fill(surface_from_resource(resource), &rect, color); if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); }

1 0