June 2012 - Wine-commits - list.winehq.org

Christian Costa : d3drm: Pass mesh builder color to newly created mesh.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 23db9d8bedd258c3649a5684db20b0ce3b0fa197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23db9d8bedd258c3649a5684d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:31:08 2012 +0200 d3drm: Pass mesh builder color to newly created mesh. --- dlls/d3drm/meshbuilder.c | 2 ++ dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index dabea1f..f3f00c1 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2022,6 +2022,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } } if (SUCCEEDED(hr)) + hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color); + if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material); if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 54a356a..f351b02 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -369,7 +369,7 @@ static void test_MeshBuilder(void) todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); color = IDirect3DRMMesh_GetGroupColor(mesh, 0); - todo_wine ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); + ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); ok(texture == NULL, "No texture should be present\n");

1 0

Gerald Pfeifer : ntdll: Omit unused typedef in test_query_timeofday.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 43923decba7f2f36e3417d86b868efc09ca38fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43923decba7f2f36e3417d86b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jun 5 07:48:49 2012 +0200 ntdll: Omit unused typedef in test_query_timeofday. --- dlls/ntdll/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1b14950..148da91 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -184,7 +184,7 @@ static void test_query_timeofday(void) LARGE_INTEGER liExpTimeZoneBias; ULONG uCurrentTimeZoneId; DWORD dwUnknown1[5]; - } SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE, *PSYSTEM_TIMEOFDAY_INFORMATION_PRIVATE; + } SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE; SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE sti;

1 0

Józef Kucia : windowscodecs/tests: Fix the expected values in some ok() messages.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: cc547444dfe8a8b1598cbfa1b0d8d360553621e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc547444dfe8a8b1598cbfa1b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 13:21:12 2012 +0200 windowscodecs/tests: Fix the expected values in some ok() messages. --- dlls/windowscodecs/tests/stream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 0dbcddf..a3295e6 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -160,7 +160,7 @@ static void test_StreamOnMemory(void) hr = IWICStream_Read(pStream, MemBuf, 12, &uBytesRead); ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); if(SUCCEEDED(hr)) { - ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 3); + ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 12); ok(memcmp(MemBuf, CmpMem, 12) == 0, "Read returned invalid data!\n"); /* check whether the seek pointer has moved correctly */ @@ -506,7 +506,7 @@ static void test_StreamOnStreamRange(void) hr = IWICStream_Read(pSubStream, MemBuf, 12, &uBytesRead); ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); if(SUCCEEDED(hr)) { - ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 3); + ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 12); ok(memcmp(MemBuf, CmpMem+20, 12) == 0, "Read returned invalid data!\n"); /* check whether the seek pointer has moved correctly */

1 0

Alexandre Julliard : gdi32: Take into account the DIB rectangles when determining overlap for blits.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 319a87c86e8f6faf0ee1bbe2dba5933843d59c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319a87c86e8f6faf0ee1bbe2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 20:44:24 2012 +0200 gdi32: Take into account the DIB rectangles when determining overlap for blits. --- dlls/gdi32/dibdrv/bitblt.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 724b704..bac5a60 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -438,11 +438,11 @@ static int get_overlap( const dib_info *dst, const RECT *dst_rect, int height, ret = 0; if (dst->stride != src->stride) return 0; /* can't be the same dib */ - if (dst_rect->right <= src_rect->left) return 0; - if (dst_rect->left >= src_rect->right) return 0; + if (dst->rect.left + dst_rect->right <= src->rect.left + src_rect->left) return 0; + if (dst->rect.left + dst_rect->left >= src->rect.left + src_rect->right) return 0; - src_top = (const char *)src->bits.ptr + src_rect->top * src->stride; - dst_top = (const char *)dst->bits.ptr + dst_rect->top * dst->stride; + src_top = (const char *)src->bits.ptr + (src->rect.top + src_rect->top) * src->stride; + dst_top = (const char *)dst->bits.ptr + (dst->rect.top + dst_rect->top) * dst->stride; height = (dst_rect->bottom - dst_rect->top) * dst->stride; if (dst->stride > 0) @@ -460,8 +460,8 @@ static int get_overlap( const dib_info *dst, const RECT *dst_rect, else if (dst_top < src_top) ret |= OVERLAP_BELOW; } - if (dst_rect->left < src_rect->left) ret |= OVERLAP_LEFT; - else if (dst_rect->left > src_rect->left) ret |= OVERLAP_RIGHT; + if (dst->rect.left + dst_rect->left < src->rect.left + src_rect->left) ret |= OVERLAP_LEFT; + else if (dst->rect.left + dst_rect->left > src->rect.left + src_rect->left) ret |= OVERLAP_RIGHT; return ret; }

