February 2009 - Wine-Commits

Nikolay Sivov : gdiplus: Implemented GdipGetRegionBounds/ GdipGetRegionBoundsI.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: dc3908a351875c5c7ff7ee69684eef56a317d128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3908a351875c5c7ff7ee696… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 30 23:56:01 2009 +0300 gdiplus: Implemented GdipGetRegionBounds/GdipGetRegionBoundsI. --- dlls/gdiplus/region.c | 56 ++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/region.c | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index cc3b6cb..e42c5cd 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -634,18 +634,66 @@ GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) return Ok; } +/***************************************************************************** + * GdipGetRegionBounds [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); + HRGN hrgn; + RECT r; + GpStatus status; - return NotImplemented; + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!region || !graphics || !rect) + return InvalidParameter; + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok) + return status; + + /* infinite */ + if(!hrgn){ + rect->X = rect->Y = -(REAL)(1 << 22); + rect->Width = rect->Height = (REAL)(1 << 23); + return Ok; + } + + if(!GetRgnBox(hrgn, &r)){ + DeleteObject(hrgn); + return GenericError; + } + + rect->X = r.left; + rect->Y = r.top; + rect->Width = r.right - r.left; + rect->Height = r.bottom - r.top; + + return Ok; } +/***************************************************************************** + * GdipGetRegionBoundsI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *region, GpGraphics *graphics, GpRect *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); + GpRectF rectf; + GpStatus status; - return NotImplemented; + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!rect) + return InvalidParameter; + + status = GdipGetRegionBounds(region, graphics, &rectf); + if(status == Ok){ + rect->X = roundr(rectf.X); + rect->Y = roundr(rectf.X); + rect->Width = roundr(rectf.Width); + rect->Height = roundr(rectf.Height); + } + + return status; } static inline void write_dword(DWORD* location, INT* offset, const DWORD write) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 294fed7..689811c 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1120,6 +1120,67 @@ static void test_translate(void) ReleaseDC(0, hdc); } +static void test_getbounds(void) +{ + GpRegion *region; + GpGraphics *graphics; + GpStatus status; + GpRectF rectf; + HDC hdc = GetDC(0); + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %08x\n", status); + status = GdipCreateRegion(&region); + ok(status == Ok, "status %08x\n", status); + + /* NULL */ + status = GdipGetRegionBounds(NULL, NULL, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipGetRegionBounds(region, NULL, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipGetRegionBounds(region, graphics, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + /* infinite */ + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 100.0; + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == -(REAL)(1 << 22), "Expected X = %.2f, got %.2f\n", -(REAL)(1 << 22), rectf.X); + ok(rectf.Y == -(REAL)(1 << 22), "Expected Y = %.2f, got %.2f\n", -(REAL)(1 << 22), rectf.Y); + ok(rectf.Width == (REAL)(1 << 23), "Expected width = %.2f, got %.2f\n", (REAL)(1 << 23), rectf.Width); + ok(rectf.Height == (REAL)(1 << 23), "Expected height = %.2f, got %.2f\n",(REAL)(1 << 23), rectf.Height); + /* empty */ + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 100.0; + status = GdipSetEmpty(region); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == 0.0, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 0.0, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 0.0, "Expected width = 0.0, got %.2f\n", rectf.Width); + ok(rectf.Height == 0.0, "Expected height = 0.0, got %.2f\n", rectf.Height); + /* rect */ + rectf.X = 10.0; rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 0.0; + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == 10.0, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 0.0, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 100.0, "Expected width = 0.0, got %.2f\n", rectf.Width); + ok(rectf.Height == 100.0, "Expected height = 0.0, got %.2f\n", rectf.Height); + + status = GdipDeleteRegion(region); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteGraphics(graphics); + ok(status == Ok, "status %08x\n", status); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1140,6 +1201,7 @@ START_TEST(region) test_gethrgn(); test_isequal(); test_translate(); + test_getbounds(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipTranslateClip/GdipTranslateClipI.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: 5da52e0677ee5a3d234a669bd97df07287b683d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da52e0677ee5a3d234a669bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jan 31 00:07:30 2009 +0300 gdiplus: Implemented GdipTranslateClip/GdipTranslateClipI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3716207..7e7bfbf 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -609,8 +609,8 @@ @ stdcall GdipTransformPoints(ptr long long ptr long) @ stdcall GdipTransformPointsI(ptr long long ptr long) @ stdcall GdipTransformRegion(ptr ptr) -@ stub GdipTranslateClip -@ stub GdipTranslateClipI +@ stdcall GdipTranslateClip(ptr long long) +@ stdcall GdipTranslateClipI(ptr long long) @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) @ stub GdipTranslatePathGradientTransform diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5193334..039739b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3318,3 +3318,29 @@ HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void) return NULL; } + +/***************************************************************************** + * GdipTranslateClip [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics *graphics, REAL dx, REAL dy) +{ + TRACE("(%p, %.2f, %.2f)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + return GdipTranslateRegion(graphics->clip, dx, dy); +} + +/***************************************************************************** + * GdipTranslateClipI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics *graphics, INT dx, INT dy) +{ + TRACE("(%p, %d, %d)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + return GdipTranslateRegion(graphics->clip, (REAL)dx, (REAL)dy); +}

1 0

Gerald Pfeifer : comctl32: Simplify four functions by removing unused parameters.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: bb6e8e56ce5d7581e54cac480c72c90518939d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6e8e56ce5d7581e54cac480… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 30 22:42:29 2009 +0100 comctl32: Simplify four functions by removing unused parameters. --- dlls/comctl32/syslink.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 5c25a52..8f48b4c 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1317,7 +1317,7 @@ static LRESULT SYSLINK_SendParentNotify (const SYSLINK_INFO *infoPtr, UINT code, * SYSLINK_SetFocus * Handles receiving the input focus. */ -static LRESULT SYSLINK_SetFocus (SYSLINK_INFO *infoPtr, HWND PrevFocusWindow) +static LRESULT SYSLINK_SetFocus (SYSLINK_INFO *infoPtr) { PDOC_ITEM Focus; @@ -1340,7 +1340,7 @@ static LRESULT SYSLINK_SetFocus (SYSLINK_INFO *infoPtr, HWND PrevFocusWindow) * SYSLINK_KillFocus * Handles losing the input focus. */ -static LRESULT SYSLINK_KillFocus (SYSLINK_INFO *infoPtr, HWND NewFocusWindow) +static LRESULT SYSLINK_KillFocus (SYSLINK_INFO *infoPtr) { PDOC_ITEM Focus; @@ -1385,7 +1385,7 @@ static PDOC_ITEM SYSLINK_LinkAtPt (const SYSLINK_INFO *infoPtr, const POINT *pt, * SYSLINK_LButtonDown * Handles mouse clicks */ -static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, DWORD Buttons, const POINT *pt) +static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, const POINT *pt) { PDOC_ITEM Current, Old; int id; @@ -1411,7 +1411,7 @@ static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, DWORD Buttons, const * SYSLINK_LButtonUp * Handles mouse clicks */ -static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, DWORD Buttons, const POINT *pt) +static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, const POINT *pt) { if(infoPtr->MouseDownID > -1) { @@ -1601,14 +1601,14 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, POINT pt; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - return SYSLINK_LButtonDown(infoPtr, wParam, &pt); + return SYSLINK_LButtonDown(infoPtr, &pt); } case WM_LBUTTONUP: { POINT pt; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - return SYSLINK_LButtonUp(infoPtr, wParam, &pt); + return SYSLINK_LButtonUp(infoPtr, &pt); } case WM_KEYDOWN: @@ -1694,10 +1694,10 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_GetIdealHeight(infoPtr); case WM_SETFOCUS: - return SYSLINK_SetFocus(infoPtr, (HWND)wParam); + return SYSLINK_SetFocus(infoPtr); case WM_KILLFOCUS: - return SYSLINK_KillFocus(infoPtr, (HWND)wParam); + return SYSLINK_KillFocus(infoPtr); case WM_ENABLE: infoPtr->Style &= ~WS_DISABLED;

1 0

Marcus Meissner : shell32: Fixed potential buffer overwrite in execute_from_key (Coverity).
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: 0aa5a836886b54196966ae0ae1738fe961362a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa5a836886b54196966ae0ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 30 22:01:18 2009 +0100 shell32: Fixed potential buffer overwrite in execute_from_key (Coverity). --- dlls/shell32/shlexec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 8a65636..1fbaabb 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -935,6 +935,8 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); + if (cmdlen >= sizeof(cmd)/sizeof(WCHAR)) + cmdlen = sizeof(cmd)/sizeof(WCHAR)-1; cmd[cmdlen] = '\0'; SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); if (resultLen > sizeof(param)/sizeof(WCHAR))

