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

Alexandre Julliard : gdi32: Store the reference DC in the enhanced metafile and use it to retrieve device caps .
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 88bcd13d7f39fbb786d377de12716ef498f1bf80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88bcd13d7f39fbb786d377de1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 14:42:50 2012 +0200 gdi32: Store the reference DC in the enhanced metafile and use it to retrieve device caps. --- dlls/gdi32/enhmfdrv/dc.c | 40 +--------------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 11 +------- dlls/gdi32/enhmfdrv/init.c | 35 ++++++++++------------------- dlls/gdi32/tests/dc.c | 15 +++++++++--- 4 files changed, 26 insertions(+), 75 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 86ad961..817872c 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -515,43 +515,5 @@ INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; - switch(cap) { - - case HORZRES: - return physDev->horzres; - case VERTRES: - return physDev->vertres; - case LOGPIXELSX: - return physDev->logpixelsx; - case LOGPIXELSY: - return physDev->logpixelsy; - case HORZSIZE: - return physDev->horzsize; - case VERTSIZE: - return physDev->vertsize; - case BITSPIXEL: - return physDev->bitspixel; - case TEXTCAPS: - return physDev->textcaps; - case RASTERCAPS: - return physDev->rastercaps; - case TECHNOLOGY: - return physDev->technology; - case PLANES: - return physDev->planes; - case NUMCOLORS: - return physDev->numcolors; - case CURVECAPS: - return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | - CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); - case LINECAPS: - return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | - LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); - case POLYGONALCAPS: - return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | - PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); - default: - FIXME("Unimplemented cap %d\n", cap); - return 0; - } + return GetDeviceCaps( physDev->ref_dc, cap ); } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 53d69bc..03bb829 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -39,15 +39,8 @@ typedef struct HANDLE hFile; /* Handle for disk based MetaFile */ HBRUSH dc_brush; HPEN dc_pen; - INT horzres, vertres; - INT horzsize, vertsize; - INT logpixelsx, logpixelsy; - INT bitspixel; - INT textcaps; - INT rastercaps; - INT technology; - INT planes; - INT numcolors; + HDC ref_dc; /* Reference device */ + HDC screen_dc; /* Screen DC if no reference device specified */ INT restoring; /* RestoreDC counter */ } EMFDRV_PDEVICE; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index d254cba..883ca5a 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -317,8 +317,6 @@ HDC WINAPI CreateEnhMetaFileW( static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; HDC ret; DC *dc; - HDC hRefDC = hdc ? hdc : CreateDCW(displayW,NULL,NULL,NULL); - /* If no ref, use current display */ EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; @@ -354,19 +352,12 @@ HDC WINAPI CreateEnhMetaFileW( physDev->hFile = 0; physDev->dc_brush = 0; physDev->dc_pen = 0; - physDev->horzres = GetDeviceCaps(hRefDC, HORZRES); - physDev->vertres = GetDeviceCaps(hRefDC, VERTRES); - physDev->logpixelsx = GetDeviceCaps(hRefDC, LOGPIXELSX); - physDev->logpixelsy = GetDeviceCaps(hRefDC, LOGPIXELSY); - physDev->horzsize = GetDeviceCaps(hRefDC, HORZSIZE); - physDev->vertsize = GetDeviceCaps(hRefDC, VERTSIZE); - physDev->bitspixel = GetDeviceCaps(hRefDC, BITSPIXEL); - physDev->textcaps = GetDeviceCaps(hRefDC, TEXTCAPS); - physDev->rastercaps = GetDeviceCaps(hRefDC, RASTERCAPS); - physDev->technology = GetDeviceCaps(hRefDC, TECHNOLOGY); - physDev->planes = GetDeviceCaps(hRefDC, PLANES); - physDev->numcolors = GetDeviceCaps(hRefDC, NUMCOLORS); + physDev->screen_dc = 0; physDev->restoring = 0; + if (hdc) /* if no ref, use current display */ + physDev->ref_dc = hdc; + else + physDev->ref_dc = physDev->screen_dc = CreateDCW( displayW, NULL, NULL, NULL ); SetVirtualResolution(physDev->dev.hdc, 0, 0, 0, 0); @@ -400,16 +391,16 @@ HDC WINAPI CreateEnhMetaFileW( physDev->emh->nPalEntries = 0; /* I guess this should start at 0 */ /* Size in pixels */ - physDev->emh->szlDevice.cx = physDev->horzres; - physDev->emh->szlDevice.cy = physDev->vertres; + physDev->emh->szlDevice.cx = GetDeviceCaps( physDev->ref_dc, HORZRES ); + physDev->emh->szlDevice.cy = GetDeviceCaps( physDev->ref_dc, VERTRES ); /* Size in millimeters */ - physDev->emh->szlMillimeters.cx = physDev->horzsize; - physDev->emh->szlMillimeters.cy = physDev->vertsize; + physDev->emh->szlMillimeters.cx = GetDeviceCaps( physDev->ref_dc, HORZSIZE ); + physDev->emh->szlMillimeters.cy = GetDeviceCaps( physDev->ref_dc, VERTSIZE ); /* Size in micrometers */ - physDev->emh->szlMicrometers.cx = physDev->horzsize * 1000; - physDev->emh->szlMicrometers.cy = physDev->vertsize * 1000; + physDev->emh->szlMicrometers.cx = physDev->emh->szlMillimeters.cx * 1000; + physDev->emh->szlMicrometers.cy = physDev->emh->szlMillimeters.cy * 1000; memcpy((char *)physDev->emh + sizeof(ENHMETAHEADER), description, length); @@ -431,9 +422,6 @@ HDC WINAPI CreateEnhMetaFileW( ret = physDev->dev.hdc; release_dc_ptr( dc ); - if( !hdc ) - DeleteDC( hRefDC ); - return ret; } @@ -469,6 +457,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); + if (physDev->screen_dc) DeleteDC( physDev->screen_dc ); emr.emr.iType = EMR_EOF; emr.emr.nSize = sizeof(emr); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5536abf..324e65b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -383,7 +383,10 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); type = GetClipBox( hdc, &rect ); - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + if (GetObjectType( hdc ) == OBJ_ENHMETADC) + todo_wine ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + else + ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); SetMapMode( hdc, MM_TEXT ); @@ -494,8 +497,7 @@ static void test_CreateCompatibleDC(void) ok( SelectObject( hNewDC, bitmap ) != 0, "SelectObject failed\n" ); caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); - caps = GetDeviceCaps( hNewDC, TECHNOLOGY ); - ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + test_device_caps( hdcMetafile, hdc, "enhmetafile dc" ); DeleteDC( hNewDC ); DeleteEnhMetaFile( CloseEnhMetaFile( hdcMetafile )); ReleaseDC( 0, hdc ); @@ -1144,7 +1146,7 @@ done: static void test_printer_dc(void) { - HDC memdc, display_memdc; + HDC memdc, display_memdc, enhmf_dc; HBITMAP orig, bmp; DWORD ret; HDC hdc = create_printer_dc(); @@ -1188,6 +1190,11 @@ static void test_printer_dc(void) ret = GetPixel( hdc, 0, 0 ); ok( ret == CLR_INVALID, "wrong pixel value %x\n", ret ); + enhmf_dc = CreateEnhMetaFileA( hdc, NULL, NULL, NULL ); + ok(enhmf_dc != 0, "CreateEnhMetaFileA failed\n"); + test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc" ); + DeleteEnhMetaFile( CloseEnhMetaFile( enhmf_dc )); + DeleteDC( memdc ); DeleteDC( display_memdc ); DeleteDC( hdc );

1 0

Alexandre Julliard : gdi32: Add explicit fields for the DC flags.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 2776a979315a6217217e332615d10ca11b954a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2776a979315a6217217e33261… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:36:45 2012 +0200 gdi32: Add explicit fields for the DC flags. --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/gdi_private.h | 7 +++---- dlls/gdi32/path.c | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index aee02c4..478100d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1347,7 +1347,7 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) if ((flags & DCB_ENABLE) && (flags & DCB_DISABLE)) return 0; if (!(dc = get_dc_ptr( hdc ))) return 0; - ret = ((dc->flags & DC_BOUNDS_ENABLE) ? DCB_ENABLE : DCB_DISABLE) | + ret = (dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE) | (is_rect_empty( &dc->BoundsRect ) ? DCB_RESET : DCB_SET); if (flags & DCB_RESET) @@ -1376,8 +1376,8 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } } - if (flags & DCB_ENABLE) dc->flags |= DC_BOUNDS_ENABLE; - if (flags & DCB_DISABLE) dc->flags &= ~DC_BOUNDS_ENABLE; + if (flags & DCB_ENABLE) dc->bounds_enabled = TRUE; + if (flags & DCB_DISABLE) dc->bounds_enabled = FALSE; release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2053553..5728a53 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -89,6 +89,9 @@ typedef struct tagDC DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ + BOOL bounds_enabled:1; /* bounds tracking is enabled */ + BOOL path_open:1; /* path is currently open (only for saved DCs) */ + INT wndOrgX; /* Window origin */ INT wndOrgY; INT wndExtX; /* Window extent */ @@ -149,10 +152,6 @@ typedef struct tagDC RECT BoundsRect; /* Current bounding rect */ } DC; - /* DC flags */ -#define DC_PATH_OPEN 0x0001 /* DC path is open (only set on saved DCs) */ -#define DC_BOUNDS_ENABLE 0x0008 /* Bounding rectangle tracking is enabled */ - /* Certain functions will do no further processing if the driver returns this. Used by mfdrv for example. */ #define GDI_NO_MORE_WORK 2 diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 52f103d..058a48a 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -867,7 +867,7 @@ BOOL PATH_SavePath( DC *dst, DC *src ) else if ((physdev = find_path_physdev( src ))) { if (!(dst->path = copy_gdi_path( physdev->path ))) return FALSE; - dst->flags |= DC_PATH_OPEN; + dst->path_open = TRUE; } else dst->path = NULL; return TRUE; @@ -877,7 +877,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) { struct path_physdev *physdev = find_path_physdev( dst ); - if (src->path && (src->flags & DC_PATH_OPEN)) + if (src->path && src->path_open) { if (!physdev) { @@ -887,7 +887,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) else free_gdi_path( physdev->path ); physdev->path = src->path; - src->flags &= ~DC_PATH_OPEN; + src->path_open = FALSE; src->path = NULL; } else if (physdev)

