December 2012 - Wine-Commits

Nikolay Sivov : msi: Fix a stream data leak on error (Coverity).
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: af5e73572a15e28d1a7204a142464a5ef5246987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5e73572a15e28d1a7204a14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 16:08:57 2012 +0400 msi: Fix a stream data leak on error (Coverity). --- dlls/msi/streams.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index d9d632f..a20f196 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -200,6 +200,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U if (FAILED(hr)) { WARN("failed to open stream: %08x\n", hr); + msi_free(stream); goto done; }

1 0

Andrew Talbot : mountmgr.sys: Remove superfluous semicolon.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 1cff1145b01d1621a0a82abe1fa3524aa4a77ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cff1145b01d1621a0a82abe1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 8 18:36:25 2012 +0000 mountmgr.sys: Remove superfluous semicolon. --- dlls/mountmgr.sys/dbus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 0384c29..7e373e6 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -72,7 +72,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); DO_FUNC(dbus_message_iter_next); \ DO_FUNC(dbus_message_iter_recurse); \ DO_FUNC(dbus_message_new_method_call); \ - DO_FUNC(dbus_message_unref); + DO_FUNC(dbus_message_unref) #define DO_FUNC(f) static typeof(f) * p_##f DBUS_FUNCS;

1 0

Piotr Caban : msvcrt: Reimplement _tzset function.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 351dff91debce853e7c25e7970b1f66b1e737894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351dff91debce853e7c25e797… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:46:46 2012 +0100 msvcrt: Reimplement _tzset function. --- dlls/msvcrt/time.c | 146 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 85 insertions(+), 61 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 2c08185..27f93b1 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -24,6 +24,7 @@ #include "config.h" +#include <stdlib.h> #define _POSIX_PTHREAD_SEMANTICS /* switch to a 2 arg style asctime_r on Solaris */ #include <time.h> #ifdef HAVE_SYS_TIMES_H @@ -92,6 +93,90 @@ static inline void write_invalid_msvcrt_tm( struct MSVCRT_tm *tm ) tm->tm_isdst = -1; } +/********************************************************************* + * _daylight (MSVCRT.@) + */ +int MSVCRT___daylight = 1; + +/********************************************************************* + * _timezone (MSVCRT.@) + */ +MSVCRT_long MSVCRT___timezone = 28800; + +/********************************************************************* + * _dstbias (MSVCRT.@) + */ +int MSVCRT__dstbias = -3600; + +/********************************************************************* + * _tzname (MSVCRT.@) + * NOTES + * Some apps (notably Mozilla) insist on writing to these, so the buffer + * must be large enough. + */ +static char tzname_std[64] = "PST"; +static char tzname_dst[64] = "PDT"; +char *MSVCRT__tzname[2] = { tzname_std, tzname_dst }; + +static TIME_ZONE_INFORMATION tzi = {0}; +/********************************************************************* + * _tzset (MSVCRT.@) + */ +void CDECL MSVCRT__tzset(void) +{ + char *tz = MSVCRT_getenv("TZ"); + BOOL error; + + _mlock(_TIME_LOCK); + if(tz && tz[0]) { + BOOL neg_zone = FALSE; + + memset(&tzi, 0, sizeof(tzi)); + + /* Parse timezone information: tzn[+|-]hh[:mm[:ss]][dzn] */ + lstrcpynA(MSVCRT__tzname[0], tz, 3); + tz += 3; + + if(*tz == '-') { + neg_zone = TRUE; + tz++; + }else if(*tz == '+') { + tz++; + } + MSVCRT___timezone = strtol(tz, &tz, 10)*3600; + if(*tz == ':') { + MSVCRT___timezone += strtol(tz+1, &tz, 10)*60; + if(*tz == ':') + MSVCRT___timezone += strtol(tz+1, &tz, 10); + } + if(neg_zone) + MSVCRT___timezone = -MSVCRT___timezone; + + MSVCRT___daylight = *tz; + lstrcpynA(MSVCRT__tzname[1], tz, 3); + }else if(GetTimeZoneInformation(&tzi) != TIME_ZONE_ID_INVALID) { + MSVCRT___timezone = tzi.Bias*60; + if(tzi.StandardDate.wMonth) + MSVCRT___timezone += tzi.StandardBias*60; + + if(tzi.DaylightDate.wMonth) { + MSVCRT___daylight = 1; + MSVCRT__dstbias = (tzi.DaylightBias-tzi.StandardBias)*60; + }else { + MSVCRT___daylight = 0; + MSVCRT__dstbias = 0; + } + + if(!WideCharToMultiByte(CP_ACP, 0, tzi.StandardName, -1, MSVCRT__tzname[0], + sizeof(tzname_std), NULL, &error) || error) + *MSVCRT__tzname[0] = 0; + if(!WideCharToMultiByte(CP_ACP, 0, tzi.DaylightName, -1, MSVCRT__tzname[1], + sizeof(tzname_dst), NULL, &error) || error) + *MSVCRT__tzname[0] = 0; + } + _munlock(_TIME_LOCK); +} + #define SECSPERDAY 86400 /* 1601 to 1970 is 369 years plus 89 leap days */ #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) @@ -701,11 +786,6 @@ MSVCRT___time32_t CDECL MSVCRT_time(MSVCRT___time32_t* buf) #endif /********************************************************************* - * _daylight (MSVCRT.@) - */ -int MSVCRT___daylight = 0; - -/********************************************************************* * __p_daylight (MSVCRT.@) */ int * CDECL MSVCRT___p__daylight(void) @@ -714,11 +794,6 @@ int * CDECL MSVCRT___p__daylight(void) } /********************************************************************* - * _dstbias (MSVCRT.@) - */ -int MSVCRT__dstbias = 0; - -/********************************************************************* * __p_dstbias (MSVCRT.@) */ int * CDECL __p__dstbias(void) @@ -727,11 +802,6 @@ int * CDECL __p__dstbias(void) } /********************************************************************* - * _timezone (MSVCRT.@) - */ -MSVCRT_long MSVCRT___timezone = 0; - -/********************************************************************* * __p_timezone (MSVCRT.@) */ MSVCRT_long * CDECL MSVCRT___p__timezone(void) @@ -740,17 +810,6 @@ MSVCRT_long * CDECL MSVCRT___p__timezone(void) } /********************************************************************* - * _tzname (MSVCRT.@) - * NOTES - * Some apps (notably Mozilla) insist on writing to these, so the buffer - * must be large enough. The size is picked based on observation of - * Windows XP. - */ -static char tzname_std[64] = "PST"; -static char tzname_dst[64] = "PDT"; -char *MSVCRT__tzname[2] = { tzname_std, tzname_dst }; - -/********************************************************************* * _get_tzname (MSVCRT.@) */ int CDECL MSVCRT__get_tzname(MSVCRT_size_t *ret, char *buf, MSVCRT_size_t bufsize, int index) @@ -792,41 +851,6 @@ char ** CDECL __p__tzname(void) return MSVCRT__tzname; } -/********************************************************************* - * _tzset (MSVCRT.@) - */ -void CDECL MSVCRT__tzset(void) -{ - tzset(); -#if defined(HAVE_TIMEZONE) && defined(HAVE_DAYLIGHT) - MSVCRT___daylight = daylight; - MSVCRT___timezone = timezone; -#else - { - static const time_t seconds_in_year = (365 * 24 + 6) * 3600; - time_t t; - struct tm *tmp; - int zone_january, zone_july; - - _mlock(_TIME_LOCK); - t = (time(NULL) / seconds_in_year) * seconds_in_year; - tmp = localtime(&t); - zone_january = -tmp->tm_gmtoff; - t += seconds_in_year / 2; - tmp = localtime(&t); - zone_july = -tmp->tm_gmtoff; - _munlock(_TIME_LOCK); - - MSVCRT___daylight = (zone_january != zone_july); - MSVCRT___timezone = max(zone_january, zone_july); - } -#endif - lstrcpynA(tzname_std, tzname[0], sizeof(tzname_std)); - tzname_std[sizeof(tzname_std) - 1] = '\0'; - lstrcpynA(tzname_dst, tzname[1], sizeof(tzname_dst)); - tzname_dst[sizeof(tzname_dst) - 1] = '\0'; -} - static inline BOOL strftime_date(char *str, MSVCRT_size_t *pos, MSVCRT_size_t max, BOOL alternate, const struct MSVCRT_tm *mstm, MSVCRT___lc_time_data *time_data) {

