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

Nikolay Sivov : mfplat/allocator: Handle D3D11 resource sharing mode configuration attributes.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: 600ed80b9be874b6fc469a3640c5072b575495bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=600ed80b9be874b6fc469a36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 30 11:36:45 2021 +0300 mfplat/allocator: Handle D3D11 resource sharing mode configuration attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 11 +++++++- dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 09c65b5fcf1..d99e2b046a6 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -74,6 +74,7 @@ struct sample_allocator DXGI_FORMAT dxgi_format; unsigned int usage; unsigned int bindflags; + unsigned int miscflags; unsigned int buffer_count; } frame_desc; @@ -1352,6 +1353,7 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; else if (desc.Usage == D3D11_USAGE_STAGING) desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ; + desc.MiscFlags = allocator->frame_desc.miscflags; if (SUCCEEDED(hr = ID3D11Device_CreateTexture2D(service->d3d11_device, &desc, NULL, &texture))) { @@ -1380,7 +1382,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u { struct surface_service service; DXGI_FORMAT dxgi_format; - unsigned int i; + unsigned int i, value; GUID major, subtype; UINT64 frame_size; IMFSample *sample; @@ -1415,6 +1417,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u dxgi_format = MFMapDX9FormatToDXGIFormat(subtype.Data1); allocator->frame_desc.bindflags = 0; + allocator->frame_desc.miscflags = 0; allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; if (dxgi_format == DXGI_FORMAT_B8G8R8A8_UNORM || @@ -1428,7 +1431,13 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u } if (attributes) + { IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED; + } sample_allocator_set_media_type(allocator, media_type); sample_allocator_set_attributes(allocator, attributes); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f1c041b7eb4..3e0907e41ad 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6798,6 +6798,12 @@ static void test_sample_allocator(void) D3D11_USAGE_STAGING, D3D11_USAGE_STAGING + 1, }; + static const unsigned int sharing[] = + { + D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED, + }; if (!pMFCreateVideoSampleAllocatorEx) { @@ -7155,6 +7161,67 @@ todo_wine IMFVideoSampleAllocatorEx_Release(allocatorex); } + /* MF_SA_D3D11_SHARED, MF_SA_D3D11_SHARED_WITHOUT_MUTEX */ + for (i = 0; i < ARRAY_SIZE(sharing); ++i) + { + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_SetDirectXManager(allocatorex, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_DeleteAllItems(attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_USAGE, D3D11_USAGE_DEFAULT); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); + if (sharing[i] == (D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED)) + { + todo_wine + ok(hr == E_INVALIDARG, "%u: Unexpected hr %#x.\n", i, hr); + IMFVideoSampleAllocatorEx_Release(allocatorex); + continue; + } + ok(hr == S_OK, "%u: Unexpected hr %#x.\n", i, hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.MiscFlags == sharing[i], "%u: unexpected misc flags %#x.\n", i, desc.MiscFlags); + + ID3D11Texture2D_Release(texture); + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorEx_Release(allocatorex); + } + IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager);

1 0

