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

Nikolay Sivov : d3d10/effect: Return full pass description from ID3D10EffectPass::GetDesc().
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 671eabdf4fb697c9aa8e0ab1d29477c171259157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=671eabdf4fb697c9aa8e0ab1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 12 10:33:54 2021 +0300 d3d10/effect: Return full pass description from ID3D10EffectPass::GetDesc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 5 ++--- dlls/d3d10/tests/effect.c | 54 ++++++++++++++++++----------------------------- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 64dd9ac9312..3040cb63528 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3562,7 +3562,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); struct d3d10_effect_shader_variable *s; - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (pass == &null_pass) { @@ -3578,9 +3578,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa s = &impl_from_ID3D10EffectShaderVariable(pass->vs.pShaderVariable)->u.shader; - memset(desc, 0, sizeof(*desc)); - desc->Name = pass->name; + desc->Annotations = pass->annotation_count; desc->pIAInputSignature = (BYTE *)s->input_signature.signature; desc->IAInputSignatureSize = s->input_signature.signature_size; desc->StencilRef = pass->stencil_ref; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e19f4a0f694..e67eb188328 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4200,44 +4200,30 @@ SamplerState sampler0 {}; technique10 tech0 { pass pass0 + <string a="text";> { } }; #endif static DWORD fx_test_state_group_defaults[] = { - 0x43425844, 0x920e6905, 0x58225fcd, 0x3b65b423, - 0x67e96b6c, 0x00000001, 0x000001f4, 0x00000001, - 0x00000024, 0x30315846, 0x000001c8, 0xfeff1001, - 0x00000001, 0x00000000, 0x00000004, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x000000ec, - 0x00000000, 0x00000000, 0x00000001, 0x00000001, - 0x00000001, 0x00000001, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, - 0x736c6162, 0x73615200, 0x69726574, 0x5372657a, - 0x65746174, 0x00000d00, 0x00000200, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000400, - 0x73617200, 0x74735f74, 0x00657461, 0x74706544, - 0x65745368, 0x6c69636e, 0x74617453, 0x00440065, - 0x00020000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00030000, 0x73640000, 0x6174735f, - 0x42006574, 0x646e656c, 0x74617453, 0x007b0065, - 0x00020000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00020000, 0x6c620000, 0x5f646e65, - 0x74617473, 0x61530065, 0x656c706d, 0x61745372, - 0xae006574, 0x02000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x15000000, 0x73000000, - 0x6c706d61, 0x00307265, 0x68636574, 0x61700030, - 0x00307373, 0x00000004, 0x00000000, 0x00000000, - 0x00000000, 0xffffffff, 0x00000000, 0x00000039, - 0x0000001d, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x00000072, 0x00000056, 0x00000000, - 0xffffffff, 0x00000000, 0x00000000, 0x000000a2, - 0x00000086, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x000000d7, 0x000000bb, 0x00000000, - 0xffffffff, 0x00000000, 0x00000000, 0x000000e0, - 0x00000001, 0x00000000, 0x000000e6, 0x00000000, - 0x00000000, + 0x43425844, 0xef2bd174, 0x123794f9, 0xbea23fa0, 0x953a31dd, 0x00000001, 0x00000209, 0x00000001, + 0x00000024, 0x30315846, 0x000001dd, 0xfeff1001, 0x00000000, 0x00000000, 0x00000004, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x0000010d, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x74736152, + 0x7a697265, 0x74537265, 0x00657461, 0x00000004, 0x00000002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000004, 0x74736172, 0x6174735f, 0x44006574, 0x68747065, 0x6e657453, 0x536c6963, + 0x65746174, 0x00003b00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000300, + 0x5f736400, 0x74617473, 0x6c420065, 0x53646e65, 0x65746174, 0x00007200, 0x00000200, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x656c6200, 0x735f646e, 0x65746174, 0x6d615300, + 0x72656c70, 0x74617453, 0x00a50065, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00150000, 0x61730000, 0x656c706d, 0x74003072, 0x30686365, 0x73617000, 0x53003073, 0x6e697274, + 0x00e30067, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00610000, + 0x74786574, 0x00003000, 0x00001400, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00006900, + 0x00004d00, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00009900, 0x00007d00, 0x00000000, + 0xffffff00, 0x000000ff, 0x00000000, 0x0000ce00, 0x0000b200, 0x00000000, 0xffffff00, 0x000000ff, + 0x00000000, 0x0000d700, 0x00000100, 0x00000000, 0x0000dd00, 0x00000000, 0x00000100, 0x00010600, + 0x0000ea00, 0x00010800, 0x00000000, }; static void test_effect_state_group_defaults(void) @@ -4272,7 +4258,7 @@ static void test_effect_state_group_defaults(void) hr = effect->lpVtbl->GetDesc(effect, &effect_desc); ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); - ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", + ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); @@ -4373,7 +4359,7 @@ static void test_effect_state_group_defaults(void) hr = pass->lpVtbl->GetDesc(pass, &pass_desc); ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); - ok(!pass_desc.Annotations, "Got unexpected Annotations %#x.\n", pass_desc.Annotations); + ok(pass_desc.Annotations == 1, "Got unexpected Annotations %u.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); ok(pass_desc.StencilRef == 0, "Got unexpected StencilRef %#x.\n", pass_desc.StencilRef); ok(pass_desc.SampleMask == 0, "Got unexpected SampleMask %#x.\n", pass_desc.SampleMask);

1 0

Nikolay Sivov : d3dx9/effect: Reset output handle for next after last technique in FindNextValidTechnique().
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 60a3e0106246cb91d598a815d4fadf2791011142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60a3e0106246cb91d598a815… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 19:17:33 2021 +0200 d3dx9/effect: Reset output handle for next after last technique in FindNextValidTechnique(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/tests/effect.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 710e999f27f..22afa649db3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3816,7 +3816,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D } } - *next_technique = get_technique_handle(&effect->techniques[0]); + *next_technique = NULL; return S_FALSE; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ae6f65d52d5..d6998284271 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7892,9 +7892,9 @@ static void test_effect_find_next_valid_technique(void) D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; D3DXTECHNIQUE_DESC desc; + D3DXHANDLE tech, tech2; ID3DXEffect *effect; IDirect3D9 *d3d; - D3DXHANDLE tech; ULONG refcount; HWND window; HRESULT hr; @@ -7939,9 +7939,12 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); - hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + tech2 = tech; + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech2); ok(hr == S_FALSE, "Got result %#x.\n", hr); - hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(!tech2, "Unexpected technique handle %p.\n", tech2); + /* Test GetTechniqueDesc() with a NULL handle. */ + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech2, &desc); ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); @@ -7957,9 +7960,10 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); - hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech2); ok(hr == S_FALSE, "Got result %#x.\n", hr); - hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(!tech2, "Unexpected technique handle %p.\n", tech2); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech2, &desc); ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); @@ -7985,8 +7989,9 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); - hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech2); ok(hr == S_FALSE, "Got result %#x.\n", hr); + ok(!tech2, "Unexpected technique handle %p.\n", tech2); hr = effect->lpVtbl->FindNextValidTechnique(effect, "nope", &tech); ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);