1 0

Piotr Caban : kernel32: Fixed TIME_CompTimeZoneID behavior on dates close to New Year's Eve.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: e5a25ec5c5078d53899eb7c1b6ea08c84dc65c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a25ec5c5078d53899eb7c1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 11:54:23 2012 +0100 kernel32: Fixed TIME_CompTimeZoneID behavior on dates close to New Year's Eve. --- dlls/kernel32/tests/time.c | 23 +++++++++++++++++++++++ dlls/kernel32/time.c | 38 +++++++++++++++++++++++++------------- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index e8df15b..2f71184 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -336,6 +336,29 @@ static void test_GetTimeZoneInformation(void) l_time = system_time_to_minutes(&local); ok(l_time - s_time == diff, "got %d, expected %d\n", (LONG)(l_time - s_time), diff); + + /* test 23:01, 31st of December date */ + memset(&tzinfo, 0, sizeof(tzinfo)); + tzinfo.StandardDate.wMonth = 10; + tzinfo.StandardDate.wDay = 5; + tzinfo.StandardDate.wHour = 2; + tzinfo.StandardDate.wMinute = 0; + tzinfo.DaylightDate.wMonth = 4; + tzinfo.DaylightDate.wDay = 1; + tzinfo.DaylightDate.wHour = 2; + tzinfo.Bias = 0; + tzinfo.StandardBias = 0; + tzinfo.DaylightBias = -60; + utc.wYear = 2012; + utc.wMonth = 12; + utc.wDay = 31; + utc.wHour = 23; + utc.wMinute = 1; + res = pSystemTimeToTzSpecificLocalTime(&tzinfo, &utc, &local); + ok(res, "SystemTimeToTzSpecificLocalTime error %u\n", GetLastError()); + ok(local.wYear==2012 && local.wMonth==12 && local.wDay==31 && local.wHour==23 && local.wMinute==1, + "got (%d-%d-%d %02d:%02d), expected (2012-12-31 23:01)\n", + local.wYear, local.wMonth, local.wDay, local.wHour, local.wMinute); } static void test_FileTimeToSystemTime(void) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 224ad70..39d3395 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -152,7 +152,7 @@ static int TIME_DayLightCompareDate( const SYSTEMTIME *date, static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, FILETIME *lpFileTime, BOOL islocal ) { - int ret; + int ret, year; BOOL beforeStandardDate, afterDaylightDate; DWORD retval = TIME_ZONE_ID_INVALID; LONGLONG llTime = 0; /* initialized to prevent gcc complaining */ @@ -177,20 +177,29 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, if (!islocal) { FILETIME2LL( lpFileTime, llTime ); - llTime -= ( pTZinfo->Bias + pTZinfo->DaylightBias ) - * (LONGLONG)600000000; + llTime -= pTZinfo->Bias * (LONGLONG)600000000; LL2FILETIME( llTime, &ftTemp) lpFileTime = &ftTemp; } FileTimeToSystemTime(lpFileTime, &SysTime); - - /* check for daylight savings */ - ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->StandardDate); - if (ret == -2) - return TIME_ZONE_ID_INVALID; + year = SysTime.wYear; + + if (!islocal) { + llTime -= pTZinfo->DaylightBias * (LONGLONG)600000000; + LL2FILETIME( llTime, &ftTemp) + FileTimeToSystemTime(lpFileTime, &SysTime); + } + + /* check for daylight savings */ + if(year == SysTime.wYear) { + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->StandardDate); + if (ret == -2) + return TIME_ZONE_ID_INVALID; - beforeStandardDate = ret < 0; + beforeStandardDate = ret < 0; + } else + beforeStandardDate = SysTime.wYear < year; if (!islocal) { llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) @@ -199,11 +208,14 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, FileTimeToSystemTime(lpFileTime, &SysTime); } - ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate); - if (ret == -2) - return TIME_ZONE_ID_INVALID; + if(year == SysTime.wYear) { + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate); + if (ret == -2) + return TIME_ZONE_ID_INVALID; - afterDaylightDate = ret >= 0; + afterDaylightDate = ret >= 0; + } else + afterDaylightDate = SysTime.wYear > year; retval = TIME_ZONE_ID_STANDARD; if( pTZinfo->DaylightDate.wMonth < pTZinfo->StandardDate.wMonth ) {

1 0

Alexandre Julliard : gdi32: Fix handling of font orientation in advanced graphics mode.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: b057c5f1401405d5b66a5c64835abb0f69b8e056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b057c5f1401405d5b66a5c648… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 14:33:53 2012 +0100 gdi32: Fix handling of font orientation in advanced graphics mode. --- dlls/gdi32/dc.c | 2 ++ dlls/gdi32/dibdrv/graphics.c | 8 ++++++-- dlls/gdi32/font.c | 32 +++++++++++++++++--------------- dlls/gdi32/freetype.c | 3 ++- dlls/winex11.drv/xrender.c | 8 ++++++-- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 07d68eb..c6ba488 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1051,6 +1051,8 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) dc->GraphicsMode = mode; } release_dc_ptr( dc ); + /* font metrics depend on the graphics mode */ + if (ret) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); return ret; } diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d0b7a39..aadd9b5 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -499,8 +499,12 @@ static struct cached_font *add_cached_font( HDC hdc, HFONT hfont, UINT aa_flags GetObjectW( hfont, sizeof(font.lf), &font.lf ); GetTransform( hdc, 0x204, &font.xform ); font.xform.eDx = font.xform.eDy = 0; /* unused, would break hashing */ - if (GetGraphicsMode( hdc ) == GM_COMPATIBLE && font.xform.eM11 * font.xform.eM22 < 0) - font.lf.lfOrientation = -font.lf.lfOrientation; + if (GetGraphicsMode( hdc ) == GM_COMPATIBLE) + { + font.lf.lfOrientation = font.lf.lfEscapement; + if (font.xform.eM11 * font.xform.eM22 < 0) + font.lf.lfOrientation = -font.lf.lfOrientation; + } font.lf.lfWidth = abs( font.lf.lfWidth ); font.aa_flags = aa_flags; font.hash = font_cache_hash( &font ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3d67c64..3d75682 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -395,15 +395,6 @@ HFONT WINAPI CreateFontIndirectExW( const ENUMLOGFONTEXDVW *penumex ) fontPtr->logfont = *plf; - if (plf->lfEscapement != plf->lfOrientation) - { - /* this should really depend on whether GM_ADVANCED is set */ - fontPtr->logfont.lfOrientation = fontPtr->logfont.lfEscapement; - WARN("orientation angle %f set to " - "escapement angle %f for new font %p\n", - plf->lfOrientation/10., plf->lfEscapement/10., fontPtr); - } - if (!(hFont = alloc_gdi_handle( fontPtr, OBJ_FONT, &font_funcs ))) { HeapFree( GetProcessHeap(), 0, fontPtr ); @@ -2274,10 +2265,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if (dc->vport2WorldValid && dc->xformWorld2Vport.eM22 < 0) desired[1].y = -desired[1].y; } - else - { - if (layout & LAYOUT_RTL) desired[1].x = -desired[1].x; - } deltas[i].x = desired[1].x - width.x; deltas[i].y = desired[1].y - width.y; @@ -2288,6 +2275,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, } else { + POINT desired[2]; + if(!done_extents) { if(flags & ETO_GLYPH_INDEX) @@ -2296,8 +2285,21 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, GetTextExtentPointW(hdc, reordered_str, count, &sz); done_extents = TRUE; } - width.x = abs(INTERNAL_XWSTODS(dc, sz.cx)); - width.y = 0; + desired[0].x = desired[0].y = 0; + desired[1].x = sz.cx; + desired[1].y = 0; + LPtoDP(hdc, desired, 2); + desired[1].x -= desired[0].x; + desired[1].y -= desired[0].y; + + if (dc->GraphicsMode == GM_COMPATIBLE) + { + if (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 < 0) + desired[1].x = -desired[1].x; + if (dc->vport2WorldValid && dc->xformWorld2Vport.eM22 < 0) + desired[1].y = -desired[1].y; + } + width = desired[1]; } tm.tmAscent = abs(INTERNAL_YWSTODS(dc, tm.tmAscent)); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 521e665..6f3f070 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4578,7 +4578,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { lf.lfHeight *= fabs(dcmat.eM11); lf.lfWidth *= fabs(dcmat.eM11); - dcmat.eM11 = dcmat.eM22 = 1.0; + dcmat.eM11 = dcmat.eM22 = dcmat.eM11 < 0 ? -1 : 1; } } else @@ -4587,6 +4587,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) font scaling abilities. */ dcmat.eM11 = dcmat.eM22 = 1.0; dcmat.eM21 = dcmat.eM12 = 0; + lf.lfOrientation = lf.lfEscapement; if (dc->vport2WorldValid) { if (dc->xformWorld2Vport.eM11 * dc->xformWorld2Vport.eM22 < 0) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 4da2eb4..293e8e2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -884,8 +884,12 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) TRACE("font transform %f %f %f %f\n", lfsz.xform.eM11, lfsz.xform.eM12, lfsz.xform.eM21, lfsz.xform.eM22); - if (GetGraphicsMode( dev->hdc ) == GM_COMPATIBLE && lfsz.xform.eM11 * lfsz.xform.eM22 < 0) - lfsz.lf.lfOrientation = -lfsz.lf.lfOrientation; + if (GetGraphicsMode( dev->hdc ) == GM_COMPATIBLE) + { + lfsz.lf.lfOrientation = lfsz.lf.lfEscapement; + if (lfsz.xform.eM11 * lfsz.xform.eM22 < 0) + lfsz.lf.lfOrientation = -lfsz.lf.lfOrientation; + } /* Not used fields, would break hashing */ lfsz.xform.eDx = lfsz.xform.eDy = 0;

