wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Nikolay Sivov : d3d10/effect: Store stream output declaration for inline shaders too.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: a3a2ae7d97f1b54bb21573270d7618a442ea247c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3a2ae7d97f1b54bb2157327… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 2 16:25:07 2021 +0200 d3d10/effect: Store stream output declaration for inline shaders too. 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 | 18 ++++++++++++++++-- dlls/d3d10/tests/effect.c | 4 +--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d521684f788..48df10acff5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1629,7 +1629,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, { ID3D10EffectVariable *variable = &null_variable.ID3D10EffectVariable_iface; const char *data_ptr = NULL; - DWORD offset; + DWORD offset, sodecl_offset; enum d3d10_effect_object_operation operation; HRESULT hr; struct d3d10_effect *effect = o->pass->technique->effect; @@ -1753,7 +1753,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, return E_FAIL; } - if (offset >= data_size || !require_space(offset, 1, sizeof(DWORD), data_size)) + if (offset >= data_size || !require_space(offset, 2, sizeof(DWORD), data_size)) { WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); return E_FAIL; @@ -1761,6 +1761,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, data_ptr = data + offset; read_dword(&data_ptr, &offset); TRACE("Effect object starts at offset %#x.\n", offset); + read_dword(&data_ptr, &sodecl_offset); if (FAILED(hr = parse_fx10_anonymous_shader(effect, &effect->anonymous_shaders[effect->anonymous_shader_current], o->type))) @@ -1770,6 +1771,19 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, variable = &v->ID3D10EffectVariable_iface; ++effect->anonymous_shader_current; + if (sodecl_offset) + { + TRACE("Anonymous shader stream output declaration at offset %#x.\n", sodecl_offset); + if (!fx10_copy_string(data, data_size, sodecl_offset, + &v->u.shader.stream_output_declaration)) + { + ERR("Failed to copy stream output declaration.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Stream output declaration: %s.\n", debugstr_a(v->u.shader.stream_output_declaration)); + } + switch (o->type) { case D3D10_EOT_VERTEXSHADER: diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index f59686c26a3..a9d077566e0 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3672,10 +3672,8 @@ if (0) hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); -todo_wine { - ok(shaderdesc.SODecl && !strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); -} v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v);

1 0