1 0

Austin English : configure.ac: Check for icps_outhist struct.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: ac0252db3323d9827e2d63ed355cfc398160f15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0252db3323d9827e2d63ed3… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 30 10:18:10 2009 -0600 configure.ac: Check for icps_outhist struct. --- configure | 171 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 36 ++++++++++ dlls/iphlpapi/ipstats.c | 8 ++- include/config.h.in | 3 + 4 files changed, 216 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 00de501..2363f46 100755 --- a/configure +++ b/configure @@ -23567,6 +23567,177 @@ _ACEOF fi +{ $as_echo "$as_me:$LINENO: checking for struct icmpstat.icps_outhist" >&5 +$as_echo_n "checking for struct icmpstat.icps_outhist... " >&6; } +if test "${ac_cv_member_struct_icmpstat_icps_outhist+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_ALIAS_H +#include <alias.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_SYS_TIMEOUT_H +#include <sys/timeout.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR +#include <netinet/icmp_var.h> +#endif + +int +main () +{ +static struct icmpstat ac_aggr; +if (ac_aggr.icps_outhist) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_icmpstat_icps_outhist=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_ALIAS_H +#include <alias.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_SYS_TIMEOUT_H +#include <sys/timeout.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR +#include <netinet/icmp_var.h> +#endif + +int +main () +{ +static struct icmpstat ac_aggr; +if (sizeof ac_aggr.icps_outhist) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_icmpstat_icps_outhist=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_icmpstat_icps_outhist=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_icmpstat_icps_outhist" >&5 +$as_echo "$ac_cv_member_struct_icmpstat_icps_outhist" >&6; } +if test "x$ac_cv_member_struct_icmpstat_icps_outhist" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST 1 +_ACEOF + + +fi + + { $as_echo "$as_me:$LINENO: checking for timezone variable" >&5 $as_echo_n "checking for timezone variable... " >&6; } if test "${ac_cv_have_timezone+set}" = set; then diff --git a/configure.ac b/configure.ac index fd760bd..3b65eea 100644 --- a/configure.ac +++ b/configure.ac @@ -1730,6 +1730,42 @@ AC_CHECK_MEMBERS([ns_msg._msg_ptr],,, # include <arpa/nameser.h> #endif]) +dnl Check for struct icmpstat.icps_outhist +AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_ALIAS_H +#include <alias.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_SYS_TIMEOUT_H +#include <sys/timeout.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR +#include <netinet/icmp_var.h> +#endif]) + dnl Check for the external timezone variables timezone and daylight AC_CACHE_CHECK([for timezone variable], ac_cv_have_timezone, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[timezone = 1]])],[ac_cv_have_timezone="yes"],[ac_cv_have_timezone="no"])) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 31336f9..b112793 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -323,7 +323,7 @@ DWORD getICMPStats(MIB_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 /* out stats */ stats->stats.icmpOutStats.dwMsgs = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; for(i = 0; i <= ICMP_MAXTYPE; i++) @@ -342,9 +342,13 @@ DWORD getICMPStats(MIB_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]; +#else /* ICPS_OUTHIST */ + memset( &stats->stats.icmpOutStats, 0, sizeof(stats->stats.icmpOutStats) ); +#endif /* ICPS_OUTHIST */ return NO_ERROR; -#else + +#else /* ICMPCTL_STATS */ FILE *fp; if (!stats) diff --git a/include/config.h.in b/include/config.h.in index 21ffe93..f1c4194 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -720,6 +720,9 @@ /* Define to 1 if `direction' is member of `struct ff_effect'. */ #undef HAVE_STRUCT_FF_EFFECT_DIRECTION +/* Define to 1 if `icps_outhist' is member of `struct icmpstat'. */ +#undef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST + /* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS

1 0

Alexandre Julliard : configure: Remove no longer needed check for -fshort-wchar.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: f35ddbaf685d9ce7598020c8645dbe12754d4bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35ddbaf685d9ce7598020c86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 2 12:27:56 2009 +0100 configure: Remove no longer needed check for -fshort-wchar. --- configure | 69 +-------------------------------------------------- configure.ac | 4 --- include/config.h.in | 3 -- 3 files changed, 1 insertions(+), 75 deletions(-) diff --git a/configure b/configure index dbe24d4..00de501 100755 --- a/configure +++ b/configure @@ -17224,74 +17224,7 @@ $as_echo "$ac_cv_c_gcc_strength_bug" >&6; } EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" fi - - { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fshort-wchar" >&5 -$as_echo_n "checking whether the compiler supports -fshort-wchar... " >&6; } -if test "${ac_cv_cflags__fshort_wchar+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fshort-wchar" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_cflags__fshort_wchar=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cflags__fshort_wchar=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fshort_wchar" >&5 -$as_echo "$ac_cv_cflags__fshort_wchar" >&6; } -if test $ac_cv_cflags__fshort_wchar = yes; then - -cat >>confdefs.h <<\_ACEOF -#define CC_FLAG_SHORT_WCHAR "-fshort-wchar" -_ACEOF - -fi - - { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fno-builtin" >&5 + { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if test "${ac_cv_cflags__fno_builtin+set}" = set; then $as_echo_n "(cached) " >&6 diff --git a/configure.ac b/configure.ac index b0725c1..fd760bd 100644 --- a/configure.ac +++ b/configure.ac @@ -1312,10 +1312,6 @@ then fi dnl Check for some compiler flags - - WINE_TRY_CFLAGS([-fshort-wchar], - [AC_DEFINE(CC_FLAG_SHORT_WCHAR, "-fshort-wchar", - [Specifies the compiler flag that forces a short wchar_t])]) WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) diff --git a/include/config.h.in b/include/config.h.in index 036b5fb..21ffe93 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,9 +2,6 @@ #define __WINE_CONFIG_H -/* Specifies the compiler flag that forces a short wchar_t */ -#undef CC_FLAG_SHORT_WCHAR - /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H