1 0

Jacek Caban : wininet: Fixed handling empty HTTP version string in HttpOpenRequest.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: bfad905bd8a60658a29660b5e84bb03b5b5d6209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfad905bd8a60658a29660b5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 10:59:24 2012 +0100 wininet: Fixed handling empty HTTP version string in HttpOpenRequest. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 383b907..f890363 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3141,7 +3141,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, } request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); - request->version = heap_strdupW(lpszVersion ? lpszVersion : g_szHttp1_1); + request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : g_szHttp1_1); HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ);

1 0

Michael Stefaniuc : dnsapi: Use FIELD_OFFSET for the size of a struct with var length array.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: c0092bcd7602b95fde2ca34be9a6dc02bca1f83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0092bcd7602b95fde2ca34be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:17:02 2012 +0100 dnsapi: Use FIELD_OFFSET for the size of a struct with var length array. --- dlls/dnsapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 72490c5..2116b11 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -563,7 +563,7 @@ static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) unsigned int size; int i; - size = sizeof(IP4_ARRAY) + sizeof(IP4_ADDRESS) * (_res.nscount - 1); + size = FIELD_OFFSET(IP4_ARRAY, AddrArray[_res.nscount]); if (!addrs || *len < size) { *len = size;

1 0

Dmitry Timoshkov : windowscodecs: Implement GetThumbnail in the PNG frame decoder.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: f52f910f8be9edafd77e3d91764a19cedc771e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52f910f8be9edafd77e3d917… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 10 11:45:04 2012 +0800 windowscodecs: Implement GetThumbnail in the PNG frame decoder. --- dlls/windowscodecs/pngformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fb45804..4183d8e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -903,8 +903,12 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = {

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_PSSetSamplers().
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 4c4131cd78af3fa779afbecd4e0d1a322f2c6354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4131cd78af3fa779afbecd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 9 21:22:06 2012 +0100 d3d10core: Implement d3d10_device_PSSetSamplers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 138f3e4..8944491 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -153,8 +153,19 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_PSSetSamplers(ID3D10Device *iface, UINT start_slot, UINT sampler_count, ID3D10SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + for (i = 0; i < sampler_count; ++i) + { + struct d3d10_sampler_state *sampler = unsafe_impl_from_ID3D10SamplerState(samplers[i]); + + wined3d_device_set_ps_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9cd280..c74498a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3052,6 +3052,27 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi return device->stateBlock->state.ps_cb[idx]; } +void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +{ + struct wined3d_sampler *prev; + + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.ps_sampler[idx]; + device->updateStateBlock->state.ps_sampler[idx] = sampler; + + if (sampler) + wined3d_sampler_incref(sampler); + if (prev) + wined3d_sampler_decref(prev); +} + HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 45118f4..10104e1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -570,6 +570,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) + { + if ((sampler = state->ps_sampler[i])) + { + state->ps_sampler[i] = NULL; + wined3d_sampler_decref(sampler); + } + } + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) { if ((buffer = state->ps_cb[i])) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8c58563..231b958 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -134,6 +134,7 @@ @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_render_target(ptr long ptr long) @ cdecl wined3d_device_set_sampler_state(ptr long long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64da8e5..9830e8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2319,6 +2319,7 @@ struct wined3d_state struct wined3d_shader *pixel_shader; struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; + struct wined3d_sampler *ps_sampler[MAX_SAMPLER_OBJECTS]; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4]; float *ps_consts_f; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0e955ce..2dd9a1a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2231,6 +2231,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, UINT start_register, const float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, UINT start_register, const int *constants, UINT vector4i_count); +void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device,

1 0

Henri Verbeet : ddraw: Avoid LPDDOVERLAYFX.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 5cea0f122c0de10bad781286568b9e38c5c5ac94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cea0f122c0de10bad7812865… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 9 21:22:05 2012 +0100 ddraw: Avoid LPDDOVERLAYFX. --- dlls/ddrawex/surface.c | 4 ++-- include/ddrawi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 119e401..5bd2bd0 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -794,8 +794,8 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_UpdateOverlay(IDirectDrawSurface4 } static HRESULT WINAPI IDirectDrawSurface3Impl_UpdateOverlay(IDirectDrawSurface3 *iface, - LPRECT SrcRect, IDirectDrawSurface3 *DstSurface, LPRECT DstRect, DWORD Flags, - LPDDOVERLAYFX FX) + RECT *SrcRect, IDirectDrawSurface3 *DstSurface, RECT *DstRect, DWORD Flags, + DDOVERLAYFX *FX) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); IDirectDrawSurfaceImpl *Dst = unsafe_impl_from_IDirectDrawSurface3(DstSurface); diff --git a/include/ddrawi.h b/include/ddrawi.h index 016e3ea..761d970 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -936,7 +936,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_MORE { DWORD dwOverlayFlags; VOID *rgjunc; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - LPDDOVERLAYFX lpddOverlayFX; + DDOVERLAYFX *lpddOverlayFX; DDSCAPSEX ddsCapsEx; DWORD dwTextureStage; LPVOID lpDDRAWReserved;

1 0