Nikolay Sivov : d3d10/effect: Set IsInline in GetShaderDesc().
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: ff32b78e780494172acbe4df27a0cfe787278432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff32b78e780494172acbe4df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:04:30 2021 +0300 d3d10/effect: Set IsInline in GetShaderDesc(). 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/d3d10_private.h | 1 + dlls/d3d10/effect.c | 4 +++- dlls/d3d10/tests/effect.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 64c445ec07a..4d73121d6ca 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -118,6 +118,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; char *stream_output_declaration; + unsigned int isinline : 1; }; struct d3d10_effect_state_object_variable diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 81745f7f239..d521684f788 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1409,6 +1409,7 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ v->type = t; v->effect = e; + v->u.shader.isinline = 1; set_variable_vtbl(v); if (!copy_name("$Anonymous", &v->name)) @@ -7008,7 +7009,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( D3D10_SHADER_DESC shader_desc; HRESULT hr; - FIXME("iface %p, index %u, desc %p semi-stub.\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) return hr; @@ -7017,6 +7018,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( if (s->input_signature) desc->pInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); desc->SODecl = s->stream_output_declaration; + desc->IsInline = s->isinline; if (s->bytecode) { desc->pBytecode = ID3D10Blob_GetBufferPointer(s->bytecode); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 70bcf1ea72b..f59686c26a3 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3671,8 +3671,8 @@ if (0) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine { ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); +todo_wine { ok(shaderdesc.SODecl && !strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); }

1 0

Jacek Caban : gdi32: Move GdiConvertToDevmodeW to gdidc.c.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 75d21c999e39cf5c1b3feb6e2c50cdc30a077325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75d21c999e39cf5c1b3feb6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:16:00 2021 +0200 gdi32: Move GdiConvertToDevmodeW to gdidc.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/driver.c | 52 +--------------------------------------------------- dlls/gdi32/gdidc.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 340476bca10..95d1583a98a 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -225,7 +225,7 @@ done: /*********************************************************************** - * __wine_set_display_driver (GDI32.@) + * __wine_set_display_driver (win32u.@) */ void CDECL __wine_set_display_driver( HMODULE module ) { @@ -941,56 +941,6 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) } -/*********************************************************************** - * GdiConvertToDevmodeW (GDI32.@) - */ -DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) -{ - DEVMODEW *dmW; - WORD dmW_size, dmA_size; - - dmA_size = dmA->dmSize; - - /* this is the minimal dmSize that XP accepts */ - if (dmA_size < FIELD_OFFSET(DEVMODEA, dmFields)) - return NULL; - - if (dmA_size > sizeof(DEVMODEA)) - dmA_size = sizeof(DEVMODEA); - - dmW_size = dmA_size + CCHDEVICENAME; - if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) - dmW_size += CCHFORMNAME; - - dmW = HeapAlloc(GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra); - if (!dmW) return NULL; - - MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmDeviceName, -1, - dmW->dmDeviceName, CCHDEVICENAME); - /* copy slightly more, to avoid long computations */ - memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA_size - CCHDEVICENAME); - - if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) - { - if (dmA->dmFields & DM_FORMNAME) - MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, -1, - dmW->dmFormName, CCHFORMNAME); - else - dmW->dmFormName[0] = 0; - - if (dmA_size > FIELD_OFFSET(DEVMODEA, dmLogPixels)) - memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA_size - FIELD_OFFSET(DEVMODEA, dmLogPixels)); - } - - if (dmA->dmDriverExtra) - memcpy((char *)dmW + dmW_size, (const char *)dmA + dmA_size, dmA->dmDriverExtra); - - dmW->dmSize = dmW_size; - - return dmW; -} - - /***************************************************************************** * @ [GDI32.100] * diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 4dc0db42571..0f9c8ede8c9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -97,6 +97,55 @@ HDC WINAPI CreateICW( const WCHAR *driver, const WCHAR *device, const WCHAR *out return CreateDCW( driver, device, output, init_data ); } +/*********************************************************************** + * GdiConvertToDevmodeW (GDI32.@) + */ +DEVMODEW *WINAPI GdiConvertToDevmodeW( const DEVMODEA *dmA ) +{ + DEVMODEW *dmW; + WORD dmW_size, dmA_size; + + dmA_size = dmA->dmSize; + + /* this is the minimal dmSize that XP accepts */ + if (dmA_size < FIELD_OFFSET(DEVMODEA, dmFields)) + return NULL; + + if (dmA_size > sizeof(DEVMODEA)) + dmA_size = sizeof(DEVMODEA); + + dmW_size = dmA_size + CCHDEVICENAME; + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) + dmW_size += CCHFORMNAME; + + dmW = HeapAlloc( GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra ); + if (!dmW) return NULL; + + MultiByteToWideChar( CP_ACP, 0, (const char*) dmA->dmDeviceName, -1, + dmW->dmDeviceName, CCHDEVICENAME ); + /* copy slightly more, to avoid long computations */ + memcpy( &dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA_size - CCHDEVICENAME ); + + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) + { + if (dmA->dmFields & DM_FORMNAME) + MultiByteToWideChar( CP_ACP, 0, (const char*) dmA->dmFormName, -1, + dmW->dmFormName, CCHFORMNAME ); + else + dmW->dmFormName[0] = 0; + + if (dmA_size > FIELD_OFFSET(DEVMODEA, dmLogPixels)) + memcpy( &dmW->dmLogPixels, &dmA->dmLogPixels, dmA_size - FIELD_OFFSET(DEVMODEA, dmLogPixels) ); + } + + if (dmA->dmDriverExtra) + memcpy( (char *)dmW + dmW_size, (const char *)dmA + dmA_size, dmA->dmDriverExtra ); + + dmW->dmSize = dmW_size; + + return dmW; +} + /*********************************************************************** * DeleteDC (GDI32.@) */

