April 2011 - Wine-Commits - list.winehq.org

Jörg Höhle : msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 0dca7f478f1ca3d4f8dc82b5c0aed3668f740264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dca7f478f1ca3d4f8dc82b5c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 1 22:26:26 2010 +0100 msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX. (cherry picked from commit c6d67fad8f6d0ac199d0945314564e39aa64644f) --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/string.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f68790b..9064fd0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -80,7 +80,7 @@ typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*__cdecl MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); -typedef struct {long double x;} MSVCRT__LDOUBLE; +typedef struct {ULONG x80[3];} MSVCRT__LDOUBLE; /* Intel 80 bit FP format has sizeof() 12 */ struct MSVCRT_tm { int tm_sec; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8c99399..7086e12 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -381,8 +381,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) { /* FIXME needs error checking for huge/small values */ #ifdef HAVE_STRTOLD + long double ld; TRACE("str %s value %p\n",str,value); - value->x = strtold(str,0); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("stub, str %s value %p\n",str,value); #endif @@ -395,8 +397,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, int flags ) { #ifdef HAVE_STRTOLD + long double ld; FIXME("%p %p %s %x partial stub\n", value, endptr, str, flags ); - value->x = strtold(str,endptr); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("%p %p %s %x stub\n", value, endptr, str, flags ); #endif @@ -682,7 +686,7 @@ struct _I10_OUTPUT_DATA { /********************************************************************* * $I10_OUTPUT (MSVCRT.@) - * ld - long double to be printed to data + * ld80 - long double (Intel 80 bit FP in 12 bytes) to be printed to data * prec - precision of part, we're interested in * flag - 0 for first prec digits, 1 for fractional part * data - data to be populated @@ -695,16 +699,22 @@ struct _I10_OUTPUT_DATA { * Native sets last byte of data->str to '0' or '9', I don't know what * it means. Current implementation sets it always to '0'. */ -int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld, int prec, int flag, struct _I10_OUTPUT_DATA *data) +int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { static const char inf_str[] = "1#INF"; static const char nan_str[] = "1#QNAN"; - double d = ld.x; + /* MS' long double type wants 12 bytes for Intel's 80 bit FP format. + * Some UNIX have sizeof(long double) == 16, yet only 80 bit are used. + * Assume long double uses 80 bit FP, never seen 128 bit FP. */ + long double ld = 0; + double d; char format[8]; char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ char *p; + memcpy(&ld, &ld80, 10); + d = ld; TRACE("(%lf %d %x %p)\n", d, prec, flag, data); if(d<0) {

1 0

Andrew Nguyen : server: Filter the WOW64 registry access flags before performing the access check.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 34450bf32b3e4b410ee2aa6ea3119f21b5c432a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34450bf32b3e4b410ee2aa6ea… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 24 07:09:41 2011 -0600 server: Filter the WOW64 registry access flags before performing the access check. (cherry picked from commit ed657182ee3a9f39a1093564eecaeb472423bc92) --- dlls/advapi32/tests/registry.c | 173 ++++++++++++++++++++++++++++++++++++++++ server/registry.c | 4 +- 2 files changed, 176 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34450bf32b3e4b410ee2a…

1 0

David Hedberg : gdi32: Stay within the clipping area when painting text background.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 6997e20fa5a934a61275f268eca4e0178d02fc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6997e20fa5a934a61275f268e… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Jan 30 20:47:55 2011 +0800 gdi32: Stay within the clipping area when painting text background. (cherry picked from commit 81bbd17c406e37ea23e8f86f95d307c0c45e2bc7) --- dlls/gdi32/font.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d51445..85f08cb 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1987,7 +1987,16 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, rc.right = x + width.x; rc.top = y - tm.tmAscent; rc.bottom = y + tm.tmDescent; - dc->funcs->pExtTextOut(dc->physDev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); + + if(flags & ETO_CLIPPED) + { + rc.left = max(lprect->left, rc.left); + rc.right = min(lprect->right, rc.right); + rc.top = max(lprect->top, rc.top); + rc.bottom = min(lprect->bottom, rc.bottom); + } + if(rc.left < rc.right && rc.top < rc.bottom) + dc->funcs->pExtTextOut(dc->physDev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); } } }

1 0

