January 2012 - Wine-Commits

Henri Verbeet : ddraw: Use the window's client rect for clipping.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 3e9fe3e938f26a8c831f92367a13776d165cfdf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9fe3e938f26a8c831f92367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 6 11:20:03 2012 +0100 ddraw: Use the window's client rect for clipping. --- dlls/ddraw/clipper.c | 76 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 56 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index b3482e7..5b8e9ce 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -93,6 +93,32 @@ static HRESULT WINAPI ddraw_clipper_SetHWnd(IDirectDrawClipper *iface, DWORD fla return DD_OK; } +static HRGN get_window_region(HWND window) +{ + POINT origin = {0, 0}; + RECT client_rect; + + if (!GetClientRect(window, &client_rect)) + { + ERR("Failed to get client rect.\n"); + return NULL; + } + + if (!ClientToScreen(window, &origin)) + { + ERR("Failed to translate origin.\n"); + return NULL; + } + + if (!OffsetRect(&client_rect, origin.x, origin.y)) + { + ERR("Failed to translate client rect.\n"); + return NULL; + } + + return CreateRectRgnIndirect(&client_rect); +} + /***************************************************************************** * IDirectDrawClipper::GetClipList * @@ -116,6 +142,7 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); static unsigned int once; + HRGN region; TRACE("iface %p, rect %s, clip_list %p, clip_list_size %p.\n", iface, wine_dbgstr_rect(rect), clip_list, clip_list_size); @@ -124,31 +151,40 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT if (clipper->window) { - HDC dc = GetDCEx(clipper->window, NULL, DCX_WINDOW); - if (dc) + if (!(region = get_window_region(clipper->window))) + { + wined3d_mutex_unlock(); + ERR("Failed to get window region.\n"); + return E_FAIL; + } + + if (rect) { - HRGN rgn = CreateRectRgn(0, 0, 0, 0); - if (GetRandomRgn(dc, rgn, SYSRGN)) + HRGN clip_region; + int ret; + + if (!(clip_region = CreateRectRgnIndirect(rect))) + { + wined3d_mutex_unlock(); + ERR("Failed to create region.\n"); + DeleteObject(region); + return E_FAIL; + } + + ret = CombineRgn(region, region, clip_region, RGN_AND); + DeleteObject(clip_region); + if (ret == ERROR) { - if (GetVersion() & 0x80000000) - { - POINT origin; - GetDCOrgEx(dc, &origin); - OffsetRgn(rgn, origin.x, origin.y); - } - if (rect) - { - HRGN clip_rgn = CreateRectRgn(rect->left, rect->top, - rect->right, rect->bottom); - CombineRgn(rgn, rgn, clip_rgn, RGN_AND); - DeleteObject(clip_rgn); - } - *clip_list_size = GetRegionData(rgn, *clip_list_size, clip_list); + wined3d_mutex_unlock(); + ERR("Failed to combine regions.\n"); + DeleteObject(region); + return E_FAIL; } - DeleteObject(rgn); - ReleaseDC(clipper->window, dc); } + *clip_list_size = GetRegionData(region, *clip_list_size, clip_list); + DeleteObject(region); + wined3d_mutex_unlock(); return DD_OK; }

1 0

Jörg Höhle : wineoss: GetStreamLatency is constant, SNDCTL_DSP_GETODELAY is dynamic.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 6d23816300a79e12ce927ebc14948831826038ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d23816300a79e12ce927ebc1… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 22:19:35 2012 +0100 wineoss: GetStreamLatency is constant, SNDCTL_DSP_GETODELAY is dynamic. --- dlls/wineoss.drv/mmdevdrv.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 304a5e1..15bda6a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1046,26 +1046,9 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } - if(This->dataflow == eRender){ - int delay_bytes; - double delay_s; - - if(ioctl(This->fd, SNDCTL_DSP_GETODELAY, &delay_bytes) < 0){ - LeaveCriticalSection(&This->lock); - WARN("GETODELAY failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - delay_s = delay_bytes / (double)(This->fmt->nSamplesPerSec * - This->fmt->nBlockAlign); - - *latency = delay_s * 10000000; - }else - *latency = 10000; /* OSS doesn't provide input latency */ - /* pretend we process audio in Period chunks, so max latency includes - * the period time */ - *latency += DefaultPeriod; + * the period time. Some native machines add .6666ms in shared mode. */ + *latency = This->period_us * 10 + 6666; LeaveCriticalSection(&This->lock);

1 0

Jörg Höhle : winecoreaudio: Fix latency calculation.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 9bd61f433739c36fbcd14c057ad632c55392b49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd61f433739c36fbcd14c057… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 22:09:47 2012 +0100 winecoreaudio: Fix latency calculation. --- dlls/winecoreaudio.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index e5d2d87..93ff3d6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1210,8 +1210,8 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, latency += stream_latency; /* pretend we process audio in Period chunks, so max latency includes * the period time */ - latency += DefaultPeriod; - *out = (latency / (double)This->fmt->nSamplesPerSec) * 10000000; + *out = MulDiv(latency, 10000000, This->fmt->nSamplesPerSec) + + This->period_ms * 10000; OSSpinLockUnlock(&This->lock);

