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

Jacek Caban : winex11: Directly use win32u for GDI functions in palette.c.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 37f31840b90f9de83052c7fe377b4f8c1d5daed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37f31840b90f9de83052c7fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:10:03 2022 +0200 winex11: Directly use win32u for GDI functions in palette.c. 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/winex11.drv/palette.c | 39 ++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 5 +++++ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 8fbd7820c95..ffed08d1f35 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -337,7 +337,7 @@ int X11DRV_PALETTE_Init(void) } else { - GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, sys_pal_template ); + get_palette_entries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, sys_pal_template ); if ((mapping = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(int) * NB_RESERVED_COLORS ))) palette_set_mapping( GetStockObject(DEFAULT_PALETTE), mapping ); @@ -881,20 +881,20 @@ static int X11DRV_SysPaletteLookupPixel( COLORREF col, BOOL skipReserved ) */ COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) { - HPALETTE hPal = GetCurrentObject(physDev->dev.hdc, OBJ_PAL ); - PALETTEENTRY entry; + HPALETTE hPal = NtGdiGetDCObject( physDev->dev.hdc, NTGDI_OBJ_PAL ); + PALETTEENTRY entry; if (color & (1 << 24)) /* PALETTEINDEX */ { unsigned int idx = LOWORD(color); - if (!GetPaletteEntries( hPal, idx, 1, &entry )) return 0; + if (!get_palette_entries( hPal, idx, 1, &entry )) return 0; return RGB( entry.peRed, entry.peGreen, entry.peBlue ); } if (color >> 24 == 2) /* PALETTERGB */ { - unsigned int idx = GetNearestPaletteIndex( hPal, color & 0xffffff ); - if (!GetPaletteEntries( hPal, idx, 1, &entry )) return 0; + unsigned int idx = NtGdiGetNearestPaletteIndex( hPal, color & 0xffffff ); + if (!get_palette_entries( hPal, idx, 1, &entry )) return 0; return RGB( entry.peRed, entry.peGreen, entry.peBlue ); } @@ -911,8 +911,8 @@ COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) */ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { - WORD index = 0; - HPALETTE hPal = GetCurrentObject(physDev->dev.hdc, OBJ_PAL ); + WORD index = 0; + HPALETTE hPal = NtGdiGetDCObject( physDev->dev.hdc, NTGDI_OBJ_PAL ); int *mapping = palette_get_mapping( hPal ); PALETTEENTRY entry; ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; @@ -931,7 +931,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { unsigned int idx = LOWORD( color ); - if (!GetPaletteEntries( hPal, idx, 1, &entry )) + if (!get_palette_entries( hPal, idx, 1, &entry )) { WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); return 0; @@ -990,13 +990,13 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) if (color & (1 << 24)) /* PALETTEINDEX */ { index = LOWORD( color ); - if (!GetPaletteEntries( hPal, index, 1, &entry )) + if (!get_palette_entries( hPal, index, 1, &entry )) WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index); else if (mapping) index = mapping[index]; } else if (color >> 24 == 2) /* PALETTERGB */ { - index = GetNearestPaletteIndex( hPal, color ); + index = NtGdiGetNearestPaletteIndex( hPal, color ); if (mapping) index = mapping[index]; } else if (color >> 16 == 0x10ff) /* DIBINDEX */ @@ -1197,7 +1197,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL) return 0; - if (!GetObjectW( hpal, sizeof(num_entries), &num_entries )) return 0; + if (!NtGdiExtGetObjectW( hpal, sizeof(num_entries), &num_entries )) return 0; /* initialize palette mapping table */ prev_mapping = palette_get_mapping( hpal ); @@ -1217,7 +1217,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) FIXME( "more than 256 entries not supported\n" ); num_entries = 256; } - if (!(num_entries = GetPaletteEntries( hpal, 0, num_entries, entries ))) return 0; + if (!(num_entries = get_palette_entries( hpal, 0, num_entries, entries ))) return 0; /* reset dynamic system palette entries */ @@ -1361,19 +1361,19 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) UINT index; PALETTEENTRY entry; - HPALETTE hpal = GetCurrentObject( dev->hdc, OBJ_PAL ); + HPALETTE hpal = NtGdiGetDCObject( dev->hdc, NTGDI_OBJ_PAL ); if (!hpal) hpal = GetStockObject( DEFAULT_PALETTE ); if (spec_type == 2) /* PALETTERGB */ - index = GetNearestPaletteIndex( hpal, color ); + index = NtGdiGetNearestPaletteIndex( hpal, color ); else /* PALETTEINDEX */ index = LOWORD(color); - if (!GetPaletteEntries( hpal, index, 1, &entry )) + if (!get_palette_entries( hpal, index, 1, &entry )) { WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); - if (!GetPaletteEntries( hpal, 0, 1, &entry )) return CLR_INVALID; + if (!get_palette_entries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); } @@ -1392,15 +1392,16 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) */ UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) { + DWORD is_memdc; UINT ret = 0; - if (palette_size && GetObjectType(dev->hdc) != OBJ_MEMDC) + if (palette_size && NtGdiGetDCDword( dev->hdc, NtGdiIsMemDC, &is_memdc ) && is_memdc) { /* lookup is needed to account for SetSystemPaletteUse() stuff */ int i, index, *mapping = palette_get_mapping( GetStockObject(DEFAULT_PALETTE) ); PALETTEENTRY entries[NB_RESERVED_COLORS]; - GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, entries ); + get_palette_entries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, entries ); EnterCriticalSection( &palette_cs ); for( i = 0; i < NB_RESERVED_COLORS; i++ ) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 18afc0e133d..2112980aab5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -847,6 +847,11 @@ static inline BOOL lp_to_dp( HDC hdc, POINT *points, INT count ) return NtGdiTransformPoints( hdc, points, points, count, NtGdiLPtoDP ); } +static inline UINT get_palette_entries( HPALETTE palette, UINT start, UINT count, PALETTEENTRY *entries ) +{ + return NtGdiDoPalette( palette, start, count, entries, NtGdiGetPaletteEntries, TRUE ); +} + /* registry helpers */ extern HKEY open_hkcu_key( const char *name ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winex11: Directly use win32u for GDI functions in graphics.c.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 4631b007c1149f7738d9ac39e5b4922cb7f9a742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4631b007c1149f7738d9ac39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:09:50 2022 +0200 winex11: Directly use win32u for GDI functions in graphics.c. 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/winex11.drv/graphics.c | 122 ++++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 7 +++ 2 files changed, 80 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4631b007c1149f7738d9…

1 0

Jacek Caban : winex11: Directly use win32u for GDI functions in bitblt.c.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: c3ed3403bae88f6a9fed26dd2fa0b622018cfd2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3ed3403bae88f6a9fed26dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:09:19 2022 +0200 winex11: Directly use win32u for GDI functions in bitblt.c. 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/winex11.drv/bitblt.c | 50 ++++++++++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 3 +-- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 46e52612a21..bae0784be78 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -44,8 +44,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "x11drv.h" #include "winternl.h" #include "wine/debug.h" @@ -849,8 +847,14 @@ BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (physDevSrc->depth == 1) { - int text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetTextColor(physDevDst->dev.hdc) ); - int bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetBkColor(physDevDst->dev.hdc) ); + DWORD text_color, bk_color; + int text_pixel, bkgnd_pixel; + + NtGdiGetDCDword( physDevDst->dev.hdc, NtGdiGetTextColor, &text_color ); + text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, text_color ); + + NtGdiGetDCDword( physDevDst->dev.hdc, NtGdiGetBkColor, &bk_color ); + bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, bk_color ); XSetBackground( gdi_display, physDevDst->gc, text_pixel ); XSetForeground( gdi_display, physDevDst->gc, bkgnd_pixel ); @@ -880,8 +884,14 @@ BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, to color or vice versa, the foreground and background color of the device context are used. In fact, it also applies to the case when it is converted from mono to mono. */ - int text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetTextColor(physDevDst->dev.hdc) ); - int bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetBkColor(physDevDst->dev.hdc) ); + DWORD text_color, bk_color; + int text_pixel, bkgnd_pixel; + + NtGdiGetDCDword( physDevDst->dev.hdc, NtGdiGetTextColor, &text_color ); + text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, text_color ); + + NtGdiGetDCDword( physDevDst->dev.hdc, NtGdiGetBkColor, &bk_color ); + bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, bk_color ); if (X11DRV_PALETTE_XPixelToPalette && physDevDst->depth != 1) { @@ -1480,7 +1490,7 @@ Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const BITMAPIN { if (dst_info->bmiHeader.biBitCount == 1) /* set a default color table for 1-bpp */ memcpy( dst_info->bmiColors, default_colortable, sizeof(default_colortable) ); - dib = CreateDIBSection( hdc, dst_info, coloruse, &dst_bits.ptr, 0, 0 ); + dib = NtGdiCreateDIBSection( hdc, 0, 0, dst_info, coloruse, 0, 0, 0, &dst_bits.ptr ); if (dib) { if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) @@ -1489,7 +1499,7 @@ Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const BITMAPIN dst_bits.free = NULL; dst_bits.is_copy = TRUE; err = put_pixmap_image( pixmap, vis, dst_info, &dst_bits ); - DeleteObject( dib ); + NtGdiDeleteObjectApp( dib ); } else err = ERROR_OUTOFMEMORY; } @@ -1592,9 +1602,9 @@ static inline UINT get_color_component( UINT color, UINT mask ) #ifdef HAVE_LIBXSHAPE static inline void flush_rgn_data( HRGN rgn, RGNDATA *data ) { - HRGN tmp = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); - CombineRgn( rgn, rgn, tmp, RGN_OR ); - DeleteObject( tmp ); + HRGN tmp = NtGdiExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); + NtGdiCombineRgn( rgn, rgn, tmp, RGN_OR ); + NtGdiDeleteObjectApp( tmp ); data->rdh.nCount = 0; } @@ -1639,7 +1649,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) data->rdh.nCount = 0; data->rdh.nRgnSize = sizeof(buffer) - sizeof(data->rdh); - rgn = CreateRectRgn( 0, 0, 0, 0 ); + rgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); width = surface->header.rect.right - surface->header.rect.left; switch (info->bmiHeader.biBitCount) @@ -1741,7 +1751,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) HeapFree( GetProcessHeap(), 0, data ); } - DeleteObject( rgn ); + NtGdiDeleteObjectApp( rgn ); #endif } @@ -1868,14 +1878,14 @@ static void x11drv_surface_set_region( struct window_surface *window_surface, HR window_surface->funcs->lock( window_surface ); if (!region) { - if (surface->region) DeleteObject( surface->region ); + if (surface->region) NtGdiDeleteObjectApp( surface->region ); surface->region = 0; XSetClipMask( gdi_display, surface->gc, None ); } else { - if (!surface->region) surface->region = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( surface->region, region, 0, RGN_COPY ); + if (!surface->region) surface->region = NtGdiCreateRectRgn( 0, 0, 0, 0 ); + NtGdiCombineRgn( surface->region, region, 0, RGN_COPY ); if ((data = X11DRV_GetRegionData( surface->region, 0 ))) { XSetClipRectangles( gdi_display, surface->gc, 0, 0, @@ -1979,7 +1989,7 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) } surface->crit.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &surface->crit ); - if (surface->region) DeleteObject( surface->region ); + if (surface->region) NtGdiDeleteObjectApp( surface->region ); HeapFree( GetProcessHeap(), 0, surface ); } @@ -2099,10 +2109,10 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) add_bounds_rect( &surface->bounds, &rc ); if (surface->region) { - region = CreateRectRgnIndirect( rect ); - if (CombineRgn( region, region, surface->region, RGN_DIFF ) <= NULLREGION) + region = NtGdiCreateRectRgn( rect->left, rect->top, rect->right, rect->bottom ); + if (NtGdiCombineRgn( region, region, surface->region, RGN_DIFF ) <= NULLREGION) { - DeleteObject( region ); + NtGdiDeleteObjectApp( region ); region = 0; } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9890fc94c22..dacd7b171cf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -57,8 +57,7 @@ typedef int Status; #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include "ntgdi.h" #include "wine/gdi_driver.h" #include "wine/list.h"

1 0

Jacek Caban : win32u: Implement NtGdiGetDCPoint.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 43126a5053ce62586d74fd70e87e9a1e7d267569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43126a5053ce62586d74fd70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:09:06 2022 +0200 win32u: Implement NtGdiGetDCPoint. 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/win32u/dc.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 9 +++++++++ dlls/wow64win/syscall.h | 1 + include/ntgdi.h | 8 ++++++++ 6 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 01a9c5d258a..216b3813729 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1027,6 +1027,42 @@ BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ) } +/*********************************************************************** + * NtGdiGetDCPoint (win32u.@) + */ +BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ) +{ + BOOL ret = TRUE; + DC *dc; + + if (!(dc = get_dc_ptr( hdc ))) return 0; + + switch (method) + { + case NtGdiGetBrushOrgEx: + *result = dc->attr->brush_org; + break; + + case NtGdiGetCurrentPosition: + *result = dc->attr->cur_pos; + break; + + case NtGdiGetDCOrg: + result->x = dc->attr->vis_rect.left; + result->y = dc->attr->vis_rect.top; + break; + + default: + WARN( "unknown method %u\n", method ); + ret = FALSE; + break; + } + + release_dc_ptr( dc ); + return ret; +} + + /*********************************************************************** * NtGdiSetBrushOrg (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f9e1d67bb6b..d19ab54fa90 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -72,6 +72,7 @@ static void * const syscalls[] = NtGdiGetColorAdjustment, NtGdiGetDCDword, NtGdiGetDCObject, + NtGdiGetDCPoint, NtGdiGetFontFileData, NtGdiGetFontFileInfo, NtGdiGetNearestPaletteIndex, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 522f280f9ae..8c2073d0fb1 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -464,7 +464,7 @@ @ stub NtGdiGetDCDpiScaleValue @ stdcall -syscall NtGdiGetDCDword(long long ptr) @ stdcall -syscall NtGdiGetDCObject(long long) -@ stub NtGdiGetDCPoint +@ stdcall -syscall NtGdiGetDCPoint(long long ptr) @ stub NtGdiGetDCforBitmap @ stdcall NtGdiGetDIBitsInternal(long long long long ptr ptr long long long) @ stdcall NtGdiGetDeviceCaps(long long) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 15dae62c1e0..ed85754640d 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -67,6 +67,15 @@ NTSTATUS WINAPI wow64_NtGdiGetDCObject( UINT *args ) return HandleToUlong( NtGdiGetDCObject( hdc, type )); } +NTSTATUS WINAPI wow64_NtGdiGetDCPoint( UINT *args ) +{ + HDC hdc = get_handle( &args ); + UINT method = get_ulong( &args ); + POINT *result = get_ptr( &args ); + + return NtGdiGetDCPoint( hdc, method, result ); +} + NTSTATUS WINAPI wow64_NtGdiCreateBitmap( UINT *args ) { INT width = get_ulong( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 1632f007e34..ba921e7e543 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -59,6 +59,7 @@ SYSCALL_ENTRY( NtGdiGetColorAdjustment ) \ SYSCALL_ENTRY( NtGdiGetDCDword ) \ SYSCALL_ENTRY( NtGdiGetDCObject ) \ + SYSCALL_ENTRY( NtGdiGetDCPoint ) \ SYSCALL_ENTRY( NtGdiGetFontFileData ) \ SYSCALL_ENTRY( NtGdiGetFontFileInfo ) \ SYSCALL_ENTRY( NtGdiGetNearestPaletteIndex ) \ diff --git a/include/ntgdi.h b/include/ntgdi.h index 8f3d4c05178..78d0f620be3 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -131,6 +131,14 @@ enum NtGdiIsMemDC, }; +/* NtGdiGetDCPoint parameter, not compatible with Windows */ +enum +{ + NtGdiGetBrushOrgEx, + NtGdiGetCurrentPosition, + NtGdiGetDCOrg, +}; + enum { NtGdiAnimatePalette,

1 0

Jacek Caban : win32u: Implement NtGdiGetDCDword.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: e9cfbef46b9d78af8c70558bd8b6fd08f7a4c74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9cfbef46b9d78af8c70558b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:08:54 2022 +0200 win32u: Implement NtGdiGetDCDword. 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/win32u/dc.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 9 +++++++ dlls/wow64win/syscall.h | 1 + include/ntgdi.h | 16 ++++++++++++ 6 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 6336c8afb2e..01a9c5d258a 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -960,6 +960,73 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre } +/*********************************************************************** + * NtGdiGetDCDword (win32u.@) + */ +BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ) +{ + BOOL ret = TRUE; + DC *dc; + + if (!(dc = get_dc_ptr( hdc ))) return 0; + + switch (method) + { + case NtGdiGetArcDirection: + *result = dc->attr->arc_direction; + break; + + case NtGdiGetBkColor: + *result = dc->attr->background_color; + break; + + case NtGdiGetBkMode: + *result = dc->attr->background_mode; + break; + + case NtGdiGetDCBrushColor: + *result = dc->attr->brush_color; + break; + + case NtGdiGetDCPenColor: + *result = dc->attr->pen_color; + break; + + case NtGdiGetGraphicsMode: + *result = dc->attr->graphics_mode; + break; + + case NtGdiGetLayout: + *result = dc->attr->layout; + break; + + case NtGdiGetPolyFillMode: + *result = dc->attr->poly_fill_mode; + break; + + case NtGdiGetROP2: + *result = dc->attr->rop_mode; + break; + + case NtGdiGetTextColor: + *result = dc->attr->text_color; + break; + + case NtGdiIsMemDC: + *result = get_gdi_object_type( hdc ) == NTGDI_OBJ_MEMDC; + break; + + default: + WARN( "unknown method %u\n", method ); + ret = FALSE; + break; + } + + release_dc_ptr( dc ); + return ret; +} + + /*********************************************************************** * NtGdiSetBrushOrg (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 2be2cfce3bf..f9e1d67bb6b 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -70,6 +70,7 @@ static void * const syscalls[] = NtGdiGetBitmapBits, NtGdiGetBitmapDimension, NtGdiGetColorAdjustment, + NtGdiGetDCDword, NtGdiGetDCObject, NtGdiGetFontFileData, NtGdiGetFontFileInfo, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index e083797b544..522f280f9ae 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -462,7 +462,7 @@ @ stub NtGdiGetColorSpaceforBitmap @ stub NtGdiGetCurrentDpiInfo @ stub NtGdiGetDCDpiScaleValue -@ stub NtGdiGetDCDword +@ stdcall -syscall NtGdiGetDCDword(long long ptr) @ stdcall -syscall NtGdiGetDCObject(long long) @ stub NtGdiGetDCPoint @ stub NtGdiGetDCforBitmap diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 3abe6daeda4..15dae62c1e0 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -50,6 +50,15 @@ NTSTATUS WINAPI wow64_NtGdiExtGetObjectW( UINT *args ) return NtGdiExtGetObjectW( handle, count, buffer ); } +NTSTATUS WINAPI wow64_NtGdiGetDCDword( UINT *args ) +{ + HDC hdc = get_handle( &args ); + UINT method = get_ulong( &args ); + DWORD *result = get_ptr( &args ); + + return NtGdiGetDCDword( hdc, method, result ); +} + NTSTATUS WINAPI wow64_NtGdiGetDCObject( UINT *args ) { HDC hdc = get_handle( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index a90c4c20d40..1632f007e34 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -57,6 +57,7 @@ SYSCALL_ENTRY( NtGdiGetBitmapBits ) \ SYSCALL_ENTRY( NtGdiGetBitmapDimension ) \ SYSCALL_ENTRY( NtGdiGetColorAdjustment ) \ + SYSCALL_ENTRY( NtGdiGetDCDword ) \ SYSCALL_ENTRY( NtGdiGetDCObject ) \ SYSCALL_ENTRY( NtGdiGetFontFileData ) \ SYSCALL_ENTRY( NtGdiGetFontFileInfo ) \ diff --git a/include/ntgdi.h b/include/ntgdi.h index 3bc1d4206e4..8f3d4c05178 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -115,6 +115,22 @@ enum NtGdiSetGraphicsMode, }; +/* NtGdiGetDCDword parameter, not compatible with Windows */ +enum +{ + NtGdiGetArcDirection, + NtGdiGetBkColor, + NtGdiGetBkMode, + NtGdiGetDCBrushColor, + NtGdiGetDCPenColor, + NtGdiGetGraphicsMode, + NtGdiGetLayout, + NtGdiGetPolyFillMode, + NtGdiGetROP2, + NtGdiGetTextColor, + NtGdiIsMemDC, +}; + enum { NtGdiAnimatePalette,

1 0

Eric Pouech : oleaut32/tests: Simplify printf for 64 bit integers.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 4782bc3c1a4c8be6cf6140d50454e4a3378f677f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4782bc3c1a4c8be6cf6140d5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 12 09:59:56 2022 +0200 oleaut32/tests: Simplify printf for 64 bit integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 11 +++++------ dlls/oleaut32/tests/vartest.c | 34 ++++++++++++++++------------------ dlls/oleaut32/tests/vartype.c | 4 ++-- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index b273f72ac8d..2e926a5bc36 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1194,9 +1194,8 @@ static double WINAPI double_func( double a0, float a1, double a2, int a3 ) static LONGLONG WINAPI longlong_func( LONGLONG a0, CY a1 ) { - ok( a0 == 0xdead00000000beefll, "wrong arg0 %08lx%08lx\n", (DWORD)(a0 >> 32), (DWORD)a0); - ok( a1.int64 == ((ULONGLONG)10000 * 12345678), "wrong arg1 %08lx%08lx\n", - (DWORD)(a1.int64 >> 32), (DWORD)a1.int64 ); + ok( a0 == 0xdead00000000beefll, "wrong arg0 %#I64x\n", a0); + ok( a1.int64 == ((ULONGLONG)10000 * 12345678), "wrong arg1 %#I64x\n", a1.int64 ); return ((ULONGLONG)4321 << 32) | 8765; } @@ -1208,7 +1207,7 @@ static VARIANT WINAPI variant_func( int a0, BOOL a1, DECIMAL a2, VARIANT a3 ) V_VT(&var) = VT_LPWSTR; V_UI4(&var) = 0xbabe; ok( a2.Hi32 == 1122, "wrong arg2.Hi32 %lx\n", a2.Hi32 ); - ok( U1(a2).Lo64 == 3344, "wrong arg2.Lo64 %08lx%08lx\n", (DWORD)(U1(a2).Lo64 >> 32), (DWORD)U1(a2).Lo64 ); + ok( U1(a2).Lo64 == 3344, "wrong arg2.Lo64 %#I64x\n", U1(a2).Lo64 ); ok( V_VT(&a3) == VT_EMPTY, "wrong arg3 type %x\n", V_VT(&a3) ); ok( V_UI4(&a3) == 0xdeadbeef, "wrong arg3 value %lx\n", V_UI4(&a3) ); return var; @@ -1389,8 +1388,8 @@ static void test_DispCallFunc(void) if (res == S_OK) { ok( V_VT(&result) == VT_I8, "wrong result type %d\n", V_VT(&result) ); - ok( V_I8(&result) == (((ULONGLONG)4321 << 32) | 8765), "wrong result %08lx%08lx\n", - (DWORD)(V_I8(&result) >> 32), (DWORD)V_I8(&result) ); + ok( V_I8(&result) == (((ULONGLONG)4321 << 32) | 8765), "wrong result %#I64x\n", + V_I8(&result) ); } memset( args, 0x55, sizeof(args) ); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index b6ccc083ad4..9456b56eb26 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -558,9 +558,9 @@ static const char *variantstr( const VARIANT *var ) case VT_INT: sprintf( vtstr_buffer[vtstr_current], "VT_INT(%d)", V_INT(var) ); break; case VT_I8: - sprintf( vtstr_buffer[vtstr_current], "VT_I8(%x%08x)", (UINT)(V_I8(var) >> 32), (UINT)V_I8(var) ); break; + sprintf( vtstr_buffer[vtstr_current], "VT_I8(%I64x)", V_I8(var) ); break; case VT_UI8: - sprintf( vtstr_buffer[vtstr_current], "VT_UI8(%x%08x)", (UINT)(V_UI8(var) >> 32), (UINT)V_UI8(var) ); break; + sprintf( vtstr_buffer[vtstr_current], "VT_UI8(%I64x)", V_UI8(var) ); break; case VT_R4: sprintf( vtstr_buffer[vtstr_current], "VT_R4(%g)", V_R4(var) ); break; case VT_R8: @@ -2515,19 +2515,17 @@ static const char *szFailOk = "Call failed, hres = %08x\n"; #define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \ ok(V_UI4(&vOut) == val, "Expected ui4 = %d, got %d\n", (ULONG)val, V_UI4(&vOut)); } #define EXPECT_I8(val) EXPECT_OK { EXPECT_TYPE(VT_I8); \ - ok(V_I8(&vOut) == val, "Expected i8 = %lx%08lx, got %lx%08lx\n", \ - (LONG)(val >> 32), (LONG)(val), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } + ok(V_I8(&vOut) == val, "Expected i8 = %#I64x, got %#I64x\n", (LONG64)val, V_I8(&vOut)); } #define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \ - ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%x%08x, got 0x%x%08x\n", \ - (DWORD)((ULONG64)val >> 32), (DWORD)(ULONG64)val, (DWORD)(V_UI8(&vOut) >> 32), (DWORD)V_UI8(&vOut)); } + ok(V_UI8(&vOut) == val, "Expected ui8 = %#I64x, got %#I64x\n", (ULONG64)val, V_UI8(&vOut); } #define EXPECT_R4(val) EXPECT_OK { EXPECT_TYPE(VT_R4); \ ok(V_R4(&vOut) == val, "Expected r4 = %f, got %f\n", val, V_R4(&vOut)); } #define EXPECT_R8(val) EXPECT_OK { EXPECT_TYPE(VT_R8); \ ok(V_R8(&vOut) == val, "Expected r8 = %g, got %g\n", val, V_R8(&vOut)); } #define CY_MULTIPLIER 10000 #define EXPECT_CY(val) EXPECT_OK { EXPECT_TYPE(VT_CY); \ - ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = 0x%lx%08lx, got 0x%lx%08lx\n", \ - (DWORD)((LONG64)val >> 23), (DWORD)(LONG64)val, (DWORD)(V_CY(&vOut).int64 >>32), (DWORD)V_CY(&vOut).int64); } + ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = %#I64x, got %#I64x\n", \ + (LONG64)val, V_CY(&vOut).int64); } #define EXPECT_DECIMAL(valHi, valMid, valLo) EXPECT_OK { EXPECT_TYPE(VT_DECIMAL); \ ok((V_DECIMAL(&vOut).Hi32 == valHi) && (S1(U1(V_DECIMAL(&vOut))).Mid32 == valMid) && \ (S1(U1(V_DECIMAL(&vOut))).Lo32 == valLo), \ @@ -4221,8 +4219,8 @@ static void test_VarInt(void) pcy->int64 = -11000; hres = pVarInt(&v,&vDst); ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == -20000, - "VarInt: VT_CY wrong, hres=0x%lX 0x%lx%08lx\n", - hres, (DWORD)(V_CY(&vDst).int64 >> 32), (DWORD)V_CY(&vDst).int64); + "VarInt: VT_CY wrong, hres=%#lX %#I64x\n", + hres, V_CY(&vDst).int64); } static HRESULT (WINAPI *pVarNeg)(LPVARIANT,LPVARIANT); @@ -9315,8 +9313,8 @@ static void test_VarIdiv(void) "VARIDIV: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == 5000, - "VARIDIV: CY value 0x%lx%08lx, expected 0x%x\n", - (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), 5000); + "VARIDIV: CY value %#I64x, expected %#x\n", + V_I8(&result), 5000); } hres = pVarIdiv(&left, &cy, &result); @@ -9347,8 +9345,8 @@ static void test_VarIdiv(void) "VARIDIV: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == 1, - "VARIDIV: DECIMAL value 0x%lx%08lx, expected %d\n", - (DWORD)(V_I8(&result) >> 32), (DWORD)V_I8(&result), 1); + "VARIDIV: DECIMAL value %I64d, expected %d\n", + V_I8(&result), 1); } /* Check for division by zero */ @@ -9895,8 +9893,8 @@ static void test_VarImp(void) "VARIMP: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == -2, - "VARIMP: CY value %lx%08lx, expected %d\n", - (DWORD)((V_I8(&result)) >> 32), (DWORD)(V_I8(&result)), -2); + "VARIMP: CY value %I64d, expected %d\n", + V_I8(&result), -2); } hres = pVarImp(&left, &cy, &result); @@ -9927,8 +9925,8 @@ static void test_VarImp(void) "VARIMP: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == -3, - "VARIMP: DECIMAL value 0x%lx%08lx, expected %d\n", - (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), -3); + "VARIMP: DECIMAL value %#I64x, expected %d\n", + V_I8(&result), -3); } SysFreeString(false_str); diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 78b50e6bcdb..c5137572d9d 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3618,8 +3618,8 @@ static void test_VarCyInt(void) #define EXPECTDEC(scl, sgn, hi, lo) ok(hres == S_OK && \ S(U(out)).scale == (BYTE)(scl) && S(U(out)).sign == (BYTE)(sgn) && \ out.Hi32 == (ULONG)(hi) && U1(out).Lo64 == (ULONG64)(lo), \ - "expected (%d,%d,%d,(%lx %lx)), got (%d,%d,%ld,(%lx %lx)) hres 0x%08lx\n", \ - scl, sgn, hi, (LONG)((LONG64)(lo) >> 32), (LONG)((lo) & 0xffffffff), S(U(out)).scale, \ + "expected (%d,%d,%d,%I64x), got (%d,%d,%ld,(%lx %lx)) hres 0x%08lx\n", \ + scl, sgn, hi, (LONG64)(lo), S(U(out)).scale, \ S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres) #define EXPECTDEC64(scl, sgn, hi, mid, lo) ok(hres == S_OK && \

1 0

Eric Pouech : oleaut32/tests: Simplify test by using long long constants.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: f438e285d3301519702704167ea5fd64a0e8b19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f438e285d330151970270416… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 12 09:59:48 2022 +0200 oleaut32/tests: Simplify test by using long long constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 25 ++++++++++--------------- dlls/oleaut32/tests/typelib.c | 4 ++-- dlls/oleaut32/tests/vartest.c | 12 ++++++------ 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a61b1637c5e..53861870e78 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -39,21 +39,18 @@ static inline void release_iface_(unsigned int line, void *iface) } #define release_iface(a) release_iface_(__LINE__, a) -/* ULL suffix is not portable */ -#define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) - static const WCHAR test_bstr1[] = {'f','o','o',0,'b','a','r'}; static const WCHAR test_bstr2[] = {'t','e','s','t',0}; static const WCHAR test_bstr3[] = {'q','u','x',0}; static const WCHAR test_bstr4[] = {'a','b','c',0}; -static const MYSTRUCT test_mystruct1 = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432), {0,1,2,3,4,5,6,7}}; -static const MYSTRUCT test_mystruct2 = {0x91827364, ULL_CONST(0x88776655, 0x44332211), {3,6,1,4,0,1,3,0}}; -static const MYSTRUCT test_mystruct3 = {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415), {9,2,4,5,6,5,1,3}}; -static const MYSTRUCT test_mystruct4 = {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425), {0,4,6,7,3,6,7,4}}; -static const MYSTRUCT test_mystruct5 = {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435), {1,6,7,3,8,4,6,5}}; -static const MYSTRUCT test_mystruct6 = {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445), {3,6,5,3,4,8,0,9}}; -static const MYSTRUCT test_mystruct7 = {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455), {1,8,4,4,4,2,3,1}}; +static const MYSTRUCT test_mystruct1 = {0x12345678, 0xdeadbeef98765432ull, {0,1,2,3,4,5,6,7}}; +static const MYSTRUCT test_mystruct2 = {0x91827364, 0x8877665544332211ull, {3,6,1,4,0,1,3,0}}; +static const MYSTRUCT test_mystruct3 = {0x1a1b1c1d, 0x1e1f101112131415ull, {9,2,4,5,6,5,1,3}}; +static const MYSTRUCT test_mystruct4 = {0x2a2b2c2d, 0x2e2f202122232425ull, {0,4,6,7,3,6,7,4}}; +static const MYSTRUCT test_mystruct5 = {0x3a3b3c3d, 0x3e3f303132333435ull, {1,6,7,3,8,4,6,5}}; +static const MYSTRUCT test_mystruct6 = {0x4a4b4c4d, 0x4e4f404142434445ull, {3,6,5,3,4,8,0,9}}; +static const MYSTRUCT test_mystruct7 = {0x5a5b5c5d, 0x5e5f505152535455ull, {1,8,4,4,4,2,3,1}}; static const struct thin test_thin_struct = {-456, 78}; @@ -1134,7 +1131,7 @@ static HRESULT WINAPI Widget_basetypes_out(IWidget *iface, signed char *c, short *uc = 254; *us = 256; *ul = 0xf00dfade; - *uh = (((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789; + *uh = 0xabcdef0123456789ull; *f = M_LN2; *d = M_LN10; *st = STATE_UNWIDGETIFIED; @@ -2033,8 +2030,7 @@ static void test_marshal_basetypes(IWidget *widget, IDispatch *disp) ok(uc == 254, "Got unsigned char %u.\n", uc); ok(us == 256, "Got unsigned short %u.\n", us); ok(ul == 0xf00dfade, "Got unsigned int %li.\n", ul); - ok(uh == ((((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789), - "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); + ok(uh == 0xabcdef0123456789ull, "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); ok(f == (float)M_LN2, "Got float %f.\n", f); ok(d == M_LN10, "Got double %f.\n", d); ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st); @@ -2050,8 +2046,7 @@ static void test_marshal_basetypes(IWidget *widget, IDispatch *disp) ok(uc == 254, "Got unsigned char %u.\n", uc); ok(us == 256, "Got unsigned short %u.\n", us); ok(ul == 0xf00dfade, "Got unsigned int %li.\n", ul); - ok(uh == ((((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789), - "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); + ok(uh == 0xabcdef0123456789ull, "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); ok(f == (float)M_LN2, "Got float %f.\n", f); ok(d == M_LN10, "Got double %f.\n", d); ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st); diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 44d5b26cbc4..b273f72ac8d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1194,7 +1194,7 @@ static double WINAPI double_func( double a0, float a1, double a2, int a3 ) static LONGLONG WINAPI longlong_func( LONGLONG a0, CY a1 ) { - ok( a0 == (((ULONGLONG)0xdead << 32) | 0xbeef), "wrong arg0 %08lx%08lx\n", (DWORD)(a0 >> 32), (DWORD)a0); + ok( a0 == 0xdead00000000beefll, "wrong arg0 %08lx%08lx\n", (DWORD)(a0 >> 32), (DWORD)a0); ok( a1.int64 == ((ULONGLONG)10000 * 12345678), "wrong arg1 %08lx%08lx\n", (DWORD)(a1.int64 >> 32), (DWORD)a1.int64 ); return ((ULONGLONG)4321 << 32) | 8765; @@ -1379,7 +1379,7 @@ static void test_DispCallFunc(void) memset( args, 0x55, sizeof(args) ); types[0] = VT_I8; - V_I8(&args[0]) = ((ULONGLONG)0xdead << 32) | 0xbeef; + V_I8(&args[0]) = 0xdead00000000beefll; types[1] = VT_CY; V_CY(&args[1]).int64 = (ULONGLONG)10000 * 12345678; memset( &result, 0xcc, sizeof(result) ); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index db0562e2d03..b6ccc083ad4 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2514,9 +2514,9 @@ static const char *szFailOk = "Call failed, hres = %08x\n"; ok(V_I4(&vOut) == val, "Expected i4 = %ld, got %ld\n", (LONG)val, V_I4(&vOut)); } #define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \ ok(V_UI4(&vOut) == val, "Expected ui4 = %d, got %d\n", (ULONG)val, V_UI4(&vOut)); } -#define EXPECT_I8(high,low) EXPECT_OK { EXPECT_TYPE(VT_I8); \ - ok(V_I8(&vOut) == ((((ULONG64)(high))<<32)|(low)), "Expected i8 = %lx%08lx, got %lx%08lx\n", \ - (LONG)(high), (LONG)(low), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } +#define EXPECT_I8(val) EXPECT_OK { EXPECT_TYPE(VT_I8); \ + ok(V_I8(&vOut) == val, "Expected i8 = %lx%08lx, got %lx%08lx\n", \ + (LONG)(val >> 32), (LONG)(val), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } #define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \ ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%x%08x, got 0x%x%08x\n", \ (DWORD)((ULONG64)val >> 32), (DWORD)(ULONG64)val, (DWORD)(V_UI8(&vOut) >> 32), (DWORD)V_UI8(&vOut)); } @@ -2615,7 +2615,7 @@ static void test_VarNumFromParseNum(void) /* We cannot use INTEGER_VTBITS as WinXP and Win2003 are broken(?). They truncate the number to the smallest integer size requested: CONVERT(16,0,0,16,4,0, INTEGER_VTBITS); EXPECT_I1((signed char)0xff); */ - CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x7fffffff,0xffffffff); + CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x7fffffffffffffffull); } /* Assume the above pattern holds for numbers without hi-bit set, test (preservation of) hi-bit */ @@ -2642,7 +2642,7 @@ static void test_VarNumFromParseNum(void) truncate the number to the smallest integer size requested: CONVERT(16,0,0,16,4,0, INTEGER_VTBITS & ~VTBIT_I1); EXPECT_I2((signed short)0x0002); */ - CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x80000000,0x00000002); + CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x8000000000000002ull); } /* Test (preservation of) hi-bit with STRICT type requesting */ @@ -2665,7 +2665,7 @@ static void test_VarNumFromParseNum(void) SETRGB(12, 0); SETRGB(13, 0); SETRGB(14, 0); SETRGB(15, 2); if (has_i8) { - CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x80000000,0x00000002); + CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x8000000000000002ull); } /* Assume the above pattern holds for numbers with hi-bit set */