1 0

Alexandre Julliard : gdi32: Clip the returned DC bounds to the device rectangle.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: b762fcc9a751495ec247a22a5fea9eae383733da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b762fcc9a751495ec247a22a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:34:25 2012 +0200 gdi32: Clip the returned DC bounds to the device rectangle. --- dlls/gdi32/dc.c | 4 ++++ dlls/gdi32/tests/dc.c | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1e0ac10..aee02c4 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1318,6 +1318,10 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) { *rect = dc->BoundsRect; ret = is_rect_empty( rect ) ? DCB_RESET : DCB_SET; + rect->left = max( rect->left, 0 ); + rect->top = max( rect->top, 0 ); + rect->right = min( rect->right, dc->vis_rect.right - dc->vis_rect.left ); + rect->bottom = min( rect->bottom, dc->vis_rect.bottom - dc->vis_rect.top ); DPtoLP( hdc, (POINT *)rect, 2 ); } if (flags & DCB_RESET) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e2ec28c..5536abf 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -930,7 +930,6 @@ static void test_boundsrect(void) ret = GetBoundsRect( hdc, &rect, 0 ); ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); SetRect( &expect, 6, 6, 1, 1 ); - todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); SetBoundsRect( hdc, NULL, DCB_ENABLE ); LineTo( hdc, 50, 40 );

