September 2021 - Wine-Devel

[PATCH v2 2/6] gdi32: Use NtGdiGetDCObject for GetCurrentObject.
by Huw Davies Sept. 3, 2021

Sept. 3, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 3 ++- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/dib.c | 5 ++-- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 53 ++++++++++++++---------------------------- dlls/gdi32/objects.c | 26 +++++++++++++++++++++ include/ntgdi.h | 2 ++ 7 files changed, 53 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c10b9d37199..e6a846c3d74 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -866,7 +866,8 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((GetObjectType( hdcDest ) != OBJ_MEMDC || - GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && + GetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), + sizeof(dib), &dib ) == sizeof(BITMAP)) && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) { /* screen DCs or DDBs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index db6a4c44c84..1ce0e940235 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -63,7 +63,8 @@ HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ) NtGdiGetDeviceCaps( hdc, PLANES ), NtGdiGetDeviceCaps( hdc, BITSPIXEL ), NULL ); - switch (NtGdiExtGetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(dib), &dib )) + switch (NtGdiExtGetObjectW( NtGdiGetDCObject( hdc, NTGDI_OBJ_SURF ), + sizeof(dib), &dib )) { case sizeof(BITMAP): /* A device-dependent bitmap is selected in the DC */ return NtGdiCreateBitmap( width, height, dib.dsBm.bmPlanes, dib.dsBm.bmBitsPixel, NULL ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 68ca1c31664..f00d5cf13e2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -253,7 +253,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY palEntry[256]; - HPALETTE palette = GetCurrentObject( hdc, OBJ_PAL ); + HPALETTE palette = NtGdiGetDCObject( hdc, NTGDI_OBJ_PAL ); int i, colors = 1 << info->bmiHeader.biBitCount; info->bmiHeader.biClrUsed = colors; @@ -284,7 +284,8 @@ BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) int i, count, colors = info->bmiHeader.biClrUsed; if (!colors) return TRUE; - if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return FALSE; + if (!(palette = NtGdiGetDCObject( hdc, NTGDI_OBJ_PAL ))) + return FALSE; if (!(count = get_palette_entries( palette, 0, colors, entries ))) return FALSE; for (i = 0; i < colors; i++, index++) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index c31845d30a9..6336e3f23fe 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -534,7 +534,7 @@ static BOOL WINAPI dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) if (!osmesa_funcs) return FALSE; if (!context) return osmesa_funcs->make_current( NULL, NULL, 0, 0, 0, 0 ); - bitmap = GetCurrentObject( hdc, OBJ_BITMAP ); + bitmap = NtGdiGetDCObject( hdc, NTGDI_OBJ_SURF ); bmp = GDI_GetObjPtr( bitmap, NTGDI_OBJ_BITMAP ); if (!bmp) return FALSE; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index cc68070674a..14b65429d4a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1005,47 +1005,28 @@ INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ) } /*********************************************************************** - * GetCurrentObject (GDI32.@) + * NtGdiGetDCObject (win32u.@) * * Get the currently selected object of a given type in a device context. - * - * PARAMS - * hdc [I] Device context to get the current object from - * type [I] Type of current object to get (OBJ_* defines from "wingdi.h") - * - * RETURNS - * Success: The current object of the given type selected in hdc. - * Failure: A NULL handle. - * - * NOTES - * - only the following object types are supported: - *| OBJ_PEN - *| OBJ_BRUSH - *| OBJ_PAL - *| OBJ_FONT - *| OBJ_BITMAP */ -HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) +HANDLE WINAPI NtGdiGetDCObject( HDC hdc, UINT type ) { HGDIOBJ ret = 0; - DC * dc = get_dc_ptr( hdc ); - - if (!dc) return 0; - - switch (type) { - case OBJ_EXTPEN: /* fall through */ - case OBJ_PEN: ret = dc->hPen; break; - case OBJ_BRUSH: ret = dc->hBrush; break; - case OBJ_PAL: ret = dc->hPalette; break; - case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; - - /* tests show that OBJ_REGION is explicitly ignored */ - case OBJ_REGION: break; - default: - /* the SDK only mentions those above */ - FIXME("(%p,%d): unknown type.\n",hdc,type); - break; + DC *dc; + + if (!(dc = get_dc_ptr( hdc ))) return 0; + + switch (type) + { + case NTGDI_OBJ_EXTPEN: /* fall through */ + case NTGDI_OBJ_PEN: ret = dc->hPen; break; + case NTGDI_OBJ_BRUSH: ret = dc->hBrush; break; + case NTGDI_OBJ_PAL: ret = dc->hPalette; break; + case NTGDI_OBJ_FONT: ret = dc->hFont; break; + case NTGDI_OBJ_SURF: ret = dc->hBitmap; break; + default: + FIXME( "(%p, %d): unknown type.\n", hdc, type ); + break; } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b989a83daa1..b656c2a3f1e 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -353,6 +353,32 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer ) return result; } +/*********************************************************************** + * GetCurrentObject (GDI32.@) + */ +HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) +{ + unsigned int obj_type; + + switch (type) + { + case OBJ_EXTPEN: obj_type = NTGDI_OBJ_EXTPEN; break; + case OBJ_PEN: obj_type = NTGDI_OBJ_PEN; break; + case OBJ_BRUSH: obj_type = NTGDI_OBJ_BRUSH; break; + case OBJ_PAL: obj_type = NTGDI_OBJ_PAL; break; + case OBJ_FONT: obj_type = NTGDI_OBJ_FONT; break; + case OBJ_BITMAP: obj_type = NTGDI_OBJ_SURF; break; + case OBJ_REGION: + /* tests show that OBJ_REGION is explicitly ignored */ + return 0; + default: + FIXME( "(%p,%d): unknown type.\n", hdc, type ); + return 0; + } + + return NtGdiGetDCObject( hdc, obj_type ); +} + /*********************************************************************** * GetObjectA (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 2ee70cf3971..9e07268a307 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -57,6 +57,7 @@ typedef struct _GDI_HANDLE_ENTRY #define NTGDI_OBJ_DC 0x010000 #define NTGDI_OBJ_ENHMETADC 0x210000 #define NTGDI_OBJ_REGION 0x040000 +#define NTGDI_OBJ_SURF 0x050000 #define NTGDI_OBJ_METAFILE 0x260000 #define NTGDI_OBJ_ENHMETAFILE 0x460000 #define NTGDI_OBJ_METADC 0x660000 @@ -296,6 +297,7 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WC ULONG flags, void *buffer ); BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); +HANDLE WINAPI NtGdiGetDCObject( HDC hdc, UINT type ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDIBitsInternal( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, void *bits, BITMAPINFO *info, UINT coloruse, -- 2.23.0

1 0

[PATCH v2 1/6] gdi32: Use shifted values for NTGDI_OBJ_* constants.
by Huw Davies Sept. 3, 2021

Sept. 3, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/gdi_private.h | 6 +++--- dlls/gdi32/gdidc.c | 4 ++-- dlls/gdi32/gdiobj.c | 24 ++++++++++++------------ dlls/gdi32/ntgdi_private.h | 8 ++++---- dlls/gdi32/objects.c | 8 ++++---- dlls/gdi32/pen.c | 4 ++-- dlls/gdi32/tests/gdiobj.c | 9 ++++++--- include/ntgdi.h | 26 +++++++++++++------------- 9 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 73b2e74174a..739dc53d31d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -47,7 +47,7 @@ static const struct gdi_obj_funcs dc_funcs = static inline DC *get_dc_obj( HDC hdc ) { - WORD type; + DWORD type; DC *dc = get_any_obj_ptr( hdc, &type ); if (!dc) return NULL; @@ -118,7 +118,7 @@ static void set_initial_dc_state( DC *dc ) /*********************************************************************** * alloc_dc_ptr */ -DC *alloc_dc_ptr( WORD magic ) +DC *alloc_dc_ptr( DWORD magic ) { DC *dc; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ce89dbc6ff5..675a2990215 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -29,16 +29,16 @@ #include "ntgdi.h" void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; -void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; +void *get_gdi_client_ptr( HGDIOBJ handle, DWORD type ) DECLSPEC_HIDDEN; DC_ATTR *get_dc_attr( HDC hdc ) DECLSPEC_HIDDEN; void GDI_hdc_using_object( HGDIOBJ obj, HDC hdc, void (*delete)( HDC hdc, HGDIOBJ handle )) DECLSPEC_HIDDEN; void GDI_hdc_not_using_object( HGDIOBJ obj, HDC hdc ) DECLSPEC_HIDDEN; -static inline WORD gdi_handle_type( HGDIOBJ obj ) +static inline DWORD gdi_handle_type( HGDIOBJ obj ) { unsigned int handle = HandleToULong( obj ); - return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT; + return handle & NTGDI_HANDLE_TYPE_MASK; } static inline BOOL is_meta_dc( HDC hdc ) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0f9c8ede8c9..7f1a5a9cd24 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -31,9 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); DC_ATTR *get_dc_attr( HDC hdc ) { - WORD type = gdi_handle_type( hdc ); + DWORD type = gdi_handle_type( hdc ); DC_ATTR *dc_attr; - if ((type & 0x1f) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) + if ((type & 0x1f0000) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) { SetLastError( ERROR_INVALID_HANDLE ); return NULL; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index ff3dd9807c2..cc68070674a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -47,7 +47,7 @@ HMODULE gdi32_module = 0; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - gdi_shared.Handles; - return LongToHandle( idx | (entry->Unique << 16) ); + return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) @@ -720,8 +720,8 @@ static void dump_gdi_objects( void ) else TRACE( "handle %p obj %s type %s selcount %u deleted %u\n", entry_to_handle( entry ), wine_dbgstr_longlong( entry->Object ), - gdi_obj_type( entry->ExtType ), entry_obj( entry )->selcount, - entry_obj( entry )->deleted ); + gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), + entry_obj( entry )->selcount, entry_obj( entry )->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -731,7 +731,7 @@ static void dump_gdi_objects( void ) * * Allocate a GDI handle for an object, which must have been allocated on the process heap. */ -HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, const struct gdi_obj_funcs *funcs ) +HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct gdi_obj_funcs *funcs ) { GDI_HANDLE_ENTRY *entry; HGDIOBJ ret; @@ -757,8 +757,8 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, const struct gd obj->system = 0; obj->deleted = 0; entry->Object = (UINT_PTR)obj; - entry->Type = type & 0x1f; - entry->ExtType = type; + entry->ExtType = type >> NTGDI_HANDLE_TYPE_SHIFT; + entry->Type = entry->ExtType & 0x1f; if (++entry->Generation == 0xff) entry->Generation = 1; ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); @@ -781,8 +781,8 @@ void *free_gdi_handle( HGDIOBJ handle ) EnterCriticalSection( &gdi_section ); if ((entry = handle_entry( handle ))) { - TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->ExtType ), handle, - InterlockedDecrement( &debug_count ) + 1, GDI_MAX_HANDLE_COUNT ); + TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), + handle, InterlockedDecrement( &debug_count ) + 1, GDI_MAX_HANDLE_COUNT ); object = entry_obj( entry ); entry->Type = 0; entry->Object = (UINT_PTR)next_free; @@ -818,7 +818,7 @@ HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) * associated with the handle. * The object must be released with GDI_ReleaseObj. */ -void *get_any_obj_ptr( HGDIOBJ handle, WORD *type ) +void *get_any_obj_ptr( HGDIOBJ handle, DWORD *type ) { void *ptr = NULL; GDI_HANDLE_ENTRY *entry; @@ -828,7 +828,7 @@ void *get_any_obj_ptr( HGDIOBJ handle, WORD *type ) if ((entry = handle_entry( handle ))) { ptr = entry_obj( entry ); - *type = entry->ExtType; + *type = entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT; } if (!ptr) LeaveCriticalSection( &gdi_section ); @@ -842,9 +842,9 @@ void *get_any_obj_ptr( HGDIOBJ handle, WORD *type ) * Return NULL if the object has the wrong type. * The object must be released with GDI_ReleaseObj. */ -void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) +void *GDI_GetObjPtr( HGDIOBJ handle, DWORD type ) { - WORD ret_type; + DWORD ret_type; void *ptr = get_any_obj_ptr( handle, &ret_type ); if (ptr && ret_type != type) { diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index c2e45ab7ce0..a438a3f93ae 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -187,7 +187,7 @@ static inline HRGN get_dc_region( DC *dc ) } /* dc.c */ -extern DC *alloc_dc_ptr( WORD magic ) DECLSPEC_HIDDEN; +extern DC *alloc_dc_ptr( DWORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; @@ -390,12 +390,12 @@ extern BOOL opentype_get_properties( const void *data, size_t size, const struct extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) DECLSPEC_HIDDEN; /* gdiobj.c */ -extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, +extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; -extern void *get_any_obj_ptr( HGDIOBJ, WORD * ) DECLSPEC_HIDDEN; +extern void *GDI_GetObjPtr( HGDIOBJ, DWORD ) DECLSPEC_HIDDEN; +extern void *get_any_obj_ptr( HGDIOBJ, DWORD * ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 96ab3271034..b989a83daa1 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -95,10 +95,10 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) return NULL; } -static WORD get_object_type( HGDIOBJ obj ) +static DWORD get_object_type( HGDIOBJ obj ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); - return entry ? entry->ExtType : 0; + return entry ? entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT : 0; } void set_gdi_client_ptr( HGDIOBJ obj, void *ptr ) @@ -107,10 +107,10 @@ void set_gdi_client_ptr( HGDIOBJ obj, void *ptr ) if (entry) entry->UserPointer = (UINT_PTR)ptr; } -void *get_gdi_client_ptr( HGDIOBJ obj, WORD type ) +void *get_gdi_client_ptr( HGDIOBJ obj, DWORD type ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); - if (!entry || (type && entry->ExtType != type) || !entry->UserPointer) + if (!entry || (type && entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT != type)) return NULL; return (void *)(UINT_PTR)entry->UserPointer; } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 684cc8375d1..ff2a766d40c 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -199,7 +199,7 @@ HGDIOBJ WINAPI NtGdiSelectPen( HDC hdc, HGDIOBJ handle ) { PENOBJ *pen; HGDIOBJ ret = 0; - WORD type; + DWORD type; DC *dc; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -262,7 +262,7 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ) */ static INT PEN_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) { - WORD type; + DWORD type; PENOBJ *pen = get_any_obj_ptr( handle, &type ); INT ret = 0; diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 64d37e39ab6..e6efce8e552 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -389,15 +389,18 @@ static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_st entry->Unique, handle >> 16); if (type != NTGDI_OBJ_MEMDC) { - ok(entry->ExtType == type, "ExtType = %x, expected %x\n", entry->ExtType, type); + ok(entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT == type, "ExtType = %x, expected %x\n", + entry->ExtType, type); } else { todo_wine - ok(entry->ExtType == NTGDI_OBJ_DC, "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); + ok(entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_DC, + "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); } ok(entry->StockFlag == is_stock, "StockFlag = %x\n", entry->StockFlag); - ok(entry->Type == (type & 0x1f), "Type = %x, expected %x\n", entry->Type, type & 0x1f); + ok(entry->Type << NTGDI_HANDLE_TYPE_SHIFT == (type & 0x1f0000), + "Type = %x, expected %x\n", entry->Type, type & 0x1f); ok(entry->Object, "Object = NULL\n"); ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); } diff --git a/include/ntgdi.h b/include/ntgdi.h index 23247c09e4a..2ee70cf3971 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -54,21 +54,21 @@ typedef struct _GDI_HANDLE_ENTRY #define GDI_MAX_HANDLE_COUNT 0x10000 -#define NTGDI_OBJ_DC 0x01 -#define NTGDI_OBJ_ENHMETADC 0x21 -#define NTGDI_OBJ_REGION 0x04 -#define NTGDI_OBJ_METAFILE 0x26 -#define NTGDI_OBJ_ENHMETAFILE 0x46 -#define NTGDI_OBJ_METADC 0x66 -#define NTGDI_OBJ_PAL 0x08 -#define NTGDI_OBJ_BITMAP 0x09 -#define NTGDI_OBJ_FONT 0x0a -#define NTGDI_OBJ_BRUSH 0x10 -#define NTGDI_OBJ_PEN 0x30 -#define NTGDI_OBJ_EXTPEN 0x50 +#define NTGDI_OBJ_DC 0x010000 +#define NTGDI_OBJ_ENHMETADC 0x210000 +#define NTGDI_OBJ_REGION 0x040000 +#define NTGDI_OBJ_METAFILE 0x260000 +#define NTGDI_OBJ_ENHMETAFILE 0x460000 +#define NTGDI_OBJ_METADC 0x660000 +#define NTGDI_OBJ_PAL 0x080000 +#define NTGDI_OBJ_BITMAP 0x090000 +#define NTGDI_OBJ_FONT 0x0a0000 +#define NTGDI_OBJ_BRUSH 0x100000 +#define NTGDI_OBJ_PEN 0x300000 +#define NTGDI_OBJ_EXTPEN 0x500000 /* Wine extension, native uses NTGDI_OBJ_DC */ -#define NTGDI_OBJ_MEMDC 0x41 +#define NTGDI_OBJ_MEMDC 0x410000 #define NTGDI_HANDLE_TYPE_SHIFT 16 #define NTGDI_HANDLE_TYPE_MASK 0x007f0000 -- 2.23.0

1 0

[PATCH 6/6] gdi32: Use NtGdiDeleteObjectApp instead of DeleteObject in ntgdi functions.
by Jacek Caban Sept. 3, 2021

Sept. 3, 2021

1 0

[PATCH 5/6] gdi32: Use internal get_stock_object in ntgdi functions.
by Jacek Caban Sept. 3, 2021

Sept. 3, 2021

1 0

[PATCH 3/6] gdi32: Use ntgdi functions to create stock objects.
by Jacek Caban Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 40 +++++++++++++++++++++----------------- dlls/gdi32/ntgdi_private.h | 3 +++ dlls/gdi32/palette.c | 2 +- dlls/gdi32/pen.c | 18 ++++++++++------- 4 files changed, 37 insertions(+), 26 deletions(-)

1 0

[PATCH 2/6] gdi32: Use NtGdiGetDCObject for GetCurrentObject.
by Jacek Caban Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 3 ++- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/dib.c | 5 ++-- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 53 ++++++++++++++---------------------------- dlls/gdi32/objects.c | 26 +++++++++++++++++++++ include/ntgdi.h | 2 ++ 7 files changed, 53 insertions(+), 41 deletions(-)

1 0

[PATCH 1/6] gdi32: Use shifted values for NTGDI_OBJ_* constants.
by Jacek Caban Sept. 3, 2021

Sept. 3, 2021

1 0

[PATCH] riched20/tests: Check clipboard content after destroying the editor window.
by Francois Gouget Sept. 3, 2021

Sept. 3, 2021

Destroying the editor window should render all the formats so they are still available after. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Iirc there's a CoUninitialize() that gets called too early so that the riched20 content is lost before it had a chance to be rendered. --- dlls/riched20/tests/editor.c | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ab74e0ef1ab..8b193eed6e5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4743,6 +4743,36 @@ static DWORD CALLBACK test_EM_GETMODIFY_esCallback(DWORD_PTR dwCookie, return 0; } +#define open_clipboard(hwnd) open_clipboard_(__LINE__, hwnd) +static BOOL open_clipboard_(int line, HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace_(__FILE__, line)("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + static void test_EM_GETMODIFY(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -4759,6 +4789,8 @@ static void test_EM_GETMODIFY(void) CHARFORMAT2A cf2; PARAFORMAT2 pf2; EDITSTREAM es; + BOOL r; + HANDLE hclip; HFONT testFont = CreateFontA (0,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | @@ -4905,7 +4937,28 @@ static void test_EM_GETMODIFY(void) ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero for EM_STREAM\n"); + /* Check that the clipboard data is still available after destroying the + * editor window. + */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"Stayin' alive"); + SendMessageA(hwndRichEdit, EM_SETSEL, 8, -1); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); + DestroyWindow(hwndRichEdit); + + r = open_clipboard(NULL); + ok(r, "OpenClipboard failed le=%u\n", GetLastError()); + + hclip = GetClipboardData(CF_TEXT); + todo_wine ok(hclip != NULL, "GetClipboardData() failed le=%u\n", GetLastError()); + if (hclip) + { + const char* str = GlobalLock(hclip); + ok(strcmp(str, "alive") == 0, "unexpected clipboard content: %s\n", str); + GlobalUnlock(hclip); + } + + CloseClipboard(); } struct exsetsel_s { -- 2.30.2

2 1

[PATCH] wininet/tests: Remove some unnecessary traces from the http test.
by Francois Gouget Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Saves a bit over 2kB of traces. --- dlls/wininet/tests/http.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4f3ffa89971..25c3ab327ff 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -596,11 +596,9 @@ static void InternetReadFile_test(int flags, const test_data_t *test) trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); reset_events(); - trace("InternetOpenA <--\n"); hi = InternetOpenA((test->flags & TESTF_COMPRESSED) ? "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)" : "", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; @@ -608,18 +606,15 @@ static void InternetReadFile_test(int flags, const test_data_t *test) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, test->host, INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, test->post_data ? "POST" : "GET", test->path, NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -633,7 +628,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; @@ -684,7 +678,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) test_status_code(hor, 0); - trace("HttpSendRequestA -->\n"); if(test->post_data) { post_len = strlen(test->post_data); post_data = HeapAlloc(GetProcessHeap(), 0, post_len); @@ -698,7 +691,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) else ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); if (flags & INTERNET_FLAG_ASYNC) { WaitForSingleObject(complete_event, INFINITE); @@ -968,22 +960,17 @@ static void InternetReadFile_chunked_test(void) trace("Starting InternetReadFile chunked test\n"); - trace("InternetOpenA <--\n"); hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -997,16 +984,13 @@ static void InternetReadFile_chunked_test(void) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; - trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); res = HttpSendRequestA(hor, "", -1, NULL, 0); ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); test_request_flags(hor, 0); @@ -1092,10 +1076,8 @@ static void InternetReadFileExA_test(int flags) trace("Starting InternetReadFileExA test with flags 0x%x\n",flags); reset_events(); - trace("InternetOpenA <--\n"); hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; @@ -1103,18 +1085,15 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -1128,7 +1107,6 @@ static void InternetReadFileExA_test(int flags) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; @@ -1157,7 +1135,6 @@ static void InternetReadFileExA_test(int flags) else SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); - trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); rc = HttpSendRequestA(hor, "", -1, NULL, 0); if (flags & INTERNET_FLAG_ASYNC) @@ -1166,7 +1143,6 @@ static void InternetReadFileExA_test(int flags) else ok((rc != 0) || GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED, "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); if (!rc && (GetLastError() == ERROR_IO_PENDING)) { WaitForSingleObject(complete_event, INFINITE); -- 2.30.2

2 1

[PATCH] nsi/tests: Improve the error messages.
by Francois Gouget Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- nsi:nsi has a bunch of random failures which I have so far been unable to reproduce and the current failure messages are pretty useless, e.g. "nsi.c:355: Test failed: 7: mismatch". https://test.winehq.org/data/patterns.html#nsi:nsi The context could probably also use some more information about the current row but I'm not sure what and it should go in a separate patch anyway. --- dlls/nsi/tests/nsi.c | 132 ++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 72 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 042fe790f2c..ca5d5abce2a 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -28,9 +28,12 @@ #include "wine/nsi.h" #include "wine/test.h" -static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) + +#define expect_bounded(name,val,lo,hi) expect_bounded_(__LINE__,name,val,lo,hi) +static void expect_bounded_( int line, const char* name, ULONG64 val, ULONG64 lo, ULONG64 hi ) { - return lo <= val && val <= hi; + ok_(__FILE__, line)( lo <= val && val <= hi, "%s: %I64d not in [%I64d %I64d]\n", + name, val, lo, hi ); } static int unstable( int val ) @@ -337,25 +340,27 @@ static void test_ndis_ifinfo( void ) ok( row->TransmitLinkSpeed == dyn->xmit_speed, "mismatch\n" ); if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "mismatch\n" ); - ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "mismatch\n" ); - ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "mismatch\n" ); - ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, - dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "mismatch\n" ); - ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "mismatch\n" ); - ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "mismatch\n" ); + expect_bounded( "InOctets", row->InOctets, dyn->in_octets, dyn_2->in_octets ); + expect_bounded( "InUcastPkts", row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ); + expect_bounded( "InNUcastPkts", row->InNUcastPkts, + dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ); + expect_bounded( "InDiscards", row->InDiscards, dyn->in_discards, dyn_2->in_discards ); + expect_bounded( "InErrors", row->InErrors, dyn->in_errors, dyn_2->in_errors ); /* InUnknownProtos */ - ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "mismatch\n" ); - ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "mismatch\n" ); - ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "mismatch\n" ); - ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "mismatch\n" ); - ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "mismatch\n" ); - ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, - dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "mismatch\n" ); - ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "mismatch\n" ); - ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "mismatch\n" ); - ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "mismatch\n" ); - ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "mismatch\n" ); - ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "mismatch\n" ); + expect_bounded( "InUcastOctets", row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ); + expect_bounded( "InMulticastOctets", row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ); + expect_bounded( "InBroadcastOctets", row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ); + expect_bounded( "OutOctets", row->OutOctets, dyn->out_octets, dyn_2->out_octets ); + expect_bounded( "OutUcastPkts", row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ); + expect_bounded( "OutNUcastPkts", row->OutNUcastPkts, + dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ); + expect_bounded( "OutDiscards", row->OutDiscards, dyn->out_discards, dyn_2->out_discards ); + expect_bounded( "OutErrors", row->OutErrors, dyn->out_errors, dyn_2->out_errors ); + expect_bounded( "OutUcastOctets", row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ); + expect_bounded( "OutMulticastOctets", row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ); + expect_bounded( "OutBroadcastOctets", row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ); /* OutQLen */ winetest_pop_context(); } @@ -471,21 +476,15 @@ static void test_ip_icmpstats( int family ) err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats2, sizeof(nsi_stats2), NULL, 0 ); ok( !err, "got %d\n", err ); - ok( bounded( table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ), - "%d vs [%d %d]\n", table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ); - ok( bounded( table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ), - "%d vs [%d %d]\n", table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ); - ok( bounded( table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ), - "%d vs [%d %d]\n", table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ); - ok( bounded( table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ), - "%d vs [%d %d]\n", table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ); + expect_bounded( "icmpInStats.dwMsgs", table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ); + expect_bounded( "icmpInStats.dwErrors", table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ); + expect_bounded( "icmpOutStats.dwMsgs", table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ); + expect_bounded( "icmpOutStats.dwErrors", table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ); for (i = 0; i < ARRAY_SIZE(nsi_stats.in_type_counts); i++) { winetest_push_context( "%d", i ); - ok( bounded( table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ), - "%d vs [%d %d]\n", table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ); - ok( bounded( table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ), - "%d vs [%d %d]\n", table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ); + expect_bounded( "icmpInStats.rgdwTypeCount", table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ); + expect_bounded( "icmpOutStats.rgdwTypeCount", table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ); winetest_pop_context(); } err: @@ -516,24 +515,24 @@ static void test_ip_ipstats( int family ) ok( !err, "got %x\n", err ); /* dwForwarding and dwDefaultTTL come from the compartment table */ - ok( bounded( table.dwInReceives, dyn.in_recv, dyn2.in_recv ), "mismatch\n" ); - ok( bounded( table.dwInHdrErrors, dyn.in_hdr_errs, dyn2.in_hdr_errs ), "mismatch\n" ); - ok( bounded( table.dwInAddrErrors, dyn.in_addr_errs, dyn2.in_addr_errs ), "mismatch\n" ); - ok( bounded( table.dwForwDatagrams, dyn.fwd_dgrams, dyn2.fwd_dgrams ), "mismatch\n" ); - ok( bounded( table.dwInUnknownProtos, dyn.in_unk_protos, dyn2.in_unk_protos ), "mismatch\n" ); - ok( bounded( table.dwInDiscards, dyn.in_discards, dyn2.in_discards ), "mismatch\n" ); - ok( bounded( table.dwInDelivers, dyn.in_delivers, dyn2.in_delivers ), "mismatch\n" ); - ok( bounded( table.dwOutRequests, dyn.out_reqs, dyn2.out_reqs ), "mismatch\n" ); - ok( bounded( table.dwRoutingDiscards, dyn.routing_discards, dyn2.routing_discards ), "mismatch\n" ); - ok( bounded( table.dwOutDiscards, dyn.out_discards, dyn2.out_discards ), "mismatch\n" ); - ok( bounded( table.dwOutNoRoutes, dyn.out_no_routes, dyn2.out_no_routes ), "mismatch\n" ); - ok( table.dwReasmTimeout == stat.reasm_timeout, "mismatch\n" ); - ok( bounded( table.dwReasmReqds, dyn.reasm_reqds, dyn2.reasm_reqds ), "mismatch\n" ); - ok( bounded( table.dwReasmOks, dyn.reasm_oks, dyn2.reasm_oks ), "mismatch\n" ); - ok( bounded( table.dwReasmFails, dyn.reasm_fails, dyn2.reasm_fails ), "mismatch\n" ); - ok( bounded( table.dwFragOks, dyn.frag_oks, dyn2.frag_oks ), "mismatch\n" ); - ok( bounded( table.dwFragFails, dyn.frag_fails, dyn2.frag_fails ), "mismatch\n" ); - ok( bounded( table.dwFragCreates, dyn.frag_creates, dyn2.frag_creates ), "mismatch\n" ); + expect_bounded( "dwInReceives", table.dwInReceives, dyn.in_recv, dyn2.in_recv ); + expect_bounded( "dwInHdrErrors", table.dwInHdrErrors, dyn.in_hdr_errs, dyn2.in_hdr_errs ); + expect_bounded( "dwInAddrErrors", table.dwInAddrErrors, dyn.in_addr_errs, dyn2.in_addr_errs ); + expect_bounded( "dwForwDatagrams", table.dwForwDatagrams, dyn.fwd_dgrams, dyn2.fwd_dgrams ); + expect_bounded( "dwInUnknownProtos", table.dwInUnknownProtos, dyn.in_unk_protos, dyn2.in_unk_protos ); + expect_bounded( "dwInDiscards", table.dwInDiscards, dyn.in_discards, dyn2.in_discards ); + expect_bounded( "dwInDelivers", table.dwInDelivers, dyn.in_delivers, dyn2.in_delivers ); + expect_bounded( "dwOutRequests", table.dwOutRequests, dyn.out_reqs, dyn2.out_reqs ); + expect_bounded( "dwRoutingDiscards", table.dwRoutingDiscards, dyn.routing_discards, dyn2.routing_discards ); + expect_bounded( "dwOutDiscards", table.dwOutDiscards, dyn.out_discards, dyn2.out_discards ); + expect_bounded( "dwOutNoRoutes", table.dwOutNoRoutes, dyn.out_no_routes, dyn2.out_no_routes ); + ok( table.dwReasmTimeout == stat.reasm_timeout, "bad timeout %d != %d\n", table.dwReasmTimeout, stat.reasm_timeout ); + expect_bounded( "dwReasmReqds", table.dwReasmReqds, dyn.reasm_reqds, dyn2.reasm_reqds ); + expect_bounded( "dwReasmOks", table.dwReasmOks, dyn.reasm_oks, dyn2.reasm_oks ); + expect_bounded( "dwReasmFails", table.dwReasmFails, dyn.reasm_fails, dyn2.reasm_fails ); + expect_bounded( "dwFragOks", table.dwFragOks, dyn.frag_oks, dyn2.frag_oks ); + expect_bounded( "dwFragFails", table.dwFragFails, dyn.frag_fails, dyn2.frag_fails ); + expect_bounded( "dwFragCreates", table.dwFragCreates, dyn.frag_creates, dyn2.frag_creates ); /* dwNumIf, dwNumAddr and dwNumRoutes come from the compartment table */ err: @@ -835,21 +834,14 @@ static void test_tcp_stats( int family ) ok( unstable( table.dwActiveOpens == dyn.active_opens ), "%d vs %d\n", table.dwActiveOpens, dyn.active_opens ); ok( unstable( table.dwPassiveOpens == dyn.passive_opens ), "%d vs %d\n", table.dwPassiveOpens, dyn.passive_opens ); - ok( bounded( table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ), "%d vs [%d %d]\n", - table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ); - ok( bounded( table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ), "%d vs [%d %d]\n", - table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ); + expect_bounded( "dwAttemptFails", table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ); + expect_bounded( "dwEstabResets", table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ); ok( unstable( table.dwCurrEstab == dyn.cur_est ), "%d vs %d\n", table.dwCurrEstab, dyn.cur_est ); - ok( bounded( table.dwInSegs, dyn.in_segs, dyn2.in_segs ), "%d vs [%I64d %I64d]\n", - table.dwInSegs, dyn.in_segs, dyn2.in_segs ); - ok( bounded( table.dwOutSegs, dyn.out_segs, dyn2.out_segs ), "%d vs [%I64d %I64d]\n", - table.dwOutSegs, dyn.out_segs, dyn2.out_segs ); - ok( bounded( table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ), "%d vs [%d %d]\n", - table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ); - ok( bounded( table.dwInErrs, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", - table.dwInErrs, dyn.in_errs, dyn2.in_errs ); - ok( bounded( table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ), "%d vs [%d %d]\n", - table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); + expect_bounded( "dwInSegs", table.dwInSegs, dyn.in_segs, dyn2.in_segs ); + expect_bounded( "dwOutSegs", table.dwOutSegs, dyn.out_segs, dyn2.out_segs ); + expect_bounded( "dwRetransSegs", table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ); + expect_bounded( "dwInErrs", table.dwInErrs, dyn.in_errs, dyn2.in_errs ); + expect_bounded( "dwOutRsts", table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); ok( unstable( table.dwNumConns == dyn.num_conns ), "%d vs %d\n", table.dwNumConns, dyn.num_conns ); winetest_pop_context(); @@ -965,14 +957,10 @@ static void test_udp_stats( int family ) &dyn2, sizeof(dyn2), NULL, 0 ); ok( !err, "got %x\n", err ); - ok( bounded( table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ), "%d vs [%I64d %I64d]\n", - table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ); - ok( bounded( table.dwNoPorts, dyn.no_ports, dyn2.no_ports ), "%d vs [%d %d]\n", - table.dwNoPorts, dyn.no_ports, dyn2.no_ports); - ok( bounded( table.dwInErrors, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", - table.dwInErrors, dyn.in_errs, dyn2.in_errs ); - ok( bounded( table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ), "%d vs [%I64d %I64d]\n", - table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); + expect_bounded( "dwInDatagrams", table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ); + expect_bounded( "dwNoPorts", table.dwNoPorts, dyn.no_ports, dyn2.no_ports ); + expect_bounded( "dwInErrors", table.dwInErrors, dyn.in_errs, dyn2.in_errs ); + expect_bounded( "dwOutDatagrams", table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); ok( unstable( table.dwNumAddrs == dyn.num_addrs ), "%d %d\n", table.dwNumAddrs, dyn.num_addrs ); winetest_pop_context(); -- 2.30.2

2 1