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

Alexandre Julliard : winegcc: Add a helper function to build the .spec.o file.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: c697ee728b60e259723730384ecf784f5f9375ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c697ee728b60e25972373038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 11:58:17 2021 +0200 winegcc: Add a helper function to build the .spec.o file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 176 ++++++++++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 79 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fd2d2c2a794..b756c5a97f8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1120,10 +1120,105 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil free(fullname); } +/* run winebuild to generate the .spec.o file */ +static const char *build_spec_obj( struct options *opts, const char *spec_file, const char *output_file, + strarray *files, strarray *lib_dirs, const char *entry_point ) +{ + unsigned int i; + int is_pe = is_pe_target( opts ); + strarray *spec_args = get_winebuild_args( opts ); + strarray *tool; + const char *spec_o_name, *output_name; + int fake_module = strendswith(output_file, ".fake"); + + /* get the filename from the path */ + if ((output_name = strrchr(output_file, '/'))) output_name++; + else output_name = output_file; + + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if (!is_pe && (tool = build_tool_name( opts, TOOL_LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + + spec_o_name = get_temp_file(output_name, ".spec.o"); + if (opts->force_pointer_size) + strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); + strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); + if (fake_module) + { + strarray_add(spec_args, "--fake-module"); + strarray_add(spec_args, "-o"); + strarray_add(spec_args, output_file); + } + else + { + strarray_add(spec_args, "-o"); + strarray_add(spec_args, spec_o_name); + } + if (spec_file) + { + strarray_add(spec_args, "-E"); + strarray_add(spec_args, spec_file); + } + + if (!opts->shared) + { + strarray_add(spec_args, "-F"); + strarray_add(spec_args, output_name); + strarray_add(spec_args, "--subsystem"); + strarray_add(spec_args, opts->gui_app ? "windows" : "console"); + if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); + } + + if (opts->target_platform == PLATFORM_WINDOWS) strarray_add(spec_args, "--safeseh"); + + if (entry_point) + { + strarray_add(spec_args, "--entry"); + strarray_add(spec_args, entry_point); + } + + if (opts->subsystem) + { + strarray_add(spec_args, "--subsystem"); + strarray_add(spec_args, opts->subsystem); + } + + for (i = 0; i < lib_dirs->size; i++) + strarray_add(spec_args, strmake("-L%s", lib_dirs->base[i])); + + if (!is_pe) + { + for (i = 0; i < opts->delayimports->size; i++) + strarray_add(spec_args, strmake("-d%s", opts->delayimports->base[i])); + } + + /* add resource files */ + for (i = 0; i < files->size; i++) + if (files->base[i][1] == 'r') strarray_add(spec_args, files->base[i]); + + /* add other files */ + strarray_add(spec_args, "--"); + for (i = 0; i < files->size; i++) + { + switch(files->base[i][1]) + { + case 'd': + case 'a': + case 'o': + strarray_add(spec_args, files->base[i] + 2); + break; + } + } + + spawn(opts->prefix, spec_args, 0); + strarray_free (spec_args); + return spec_o_name; +} + static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args, *implib_args, *tool; + strarray *link_args, *implib_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1287,85 +1382,8 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ - spec_args = get_winebuild_args( opts ); - if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); - if (!is_pe && (tool = build_tool_name( opts, TOOL_LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); - - spec_o_name = get_temp_file(output_name, ".spec.o"); - if (opts->force_pointer_size) - strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); - strarray_add(spec_args, "-D_REENTRANT"); - if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); - strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); - if (fake_module) - { - strarray_add(spec_args, "--fake-module"); - strarray_add(spec_args, "-o"); - strarray_add(spec_args, output_file); - } - else - { - strarray_add(spec_args, "-o"); - strarray_add(spec_args, spec_o_name); - } - if (spec_file) - { - strarray_add(spec_args, "-E"); - strarray_add(spec_args, spec_file); - } - - if (!opts->shared) - { - strarray_add(spec_args, "-F"); - strarray_add(spec_args, output_name); - strarray_add(spec_args, "--subsystem"); - strarray_add(spec_args, opts->gui_app ? "windows" : "console"); - if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); - } - - if (opts->target_platform == PLATFORM_WINDOWS) strarray_add(spec_args, "--safeseh"); + spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); - if (entry_point) - { - strarray_add(spec_args, "--entry"); - strarray_add(spec_args, entry_point); - } - - if (opts->subsystem) - { - strarray_add(spec_args, "--subsystem"); - strarray_add(spec_args, opts->subsystem); - } - - for ( j = 0; j < lib_dirs->size; j++ ) - strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); - - if (!is_pe) - { - for (j = 0; j < opts->delayimports->size; j++) - strarray_add(spec_args, strmake("-d%s", opts->delayimports->base[j])); - } - - /* add resource files */ - for ( j = 0; j < files->size; j++ ) - if (files->base[j][1] == 'r') strarray_add(spec_args, files->base[j]); - - /* add other files */ - strarray_add(spec_args, "--"); - for ( j = 0; j < files->size; j++ ) - { - switch(files->base[j][1]) - { - case 'd': - case 'a': - case 'o': - strarray_add(spec_args, files->base[j] + 2); - break; - } - } - - spawn(opts->prefix, spec_args, 0); - strarray_free (spec_args); if (fake_module) return; /* nothing else to do */ /* link everything together now */