1 0

Alexandre Julliard : gdi32: SaveDC doesn't save the DC bounds.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 5917bd3959f39a996b87356f9ef824677bfc4b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5917bd3959f39a996b87356f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:33:48 2012 +0200 gdi32: SaveDC doesn't save the DC bounds. --- dlls/gdi32/dc.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e4f31814..1e0ac10 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -336,7 +336,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) DC *newdc, *dc = get_nulldrv_dc( dev ); if (!(newdc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*newdc )))) return 0; - newdc->flags = dc->flags; newdc->layout = dc->layout; newdc->hPen = dc->hPen; newdc->hBrush = dc->hBrush; @@ -379,7 +378,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) newdc->vportExtY = dc->vportExtY; newdc->virtual_res = dc->virtual_res; newdc->virtual_size = dc->virtual_size; - newdc->BoundsRect = dc->BoundsRect; newdc->gdiFont = dc->gdiFont; /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ @@ -428,7 +426,6 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (!PATH_RestorePath( dc, dcs )) return FALSE; - dc->flags = dcs->flags; dc->layout = dcs->layout; dc->hDevice = dcs->hDevice; dc->ROPmode = dcs->ROPmode; @@ -456,8 +453,6 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->xformWorld2Vport = dcs->xformWorld2Vport; dc->xformVport2World = dcs->xformVport2World; dc->vport2WorldValid = dcs->vport2WorldValid; - dc->BoundsRect = dcs->BoundsRect; - dc->wndOrgX = dcs->wndOrgX; dc->wndOrgY = dcs->wndOrgY; dc->wndExtX = dcs->wndExtX;