Jacek Caban : gdi32: Store DC brush color in DC_ATTR.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: e7abb54f430e92a559425f933b0e237ccb8294e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7abb54f430e92a559425f93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:00:45 2021 +0200 gdi32: Store DC brush color in DC_ATTR. 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/dc.c | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index bae1e9d21ab..fd4a1d3abd0 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -88,7 +88,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->rel_abs_mode = ABSOLUTE; dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); - dc->dcBrushColor = RGB( 255, 255, 255 ); + dc->attr->brush_color = RGB( 255, 255, 255 ); dc->dcPenColor = RGB( 0, 0, 0 ); dc->attr->text_color = RGB( 0, 0, 0 ); dc->brush_org.x = 0; @@ -398,7 +398,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; newdc->mapperFlags = dc->mapperFlags; @@ -470,7 +469,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->background_mode = dcs->attr->background_mode; dc->attr->background_color = dcs->attr->background_color; dc->attr->text_color = dcs->attr->text_color; - dc->dcBrushColor = dcs->dcBrushColor; + dc->attr->brush_color = dcs->attr->brush_color; dc->dcPenColor = dcs->dcPenColor; dc->brush_org = dcs->brush_org; dc->mapperFlags = dcs->mapperFlags; @@ -1479,26 +1478,6 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) return oldlayout; } -/*********************************************************************** - * GetDCBrushColor (GDI32.@) - */ -COLORREF WINAPI GetDCBrushColor(HDC hdc) -{ - DC *dc; - COLORREF dcBrushColor = CLR_INVALID; - - TRACE("hdc(%p)\n", hdc); - - dc = get_dc_ptr( hdc ); - if (dc) - { - dcBrushColor = dc->dcBrushColor; - release_dc_ptr( dc ); - } - - return dcBrushColor; -} - /*********************************************************************** * SetDCBrushColor (GDI32.@) */ @@ -1516,8 +1495,8 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) crColor = physdev->funcs->pSetDCBrushColor( physdev, crColor ); if (crColor != CLR_INVALID) { - oldClr = dc->dcBrushColor; - dc->dcBrushColor = crColor; + oldClr = dc->attr->brush_color; + dc->attr->brush_color = crColor; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 3a0ea7465a6..9d2c4022759 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -2137,7 +2137,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_ GetObjectW( hbrush, sizeof(logbrush), &logbrush ); if (hbrush == GetStockObject( DC_BRUSH )) - logbrush.lbColor = dc->dcBrushColor; + logbrush.lbColor = dc->attr->brush_color; select_brush( pdev, &pdev->brush, &logbrush, pattern, TRUE ); return hbrush; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index bbd172239cd..9e85143ce0c 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -74,6 +74,15 @@ COLORREF WINAPI GetBkColor( HDC hdc ) return dc_attr ? dc_attr->background_color : CLR_INVALID; } +/*********************************************************************** + * GetDCBrushColor (GDI32.@) + */ +COLORREF WINAPI GetDCBrushColor( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->brush_color : CLR_INVALID; +} + /*********************************************************************** * GetTextColor (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 19a5819f031..fb110409357 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -116,7 +116,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - COLORREF dcBrushColor; COLORREF dcPenColor; POINT brush_org; diff --git a/include/ntgdi.h b/include/ntgdi.h index 08df860a5e6..1f33cfe5143 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -100,6 +100,7 @@ typedef struct DC_ATTR { LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ COLORREF background_color; + COLORREF brush_color; COLORREF text_color; POINT cur_pos; INT graphics_mode;

1 0

Jacek Caban : gdi32: Store DC pen color in DC_ATTR.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: b9ffa2bf261d49cd72caf4a42855107e0ac91d29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ffa2bf261d49cd72caf4a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:00:54 2021 +0200 gdi32: Store DC pen color in DC_ATTR. 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/dc.c | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index fd4a1d3abd0..675527d4df5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -89,7 +89,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); dc->attr->brush_color = RGB( 255, 255, 255 ); - dc->dcPenColor = RGB( 0, 0, 0 ); + dc->attr->pen_color = RGB( 0, 0, 0 ); dc->attr->text_color = RGB( 0, 0, 0 ); dc->brush_org.x = 0; dc->brush_org.y = 0; @@ -398,7 +398,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; newdc->mapperFlags = dc->mapperFlags; newdc->charExtra = dc->charExtra; @@ -470,7 +469,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->background_color = dcs->attr->background_color; dc->attr->text_color = dcs->attr->text_color; dc->attr->brush_color = dcs->attr->brush_color; - dc->dcPenColor = dcs->dcPenColor; + dc->attr->pen_color = dcs->attr->pen_color; dc->brush_org = dcs->brush_org; dc->mapperFlags = dcs->mapperFlags; dc->attr->text_align = dcs->attr->text_align; @@ -1504,26 +1503,6 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) return oldClr; } -/*********************************************************************** - * GetDCPenColor (GDI32.@) - */ -COLORREF WINAPI GetDCPenColor(HDC hdc) -{ - DC *dc; - COLORREF dcPenColor = CLR_INVALID; - - TRACE("hdc(%p)\n", hdc); - - dc = get_dc_ptr( hdc ); - if (dc) - { - dcPenColor = dc->dcPenColor; - release_dc_ptr( dc ); - } - - return dcPenColor; -} - /*********************************************************************** * SetDCPenColor (GDI32.@) */ @@ -1541,8 +1520,8 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) crColor = physdev->funcs->pSetDCPenColor( physdev, crColor ); if (crColor != CLR_INVALID) { - oldClr = dc->dcPenColor; - dc->dcPenColor = crColor; + oldClr = dc->attr->pen_color; + dc->attr->pen_color = crColor; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 9d2c4022759..ce8e3572e90 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -2189,7 +2189,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern pdev->pen_width = get_pen_device_width( dc, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) - logbrush.lbColor = dc->dcPenColor; + logbrush.lbColor = dc->attr->pen_color; set_dash_pattern( &pdev->pen_pattern, 0, NULL ); select_brush( pdev, &pdev->pen_brush, &logbrush, pattern, dither ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 9e85143ce0c..be9ac3d83b9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -83,6 +83,15 @@ COLORREF WINAPI GetDCBrushColor( HDC hdc ) return dc_attr ? dc_attr->brush_color : CLR_INVALID; } +/*********************************************************************** + * GetDCPenColor (GDI32.@) + */ +COLORREF WINAPI GetDCPenColor(HDC hdc) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->pen_color : CLR_INVALID; +} + /*********************************************************************** * GetTextColor (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index fb110409357..73e6fd3d21f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -116,7 +116,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - COLORREF dcPenColor; POINT brush_org; DWORD mapperFlags; /* Font mapper flags */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 1f33cfe5143..1fffc566adc 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -101,6 +101,7 @@ typedef struct DC_ATTR LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ COLORREF background_color; COLORREF brush_color; + COLORREF pen_color; COLORREF text_color; POINT cur_pos; INT graphics_mode;

