July 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Introduce NtGdiExtGetObjectW.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 14a39fcfe785cf2a35204912bc399cc309af7cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a39fcfe785cf2a35204912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:39:05 2021 +0200 gdi32: Introduce NtGdiExtGetObjectW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 10 ++++------ dlls/gdi32/objects.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2f795a3f12f..67c2ddc19e6 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1060,9 +1060,9 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) } /*********************************************************************** - * GetObjectW (GDI32.@) + * NtGdiExtGetObjectW (win32u.@) */ -INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) +INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ) { GDI_HANDLE_ENTRY *entry; const struct gdi_obj_funcs *funcs = NULL; @@ -1078,11 +1078,9 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) } LeaveCriticalSection( &gdi_section ); - if (funcs) + if (funcs && funcs->pGetObjectW) { - if (!funcs->pGetObjectW) - SetLastError( ERROR_INVALID_HANDLE ); - else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ SetLastError( ERROR_NOACCESS ); else result = funcs->pGetObjectW( handle, count, buffer ); diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 854f4783f5b..af1e2a19f06 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -111,3 +111,32 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ obj ) if (!ret) SetLastError( ERROR_INVALID_HANDLE ); return ret; } + +/*********************************************************************** + * GetObjectW (GDI32.@) + */ +INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer ) +{ + int result; + + TRACE( "%p %d %p\n", handle, count, buffer ); + + result = NtGdiExtGetObjectW( handle, count, buffer ); + if (!result && count) + { + switch(get_object_type( handle )) + { + case 0: + case OBJ_BITMAP: + case OBJ_BRUSH: + case OBJ_FONT: + case OBJ_PAL: + case OBJ_PEN: + case OBJ_EXTPEN: + break; + default: + SetLastError( ERROR_INVALID_HANDLE ); + } + } + return result; +}

1 0

