September 2021 - Wine-Commits

Eric Pouech : dbghelp: Don't call assert() on missing subprogram dwarf's information.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 0b84fa05a1dca78a8cb7734ac1bb4890ac468865 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b84fa05a1dca78a8cb7734a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:50 2021 +0200 dbghelp: Don't call assert() on missing subprogram dwarf's information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ee73abdf378..2f8a18cae8d 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1602,10 +1602,10 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, /* either a pmt/variable relative to frame pointer or * pmt/variable in a register */ - assert(subpgm->func); - symt_add_func_local(subpgm->ctx->module, subpgm->func, - is_pmt ? DataIsParam : DataIsLocal, - &loc, block, param_type, name.u.string); + if (subpgm->func) + symt_add_func_local(subpgm->ctx->module, subpgm->func, + is_pmt ? DataIsParam : DataIsLocal, + &loc, block, param_type, name.u.string); break; } }

1 0

Eric Pouech : dbghelp: Harden inspection of Dwarf line number information.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: ebff1e8c9bf66411b29e05b457eb512155283c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebff1e8c9bf66411b29e05b4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:56 2021 +0200 dbghelp: Harden inspection of Dwarf line number information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 7 ++++--- dlls/dbghelp/source.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2f8a18cae8d..0479f7c7401 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2190,6 +2190,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, p = vector_add(&dirs, &ctx->pool); *p = compile_dir ? compile_dir : "."; while (*traverse.data) + while (traverse.data < traverse.end_data && *traverse.data) { const char* rel = (const char*)traverse.data; unsigned rellen = strlen(rel); @@ -2205,7 +2206,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, unsigned baselen = strlen(compile_dir); char* tmp = pool_alloc(&ctx->pool, baselen + 1 + rellen + 1); strcpy(tmp, compile_dir); - if (tmp[baselen - 1] != '/') tmp[baselen++] = '/'; + if (baselen && tmp[baselen - 1] != '/') tmp[baselen++] = '/'; strcpy(&tmp[baselen], rel); *p = tmp; } @@ -2214,7 +2215,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, traverse.data++; vector_init(&files, sizeof(unsigned), 16); - while (*traverse.data) + while (traverse.data < traverse.end_data && *traverse.data) { unsigned int dir_index, mod_time; const char* name; @@ -2233,7 +2234,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, } traverse.data++; - while (traverse.data < traverse.end_data) + while (traverse.data < traverse.end_data && *traverse.data) { ULONG_PTR address = 0; unsigned file = 1; diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 1844eec7838..a78e62a8661 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -78,7 +78,7 @@ unsigned source_new(struct module* module, const char* base, const char* name) if (!tmp) return ret; full = tmp; strcpy(tmp, base); - if (tmp[bsz - 1] != '/') tmp[bsz++] = '/'; + if (bsz && tmp[bsz - 1] != '/') tmp[bsz++] = '/'; strcpy(&tmp[bsz], name); } rb_module = module;

1 0

Zebediah Figura : d3dcompiler/tests: Test including an absolute path.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 93a4c5889753264dc91257e657d819710853d220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a4c5889753264dc91257e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 12:12:48 2021 -0500 d3dcompiler/tests: Test including an absolute path. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index a950fa83d89..ad27084dce0 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -1523,7 +1523,7 @@ struct test_d3dinclude static void test_d3dcompile(void) { struct test_d3dinclude include = {{&test_d3dinclude_vtbl}}; - WCHAR filename[MAX_PATH], directory[MAX_PATH]; + WCHAR filename[MAX_PATH], directory[MAX_PATH], include_filename[MAX_PATH]; ID3D10Blob *blob = NULL, *errors = NULL; CHAR filename_a[MAX_PATH]; HRESULT hr; @@ -1542,12 +1542,20 @@ static void test_d3dcompile(void) static const char include2[] = "#include \"include1.h\"\n" "float4 light_color = LIGHT;\n"; + static const char ps_absolute_template[] = + "#include \"%ls\"\n" + "\n" + "float4 main() : COLOR\n" + "{\n" + " return light_color;\n" + "}"; + char ps_absolute_buffer[sizeof(ps_absolute_template) + MAX_PATH]; create_file(L"source.ps", ps_code, strlen(ps_code), filename); create_directory(L"include"); create_file(L"include\\include1.h", include1_wrong, strlen(include1_wrong), NULL); create_file(L"include1.h", include1, strlen(include1), NULL); - create_file(L"include\\include2.h", include2, strlen(include2), NULL); + create_file(L"include\\include2.h", include2, strlen(include2), include_filename); len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); @@ -1650,6 +1658,18 @@ static void test_d3dcompile(void) blob = NULL; } + sprintf(ps_absolute_buffer, ps_absolute_template, include_filename); + hr = ppD3DCompile(ps_absolute_buffer, sizeof(ps_absolute_buffer), filename_a, NULL, + D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + GetCurrentDirectoryW(MAX_PATH, directory); SetCurrentDirectoryW(temp_dir);

1 0

Eric Pouech : winedbg: Allow debugging a 32bit target from a 64bit winedbg.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: b99d7db835b8ed22d8b685a04c0fc0242f61c657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b99d7db835b8ed22d8b685a0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:08:19 2021 +0200 winedbg: Allow debugging a 32bit target from a 64bit winedbg. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 6b363168cd7..35b7642b733 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -657,7 +657,8 @@ int main(int argc, char** argv) dbg_init_console(); SymSetOptions((SymGetOptions() & ~(SYMOPT_UNDNAME)) | - SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS); + SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS | + SYMOPT_INCLUDE_32BIT_MODULES); if (argc && !strcmp(argv[0], "--auto")) {

1 0

Nikolay Sivov : d3d10/effect: Set IsInline in GetShaderDesc().
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

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

Nikolay Sivov : d3d10/effect: Store stream output declaration for inline shaders too.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

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

Jacek Caban : gdi32: Use ntgdi interface for printer driver functions.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

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 Sept. 2, 2021

Sept. 2, 2021

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: Move GdiConvertToDevmodeW to gdidc.c.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

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

Nikolay Sivov : d3d10/effect: Remove unnecessary early returns.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 0b3e2400aa11be6b0385740d4e976cd7a3f70db2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3e2400aa11be6b0385740d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:04:33 2021 +0300 d3d10/effect: Remove unnecessary early returns. 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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71468bd4d3c..7e583ea956b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -765,12 +765,10 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse { case D3D10_SVT_VERTEXSHADER: hr = ID3D10Device_CreateVertexShader(device, ptr, dxbc_size, &v->u.shader.shader.vs); - if (FAILED(hr)) return hr; break; case D3D10_SVT_PIXELSHADER: hr = ID3D10Device_CreatePixelShader(device, ptr, dxbc_size, &v->u.shader.shader.ps); - if (FAILED(hr)) return hr; break; case D3D10_SVT_GEOMETRYSHADER:

1 0