1 0

Jörg Höhle : mmdevapi: GetDevicePeriod returns constants.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: acd8d60faaf00159e6c3cea76eed878df6fa6de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd8d60faaf00159e6c3cea76… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:17:31 2012 +0100 mmdevapi: GetDevicePeriod returns constants. --- dlls/winecoreaudio.drv/mmdevdrv.c | 19 ++++--------------- dlls/wineoss.drv/mmdevdrv.c | 4 ---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a2c72da..e5d2d87 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1396,21 +1396,10 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, if(!defperiod && !minperiod) return E_POINTER; - OSSpinLockLock(&This->lock); - - if(This->period_ms){ - if(defperiod) - *defperiod = This->period_ms * 10000; - if(minperiod) - *minperiod = This->period_ms * 10000; - }else{ - if(defperiod) - *defperiod = DefaultPeriod; - if(minperiod) - *minperiod = MinimumPeriod; - } - - OSSpinLockUnlock(&This->lock); + if(defperiod) + *defperiod = DefaultPeriod; + if(minperiod) + *minperiod = MinimumPeriod; return S_OK; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e80385c..304a5e1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1261,15 +1261,11 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, if(!defperiod && !minperiod) return E_POINTER; - EnterCriticalSection(&This->lock); - if(defperiod) *defperiod = DefaultPeriod; if(minperiod) *minperiod = MinimumPeriod; - LeaveCriticalSection(&This->lock); - return S_OK; }

1 0