Jacek Caban : gdi32: Reimplement GetObjectA on top of GetObjectW.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 3dcb5db47f6f5b35443386cbd64bb614b672eb1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcb5db47f6f5b35443386cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:00 2021 +0200 gdi32: Reimplement GetObjectA on top of GetObjectW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 1 - dlls/gdi32/brush.c | 1 - dlls/gdi32/dc.c | 1 - dlls/gdi32/dib.c | 1 - dlls/gdi32/font.c | 22 ---------------------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 31 ------------------------------- dlls/gdi32/objects.c | 29 +++++++++++++++++++++++++++++ dlls/gdi32/palette.c | 1 - dlls/gdi32/pen.c | 1 - dlls/gdi32/region.c | 1 - 11 files changed, 29 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index d1805beb99c..aaad76dce36 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -37,7 +37,6 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs bitmap_funcs = { - BITMAP_GetObject, /* pGetObjectA */ BITMAP_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ BITMAP_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index c7b80479594..1d4e45952c9 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -44,7 +44,6 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs brush_funcs = { - BRUSH_GetObject, /* pGetObjectA */ BRUSH_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ BRUSH_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d96285c6520..861bc97a78e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -38,7 +38,6 @@ static BOOL DC_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs dc_funcs = { - NULL, /* pGetObjectA */ NULL, /* pGetObjectW */ NULL, /* pUnrealizeObject */ DC_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 069b9e77a28..e8d99ac415d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -83,7 +83,6 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs dib_funcs = { - DIB_GetObject, /* pGetObjectA */ DIB_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ DIB_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2a51e3f7411..39f2a76255a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -180,13 +180,11 @@ static inline WCHAR *strdupW( const WCHAR *p ) return ret; } -static INT FONT_GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ); static INT FONT_GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ); static BOOL FONT_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs fontobj_funcs = { - FONT_GetObjectA, /* pGetObjectA */ FONT_GetObjectW, /* pGetObjectW */ NULL, /* pUnrealizeObject */ FONT_DeleteObject /* pDeleteObject */ @@ -4567,26 +4565,6 @@ HGDIOBJ WINAPI NtGdiSelectFont( HDC hdc, HGDIOBJ handle ) } -/*********************************************************************** - * FONT_GetObjectA - */ -static INT FONT_GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) -{ - FONTOBJ *font = GDI_GetObjPtr( handle, OBJ_FONT ); - LOGFONTA lfA; - - if (!font) return 0; - if (buffer) - { - FONT_LogFontWToA( &font->logfont, &lfA ); - if (count > sizeof(lfA)) count = sizeof(lfA); - memcpy( buffer, &lfA, count ); - } - else count = sizeof(lfA); - GDI_ReleaseObj( handle ); - return count; -} - /*********************************************************************** * FONT_GetObjectW */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a4bc141811f..02e4c9d26b0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -50,7 +50,6 @@ typedef struct { struct gdi_obj_funcs { - INT (*pGetObjectA)( HGDIOBJ handle, INT count, LPVOID buffer ); INT (*pGetObjectW)( HGDIOBJ handle, INT count, LPVOID buffer ); BOOL (*pUnrealizeObject)( HGDIOBJ handle ); BOOL (*pDeleteObject)( HGDIOBJ handle ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 67c2ddc19e6..af74071aa6d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1028,37 +1028,6 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) } -/*********************************************************************** - * GetObjectA (GDI32.@) - */ -INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) -{ - GDI_HANDLE_ENTRY *entry; - const struct gdi_obj_funcs *funcs = NULL; - INT result = 0; - - TRACE("%p %d %p\n", handle, count, buffer ); - - EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) - { - funcs = entry_obj( entry )->funcs; - handle = entry_to_handle( entry ); /* make it a full handle */ - } - LeaveCriticalSection( &gdi_section ); - - if (funcs) - { - if (!funcs->pGetObjectA) - SetLastError( ERROR_INVALID_HANDLE ); - else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ - SetLastError( ERROR_NOACCESS ); - else - result = funcs->pGetObjectA( handle, count, buffer ); - } - return result; -} - /*********************************************************************** * NtGdiExtGetObjectW (win32u.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index af1e2a19f06..664dcf4f043 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "ntgdi.h" #include "winternl.h" @@ -140,3 +141,31 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer ) } return result; } + +/*********************************************************************** + * GetObjectA (GDI32.@) + */ +INT WINAPI GetObjectA( HGDIOBJ handle, INT count, void *buffer ) +{ + TRACE("%p %d %p\n", handle, count, buffer ); + + if (get_object_type( handle ) == OBJ_FONT) + { + LOGFONTA *lfA = buffer; + LOGFONTW lf; + + if (!buffer) return sizeof(*lfA); + if (!GetObjectW( handle, sizeof(lf), &lf )) return 0; + if (count > sizeof(*lfA)) count = sizeof(*lfA); + memcpy( lfA, &lf, min( count, FIELD_OFFSET(LOGFONTA, lfFaceName) )); + if (count > FIELD_OFFSET(LOGFONTA, lfFaceName)) + { + WideCharToMultiByte( CP_ACP, 0, lf.lfFaceName, -1, lfA->lfFaceName, + count - FIELD_OFFSET(LOGFONTA, lfFaceName), NULL, NULL ); + if (count == sizeof(*lfA)) lfA->lfFaceName[LF_FACESIZE - 1] = 0; + } + return count; + } + + return GetObjectW( handle, count, buffer ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index f9d5851d20e..8584011bda8 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -55,7 +55,6 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs palette_funcs = { - PALETTE_GetObject, /* pGetObjectA */ PALETTE_GetObject, /* pGetObjectW */ PALETTE_UnrealizeObject, /* pUnrealizeObject */ PALETTE_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 0cc242ead5a..8a01125b390 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -45,7 +45,6 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs pen_funcs = { - PEN_GetObject, /* pGetObjectA */ PEN_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ PEN_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 3d0f9cfc211..2e90e82180e 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -111,7 +111,6 @@ static BOOL REGION_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs region_funcs = { - NULL, /* pGetObjectA */ NULL, /* pGetObjectW */ NULL, /* pUnrealizeObject */ REGION_DeleteObject /* pDeleteObject */

1 0

Jacek Caban : gdi32: Implement CreatePenIndirect on top of CreatePen.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 4590f6fb4f87e738afd1de147e740555c4fdbd3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4590f6fb4f87e738afd1de14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:07 2021 +0200 gdi32: Implement CreatePenIndirect on top of CreatePen. Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/pen.c | 32 ++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 664dcf4f043..7fbb0419ec8 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -169,3 +169,11 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, void *buffer ) return GetObjectW( handle, count, buffer ); } + +/*********************************************************************** + * CreatePenIndirect (GDI32.@) + */ +HPEN WINAPI CreatePenIndirect( const LOGPEN *pen ) +{ + return CreatePen( pen->lopnStyle, pen->lopnWidth.x, pen->lopnColor ); +} diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 8a01125b390..1fbd467d105 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -56,28 +56,12 @@ static const struct gdi_obj_funcs pen_funcs = */ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) { - LOGPEN logpen; - - TRACE("%d %d %06x\n", style, width, color ); - - logpen.lopnStyle = style; - logpen.lopnWidth.x = width; - logpen.lopnWidth.y = 0; - logpen.lopnColor = color; - - return CreatePenIndirect( &logpen ); -} - - -/*********************************************************************** - * CreatePenIndirect (GDI32.@) - */ -HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) -{ - PENOBJ * penPtr; + PENOBJ *penPtr; HPEN hpen; - if (pen->lopnStyle == PS_NULL) + TRACE( "%d %d %06x\n", style, width, color ); + + if (style == PS_NULL) { hpen = GetStockObject(NULL_PEN); if (hpen) return hpen; @@ -85,12 +69,12 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) if (!(penPtr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*penPtr) ))) return 0; - penPtr->logpen.elpPenStyle = pen->lopnStyle; - penPtr->logpen.elpWidth = abs(pen->lopnWidth.x); - penPtr->logpen.elpColor = pen->lopnColor; + penPtr->logpen.elpPenStyle = style; + penPtr->logpen.elpWidth = abs(width); + penPtr->logpen.elpColor = color; penPtr->logpen.elpBrushStyle = BS_SOLID; - switch (pen->lopnStyle) + switch (style) { case PS_SOLID: case PS_DASH:

1 0

Jacek Caban : gdi32: Introduce NtGdiCreatePen.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: f5c117fb78b8530a31fb15eff7936b1b37aef7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5c117fb78b8530a31fb15ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:15 2021 +0200 gdi32: Introduce NtGdiCreatePen. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 9 +++++++++ dlls/gdi32/pen.c | 33 ++++++++++++++------------------- include/ntgdi.h | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 7fbb0419ec8..0e8453f4af2 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -177,3 +177,12 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN *pen ) { return CreatePen( pen->lopnStyle, pen->lopnWidth.x, pen->lopnColor ); } + +/*********************************************************************** + * CreatePen (GDI32.@) + */ +HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) +{ + if (style < 0 || style > PS_INSIDEFRAME) style = PS_SOLID; + return NtGdiCreatePen( style, width, color, NULL ); +} diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 1fbd467d105..7790278fca6 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -52,27 +52,15 @@ static const struct gdi_obj_funcs pen_funcs = /*********************************************************************** - * CreatePen (GDI32.@) + * NtGdiCreatePen (win32u.@) */ -HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) +HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) { PENOBJ *penPtr; HPEN hpen; TRACE( "%d %d %06x\n", style, width, color ); - - if (style == PS_NULL) - { - hpen = GetStockObject(NULL_PEN); - if (hpen) return hpen; - } - - if (!(penPtr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*penPtr) ))) return 0; - - penPtr->logpen.elpPenStyle = style; - penPtr->logpen.elpWidth = abs(width); - penPtr->logpen.elpColor = color; - penPtr->logpen.elpBrushStyle = BS_SOLID; + if (brush) FIXME( "brush not supported\n" ); switch (style) { @@ -84,14 +72,21 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) case PS_INSIDEFRAME: break; case PS_NULL: - penPtr->logpen.elpWidth = 1; - penPtr->logpen.elpColor = 0; + if ((hpen = GetStockObject( NULL_PEN ))) return hpen; + width = 1; + color = 0; break; default: - penPtr->logpen.elpPenStyle = PS_SOLID; - break; + return 0; } + if (!(penPtr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*penPtr) ))) return 0; + + penPtr->logpen.elpPenStyle = style; + penPtr->logpen.elpWidth = abs(width); + penPtr->logpen.elpColor = color; + penPtr->logpen.elpBrushStyle = BS_SOLID; + if (!(hpen = alloc_gdi_handle( &penPtr->obj, OBJ_PEN, &pen_funcs ))) HeapFree( GetProcessHeap(), 0, penPtr ); return hpen; diff --git a/include/ntgdi.h b/include/ntgdi.h index b4501c46b4e..778f589f550 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -68,7 +68,7 @@ HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, UL ULONG unk4, void *data ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); -HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color ); +HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height );

