wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Jacek Caban : gdi32: Use NtGdiGetDIBitsInternal for GetDIBits.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 011032164040ac36370249655addb300baec1b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=011032164040ac3637024965… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:35 2021 +0100 gdi32: Use NtGdiGetDIBitsInternal for GetDIBits. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 17 ++++------------- dlls/gdi32/objects.c | 9 +++++++++ include/ntgdi.h | 3 +++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5a8d29ae5bf..976e6060955 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1190,22 +1190,13 @@ BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) } /****************************************************************************** - * GetDIBits [GDI32.@] + * NtGdiGetDIBitsInternal (win32u.@) * * Retrieves bits of bitmap and copies to buffer. - * - * RETURNS - * Success: Number of scan lines copied from bitmap - * Failure: 0 */ -INT WINAPI DECLSPEC_HOTPATCH GetDIBits( - HDC hdc, /* [in] Handle to device context */ - HBITMAP hbitmap, /* [in] Handle to bitmap */ - UINT startscan, /* [in] First scan line to set in dest bitmap */ - UINT lines, /* [in] Number of scan lines to copy */ - LPVOID bits, /* [out] Address of array for bitmap bits */ - BITMAPINFO * info, /* [out] Address of structure with bitmap data */ - UINT coloruse) /* [in] RGB or palette index */ +INT WINAPI NtGdiGetDIBitsInternal( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, + void *bits, BITMAPINFO *info, UINT coloruse, + UINT max_bits, UINT max_info ) { DC * dc; BITMAPOBJ * bmp; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 58ac32ed576..03985737b51 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -724,6 +724,15 @@ UINT WINAPI GetSystemPaletteEntries( HDC hdc, UINT start, UINT count, PALETTEENT return 0; } +/*********************************************************************** + * GetDIBits (GDI32.@) + */ +INT WINAPI DECLSPEC_HOTPATCH GetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, + void *bits, BITMAPINFO *info, UINT coloruse ) +{ + return NtGdiGetDIBitsInternal( hdc, hbitmap, startscan, lines, bits, info, coloruse, 0, 0 ); +} + /*********************************************************************** * GetDIBColorTable (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 63f65e04794..fbe168a73bd 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -273,6 +273,9 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WC BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); 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, + UINT max_bits, UINT max_info ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ); DWORD WINAPI NtGdiGetFontData( HDC hdc, DWORD table, DWORD offset, void *buffer, DWORD length );

1 0

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetGraphicsMode.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 55849cd42808e54e1a63ef0de4db05640065a968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55849cd42808e54e1a63ef0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:34 2021 +0100 gdi32: Use NtGdiGetAndSetDCDword for SetGraphicsMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 9 ++++----- dlls/gdi32/dc.c | 49 +++++++++++++++++++++++-------------------------- dlls/gdi32/gdidc.c | 9 +++++++++ include/ntgdi.h | 1 + 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index dcc2c932453..7f66d2f66fe 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -1019,7 +1019,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { - int oldgMode; + DWORD prev_mode; /* parallelogram coords */ POINT plg[3]; /* rect coords */ @@ -1030,8 +1030,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, double det; /* save actual mode, set GM_ADVANCED */ - oldgMode = SetGraphicsMode(hdcDest,GM_ADVANCED); - if (oldgMode == 0) + if (!NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, GM_ADVANCED, &prev_mode )) return FALSE; memcpy(plg,lpPoint,sizeof(POINT)*3); @@ -1047,7 +1046,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, if (fabs(det) < 1e-5) { - SetGraphicsMode(hdcDest,oldgMode); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, prev_mode, NULL ); return FALSE; } @@ -1084,7 +1083,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, SRCCOPY); /* restore dest DC */ SetWorldTransform(hdcDest,&oldDestXf); - SetGraphicsMode(hdcDest,oldgMode); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, prev_mode, NULL ); return TRUE; } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7e9dff645b1..420754b555e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -806,6 +806,24 @@ INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ) } +static BOOL set_graphics_mode( DC *dc, int mode ) +{ + if (mode == dc->attr->graphics_mode) return TRUE; + if (mode <= 0 || mode > GM_LAST) return FALSE; + + /* One would think that setting the graphics mode to GM_COMPATIBLE + * would also reset the world transformation matrix to the unity + * matrix. However, in Windows, this is not the case. This doesn't + * make a lot of sense to me, but that's the way it is. + */ + dc->attr->graphics_mode = mode; + + /* font metrics depend on the graphics mode */ + NtGdiSelectFont(dc->hSelf, dc->hFont); + return TRUE; +} + + /*********************************************************************** * NtGdiGetAndSetDCDword (win32u.@) */ @@ -848,6 +866,11 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre if (value != CLR_INVALID) dc->attr->pen_color = value; break; + case NtGdiSetGraphicsMode: + if (prev_value) *prev_value = dc->attr->graphics_mode; + ret = set_graphics_mode( dc, value ); + break; + default: WARN( "unknown method %u\n", method ); ret = FALSE; @@ -859,32 +882,6 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre } -/*********************************************************************** - * SetGraphicsMode (GDI32.@) - */ -INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc = get_dc_ptr( hdc ); - - /* One would think that setting the graphics mode to GM_COMPATIBLE - * would also reset the world transformation matrix to the unity - * matrix. However, in Windows, this is not the case. This doesn't - * make a lot of sense to me, but that's the way it is. - */ - if (!dc) return 0; - if ((mode > 0) && (mode <= GM_LAST)) - { - ret = dc->attr->graphics_mode; - dc->attr->graphics_mode = mode; - } - /* font metrics depend on the graphics mode */ - if (ret != mode) NtGdiSelectFont(dc->hSelf, dc->hFont); - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * NtGdiGetTransform (win32u.@) * diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c3c7ad710f2..0be21c75d58 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -436,6 +436,15 @@ INT WINAPI GetGraphicsMode( HDC hdc ) return dc_attr ? dc_attr->graphics_mode : 0; } +/*********************************************************************** + * SetGraphicsMode (GDI32.@) + */ +INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) +{ + DWORD ret; + return NtGdiGetAndSetDCDword( hdc, NtGdiSetGraphicsMode, mode, &ret ) ? ret : 0; +} + /*********************************************************************** * GetArcDirection (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 25ac5ee505f..63f65e04794 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -111,6 +111,7 @@ enum NtGdiSetTextColor, NtGdiSetDCBrushColor, NtGdiSetDCPenColor, + NtGdiSetGraphicsMode, }; enum

1 0

Jacek Caban : gdi32: Use NtGdiCreateCompatibleBitmap for CreateCompatibleBitmap.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 9c03e8ae8c0f81e70528bc7719fba5196ea7949e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c03e8ae8c0f81e70528bc77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:33 2021 +0100 gdi32: Use NtGdiCreateCompatibleBitmap for CreateCompatibleBitmap. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/bitmap.c | 30 ++++++++++++------------------ dlls/gdi32/objects.c | 13 +++++++++++++ include/ntgdi.h | 1 + 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 54c923236ee..dcc2c932453 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -789,7 +789,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, /* make bitmap */ hDC1 = NtGdiCreateCompatibleDC( hdcDest ); - hBitmap1 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); + hBitmap1 = NtGdiCreateCompatibleBitmap( hdcDest, nWidth, nHeight ); hOldBitmap1 = NtGdiSelectBitmap(hDC1, hBitmap1); /* draw using bkgnd rop */ @@ -800,7 +800,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, /* make bitmap */ hDC2 = NtGdiCreateCompatibleDC( hdcDest ); - hBitmap2 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); + hBitmap2 = NtGdiCreateCompatibleBitmap( hdcDest, nWidth, nHeight ); hOldBitmap2 = NtGdiSelectBitmap(hDC2, hBitmap2); /* draw using foregnd rop */ @@ -879,7 +879,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, info.bmiHeader.biCompression = BI_RGB; bmpWork = CreateDIBSection( 0, &info, DIB_RGB_COLORS, NULL, NULL, 0 ); } - else bmpWork = CreateCompatibleBitmap(hdcDest, widthDest, heightDest); + else bmpWork = NtGdiCreateCompatibleBitmap( hdcDest, widthDest, heightDest ); oldWork = NtGdiSelectBitmap(hdcWork, bmpWork); if(!StretchBlt(hdcWork, 0, 0, widthDest, heightDest, hdcSrc, xSrc, ySrc, widthSrc, heightSrc, SRCCOPY)) { TRACE("Failed to stretch\n"); @@ -889,7 +889,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, /* Create mask */ hdcMask = NtGdiCreateCompatibleDC( hdcDest ); - bmpMask = CreateCompatibleBitmap(hdcMask, widthDest, heightDest); + bmpMask = NtGdiCreateCompatibleBitmap( hdcMask, widthDest, heightDest ); oldMask = NtGdiSelectBitmap(hdcMask, bmpMask); if(!BitBlt(hdcMask, 0, 0, widthDest, heightDest, hdcWork, 0, 0, SRCCOPY)) { TRACE("Failed to create mask\n"); diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8866ec0af8a..472efdec295 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -44,44 +44,38 @@ static const struct gdi_obj_funcs bitmap_funcs = /****************************************************************************** - * CreateCompatibleBitmap [GDI32.@] + * NtGdiCreateCompatibleBitmap (win32u.@) * * Creates a bitmap compatible with the DC. - * - * PARAMS - * hdc [I] Handle to device context - * width [I] Width of bitmap - * height [I] Height of bitmap - * - * RETURNS - * Success: Handle to bitmap - * Failure: 0 */ -HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) +HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *bi = (BITMAPINFO *)buffer; DIBSECTION dib; - TRACE("(%p,%d,%d)\n", hdc, width, height); + TRACE( "(%p,%d,%d)\n", hdc, width, height ); + + if (!width || !height) return 0; if (GetObjectType( hdc ) != OBJ_MEMDC) - return CreateBitmap( width, height, - GetDeviceCaps(hdc, PLANES), GetDeviceCaps(hdc, BITSPIXEL), NULL ); + return NtGdiCreateBitmap( width, height, + NtGdiGetDeviceCaps( hdc, PLANES ), + NtGdiGetDeviceCaps( hdc, BITSPIXEL ), NULL ); - switch (GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(dib), &dib )) + switch (NtGdiExtGetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(dib), &dib )) { case sizeof(BITMAP): /* A device-dependent bitmap is selected in the DC */ - return CreateBitmap( width, height, dib.dsBm.bmPlanes, dib.dsBm.bmBitsPixel, NULL ); + return NtGdiCreateBitmap( width, height, dib.dsBm.bmPlanes, dib.dsBm.bmBitsPixel, NULL ); case sizeof(DIBSECTION): /* A DIB section is selected in the DC */ bi->bmiHeader = dib.dsBmih; bi->bmiHeader.biWidth = width; bi->bmiHeader.biHeight = height; if (dib.dsBmih.biCompression == BI_BITFIELDS) /* copy the color masks */ - memcpy(bi->bmiColors, dib.dsBitfields, sizeof(dib.dsBitfields)); + memcpy( bi->bmiColors, dib.dsBitfields, sizeof(dib.dsBitfields) ); else if (dib.dsBmih.biBitCount <= 8) /* copy the color table */ - GetDIBColorTable(hdc, 0, 256, bi->bmiColors); + NtGdiDoPalette( hdc, 0, 256, bi->bmiColors, NtGdiGetDIBColorTable, FALSE ); return CreateDIBSection( hdc, bi, DIB_RGB_COLORS, NULL, NULL, 0 ); default: diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 70cf1d6a0a5..58ac32ed576 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -524,6 +524,19 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, return NtGdiCreateBitmap( width, height, planes, bpp, bits ); } +/****************************************************************************** + * CreateCompatibleBitmap (GDI32.@) + * + * Creates a bitmap compatible with the DC. + */ +HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height ) +{ + if (!width || !height) + return GetStockObject( STOCK_LAST + 1 ); /* default 1x1 bitmap */ + + return NtGdiCreateCompatibleBitmap( hdc, width, height ); +} + /****************************************************************************** * CreateDiscardableBitmap (GDI32.@) * diff --git a/include/ntgdi.h b/include/ntgdi.h index f8dd944a185..25ac5ee505f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -216,6 +216,7 @@ INT WINAPI NtGdiCombineRgn( HRGN dest, HRGN src1, HRGN src2, INT mode ); BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ); HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, UINT bpp, const void *bits ); +HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ); HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ); HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ); HDC WINAPI NtGdiCreateMetafileDC( HDC hdc );

1 0

Jacek Caban : gdi32: Use NtGdiExtCreatePen for ExtCreatePen.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: e4bb7972525ae855865c54a7f87955cb74b123c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4bb7972525ae855865c54a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:32 2021 +0100 gdi32: Use NtGdiExtCreatePen for ExtCreatePen. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 8 +------- dlls/gdi32/objects.c | 23 +++++++++++++++++++++++ dlls/gdi32/pen.c | 22 ++++++++++++---------- dlls/gdi32/tests/pen.c | 3 +-- include/ntgdi.h | 6 ++++-- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 1dcf4b2c844..7c43df0dfcf 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -90,8 +90,6 @@ done: BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) { - HGLOBAL hmem = 0; - pattern->info = NULL; pattern->bits.free = NULL; @@ -117,20 +115,16 @@ BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) brush->lbColor = 0; return copy_bitmap( pattern, (HBITMAP)brush->lbHatch ); - case BS_DIBPATTERN: - hmem = (HGLOBAL)brush->lbHatch; - if (!(brush->lbHatch = (ULONG_PTR)GlobalLock( hmem ))) return FALSE; - /* fall through */ case BS_DIBPATTERNPT: pattern->usage = brush->lbColor; pattern->info = copy_packed_dib( (BITMAPINFO *)brush->lbHatch, pattern->usage ); - if (hmem) GlobalUnlock( hmem ); if (!pattern->info) return FALSE; pattern->bits.ptr = (char *)pattern->info + get_dib_info_size( pattern->info, pattern->usage ); brush->lbStyle = BS_DIBPATTERN; brush->lbColor = 0; return TRUE; + case BS_DIBPATTERN: case BS_DIBPATTERN8X8: case BS_MONOPATTERN: case BS_INDEXED: diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index bdd4a03fe34..70cf1d6a0a5 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -398,6 +398,29 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) return NtGdiCreatePen( style, width, color, NULL ); } +/*********************************************************************** + * ExtCreatePen (GDI32.@) + */ +HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, const LOGBRUSH *brush, DWORD style_count, + const DWORD *style_bits ) +{ + ULONG brush_style = brush->lbStyle; + ULONG_PTR hatch = brush->lbHatch; + HPEN pen; + + if (brush_style == BS_DIBPATTERN) + { + if (!(hatch = (ULONG_PTR)GlobalLock( (HGLOBAL)hatch ))) return 0; + brush_style = BS_DIBPATTERNPT; + } + + pen = NtGdiExtCreatePen( style, width, brush_style, brush->lbColor, brush->lbHatch, hatch, + style_count, style_bits, /* FIXME */ 0, FALSE, NULL ); + + if (brush->lbStyle == BS_DIBPATTERN) GlobalUnlock( (HGLOBAL)brush->lbHatch ); + return pen; +} + /*********************************************************************** * CreateBrushIndirect (GDI32.@) */ diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 3b3ab78ecd7..684cc8375d1 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -93,12 +93,12 @@ HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) } /*********************************************************************** - * ExtCreatePen (GDI32.@) + * NtGdiExtCreatePen (win32u.@) */ - -HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, - const LOGBRUSH * brush, DWORD style_count, - const DWORD *style_bits ) +HPEN WINAPI NtGdiExtCreatePen( DWORD style, DWORD width, ULONG brush_style, ULONG color, + ULONG_PTR client_hatch, ULONG_PTR hatch, DWORD style_count, + const DWORD *style_bits, ULONG dib_size, BOOL old_style, + HBRUSH brush ) { PENOBJ *penPtr = NULL; HPEN hpen; @@ -110,7 +110,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, switch (style & PS_STYLE_MASK) { case PS_NULL: - return CreatePen( PS_NULL, 0, brush->lbColor ); + return NtGdiCreatePen( PS_NULL, 0, color, NULL ); case PS_SOLID: case PS_DASH: @@ -154,18 +154,20 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) { - if (brush->lbStyle == BS_NULL) return CreatePen( PS_NULL, 0, 0 ); + if (brush_style == BS_NULL) return NtGdiCreatePen( PS_NULL, 0, 0, NULL ); } else { if (width != 1) goto invalid; - if (brush->lbStyle != BS_SOLID) goto invalid; + if (brush_style != BS_SOLID) goto invalid; } if (!(penPtr = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(PENOBJ,logpen.elpStyleEntry[style_count])))) return 0; - logbrush = *brush; + logbrush.lbStyle = brush_style; + logbrush.lbColor = color; + logbrush.lbHatch = hatch; if (!store_brush_pattern( &logbrush, &penPtr->pattern )) goto invalid; if (logbrush.lbStyle == BS_DIBPATTERN) logbrush.lbStyle = BS_DIBPATTERNPT; @@ -173,7 +175,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, penPtr->logpen.elpWidth = abs((int)width); penPtr->logpen.elpBrushStyle = logbrush.lbStyle; penPtr->logpen.elpColor = logbrush.lbColor; - penPtr->logpen.elpHatch = brush->lbHatch; + penPtr->logpen.elpHatch = client_hatch; penPtr->logpen.elpNumEntries = style_count; memcpy(penPtr->logpen.elpStyleEntry, style_bits, style_count * sizeof(DWORD)); diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 530272ea79f..d1bfa7ee34f 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -646,8 +646,7 @@ static void test_brush_pens(void) ok( elp->elpPenStyle == (PS_DOT | PS_GEOMETRIC), "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == BS_DIBPATTERNPT, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == 0, "wrong color %x\n", elp->elpColor ); - ok( elp->elpHatch == lb.lbHatch || broken(elp->elpHatch != lb.lbHatch), /* <= w2k */ - "wrong hatch %lx/%lx\n", elp->elpHatch, lb.lbHatch ); + ok( elp->elpHatch == lb.lbHatch, "wrong hatch %lx/%lx\n", elp->elpHatch, lb.lbHatch ); ok( elp->elpNumEntries == 0, "wrong entries %x\n", elp->elpNumEntries ); break; diff --git a/include/ntgdi.h b/include/ntgdi.h index 7fa2b09b2e0..f8dd944a185 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -242,8 +242,10 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ); LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, DWORD func, BOOL inbound ); INT WINAPI NtGdiEndPage( HDC hdc ); -HPEN WINAPI NtGdiExtCreatePen( DWORD style, DWORD width, const LOGBRUSH *brush, - DWORD style_count, const DWORD *style_bits ); +HPEN WINAPI NtGdiExtCreatePen( DWORD style, DWORD width, ULONG brush_style, ULONG color, + ULONG_PTR client_hatch, ULONG_PTR hatch, DWORD style_count, + const DWORD *style_bits, ULONG dib_size, BOOL old_style, + HBRUSH brush ); HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *data ); INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ); INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN region, INT mode );

1 0

Jacek Caban : gdi32: Move EnumObjects to objects.c.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 91621cece6154356bfbe8934759c355abea9a074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91621cece6154356bfbe8934… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:31 2021 +0100 gdi32: Move EnumObjects to objects.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/gdi32/gdiobj.c | 77 ---------------------------------------------------- dlls/gdi32/objects.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 77 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 67550d7f724..2937cdcf48f 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1085,83 +1085,6 @@ BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) } -/* Solid colors to enumerate */ -static const COLORREF solid_colors[] = -{ RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff), -RGB(0xff,0x00,0x00), RGB(0x00,0xff,0x00), -RGB(0x00,0x00,0xff), RGB(0xff,0xff,0x00), -RGB(0xff,0x00,0xff), RGB(0x00,0xff,0xff), -RGB(0x80,0x00,0x00), RGB(0x00,0x80,0x00), -RGB(0x80,0x80,0x00), RGB(0x00,0x00,0x80), -RGB(0x80,0x00,0x80), RGB(0x00,0x80,0x80), -RGB(0x80,0x80,0x80), RGB(0xc0,0xc0,0xc0) -}; - - -/*********************************************************************** - * EnumObjects (GDI32.@) - */ -INT WINAPI EnumObjects( HDC hdc, INT nObjType, - GOBJENUMPROC lpEnumFunc, LPARAM lParam ) -{ - UINT i; - INT retval = 0; - LOGPEN pen; - LOGBRUSH brush; - - TRACE("%p %d %p %08lx\n", hdc, nObjType, lpEnumFunc, lParam ); - switch(nObjType) - { - case OBJ_PEN: - /* Enumerate solid pens */ - for (i = 0; i < ARRAY_SIZE( solid_colors ); i++) - { - pen.lopnStyle = PS_SOLID; - pen.lopnWidth.x = 1; - pen.lopnWidth.y = 0; - pen.lopnColor = solid_colors[i]; - retval = lpEnumFunc( &pen, lParam ); - TRACE("solid pen %08x, ret=%d\n", - solid_colors[i], retval); - if (!retval) break; - } - break; - - case OBJ_BRUSH: - /* Enumerate solid brushes */ - for (i = 0; i < ARRAY_SIZE( solid_colors ); i++) - { - brush.lbStyle = BS_SOLID; - brush.lbColor = solid_colors[i]; - brush.lbHatch = 0; - retval = lpEnumFunc( &brush, lParam ); - TRACE("solid brush %08x, ret=%d\n", - solid_colors[i], retval); - if (!retval) break; - } - - /* Now enumerate hatched brushes */ - if (retval) for (i = HS_HORIZONTAL; i <= HS_DIAGCROSS; i++) - { - brush.lbStyle = BS_HATCHED; - brush.lbColor = RGB(0,0,0); - brush.lbHatch = i; - retval = lpEnumFunc( &brush, lParam ); - TRACE("hatched brush %d, ret=%d\n", - i, retval); - if (!retval) break; - } - break; - - default: - /* FIXME: implement Win32 types */ - WARN("(%d): Invalid type\n", nObjType ); - break; - } - return retval; -} - - /*********************************************************************** * NtGdiFlush (win32u.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 830d187c9a2..bdd4a03fe34 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -821,3 +821,76 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit ) { return 1; /* FIXME */ } + +/* Solid colors to enumerate */ +static const COLORREF solid_colors[] = +{ + RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff), + RGB(0xff,0x00,0x00), RGB(0x00,0xff,0x00), + RGB(0x00,0x00,0xff), RGB(0xff,0xff,0x00), + RGB(0xff,0x00,0xff), RGB(0x00,0xff,0xff), + RGB(0x80,0x00,0x00), RGB(0x00,0x80,0x00), + RGB(0x80,0x80,0x00), RGB(0x00,0x00,0x80), + RGB(0x80,0x00,0x80), RGB(0x00,0x80,0x80), + RGB(0x80,0x80,0x80), RGB(0xc0,0xc0,0xc0) +}; + +/*********************************************************************** + * EnumObjects (GDI32.@) + */ +INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param ) +{ + UINT i; + INT retval = 0; + LOGPEN pen; + LOGBRUSH brush; + + TRACE( "%p %d %p %08lx\n", hdc, type, enum_func, param ); + + switch(type) + { + case OBJ_PEN: + /* Enumerate solid pens */ + for (i = 0; i < ARRAY_SIZE(solid_colors); i++) + { + pen.lopnStyle = PS_SOLID; + pen.lopnWidth.x = 1; + pen.lopnWidth.y = 0; + pen.lopnColor = solid_colors[i]; + retval = enum_func( &pen, param ); + TRACE( "solid pen %08x, ret=%d\n", solid_colors[i], retval ); + if (!retval) break; + } + break; + + case OBJ_BRUSH: + /* Enumerate solid brushes */ + for (i = 0; i < ARRAY_SIZE(solid_colors); i++) + { + brush.lbStyle = BS_SOLID; + brush.lbColor = solid_colors[i]; + brush.lbHatch = 0; + retval = enum_func( &brush, param ); + TRACE( "solid brush %08x, ret=%d\n", solid_colors[i], retval ); + if (!retval) break; + } + + /* Now enumerate hatched brushes */ + for (i = HS_HORIZONTAL; retval && i <= HS_DIAGCROSS; i++) + { + brush.lbStyle = BS_HATCHED; + brush.lbColor = RGB(0,0,0); + brush.lbHatch = i; + retval = enum_func( &brush, param ); + TRACE( "hatched brush %d, ret=%d\n", i, retval ); + } + break; + + default: + /* FIXME: implement Win32 types */ + WARN( "(%d): Invalid type\n", type ); + break; + } + + return retval; +}