1 0

Nikolay Sivov : d3dcompiler: Improve d3d10_shader_reflection_GetDesc() to return missing stats.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: ff98978836b9cd0fa531f4e807050da2072b448e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff98978836b9cd0fa531f4e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 11 12:17:08 2021 +0300 d3dcompiler: Improve d3d10_shader_reflection_GetDesc() to return missing stats. 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/d3dcompiler_43/reflection.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index bd064793587..8b893fe76db 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -124,6 +124,7 @@ struct d3dcompiler_shader_reflection UINT gs_max_output_vertex_count; D3D_PRIMITIVE input_primitive; UINT cut_instruction_count; + UINT def_count; UINT dcl_count; UINT static_flow_control_count; UINT float_instruction_count; @@ -138,6 +139,7 @@ struct d3dcompiler_shader_reflection UINT texture_bias_instructions; UINT texture_gradient_instructions; UINT dynamic_flow_control_count; + UINT macro_instruction_count; UINT c_control_points; D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; @@ -1098,7 +1100,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->temp_register_count = read_dword(&ptr); TRACE("TempRegisterCount: %u\n", r->temp_register_count); - skip_dword_unknown(&ptr, 1); + r->def_count = read_dword(&ptr); + TRACE("DefCount: %u\n", r->def_count); r->dcl_count = read_dword(&ptr); TRACE("DclCount: %u\n", r->dcl_count); @@ -1118,7 +1121,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->dynamic_flow_control_count = read_dword(&ptr); TRACE("DynamicFlowControlCount: %u\n", r->dynamic_flow_control_count); - skip_dword_unknown(&ptr, 1); + r->macro_instruction_count = read_dword(&ptr); + TRACE("MacroInstructionCount: %u\n", r->macro_instruction_count); r->temp_array_count = read_dword(&ptr); TRACE("TempArrayCount: %u\n", r->temp_array_count); @@ -1917,7 +1921,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (!desc) { @@ -1935,7 +1939,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->InstructionCount = reflection->instruction_count; desc->TempRegisterCount = reflection->temp_register_count; desc->TempArrayCount = reflection->temp_array_count; - desc->DefCount = 0; + desc->DefCount = reflection->def_count; desc->DclCount = reflection->dcl_count; desc->TextureNormalInstructions = reflection->texture_normal_instructions; desc->TextureLoadInstructions = reflection->texture_load_instructions; @@ -1947,7 +1951,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->UintInstructionCount = reflection->uint_instruction_count; desc->StaticFlowControlCount = reflection->static_flow_control_count; desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; - desc->MacroInstructionCount = 0; + desc->MacroInstructionCount = reflection->macro_instruction_count; desc->ArrayInstructionCount = reflection->array_instruction_count; desc->CutInstructionCount = reflection->cut_instruction_count; desc->EmitInstructionCount = reflection->emit_instruction_count;

1 0

Gerald Pfeifer : ntdll: Only use sysinfo function when present.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 59da79021a6e441e3b21b933c744aba922208ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59da79021a6e441e3b21b933… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Aug 10 22:36:27 2021 +0200 ntdll: Only use sysinfo function when present. On some systems <sys/sysinfo.h> may be present while the sysinfo function may not, or at least not as part of standard libraries, so check whether the function is actually available before using it. This fixes builds on FreeBSD with the devel/libsysinfo present. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/unix/virtual.c | 3 ++- include/config.h.in | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 1be0aa9d217..e8c1cb9e3a8 100755 --- a/configure +++ b/configure @@ -18068,6 +18068,7 @@ for ac_func in \ setprogname \ sigprocmask \ symlink \ + sysinfo \ tcdrain \ thr_kill2 diff --git a/configure.ac b/configure.ac index 69e27147088..065b3f231bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2205,6 +2205,7 @@ AC_CHECK_FUNCS(\ setprogname \ sigprocmask \ symlink \ + sysinfo \ tcdrain \ thr_kill2 ) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index a252e25fbc6..2cca90ac952 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2737,7 +2737,8 @@ ULONG_PTR get_system_affinity_mask(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) { -#if defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) +#if defined(HAVE_SYSINFO) \ + && defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) struct sysinfo sinfo; if (!sysinfo(&sinfo)) diff --git a/include/config.h.in b/include/config.h.in index ad770281471..24f7b64ffd3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -744,6 +744,9 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define to 1 if you have the `sysinfo' function. */ +#undef HAVE_SYSINFO + /* Define to 1 if you have the <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H

1 0

Rémi Bernon : xinput1_3/tests: Add some HID report tests.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 7a571127e4fb5e3eba3f382446f4a82ef5728b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a571127e4fb5e3eba3f3824… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:22:16 2021 +0200 xinput1_3/tests: Add some HID report tests. This adds tests to validate the bogus HID devices exposed native XInput driver. Interactive tests are also included to validate the HID report values, and more specifically the weird combined triggers, which is currently not implemented correctly in Wine. Some third-party libraries, such as SDL, are known to rely on this bogus HID devices and hardcode the expected report structure. This has been tested on Windows 10 with XBox 360 controllers as well as Xbox One S controllers. The latter are detected as 045e:02ea on Linux, but as 045e:02ff on Windows for some reason, and their descriptor seems a little bit different. Their exposed HID device also doesn't seem to work at all and ReadFile never succeeds, so the interactive tests are skipped for these devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/Makefile.in | 2 +- dlls/xinput1_3/tests/xinput.c | 516 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 517 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a571127e4fb5e3eba3f…

1 0

Nikolay Sivov : d3dx9: Implement getting/setting line width.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: ebb99bde64f8a134466f45547d82ff974524ee47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb99bde64f8a134466f4554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 11:54:05 2021 +0300 d3dx9: Implement getting/setting line width. 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/line.c | 19 +++++++++++++++---- dlls/d3dx9_36/tests/line.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 7b2e3b5428f..647eb1b5b2a 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -29,6 +29,7 @@ struct d3dx9_line IDirect3DDevice9 *device; IDirect3DStateBlock9 *state; + float width; }; static inline struct d3dx9_line *impl_from_ID3DXLine(ID3DXLine *iface) @@ -192,16 +193,25 @@ static float WINAPI d3dx9_line_GetPatternScale(ID3DXLine *iface) static HRESULT WINAPI d3dx9_line_SetWidth(ID3DXLine *iface, float width) { - FIXME("iface %p, width %.8e stub!\n", iface, width); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return E_NOTIMPL; + TRACE("iface %p, width %.8e.\n", iface, width); + + if (width <= 0.0f) + return D3DERR_INVALIDCALL; + + line->width = width; + + return D3D_OK; } static float WINAPI d3dx9_line_GetWidth(ID3DXLine *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return 1.0f; + TRACE("iface %p.\n", iface); + + return line->width; } static HRESULT WINAPI d3dx9_line_SetAntialias(ID3DXLine *iface, BOOL antialias) @@ -306,6 +316,7 @@ HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine object->ref = 1; object->device = device; IDirect3DDevice9_AddRef(device); + object->width = 1.0f; *line = &object->ID3DXLine_iface; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index ae8d07e0623..d89ae160ba5 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -115,6 +115,38 @@ static void test_create_line(IDirect3DDevice9* device) ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); } +static void test_line_width(IDirect3DDevice9* device) +{ + ID3DXLine *line = NULL; + ULONG refcount; + float width; + HRESULT hr; + + hr = D3DXCreateLine(device, &line); + ok(hr == D3D_OK, "Failed to create a line, hr %#x.\n", hr); + + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 0.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, -1.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 10.0f); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 10.0f, "Unexpected line width %.8e.\n", width); + + refcount = ID3DXLine_Release(line); + ok(!refcount, "Got %u references to line.\n", refcount); +} + START_TEST(line) { HWND wnd; @@ -148,6 +180,7 @@ START_TEST(line) } test_create_line(device); + test_line_width(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Alexandre Julliard : winegcc: Don't build the .spec.o file for native Unix libraries.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 6688367046fd0a7446baaf623b2a6b8329b27059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6688367046fd0a7446baaf62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 11:59:26 2021 +0200 winegcc: Don't build the .spec.o file for native Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b756c5a97f8..8e77648ac10 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1220,7 +1220,7 @@ static void build(struct options* opts) strarray *lib_dirs, *files; strarray *link_args, *implib_args, *tool; char *output_file, *output_path; - const char *spec_o_name, *libgcc = NULL; + const char *spec_o_name = NULL, *libgcc = NULL; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; @@ -1382,7 +1382,8 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ - spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); + if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "native"))) + spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); if (fake_module) return; /* nothing else to do */ @@ -1414,7 +1415,7 @@ static void build(struct options* opts) entry_point)); } - strarray_add(link_args, spec_o_name); + if (spec_o_name) strarray_add(link_args, spec_o_name); if (is_pe) {

1 0

Zebediah Figura : kernelbase: Implement reading performance counter help strings.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: aa99608dfac51239f62b971d40a813b5ae80e70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa99608dfac51239f62b971d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 11 00:20:08 2021 -0500 kernelbase: Implement reading performance counter help strings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 18 ++++++++++++------ dlls/kernelbase/registry.c | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 811117beadc..4da2ce100ab 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3849,7 +3849,7 @@ static void test_performance_keys(void) size = 0xdeadbeef; ret = RegQueryValueExA(keys[i], "hElP", NULL, NULL, NULL, &size); - todo_wine + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) { ok(!ret, "got %u\n", ret); ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); @@ -3859,15 +3859,19 @@ static void test_performance_keys(void) size = 0; ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { ok(ret == ERROR_MORE_DATA, "got %u\n", ret); - todo_wine ok(size > 0, "got size %u\n", size); + ok(size > 0, "got size %u\n", size); + } type = 0xdeadbeef; size = buffer_size; ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { ok(!ret, "got %u\n", ret); - todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } if (type == REG_MULTI_SZ) test_help_values(buffer, keys[i]); @@ -3875,14 +3879,16 @@ static void test_performance_keys(void) size = buffer_size; ret = RegQueryValueExA(keys[i], "hElPwine", NULL, &type, buffer, &size); todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { ok(!ret, "got %u\n", ret); - todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } if (type == REG_MULTI_SZ) test_help_values(buffer, keys[i]); size = 0; ret = RegQueryValueExW(keys[i], L"hElP", NULL, NULL, NULL, &size); - todo_wine + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) { ok(!ret, "got %u\n", ret); ok(size > 0, "got size %u\n", size); @@ -3892,7 +3898,7 @@ static void test_performance_keys(void) type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"hElP", NULL, &type, bufferW, &size); - todo_wine + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) { ok(!ret, "got %u\n", ret); ok(type == REG_MULTI_SZ, "got type %u\n", type); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 31698cb0948..c3d5cdbc6e0 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1225,6 +1225,27 @@ static DWORD query_perf_names( DWORD *type, void *data, DWORD *ret_size, BOOL un return ERROR_SUCCESS; } +/* FIXME: we should read data from system32/perf009h.dat (or perf###h depending + * on locale) instead */ +static DWORD query_perf_help( DWORD *type, void *data, DWORD *ret_size, BOOL unicode ) +{ + static const WCHAR names[] = L"1847\0End Marker\0"; + DWORD size = *ret_size; + + if (type) *type = REG_MULTI_SZ; + *ret_size = sizeof(names); + if (!unicode) *ret_size /= sizeof(WCHAR); + + if (!data) return ERROR_SUCCESS; + if (size < *ret_size) return ERROR_MORE_DATA; + + if (unicode) + memcpy( data, names, sizeof(names) ); + else + RtlUnicodeToMultiByteN( data, size, NULL, names, sizeof(names) ); + return ERROR_SUCCESS; +} + struct perf_provider { HMODULE perflib; @@ -1370,6 +1391,8 @@ static DWORD query_perf_data( const WCHAR *query, DWORD *type, void *data, DWORD if (!wcsnicmp( query, L"counter", 7 )) return query_perf_names( type, data, ret_size, unicode ); + if (!wcsnicmp( query, L"help", 4 )) + return query_perf_help( type, data, ret_size, unicode ); data_size = *ret_size; *ret_size = 0;

1 0

Alexandre Julliard : ntdll: Make __wine_unix_call() WINAPI to follow syscall conventions.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: d7add3821898b6f002c3df969f1198b30fcfc8c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7add3821898b6f002c3df96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 20:07:15 2021 +0200 ntdll: Make __wine_unix_call() WINAPI to follow syscall conventions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 2 +- include/winternl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5ac5a16ed44..36d997d1762 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1625,7 +1625,7 @@ @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) # Unix interface -@ cdecl -syscall __wine_unix_call(int64 long ptr) +@ stdcall -syscall __wine_unix_call(int64 long ptr) @ cdecl __wine_set_unix_funcs(long ptr) @ cdecl __wine_init_unix_lib(long long ptr ptr) @ stdcall __wine_ctrl_routine(ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f1a2b9f5a79..7d9635db535 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1141,7 +1141,7 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr /*********************************************************************** * __wine_unix_call */ -NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) { return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args ); } diff --git a/include/winternl.h b/include/winternl.h index 562a35a83a1..523e65007ed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4617,7 +4617,7 @@ typedef UINT64 unixlib_handle_t; /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); -extern NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

Alexandre Julliard : ntdll: Avoid CDECL on internal functions.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 2941e5185535781b58bbe5c2b63393a132c30098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2941e5185535781b58bbe5c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 20:07:29 2021 +0200 ntdll: Avoid CDECL on internal functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 372447eb8af..a252e25fbc6 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -381,7 +381,7 @@ static int mmap_is_in_reserved_area( void *addr, SIZE_T size ) return 0; } -static int mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), +static int mmap_enum_reserved_areas( int (*enum_func)(void *base, SIZE_T size, void *arg), void *arg, int top_down ) { int ret = 0; @@ -1451,7 +1451,7 @@ struct area_boundary * in the specified region. If no boundaries are found, result is NULL. * virtual_mutex must be held by caller. */ -static int CDECL get_area_boundary_callback( void *start, SIZE_T size, void *arg ) +static int get_area_boundary_callback( void *start, SIZE_T size, void *arg ) { struct area_boundary *area = arg; void *end = (char *)start + size; @@ -1818,7 +1818,7 @@ struct alloc_area * * Try to map some space inside a reserved area. Callback for mmap_enum_reserved_areas. */ -static int CDECL alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) +static int alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) { struct alloc_area *alloc = arg; void *end = (char *)start + size; @@ -2633,7 +2633,7 @@ struct alloc_virtual_heap }; /* callback for mmap_enum_reserved_areas to allocate space for the virtual heap */ -static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) +static int alloc_virtual_heap( void *base, SIZE_T size, void *arg ) { struct alloc_virtual_heap *alloc = arg; void *end = (char *)base + size; @@ -3668,7 +3668,7 @@ struct free_range }; /* free reserved areas above the limit; callback for mmap_enum_reserved_areas */ -static int CDECL free_reserved_memory( void *base, SIZE_T size, void *arg ) +static int free_reserved_memory( void *base, SIZE_T size, void *arg ) { struct free_range *range = arg; @@ -4048,7 +4048,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T /* retrieve state for a free memory area; callback for mmap_enum_reserved_areas */ -static int CDECL get_free_mem_state_callback( void *start, SIZE_T size, void *arg ) +static int get_free_mem_state_callback( void *start, SIZE_T size, void *arg ) { MEMORY_BASIC_INFORMATION *info = arg; void *end = (char *)start + size;

1 0

Ziqing Hui : d2d1: Add D2D1Crop.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: a52b58473c4bf09e26592b5fb5ad51964b39180d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a52b58473c4bf09e26592b5f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 11 13:53:44 2021 +0800 d2d1: Add D2D1Crop. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 3 ++- dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 5f334d19f71..0c33f956826 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -24,7 +24,8 @@ static const struct d2d_effect_info builtin_effects[] = { {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, - {&CLSID_D2D1Composite, 2, 1, 0xffffffff} + {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 343a2363e14..cd58d642ce1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9707,6 +9707,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 4154276345b..9bd0b7012ad 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -19,6 +19,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") typedef enum D2D1_BORDER_MODE { @@ -75,3 +76,10 @@ typedef enum D2D1_COMPOSITE_PROP D2D1_COMPOSITE_PROP_MODE = 0x0, D2D1_COMPOSITE_PROP_FORCE_DWORD = 0xffffffff } D2D1_COMPOSITE_PROP; + +typedef enum D2D1_CROP_PROP +{ + D2D1_CROP_PROP_RECT = 0x0, + D2D1_CROP_PROP_BORDER_MODE = 0x1, + D2D1_CROP_PROP_FORCE_DWORD = 0xffffffff +} D2D1_CROP_PROP;

1 0