1 0

Vitaliy Margolen : dinput: Consume mouse & keyboard events in exclusive mode.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: 3743a1a7ca170c765cd779c61b9e362c5b1c5203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3743a1a7ca170c765cd779c61… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Feb 1 13:11:46 2009 -0700 dinput: Consume mouse & keyboard events in exclusive mode. --- dlls/dinput/dinput_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 46e4e28..bdcf557 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -885,6 +885,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) { IDirectInputImpl *dinput; + int skip = 0; if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); @@ -899,12 +900,13 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) { TRACE("calling %p->%p (%lx %lx)\n", dev, dev->event_proc, wparam, lparam); dev->event_proc( (LPDIRECTINPUTDEVICE8A)dev, wparam, lparam ); + skip |= dev->dwCoopLevel & DISCL_EXCLUSIVE; } LeaveCriticalSection( &dinput->crit ); } LeaveCriticalSection( &dinput_hook_crit ); - return CallNextHookEx( 0, code, wparam, lparam ); + return skip ? 1 : CallNextHookEx( 0, code, wparam, lparam ); } static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam )

1 0

Alexandre Julliard : winegcc: Support -b option for cross-compiling.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: 34729392551a19d21ea4f0801d2d4c4cf10910fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=34729392551a19d21ea4f0801… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 2 12:25:37 2009 +0100 winegcc: Support -b option for cross-compiling. --- tools/winegcc/utils.c | 7 +++ tools/winegcc/utils.h | 1 + tools/winegcc/winegcc.c | 120 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 104 insertions(+), 24 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index f30a8c3..743f2e0 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -66,6 +66,13 @@ void *xrealloc(void* p, size_t size) return p2; } +char *xstrdup( const char *str ) +{ + char *res = strdup( str ); + if (!res) error("Virtual memory exhausted.\n"); + return res; +} + int strendswith(const char* str, const char* end) { int l = strlen(str); diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 4c8fec3..a48bbf0 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -35,6 +35,7 @@ void error(const char* s, ...) DECLSPEC_NORETURN; void* xmalloc(size_t size); void* xrealloc(void* p, size_t size); +char *xstrdup( const char *str ); char* strmake(const char* fmt, ...); int strendswith(const char* str, const char* end); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5434760..e0b03b1 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -88,6 +88,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <signal.h> @@ -154,11 +155,43 @@ enum target_platform PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS }; -struct options +static const struct +{ + const char *name; + enum target_cpu cpu; +} cpu_names[] = +{ + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "x86_64", CPU_x86_64 }, + { "sparc", CPU_SPARC }, + { "alpha", CPU_ALPHA }, + { "powerpc", CPU_POWERPC } +}; + +static const struct +{ + const char *name; + enum target_platform platform; +} platform_names[] = +{ + { "macos", PLATFORM_APPLE }, + { "darwin", PLATFORM_APPLE }, + { "solaris", PLATFORM_SOLARIS }, + { "mingw32", PLATFORM_WINDOWS }, + { "windows", PLATFORM_WINDOWS }, + { "winnt", PLATFORM_WINDOWS } +}; + +struct options { enum processor processor; enum target_cpu target_cpu; enum target_platform target_platform; + const char *target; int shared; int use_msvcrt; int nostdinc; @@ -248,29 +281,20 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } -static const strarray* get_translator(enum processor processor) +static const strarray* get_translator(struct options *opts) { - static strarray* cpp = 0; - static strarray* as = 0; - static strarray* cc = 0; - static strarray* cxx = 0; + const char *str; - switch(processor) + switch(opts->processor) { - case proc_cpp: - if (!cpp) cpp = strarray_fromstring(CPP, " "); - return cpp; - case proc_cc: - if (!cc) cc = strarray_fromstring(CC, " "); - return cc; - case proc_cxx: - if (!cxx) cxx = strarray_fromstring(CXX, " "); - return cxx; - case proc_as: - if (!as) as = strarray_fromstring(AS, " "); - return as; + case proc_cpp: str = CPP; break; + case proc_cc: str = CC; break; + case proc_cxx: str = CXX; break; + case proc_as: str = AS; break; + default: assert(0); } - error("Unknown processor\n"); + if (opts->target) str = strmake( "%s-%s", opts->target, str ); + return strarray_fromstring( str, " " ); } static void compile(struct options* opts, const char* lang) @@ -279,7 +303,7 @@ static void compile(struct options* opts, const char* lang) unsigned int j; int gcc_defs = 0; - strarray_addall(comp_args, get_translator(opts->processor)); + strarray_addall(comp_args, get_translator(opts)); switch(opts->processor) { case proc_cpp: gcc_defs = 1; break; @@ -614,6 +638,11 @@ static void build(struct options* opts) strarray_add(spec_args, winebuild); if (verbose) strarray_add(spec_args, "-v"); if (keep_generated) strarray_add(spec_args, "--save-temps"); + if (opts->target) + { + strarray_add(spec_args, "--target"); + strarray_add(spec_args, opts->target); + } strarray_add(spec_args, "--as-cmd"); strarray_add(spec_args, AS); strarray_add(spec_args, "--ld-cmd"); @@ -669,7 +698,7 @@ static void build(struct options* opts) /* link everything together now */ link_args = strarray_alloc(); - strarray_addall(link_args, get_translator(opts->processor)); + strarray_addall(link_args, get_translator(opts)); strarray_addall(link_args, strarray_fromstring(LDDLLFLAGS, " ")); strarray_add(link_args, "-o"); @@ -760,7 +789,7 @@ static void forward(int argc, char **argv, struct options* opts) strarray* args = strarray_alloc(); int j; - strarray_addall(args, get_translator(opts->processor)); + strarray_addall(args, get_translator(opts)); for( j = 1; j < argc; j++ ) strarray_add(args, argv[j]); @@ -843,6 +872,46 @@ static int is_mingw_arg(const char* arg) return 0; } +static void parse_target_option( struct options *opts, const char *target ) +{ + char *p, *platform, *spec = xstrdup( target ); + unsigned int i; + + /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ + + /* get the CPU part */ + + if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); + *p++ = 0; + for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + { + if (!strcmp( cpu_names[i].name, spec )) + { + opts->target_cpu = cpu_names[i].cpu; + break; + } + } + if (i == sizeof(cpu_names)/sizeof(cpu_names[0])) + error( "Unrecognized CPU '%s'\n", spec ); + platform = p; + if ((p = strrchr( p, '-' ))) platform = p + 1; + + /* get the OS part */ + + opts->target_platform = PLATFORM_UNSPECIFIED; /* default value */ + for (i = 0; i < sizeof(platform_names)/sizeof(platform_names[0]); i++) + { + if (!strncmp( platform_names[i].name, platform, strlen(platform_names[i].name) )) + { + opts->target_platform = platform_names[i].platform; + break; + } + } + + free( spec ); + opts->target = xstrdup( target ); +} + int main(int argc, char **argv) { int i, c, next_is_arg = 0, linking = 1; @@ -943,7 +1012,7 @@ int main(int argc, char **argv) raw_linker_arg = 0; if (argv[i][1] == 'c' || argv[i][1] == 'L') raw_compiler_arg = 0; - if (argv[i][1] == 'o') + if (argv[i][1] == 'o' || argv[i][1] == 'b') raw_compiler_arg = raw_linker_arg = 0; /* do a bit of semantic analysis */ @@ -963,6 +1032,9 @@ int main(int argc, char **argv) if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); break; + case 'b': + parse_target_option( &opts, option_arg ); + break; case 'c': /* compile or assemble */ if (argv[i][2] == 0) opts.compile_only = 1; /* fall through */