1 0

Jacek Caban : gdi32: Move stub object functions to objects.c.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 86f11f71a04fa27f3e52366a131810d945749c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f11f71a04fa27f3e52366a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:30 2021 +0100 gdi32: Move stub object functions to objects.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/gdi32/gdiobj.c | 35 ----------------------------------- dlls/gdi32/objects.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2e99d6a830b..67550d7f724 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1162,23 +1162,6 @@ INT WINAPI EnumObjects( HDC hdc, INT nObjType, } -/*********************************************************************** - * SetObjectOwner (GDI32.@) - */ -void WINAPI SetObjectOwner( HGDIOBJ handle, HANDLE owner ) -{ - /* Nothing to do */ -} - -/*********************************************************************** - * GdiInitializeLanguagePack (GDI32.@) - */ -DWORD WINAPI GdiInitializeLanguagePack( DWORD arg ) -{ - FIXME("stub\n"); - return 0; -} - /*********************************************************************** * NtGdiFlush (win32u.@) */ @@ -1188,24 +1171,6 @@ BOOL WINAPI NtGdiFlush(void) } -/*********************************************************************** - * GdiGetBatchLimit (GDI32.@) - */ -DWORD WINAPI GdiGetBatchLimit(void) -{ - return 1; /* FIXME */ -} - - -/*********************************************************************** - * GdiSetBatchLimit (GDI32.@) - */ -DWORD WINAPI GdiSetBatchLimit( DWORD limit ) -{ - return 1; /* FIXME */ -} - - /******************************************************************* * NtGdiGetColorAdjustment (win32u.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index e5aa641edf3..830d187c9a2 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -788,3 +788,36 @@ done: release_display_device_init_mutex( mutex ); return status; } + +/*********************************************************************** + * SetObjectOwner (GDI32.@) + */ +void WINAPI SetObjectOwner( HGDIOBJ handle, HANDLE owner ) +{ + /* Nothing to do */ +} + +/*********************************************************************** + * GdiInitializeLanguagePack (GDI32.@) + */ +DWORD WINAPI GdiInitializeLanguagePack( DWORD arg ) +{ + FIXME( "stub\n" ); + return 0; +} + +/*********************************************************************** + * GdiGetBatchLimit (GDI32.@) + */ +DWORD WINAPI GdiGetBatchLimit(void) +{ + return 1; /* FIXME */ +} + +/*********************************************************************** + * GdiSetBatchLimit (GDI32.@) + */ +DWORD WINAPI GdiSetBatchLimit( DWORD limit ) +{ + return 1; /* FIXME */ +}