1 0

Jacek Caban : gdi32: Implement CreateBitmapIndirect on top of CreateBitmap.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 505a6b9cffa5e7081bce4326c15f4f960601760f URL: https://source.winehq.org/git/wine.git/?a=commit;h=505a6b9cffa5e7081bce4326… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:45 2021 +0200 gdi32: Implement CreateBitmapIndirect on top of CreateBitmap. Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 121 +++++++++++++++------------------------------------ dlls/gdi32/objects.c | 15 +++++++ 2 files changed, 49 insertions(+), 87 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index aaad76dce36..cebe2dea644 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -43,38 +43,6 @@ static const struct gdi_obj_funcs bitmap_funcs = }; -/****************************************************************************** - * CreateBitmap [GDI32.@] - * - * Creates a bitmap with the specified info. - * - * PARAMS - * width [I] bitmap width - * height [I] bitmap height - * planes [I] Number of color planes - * bpp [I] Number of bits to identify a color - * bits [I] Pointer to array containing color data - * - * RETURNS - * Success: Handle to bitmap - * Failure: 0 - */ -HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, - UINT bpp, LPCVOID bits ) -{ - BITMAP bm; - - bm.bmType = 0; - bm.bmWidth = width; - bm.bmHeight = height; - bm.bmWidthBytes = get_bitmap_stride( width, bpp ); - bm.bmPlanes = planes; - bm.bmBitsPixel = bpp; - bm.bmBits = (LPVOID)bits; - - return CreateBitmapIndirect( &bm ); -} - /****************************************************************************** * CreateCompatibleBitmap [GDI32.@] * @@ -123,81 +91,57 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) /****************************************************************************** - * CreateBitmapIndirect [GDI32.@] + * CreateBitmap [GDI32.@] * * Creates a bitmap with the specified info. - * - * PARAMS - * bmp [I] Pointer to the bitmap info describing the bitmap - * - * RETURNS - * Success: Handle to bitmap - * Failure: NULL. Use GetLastError() to determine the cause. - * - * NOTES - * If a width or height of 0 is given, a 1x1 monochrome bitmap is returned. */ -HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) +HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, + UINT bpp, const void *bits ) { - BITMAP bm; BITMAPOBJ *bmpobj; HBITMAP hbitmap; INT dib_stride; SIZE_T size; - if (!bmp || bmp->bmType) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - - if (bmp->bmWidth > 0x7ffffff || bmp->bmHeight > 0x7ffffff) + if (width > 0x7ffffff || height > 0x7ffffff) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - bm = *bmp; - - if (!bm.bmWidth || !bm.bmHeight) - { + if (!width || !height) return GetStockObject( DEFAULT_BITMAP ); - } - else - { - if (bm.bmHeight < 0) - bm.bmHeight = -bm.bmHeight; - if (bm.bmWidth < 0) - bm.bmWidth = -bm.bmWidth; - } - if (bm.bmPlanes != 1) + if (height < 0) + height = -height; + if (width < 0) + width = -width; + + if (planes != 1) { - FIXME("planes = %d\n", bm.bmPlanes); + FIXME("planes = %d\n", planes); SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } /* Windows only uses 1, 4, 8, 16, 24 and 32 bpp */ - if(bm.bmBitsPixel == 1) bm.bmBitsPixel = 1; - else if(bm.bmBitsPixel <= 4) bm.bmBitsPixel = 4; - else if(bm.bmBitsPixel <= 8) bm.bmBitsPixel = 8; - else if(bm.bmBitsPixel <= 16) bm.bmBitsPixel = 16; - else if(bm.bmBitsPixel <= 24) bm.bmBitsPixel = 24; - else if(bm.bmBitsPixel <= 32) bm.bmBitsPixel = 32; - else { - WARN("Invalid bmBitsPixel %d, returning ERROR_INVALID_PARAMETER\n", bm.bmBitsPixel); + if(bpp == 1) bpp = 1; + else if(bpp <= 4) bpp = 4; + else if(bpp <= 8) bpp = 8; + else if(bpp <= 16) bpp = 16; + else if(bpp <= 24) bpp = 24; + else if(bpp <= 32) bpp = 32; + else + { + WARN("Invalid bmBitsPixel %d, returning ERROR_INVALID_PARAMETER\n", bpp); SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - /* Windows ignores the provided bm.bmWidthBytes */ - bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - - dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel ); - size = dib_stride * bm.bmHeight; + dib_stride = get_dib_stride( width, bpp ); + size = dib_stride * height; /* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */ - if (dib_stride != size / bm.bmHeight) + if (dib_stride != size / height) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -210,8 +154,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return 0; } - bmpobj->dib.dsBm = bm; - bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + bmpobj->dib.dsBm.bmType = 0; + bmpobj->dib.dsBm.bmWidth = width; + bmpobj->dib.dsBm.bmHeight = height; + bmpobj->dib.dsBm.bmWidthBytes = get_bitmap_stride( width, bpp ); + bmpobj->dib.dsBm.bmPlanes = planes; + bmpobj->dib.dsBm.bmBitsPixel = bpp; + bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); if (!bmpobj->dib.dsBm.bmBits) { HeapFree( GetProcessHeap(), 0, bmpobj ); @@ -226,12 +175,10 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return 0; } - if (bm.bmBits) - SetBitmapBits( hbitmap, bm.bmHeight * bm.bmWidthBytes, bm.bmBits ); - - TRACE("%dx%d, bpp %d planes %d: returning %p\n", bm.bmWidth, bm.bmHeight, - bm.bmBitsPixel, bm.bmPlanes, hbitmap); + if (bits) + SetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); + TRACE("%dx%d, bpp %d planes %d: returning %p\n", width, height, bpp, planes, hbitmap); return hbitmap; } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 0e8453f4af2..1567a02b128 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -186,3 +186,18 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) if (style < 0 || style > PS_INSIDEFRAME) style = PS_SOLID; return NtGdiCreatePen( style, width, color, NULL ); } + +/*********************************************************************** + * CreateBitmapIndirect (GDI32.@) + */ +HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) +{ + if (!bmp || bmp->bmType) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + return CreateBitmap( bmp->bmWidth, bmp->bmHeight, bmp->bmPlanes, + bmp->bmBitsPixel, bmp->bmBits ); +}