1 0

Jacek Caban : winex11: Directly use win32u for GDI functions in more places.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 3a11be1d48251ecbc0b99d7f4b3325bddbcd486b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a11be1d48251ecbc0b99d7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:10:35 2022 +0200 winex11: Directly use win32u for GDI functions in more places. 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/winex11.drv/brush.c | 6 +++--- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/init.c | 15 +++++++++------ dlls/winex11.drv/mouse.c | 40 +++++++++++++++++++++------------------- dlls/winex11.drv/opengl.c | 17 ++++++++++------- dlls/winex11.drv/pen.c | 10 +++++----- 6 files changed, 50 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a11be1d48251ecbc0b9…

1 0

Alexandre Julliard : win32u: Use the ntdll functions for codepage conversions.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 65ff9caca02af9544f3fc62c1e12fd90f6176af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ff9caca02af9544f3fc62c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 10:10:17 2022 +0200 win32u: Use the ntdll functions for codepage conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 99 ++++---------------------------------------- dlls/win32u/win32u_private.h | 5 +-- 2 files changed, 9 insertions(+), 95 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 2bf68141d6d..82daf9ad2ba 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -3221,7 +3221,6 @@ static UINT get_glyph_index_symbol( struct gdi_font *font, UINT glyph ) CPTABLEINFO *get_cptable( WORD cp ) { static CPTABLEINFO tables[100]; - CPTABLEINFO *info; unsigned int i; USHORT *ptr; SIZE_T size; @@ -3234,112 +3233,28 @@ CPTABLEINFO *get_cptable( WORD cp ) ERR( "too many code pages\n" ); return NULL; } - - info = &tables[i]; - info->CodePage = ptr[1]; - info->MaximumCharacterSize = ptr[2]; - info->DefaultChar = ptr[3]; - info->UniDefaultChar = ptr[4]; - info->TransDefaultChar = ptr[5]; - info->TransUniDefaultChar = ptr[6]; - memcpy( info->LeadByte, ptr + 7, sizeof(info->LeadByte) ); - ptr += ptr[0]; - - info->WideCharTable = ptr + ptr[0] + 1; - info->MultiByteTable = ++ptr; - ptr += 256; - if (*ptr++) ptr += 256; /* glyph table */ - info->DBCSRanges = ptr; - if (*ptr) /* dbcs ranges */ - { - info->DBCSCodePage = 1; - info->DBCSOffsets = ptr + 1; - } - else - { - info->DBCSCodePage = 0; - info->DBCSOffsets = NULL; - } - - return info; + RtlInitCodePageTable( ptr, &tables[i] ); + return &tables[i]; } DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD srclen ) { - DWORD i, ret; + DWORD ret; if (!info && !(info = get_cptable( get_acp() ))) return 0; - srclen /= sizeof(WCHAR); - if (info->DBCSCodePage) - { - WCHAR *uni2cp = info->WideCharTable; - - for (i = dstlen; srclen && i; i--, srclen--, src++) - { - if (uni2cp[*src] & 0xff00) - { - if (i == 1) break; /* do not output a partial char */ - i--; - *dst++ = uni2cp[*src] >> 8; - } - *dst++ = (char)uni2cp[*src]; - } - ret = dstlen - i; - } - else - { - char *uni2cp = info->WideCharTable; - ret = min( srclen, dstlen ); - for (i = 0; i < ret; i++) dst[i] = uni2cp[src[i]]; - } + RtlUnicodeToCustomCPN( info, dst, dstlen, &ret, src, srclen ); return ret; } DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, DWORD srclen ) { - DWORD i, ret; + DWORD ret; if (!info && !(info = get_cptable( get_acp() ))) return 0; - if (!dst) - { - /* only compute length */ - if (info->DBCSOffsets) - { - for (ret = 0; srclen--; src++, ret++) - { - if (!info->DBCSOffsets[(unsigned char)*src]) continue; - if (!srclen--) break; - src++; - } - } - else ret = srclen; - return ret * sizeof(WCHAR); - } - - dstlen /= sizeof(WCHAR); - if (info->DBCSOffsets) - { - for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) - { - USHORT off = info->DBCSOffsets[(unsigned char)*src]; - if (off && srclen > 1) - { - src++; - srclen--; - *dst = info->DBCSOffsets[off + (unsigned char)*src]; - } - else *dst = info->MultiByteTable[(unsigned char)*src]; - } - ret = dstlen - i; - } - else - { - ret = min( srclen, dstlen ); - for (i = 0; i < ret; i++) dst[i] = info->MultiByteTable[(unsigned char)src[i]]; - } - return ret * sizeof(WCHAR); + RtlCustomCPToUnicodeN( info, dst, dstlen, &ret, src, srclen ); + return ret; } static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_default ) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d552850e303..f570bde39fe 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -592,9 +592,8 @@ static inline WCHAR *win32u_wcsdup( const WCHAR *str ) static inline WCHAR *towstr( const char *str ) { DWORD len = strlen( str ) + 1; - DWORD size = win32u_mbtowc( NULL, NULL, 0, str, len ); - WCHAR *ret = malloc( size ); - if (ret) win32u_mbtowc( NULL, ret, size, str, len ); + WCHAR *ret = malloc( len * sizeof(WCHAR) ); + if (ret) win32u_mbtowc( NULL, ret, len * sizeof(WCHAR), str, len ); return ret; }