1 0

Erich Hoover : ws2_32: Implement IP_UNICAST_IF socket option.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 313d36d5aa03db464a752eca58df87b628ca80bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=313d36d5aa03db464a752eca5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 9 13:06:08 2012 -0600 ws2_32: Implement IP_UNICAST_IF socket option. --- dlls/ws2_32/socket.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 228d101..5d20459 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -383,6 +383,9 @@ static const int ws_ip_map[][2] = #ifdef IP_PKTINFO MAP_OPTION( IP_PKTINFO ), #endif +#ifdef IP_UNICAST_IF + MAP_OPTION( IP_UNICAST_IF ), +#endif }; static const int ws_ipv6_map[][2] = @@ -2846,6 +2849,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #endif case WS_IP_TOS: case WS_IP_TTL: +#ifdef IP_UNICAST_IF + case WS_IP_UNICAST_IF: +#endif if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); @@ -4268,6 +4274,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #endif case WS_IP_TOS: case WS_IP_TTL: +#ifdef IP_UNICAST_IF + case WS_IP_UNICAST_IF: +#endif convert_sockopt(&level, &optname); break; case WS_IP_DONTFRAGMENT:

1 0

Alexandre Julliard : gdi32/tests: Add tests for DC bounds handling across various DC manipulations.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 80f68d4442b59cfa4260edf2c9d776a954ae2138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f68d4442b59cfa4260edf2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:30:32 2012 +0200 gdi32/tests: Add tests for DC bounds handling across various DC manipulations. --- dlls/gdi32/tests/dc.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 52f0fba..e2ec28c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -736,15 +736,18 @@ todo_wine static void test_boundsrect(void) { + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)buffer; HDC hdc; - HBITMAP bitmap; + HBITMAP bitmap, dib, old; RECT rect, expect, set_rect; UINT ret; + int level; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); bitmap = CreateCompatibleBitmap( hdc, 200, 200 ); - SelectObject( hdc, bitmap ); + old = SelectObject( hdc, bitmap ); ret = GetBoundsRect(hdc, NULL, 0); ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret); @@ -874,8 +877,115 @@ static void test_boundsrect(void) rect.left, rect.top, rect.right, rect.bottom); } + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + MoveToEx( hdc, 10, 10, NULL ); + LineTo( hdc, 20, 20 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + todo_wine + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 10, 10, 21, 21 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetRect( &rect, 8, 8, 23, 23 ); + expect = rect; + SetBoundsRect( hdc, &rect, DCB_ACCUMULATE ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + level = SaveDC( hdc ); + LineTo( hdc, 30, 25 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 8, 8, 31, 26 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetBoundsRect( hdc, NULL, DCB_DISABLE ); + LineTo( hdc, 40, 40 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 8, 8, 31, 26 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetRect( &rect, 6, 6, 30, 30 ); + SetBoundsRect( hdc, &rect, DCB_ACCUMULATE ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 31, 30 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + RestoreDC( hdc, level ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, 40, 40 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + SelectObject( hdc, old ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 1, 1 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetBoundsRect( hdc, NULL, DCB_ENABLE ); + LineTo( hdc, 50, 40 ); + + SelectObject( hdc, bitmap ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 51, 41 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SelectObject( hdc, GetStockObject( NULL_PEN )); + LineTo( hdc, 50, 50 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 51, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + memset( buffer, 0, sizeof(buffer) ); + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = 64; + info->bmiHeader.biHeight = 64; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 8; + info->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( 0, info, DIB_RGB_COLORS, NULL, NULL, 0 ); + ok( dib != 0, "failed to create DIB\n" ); + SelectObject( hdc, dib ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 51, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, 55, 30 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 56, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, 100, 30 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 64, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, -100, -100 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 0, 0, 64, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + DeleteDC( hdc ); DeleteObject( bitmap ); + DeleteObject( dib ); } static void test_desktop_colorres(void)

1 0

Alexandre Julliard : gdi32/tests: Automatically reset the bits after comparing the hash.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 514e952827477dab0b494752512909fc4ad7f8ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=514e952827477dab0b4947525… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 21:28:50 2012 +0200 gdi32/tests: Automatically reset the bits after comparing the hash. --- dlls/gdi32/tests/dib.c | 67 +++--------------------------------------------- 1 files changed, 4 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=514e952827477dab0b494…

1 0

Alexandre Julliard : gdi32/tests: Add tests for DC bounds to the DIB graphics tests.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 399ab6f1f26c81ab4a7ff8069ed904435033a2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399ab6f1f26c81ab4a7ff8069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 22:59:11 2012 +0200 gdi32/tests: Add tests for DC bounds to the DIB graphics tests. --- dlls/gdi32/tests/dib.c | 383 +++++++++++++++++++++++++++++++----------------- 1 files changed, 249 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=399ab6f1f26c81ab4a7ff…

1 0

Alexandre Julliard : gdi32/tests: Add tests for DC bounds on various device types.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: a186a8b170d5f6976148d30307202bb7c62c7070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a186a8b170d5f6976148d3030… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:20:01 2012 +0200 gdi32/tests: Add tests for DC bounds on various device types. --- dlls/gdi32/tests/dc.c | 61 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index da2c31b..52f0fba 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -345,7 +345,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) unsigned int i; WORD ramp[3][256]; BOOL ret; - RECT clip; + RECT rect; UINT type; if (GetObjectType( hdc ) == OBJ_METADC) @@ -360,8 +360,15 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &clip ); + type = GetClipBox( hdc, &rect ); ok( type == ERROR, "GetClipBox returned %d on %s\n", type, descr ); + + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + SetMapMode( hdc, MM_TEXT ); + Rectangle( hdc, 2, 2, 5, 5 ); + type = GetBoundsRect( hdc, &rect, DCB_RESET ); + todo_wine + ok( !type, "GetBoundsRect succeeded on %s\n", descr ); } else { @@ -375,16 +382,35 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &clip ); + type = GetClipBox( hdc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + SetMapMode( hdc, MM_TEXT ); + Rectangle( hdc, 2, 2, 4, 4 ); + type = GetBoundsRect( hdc, &rect, DCB_RESET ); + todo_wine + ok( rect.left == 2 && rect.top == 2 && rect.right == 4 && rect.bottom == 4 && type == DCB_SET, + "GetBoundsRect returned %d,%d,%d,%d type %x on memdc for %s\n", + rect.left, rect.top, rect.right, rect.bottom, type, descr ); } - type = GetClipBox( ref_dc, &clip ); + type = GetClipBox( ref_dc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); - ok( clip.left == 0 && clip.top == 0 && - clip.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && - clip.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), - "GetClipBox returned %d,%d,%d,%d on %s\n", clip.left, clip.top, clip.right, clip.bottom, descr ); + ok( rect.left == 0 && rect.top == 0 && + rect.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && + rect.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), + "GetClipBox returned %d,%d,%d,%d on %s\n", rect.left, rect.top, rect.right, rect.bottom, descr ); + + SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_ACCUMULATE ); + SetMapMode( ref_dc, MM_TEXT ); + Rectangle( ref_dc, 3, 3, 5, 5 ); + type = GetBoundsRect( ref_dc, &rect, DCB_RESET ); + /* it may or may not work on non-memory DCs */ + ok( (rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0 && type == DCB_RESET) || + (rect.left == 3 && rect.top == 3 && rect.right == 5 && rect.bottom == 5 && type == DCB_SET), + "GetBoundsRect returned %d,%d,%d,%d type %x on %s\n", + rect.left, rect.top, rect.right, rect.bottom, type, descr ); if (GetObjectType( hdc ) == OBJ_MEMDC) { @@ -413,11 +439,20 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &clip ); + type = GetClipBox( hdc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); - ok( clip.left == 0 && clip.top == 0 && clip.right == 16 && clip.bottom == 16, + ok( rect.left == 0 && rect.top == 0 && rect.right == 16 && rect.bottom == 16, "GetClipBox returned %d,%d,%d,%d on memdc for %s\n", - clip.left, clip.top, clip.right, clip.bottom, descr ); + rect.left, rect.top, rect.right, rect.bottom, descr ); + + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + SetMapMode( hdc, MM_TEXT ); + Rectangle( hdc, 5, 5, 12, 14 ); + type = GetBoundsRect( hdc, &rect, DCB_RESET ); + todo_wine + ok( rect.left == 5 && rect.top == 5 && rect.right == 12 && rect.bottom == 14 && type == DCB_SET, + "GetBoundsRect returned %d,%d,%d,%d type %x on memdc for %s\n", + rect.left, rect.top, rect.right, rect.bottom, type, descr ); SelectObject( hdc, old ); DeleteObject( dib ); @@ -1022,13 +1057,13 @@ static void test_printer_dc(void) ret = GetDeviceCaps( display_memdc, TECHNOLOGY ); ok( ret == DT_RASDISPLAY, "wrong type %u\n", ret ); - test_device_caps( memdc, hdc, "printer dc" ); - bmp = CreateBitmap( 100, 100, 1, GetDeviceCaps( hdc, BITSPIXEL ), NULL ); orig = SelectObject( memdc, bmp ); ok( orig != NULL, "SelectObject failed\n" ); ok( BitBlt( hdc, 10, 10, 20, 20, memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); + test_device_caps( memdc, hdc, "printer dc" ); + ok( !SelectObject( display_memdc, bmp ), "SelectObject succeeded\n" ); SelectObject( memdc, orig ); DeleteObject( bmp );

1 0

Frédéric Delanoy : Fixes for 1.5. 1 French translation
by Jeremy Newman April 9, 2012

April 9, 2012

Module: website Branch: master Commit: 651d70b1da11a1910d81db43ed65809d782ce526 URL: http://source.winehq.org/git/website.git/?a=commit;h=651d70b1da11a1910d81db… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 8 10:38:35 2012 +0200 Fixes for 1.5.1 French translation --- news/fr/2012033001.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/news/fr/2012033001.xml b/news/fr/2012033001.xml index 94d4c57..7aff991 100644 --- a/news/fr/2012033001.xml +++ b/news/fr/2012033001.xml @@ -1,9 +1,9 @@ <news> <date></date> -<title>Sortie de Wine 1.5.x</title> +<title>Sortie de Wine 1.5.1</title> <body> - La version de développement 1.5.x de Wine est disponible. - <a href="{$root}/announce/1.5.x">Nouveautés</a> de cette version : + La version de développement 1.5.1 de Wine est disponible. + <a href="{$root}/announce/1.5.1">Nouveautés</a> de cette version : <ul> <li>JavaScript intégré préféré à celui de Gecko dans la plupart des cas.</li> <li>Prise en charge des ressources de polices évolutives.</li> @@ -12,7 +12,7 @@ <li>Diverses corrections de bogues.</li> </ul> Le <a -href="http://prdownloads.sourceforge.net/wine/wine-1.5.x.tar.bz2">code +href="http://prdownloads.sourceforge.net/wine/wine-1.5.1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs.

1 0