1 0

Jacek Caban : gdi32: Store miter limit in DC_ATTR.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: 06dd790c452bbf783b98380a738e1d949213ebb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06dd790c452bbf783b98380a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:05 2021 +0200 gdi32: Store miter limit in DC_ATTR. 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/dc.c | 30 +++--------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 2 +- include/ntgdi.h | 1 + 6 files changed, 17 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 675527d4df5..4a8326c647e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -79,7 +79,7 @@ static void set_initial_dc_state( DC *dc ) dc->vport_org.y = 0; dc->vport_ext.cx = 1; dc->vport_ext.cy = 1; - dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ + dc->attr->miter_limit = 10.0f; /* 10.0 is the default, from MSDN */ dc->attr->layout = 0; dc->font_code_page = CP_ACP; dc->attr->rop_mode = R2_COPYPEN; @@ -1538,30 +1538,6 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } -/******************************************************************* - * GetMiterLimit [GDI32.@] - * - * - */ -BOOL WINAPI GetMiterLimit(HDC hdc, PFLOAT peLimit) -{ - BOOL bRet = FALSE; - DC *dc; - - TRACE("(%p,%p)\n", hdc, peLimit); - - dc = get_dc_ptr( hdc ); - if (dc) - { - if (peLimit) - *peLimit = dc->miterLimit; - - release_dc_ptr( dc ); - bRet = TRUE; - } - return bRet; -} - /******************************************************************* * SetMiterLimit [GDI32.@] * @@ -1578,8 +1554,8 @@ BOOL WINAPI SetMiterLimit(HDC hdc, FLOAT eNewLimit, PFLOAT peOldLimit) if (dc) { if (peOldLimit) - *peOldLimit = dc->miterLimit; - dc->miterLimit = eNewLimit; + *peOldLimit = dc->attr->miter_limit; + dc->attr->miter_limit = eNewLimit; release_dc_ptr( dc ); bRet = TRUE; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ce8e3572e90..c5c805ff77e 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1316,7 +1316,7 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, y = a * face_1->dy - b * face_2->dy; if (((x - pt->x) * (x - pt->x) + (y - pt->y) * (y - pt->y)) * 4 > - dc->miterLimit * dc->miterLimit * pdev->pen_width * pdev->pen_width) + dc->attr->miter_limit * dc->attr->miter_limit * pdev->pen_width * pdev->pen_width) return 0; pts[0] = face_2->start; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index be9ac3d83b9..8d55d50f9a3 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -328,6 +328,17 @@ INT WINAPI SetROP2( HDC hdc, INT mode ) return ret; } +/*********************************************************************** + * GetMiterLimit (GDI32.@) + */ +BOOL WINAPI GetMiterLimit( HDC hdc, FLOAT *limit ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (limit) *limit = dc_attr->miter_limit; + return TRUE; +} + /*********************************************************************** * SetPixel (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 73e6fd3d21f..773f6aa007d 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -97,7 +97,6 @@ typedef struct tagDC RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ - FLOAT miterLimit; WCHAR display[CCHDEVICENAME]; /* Display name when created for a specific display device */ int flags; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 8a0369a82d0..634bea9bb89 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1796,7 +1796,7 @@ static struct gdi_path *PATH_WidenPath(DC *dc) alpha = atan2( yb - yo, xb - xo ) - theta; if (alpha > 0) alpha -= M_PI; else alpha += M_PI; - if(_joint == PS_JOIN_MITER && dc->miterLimit < fabs(1 / sin(alpha/2))) { + if(_joint == PS_JOIN_MITER && dc->attr->miter_limit < fabs(1 / sin(alpha/2))) { _joint = PS_JOIN_BEVEL; } if(alpha > 0) { diff --git a/include/ntgdi.h b/include/ntgdi.h index 1fffc566adc..22d1f9da187 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -114,6 +114,7 @@ typedef struct DC_ATTR WORD rel_abs_mode; WORD stretch_blt_mode; INT map_mode; + FLOAT miter_limit; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetMiterLimit.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: a6400cfbcb6cba86978d610ec9fdcc602eb61b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6400cfbcb6cba86978d610e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:11 2021 +0200 gdi32: Use get_dc_attr in SetMiterLimit. 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/dc.c | 24 ------------------------ dlls/gdi32/gdidc.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4a8326c647e..a0bc86d6337 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1538,30 +1538,6 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } -/******************************************************************* - * SetMiterLimit [GDI32.@] - * - * - */ -BOOL WINAPI SetMiterLimit(HDC hdc, FLOAT eNewLimit, PFLOAT peOldLimit) -{ - BOOL bRet = FALSE; - DC *dc; - - TRACE("(%p,%f,%p)\n", hdc, eNewLimit, peOldLimit); - - dc = get_dc_ptr( hdc ); - if (dc) - { - if (peOldLimit) - *peOldLimit = dc->attr->miter_limit; - dc->attr->miter_limit = eNewLimit; - release_dc_ptr( dc ); - bRet = TRUE; - } - return bRet; -} - /******************************************************************* * GdiIsMetaPrintDC [GDI32.@] */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 8d55d50f9a3..aec9ad48610 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -339,6 +339,19 @@ BOOL WINAPI GetMiterLimit( HDC hdc, FLOAT *limit ) return TRUE; } +/******************************************************************* + * SetMiterLimit (GDI32.@) + */ +BOOL WINAPI SetMiterLimit( HDC hdc, FLOAT limit, FLOAT *old_limit ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + /* FIXME: record EMFs */ + if (old_limit) *old_limit = dc_attr->miter_limit; + dc_attr->miter_limit = limit; + return TRUE; +} + /*********************************************************************** * SetPixel (GDI32.@) */