1 0

Alexandre Julliard : win32u: Support UTF-8 as the default Ansi codepage.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 5cc2d4adc5d183ed322b48bf3a7ec8359ef2abd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc2d4adc5d183ed322b48bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 10:17:13 2022 +0200 win32u: Support UTF-8 as the default Ansi codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 44 +++++++++++++++++++++++++++++++++++++++----- dlls/win32u/gdiobj.c | 40 ++++++++++++---------------------------- 2 files changed, 51 insertions(+), 33 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 86786b160fb..c5a5a5806ba 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -199,6 +199,7 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static CPTABLEINFO utf8_cp; static CPTABLEINFO oem_cp; CPTABLEINFO ansi_cp = { 0 }; @@ -370,6 +371,11 @@ static const struct nls_update_font_list "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", "sseriff.fon", "Tahoma","Times New Roman" /* FIXME unverified */ }, + /* UTF-8 */ + { CP_UTF8, CP_UTF8, "vga850.fon", "vgafix.fon", "vgasys.fon", + "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", "sseriff.fon", + "Tahoma", "Times New Roman" /* FIXME unverified */ + }, /* Eastern Europe */ { 1250, 852, "vga852.fon", "vgafixe.fon", "vgasyse.fon", "couree.fon", "serifee.fon", "smallee.fon", "sserifee.fon", "sseriffe.fon", @@ -2717,6 +2723,7 @@ static void update_font_system_link_info(void) static void update_codepage( UINT screen_dpi ) { + USHORT utf8_hdr[2] = { 0, CP_UTF8 }; char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[40 * sizeof(WCHAR)])]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; char cpbuf[40]; @@ -2733,8 +2740,15 @@ static void update_codepage( UINT screen_dpi ) if (size == sizeof(DWORD) && info->Type == REG_DWORD) font_dpi = *(DWORD *)info->Data; - RtlInitCodePageTable( NtCurrentTeb()->Peb->AnsiCodePageData, &ansi_cp ); - RtlInitCodePageTable( NtCurrentTeb()->Peb->OemCodePageData, &oem_cp ); + RtlInitCodePageTable( utf8_hdr, &utf8_cp ); + if (NtCurrentTeb()->Peb->AnsiCodePageData) + RtlInitCodePageTable( NtCurrentTeb()->Peb->AnsiCodePageData, &ansi_cp ); + else + ansi_cp = utf8_cp; + if (NtCurrentTeb()->Peb->OemCodePageData) + RtlInitCodePageTable( NtCurrentTeb()->Peb->OemCodePageData, &oem_cp ); + else + oem_cp = utf8_cp; sprintf( cpbuf, "%u,%u", ansi_cp.CodePage, oem_cp.CodePage ); asciiz_to_unicode( cpbufW, cpbuf ); @@ -3210,6 +3224,7 @@ CPTABLEINFO *get_cptable( WORD cp ) SIZE_T size; if (cp == CP_ACP) return &ansi_cp; + if (cp == CP_UTF8) return &utf8_cp; for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) if (tables[i].CodePage == cp) return &tables[i]; @@ -3227,7 +3242,11 @@ DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *sr { DWORD ret; - RtlUnicodeToCustomCPN( info, dst, dstlen, &ret, src, srclen * sizeof(WCHAR) ); + if (info->CodePage == CP_UTF8) + RtlUnicodeToUTF8N( dst, dstlen, &ret, src, srclen * sizeof(WCHAR) ); + else + RtlUnicodeToCustomCPN( info, dst, dstlen, &ret, src, srclen * sizeof(WCHAR) ); + return ret; } @@ -3235,7 +3254,11 @@ DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *sr { DWORD ret; - RtlCustomCPToUnicodeN( info, dst, dstlen * sizeof(WCHAR), &ret, src, srclen ); + if (info->CodePage == CP_UTF8) + RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &ret, src, srclen ); + else + RtlCustomCPToUnicodeN( info, dst, dstlen * sizeof(WCHAR), &ret, src, srclen ); + return ret / sizeof(WCHAR); } @@ -3245,7 +3268,18 @@ static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_defau if (!(info = get_cptable( cp ))) return FALSE; - if (info->DBCSCodePage) + if (info->CodePage == CP_UTF8) + { + if (wc < 0x80) + { + *dst = wc; + return TRUE; + } + if (!allow_default) return FALSE; + *dst = info->DefaultChar; + return TRUE; + } + else if (info->DBCSCodePage) { WCHAR *uni2cp = info->WideCharTable; if (uni2cp[wc] & 0xff00) return FALSE; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 78fab0189c9..d71807c8c04 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -464,38 +464,22 @@ void make_gdi_object_system( HGDIOBJ handle, BOOL set) /****************************************************************************** * get_default_fonts */ -static const struct DefaultFontInfo* get_default_fonts(UINT charset) +static const struct DefaultFontInfo* get_default_fonts(void) { - unsigned int n; + unsigned int n; + CHARSETINFO csi; - for(n = 0; n < ARRAY_SIZE( default_fonts ); n++) - { - if ( default_fonts[n].charset == charset ) - return &default_fonts[n]; - } - - FIXME( "unhandled charset 0x%08x - use ANSI_CHARSET for default stock objects\n", charset ); - return &default_fonts[0]; -} - - -/****************************************************************************** - * get_default_charset (internal) - * - * get the language-dependent charset that can handle CP_ACP correctly. - */ -static UINT get_default_charset( void ) -{ - CHARSETINFO csi; + if (ansi_cp.CodePage == CP_UTF8) return &default_fonts[0]; csi.ciCharset = ANSI_CHARSET; - if ( !translate_charset_info( ULongToPtr(ansi_cp.CodePage), &csi, TCI_SRCCODEPAGE ) ) - { - FIXME( "unhandled codepage %u - use ANSI_CHARSET for default stock objects\n", ansi_cp.CodePage ); - return ANSI_CHARSET; - } + translate_charset_info( ULongToPtr(ansi_cp.CodePage), &csi, TCI_SRCCODEPAGE ); + + for(n = 0; n < ARRAY_SIZE( default_fonts ); n++) + if ( default_fonts[n].charset == csi.ciCharset ) + return &default_fonts[n]; - return csi.ciCharset; + FIXME( "unhandled charset 0x%08x - use ANSI_CHARSET for default stock objects\n", csi.ciCharset ); + return &default_fonts[0]; } @@ -654,7 +638,7 @@ static void init_stock_objects( unsigned int dpi ) create_font( &AnsiVarFont ); /* language-dependent stock fonts */ - deffonts = get_default_fonts(get_default_charset()); + deffonts = get_default_fonts(); create_font( &deffonts->SystemFont ); create_font( &deffonts->DeviceDefaultFont );

1 0