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

Alexandre Julliard : winebuild: Don't remove stdcall decorations on non-x86 .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 26dcc7f1c8eed925df5b92be44482fad23f827ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=26dcc7f1c8eed925df5b92be4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 17:39:45 2011 +0100 winebuild: Don't remove stdcall decorations on non-x86. (cherry picked from commit a5decb5444b3f371528aa40a67e3734375748c09) --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 75568d6..91e3c1f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -587,6 +587,7 @@ int remove_stdcall_decoration( char *name ) { char *p, *end = strrchr( name, '@' ); if (!end || !end[1] || end == name) return -1; + if (target_cpu != CPU_x86) return -1; /* make sure all the rest is digits */ for (p = end + 1; *p; p++) if (!isdigit(*p)) return -1; *end = 0;

1 0

David Hedberg : gdi32: Stay within the clipping area when painting text background.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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

Ken Thomases : mountmgr: Balance volume references in add_volume().
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 33e5502034617e98a1db1c19e90597c740a7be3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e5502034617e98a1db1c19e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 31 17:07:16 2011 -0600 mountmgr: Balance volume references in add_volume(). (cherry picked from commit 8a38fbcacc5e4284038787296ea9ea57516a6004) --- dlls/mountmgr.sys/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6c182e8..8709472 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -666,7 +666,11 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) - if (volume->udi && !strcmp( udi, volume->udi )) goto found; + if (volume->udi && !strcmp( udi, volume->udi )) + { + grab_volume( volume ); + goto found; + } /* udi not found, search for a non-dynamic volume */ if ((volume = find_matching_volume( udi, device, mount_point, type ))) set_volume_udi( volume, udi );

1 0

Dmitry Timoshkov : winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn ().
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 9d9570453a05f7bbaaf7a91a6f520e6a4af6ff9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9570453a05f7bbaaf7a91a6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 31 19:30:43 2011 +0800 winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn(). (cherry picked from commit 38167e71d1ccff264d269c3bee7e1a448871829a) --- dlls/winex11.drv/window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 18a86b2..ef515ee 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1600,7 +1600,7 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect RECT dst_rect = *new_rect; HDC hdc_src, hdc_dst; INT code; - HRGN rgn = 0; + HRGN rgn; HWND parent = 0; if (!data->whole_window) @@ -1619,6 +1619,9 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } + rgn = CreateRectRgnIndirect( &dst_rect ); + SelectClipRgn( hdc_dst, rgn ); + DeleteObject( rgn ); ExcludeUpdateRgn( hdc_dst, data->hwnd ); code = X11DRV_START_EXPOSURES; @@ -1631,6 +1634,7 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, hdc_src, src_rect.left, src_rect.top, SRCCOPY ); + rgn = 0; code = X11DRV_END_EXPOSURES; ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(rgn), (LPSTR)&rgn );

1 0

Alexandre Julliard : libwine: Fix handling of null character in vsnprintfW for %c format.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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 07 Apr '11

07 Apr '11

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

Maarten Lankhorst : ole32: Handle alertable wait in CoWaitForMultipleHandles.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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 07 Apr '11

07 Apr '11

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 07 Apr '11

07 Apr '11

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 : comctl32/imagelist: Don' t change destination size in ImageList_Duplicate without corresponding allocation .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 17bc2fc68d3426003ae8350edca9f9e8419ce11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bc2fc68d3426003ae8350ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 11:16:23 2011 +0100 comctl32/imagelist: Don't change destination size in ImageList_Duplicate without corresponding allocation. (cherry picked from commit cca319d5943ca01a564335473a9ac3ee949d342d) --- dlls/comctl32/imagelist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 47279c9..c80236f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1519,7 +1519,6 @@ ImageList_Duplicate (HIMAGELIST himlSrc) himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; - himlDst->cMaxImage = himlSrc->cMaxImage; if (himlSrc->has_alpha && himlDst->has_alpha) memcpy( himlDst->has_alpha, himlSrc->has_alpha, himlDst->cCurImage ); }

1 0