1 0

Jacek Caban : gdi32: Use NtGdiRestoreDC for RestoreDC.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 561b25c4de1b721f18288133a89bf0318c7e61ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=561b25c4de1b721f18288133… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:37:39 2021 +0200 gdi32: Use NtGdiRestoreDC for RestoreDC. 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 | 200 ++++++++++++++++++----------------- dlls/gdi32/enhmfdrv/dc.c | 19 +--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 - dlls/gdi32/enhmfdrv/init.c | 3 +- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdidc.c | 13 +++ dlls/gdi32/mfdrv/dc.c | 4 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 125 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=561b25c4de1b721f1828…

1 0

Jacek Caban : gdi32: Rename METAFILEDRV_PDEVICE to metadc.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 851060a3a0550b0cd3804132f7d09be774675162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=851060a3a0550b0cd3804132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:37:53 2021 +0200 gdi32: Rename METAFILEDRV_PDEVICE to metadc. 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/mfdrv/graphics.c | 10 +++++----- dlls/gdi32/mfdrv/init.c | 36 ++++++++++++++++++------------------ dlls/gdi32/mfdrv/metafiledrv.h | 6 +++--- dlls/gdi32/mfdrv/objects.c | 16 ++++++++-------- 4 files changed, 34 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=851060a3a0550b0cd380…

1 0