1 0

Jacek Caban : gdi32: Use ntgdi interface for printer driver functions.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: ef7b2a1b8bf3cfdd29051da248fa3c2060800271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7b2a1b8bf3cfdd29051da2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:15:53 2021 +0200 gdi32: Use ntgdi interface for printer driver functions. 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/gdidc.c | 32 ++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 21 +++++++++------------ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f50b10dd3c7..4dc0db42571 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1888,6 +1888,38 @@ INT WINAPI StartDocA( HDC hdc, const DOCINFOA *doc ) return ret; } +/*********************************************************************** + * StartPage (GDI32.@) + */ +INT WINAPI StartPage( HDC hdc ) +{ + return NtGdiStartPage( hdc ); +} + +/*********************************************************************** + * EndPage (GDI32.@) + */ +INT WINAPI EndPage( HDC hdc ) +{ + return NtGdiEndPage( hdc ); +} + +/*********************************************************************** + * EndDoc (GDI32.@) + */ +INT WINAPI EndDoc( HDC hdc ) +{ + return NtGdiEndDoc( hdc ); +} + +/*********************************************************************** + * AbortDoc (GDI32.@) + */ +INT WINAPI AbortDoc( HDC hdc ) +{ + return NtGdiAbortDoc( hdc ); +} + /********************************************************************** * SetAbortProc (GDI32.@) */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 19f23ccbc12..9a4ad3b5c23 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -81,10 +81,9 @@ INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ) /****************************************************************** - * EndDoc [GDI32.@] - * + * NtGdiEndDoc (win32u.@) */ -INT WINAPI EndDoc(HDC hdc) +INT WINAPI NtGdiEndDoc( HDC hdc ) { INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); @@ -100,10 +99,9 @@ INT WINAPI EndDoc(HDC hdc) /****************************************************************** - * StartPage [GDI32.@] - * + * NtGdiStartPage (win32u.@) */ -INT WINAPI StartPage(HDC hdc) +INT WINAPI NtGdiStartPage( HDC hdc ) { INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); @@ -119,10 +117,9 @@ INT WINAPI StartPage(HDC hdc) /****************************************************************** - * EndPage [GDI32.@] - * + * NtGdiEndPage (win32u.@) */ -INT WINAPI EndPage(HDC hdc) +INT WINAPI NtGdiEndPage( HDC hdc ) { INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); @@ -137,10 +134,10 @@ INT WINAPI EndPage(HDC hdc) } -/****************************************************************************** - * AbortDoc [GDI32.@] +/*********************************************************************** + * NtGdiAbortDoc (win32u.@) */ -INT WINAPI AbortDoc(HDC hdc) +INT WINAPI NtGdiAbortDoc( HDC hdc ) { INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc );

1 0