Henri Verbeet : ddraw: Convert to integer before adjusting the clipped source rect.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 31f3120815721c36b3f31a66e91a564aa3c5165b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f3120815721c36b3f31a66e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 6 11:20:05 2012 +0100 ddraw: Convert to integer before adjusting the clipped source rect. This makes a difference for the bottom and right edges, and we could end up with an empty source rectangle otherwise. --- dlls/ddraw/surface.c | 8 ++++---- dlls/ddraw/tests/ddraw1.c | 10 +++------- dlls/ddraw/tests/ddraw2.c | 10 +++------- dlls/ddraw/tests/ddraw4.c | 10 +++------- dlls/ddraw/tests/ddraw7.c | 10 +++------- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0b9248c..6069da7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1361,10 +1361,10 @@ static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, co if (src_surface) { - src_rect_clipped.left += (clip_rect[i].left - dst_rect.left) * scale_x; - src_rect_clipped.top += (clip_rect[i].top - dst_rect.top) * scale_y; - src_rect_clipped.right -= (dst_rect.right - clip_rect[i].right) * scale_x; - src_rect_clipped.bottom -= (dst_rect.bottom - clip_rect[i].bottom) * scale_y; + src_rect_clipped.left += (LONG)((clip_rect[i].left - dst_rect.left) * scale_x); + src_rect_clipped.top += (LONG)((clip_rect[i].top - dst_rect.top) * scale_y); + src_rect_clipped.right -= (LONG)((dst_rect.right - clip_rect[i].right) * scale_x); + src_rect_clipped.bottom -= (LONG)((dst_rect.bottom - clip_rect[i].bottom) * scale_y); if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7275df6..09d632a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -297,7 +297,7 @@ static void test_clipper_blt(void) SetRect(&src_rect, 0, 0, 4, 1); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -305,12 +305,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - if ((i < 2 && j < 2) || (i >= 2 && j >= 2)) - todo_wine ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); - else - ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); + ok(compare_color(color, expected1[i * 4 + j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 71a57a8..7ffa977 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -304,7 +304,7 @@ static void test_clipper_blt(void) SetRect(&src_rect, 0, 0, 4, 1); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -312,12 +312,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - if ((i < 2 && j < 2) || (i >= 2 && j >= 2)) - todo_wine ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); - else - ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); + ok(compare_color(color, expected1[i * 4 + j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index db8d005..68448d1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -599,7 +599,7 @@ static void test_clipper_blt(void) SetRect(&src_rect, 0, 0, 4, 1); hr = IDirectDrawSurface4_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -607,12 +607,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - if ((i < 2 && j < 2) || (i >= 2 && j >= 2)) - todo_wine ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); - else - ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); + ok(compare_color(color, expected1[i * 4 + j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 630247b..d434c94 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -592,7 +592,7 @@ static void test_clipper_blt(void) SetRect(&src_rect, 0, 0, 4, 1); hr = IDirectDrawSurface7_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -600,12 +600,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - if ((i < 2 && j < 2) || (i >= 2 && j >= 2)) - todo_wine ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); - else - ok(compare_color(color, expected1[i * 4 + j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); + ok(compare_color(color, expected1[i * 4 + j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } }

1 0

Daniel Lehman : msvcp90: Fix return value for ctype<wchar_t> do_is(ch).
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 4654b3f68e9640edfec15439ea696d352f71c513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4654b3f68e9640edfec15439e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jan 5 14:49:50 2012 -0800 msvcp90: Fix return value for ctype<wchar_t> do_is(ch). --- dlls/msvcp90/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 3f09ea0..fcf2c8b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2339,7 +2339,7 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_is_ch, 12) MSVCP_bool __thiscall ctype_wchar_do_is_ch(const ctype_wchar *this, short mask, wchar_t ch) { TRACE("(%p %x %d)\n", this, mask, ch); - return !(_Getwctype(ch, &this->ctype) & mask); + return (_Getwctype(ch, &this->ctype) & mask) != 0; } /* ?do_is@?$ctype(a)_W@std@@MBEPB_WPB_W0PAF(a)Z */

1 0

Daniel Lehman : msvcrt: Make WEOF returned from swscanf signed.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 5a3695ccee31a1e0353a96f4e82619cf3de4cd36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3695ccee31a1e0353a96f4e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jan 4 13:58:23 2012 -0800 msvcrt: Make WEOF returned from swscanf signed. --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index d1ac548..9f6911e 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -26,7 +26,7 @@ #ifdef WIDE_SCANF #define _CHAR_ MSVCRT_wchar_t #define _EOF_ MSVCRT_WEOF -#define _EOF_RET MSVCRT_WEOF +#define _EOF_RET (short)MSVCRT_WEOF #define _ISSPACE_(c) MSVCRT_iswspace(c) #define _ISDIGIT_(c) MSVCRT_iswdigit(c) #define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */ diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index cbfb184..8b13bdc 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -243,8 +243,25 @@ static void test_sscanf_s(void) ok(i==123, "i = %d\n", i); } +static void test_swscanf( void ) +{ + wchar_t buffer[100]; + int result, ret; + static const WCHAR formatd[] = {'%','d',0}; + + /* check WEOF */ + /* WEOF is an unsigned short -1 but swscanf returns int + so it should be sign-extended */ + buffer[0] = 0; + ret = swscanf(buffer, formatd, &result); + /* msvcrt returns 0 but should return -1 (later versions do) */ + ok( ret == (short)WEOF || broken(ret == 0), + "swscanf returns %x instead of %x\n", ret, WEOF ); +} + START_TEST(scanf) { test_sscanf(); test_sscanf_s(); + test_swscanf(); }

1 0

Francois Gouget : include: tom.idl should import ocidl.idl.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 63e78264d821305685b69c1df0ce122ab6d884fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e78264d821305685b69c1df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:23:28 2012 +0100 include: tom.idl should import ocidl.idl. --- include/tom.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index 35be7f7..daa907b 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -17,6 +17,7 @@ */ import "oaidl.idl"; +import "ocidl.idl"; cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef FindText")

1 0

Jörg Höhle : mmdevapi: Avoid HeapRealloc when no data need be copied.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 8316a77959722c9c3cc5fbf69cf9345e1a88979e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8316a77959722c9c3cc5fbf69… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 17:58:21 2012 +0100 mmdevapi: Avoid HeapRealloc when no data need be copied. --- dlls/winealsa.drv/mmdevdrv.c | 18 ++++++------------ dlls/wineoss.drv/mmdevdrv.c | 17 ++++++----------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2557e6e..3168e8f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2029,12 +2029,9 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; if(write_pos + frames > This->bufsize_frames){ if(This->tmp_buffer_frames < frames){ - if(This->tmp_buffer) - This->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, - This->tmp_buffer, frames * This->fmt->nBlockAlign); - else - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - frames * This->fmt->nBlockAlign); + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + frames * This->fmt->nBlockAlign); if(!This->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; @@ -2184,12 +2181,9 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(This->lcl_offs_frames + *frames > This->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(This->tmp_buffer_frames < *frames){ - if(This->tmp_buffer) - This->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, - This->tmp_buffer, *frames * This->fmt->nBlockAlign); - else - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - *frames * This->fmt->nBlockAlign); + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + *frames * This->fmt->nBlockAlign); if(!This->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dbbcd9f..e80385c 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1738,12 +1738,9 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; if(write_pos + frames > This->bufsize_frames){ if(This->tmp_buffer_frames < frames){ - if(This->tmp_buffer) - This->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, - This->tmp_buffer, frames * This->fmt->nBlockAlign); - else - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - frames * This->fmt->nBlockAlign); + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + frames * This->fmt->nBlockAlign); if(!This->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; @@ -1922,11 +1919,9 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT32 chunk_bytes, offs_bytes, frames_bytes; if(This->tmp_buffer_frames < *frames){ if(This->tmp_buffer) - This->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, - This->tmp_buffer, *frames * This->fmt->nBlockAlign); - else - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - *frames * This->fmt->nBlockAlign); + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + *frames * This->fmt->nBlockAlign); if(!This->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY;

1 0

Francois Gouget : include: winsxs.idl should not import oleidl.idl.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 739bd884a027e06abe50d7e9cd637c5bd8bcd357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739bd884a027e06abe50d7e9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:23:32 2012 +0100 include: winsxs.idl should not import oleidl.idl. --- include/winsxs.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winsxs.idl b/include/winsxs.idl index c2c38f2..202b91f 100644 --- a/include/winsxs.idl +++ b/include/winsxs.idl @@ -17,6 +17,7 @@ */ import "objidl.idl"; +import "oleidl.idl"; interface IAssemblyCache; interface IAssemblyCacheItem;

1 0