Jacek Caban : gdi32: Avoid using MFDRV_MetaParam* helpers.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: a3368089fb45975df4e819ebb232008fd1228416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3368089fb45975df4e819eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:38:06 2021 +0200 gdi32: Avoid using MFDRV_MetaParam* helpers. 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/mfdrv/graphics.c | 14 +++++++------- dlls/gdi32/mfdrv/init.c | 13 +++++++++---- dlls/gdi32/mfdrv/metafiledrv.h | 13 +------------ dlls/gdi32/mfdrv/objects.c | 24 ++++++++++++------------ 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 933ad0c682c..248de986cee 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -340,7 +340,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) mr->rdParm[10] = rgndata->rdh.rcBound.bottom; mr->rdFunction = META_CREATEREGION; mr->rdSize = Param - (WORD *)mr; - ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2 ); + ret = metadc_record( dev->hdc, mr, mr->rdSize * 2 ); HeapFree( GetProcessHeap(), 0, mr ); HeapFree( GetProcessHeap(), 0, rgndata ); if(!ret) @@ -363,7 +363,7 @@ BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) index = MFDRV_CreateRegion( &mf->dev, hrgn ); if(index == -1) return FALSE; - return MFDRV_MetaParam1( &mf->dev, META_PAINTREGION, index ); + return metadc_param1( hdc, META_PAINTREGION, index ); } @@ -378,7 +378,7 @@ BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) index = MFDRV_CreateRegion( &mf->dev, hrgn ); if(index == -1) return FALSE; - return MFDRV_MetaParam1( &mf->dev, META_INVERTREGION, index ); + return metadc_param1( hdc, META_INVERTREGION, index ); } @@ -398,7 +398,7 @@ BOOL METADC_FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) iBrush = MFDRV_CreateBrushIndirect( &mf->dev, hbrush ); if(!iBrush) return FALSE; - return MFDRV_MetaParam2( &mf->dev, META_FILLREGION, iRgn, iBrush ); + return metadc_param2( hdc, META_FILLREGION, iRgn, iBrush ); } /********************************************************************** @@ -424,7 +424,7 @@ BOOL METADC_FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) iBrush = MFDRV_CreateBrushIndirect( &mf->dev, hbrush ); if(!iBrush) return FALSE; - return MFDRV_MetaParam4( &mf->dev, META_FRAMEREGION, iRgn, iBrush, x, y ); + return metadc_param4( hdc, META_FRAMEREGION, iRgn, iBrush, x, y ); } @@ -442,8 +442,8 @@ BOOL METADC_ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT mode ) if (!hrgn) return NULLREGION; iRgn = MFDRV_CreateRegion( &metadc->dev, hrgn ); if(iRgn == -1) return ERROR; - ret = MFDRV_MetaParam1( &metadc->dev, META_SELECTOBJECT, iRgn ) ? NULLREGION : ERROR; - MFDRV_MetaParam1( &metadc->dev, META_DELETEOBJECT, iRgn ); + ret = metadc_param1( hdc, META_SELECTOBJECT, iRgn ) ? NULLREGION : ERROR; + metadc_param1( hdc, META_DELETEOBJECT, iRgn ); MFDRV_RemoveHandle( &metadc->dev, iRgn ); return ret; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index e841f0c0fc0..345618ead08 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -378,7 +378,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) * in SDK Knowledgebase Q99334. */ - if (!MFDRV_MetaParam0(dc->physDev, META_EOF)) + if (!metadc_param0( hdc, META_EOF )) { free_dc_ptr( dc ); return 0; @@ -581,12 +581,17 @@ struct metadc *get_metadc_ptr( HDC hdc ) return metafile; } +BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, unsigned int rlen ) +{ + return MFDRV_WriteRecord( &metadc->dev, mr, rlen ); +} + BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) { - struct metadc *dev; + struct metadc *metadc; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_WriteRecord( &dev->dev, mr, rlen ); + if (!(metadc = get_metadc_ptr( hdc ))) return FALSE; + return metadc_write_record( metadc, mr, rlen ); } BOOL metadc_param1( HDC hdc, short func, short param ) diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b986855540e..2cb8ab9a5f1 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -46,18 +46,6 @@ struct metadc #define HANDLE_LIST_INC 20 -extern BOOL MFDRV_MetaParam0(PHYSDEV dev, short func) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam1(PHYSDEV dev, short func, short param1) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam2(PHYSDEV dev, short func, short param1, short param2) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam4(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam6(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, - short param6) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, - short param6, short param7, short param8) DECLSPEC_HIDDEN; -extern BOOL MFDRV_WriteRecord(PHYSDEV dev, METARECORD *mr, DWORD rlen) DECLSPEC_HIDDEN; extern UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; @@ -76,6 +64,7 @@ extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6, short param7, short param8 ) DECLSPEC_HIDDEN; extern BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) DECLSPEC_HIDDEN; +extern BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, DWORD rlen ) DECLSPEC_HIDDEN; /* Metafile driver functions */ diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 34b58ebfe52..dbbb72b67bc 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -112,7 +112,7 @@ void METADC_DeleteObject( HDC hdc, HGDIOBJ obj ) mr.rdFunction = META_DELETEOBJECT; mr.rdParm[0] = index; - MFDRV_WriteRecord( &metadc->dev, &mr, mr.rdSize*2 ); + metadc_write_record( metadc, &mr, mr.rdSize * 2 ); metadc->handles[index] = 0; metadc->cur_handles--; @@ -122,15 +122,14 @@ void METADC_DeleteObject( HDC hdc, HGDIOBJ obj ) /*********************************************************************** * MFDRV_SelectObject */ -static BOOL MFDRV_SelectObject( PHYSDEV dev, INT16 index) +static BOOL metadc_select_object( HDC hdc, INT16 index) { METARECORD mr; mr.rdSize = sizeof mr / 2; mr.rdFunction = META_SELECTOBJECT; mr.rdParm[0] = index; - - return MFDRV_WriteRecord( dev, &mr, mr.rdSize*2 ); + return metadc_record( hdc, &mr, mr.rdSize*2 ); } @@ -209,7 +208,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) FIXME("Unknown brush style %x\n", logbrush.lbStyle); return 0; } - r = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); + r = metadc_record( dev->hdc, mr, mr->rdSize * 2 ); HeapFree(GetProcessHeap(), 0, mr); if( !r ) return -1; @@ -235,7 +234,7 @@ static HBRUSH METADC_SelectBrush( HDC hdc, HBRUSH hbrush ) return 0; GDI_hdc_using_object( hbrush, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->brush; metadc->brush = hbrush; return ret; @@ -273,7 +272,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo /* Zero pad the facename buffer, so that we don't write uninitialized data to disk */ memset(font16->lfFaceName + written, 0, LF_FACESIZE - written); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * 2)) return 0; return MFDRV_AddHandle( dev, hFont ); } @@ -299,7 +298,7 @@ static HFONT METADC_SelectFont( HDC hdc, HFONT hfont ) return 0; GDI_hdc_using_object( hfont, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->font; metadc->font = hfont; return ret; @@ -316,7 +315,7 @@ static UINT16 MFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen, LOGPEN16 *logpen) mr->rdSize = (sizeof(METARECORD) + sizeof(*logpen) - 2) / 2; mr->rdFunction = META_CREATEPENINDIRECT; memcpy(&(mr->rdParm), logpen, sizeof(*logpen)); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * 2 )) return 0; return MFDRV_AddHandle( dev, hPen ); } @@ -370,7 +369,8 @@ static HPEN METADC_SelectPen( HDC hdc, HPEN hpen ) GDI_hdc_using_object( hpen, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->pen; metadc->pen = hpen; return ret; @@ -390,7 +390,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP mr->rdSize = (sizeof(METARECORD) + sizeofPalette - sizeof(WORD)) / sizeof(WORD); mr->rdFunction = META_CREATEPALETTE; memcpy(&(mr->rdParm), logPalette, sizeofPalette); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * sizeof(WORD)))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * sizeof(WORD) )) { HeapFree(GetProcessHeap(), 0, mr); return FALSE; @@ -403,7 +403,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP else { *(mr->rdParm) = index; - ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * sizeof(WORD)); + ret = metadc_record( dev->hdc, mr, mr->rdSize * sizeof(WORD) ); } HeapFree(GetProcessHeap(), 0, mr); return ret;