Jacek Caban : gdi32: Use NtGdiStartDoc for StartDoc.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 800cde3cf4bffa3a2909e5ae00326db6eb1b42b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=800cde3cf4bffa3a2909e5ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:38 2021 +0200 gdi32: Use NtGdiStartDoc for StartDoc. 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/gdidc.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 55 ++---------------------------------------- include/ntgdi.h | 2 +- 3 files changed, 70 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0f01e28696d..f50b10dd3c7 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -23,6 +23,7 @@ #include "gdi_private.h" #include "winternl.h" #include "ddrawgdi.h" +#include "winnls.h" #include "wine/debug.h" @@ -1821,6 +1822,72 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } +/*********************************************************************** + * StartDocW [GDI32.@] + * + * StartDoc calls the STARTDOC Escape with the input data pointing to DocName + * and the output data (which is used as a second input parameter).pointing at + * the whole docinfo structure. This seems to be an undocumented feature of + * the STARTDOC Escape. + * + * Note: we now do it the other way, with the STARTDOC Escape calling StartDoc. + */ +INT WINAPI StartDocW( HDC hdc, const DOCINFOW *doc ) +{ + DC_ATTR *dc_attr; + + TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n", + debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), + debugstr_w(doc->lpszDatatype), doc->fwType); + + if (!(dc_attr = get_dc_attr( hdc ))) return SP_ERROR; + + if (dc_attr->abort_proc && !dc_attr->abort_proc( hdc, 0 )) return 0; + return NtGdiStartDoc( hdc, doc, NULL, 0 ); +} + +/*********************************************************************** + * StartDocA [GDI32.@] + */ +INT WINAPI StartDocA( HDC hdc, const DOCINFOA *doc ) +{ + WCHAR *doc_name = NULL, *output = NULL, *data_type = NULL; + DOCINFOW docW; + INT ret, len; + + docW.cbSize = doc->cbSize; + if (doc->lpszDocName) + { + len = MultiByteToWideChar( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0 ); + doc_name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, doc->lpszDocName, -1, doc_name, len ); + } + if (doc->lpszOutput) + { + len = MultiByteToWideChar( CP_ACP, 0, doc->lpszOutput, -1, NULL, 0 ); + output = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, doc->lpszOutput, -1, output, len ); + } + if (doc->lpszDatatype) + { + len = MultiByteToWideChar( CP_ACP, 0, doc->lpszDatatype, -1, NULL, 0); + data_type = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, doc->lpszDatatype, -1, data_type, len ); + } + + docW.lpszDocName = doc_name; + docW.lpszOutput = output; + docW.lpszDatatype = data_type; + docW.fwType = doc->fwType; + + ret = StartDocW(hdc, &docW); + + HeapFree( GetProcessHeap(), 0, doc_name ); + HeapFree( GetProcessHeap(), 0, output ); + HeapFree( GetProcessHeap(), 0, data_type ); + return ret; +} + /********************************************************************** * SetAbortProc (GDI32.@) */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index ee8ae295daf..19f23ccbc12 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -56,16 +56,9 @@ DWORD WINAPI NtGdiInitSpool(void) } /****************************************************************** - * StartDocW [GDI32.@] - * - * StartDoc calls the STARTDOC Escape with the input data pointing to DocName - * and the output data (which is used as a second input parameter).pointing at - * the whole docinfo structure. This seems to be an undocumented feature of - * the STARTDOC Escape. - * - * Note: we now do it the other way, with the STARTDOC Escape calling StartDoc. + * NtGdiStartDoc (win32u.@) */ -INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) +INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ) { INT ret; DC *dc = get_dc_ptr( hdc ); @@ -86,50 +79,6 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) return ret; } -/************************************************************************* - * StartDocA [GDI32.@] - * - */ -INT WINAPI StartDocA(HDC hdc, const DOCINFOA* doc) -{ - LPWSTR szDocName = NULL, szOutput = NULL, szDatatype = NULL; - DOCINFOW docW; - INT ret, len; - - docW.cbSize = doc->cbSize; - if (doc->lpszDocName) - { - len = MultiByteToWideChar(CP_ACP,0,doc->lpszDocName,-1,NULL,0); - szDocName = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP,0,doc->lpszDocName,-1,szDocName,len); - } - if (doc->lpszOutput) - { - len = MultiByteToWideChar(CP_ACP,0,doc->lpszOutput,-1,NULL,0); - szOutput = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP,0,doc->lpszOutput,-1,szOutput,len); - } - if (doc->lpszDatatype) - { - len = MultiByteToWideChar(CP_ACP,0,doc->lpszDatatype,-1,NULL,0); - szDatatype = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP,0,doc->lpszDatatype,-1,szDatatype,len); - } - - docW.lpszDocName = szDocName; - docW.lpszOutput = szOutput; - docW.lpszDatatype = szDatatype; - docW.fwType = doc->fwType; - - ret = StartDocW(hdc, &docW); - - HeapFree( GetProcessHeap(), 0, szDocName ); - HeapFree( GetProcessHeap(), 0, szOutput ); - HeapFree( GetProcessHeap(), 0, szDatatype ); - - return ret; -} - /****************************************************************** * EndDoc [GDI32.@] diff --git a/include/ntgdi.h b/include/ntgdi.h index 8bff1d4338f..23247c09e4a 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -397,7 +397,7 @@ UINT WINAPI NtGdiSetSystemPaletteUse( HDC hdc, UINT use ); BOOL WINAPI NtGdiSetTextJustification( HDC hdc, INT extra, INT breaks ); BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size ); -INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc ); +INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ); INT WINAPI NtGdiStartPage( HDC hdc ); BOOL WINAPI NtGdiStretchBlt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src,

