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

Matteo Bruni : d3dcompiler: Use a separate bytecodewriter debug channel.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 233101b0ca0a413abe3c62e3d867ae37daa951a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233101b0ca0a413abe3c62e3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 17:58:21 2012 +0200 d3dcompiler: Use a separate bytecodewriter debug channel. --- dlls/d3dcompiler_43/bytecodewriter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 5a3e7f2..f24ac9d 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -27,7 +27,7 @@ #include "d3d9types.h" #include "d3dcompiler_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(asmshader); +WINE_DEFAULT_DEBUG_CHANNEL(bytecodewriter); /**************************************************************** * General assembler shader construction helper routines follow *

1 0

Michael Stefaniuc : include: Move "inline" right after the storage specifier.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 2e3c0d86cfe573ae686ad134fdc55dede54a5b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3c0d86cfe573ae686ad134f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 5 11:35:34 2012 +0200 include: Move "inline" right after the storage specifier. --- include/wine/port.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 705716e..4b653c7 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -200,7 +200,7 @@ struct statvfs #endif #ifndef NAN -static float inline __port_nan(void) +static inline float __port_nan(void) { static const unsigned __nan_bytes = 0x7fc00000; return *(const float *)&__nan_bytes;

1 0

Gerald Pfeifer : ntdll: Omit unused typedef in test_query_timeofday.
by Alexandre Julliard June 5, 2012

June 5, 2012

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

Alexandre Julliard : gdi32: Take into account the DIB rectangles when determining overlap for blits.
by Alexandre Julliard June 5, 2012

June 5, 2012

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 June 5, 2012

June 5, 2012

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 : msxml3/tests: Fix the expected values in some ok() messages.
by Alexandre Julliard June 4, 2012

June 4, 2012

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

Michael Stefaniuc : shlwapi/tests: Fix the expected value in an ok() message.
by Alexandre Julliard June 4, 2012

June 4, 2012

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

André Hentschel : ntdll: Get the unix tid on DragonFly BSD.
by Alexandre Julliard June 4, 2012

June 4, 2012

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

André Hentschel : iphlpapi: Fix check for icmpstat. icps_outhist.
by Alexandre Julliard June 4, 2012

June 4, 2012

Module: wine Branch: master Commit: c74b1c21596b40586c2fcff3efc5e31ebc0a9a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74b1c21596b40586c2fcff3e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:57:34 2012 +0200 iphlpapi: Fix check for icmpstat.icps_outhist. --- dlls/iphlpapi/ipstats.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f87e056..c204223 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -522,7 +522,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) stats->stats.icmpInStats.dwAddrMasks = icmp_stat.icps_inhist[ICMP_MASKREQ]; stats->stats.icmpInStats.dwAddrMaskReps = icmp_stat.icps_inhist[ICMP_MASKREPLY]; -#ifdef HAVE_ICPS_OUTHIST +#ifdef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST /* out stats */ stats->stats.icmpOutStats.dwMsgs = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; for(i = 0; i <= ICMP_MAXTYPE; i++) @@ -541,7 +541,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) stats->stats.icmpOutStats.dwTimestampReps = icmp_stat.icps_outhist[ICMP_TSTAMPREPLY]; stats->stats.icmpOutStats.dwAddrMasks = icmp_stat.icps_outhist[ICMP_MASKREQ]; stats->stats.icmpOutStats.dwAddrMaskReps = icmp_stat.icps_outhist[ICMP_MASKREPLY]; -#endif /* ICPS_OUTHIST */ +#endif /* HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST */ ret = NO_ERROR; } }

1 0

André Hentschel : iphlpapi: Check for the right IP statistics structure name (for DragonFly BSD).
by Alexandre Julliard June 4, 2012

June 4, 2012

Module: wine Branch: master Commit: cecf1056bb17f83586568c98d42ed687c1c41684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecf1056bb17f83586568c98d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:58:39 2012 +0200 iphlpapi: Check for the right IP statistics structure name (for DragonFly BSD). --- configure | 311 ++++++++++++++++++++++++++--------------------- configure.ac | 12 ++ dlls/iphlpapi/ipstats.c | 6 +- include/config.h.in | 11 ++ 4 files changed, 199 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cecf1056bb17f83586568…

1 0