1 0

Jacek Caban : gdi32: Don't use PHYSDEV for metafile helpers.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 22e40449e117e31dfdcff3d8c78c86a33054f1ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e40449e117e31dfdcff3d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:38:21 2021 +0200 gdi32: Don't use PHYSDEV for metafile helpers. 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/mfdrv/graphics.c | 27 ++++++----- dlls/gdi32/mfdrv/metafiledrv.h | 6 +-- dlls/gdi32/mfdrv/objects.c | 102 ++++++++++++++++++++--------------------- 3 files changed, 65 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22e40449e117e31dfdcf…

1 0

Jacek Caban : gdi32: Remove no longer needed metafile helpers.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 728f96bf8ac8fc44fa234a65c5e0b0122c8840b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=728f96bf8ac8fc44fa234a65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:38:50 2021 +0200 gdi32: Remove no longer needed metafile helpers. 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/mfdrv/init.c | 236 ++++++++++++++---------------------------------- 1 file changed, 67 insertions(+), 169 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 345618ead08..356319f36eb 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -427,165 +427,34 @@ HMETAFILE WINAPI CloseMetaFile(HDC hdc) } -/****************************************************************** - * MFDRV_WriteRecord - * - * Warning: this function can change the pointer to the metafile header. - */ -BOOL MFDRV_WriteRecord( PHYSDEV dev, METARECORD *mr, DWORD rlen) +struct metadc *get_metadc_ptr( HDC hdc ) +{ + struct metadc *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC ); + if (!metafile) SetLastError( ERROR_INVALID_HANDLE ); + return metafile; +} + +BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, unsigned int rlen ) { DWORD len, size; METAHEADER *mh; - struct metadc *physDev = (struct metadc *)dev; - len = physDev->mh->mtSize * 2 + rlen; - /* reallocate memory if needed */ - size = HeapSize( GetProcessHeap(), 0, physDev->mh ); + len = metadc->mh->mtSize * sizeof(WORD) + rlen; + size = HeapSize( GetProcessHeap(), 0, metadc->mh ); if (len > size) { - /*expand size*/ - size += size / 2 + rlen; - mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); + size += size / sizeof(WORD) + rlen; + mh = HeapReAlloc( GetProcessHeap(), 0, metadc->mh, size ); if (!mh) return FALSE; - physDev->mh = mh; - TRACE("Reallocated metafile: new size is %d\n",size); + metadc->mh = mh; } - memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen); + memcpy( (WORD *)metadc->mh + metadc->mh->mtSize, mr, rlen ); - physDev->mh->mtSize += rlen / 2; - physDev->mh->mtMaxRecord = max(physDev->mh->mtMaxRecord, rlen / 2); + metadc->mh->mtSize += rlen / sizeof(WORD); + metadc->mh->mtMaxRecord = max( metadc->mh->mtMaxRecord, rlen / sizeof(WORD) ); return TRUE; } - -/****************************************************************** - * MFDRV_MetaParam0 - */ - -BOOL MFDRV_MetaParam0(PHYSDEV dev, short func) -{ - char buffer[8]; - METARECORD *mr = (METARECORD *)&buffer; - - mr->rdSize = 3; - mr->rdFunction = func; - return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); -} - - -/****************************************************************** - * MFDRV_MetaParam1 - */ -BOOL MFDRV_MetaParam1(PHYSDEV dev, short func, short param1) -{ - char buffer[8]; - METARECORD *mr = (METARECORD *)&buffer; - WORD *params = mr->rdParm; - - mr->rdSize = 4; - mr->rdFunction = func; - params[0] = param1; - return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); -} - - -/****************************************************************** - * MFDRV_MetaParam2 - */ -BOOL MFDRV_MetaParam2(PHYSDEV dev, short func, short param1, short param2) -{ - char buffer[10]; - METARECORD *mr = (METARECORD *)&buffer; - WORD *params = mr->rdParm; - - mr->rdSize = 5; - mr->rdFunction = func; - params[0] = param2; - params[1] = param1; - return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); -} - - -/****************************************************************** - * MFDRV_MetaParam4 - */ - -BOOL MFDRV_MetaParam4(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4) -{ - char buffer[14]; - METARECORD *mr = (METARECORD *)&buffer; - WORD *params = mr->rdParm; - - mr->rdSize = 7; - mr->rdFunction = func; - params[0] = param4; - params[1] = param3; - params[2] = param2; - params[3] = param1; - return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); -} - - -/****************************************************************** - * MFDRV_MetaParam6 - */ - -BOOL MFDRV_MetaParam6(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, short param6) -{ - char buffer[18]; - METARECORD *mr = (METARECORD *)&buffer; - WORD *params = mr->rdParm; - - mr->rdSize = 9; - mr->rdFunction = func; - params[0] = param6; - params[1] = param5; - params[2] = param4; - params[3] = param3; - params[4] = param2; - params[5] = param1; - return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); -} - - -/****************************************************************** - * MFDRV_MetaParam8 - */ -BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, - short param6, short param7, short param8) -{ - char buffer[22]; - METARECORD *mr = (METARECORD *)&buffer; - WORD *params = mr->rdParm; - - mr->rdSize = 11; - mr->rdFunction = func; - params[0] = param8; - params[1] = param7; - params[2] = param6; - params[3] = param5; - params[4] = param4; - params[5] = param3; - params[6] = param2; - params[7] = param1; - return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); -} - -struct metadc *get_metadc_ptr( HDC hdc ) -{ - struct metadc *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC ); - if (!metafile) SetLastError( ERROR_INVALID_HANDLE ); - return metafile; -} - -BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, unsigned int rlen ) -{ - return MFDRV_WriteRecord( &metadc->dev, mr, rlen ); -} - BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) { struct metadc *metadc; @@ -594,37 +463,50 @@ BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) return metadc_write_record( metadc, mr, rlen ); } -BOOL metadc_param1( HDC hdc, short func, short param ) +BOOL metadc_param0( HDC hdc, short func ) { - struct metadc *dev; + METARECORD mr; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_MetaParam1( &dev->dev, func, param ); + mr.rdSize = FIELD_OFFSET(METARECORD, rdParm[0]) / sizeof(WORD); + mr.rdFunction = func; + return metadc_record( hdc, &mr, mr.rdSize * sizeof(WORD) ); } -BOOL metadc_param0( HDC hdc, short func ) +BOOL metadc_param1( HDC hdc, short func, short param ) { - struct metadc *dev; + METARECORD mr; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_MetaParam0( &dev->dev, func ); + mr.rdSize = sizeof(mr) / sizeof(WORD); + mr.rdFunction = func; + mr.rdParm[0] = param; + return metadc_record( hdc, &mr, mr.rdSize * sizeof(WORD) ); } BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) { - struct metadc *dev; + char buffer[FIELD_OFFSET(METARECORD, rdParm[2])]; + METARECORD *mr = (METARECORD *)&buffer; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_MetaParam2( &dev->dev, func, param1, param2 ); + mr->rdSize = sizeof(buffer) / sizeof(WORD); + mr->rdFunction = func; + mr->rdParm[0] = param2; + mr->rdParm[1] = param1; + return metadc_record( hdc, mr, sizeof(buffer) ); } BOOL metadc_param4( HDC hdc, short func, short param1, short param2, short param3, short param4 ) { - struct metadc *dev; + char buffer[FIELD_OFFSET(METARECORD, rdParm[4])]; + METARECORD *mr = (METARECORD *)&buffer; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_MetaParam4( &dev->dev, func, param1, param2, param3, param4 ); + mr->rdSize = sizeof(buffer) / sizeof(WORD); + mr->rdFunction = func; + mr->rdParm[0] = param4; + mr->rdParm[1] = param3; + mr->rdParm[2] = param2; + mr->rdParm[3] = param1; + return metadc_record( hdc, mr, sizeof(buffer) ); } BOOL metadc_param5( HDC hdc, short func, short param1, short param2, @@ -647,20 +529,36 @@ BOOL metadc_param6( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6 ) { - struct metadc *dev; + char buffer[FIELD_OFFSET(METARECORD, rdParm[6])]; + METARECORD *mr = (METARECORD *)&buffer; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_MetaParam6( &dev->dev, func, param1, param2, param3, - param4, param5, param6 ); + mr->rdSize = sizeof(buffer) / sizeof(WORD); + mr->rdFunction = func; + mr->rdParm[0] = param6; + mr->rdParm[1] = param5; + mr->rdParm[2] = param4; + mr->rdParm[3] = param3; + mr->rdParm[4] = param2; + mr->rdParm[5] = param1; + return metadc_record( hdc, mr, sizeof(buffer) ); } BOOL metadc_param8( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6, short param7, short param8) { - struct metadc *dev; + char buffer[FIELD_OFFSET(METARECORD, rdParm[8])]; + METARECORD *mr = (METARECORD *)&buffer; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_MetaParam8( &dev->dev, func, param1, param2, param3, - param4, param5, param6, param7, param8 ); + mr->rdSize = sizeof(buffer) / sizeof(WORD); + mr->rdFunction = func; + mr->rdParm[0] = param8; + mr->rdParm[1] = param7; + mr->rdParm[2] = param6; + mr->rdParm[3] = param5; + mr->rdParm[4] = param4; + mr->rdParm[5] = param3; + mr->rdParm[6] = param2; + mr->rdParm[7] = param1; + return metadc_record( hdc, mr, sizeof(buffer) ); }

1 0

Jacek Caban : gdi32: Use NtGdiCreateClientObj for CreateMetaFile.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 6167fd3290cdbf9f8c1aa93e4697e09fa15e4681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6167fd3290cdbf9f8c1aa93e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:39:33 2021 +0200 gdi32: Use NtGdiCreateClientObj for CreateMetaFile. Instead of alloc_dc_ptr. Metafile DCs are not real DCs. 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 | 3 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/dc.c | 60 ------- dlls/gdi32/mfdrv/graphics.c | 39 ----- dlls/gdi32/mfdrv/init.c | 347 ++++++++++------------------------------- dlls/gdi32/mfdrv/metafiledrv.h | 23 +-- dlls/gdi32/objects.c | 2 + dlls/gdi32/tests/metafile.c | 2 - 8 files changed, 88 insertions(+), 389 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6167fd3290cdbf9f8c1a…

1 0

Jacek Caban : gdi32: Directly handle EMFs in GdiComment.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 2ef5b9720f9867371a5dcc6069d819cc93e3929d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef5b9720f9867371a5dcc60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:39:46 2021 +0200 gdi32: Directly handle EMFs in GdiComment. 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/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 11 +++++++---- dlls/gdi32/gdiobj.c | 19 ------------------- 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 3e24af9f0da..fb108c15be5 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -73,7 +73,6 @@ extern BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, const BYTE *buffer ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index bdae8005e90..4bd9d831a53 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -66,7 +66,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_FlattenPath, /* pFlattenPath */ NULL, /* pFontIsLinked */ EMFDRV_FrameRgn, /* pFrameRgn */ - EMFDRV_GdiComment, /* pGdiComment */ + NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 14632dc7b23..1e2cb52dc6a 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -510,15 +510,18 @@ COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? color : CLR_INVALID; } -/****************************************************************** - * EMFDRV_GdiComment +/******************************************************************* + * GdiComment (GDI32.@) */ -BOOL CDECL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, const BYTE *buffer) +BOOL WINAPI GdiComment( HDC hdc, UINT bytes, const BYTE *buffer ) { + DC_ATTR *dc_attr; EMRGDICOMMENT *emr; UINT total, rounded_size; BOOL ret; + if (!(dc_attr = get_dc_attr( hdc )) || !dc_attr->emf) return FALSE; + rounded_size = (bytes+3) & ~3; total = offsetof(EMRGDICOMMENT,Data) + rounded_size; @@ -529,7 +532,7 @@ BOOL CDECL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, const BYTE *buffer) memset(&emr->Data[bytes], 0, rounded_size - bytes); memcpy(&emr->Data[0], buffer, bytes); - ret = EMFDRV_WriteRecord( dev, &emr->emr ); + ret = EMFDRV_WriteRecord( dc_attr->emf, &emr->emr ); HeapFree(GetProcessHeap(), 0, emr); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 8435c009716..da428d149ce 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1217,25 +1217,6 @@ BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) return FALSE; } -/******************************************************************* - * GdiComment [GDI32.@] - * - * - */ -BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) -{ - DC *dc = get_dc_ptr(hdc); - BOOL ret = FALSE; - - if(dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGdiComment ); - ret = physdev->funcs->pGdiComment( physdev, cbSize, lpData ); - release_dc_ptr( dc ); - } - return ret; -} - /******************************************************************* * SetColorAdjustment [GDI32.@] *

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 3057388ff877dcf6ea18fc2355f496927bbe17e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3057388ff877dcf6ea18fc23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:39:56 2021 +0200 gdi32: Remove no longer used driver entry points. 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 | 9 --------- dlls/gdi32/dibdrv/dc.c | 4 ---- dlls/gdi32/driver.c | 7 ------- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 2 -- dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 13 files changed, 1 insertion(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3057388ff877dcf6ea18…

1 0