1 0

Jacek Caban : gdi32: Store abort proc in DC_ATTR.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 711ce415c01a5e36bde6bb147b5aa3cedc8b35ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=711ce415c01a5e36bde6bb14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:25 2021 +0200 gdi32: Store abort proc 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/gdidc.c | 12 ++++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/printdrv.c | 17 +---------------- include/ntgdi.h | 1 + 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f175d8f59bc..0f01e28696d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1821,6 +1821,18 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } +/********************************************************************** + * SetAbortProc (GDI32.@) + */ +INT WINAPI SetAbortProc( HDC hdc, ABORTPROC abrtprc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + dc_attr->abort_proc = abrtprc; + return TRUE; +} + /*********************************************************************** * SetICMMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 6701385784f..c2e45ab7ce0 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -101,7 +101,6 @@ typedef struct tagDC INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ - ABORTPROC pAbortProc; /* AbortProc for Printing */ XFORM xformWorld2Wnd; /* World-to-window transformation */ XFORM xformWorld2Vport; /* World-to-viewport transformation */ XFORM xformVport2World; /* Inverse of the above transformation */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index c4fcf8ada13..ee8ae295daf 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -76,7 +76,7 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; - if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) ret = 0; + if (dc->attr->abort_proc && !dc->attr->abort_proc( hdc, 0 )) ret = 0; else { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartDoc ); @@ -204,18 +204,3 @@ INT WINAPI AbortDoc(HDC hdc) } return ret; } - - -/********************************************************************** - * SetAbortProc (GDI32.@) - * - */ -INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc) -{ - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - dc->pAbortProc = abrtprc; - release_dc_ptr( dc ); - return TRUE; -} diff --git a/include/ntgdi.h b/include/ntgdi.h index 061ed40779c..8bff1d4338f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -169,6 +169,7 @@ typedef struct DC_ATTR UINT font_code_page; RECTL emf_bounds; void *emf; + ABORTPROC abort_proc; /* AbortProc for printing */ } DC_ATTR; struct font_enum_entry

1 0