1 0

Alexandre Julliard : wow64: Load wow64win.dll.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 3a5b9263848d6244d9eb1aae14fd71812f88576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a5b9263848d6244d9eb1aae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:32:07 2021 +0200 wow64: Load wow64win.dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 93 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 74 insertions(+), 19 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 087bf1aa3ad..cc2ab1c48b3 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -72,6 +72,9 @@ struct mem_header SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; +/* wow64win syscall table */ +static const SYSTEM_SERVICE_TABLE *psdwhwin32; + /* cpu backend dll functions */ static void * (WINAPI *pBTCpuGetBopCode)(void); static void (WINAPI *pBTCpuProcessInit)(void); @@ -410,39 +413,84 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_ /********************************************************************** - * load_cpu_dll + * load_64bit_module */ -static HMODULE load_cpu_dll(void) +static HMODULE load_64bit_module( const WCHAR *name ) { NTSTATUS status; HMODULE module; UNICODE_STRING str; WCHAR path[MAX_PATH]; - const WCHAR *dir, *name; + const WCHAR *dir = get_machine_wow64_dir( IMAGE_FILE_MACHINE_TARGET_HOST ); - switch (current_machine) + swprintf( path, MAX_PATH, L"%s\\%s", dir, name ); + RtlInitUnicodeString( &str, path ); + if ((status = LdrLoadDll( NULL, 0, &str, &module ))) { - case IMAGE_FILE_MACHINE_I386: - name = (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); - break; - case IMAGE_FILE_MACHINE_ARM: - name = L"wowarmhw.dll"; - break; - default: - ERR( "unsupported machine %04x\n", current_machine ); - RtlExitUserProcess( 1 ); + ERR( "failed to load dll %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); } + return module; +} - dir = get_machine_wow64_dir( IMAGE_FILE_MACHINE_TARGET_HOST ); + +/********************************************************************** + * load_32bit_module + */ +static HMODULE load_32bit_module( const WCHAR *name ) +{ + NTSTATUS status; + UNICODE_STRING str; + WCHAR path[MAX_PATH]; + HANDLE file, mapping; + LARGE_INTEGER size; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; + SIZE_T len = 0; + void *module = NULL; + const WCHAR *dir = get_machine_wow64_dir( current_machine ); swprintf( path, MAX_PATH, L"%s\\%s", dir, name ); RtlInitUnicodeString( &str, path ); - if ((status = LdrLoadDll( NULL, 0, &str, &module ))) + InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL ); + if ((status = NtOpenFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) goto failed; + + size.QuadPart = 0; + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | SECTION_MAP_EXECUTE, + NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, file ); + NtClose( file ); + if (status) goto failed; + + status = NtMapViewOfSection( mapping, GetCurrentProcess(), &module, 0, 0, NULL, &len, + ViewShare, 0, PAGE_EXECUTE_READ ); + NtClose( mapping ); + if (!status) return module; + +failed: + ERR( "failed to load dll %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + return NULL; +} + + +/********************************************************************** + * get_cpu_dll_name + */ +static const WCHAR *get_cpu_dll_name(void) +{ + switch (current_machine) { - ERR( "failed to load CPU dll %x\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); + case IMAGE_FILE_MACHINE_I386: + return (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); + case IMAGE_FILE_MACHINE_ARM: + return L"wowarmhw.dll"; + default: + ERR( "unsupported machine %04x\n", current_machine ); + RtlExitUserProcess( 1 ); } - return module; } @@ -464,11 +512,14 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex LdrGetDllHandle( NULL, 0, &str, &module ); GET_PTR( LdrSystemDllInitBlock ); - module = load_cpu_dll(); + module = load_64bit_module( get_cpu_dll_name() ); GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuProcessInit ); GET_PTR( BTCpuSimulate ); + module = load_64bit_module( L"wow64win.dll" ); + GET_PTR( sdwhwin32 ); + pBTCpuProcessInit(); module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; @@ -476,6 +527,10 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex init_syscall_table( module, 0, &ntdll_syscall_table ); *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); + module = load_32bit_module( L"win32u.dll" ); + init_syscall_table( module, 1, psdwhwin32 ); + NtUnmapViewOfSection( GetCurrentProcess(), module ); + init_file_redirects(); return TRUE;

1 0

Alexandre Julliard : wow64: Patch the Wow64Transition pointer in all loaded modules.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 40673153b4c8e6f6e5637c640a68764619237a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40673153b4c8e6f6e5637c64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:31:41 2021 +0200 wow64: Patch the Wow64Transition pointer in all loaded modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 23 ++++++++++++++++------- dlls/wow64/virtual.c | 6 ++++++ dlls/wow64/wow64_private.h | 1 + 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index feda6bf348c..087bf1aa3ad 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -334,6 +334,17 @@ static DWORD get_syscall_num( const BYTE *syscall ) } +/********************************************************************** + * init_image_mapping + */ +void init_image_mapping( HMODULE module ) +{ + void **ptr = RtlFindExportedRoutineByName( module, "Wow64Transition" ); + + if (ptr) *ptr = pBTCpuGetBopCode(); +} + + /********************************************************************** * init_syscall_table */ @@ -440,7 +451,6 @@ static HMODULE load_cpu_dll(void) */ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { - void **pWow64Transition, **p__wine_syscall_dispatcher; HMODULE module; UNICODE_STRING str; @@ -454,18 +464,17 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex LdrGetDllHandle( NULL, 0, &str, &module ); GET_PTR( LdrSystemDllInitBlock ); - module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; - GET_PTR( Wow64Transition ); - GET_PTR( __wine_syscall_dispatcher ); - init_syscall_table( module, 0, &ntdll_syscall_table ); - module = load_cpu_dll(); GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuProcessInit ); GET_PTR( BTCpuSimulate ); pBTCpuProcessInit(); - *pWow64Transition = *p__wine_syscall_dispatcher = pBTCpuGetBopCode(); + + module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; + init_image_mapping( module ); + init_syscall_table( module, 0, &ntdll_syscall_table ); + *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); init_file_redirects(); return TRUE; diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index b4aabb13c7d..e5759609974 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -257,6 +257,12 @@ NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args ) commit, offset, size_32to64( &size, size32 ), inherit, alloc, protect ); if (NT_SUCCESS(status)) { + SECTION_IMAGE_INFORMATION info; + + if (!NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL )) + { + if (info.Machine == current_machine) init_image_mapping( addr ); + } put_addr( addr32, addr ); put_size( size32, size ); } diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 370ae76a0c4..1a9d05eaf43 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -32,6 +32,7 @@ void * WINAPI Wow64AllocateTemp( SIZE_T size ); void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ); void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ); +extern void init_image_mapping( HMODULE module ) DECLSPEC_HIDDEN; extern void init_file_redirects(void) DECLSPEC_HIDDEN; extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wow64: Add support for multiple syscall tables.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 0afbbabcd9942fba9de1863d5931f9c89eebc492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0afbbabcd9942fba9de1863d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:31:04 2021 +0200 wow64: Add support for multiple syscall tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 66 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 0df1dfc143b..feda6bf348c 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -53,7 +53,14 @@ static const char *syscall_names[] = #undef SYSCALL_ENTRY }; -static unsigned short syscall_map[1024]; +static const SYSTEM_SERVICE_TABLE ntdll_syscall_table = +{ + (ULONG_PTR *)syscall_thunks, + (ULONG_PTR *)syscall_names, + ARRAY_SIZE(syscall_thunks) +}; + +static SYSTEM_SERVICE_TABLE syscall_tables[4]; /* header for Wow64AllocTemp blocks; probably not the right layout */ struct mem_header @@ -330,50 +337,64 @@ static DWORD get_syscall_num( const BYTE *syscall ) /********************************************************************** * init_syscall_table */ -static void init_syscall_table( HMODULE ntdll ) +static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_TABLE *orig_table ) { + static syscall_thunk thunks[2048]; + static ULONG start_pos; + const IMAGE_EXPORT_DIRECTORY *exports; const ULONG *functions, *names; const USHORT *ordinals; - ULONG id, exp_size, exp_pos, wrap_pos; + ULONG id, exp_size, exp_pos, wrap_pos, max_pos = 0; + const char **syscall_names = (const char **)orig_table->CounterTable; - args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); - - exports = RtlImageDirectoryEntryToData( ntdll, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); - ordinals = get_rva( ntdll, exports->AddressOfNameOrdinals ); - functions = get_rva( ntdll, exports->AddressOfFunctions ); - names = get_rva( ntdll, exports->AddressOfNames ); + exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + ordinals = get_rva( module, exports->AddressOfNameOrdinals ); + functions = get_rva( module, exports->AddressOfFunctions ); + names = get_rva( module, exports->AddressOfNames ); for (exp_pos = wrap_pos = 0; exp_pos < exports->NumberOfNames; exp_pos++) { - char *name = get_rva( ntdll, names[exp_pos] ); + char *name = get_rva( module, names[exp_pos] ); int res = -1; if (strncmp( name, "Nt", 2 ) && strncmp( name, "wine", 4 ) && strncmp( name, "__wine", 6 )) continue; /* not a syscall */ - if ((id = get_syscall_num( get_rva( ntdll, functions[ordinals[exp_pos]] ))) == ~0u) + if ((id = get_syscall_num( get_rva( module, functions[ordinals[exp_pos]] ))) == ~0u) continue; /* not a syscall */ - if (wrap_pos < ARRAY_SIZE(syscall_names)) - res = strcmp( name, syscall_names[wrap_pos] ); + if (wrap_pos < orig_table->ServiceLimit) res = strcmp( name, syscall_names[wrap_pos] ); if (!res) /* got a match */ { - if (id < ARRAY_SIZE(syscall_map)) syscall_map[id] = wrap_pos++; - else ERR( "invalid syscall id %04x for %s\n", id, name ); + ULONG table_idx = (id >> 12) & 3, table_pos = id & 0xfff; + if (table_idx == idx) + { + if (start_pos + table_pos < ARRAY_SIZE(thunks)) + { + thunks[start_pos + table_pos] = (syscall_thunk)orig_table->ServiceTable[wrap_pos++]; + max_pos = max( table_pos, max_pos ); + } + else ERR( "invalid syscall id %04x for %s\n", id, name ); + } + else ERR( "wrong syscall table id %04x for %s\n", id, name ); } else if (res > 0) { - FIXME( "no ntdll export for syscall %s\n", syscall_names[wrap_pos] ); + FIXME( "no export for syscall %s\n", syscall_names[wrap_pos] ); wrap_pos++; exp_pos--; /* try again */ } else FIXME( "missing wrapper for syscall %04x %s\n", id, name ); } - for ( ; wrap_pos < ARRAY_SIZE(syscall_thunks); wrap_pos++) - FIXME( "no ntdll export for syscall %s\n", syscall_names[wrap_pos] ); + for ( ; wrap_pos < orig_table->ServiceLimit; wrap_pos++) + FIXME( "no export for syscall %s\n", syscall_names[wrap_pos] ); + + syscall_tables[idx].ServiceTable = (ULONG_PTR *)(thunks + start_pos); + syscall_tables[idx].ServiceLimit = max_pos + 1; + start_pos += max_pos + 1; } @@ -425,6 +446,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); if (!current_machine) current_machine = native_machine; + args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) @@ -435,7 +457,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; GET_PTR( Wow64Transition ); GET_PTR( __wine_syscall_dispatcher ); - init_syscall_table( module ); + init_syscall_table( module, 0, &ntdll_syscall_table ); module = load_cpu_dll(); GET_PTR( BTCpuGetBopCode ); @@ -540,15 +562,17 @@ static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) { NTSTATUS status; + UINT id = num & 0xfff; + const SYSTEM_SERVICE_TABLE *table = &syscall_tables[(num >> 12) & 3]; - if (num >= ARRAY_SIZE( syscall_map ) || !syscall_map[num]) + if (id >= table->ServiceLimit || !table->ServiceTable[id]) { ERR( "unsupported syscall %04x\n", num ); return STATUS_INVALID_SYSTEM_SERVICE; } __TRY { - syscall_thunk thunk = syscall_thunks[syscall_map[num]]; + syscall_thunk thunk = (syscall_thunk)table->ServiceTable[id]; status = thunk( args ); } __EXCEPT( syscall_filter )