1 0

Alexandre Julliard : gdi32: Clip output to both the DIB visible rectangle and the total DIB extents.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: c07763b4194c3dc81391c8d74d0552f5140b18ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07763b4194c3dc81391c8d74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 22:22:29 2012 +0200 gdi32: Clip output to both the DIB visible rectangle and the total DIB extents. --- dlls/gdi32/dibdrv/dc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 798a9cd..df51332 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -263,10 +263,11 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl init_clipped_rects( clip_rects ); - rect.left = 0; - rect.top = 0; - rect.right = dib->rect.right - dib->rect.left; - rect.bottom = dib->rect.bottom - dib->rect.top; + rect.left = max( 0, -dib->rect.left ); + rect.top = max( 0, -dib->rect.top ); + rect.right = min( dib->rect.right, dib->width ) - dib->rect.left; + rect.bottom = min( dib->rect.bottom, dib->height ) - dib->rect.top; + if (is_rect_empty( &rect )) return 0; if (rc && !intersect_rect( &rect, &rect, rc )) return 0; if (!clip)

1 0

Michael Stefaniuc : shlwapi/tests: Fix the expected value in an ok() message.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: a5b0d137414fea60ced9165eb6e03e764e40343a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b0d137414fea60ced9165eb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 4 17:29:58 2012 +0200 shlwapi/tests: Fix the expected value in an ok() message. --- dlls/shlwapi/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 949aaa0..fbc3601 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -901,7 +901,7 @@ static void test_UrlEscape(void) wc = 127; ret = pUrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); - ok(size == 10, "got %d, expected 9\n", size); + ok(size == 10, "got %d, expected 10\n", size); ok(wc == 127, "String has changed, wc = %d\n", wc); }

1 0

Michael Stefaniuc : msxml3/tests: Fix the expected values in some ok() messages.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 90f93e3819dcaa0cea16bd297fa69a359fb6b517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f93e3819dcaa0cea16bd297… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 4 17:31:18 2012 +0200 msxml3/tests: Fix the expected values in some ok() messages. --- dlls/msxml3/tests/saxreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 003446f..33ac2dc 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4580,9 +4580,9 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK); if (table->hr == S_OK) - ok(len == 1, "%d: got %d length, expected 0\n", i, len); + ok(len == 1, "%d: got %d length, expected 1\n", i, len); else - ok(len == 0, "%d: got %d length, expected 1\n", i, len); + ok(len == 0, "%d: got %d length, expected 0\n", i, len); ISAXAttributes_Release(saxattr); IMXAttributes_Release(mxattr);

1 0

André Hentschel : ntdll: Add default COM device for DragonFly BSD.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1748f0de4ed44beac8a80079c67c2bc2b8c80e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1748f0de4ed44beac8a80079c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:54:10 2012 +0200 ntdll: Add default COM device for DragonFly BSD. --- dlls/ntdll/directory.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index a048e1d..1b60fbe 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -320,6 +320,13 @@ static char *get_default_com_device( int num ) strcpy( ret, "/dev/cuad0" ); ret[strlen(ret) - 1] = '0' + num - 1; } +#elif defined(__DragonFly__) + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuaa0") ); + if (ret) + { + strcpy( ret, "/dev/cuaa0" ); + ret[strlen(ret) - 1] = '0' + num - 1; + } #else FIXME( "no known default for device com%d\n", num ); #endif

1 0

André Hentschel : ntdll: Change default COM device for FreeBSD 8.0.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1b1af341733cda0430b38f21b3360bb2787ee25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1af341733cda0430b38f21b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:54:49 2012 +0200 ntdll: Change default COM device for FreeBSD 8.0. --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 1b60fbe..329e063 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -314,10 +314,10 @@ static char *get_default_com_device( int num ) ret[strlen(ret) - 1] = '0' + num - 1; } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuad0") ); + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuau0") ); if (ret) { - strcpy( ret, "/dev/cuad0" ); + strcpy( ret, "/dev/cuau0" ); ret[strlen(ret) - 1] = '0' + num - 1; } #elif defined(__DragonFly__)

1 0

André Hentschel : ntdll: Get the unix tid on DragonFly BSD.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 4c44e151bee80973bd3bf20de78da756528e4b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c44e151bee80973bd3bf20de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:55:04 2012 +0200 ntdll: Get the unix tid on DragonFly BSD. --- dlls/ntdll/server.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 8a01d22..392668d 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -955,6 +955,8 @@ static int get_unix_tid(void) long lwpid; thr_self( &lwpid ); ret = lwpid; +#elif defined(__DragonFly__) + ret = lwp_gettid(); #endif return ret; }

1 0