1 0

Jacek Caban : gdi32: Move more functions from dc.c.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: fa7c939d02903f3e06b6c41e571b5a623d0a64bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa7c939d02903f3e06b6c41e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:38 2021 +0200 gdi32: Move more functions from dc.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/dc.c | 132 ---------------------------------------------------- dlls/gdi32/gdidc.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 132 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a0bc86d6337..130a1ac99e1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -690,65 +690,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, } -/*********************************************************************** - * CreateDCA (GDI32.@) - */ -HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output, - const DEVMODEA *initData ) -{ - UNICODE_STRING driverW, deviceW, outputW; - DEVMODEW *initDataW; - HDC ret; - - if (driver) RtlCreateUnicodeStringFromAsciiz(&driverW, driver); - else driverW.Buffer = NULL; - - if (device) RtlCreateUnicodeStringFromAsciiz(&deviceW, device); - else deviceW.Buffer = NULL; - - if (output) RtlCreateUnicodeStringFromAsciiz(&outputW, output); - else outputW.Buffer = NULL; - - initDataW = NULL; - if (initData) - { - /* don't convert initData for DISPLAY driver, it's not used */ - if (!driverW.Buffer || wcsicmp( driverW.Buffer, L"display" )) - initDataW = GdiConvertToDevmodeW(initData); - } - - ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, initDataW ); - - RtlFreeUnicodeString(&driverW); - RtlFreeUnicodeString(&deviceW); - RtlFreeUnicodeString(&outputW); - HeapFree(GetProcessHeap(), 0, initDataW); - return ret; -} - - -/*********************************************************************** - * CreateICA (GDI32.@) - */ -HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output, - const DEVMODEA* initData ) -{ - /* Nothing special yet for ICs */ - return CreateDCA( driver, device, output, initData ); -} - - -/*********************************************************************** - * CreateICW (GDI32.@) - */ -HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, - const DEVMODEW* initData ) -{ - /* Nothing special yet for ICs */ - return CreateDCW( driver, device, output, initData ); -} - - /*********************************************************************** * CreateCompatibleDC (GDI32.@) */ @@ -864,24 +805,6 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) } -/*********************************************************************** - * ResetDCA (GDI32.@) - */ -HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) -{ - DEVMODEW *devmodeW; - HDC ret; - - if (devmode) devmodeW = GdiConvertToDevmodeW(devmode); - else devmodeW = NULL; - - ret = ResetDCW(hdc, devmodeW); - - HeapFree(GetProcessHeap(), 0, devmodeW); - return ret; -} - - /*********************************************************************** * GetDeviceCaps (GDI32.@) */ @@ -1164,18 +1087,6 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) return ret; } -/*********************************************************************** - * SetICMMode (GDI32.@) - */ -INT WINAPI SetICMMode(HDC hdc, INT iEnableICM) -{ -/*FIXME: Assume that ICM is always off, and cannot be turned on */ - if (iEnableICM == ICM_OFF) return ICM_OFF; - if (iEnableICM == ICM_ON) return 0; - if (iEnableICM == ICM_QUERY) return ICM_OFF; - return 0; -} - /*********************************************************************** * GetDeviceGammaRamp (GDI32.@) */ @@ -1528,46 +1439,3 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) return oldClr; } - -/*********************************************************************** - * CancelDC (GDI32.@) - */ -BOOL WINAPI CancelDC(HDC hdc) -{ - FIXME("stub\n"); - return TRUE; -} - -/******************************************************************* - * GdiIsMetaPrintDC [GDI32.@] - */ -BOOL WINAPI GdiIsMetaPrintDC(HDC hdc) -{ - FIXME("%p\n", hdc); - return FALSE; -} - -/******************************************************************* - * GdiIsMetaFileDC [GDI32.@] - */ -BOOL WINAPI GdiIsMetaFileDC(HDC hdc) -{ - TRACE("%p\n", hdc); - - switch( GetObjectType( hdc ) ) - { - case OBJ_METADC: - case OBJ_ENHMETADC: - return TRUE; - } - return FALSE; -} - -/******************************************************************* - * GdiIsPlayMetafileDC [GDI32.@] - */ -BOOL WINAPI GdiIsPlayMetafileDC(HDC hdc) -{ - FIXME("%p\n", hdc); - return FALSE; -} diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index aec9ad48610..42df880f718 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -21,6 +21,8 @@ */ #include "gdi_private.h" +#include "winternl.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); @@ -37,6 +39,79 @@ static DC_ATTR *get_dc_attr( HDC hdc ) return dc_attr->disabled ? NULL : dc_attr; } +/*********************************************************************** + * CreateDCA (GDI32.@) + */ +HDC WINAPI CreateDCA( const char *driver, const char *device, const char *output, + const DEVMODEA *init_data ) +{ + UNICODE_STRING driverW, deviceW, outputW; + DEVMODEW *init_dataW = NULL; + HDC ret; + + if (driver) RtlCreateUnicodeStringFromAsciiz( &driverW, driver ); + else driverW.Buffer = NULL; + + if (device) RtlCreateUnicodeStringFromAsciiz( &deviceW, device ); + else deviceW.Buffer = NULL; + + if (output) RtlCreateUnicodeStringFromAsciiz( &outputW, output ); + else outputW.Buffer = NULL; + + if (init_data) + { + /* don't convert init_data for DISPLAY driver, it's not used */ + if (!driverW.Buffer || wcsicmp( driverW.Buffer, L"display" )) + init_dataW = GdiConvertToDevmodeW( init_data ); + } + + ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, init_dataW ); + + RtlFreeUnicodeString( &driverW ); + RtlFreeUnicodeString( &deviceW ); + RtlFreeUnicodeString( &outputW ); + HeapFree( GetProcessHeap(), 0, init_dataW ); + return ret; +} + +/*********************************************************************** + * CreateICA (GDI32.@) + */ +HDC WINAPI CreateICA( const char *driver, const char *device, const char *output, + const DEVMODEA *init_data ) +{ + /* Nothing special yet for ICs */ + return CreateDCA( driver, device, output, init_data ); +} + + +/*********************************************************************** + * CreateICW (GDI32.@) + */ +HDC WINAPI CreateICW( const WCHAR *driver, const WCHAR *device, const WCHAR *output, + const DEVMODEW *init_data ) +{ + /* Nothing special yet for ICs */ + return CreateDCW( driver, device, output, init_data ); +} + +/*********************************************************************** + * ResetDCA (GDI32.@) + */ +HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) +{ + DEVMODEW *devmodeW; + HDC ret; + + if (devmode) devmodeW = GdiConvertToDevmodeW( devmode ); + else devmodeW = NULL; + + ret = ResetDCW( hdc, devmodeW ); + + HeapFree( GetProcessHeap(), 0, devmodeW ); + return ret; +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ @@ -854,3 +929,61 @@ BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT format, const PIXELFORMATDESCRIPTOR TRACE( "(%p,%d,%p)\n", hdc, format, descr ); return NtGdiSetPixelFormat( hdc, format ); } + +/*********************************************************************** + * CancelDC (GDI32.@) + */ +BOOL WINAPI CancelDC(HDC hdc) +{ + FIXME( "stub\n" ); + return TRUE; +} + +/*********************************************************************** + * SetICMMode (GDI32.@) + */ +INT WINAPI SetICMMode( HDC hdc, INT mode ) +{ + /* FIXME: Assume that ICM is always off, and cannot be turned on */ + switch (mode) + { + case ICM_OFF: return ICM_OFF; + case ICM_ON: return 0; + case ICM_QUERY: return ICM_OFF; + } + return 0; +} + +/*********************************************************************** + * GdiIsMetaPrintDC (GDI32.@) + */ +BOOL WINAPI GdiIsMetaPrintDC( HDC hdc ) +{ + FIXME( "%p\n", hdc ); + return FALSE; +} + +/*********************************************************************** + * GdiIsMetaFileDC (GDI32.@) + */ +BOOL WINAPI GdiIsMetaFileDC( HDC hdc ) +{ + TRACE( "%p\n", hdc ); + + switch (GetObjectType( hdc )) + { + case OBJ_METADC: + case OBJ_ENHMETADC: + return TRUE; + } + return FALSE; +} + +/*********************************************************************** + * GdiIsPlayMetafileDC (GDI32.@) + */ +BOOL WINAPI GdiIsPlayMetafileDC( HDC hdc ) +{ + FIXME( "%p\n", hdc ); + return FALSE; +}

