January 2012 - Wine-commits

Alexandre Julliard : gdi32: Simplify CreateDIBSection and avoid using the reference DC if not needed.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 8946a33c4b0d85ac1c8dd5129cfb85c932d73438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8946a33c4b0d85ac1c8dd5129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 14:43:12 2012 +0100 gdi32: Simplify CreateDIBSection and avoid using the reference DC if not needed. --- dlls/gdi32/dib.c | 54 +++++++++++++++--------------------------------------- 1 files changed, 15 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0f17972..3a8fadb 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1486,11 +1486,8 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; HBITMAP ret = 0; - DC *dc; - BOOL bDesktopDC = FALSE; DIBSECTION *dib; BITMAPOBJ *bmp; - RGBQUAD *color_table = NULL; void *mapBits = NULL; if (bits) *bits = NULL; @@ -1502,7 +1499,8 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, WARN( "%u planes not properly supported\n", info->bmiHeader.biPlanes ); } - if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; + if (!(bmp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*bmp) ))) return 0; + if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) goto error; TRACE("format (%d,%d), planes %d, bpp %d, %s, size %d %s\n", info->bmiHeader.biWidth, info->bmiHeader.biHeight, @@ -1519,14 +1517,17 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBm.bmBits = NULL; dib->dsBmih = info->bmiHeader; + bmp->funcs = &dib_driver; + bmp->dib = dib; + if (info->bmiHeader.biBitCount <= 8) /* build the color table */ { if (usage == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( info, hdc )) goto error; dib->dsBmih.biClrUsed = info->bmiHeader.biClrUsed; - if (!(color_table = HeapAlloc( GetProcessHeap(), 0, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ))) + if (!(bmp->color_table = HeapAlloc( GetProcessHeap(), 0, dib->dsBmih.biClrUsed*sizeof(RGBQUAD) ))) goto error; - memcpy( color_table, info->bmiColors, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ); + memcpy( bmp->color_table, info->bmiColors, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ); } /* set dsBitfields values */ @@ -1572,46 +1573,21 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (!dib->dsBm.bmBits) goto error; - /* If the reference hdc is null, take the desktop dc */ - if (hdc == 0) - { - hdc = CreateCompatibleDC(0); - bDesktopDC = TRUE; - } - - if (!(dc = get_dc_ptr( hdc ))) goto error; - - /* create Device Dependent Bitmap and add DIB pointer */ - ret = CreateBitmap( dib->dsBm.bmWidth, dib->dsBm.bmHeight, 1, - (info->bmiHeader.biBitCount == 1) ? 1 : GetDeviceCaps(hdc, BITSPIXEL), NULL ); + bmp->bitmap = dib->dsBm; + bmp->bitmap.bmWidthBytes = get_bitmap_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + bmp->bitmap.bmBits = NULL; - if (ret && ((bmp = GDI_GetObjPtr(ret, OBJ_BITMAP)))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pCreateDIBSection ); - bmp->dib = dib; - bmp->header.funcs = &dib_funcs; - bmp->funcs = physdev->funcs; - bmp->color_table = color_table; - GDI_ReleaseObj( ret ); - - if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) - { - DeleteObject( ret ); - ret = 0; - } - } + if (!(ret = alloc_gdi_handle( &bmp->header, OBJ_BITMAP, &dib_funcs ))) goto error; - release_dc_ptr( dc ); - if (bDesktopDC) DeleteDC( hdc ); - if (ret && bits) *bits = dib->dsBm.bmBits; + if (bits) *bits = dib->dsBm.bmBits; return ret; error: - if (bDesktopDC) DeleteDC( hdc ); if (section) UnmapViewOfFile( mapBits ); - else if (!offset) VirtualFree( dib->dsBm.bmBits, 0, MEM_RELEASE ); - HeapFree( GetProcessHeap(), 0, color_table ); + else VirtualFree( dib->dsBm.bmBits, 0, MEM_RELEASE ); + HeapFree( GetProcessHeap(), 0, bmp->color_table ); HeapFree( GetProcessHeap(), 0, dib ); + HeapFree( GetProcessHeap(), 0, bmp ); return 0; }

1 0