1 0

Jacek Caban : gdi32: Introduce NtGdiCreateBitmap.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 270f7bed600236c33286d0431f120b23c0c7ea4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=270f7bed600236c33286d043… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:58 2021 +0200 gdi32: Introduce NtGdiCreateBitmap. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 8 ++++---- dlls/gdi32/objects.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index cebe2dea644..c5a7ef9ca76 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -91,12 +91,12 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) /****************************************************************************** - * CreateBitmap [GDI32.@] + * NtGdiCreateBitmap (win32u.@) * * Creates a bitmap with the specified info. */ -HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, - UINT bpp, const void *bits ) +HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, + UINT bpp, const void *bits ) { BITMAPOBJ *bmpobj; HBITMAP hbitmap; @@ -110,7 +110,7 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, } if (!width || !height) - return GetStockObject( DEFAULT_BITMAP ); + return 0; if (height < 0) height = -height; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 1567a02b128..a7d565e32ed 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -201,3 +201,17 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return CreateBitmap( bmp->bmWidth, bmp->bmHeight, bmp->bmPlanes, bmp->bmBitsPixel, bmp->bmBits ); } + +/****************************************************************************** + * CreateBitmap (GDI32.@) + * + * Creates a bitmap with the specified info. + */ +HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, + UINT bpp, const void *bits ) +{ + if (!width || !height) + return GetStockObject( STOCK_LAST + 1 ); /* default 1x1 bitmap */ + + return NtGdiCreateBitmap( width, height, planes, bpp, bits ); +}