Alexander Law : programs/notepad: Correct sharing mode for opening file in notepad.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: a6e083b9d7ecf302b5cc93cc7f8605a8be093c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e083b9d7ecf302b5cc93cc7… Author: Alexander Law <exclusion(a)gmail.com> Date: Fri Jan 28 08:34:23 2011 +0300 programs/notepad: Correct sharing mode for opening file in notepad. (cherry picked from commit a8308dd017541e9dd2ceca3d07a9ba8a566d8b3d) --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ff5df75..0c4b716 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -356,7 +356,7 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) if (!DoCloseFile()) return; - hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) {

1 0

Alexandre Julliard : configure: Print a notice if zlib isn't found.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 851bc356a9baf2426ae042698d53ff76ae047ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851bc356a9baf2426ae042698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 13:07:27 2011 +0100 configure: Print a notice if zlib isn't found. (cherry picked from commit ba6a41a4f7256fcf34932cbea385ab24549d5ce4) --- configure | 16 ++++++++++++++++ configure.ac | 3 +++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 638d7ba..35c1226 100755 --- a/configure +++ b/configure @@ -805,6 +805,7 @@ with_xshape with_xshm with_xslt with_xxf86vm +with_zlib with_wine_tools with_wine64 enable_largefile @@ -1493,6 +1494,7 @@ Optional Packages: --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension + --without-zlib do not use Zlib (data compression) --with-wine-tools=DIR use Wine tools from directory DIR --with-wine64=DIR use the 64-bit Wine in DIR for a Wow64 build --with-x use the X Window System @@ -2740,6 +2742,12 @@ if test "${with_xxf86vm+set}" = set; then : fi +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi +fi + + # Check whether --with-wine-tools was given. if test "${with_wine_tools+set}" = set; then : @@ -10330,6 +10338,14 @@ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h fi fi +if test "x$ZLIB" = "x"; then : + case "x$with_zlib" in + x) as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;; + xno) ;; + *) as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported. +This is an error since --with-zlib was requested." "$LINENO" 5 ;; +esac +fi if test "x$with_esd" != xno then diff --git a/configure.ac b/configure.ac index 3372e87..cab92ef 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,8 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) +AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]), + [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi]) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -1362,6 +1364,7 @@ then AC_CHECK_LIB(z,inflate,[AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).]) AC_SUBST(ZLIB,"-lz")]) fi +WINE_NOTICE_WITH(zlib,[test "x$ZLIB" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) dnl **** Check for EsounD **** if test "x$with_esd" != xno

1 0

Maarten Lankhorst : ole32: Handle alertable wait in CoWaitForMultipleHandles.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 05ddd428e499a2d7fcedfa27cd48272a6ec2eb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ddd428e499a2d7fcedfa27c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jan 21 14:17:22 2011 +0100 ole32: Handle alertable wait in CoWaitForMultipleHandles. (cherry picked from commit 75801f095db38c5c1dfecbd8d70ad14994484b56) --- dlls/ole32/compobj.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 937f3d8..40726d1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3655,6 +3655,11 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, hr = RPC_S_CALLPENDING; break; } + else if (res == WAIT_IO_COMPLETION) + { + *lpdwindex = WAIT_IO_COMPLETION; + break; + } else { ERR("Unexpected wait termination: %d, %d\n", res, GetLastError());

1 0

Vincent Povirk : oleaut32: Deserialize VT_BOOL as 2 bytes, not 4.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: b1eacaf916b877ee08d446a8fa8a6bbdc73ea997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1eacaf916b877ee08d446a8f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 17 23:27:39 2011 -0600 oleaut32: Deserialize VT_BOOL as 2 bytes, not 4. (cherry picked from commit 63f2121d92bd404a0430f78bd85f43b0941794ef) --- dlls/oleaut32/tmarshal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index bfe17c8..76b64f1 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -553,7 +553,6 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { return sizeof(DATE); case VT_CY: return sizeof(CY); - /* FIXME: VT_BOOL should return 2? */ case VT_VARIANT: return sizeof(VARIANT)+3; /* FIXME: why the +3? */ case VT_CARRAY: { @@ -570,6 +569,7 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { return 8; case VT_UI2: case VT_I2: + case VT_BOOL: return 2; case VT_UI1: case VT_I1: @@ -625,7 +625,6 @@ serialize_param( if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,8); return hres; - case VT_BOOL: case VT_ERROR: case VT_INT: case VT_UINT: @@ -639,6 +638,7 @@ serialize_param( return hres; case VT_I2: case VT_UI2: + case VT_BOOL: hres = S_OK; if (debugout) TRACE_(olerelay)("%04x\n",*arg & 0xffff); if (writeit) @@ -924,7 +924,6 @@ deserialize_param( if (debugout) TRACE_(olerelay)("%x%x",arg[0],arg[1]); return hres; case VT_ERROR: - case VT_BOOL: case VT_I4: case VT_INT: case VT_UINT: @@ -938,6 +937,7 @@ deserialize_param( return hres; case VT_I2: case VT_UI2: + case VT_BOOL: if (readit) { DWORD x; hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD));

1 0

Vincent Povirk : wininet: Use LIST_FOR_EACH_SAFE in a loop where we can delete an entry.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 8861a7545fecee4a873a5de0d04f5abe33436e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8861a7545fecee4a873a5de0d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 14 16:39:57 2011 -0600 wininet: Use LIST_FOR_EACH_SAFE in a loop where we can delete an entry. (cherry picked from commit 173b2c5b0f0d44adf7b946c9fbe2ad5f94b33d69) --- dlls/wininet/cookie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 7dfd2a8..157ee8d 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -302,11 +302,11 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, cookie_domain *cookiesDomain = LIST_ENTRY(cursor, cookie_domain, entry); if (COOKIE_matchDomain(hostName, path, cookiesDomain, TRUE)) { - struct list * cursor; + struct list * cursor, * cursor2; domain_count++; TRACE("found domain %p\n", cookiesDomain); - LIST_FOR_EACH(cursor, &cookiesDomain->cookie_list) + LIST_FOR_EACH_SAFE(cursor, cursor2, &cookiesDomain->cookie_list) { cookie *thisCookie = LIST_ENTRY(cursor, cookie, entry); /* check for expiry */

1 0

Alexandre Julliard : libwine: Fix handling of null character in vsnprintfW for %c format.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: acbaedd0e76e944691dfea2ab258ef20e06ca988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbaedd0e76e944691dfea2ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 12:41:03 2011 +0100 libwine: Fix handling of null character in vsnprintfW for %c format. (cherry picked from commit 3812fd3006e4f039a4744784178b9ce9356a38f0) --- libs/wine/string.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 6afb899..8f85c63 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -300,7 +300,7 @@ noconv: /* format a WCHAR string according to a printf format; helper for vsnprintfW */ -static int format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str ) +static int format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len ) { size_t count = 0; int i, left_align = 0, width = 0, max = 0; @@ -316,13 +316,14 @@ static int format_string( WCHAR *buffer, size_t len, const char *format, const W while (isdigit(*format)) width = width * 10 + *format++ - '0'; + if (str_len == -1) str_len = strlenW( str ); if (*format == '.') { format++; while (isdigit(*format)) max = max * 10 + *format++ - '0'; - for (i = 0; i < max; i++) if (!str[i]) max = i; + if (max > str_len) max = str_len; } - else max = strlenW(str); + else max = str_len; if (*format == 'h' || *format == 'l') format++; @@ -425,7 +426,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) *fmta++ = 's'; *fmta = 0; - count = format_string( str, len - written, fmtbufa, wstr ? wstr : none ); + count = format_string( str, len - written, fmtbufa, wstr ? wstr : none, -1 ); if (count == -1) return -1; str += count; written += count; @@ -435,14 +436,13 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) case 'c': { - WCHAR wstr[2]; + WCHAR wstr; int count; - wstr[0] = va_arg(valist, int); - wstr[1] = 0; + wstr = va_arg(valist, int); *fmta++ = 's'; *fmta = 0; - count = format_string( str, len - written, fmtbufa, wstr ); + count = format_string( str, len - written, fmtbufa, &wstr, 1 ); if (count == -1) return -1; str += count; written += count;

1 0

Alexandre Julliard : libwine: Fall back to normal exec if the preloader doesn't exist.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 1cddc427471b02d558c882a32c13ceeaf71e634f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cddc427471b02d558c882a32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 19:56:12 2011 +0100 libwine: Fall back to normal exec if the preloader doesn't exist. (cherry picked from commit 06f76236d1a9ee2f9136b0088cd0ba883437f5f9) --- libs/wine/config.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 6bb87b0..06cabb1 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -470,7 +470,6 @@ static void preloader_exec( char **argv, int use_preloader ) execv( full_name, new_argv ); free( new_argv ); free( full_name ); - return; } #endif execv( argv[0], argv );

1 0