Alexandre Julliard : gdi32: Use the bpp info from the bitmap structure now that it' s identical to the DIB one.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 66774baba3e67f8c6002f7954401abd7ae625444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66774baba3e67f8c6002f7954… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 19:38:54 2012 +0100 gdi32: Use the bpp info from the bitmap structure now that it's identical to the DIB one. --- dlls/gdi32/bitmap.c | 9 +++------ dlls/gdi32/dib.c | 26 +++++++++----------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index dcccd3d..ab93525 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -342,9 +342,7 @@ LONG WINAPI GetBitmapBits( if (!bmp) return 0; funcs = get_bitmap_funcs( bmp ); - if (bmp->dib) dst_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); - else dst_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); - + dst_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); ret = max = dst_stride * bmp->bitmap.bmHeight; if (!bits) goto done; if (count > max) count = max; @@ -426,8 +424,7 @@ LONG WINAPI SetBitmapBits( count = -count; } - if (bmp->dib) src_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); - else src_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + src_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); count = min( count, src_stride * bmp->bitmap.bmHeight ); dst_stride = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); @@ -481,7 +478,7 @@ LONG WINAPI SetBitmapBits( /* query the color info */ info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->dib ? bmp->dib->dsBmih.biBitCount : bmp->bitmap.bmBitsPixel; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3a8fadb..143cc47 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -975,25 +975,17 @@ static int fill_query_info( BITMAPINFO *info, BITMAPOBJ *bmp ) header.biWidth = bmp->bitmap.bmWidth; header.biHeight = bmp->bitmap.bmHeight; header.biPlanes = 1; + header.biBitCount = bmp->bitmap.bmBitsPixel; - if (bmp->dib) + switch (header.biBitCount) { - header.biBitCount = bmp->dib->dsBm.bmBitsPixel; - switch (bmp->dib->dsBm.bmBitsPixel) - { - case 16: - case 32: - header.biCompression = BI_BITFIELDS; - break; - default: - header.biCompression = BI_RGB; - break; - } - } - else - { - header.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; - header.biBitCount = bmp->bitmap.bmBitsPixel; + case 16: + case 32: + header.biCompression = BI_BITFIELDS; + break; + default: + header.biCompression = BI_RGB; + break; } header.biSizeImage = get_dib_image_size( (BITMAPINFO *)&header );

1 0

Alexandre Julliard : gdi32: Get rid of the get_bitmap_funcs function.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 8a9be0a30bd9e8b5fd5ab4e7c78905cfabefeb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9be0a30bd9e8b5fd5ab4e7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 14:11:50 2012 +0100 gdi32: Get rid of the get_bitmap_funcs function. DIBs no longer use the display driver functions. --- dlls/gdi32/bitmap.c | 11 +++-------- dlls/gdi32/brush.c | 4 +--- dlls/gdi32/dib.c | 12 +++--------- dlls/gdi32/gdi_private.h | 6 ------ 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index ab93525..af96111 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -337,10 +337,8 @@ LONG WINAPI GetBitmapBits( struct bitblt_coords src; int dst_stride, max, ret; BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - const struct gdi_dc_funcs *funcs; if (!bmp) return 0; - funcs = get_bitmap_funcs( bmp ); dst_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); ret = max = dst_stride * bmp->bitmap.bmHeight; @@ -356,7 +354,7 @@ LONG WINAPI GetBitmapBits( src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - if (!funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) + if (!bmp->funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) { const char *src_ptr = src_bits.ptr; int src_stride = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); @@ -410,15 +408,12 @@ LONG WINAPI SetBitmapBits( struct bitblt_coords src, dst; struct gdi_image_bits src_bits; HRGN clip = NULL; - const struct gdi_dc_funcs *funcs; if (!bits) return 0; bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return 0; - funcs = get_bitmap_funcs( bmp ); - if (count < 0) { WARN("(%d): Negative number of bytes passed???\n", count ); count = -count; @@ -487,14 +482,14 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = 0; info->bmiHeader.biHeight = 0; info->bmiHeader.biSizeImage = 0; - err = funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); if (!err || err == ERROR_BAD_FORMAT) { info->bmiHeader.biWidth = bmp->bitmap.bmWidth; info->bmiHeader.biHeight = -dst.height; info->bmiHeader.biSizeImage = dst.height * dst_stride; - err = funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); + err = bmp->funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 7513fca..f8c91c1 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -58,7 +58,6 @@ static const struct gdi_obj_funcs brush_funcs = /* fetch the contents of the brush bitmap and cache them in the brush pattern */ void cache_pattern_bits( PHYSDEV physdev, struct brush_pattern *pattern ) { - const struct gdi_dc_funcs *funcs; struct gdi_image_bits bits; struct bitblt_coords src; BITMAPINFO *info; @@ -76,8 +75,7 @@ void cache_pattern_bits( PHYSDEV physdev, struct brush_pattern *pattern ) src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->bitmap.bmWidth; src.visrect.bottom = src.height = bmp->bitmap.bmHeight; - funcs = get_bitmap_funcs( bmp ); - if (funcs->pGetImage( NULL, pattern->bitmap, info, &bits, &src )) + if (bmp->funcs->pGetImage( NULL, pattern->bitmap, info, &bits, &src )) { HeapFree( GetProcessHeap(), 0, info ); goto done; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 143cc47..55ac726 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -657,7 +657,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, struct bitblt_coords src, dst; INT src_to_dst_offset; HRGN clip = 0; - const struct gdi_dc_funcs *funcs; if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse, TRUE ) || coloruse > DIB_PAL_COLORS) { @@ -715,8 +714,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (lines < src.visrect.bottom) src.visrect.bottom = lines; } - funcs = get_bitmap_funcs( bitmap ); - result = lines; offset_rect( &src.visrect, 0, src_to_dst_offset ); @@ -736,11 +733,11 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, copy_bitmapinfo( dst_info, src_info ); - err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + err = bitmap->funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) { err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); - if (!err) err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + if (!err) err = bitmap->funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } if(err) result = 0; @@ -1212,7 +1209,6 @@ INT WINAPI GetDIBits( BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; - const struct gdi_dc_funcs *funcs; struct gdi_image_bits src_bits; struct bitblt_coords src, dst; BOOL empty_rect = FALSE; @@ -1239,8 +1235,6 @@ INT WINAPI GetDIBits( return 0; } - funcs = get_bitmap_funcs( bmp ); - src.visrect.left = 0; src.visrect.top = 0; src.visrect.right = bmp->bitmap.bmWidth; @@ -1348,7 +1342,7 @@ INT WINAPI GetDIBits( lines = src.height; } - err = funcs->pGetImage( NULL, hbitmap, src_info, bits ? &src_bits : NULL, bits ? &src : NULL ); + err = bmp->funcs->pGetImage( NULL, hbitmap, src_info, bits ? &src_bits : NULL, bits ? &src : NULL ); if (err) goto done; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 081ecfd..b5a80ca 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -486,12 +486,6 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } -static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitmap ) -{ - if( bitmap->dib ) return &dib_driver; - return bitmap->funcs; -} - extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Always store a DIBSECTION structure in the bitmap object.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: e896af40655a58681aeb6513fc6a439d46f0264f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e896af40655a58681aeb6513f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:04:17 2012 +0100 gdi32: Always store a DIBSECTION structure in the bitmap object. --- dlls/gdi32/bitmap.c | 6 +-- dlls/gdi32/brush.c | 10 ++-- dlls/gdi32/dib.c | 97 ++++++++++++++++++++-------------------------- dlls/gdi32/dibdrv/dc.c | 6 +- dlls/gdi32/gdi_private.h | 10 +++- 5 files changed, 58 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e896af40655a58681aeb6…