Jacek Caban : gdi32: Use ntgdi names for spool functions.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 02d2bc944db2e5132e11a9ffdcad5f3f497b03fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d2bc944db2e5132e11a9ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:16 2021 +0200 gdi32: Use ntgdi names for spool functions. 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/gdi32.spec | 4 ++-- dlls/gdi32/printdrv.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 569468bc3c1..da37f8ba643 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -203,9 +203,9 @@ # @ stub GdiGetPageCount # @ stub GdiGetPageHandle # @ stub GdiGetSpoolFileHandle -@ stdcall GdiGetSpoolMessage(ptr long ptr long) +@ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) -@ stdcall GdiInitSpool() +@ stdcall GdiInitSpool() NtGdiInitSpool @ stdcall GdiInitializeLanguagePack(long) @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index d9595ff7abf..c4fcf8ada13 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -35,10 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(print); /****************************************************************** - * GdiGetSpoolMessage [GDI32.@] - * + * NtGdiGetSpoolMessage (win32u.@) */ -DWORD WINAPI GdiGetSpoolMessage(LPVOID ptr1, DWORD data2, LPVOID ptr3, DWORD data4) +DWORD WINAPI NtGdiGetSpoolMessage( void *ptr1, DWORD data2, void *ptr3, DWORD data4 ) { TRACE("(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4); /* avoid 100% cpu usage with spoolsv.exe from w2k @@ -48,10 +47,9 @@ DWORD WINAPI GdiGetSpoolMessage(LPVOID ptr1, DWORD data2, LPVOID ptr3, DWORD dat } /****************************************************************** - * GdiInitSpool [GDI32.@] - * + * NtGdiInitSpool (win32u.@) */ -DWORD WINAPI GdiInitSpool(void) +DWORD WINAPI NtGdiInitSpool(void) { FIXME("stub\n"); return TRUE;

1 0

