January 2012 - Wine-commits

Jörg Höhle : winealsa: Have GetStreamLatency reflect the ALSA period.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 92d8e93acb34f561a7c381a3fca954474d0c0bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d8e93acb34f561a7c381a3f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:36:43 2012 +0100 winealsa: Have GetStreamLatency reflect the ALSA period. --- dlls/winealsa.drv/mmdevdrv.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3168e8f..cb118cff 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1138,7 +1138,9 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, LeaveCriticalSection(&This->lock); - *latency = 500000; + /* one mmdevapi period plus one period we hide in the ALSA buffer */ + *latency = MulDiv(This->alsa_period_frames, 10000000, This->fmt->nSamplesPerSec) + + This->mmdev_period_rt; return S_OK; }

1 0

Jörg Höhle : wineoss: GetStreamLatency is constant, SNDCTL_DSP_GETODELAY is dynamic.
by Alexandre Julliard 06 Jan '12

06 Jan '12

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

Henri Verbeet : ddraw: Use the window's client rect for clipping.
by Alexandre Julliard 06 Jan '12

06 Jan '12

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

Henri Verbeet : ddraw: Implement IDirectDrawClipper::SetClipList().
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: f17e7148578939dbfac67bcb67746831819db5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17e7148578939dbfac67bcb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 6 11:20:04 2012 +0100 ddraw: Implement IDirectDrawClipper::SetClipList(). --- dlls/ddraw/clipper.c | 83 +++++++++++++++++++++++++++---------------- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/tests/ddraw1.c | 12 +++---- dlls/ddraw/tests/ddraw2.c | 12 +++---- dlls/ddraw/tests/ddraw4.c | 12 +++---- dlls/ddraw/tests/ddraw7.c | 12 +++---- 6 files changed, 73 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f17e7148578939dbfac67…

1 0

Henri Verbeet : ddraw: Convert to integer before adjusting the clipped source rect.
by Alexandre Julliard 06 Jan '12

06 Jan '12

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

Francois Gouget : include: wincodec.idl should not import objidl.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 33ec4fbdc4febed037cb9f10516f65bd8fca1122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ec4fbdc4febed037cb9f105… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:22:56 2012 +0100 include: wincodec.idl should not import objidl.idl. --- include/wincodec.idl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 4c46cf4..a57c5b7 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -18,7 +18,6 @@ import "wtypes.idl"; import "propidl.idl"; -import "objidl.idl"; import "ocidl.idl"; cpp_quote("#define WINCODEC_SDK_VERSION 0x0236")

1 0

Francois Gouget : include: ocmm.idl should import oleidl.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 94711b29fdcc8c701452fe3220b6dda5c129dd71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94711b29fdcc8c701452fe322… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:23:02 2012 +0100 include: ocmm.idl should import oleidl.idl. --- include/ocmm.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ocmm.idl b/include/ocmm.idl index 57adf34..0d2c2c0 100644 --- a/include/ocmm.idl +++ b/include/ocmm.idl @@ -17,7 +17,7 @@ */ import "oaidl.idl"; -import "ocidl.idl"; +import "oleidl.idl"; cpp_quote("EXTERN_C const GUID NAMEDTIMER_DRAW;")

1 0

Francois Gouget : include: mshtml.idl should import dispex.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 80bee500b1560827544bfed2271ebc0c4d405f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bee500b1560827544bfed22… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:23:23 2012 +0100 include: mshtml.idl should import dispex.idl. --- include/mshtml.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2837b60..71d49e1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -24,6 +24,7 @@ import "ocidl.idl"; import "dimm.idl"; import "shtypes.idl"; +import "dispex.idl"; cpp_quote("#include <olectl.h>")

1 0

Francois Gouget : include: tom.idl should import ocidl.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

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

Francois Gouget : include: winsxs.idl should not import oleidl.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

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