1 0

Alexandre Julliard : gdi32: Use the bitmap part of the DIBSECTION structure for the DDB object information .
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 71ea68b65727a7abac8f179035fe895f8b641a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ea68b65727a7abac8f17903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:09:54 2012 +0100 gdi32: Use the bitmap part of the DIBSECTION structure for the DDB object information. --- dlls/gdi32/bitmap.c | 63 +++++++++++++++++++++++---------------------- dlls/gdi32/brush.c | 8 +++--- dlls/gdi32/dib.c | 30 +++++++++------------ dlls/gdi32/dibdrv/dc.c | 12 ++++---- dlls/gdi32/gdi_private.h | 1 - 5 files changed, 55 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71ea68b65727a7abac8f1…

1 0

Alexandre Julliard : gdi32: Get rid of the CreateDIBSection driver entry point.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: fbbf3ba40814129effa1be087b29414e139dcf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbf3ba40814129effa1be087… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 14:21:01 2012 +0100 gdi32: Get rid of the CreateDIBSection driver entry point. --- dlls/gdi32/dibdrv/dc.c | 1 - dlls/gdi32/driver.c | 6 ------ dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/path.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +-- 10 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 220224f..9f1a633 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -575,7 +575,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ dibdrv_DeleteBitmap, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 29b6973..36bf48f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -227,11 +227,6 @@ static BOOL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, return FALSE; } -static HBITMAP nulldrv_CreateDIBSection( PHYSDEV dev, HBITMAP bitmap, BITMAPINFO *info, UINT usage ) -{ - return bitmap; -} - static BOOL nulldrv_DeleteBitmap( HBITMAP bitmap ) { return TRUE; @@ -739,7 +734,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_CreateBitmap, /* pCreateBitmap */ nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */ nulldrv_CreateDC, /* pCreateDC */ - nulldrv_CreateDIBSection, /* pCreateDIBSection */ nulldrv_DeleteBitmap, /* pDeleteBitmap */ nulldrv_DeleteDC, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 28c2b2f..f988ebd 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -51,7 +51,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ EMFDRV_DeleteDC, /* pDeleteDC */ EMFDRV_DeleteObject, /* pDeleteObject */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 537d81a..37725a1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7158,7 +7158,6 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ freetype_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ freetype_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 0aa9f3f..e02c6be 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -96,7 +96,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pCreateBitmap */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ MFDRV_DeleteDC, /* pDeleteDC */ MFDRV_DeleteObject, /* pDeleteObject */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 4d753fd..52f103d 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2250,7 +2250,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ pathdrv_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ pathdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 5f54244..fa47573 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -834,7 +834,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pCreateBitmap */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ PSDRV_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 15f110b..0530e31 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -467,7 +467,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ - X11DRV_CreateDIBSection, /* pCreateDIBSection */ X11DRV_DeleteBitmap, /* pDeleteBitmap */ X11DRV_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index dc3d55b..feb8523 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2684,7 +2684,6 @@ static const struct gdi_dc_funcs xrender_funcs = xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ xrenderdrv_DeleteBitmap, /* pDeleteBitmap */ xrenderdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 2ba1b7b..eb64b36 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -77,7 +77,6 @@ struct gdi_dc_funcs BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); - HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,BITMAPINFO *,UINT); BOOL (*pDeleteBitmap)(HBITMAP); BOOL (*pDeleteDC)(PHYSDEV); BOOL (*pDeleteObject)(PHYSDEV,HGDIOBJ); @@ -212,7 +211,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 23 +#define WINE_GDI_DRIVER_VERSION 24 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Aric Stewart : usp10: Better handle cases in single line edit controls where es-> x_offset exceeds line length.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 3ebb878470a7c30a4120554e846ea17a7a723318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebb878470a7c30a4120554e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 9 13:30:31 2012 -0600 usp10: Better handle cases in single line edit controls where es->x_offset exceeds line length. --- dlls/user32/edit.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0fcc9db..81cb6cc 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1093,6 +1093,7 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) { if (es->x_offset >= get_text_length(es)) { + int leftover = es->x_offset - get_text_length(es); if (es->ssa) { const SIZE *size; @@ -1101,8 +1102,10 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) } else xoff = 0; + xoff += es->char_width * leftover; } - ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); + else + ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); } else xoff = 0;