Jacek Caban : gdi32: Use NtGdiGetRandomRgn for GetMetaRgn.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: b096da8a50210cb437376a2d65374e310d53eeff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b096da8a50210cb437376a2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:08 2021 +0200 gdi32: Use NtGdiGetRandomRgn for GetMetaRgn. 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/clipping.c | 26 ++------------------------ dlls/gdi32/gdidc.c | 8 ++++++++ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 4f22e6f3cde..02247f03620 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -392,28 +392,6 @@ INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ) } -/*********************************************************************** - * GetMetaRgn (GDI32.@) - */ -INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - if (dc->hMetaRgn && NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ) != ERROR) - { - ret = 1; - if (dc->attr->layout & LAYOUT_RTL) - mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiGetRandomRgn (win32u.@) * @@ -442,8 +420,8 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) else if (!NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY )) ret = -1; break; case 2: - if (dc->hMetaRgn) NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); - else ret = 0; + if (!dc->hMetaRgn) ret = 0; + else if (!NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY )) ret = -1; break; case 3: if (dc->hClipRgn && dc->hMetaRgn) NtGdiCombineRgn( hRgn, dc->hClipRgn, dc->hMetaRgn, RGN_AND ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 6f534dce061..f175d8f59bc 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1641,6 +1641,14 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN rgn ) return NtGdiGetRandomRgn( hdc, rgn, NTGDI_RGN_MIRROR_RTL | 1 ); } +/*********************************************************************** + * GetMetaRgn (GDI32.@) + */ +INT WINAPI GetMetaRgn( HDC hdc, HRGN rgn ) +{ + return NtGdiGetRandomRgn( hdc, rgn, NTGDI_RGN_MIRROR_RTL | 2 ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */

1 0

Jacek Caban : gdi32: Use NtGdiGetRandomRgn for GetClipRgn.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 8217ce0fef83a0aea3c658489c885d9bb69a3056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8217ce0fef83a0aea3c65848… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:00 2021 +0200 gdi32: Use NtGdiGetRandomRgn for GetClipRgn. 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/clipping.c | 36 ++++++++---------------------------- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/tests/clipping.c | 7 ++++++- include/ntgdi.h | 3 +++ 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 28a314b76b9..4f22e6f3cde 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -392,31 +392,6 @@ INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ) } -/*********************************************************************** - * GetClipRgn (GDI32.@) - */ -INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) -{ - INT ret = -1; - DC * dc; - if ((dc = get_dc_ptr( hdc ))) - { - if( dc->hClipRgn ) - { - if (NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ) != ERROR) - { - ret = 1; - if (dc->attr->layout & LAYOUT_RTL) - mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); - } - } - else ret = 0; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetMetaRgn (GDI32.@) */ @@ -460,11 +435,11 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) if (!dc) return -1; - switch (iCode) + switch (iCode & ~NTGDI_RGN_MIRROR_RTL) { case 1: - if (dc->hClipRgn) NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ); - else ret = 0; + if (!dc->hClipRgn) ret = 0; + else if (!NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY )) ret = -1; break; case 2: if (dc->hMetaRgn) NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); @@ -496,6 +471,11 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) ret = -1; break; } + + /* Wine extension */ + if (ret > 0 && (iCode & NTGDI_RGN_MIRROR_RTL) && (dc->attr->layout & LAYOUT_RTL)) + mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); + release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0be21c75d58..6f534dce061 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1633,6 +1633,14 @@ BOOL WINAPI SelectClipPath( HDC hdc, INT mode ) return NtGdiSelectClipPath( hdc, mode ); } +/*********************************************************************** + * GetClipRgn (GDI32.@) + */ +INT WINAPI GetClipRgn( HDC hdc, HRGN rgn ) +{ + return NtGdiGetRandomRgn( hdc, rgn, NTGDI_RGN_MIRROR_RTL | 1 ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 484430b0cb9..37a96de2bb4 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -42,6 +42,8 @@ static void test_GetRandomRgn(void) ret = GetRandomRgn(hdc, hrgn, 1); ok(ret == 0, "GetRandomRgn rets %d\n", ret); + ret = GetRandomRgn(hdc, NULL, 1); + ok(ret == 0, "GetRandomRgn rets %d\n", ret); ret = GetRandomRgn(hdc, hrgn, 2); ok(ret == 0, "GetRandomRgn rets %d\n", ret); ret = GetRandomRgn(hdc, hrgn, 3); @@ -84,10 +86,13 @@ static void test_GetRandomRgn(void) IntersectClipRect(hdc, rc2.left, rc2.top, rc2.right, rc2.bottom); ret = GetRandomRgn(hdc, hrgn, 1); - ok(ret != 0, "GetRandomRgn rets %d\n", ret); + ok(ret > 0, "GetRandomRgn rets %d\n", ret); GetRgnBox(hrgn, &ret_rc); ok(EqualRect(&rc2, &ret_rc), "GetRandomRgn %s\n", wine_dbgstr_rect(&ret_rc)); + ret = GetRandomRgn(hdc, NULL, 1); + ok(ret == -1, "GetRandomRgn rets %d\n", ret); + ret = GetRandomRgn(hdc, hrgn, 2); ok(ret != 0, "GetRandomRgn rets %d\n", ret); GetRgnBox(hrgn, &ret_rc); diff --git a/include/ntgdi.h b/include/ntgdi.h index 00783975e18..061ed40779c 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -178,6 +178,9 @@ struct font_enum_entry NEWTEXTMETRICEXW tm; }; +/* flag for NtGdiGetRandomRgn to respect LAYOUT_RTL */ +#define NTGDI_RGN_MIRROR_RTL 0x80000000 + #endif /* __WINESRC__ */ struct font_realization_info

1 0

Jacek Caban : gdi32: Move GdiDllInitialize to objects.c.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: f95687c510e177d3c2b368e0181e9209aa2ac381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95687c510e177d3c2b368e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:12:32 2021 +0200 gdi32: Move GdiDllInitialize 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 | 12 ------------ dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 1294401f15b..ff3dd9807c2 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -685,18 +685,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -/*********************************************************************** - * GdiDllInitialize - * - * Stub entry point, some games (CoD: Black Ops 3) call it directly. - */ -BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - FIXME("stub\n"); - return TRUE; -} - - static const char *gdi_obj_type( unsigned type ) { switch ( type ) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 5bc14090feb..96ab3271034 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -1059,3 +1059,14 @@ BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end, } return TRUE; } + +/*********************************************************************** + * GdiDllInitialize (GDI32.@) + * + * Stub entry point, some games (CoD: Black Ops 3) call it directly. + */ +BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + FIXME( "stub\n" ); + return TRUE; +}

1 0

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 September 2021