1 0

Paul Vriens : kernel32/tests: Fix remaining failures on Win9x and WinME.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: 047a43f084135a188f7b691f345137e3c2a5ee18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047a43f084135a188f7b691f3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jan 31 15:37:59 2009 +0100 kernel32/tests: Fix remaining failures on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 24342da..2e5678c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -402,8 +402,11 @@ static void test_profile_delete_on_close(void) "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents - 1, "Test file: partial write\n"); + SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); - ok( res == 123, "Got %d instead of 123\n", res); + ok( res == 123 || + broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ + "Got %d instead of 123\n", res); /* This also deletes the file */ CloseHandle(h); @@ -423,8 +426,11 @@ static void test_profile_refresh(void) "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents1 - 1, "Test file: partial write\n"); + SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); - ok( res == 123, "Got %d instead of 123\n", res); + ok( res == 123 || + broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ + "Got %d instead of 123\n", res); CloseHandle(h); @@ -436,8 +442,11 @@ static void test_profile_refresh(void) "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents2 - 1, "Test file: partial write\n"); + SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); - ok( res == 124, "Got %d instead of 124\n", res); + ok( res == 124 || + broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "Got %d instead of 124\n", res); /* This also deletes the file */ CloseHandle(h);

1 0

Alexandre Julliard : winegcc: Make platform-specific behaviors depend on variables instead of #ifdefs.
by Alexandre Julliard Feb. 2, 2009

Feb. 2, 2009

Module: wine Branch: master Commit: 9e04ecd9de3c001c2420df865bb8cd95b69b95fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e04ecd9de3c001c2420df865… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 2 12:19:11 2009 +0100 winegcc: Make platform-specific behaviors depend on variables instead of #ifdefs. --- tools/winegcc/winegcc.c | 180 +++++++++++++++++++++++++++++------------------ 1 files changed, 112 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e04ecd9de3c001c2420d…

1 0