1 0

Jacek Caban : gdi32: Use ntgdi names for bitmap functions.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 6b3c811c763b745f910d96741da36357b805f58a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3c811c763b745f910d9674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:41:16 2021 +0200 gdi32: Use ntgdi names for bitmap functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 18 +++++++++--------- dlls/gdi32/gdi32.spec | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c5a7ef9ca76..22629f95af4 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -176,7 +176,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, } if (bits) - SetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); + NtGdiSetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); TRACE("%dx%d, bpp %d planes %d: returning %p\n", width, height, bpp, planes, hbitmap); return hbitmap; @@ -184,7 +184,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, /*********************************************************************** - * GetBitmapBits [GDI32.@] + * NtGdiGetBitmapBits (win32u.@) * * Copies bitmap bits of bitmap to buffer. * @@ -192,7 +192,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, * Success: Number of bytes copied * Failure: 0 */ -LONG WINAPI GetBitmapBits( +LONG WINAPI NtGdiGetBitmapBits( HBITMAP hbitmap, /* [in] Handle to bitmap */ LONG count, /* [in] Number of bytes to copy */ LPVOID bits) /* [out] Pointer to buffer to receive bits */ @@ -253,7 +253,7 @@ done: /****************************************************************************** - * SetBitmapBits [GDI32.@] + * NtGdiSetBitmapBits (win32u.@) * * Sets bits of color data for a bitmap. * @@ -261,7 +261,7 @@ done: * Success: Number of bytes used in setting the bitmap bits * Failure: 0 */ -LONG WINAPI SetBitmapBits( +LONG WINAPI NtGdiSetBitmapBits( HBITMAP hbitmap, /* [in] Handle to bitmap */ LONG count, /* [in] Number of bytes in bitmap array */ LPCVOID bits) /* [in] Address of array with bitmap bits */ @@ -493,7 +493,7 @@ HBITMAP WINAPI CreateDiscardableBitmap( /****************************************************************************** - * GetBitmapDimensionEx [GDI32.@] + * NtGdiGetBitmapDimension (win32u.@) * * Retrieves dimensions of a bitmap. * @@ -501,7 +501,7 @@ HBITMAP WINAPI CreateDiscardableBitmap( * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetBitmapDimensionEx( +BOOL WINAPI NtGdiGetBitmapDimension( HBITMAP hbitmap, /* [in] Handle to bitmap */ LPSIZE size) /* [out] Address of struct receiving dimensions */ { @@ -514,7 +514,7 @@ BOOL WINAPI GetBitmapDimensionEx( /****************************************************************************** - * SetBitmapDimensionEx [GDI32.@] + * NtGdiSetBitmapDimension (win32u.@) * * Assigns dimensions to a bitmap. * MSDN says that this function will fail if hbitmap is a handle created by @@ -524,7 +524,7 @@ BOOL WINAPI GetBitmapDimensionEx( * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetBitmapDimensionEx( +BOOL WINAPI NtGdiSetBitmapDimension( HBITMAP hbitmap, /* [in] Handle to bitmap */ INT x, /* [in] Bitmap width */ INT y, /* [in] Bitmap height */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index b21f22c3629..6da3721a00b 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -240,8 +240,8 @@ @ stdcall GetArcDirection(long) @ stdcall GetAspectRatioFilterEx(long ptr) # @ stub GetBitmapAttributes -@ stdcall GetBitmapBits(long long ptr) -@ stdcall GetBitmapDimensionEx(long ptr) +@ stdcall GetBitmapBits(long long ptr) NtGdiGetBitmapBits +@ stdcall GetBitmapDimensionEx(long ptr) NtGdiGetBitmapDimension @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) @ stdcall GetBoundsRect(long ptr long) @@ -474,8 +474,8 @@ @ stdcall SetAbortProc(long ptr) @ stdcall SetArcDirection(long long) # @ stub SetBitmapAttributes -@ stdcall SetBitmapBits(long long ptr) -@ stdcall SetBitmapDimensionEx(long long long ptr) +@ stdcall SetBitmapBits(long long ptr) NtGdiSetBitmapBits +@ stdcall SetBitmapDimensionEx(long long long ptr) NtGdiSetBitmapDimension @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) @ stdcall SetBoundsRect(long ptr long)

1 0

Alexandre Julliard : Wine release 6.12
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: website Branch: master Commit: bf6df5ada8e4f5f33a1aef2bf8915a74fd86559a URL: https://source.winehq.org/git/website.git/?a=commit;h=bf6df5ada8e4f5f33a1ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:46:55 2021 +0200 Wine release 6.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021070201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021070201.xml b/news/en/2021070201.xml new file mode 100644 index 00000000..8f3e0e59 --- /dev/null +++ b/news/en/2021070201.xml @@ -0,0 +1,17 @@ +<news> +<date>July 2, 2021</date> +<title>Wine 6.12 Released</title> +<body> + The Wine development release 6.12 is now available. + <a href="{$root}/announce/6.12">What's new</a> in this release: +<ul> + <li>Builtin "Blue" and "Classic Blue" themes.</li> + <li>More work towards WinSock PE conversion.</li> + <li>Beginnings of the NSI (Network Store Interface) implementation.</li> + <li>Support for 32/64-bit registry views in reg.exe.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Huw Davies : iphlpapi: Implement if_nametoindex() using the ConvertInterface* functions.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 259f7c7c4771f0e7763a18418bd298884cc29188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=259f7c7c4771f0e7763a1841… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:34 2021 +0100 iphlpapi: Implement if_nametoindex() using the ConvertInterface* functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a774e60c3d9..aaa6a80c19e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3357,13 +3357,18 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) { - IF_INDEX idx; + IF_INDEX index; + NET_LUID luid; + DWORD err; - TRACE("(%s)\n", name); - if (getInterfaceIndexByName(name, &idx) == NO_ERROR) - return idx; + TRACE( "(%s)\n", name ); - return 0; + err = ConvertInterfaceNameToLuidA( name, &luid ); + if (err) return 0; + + err = ConvertInterfaceLuidToIndex( &luid, &index ); + if (err) index = 0; + return index; } /******************************************************************

1 0

Huw Davies : iphlpapi: Implement if_indextoname() using the ConvertInterface* functions.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 84a51219b538923df8aca1f2b9fbaac3de1c2bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a51219b538923df8aca1f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:35 2021 +0100 iphlpapi: Implement if_indextoname() using the ConvertInterface* functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aaa6a80c19e..8540b594e53 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3374,11 +3374,19 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) /****************************************************************** * if_indextoname (IPHLPAPI.@) */ -PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) { - TRACE("(%u, %p)\n", index, name); + NET_LUID luid; + DWORD err; + + TRACE( "(%u, %p)\n", index, name ); + + err = ConvertInterfaceIndexToLuid( index, &luid ); + if (err) return NULL; - return getInterfaceNameByIndex(index, name); + err = ConvertInterfaceLuidToNameA( &luid, name, IF_MAX_STRING_SIZE ); + if (err) return NULL; + return name; } /******************************************************************

1 0