1 0

Jacek Caban : gdi32: Use NtGdiSaveDC for SaveDC implementation.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: d423244c1befbe41073d19e77032505a0acade31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d423244c1befbe41073d19e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:56 2021 +0200 gdi32: Use NtGdiSaveDC for SaveDC implementation. 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/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/dc.c | 17 +++++------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 10 +++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/tests/dc.c | 5 +++++ 10 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 130a1ac99e1..6118e443a6f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -577,9 +577,9 @@ static BOOL reset_dc_state( HDC hdc ) /*********************************************************************** - * SaveDC (GDI32.@) + * NtGdiSaveDC (win32u.@) */ -INT WINAPI SaveDC( HDC hdc ) +INT WINAPI NtGdiSaveDC( HDC hdc ) { DC * dc; INT ret = 0; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 1faf777c47e..5148e03a231 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -22,19 +22,12 @@ #include <assert.h> #include "enhmfdrv/enhmetafiledrv.h" -INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) +BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSaveDC ); - INT ret = next->funcs->pSaveDC( next ); - - if (ret) - { - EMRSAVEDC emr; - emr.emr.iType = EMR_SAVEDC; - emr.emr.nSize = sizeof(emr); - EMFDRV_WriteRecord( dev, &emr.emr ); - } - return ret; + EMRSAVEDC emr; + emr.emr.iType = EMR_SAVEDC; + emr.emr.nSize = sizeof(emr); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 981cdea7887..35ff9af0e90 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -102,7 +102,6 @@ extern BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT righ extern BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 516c6c4e884..2291e22348f 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -118,7 +118,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pResetDC */ EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ - EMFDRV_SaveDC, /* pSaveDC */ + NULL, /* pSaveDC */ EMFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ EMFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 105d72b23f0..197ee8942c5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -66,6 +66,7 @@ extern BOOL METADC_Polyline( HDC hdc, const POINT *points,INT count) DECLSPEC_HI extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL METADC_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; @@ -114,6 +115,7 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 42df880f718..6dd5940d45a 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -112,6 +112,19 @@ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) return ret; } +/*********************************************************************** + * SaveDC (GDI32.@) + */ +INT WINAPI SaveDC( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SaveDC( hdc ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SaveDC( dc_attr )) return FALSE; + return NtGdiSaveDC( hdc ); +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 044e228b2bf..9513da7160c 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -20,9 +20,9 @@ #include "mfdrv/metafiledrv.h" -INT CDECL MFDRV_SaveDC( PHYSDEV dev ) +BOOL METADC_SaveDC( HDC hdc ) { - return MFDRV_MetaParam0( dev, META_SAVEDC ); + return metadc_param0( hdc, META_SAVEDC ); } BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 31a0297c9e3..70442fac20f 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -181,7 +181,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ - MFDRV_SaveDC, /* pSaveDC */ + NULL, /* pSaveDC */ MFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ MFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ @@ -613,6 +613,14 @@ BOOL metadc_param1( HDC hdc, short func, short param ) return MFDRV_MetaParam1( &dev->dev, func, param ); } +BOOL metadc_param0( HDC hdc, short func ) +{ + METAFILEDRV_PDEVICE *dev; + + if (!(dev = get_metadc_ptr( hdc ))) return FALSE; + return MFDRV_MetaParam0( &dev->dev, func ); +} + BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) { METAFILEDRV_PDEVICE *dev; diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 567b60158b2..b3104318223 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -60,6 +60,7 @@ extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; extern METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc ) DECLSPEC_HIDDEN; +extern BOOL metadc_param0( HDC hdc, short func ) DECLSPEC_HIDDEN; extern BOOL metadc_param1( HDC hdc, short func, short param ) DECLSPEC_HIDDEN; extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN; extern BOOL metadc_param4( HDC hdc, short func, short param1, short param2, @@ -95,7 +96,6 @@ extern BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD ro extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 054279bf46c..bdc8186bf76 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -234,6 +234,11 @@ static void test_savedc(void) "ret = %d\n", ret); DeleteDC(hdc); + + SetLastError(0xdeadbeef); + ret = SaveDC(ULongToHandle(0xdeadbeef)); + ok(!ret, "SaveDC returned %u\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } static void test_GdiConvertToDevmodeW(void)

1 0

Jacek Caban : gdi32: Don't use driver entry point for NtGdiSaveDC implementation.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: eefca28ed32742b9872458895531768ac2a5b556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefca28ed32742b987245889… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:02:30 2021 +0200 gdi32: Don't use driver entry point for NtGdiSaveDC implementation. 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/dc.c | 125 +++++++++++++++++++++----------------------- dlls/gdi32/dibdrv/dc.c | 2 - dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/font.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 1 - dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/gdi.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +- 14 files changed, 60 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eefca28ed32742b98724…

1 0

Jacek Caban : gdi32: Use ntgdi name for CreateCompatibleDC.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: 2a6adcdc0f805bedc7574f3dcf66d956cb304a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6adcdc0f805bedc7574f3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:02:47 2021 +0200 gdi32: Use ntgdi name for CreateCompatibleDC. 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/dc.c | 4 ++-- dlls/gdi32/dib.c | 3 ++- dlls/gdi32/enhmetafile.c | 10 +++++----- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/metafile.c | 4 ++-- include/ntgdi.h | 1 + 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4c80f1af611..7298be9e6e0 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -788,7 +788,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, hbrDst = NtGdiSelectBrush(hdcDest, GetStockObject(NULL_BRUSH)); /* make bitmap */ - hDC1 = CreateCompatibleDC(hdcDest); + hDC1 = NtGdiCreateCompatibleDC( hdcDest ); hBitmap1 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap1 = NtGdiSelectBitmap(hDC1, hBitmap1); @@ -799,7 +799,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, NtGdiSelectBrush(hDC1, hbrTmp); /* make bitmap */ - hDC2 = CreateCompatibleDC(hdcDest); + hDC2 = NtGdiCreateCompatibleDC( hdcDest ); hBitmap2 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap2 = NtGdiSelectBitmap(hDC2, hBitmap2); @@ -864,7 +864,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, oldStretchMode = GetStretchBltMode(hdcSrc); if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); - hdcWork = CreateCompatibleDC(hdcDest); + hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((GetObjectType( hdcDest ) != OBJ_MEMDC || GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) @@ -888,7 +888,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, SetBkColor(hdcWork, crTransparent); /* Create mask */ - hdcMask = CreateCompatibleDC(hdcDest); + hdcMask = NtGdiCreateCompatibleDC( hdcDest ); bmpMask = CreateCompatibleBitmap(hdcMask, widthDest, heightDest); oldMask = NtGdiSelectBitmap(hdcMask, bmpMask); if(!BitBlt(hdcMask, 0, 0, widthDest, heightDest, hdcWork, 0, 0, SRCCOPY)) { diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1d89d48d9c6..a51fac027d7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -684,9 +684,9 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, /*********************************************************************** - * CreateCompatibleDC (GDI32.@) + * NtGdiCreateCompatibleDC (win32u.@) */ -HDC WINAPI CreateCompatibleDC( HDC hdc ) +HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) { DC *dc, *origDC; HDC ret; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 432f33151d9..cf822440490 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1636,7 +1636,8 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) !desc->Pitch || desc->Pitch < get_dib_stride( desc->Width, format->bit_count ) || !desc->Height || desc->Height > UINT_MAX / desc->Pitch) return STATUS_INVALID_PARAMETER; - if (!desc->hDeviceDc || !(dc = CreateCompatibleDC( desc->hDeviceDc ))) return STATUS_INVALID_PARAMETER; + if (!desc->hDeviceDc || !(dc = NtGdiCreateCompatibleDC( desc->hDeviceDc ))) + return STATUS_INVALID_PARAMETER; if (!(bmp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*bmp) ))) goto error; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 1053a2ea104..99f692adb98 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1916,7 +1916,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( PatBlt(hdc, pBitBlt->xDest, pBitBlt->yDest, pBitBlt->cxDest, pBitBlt->cyDest, pBitBlt->dwRop); } else { /* BitBlt */ - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pBitBlt->offBmiSrc); @@ -1959,7 +1959,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( PatBlt(hdc, pStretchBlt->xDest, pStretchBlt->yDest, pStretchBlt->cxDest, pStretchBlt->cyDest, pStretchBlt->dwRop); } else { /* StretchBlt */ - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pStretchBlt->offBmiSrc); @@ -2002,7 +2002,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( if(pAlphaBlend->offBmiSrc == 0) { FIXME("EMR_ALPHABLEND: offBmiSrc == 0\n"); } else { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pAlphaBlend->offBmiSrc); void *bits; @@ -2028,7 +2028,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_MASKBLT: { const EMRMASKBLT *pMaskBlt = (const EMRMASKBLT *)mr; - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; @@ -2076,7 +2076,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_PLGBLT: { const EMRPLGBLT *pPlgBlt = (const EMRPLGBLT *)mr; - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index aef85c88d7d..6b1d0952bf2 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -44,7 +44,7 @@ @ stdcall CreateColorSpaceA(ptr) @ stdcall CreateColorSpaceW(ptr) @ stdcall CreateCompatibleBitmap(long long long) -@ stdcall CreateCompatibleDC(long) +@ stdcall CreateCompatibleDC(long) NtGdiCreateCompatibleDC @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) @ stdcall CreateDIBPatternBrush(long long) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 1b31e40bc14..b0428960b50 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -841,7 +841,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_STRETCHBLT: { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hbitmap = CreateBitmap(mr->rdParm[10], /*Width */ mr->rdParm[11], /*Height*/ mr->rdParm[13], /*Planes*/ @@ -859,7 +859,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_BITBLT: { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hbitmap = CreateBitmap(mr->rdParm[7]/*Width */, mr->rdParm[8]/*Height*/, mr->rdParm[10]/*Planes*/, diff --git a/include/ntgdi.h b/include/ntgdi.h index 22d1f9da187..94b180041c8 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -139,6 +139,7 @@ BOOL WINAPI NtGdiEndPath( HDC hdc ); HANDLE WINAPI NtGdiCreateClientObj( ULONG type ); HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3, ULONG unk4, void *data ); +HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen );

1 0

Jacek Caban : gdi32: Use NtGdiGetDeviceCaps for GetDeviceCaps implementation.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: c129d13cbd49417078878573bd5f34a0f8f7410e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c129d13cbd49417078878573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:03:15 2021 +0200 gdi32: Use NtGdiGetDeviceCaps for GetDeviceCaps implementation. 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/dc.c | 4 ++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 10 ++++++++++ dlls/gdi32/mfdrv/init.c | 8 +++++--- dlls/gdi32/tests/dc.c | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a51fac027d7..1faf83b3201 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -799,9 +799,9 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) /*********************************************************************** - * GetDeviceCaps (GDI32.@) + * NtGdiGetDeviceCaps (win32u.@) */ -INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) +INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ) { DC *dc; INT ret = 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 197ee8942c5..68d692fbab3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -53,6 +53,7 @@ extern BOOL METADC_ExtTextOut( HDC hdc, INT x, INT y, UINT flags, const RECT *re const WCHAR *str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern BOOL METADC_FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL METADC_FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; +extern INT METADC_GetDeviceCaps( HDC hdc, INT cap ); extern BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 6dd5940d45a..5dcc3be6baf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -125,6 +125,16 @@ INT WINAPI SaveDC( HDC hdc ) return NtGdiSaveDC( hdc ); } +/*********************************************************************** + * GetDeviceCaps (GDI32.@) + */ +INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) +{ + if (is_meta_dc( hdc )) return METADC_GetDeviceCaps( hdc, cap ); + if (!get_dc_attr( hdc )) return FALSE; + return NtGdiGetDeviceCaps( hdc, cap ); +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 91be4c1ef6c..73b3ce7365b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -78,12 +78,14 @@ static UINT CDECL MFDRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) /****************************************************************** - * MFDRV_GetDeviceCaps + * METADC_GetDeviceCaps * *A very simple implementation that returns DT_METAFILE */ -static INT CDECL MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) +INT METADC_GetDeviceCaps( HDC hdc, INT cap ) { + if (!get_metadc_ptr( hdc )) return 0; + switch(cap) { case TECHNOLOGY: @@ -137,7 +139,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ NULL, /* pGetCharWidthInfo */ - MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ + NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontRealizationInfo */ diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index bdc8186bf76..2e005f23f3c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -89,6 +89,11 @@ static void test_dc_values(void) attr = GetBkColor(ULongToHandle(0xdeadbeef)); ok(attr == CLR_INVALID, "attr = %x\n", attr); + SetLastError(0xdeadbeef); + attr = GetDeviceCaps(ULongToHandle(0xdeadbeef), TECHNOLOGY); + ok(!attr, "GetDeviceCaps rets %d\n", attr); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); + DeleteDC( hdc ); }

1 0