1 0

André Hentschel : setupapi: Add stub for CM_Get_DevNode_Registry_Property_ExW.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: c83b67bc4ff37222d56761669618f7533d6d0c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83b67bc4ff37222d56761669… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 9 23:07:10 2012 +0100 setupapi: Add stub for CM_Get_DevNode_Registry_Property_ExW. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 44097ef..450ce02 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,7 +57,7 @@ @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW @ stub CM_Get_DevNode_Registry_Property_ExA -@ stub CM_Get_DevNode_Registry_Property_ExW +@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 25639f5..2d5d80a 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -68,7 +68,7 @@ @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW @ stub CM_Get_DevNode_Registry_Property_ExA -@ stub CM_Get_DevNode_Registry_Property_ExW +@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f53b3ad..b43a343 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -359,6 +359,16 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, } /*********************************************************************** + * CM_Get_DevNode_Registry_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

André Hentschel : dbghelp: No need for WINE_ prefixed ERR.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: b95574e2867f89d53d7f76d8b088f6e02b539ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95574e2867f89d53d7f76d8b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 9 23:23:09 2012 +0100 dbghelp: No need for WINE_ prefixed ERR. --- dlls/dbghelp/pe_module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index ba7f1a2..79a4d90 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -600,8 +600,8 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* mod if (nDbg != 1 || dbg->Type != IMAGE_DEBUG_TYPE_MISC || misc->DataType != IMAGE_DEBUG_MISC_EXENAME) { - WINE_ERR("-Debug info stripped, but no .DBG file in module %s\n", - debugstr_w(module->module.ModuleName)); + ERR("-Debug info stripped, but no .DBG file in module %s\n", + debugstr_w(module->module.ModuleName)); } else {

1 0

Dmitry Timoshkov : msvcrt: Add some tests for strftime/wcsftime.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 42157151d0b4e9fcc2ffd72cc16ded5c157ff10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42157151d0b4e9fcc2ffd72cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 10 16:02:04 2012 +0800 msvcrt: Add some tests for strftime/wcsftime. --- dlls/msvcrt/tests/time.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 950042c..a7790d5 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -25,6 +25,7 @@ #include <stdlib.h> /*setenv*/ #include <stdio.h> /*printf*/ +#include <locale.h> #include <errno.h> #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) @@ -37,6 +38,7 @@ static __time32_t (__cdecl *p_mkgmtime32)(struct tm*); static struct tm* (__cdecl *p_gmtime32)(__time32_t*); +static struct tm* (__cdecl *p_gmtime)(time_t*); static errno_t (__cdecl *p_gmtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_strtime_s)(char*,size_t); static errno_t (__cdecl *p_strdate_s)(char*,size_t); @@ -44,12 +46,15 @@ static errno_t (__cdecl *p_localtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); +static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); +static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); static void init(void) { - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + HMODULE hmod = LoadLibrary("msvcrt.dll"); p_gmtime32 = (void*)GetProcAddress(hmod, "_gmtime32"); + p_gmtime = (void*)GetProcAddress(hmod, "gmtime"); p_gmtime32_s = (void*)GetProcAddress(hmod, "_gmtime32_s"); p_mkgmtime32 = (void*)GetProcAddress(hmod, "_mkgmtime32"); p_strtime_s = (void*)GetProcAddress(hmod, "_strtime_s"); @@ -58,6 +63,8 @@ static void init(void) p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); p__daylight = (void*)GetProcAddress(hmod, "__daylight"); p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); + p_strftime = (void*)GetProcAddress(hmod, "strftime"); + p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); } static int get_test_year(time_t *start) @@ -568,10 +575,48 @@ static void test_daylight(void) ok(ret1 && ret1 == ret2, "got %p\n", ret1); } +static void test_strftime(void) +{ + static const wchar_t cW[] = { '%','c',0 }; + static const char expected[] = "01/01/70 00:00:00"; + time_t gmt; + struct tm* gmt_tm; + char buf[256], bufA[256]; + WCHAR bufW[256]; + long retA, retW; + + if (!p_strftime || !p_wcsftime || !p_gmtime) + { + win_skip("strftime, wcsftime or gmtime is not available\n"); + return; + } + + setlocale(LC_TIME, "C"); + + gmt = 0; + gmt_tm = p_gmtime(&gmt); + ok(gmt_tm != NULL, "gmtime failed\n"); + + retA = strftime(bufA, 256, "%c", gmt_tm); +todo_wine { + ok(retA == 17, "expected 17, got %ld\n", retA); + ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); +} + retW = wcsftime(bufW, 256, cW, gmt_tm); +todo_wine + ok(retW == 17, "expected 17, got %ld\n", retW); + ok(retA == retW, "expected %ld, got %ld\n", retA, retW); + buf[0] = 0; + retA = WideCharToMultiByte(CP_ACP, 0, bufW, retW, buf, 256, NULL, NULL); + buf[retA] = 0; + ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); +} + START_TEST(time) { init(); + test_strftime(); test_ctime(); test_gmtime(); test_mktime();

1 0