wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

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

10 Dec '12

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 10 Dec '12

10 Dec '12

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

Alexandre Julliard : gdi32: Add ref counting to the font objects and simplify the cache management.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 75fff47f945dd2b5855c863383c82ff6ba4221ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fff47f945dd2b5855c86338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 12:32:17 2012 +0100 gdi32: Add ref counting to the font objects and simplify the cache management. --- dlls/gdi32/font.c | 2 - dlls/gdi32/freetype.c | 168 +++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 53 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75fff47f945dd2b5855c8…

1 0

Alexandre Julliard : gdiplus/tests: Tweak some metrics to make the tests pass on Wine.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: fa664b548ee96dafdfc8c186ab43300a679bd5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa664b548ee96dafdfc8c186a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 11:54:58 2012 +0100 gdiplus/tests: Tweak some metrics to make the tests pass on Wine. --- dlls/gdiplus/tests/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 42612dd..fdea646 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3055,7 +3055,7 @@ static void test_string_functions(void) expect(3, linesfilled); /* Cut off everything including the first space. */ - rc.Width = char_bounds.Width + char_width * 1.5; + rc.Width = char_bounds.Width + char_width * 1.7; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status); @@ -3067,7 +3067,7 @@ static void test_string_functions(void) expect(3, linesfilled); /* Cut off everything after the first character. */ - rc.Width = char_bounds.Width + char_width * 0.5; + rc.Width = char_bounds.Width + char_width * 0.8; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status);

1 0

Alexandre Julliard : widl: Fix a typo in the man page.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 50835b415160e677c81ffa6dbfcbdf1581d5d6e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50835b415160e677c81ffa6db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 11:27:33 2012 +0100 widl: Fix a typo in the man page. --- tools/widl/widl.man.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 5b6e0de..0e4baa5 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -114,7 +114,7 @@ prefixed with \fB0x\fR, it will be interpreted as an hexadecimal number. For the meaning of values, see the \fBDebug\fR section. .PP .B Miscellaneous options: -.IP "\fB-app_config\f" +.IP "\fB-app_config\fR" Ignored, present for midl compatibility. .IP "\fB--local-stubs=\fIfile\fR" Generate empty stubs for call_as/local methods in an object interface and

1 0

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

10 Dec '12

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 : itss: Don' t over-allocate memory for a ITSS_IStorageImpl.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 27adacc577a95f5e426d4aab858212654dbb9292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27adacc577a95f5e426d4aab8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:31:41 2012 +0100 itss: Don't over-allocate memory for a ITSS_IStorageImpl. --- dlls/itss/storage.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index c53b0c2..60e452d 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -616,13 +616,11 @@ static HRESULT ITSS_create_chm_storage( struct chmFile *chmfile, const WCHAR *dir, IStorage** ppstgOpen ) { ITSS_IStorageImpl *stg; - DWORD len; TRACE("%p %s\n", chmfile, debugstr_w( dir ) ); - len = strlenW( dir ) + 1; - stg = HeapAlloc( GetProcessHeap(), 0, - sizeof (ITSS_IStorageImpl) + len*sizeof(WCHAR) ); + stg = HeapAlloc( GetProcessHeap(), 0, + FIELD_OFFSET( ITSS_IStorageImpl, dir[strlenW( dir ) + 1] )); stg->IStorage_iface.lpVtbl = &ITSS_IStorageImpl_Vtbl; stg->ref = 1; stg->chmfile = chmfile;

1 0

Michael Stefaniuc : iphlpapi: Simplify size calculation of structs with var length array.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 61a029355ec2865c3f83accfa9f1cfb5e5641173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a029355ec2865c3f83accfa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:22:25 2012 +0100 iphlpapi: Simplify size calculation of structs with var length array. --- dlls/iphlpapi/ifenum.c | 10 ++-------- dlls/iphlpapi/iphlpapi_main.c | 4 +--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index aff88cd..d8eebca 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -211,13 +211,10 @@ InterfaceIndexTable *getInterfaceIndexTable(void) if (indexes) { struct if_nameindex *p; - DWORD size = sizeof(InterfaceIndexTable); for (p = indexes, numInterfaces = 0; p && p->if_name; p++) numInterfaces++; - if (numInterfaces > 1) - size += (numInterfaces - 1) * sizeof(DWORD); - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[numInterfaces])); if (ret) { ret->numIndexes = 0; for (p = indexes; p && p->if_name; p++) @@ -241,14 +238,11 @@ InterfaceIndexTable *getNonLoopbackInterfaceIndexTable(void) if (indexes) { struct if_nameindex *p; - DWORD size = sizeof(InterfaceIndexTable); for (p = indexes, numInterfaces = 0; p && p->if_name; p++) if (!isLoopbackInterface(fd, p->if_name)) numInterfaces++; - if (numInterfaces > 1) - size += (numInterfaces - 1) * sizeof(DWORD); - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[numInterfaces])); if (ret) { ret->numIndexes = 0; for (p = indexes; p && p->if_name; p++) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 16f138c..9cffe06 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1505,10 +1505,8 @@ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL ret = getIPAddrTable(&table, GetProcessHeap(), 0); if (ret == NO_ERROR) { - ULONG size = sizeof(MIB_IPADDRTABLE); + ULONG size = FIELD_OFFSET(MIB_IPADDRTABLE, table[table->dwNumEntries]); - if (table->dwNumEntries > 1) - size += (table->dwNumEntries - 1) * sizeof(MIB_IPADDRROW); if (!pIpAddrTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER;

1 0

Michael Stefaniuc : dwrite: Don't overallocate memory for a BITMAPINFO.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 034b8d5c3c99ba90c533e37615ed3ff651c65a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=034b8d5c3c99ba90c533e3761… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:19:59 2012 +0100 dwrite: Don't overallocate memory for a BITMAPINFO. --- dlls/dwrite/gdiinterop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index d41af81..496f099 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -165,7 +165,7 @@ static const IDWriteBitmapRenderTargetVtbl rendertargetvtbl = { static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; struct rendertarget *This; HBITMAP dib;

1 0

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

10 Dec '12

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

← Newer
1
...
35
36
37
38
39
40
41
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012