1 0

Alexandre Julliard : wow64win: Add the infrastructure for wrapping the win32u syscall table.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 18c512089e3ffc2fd315543cb553a332dbf23ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c512089e3ffc2fd315543c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:24:10 2021 +0200 wow64win: Add the infrastructure for wrapping the win32u syscall table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/Makefile.in | 1 + dlls/wow64win/Makefile.in | 6 ++++ dlls/wow64win/syscall.c | 65 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 27 +++++++++++++++++ dlls/wow64win/wow64win.spec | 2 +- dlls/wow64win/wow64win_private.h | 30 +++++++++++++++++++ 6 files changed, 130 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 9dce0bc39fd..0f76f61b798 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1,4 +1,5 @@ MODULE = win32u.dll +IMPORTLIB = win32u IMPORTS = ntdll winecrt0 EXTRALIBS = -Wl,--subsystem,unixlib diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in index 3107ce5e537..185d8595282 100644 --- a/dlls/wow64win/Makefile.in +++ b/dlls/wow64win/Makefile.in @@ -1 +1,7 @@ MODULE = wow64win.dll +IMPORTS = win32u ntdll winecrt0 + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f200000 + +C_SRCS = \ + syscall.c diff --git a/dlls/wow64win/syscall.c b/dlls/wow64win/syscall.c new file mode 100644 index 00000000000..1d4918a6025 --- /dev/null +++ b/dlls/wow64win/syscall.c @@ -0,0 +1,65 @@ +/* + * WoW64 syscall wrapping + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wow64win_private.h" + +extern BOOL WINAPI NtGdiFlush(void); + +NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) +{ + return NtGdiFlush(); +} + +static void * const win32_syscalls[] = +{ +#define SYSCALL_ENTRY(func) wow64_ ## func, + ALL_WIN32_SYSCALLS +#undef SYSCALL_ENTRY +}; + +static const char * const win32_syscall_names[] = +{ +#define SYSCALL_ENTRY(func) #func, + ALL_WIN32_SYSCALLS +#undef SYSCALL_ENTRY +}; + +SYSTEM_SERVICE_TABLE sdwhwin32 = +{ + (ULONG_PTR *)win32_syscalls, + (ULONG_PTR *)win32_syscall_names, + ARRAY_SIZE(win32_syscalls), + NULL +}; + + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + return TRUE; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h new file mode 100644 index 00000000000..3e4cc0def33 --- /dev/null +++ b/dlls/wow64win/syscall.h @@ -0,0 +1,27 @@ +/* + * WoW64 USER32 syscall definitions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WOW64WIN_SYSCALL_H +#define __WOW64WIN_SYSCALL_H + +#define ALL_WIN32_SYSCALLS \ + SYSCALL_ENTRY( NtGdiFlush ) + +#endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/wow64win.spec b/dlls/wow64win/wow64win.spec index 8ca119ffb34..8939384e2ef 100644 --- a/dlls/wow64win/wow64win.spec +++ b/dlls/wow64win/wow64win.spec @@ -1,2 +1,2 @@ #@ extern sdwhcon -#@ extern sdwhwin32 +@ extern sdwhwin32 diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h new file mode 100644 index 00000000000..466dfe5f6e0 --- /dev/null +++ b/dlls/wow64win/wow64win_private.h @@ -0,0 +1,30 @@ +/* + * WoW64 private definitions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WOW64WIN_PRIVATE_H +#define __WOW64WIN_PRIVATE_H + +#include "syscall.h" + +#define SYSCALL_ENTRY(func) extern NTSTATUS WINAPI wow64_ ## func( UINT *args ) DECLSPEC_HIDDEN; +ALL_WIN32_SYSCALLS +#undef SYSCALL_ENTRY + +#endif /* __WOW64WIN_PRIVATE_H */

1 0

← Newer
1
2
3
4
5
6
7
...
106
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021