December 2019 - Wine-Devel - list.winehq.org

Re: widl: Set name return value (passed by reference) in the alias case alias case in get_user_type.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > So, I admit I don't really know this code, but looking at it (triggered > by a warning issued by GCC development versions), I noticed that this > variable passed by reference is not initialized here. It's initialized when we return a type, and it doesn't need to be initialized on NULL return. The code is correct, but you could probably set the variable to NULL in the caller to silence the warning. -- Alexandre Julliard julliard(a)winehq.org

2 1

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

TestBot and graphics tests
by Francois Gouget Aug. 24, 2020

Aug. 24, 2020

Here are some things I've learned about PCI-passthrough recently, which would be one way (probably the best) to add "real hardware" to the TestBot. I don't want to give anyone false hopes though: this just went from "this is a mysterious thing I need to learn about" to "I think I know how to do it but have not tried it yet". So graphics card PCI-passthrough is now relatively well documented on the Internet and seems to have seen some use-cases that would indicate it may even be reasonably usable. * There are two machines intended to run real GPU tests for Wine: cw1-hd6800 and cw2-gtx560. For now they are only used to run WineTest daily on Windows 8.1, Windows 10 1507, 1709, 1809 and Linux. That's quite a bunch but it would be much better if they were integrated with the TestBot as that would allow developers to submit their own tests. So I had a look at what it would imply to convert them to VM hosts using QEmu + PCI-passthrough. * First one needs a processor with hardware virtualisation support. For Intel that's VT-d. Both machines have an Intel Core 2600 which supports VT-d. Good. * Second the motherboard too needs to support VT-d. Both machines have an ASRock P67 Extreme4 motherboard. Unfortunately UEFI says "unsupported" next to the "VT-d" setting for the motherboard :-( It looks like there was some confusion as to whether the P67 chipset supported VT-d initially. From what I gathered it's only Q67 that does but this caused some manufacturers, among which ASRock, to initially claim support and later retract it. * Then one needs to add the intel_iommu=on option to the kernel command line (resp. amd_iommu). This is should make all the PCI devices appear in /sys/kernel/iommu_groups. But that folder remains empty which confirms that full VT-d support is missing. * Another important aspect is to have a graphics card which is hot-restartable. In some cases when a VM's graphics card is crashed the only way to reset it is to reboot the host. The TestBot is likely to crash the graphics card, particularly if we do a hard-power off on the VMs like we currently do, and it would relaly be annoying to have to reboot the host everytime the graphics card goes belly up. I don't know if the AMD HD6800 and Nvidia GTX560 are suitable but it's quite possible they are not. All I know for now is that we should avoid AMD's R9 line of graphics cards. I still need to find a couple of suitable reasonably lower power graphics cards: one AMD and one Nvidia. * Then one needs to prevent the host from using the graphics card. Usually that's done by having the host use the processor's IGP and dedicating the discrete GPU to the VMs. Unfortunately the 2600's IGP cannot be active when there's a discrete card so that route is denied to us. Fortunately there's quite a bit of documentation on how to shut down not just X but also the Linux virtual consoles to free the GPU and hand it over to the VMs after boot. Doing so means losing KVM access to the host which is a bit annoying in case something goes wrong. So ideally we'd make sure this does not happen in grub's "safe mode" boot option. * Although I have not done any test yet I'm reasonably certain that PCI-passthrough rules out live snapshots: QEmu would have no way to restore the graphics card's internal state. - For Windows VMs that's not an issue: if we provide a power off snapshot the TestBot already knows how to power on the VM and wait for it to boot (as long as the boot is shorter than the connection timeout but it works out usually). - For Linux VM's that's more of an issue: the TestBot will power on the VM as usual. The problem is when it updates Wine: after recompiling everything it deletes the old snapshot and creates a new one from the current state of the VM, which means a live snapshot. So the TestBot will need to be modified so it knows when and how to power off the VM and take a powered off snapshot. * Since the VM has full control of the graphics card QEmu has no access to the content of the screen. That's not an issue for the normal TestBot operation, just for the initial VM setup. Fortunately the graphics card is connected to a KVM so the screen can be accessed through that means. It does mean assigning the mouse and keyboard to the VM too. Should that prove impractical there are a bunch of other options too: VNC, LookingGlass, Synergy, etc. But the less needs to be installed in the VMs the better. * Also the TestBot uses QEmu to take the screenshots. But QEmu does not have access to the content of the screen. The fix is to use a tool to take the screenshots from within the VM and use TestAgent to retrieve them. On Linux there are standard tools we can use. On Windows there's code floating around we can use. So the next steps would be: * Maybe test on my box using the builtin IGP. But that likely won't be very conclusive beyond confirming the snapshot issues, screen access, etc. * Find a suitable AMD or Nvidia graphics card and test that on my box. That would allow me to fully test integration with the TestBot, check for stability issues, etc. * Then see what can be done with the existing cw1 and cw2 boxes. -- Francois Gouget <fgouget(a)codeweavers.com>

4 10

llvm-mingw support update
by Jacek Caban May 14, 2020

May 14, 2020

Hi all, Last night Martin pushed an update to llvm-mingw bumping version of LLVM to a commit that includes a number of fixes for Wine. See [1] for details. Thank you, Martin! Meantime, Wine got required fixes, so that it all should mostly work together. If you want to try it, just clone [2] git and run: DEFAULT_MSVCRT=msvcrt-os ./build-all.sh /path/to/install If the installation is on PATH, current Wine should be able to use it without any additional tweaks. You should be able to configure it just like configuration on GCC-based mingw works. DEFAULT_MSVCRT=msvcrt-os part is needed because Wine can't deal with mingw-w64 defaulting to crt version other than msvcrt.dll. This is not a problem specific to LLVM, we will hit the same problem on GCC if mingw-w64 is configured to use other crt (usually ucrt, things like msvcrt100 is also possible). It is not yet a popular setup, but it will probably be more popular over time, so it would be great to have it supported. The ultimate solution for Wine is to always use -nodefaultlibs for all its binaries. It's already the case for all Wine builtin DLLs, we just need to do the same for EXEs. I have some unfinished patches for that, but it's not something appropriate for code freeze. I'm experimenting with a smaller fix, because it would be great to have something sooner, but using DEFAULT_MSVCRT=msvcrt-os is required for now. One of nice LLVM features is support for PDB files. If you want to make a build with PDB files, configure Wine like this: configure CROSSCFLAGS="-g -gcodeview -O2" CROSSLDFLAGS="-Wl,-pdb=" #append your usual args and then run make like: make CROSSLDFLAGS="-Wl,-pdb=" The additional make argument is needed because Wine does not yet propagate CROSSLDFLAGS from configure. Patch [3] should fix it. Cheers, Jacek [1] https://github.com/mstorsjo/llvm-mingw/commit/056c1f5cd22b1c5ca76af38f2d1f9… [2] https://github.com/mstorsjo/llvm-mingw [3] https://source.winehq.org/patches/data/176054

2 3

About GSoC
by Alex March 3, 2020

March 3, 2020

So, I have this idea of replacing Winetricks with something more beautiful, responsive and functional. I have been developing Wineglass independently as an elementaryOS app (https://github.com/aggalex/Wineglass) and I want to expand it and integrate it with wine in a much better way. If possible, could you inform me about wine's GSoC program? Do you believe such a project is suitable for wine and GSoC?

3 3

[PATCH v2 1/4] d3dcompiler: Get rid of the "node" field from struct hlsl_ir_function_decl.
by Zebediah Figura Feb. 5, 2020

Feb. 5, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- dlls/d3dcompiler_43/hlsl.y | 20 ++++++++++---------- dlls/d3dcompiler_43/utils.c | 4 +--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1ab343de2d8..01f6ce0e60a 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -712,7 +712,6 @@ enum hlsl_ir_node_type HLSL_IR_CONSTRUCTOR, HLSL_IR_DEREF, HLSL_IR_EXPR, - HLSL_IR_FUNCTION_DECL, HLSL_IR_IF, HLSL_IR_LOOP, HLSL_IR_JUMP, @@ -776,7 +775,8 @@ struct hlsl_ir_function struct hlsl_ir_function_decl { - struct hlsl_ir_node node; + struct hlsl_type *return_type; + struct source_location loc; struct wine_rb_entry entry; struct hlsl_ir_function *func; const char *semantic; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5585b899463..7c14ad0091c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1084,28 +1084,28 @@ hlsl_prog: /* empty */ { if (decl->body && $2.decl->body) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefinition of function %s", debugstr_a($2.name)); YYABORT; } - else if (!compare_hlsl_types(decl->node.data_type, $2.decl->node.data_type)) + else if (!compare_hlsl_types(decl->return_type, $2.decl->return_type)) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefining function %s with a different return type", debugstr_a($2.name)); - hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_NOTE, + hlsl_report_message(decl->loc.file, decl->loc.line, decl->loc.col, HLSL_LEVEL_NOTE, "%s previously declared here", debugstr_a($2.name)); YYABORT; } } - if ($2.decl->node.data_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) + if ($2.decl->return_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "void function with a semantic"); } @@ -1280,7 +1280,7 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' c } $$.name = $3; $$.decl->semantic = $7.semantic; - set_location(&$$.decl->node.loc, &@3); + set_location(&$$.decl->loc, &@3); } compound_statement: '{' '}' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5ecbbc9dc1d..ad2d02e1452 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1577,8 +1577,7 @@ struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, struc ERR("Out of memory.\n"); return NULL; } - decl->node.type = HLSL_IR_FUNCTION_DECL; - decl->node.data_type = return_type; + decl->return_type = return_type; decl->parameters = parameters; return decl; @@ -1775,7 +1774,6 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_CONSTRUCTOR", "HLSL_IR_DEREF", "HLSL_IR_EXPR", - "HLSL_IR_FUNCTION_DECL", "HLSL_IR_IF", "HLSL_IR_JUMP", "HLSL_IR_SWIZZLE", -- 2.20.1

2 5

[PATCH v3 1/5] wined3d: Introduce wined3d_device_apply_stateblock().
by Zebediah Figura Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: Only push modified constants. This series may not necessarily be safe for code freeze, but I'm submitting it at least to finish the review process. dlls/wined3d/device.c | 193 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 195 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8913420724..8e20e31d3f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3829,6 +3829,199 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j, count; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + if (stateblock->changed.vertexShader) + wined3d_device_set_vertex_shader(device, state->vs); + if (stateblock->changed.pixelShader) + wined3d_device_set_pixel_shader(device, state->ps); + + count = 0; + for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) + { + if (stateblock->changed.vs_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.vertexShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.vertexShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + + count = 0; + for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) + { + if (stateblock->changed.ps_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.pixelShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.pixelShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + { + if (stateblock->changed.textureState[i] & (1u << j)) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + { + if (stateblock->changed.samplerState[i] & (1 << j)) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + { + if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + wined3d_device_set_transform(device, i, &state->transforms[i]); + } + + if (stateblock->changed.indices) + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + if (stateblock->changed.vertexDecl) + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + if (stateblock->changed.material) + wined3d_device_set_material(device, &state->material); + if (stateblock->changed.viewport) + wined3d_device_set_viewports(device, 1, &state->viewport); + if (stateblock->changed.scissorRect) + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (stateblock->changed.streamSource & (1u << i)) + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + if (stateblock->changed.streamFreq & (1u << i)) + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + if (stateblock->changed.textures & (1u << i)) + wined3d_device_set_texture(device, stage, state->textures[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + { + if (stateblock->changed.clipplane & (1u << i)) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + } + + memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b..c8ef442c72 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9cdf18633c..4306f5ae21 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2289,6 +2289,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -- 2.24.0

3 9

[PATCH 00/10] Implement d3d10 effect framework functionality
by Connor McAdams Jan. 22, 2020

Jan. 22, 2020

Patch series to implement the functions that are used by steam big picture mode. Submitting for feedback/ideas on how to improve/change things. Connor McAdams (10): d3d10: Allocate buffers for effect interface local_buffers. d3d10: Implement scalar effect variable set methods. d3d10: Implement scalar effect variable get methods. d3d10: Implement vector effect variable set methods. d3d10: Implement vector effect variable get methods. d3d10: Implement matrix effect variable set methods. d3d10: Implement matrix effect variable get methods. d3d10: Implement ShaderResource effect variable set method. d3d10: Get resources used by effect shaders. d3d10: Apply shader resources for shaders used in pass. dlls/d3d10/d3d10_private.h | 28 ++ dlls/d3d10/effect.c | 758 +++++++++++++++++++++++++++++++++---- 2 files changed, 718 insertions(+), 68 deletions(-) -- 2.20.1

2 21

[PATCH 1/7] ddraw/tests: Pass in device to look for when enumerating.
by Jeff Smith Jan. 22, 2020

Jan. 22, 2020

This makes it possible to scan for devices other than HAL. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 470464951c..d921746152 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -339,10 +339,10 @@ static IDirectDraw7 *create_ddraw(void) static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) { - BOOL *hal_ok = ctx; - if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + struct { REFCLSID riid; BOOL present; } *device_data = ctx; + if (IsEqualGUID(&desc->deviceGUID, device_data->riid)) { - *hal_ok = TRUE; + device_data->present = TRUE; return DDENUMRET_CANCEL; } return DDENUMRET_OK; @@ -357,7 +357,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) IDirectDraw7 *ddraw; IDirect3D7 *d3d7; HRESULT hr; - BOOL hal_ok = FALSE; + struct { REFCLSID riid; BOOL present; } device_data = { &IID_IDirect3DTnLHalDevice, FALSE }; const GUID *devtype = &IID_IDirect3DHALDevice; if (!(ddraw = create_ddraw())) @@ -397,9 +397,9 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } - hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &hal_ok); + hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &device_data); ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); - if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + if (device_data.present) devtype = device_data.riid; memset(&z_fmt, 0, sizeof(z_fmt)); hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt); @@ -5650,7 +5650,7 @@ static void test_rt_caps(void) PALETTEENTRY palette_entries[256]; IDirectDrawPalette *palette; IDirectDraw7 *ddraw; - BOOL hal_ok = FALSE; + struct { REFCLSID riid; BOOL present; } device_data = { &IID_IDirect3DTnLHalDevice, FALSE }; DDPIXELFORMAT z_fmt; IDirect3D7 *d3d; unsigned int i; @@ -5848,10 +5848,10 @@ static void test_rt_caps(void) goto done; } - hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &hal_ok); + hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &device_data); ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); - if (hal_ok) - devtype = &IID_IDirect3DTnLHalDevice; + if (device_data.present) + devtype = device_data.riid; memset(&z_fmt, 0, sizeof(z_fmt)); hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt); @@ -6133,7 +6133,7 @@ static void test_surface_lock(void) DDSURFACEDESC2 ddsd; ULONG refcount; DDPIXELFORMAT z_fmt; - BOOL hal_ok = FALSE; + struct { REFCLSID riid; BOOL present; } device_data = { &IID_IDirect3DTnLHalDevice, FALSE }; const GUID *devtype = &IID_IDirect3DHALDevice; D3DDEVICEDESC7 device_desc; BOOL cubemap_supported; @@ -6254,10 +6254,10 @@ static void test_surface_lock(void) goto done; } - hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &hal_ok); + hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &device_data); ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); - if (hal_ok) - devtype = &IID_IDirect3DTnLHalDevice; + if (device_data.present) + devtype = device_data.riid; memset(&z_fmt, 0, sizeof(z_fmt)); hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt); -- 2.23.0

3 16

[PATCH] dmusic: Use wide-char string literals
by Michael Stefaniuc Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/dmusic.c | 8 +++----- dlls/dmusic/tests/dmusic.c | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index cc798ce4d9..1916fb7bd9 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -343,20 +343,18 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW if (!index) { static const GUID guid_system_clock = { 0x58d58419, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; - static const WCHAR name_system_clock[] = { 'S','y','s','t','e','m',' ','C','l','o','c','k',0 }; clock_info->ctType = 0; clock_info->guidClock = guid_system_clock; - lstrcpyW(clock_info->wszDescription, name_system_clock); + lstrcpyW(clock_info->wszDescription, L"System Clock"); } else { static const GUID guid_dsound_clock = { 0x58d58420, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; - static const WCHAR name_dsound_clock[] = { 'D','i','r','e','c','t','S','o','u','n','d',' ','C','l','o','c','k',0 }; clock_info->ctType = 0; clock_info->guidClock = guid_dsound_clock; - lstrcpyW(clock_info->wszDescription, name_dsound_clock); + lstrcpyW(clock_info->wszDescription, L"DirectSound Clock"); } return S_OK; @@ -496,7 +494,7 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { static void create_system_ports_list(IDirectMusic8Impl* object) { - static const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; + static const WCHAR emulated[] = L" [Emulated]"; port_info * port; ULONG nb_ports; ULONG nb_midi_out; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index f6c417af30..776f9d0ec9 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -639,7 +639,6 @@ static void test_parsedescriptor(void) IStream *stream; DMUS_OBJECTDESC desc = {0}; HRESULT hr; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, FOURCC_DLS, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -735,7 +734,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -747,7 +746,7 @@ static void test_parsedescriptor(void) ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

3 3

[PATCH v2 1/5] wined3d: Introduce wined3d_device_apply_stateblock().
by Zebediah Figura Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Push all shader constants in one call, and make use of stateblock changed-state tracking for all other states, as per Matteo's suggestion. dlls/wined3d/device.c | 116 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 118 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8913420724..acc915eb55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3829,6 +3829,122 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + if (stateblock->changed.vertexShader) + wined3d_device_set_vertex_shader(device, state->vs); + if (stateblock->changed.pixelShader) + wined3d_device_set_pixel_shader(device, state->ps); + + wined3d_device_set_vs_consts_f(device, 0, d3d_info->limits.vs_uniform_count, state->vs_consts_f); + wined3d_device_set_vs_consts_b(device, 0, WINED3D_MAX_CONSTS_B, state->vs_consts_b); + wined3d_device_set_vs_consts_i(device, 0, WINED3D_MAX_CONSTS_I, state->vs_consts_i); + wined3d_device_set_ps_consts_f(device, 0, d3d_info->limits.ps_uniform_count, state->ps_consts_f); + wined3d_device_set_ps_consts_b(device, 0, WINED3D_MAX_CONSTS_B, state->ps_consts_b); + wined3d_device_set_ps_consts_i(device, 0, WINED3D_MAX_CONSTS_I, state->ps_consts_i); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + { + if (stateblock->changed.textureState[i] & (1u << j)) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + { + if (stateblock->changed.samplerState[i] & (1 << j)) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + { + if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + wined3d_device_set_transform(device, i, &state->transforms[i]); + } + + if (stateblock->changed.indices) + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + if (stateblock->changed.vertexDecl) + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + if (stateblock->changed.material) + wined3d_device_set_material(device, &state->material); + if (stateblock->changed.viewport) + wined3d_device_set_viewports(device, 1, &state->viewport); + if (stateblock->changed.scissorRect) + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (stateblock->changed.streamSource & (1u << i)) + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + if (stateblock->changed.streamFreq & (1u << i)) + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + if (stateblock->changed.textures & (1u << i)) + wined3d_device_set_texture(device, stage, state->textures[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + { + if (stateblock->changed.clipplane & (1u << i)) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + } + + memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b..c8ef442c72 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db88e11032..8951f92d14 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2288,6 +2288,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -- 2.24.0

3 9

[PATCH 1/2] gdi32/tests: Don't treat a return value of COMPLEXREGION from IntersectClipRect() as broken.
by Zebediah Figura Jan. 2, 2020

Jan. 2, 2020

It may be counterintuitive, but every version of Windows returns this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/tests/dc.c | 52 ++++++++++++------------------------- dlls/gdi32/tests/metafile.c | 48 ++++++++++++---------------------- 2 files changed, 32 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9739b8f61d..e9fdb12f68 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -40,27 +40,6 @@ static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); -static void dump_region(HRGN hrgn) -{ - DWORD i, size; - RGNDATA *data = NULL; - RECT *rect; - - if (!hrgn) - { - printf( "(null) region\n" ); - return; - } - if (!(size = GetRegionData( hrgn, 0, NULL ))) return; - if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return; - GetRegionData( hrgn, size, data ); - printf( "%d rects:", data->rdh.nCount ); - for (i = 0, rect = (RECT *)data->Buffer; i < data->rdh.nCount; i++, rect++) - printf( " (%d,%d)-(%d,%d)", rect->left, rect->top, rect->right, rect->bottom ); - printf( "\n" ); - HeapFree( GetProcessHeap(), 0, data ); -} - static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -111,6 +90,8 @@ static void test_dc_values(void) static void test_savedc_2(void) { + char buffer[100]; + RGNDATA *rgndata = (RGNDATA *)buffer; HWND hwnd; HDC hdc; HRGN hrgn; @@ -130,13 +111,15 @@ static void test_savedc_2(void) ok(hdc != NULL, "GetDC failed\n"); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION, "wrong region type %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "GetClipRgn returned %d instead of 0\n", ret); ret = GetRgnBox(hrgn, &rc); ok(ret == NULLREGION, "GetRgnBox returned %d %s instead of NULLREGION\n", ret, wine_dbgstr_rect(&rc)); - /*dump_region(hrgn);*/ + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER), "got %u\n", ret); + ok(!rgndata->rdh.nCount, "got %u rectangles\n", rgndata->rdh.nCount); SetRect(&rc, 0, 0, 100, 100); ok(EqualRect(&rc, &rc_clip), "rects are not equal: %s - %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&rc_clip)); @@ -145,20 +128,17 @@ static void test_savedc_2(void) ok(ret == 1, "ret = %d\n", ret); ret = IntersectClipRect(hdc, 0, 0, 50, 50); - if (ret == COMPLEXREGION) - { - /* XP returns COMPLEXREGION although dump_region reports only 1 rect */ - trace("Windows BUG: IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); - /* let's make sure that it's a simple region */ - ret = GetClipRgn(hdc, hrgn); - ok(ret == 1, "GetClipRgn returned %d instead of 1\n", ret); - dump_region(hrgn); - } - else - ok(ret == SIMPLEREGION, "IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); + todo_wine ok(ret == COMPLEXREGION, "wrong region type %d\n", ret); + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "GetClipRgn returned %d instead of 1\n", ret); + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER) + sizeof(RECT), "got %u\n", ret); + ok(rgndata->rdh.nCount == 1, "got %u rectangles\n", rgndata->rdh.nCount); + SetRect(&rc, 0, 0, 50, 50); + ok(EqualRect((RECT *)rgndata->Buffer, &rc), "got rect %s\n", wine_dbgstr_rect((RECT *)rgndata->Buffer)); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION, "wrong region type %d\n", ret); SetRect(&rc, 0, 0, 50, 50); ok(EqualRect(&rc, &rc_clip), "rects are not equal: %s - %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&rc_clip)); @@ -167,7 +147,7 @@ static void test_savedc_2(void) ok(ret, "ret = %d\n", ret); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION, "wrong region type %d\n", ret); SetRect(&rc, 0, 0, 100, 100); ok(EqualRect(&rc, &rc_clip), "rects are not equal: %s - %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&rc_clip)); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 231d6a4d35..d1c18cdb29 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -60,20 +60,6 @@ static void init_function_pointers(void) GDI_GET_PROC(SetDCPenColor); } -static DWORD rgn_rect_count(HRGN hrgn) -{ - DWORD size; - RGNDATA *data; - - if (!hrgn) return 0; - if (!(size = GetRegionData(hrgn, 0, NULL))) return 0; - if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - GetRegionData(hrgn, size, data); - size = data->rdh.nCount; - HeapFree(GetProcessHeap(), 0, data); - return size; -} - static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, const ENHMETARECORD *emr, int n_objs, LPARAM param) { @@ -2716,6 +2702,8 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, static void test_emf_clipping(void) { + char buffer[100]; + RGNDATA *rgndata = (RGNDATA *)buffer; static const RECT rc = { 0, 0, 100, 100 }; RECT rc_clip = { 100, 100, 1024, 1024 }; HWND hwnd; @@ -2790,15 +2778,13 @@ static void test_emf_clipping(void) wine_dbgstr_rect(&rc_res)); ret = IntersectClipRect(hdc, 0, 0, 100, 100); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); - if (ret == COMPLEXREGION) - { - /* XP returns COMPLEXREGION although region contains only 1 rect */ - ret = GetClipRgn(hdc, hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - ret = rgn_rect_count(hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - } + todo_wine ok(ret == COMPLEXREGION, "wrong region type %d\n", ret); + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER) + sizeof(RECT), "got %u\n", ret); + ok(rgndata->rdh.nCount == 1, "got %u rectangles\n", rgndata->rdh.nCount); + ok(EqualRect((RECT *)rgndata->Buffer, &rc), "got rect %s\n", wine_dbgstr_rect((RECT *)rgndata->Buffer)); SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); @@ -2807,15 +2793,13 @@ static void test_emf_clipping(void) SetRect(&rc_sclip, 0, 0, 100, 50); ret = ExcludeClipRect(hdc, 0, 50, 100, 100); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); - if (ret == COMPLEXREGION) - { - /* XP returns COMPLEXREGION although region contains only 1 rect */ - ret = GetClipRgn(hdc, hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - ret = rgn_rect_count(hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - } + todo_wine ok(ret == COMPLEXREGION, "wrong region type %d\n", ret); + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER) + sizeof(RECT), "got %u\n", ret); + ok(rgndata->rdh.nCount == 1, "got %u rectangles\n", rgndata->rdh.nCount); + ok(EqualRect((RECT *)rgndata->Buffer, &rc_sclip), "got rect %s\n", wine_dbgstr_rect((RECT *)rgndata->Buffer)); SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); -- 2.24.1

3 7

[PATCH vkd3d 1/2] vkd3d: Add queries for KHR_timeline_semaphore extension.
by Rémi Bernon Jan. 2, 2020

Jan. 2, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- libs/vkd3d/device.c | 23 +++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 3 +++ libs/vkd3d/vulkan_procs.h | 3 +++ 3 files changed, 29 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 757d4ac8..3f99ef9a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -127,6 +127,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), + VK_EXTENSION(KHR_TIMELINE_SEMAPHORE, KHR_timeline_semaphore), /* EXT extensions */ VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), @@ -664,6 +665,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; + VkPhysicalDeviceTimelineSemaphorePropertiesKHR timeline_semaphore_properties; VkPhysicalDeviceProperties2KHR properties2; @@ -675,6 +677,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR timeline_semaphore_features; VkPhysicalDeviceFeatures2 features2; }; @@ -693,8 +696,10 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; VkPhysicalDeviceMaintenance3Properties *maintenance3_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb_properties; + VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore_properties; VkPhysicalDevice physical_device = device->vk_physical_device; VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore_features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; memset(info, 0, sizeof(*info)); @@ -710,6 +715,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vertex_divisor_properties = &info->vertex_divisor_properties; xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + timeline_semaphore_properties = &info->timeline_semaphore_properties; + timeline_semaphore_features = &info->timeline_semaphore_features; info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; @@ -727,6 +734,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->features2, xfb_features); vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; vk_prepend_struct(&info->features2, vertex_divisor_features); + timeline_semaphore_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; + vk_prepend_struct(&info->features2, timeline_semaphore_features); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2)); @@ -745,6 +754,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->properties2, xfb_properties); vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; vk_prepend_struct(&info->properties2, vertex_divisor_properties); + timeline_semaphore_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR; + vk_prepend_struct(&info->properties2, timeline_semaphore_properties); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); @@ -817,6 +828,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment; const VkPhysicalDeviceMaintenance3Properties *maintenance3; const VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb; + const VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore; TRACE("Device limits:\n"); TRACE(" maxImageDimension1D: %u.\n", limits->maxImageDimension1D); @@ -1021,6 +1033,10 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic divisor_properties = &info->vertex_divisor_properties; TRACE(" VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT:\n"); TRACE(" maxVertexAttribDivisor: %u.\n", divisor_properties->maxVertexAttribDivisor); + + timeline_semaphore = &info->timeline_semaphore_properties; + TRACE(" VkPhysicalDeviceTimelineSemaphorePropertiesKHR:\n"); + TRACE(" maxTimelineSemaphoreValueDifference: %u.\n", timeline_semaphore->maxTimelineSemaphoreValueDifference); } static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) @@ -1033,6 +1049,7 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; const VkPhysicalDeviceFeatures *features = &info->features2.features; const VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb; + const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore; TRACE("Device features:\n"); TRACE(" robustBufferAccess: %#x.\n", features->robustBufferAccess); @@ -1165,6 +1182,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev divisor_features->vertexAttributeInstanceRateDivisor); TRACE(" vertexAttributeInstanceRateZeroDivisor: %#x.\n", divisor_features->vertexAttributeInstanceRateZeroDivisor); + + timeline_semaphore = &info->timeline_semaphore_features; + TRACE(" VkPhysicalDeviceTimelineSemaphoreFeaturesKHR:\n"); + TRACE(" timelineSemaphore: %#x.\n", timeline_semaphore->timelineSemaphore); } static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, @@ -1294,6 +1315,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->transform_feedback_queries = physical_device_info->xfb_properties.transformFeedbackQueries; vulkan_info->max_vertex_attrib_divisor = max(physical_device_info->vertex_divisor_properties.maxVertexAttribDivisor, 1); + vulkan_info->max_timeline_semaphore_value_difference = max(physical_device_info->timeline_semaphore_properties.maxTimelineSemaphoreValueDifference, 1); + device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; device->feature_options.OutputMergerLogicOp = features->logicOp; /* SPV_KHR_16bit_storage */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0c031d20..84abcb8d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -100,6 +100,7 @@ struct vkd3d_vulkan_info bool KHR_image_format_list; bool KHR_maintenance3; bool KHR_push_descriptor; + bool KHR_timeline_semaphore; /* EXT device extensions */ bool EXT_conditional_rendering; bool EXT_debug_marker; @@ -116,6 +117,8 @@ struct vkd3d_vulkan_info bool vertex_attrib_zero_divisor; unsigned int max_vertex_attrib_divisor; + uint64_t max_timeline_semaphore_value_difference; + VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index ec29eb45..d080278a 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -206,6 +206,9 @@ VK_DEVICE_EXT_PFN(vkCmdBindTransformFeedbackBuffersEXT) VK_DEVICE_EXT_PFN(vkCmdEndQueryIndexedEXT) VK_DEVICE_EXT_PFN(vkCmdEndTransformFeedbackEXT) +/* VK_KHR_timeline_semaphore */ +VK_DEVICE_EXT_PFN(vkSignalSemaphoreKHR) + #undef VK_INSTANCE_PFN #undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN -- 2.24.0

4 6

[PATCH] user32/tests: Fix a test failure on Windows < Vista.
by Zebediah Figura Jan. 1, 2020

Jan. 1, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/winstation.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index aaa51d560ac..233ce966355 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -68,7 +68,10 @@ static HDESK initial_desktop; static DWORD CALLBACK thread( LPVOID arg ) { HDESK d1, d2; - HWND hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); ok( hwnd != 0, "CreateWindow failed\n" ); d1 = GetThreadDesktop(GetCurrentThreadId()); trace( "thread %p desktop: %p\n", arg, d1 ); @@ -92,9 +95,13 @@ static DWORD CALLBACK thread( LPVOID arg ) "bad last error %d\n", GetLastError() ); DestroyWindow( hwnd ); - ok( SetThreadDesktop( d2 ), "set thread desktop failed\n" ); - d1 = GetThreadDesktop(GetCurrentThreadId()); - ok( d1 == d2, "GetThreadDesktop did not return set desktop %p/%p\n", d1, d2 ); + ret = SetThreadDesktop( d2 ); + ok(ret || broken(!ret) /* < Vista */, "failed to set desktop, error %u\n", GetLastError()); + if (ret) + { + d1 = GetThreadDesktop(GetCurrentThreadId()); + ok( d1 == d2, "GetThreadDesktop did not return set desktop %p/%p\n", d1, d2 ); + } print_object( d2 ); if (arg < (LPVOID)5) { -- 2.24.0

2 4

[PATCH] kernel32/tests: Fix a test failure on Windows 10.
by Zebediah Figura Dec. 31, 2019

Dec. 31, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/virtual.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 952c1054c83..120e9f16f02 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -122,8 +122,11 @@ static void test_VirtualAllocEx(void) ok( bytes_written == 0, "%lu bytes written\n", bytes_written ); b = ReadProcessMemory(hProcess, addr1, src, alloc_size, &bytes_read); ok( !b, "ReadProcessMemory succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); + ok( GetLastError() == ERROR_NOACCESS || + GetLastError() == ERROR_PARTIAL_COPY, /* win10 v1607+ */ + "wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_NOACCESS) + ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); b = VirtualProtect( src, 0x2000, PAGE_NOACCESS, &old_prot ); ok( b, "VirtualProtect failed error %u\n", GetLastError() ); @@ -135,8 +138,11 @@ static void test_VirtualAllocEx(void) ok( bytes_written == 0, "%lu bytes written\n", bytes_written ); b = ReadProcessMemory(hProcess, addr1, src, alloc_size, &bytes_read); ok( !b, "ReadProcessMemory succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); + ok( GetLastError() == ERROR_NOACCESS || + GetLastError() == ERROR_PARTIAL_COPY, /* win10 v1607+ */ + "wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_NOACCESS) + ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); b = pVirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError()); -- 2.24.0

1 0

[PATCH] include: Update DWRITE_INFORMATIONAL_STRING_ID enum.
by Nikolay Sivov Dec. 31, 2019

Dec. 31, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite.idl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index bfb2c1b37d..b92b1544e0 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -127,12 +127,18 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_LICENSE_INFO_URL, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT, DWRITE_INFORMATIONAL_STRING_FULL_NAME, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, - DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME + DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME, + DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, + DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, + DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, } DWRITE_INFORMATIONAL_STRING_ID; typedef enum DWRITE_FONT_SIMULATIONS -- 2.24.1

1 0

[PATCH] po: Fix typo in Catalan translation
by Alex Henrie Dec. 31, 2019

Dec. 31, 2019

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ca.po b/po/ca.po index 7255f30d38..59c69ea6d3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-26 18:54-0700\n" +"PO-Revision-Date: 2019-12-31 11:39-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -17115,7 +17115,7 @@ msgstr "" "[/A] Només copiar els fitxers amb l'atribut d'arxiu establert.\n" "[/M] Només copiar els fitxers amb l'atribut d'arxiu establert, elimina\n" "\tl'atribut d'arxiu.\n" -"[/K] Copiar els atributs de fitxer; sense això, no se preserven els\n" +"[/K] Copiar els atributs de fitxer; sense això, no es preserven els\n" " atributs.\n" "[/D | /D:m-d-y] Copiar els fitxers nous o els modificats després de la data\n" "\t\tproveïda.\n" -- 2.24.1

1 0

win32 on macOS
by Fabian Maurer Dec. 31, 2019

Dec. 31, 2019

Hello wine-devel, is there any documentation on how the CodeWeavers solution for 32bit Applications on Catalina works? I'm interested in the technical details of this miracle, but there don't seem to be many details out there. What I found was either on the superficial level, or a bunch of speculation. Regards, Fabian Maurer

4 9

Wine Gecko 2.47.1 is not compatible with Python 2 or 3
by Michael Cronenworth Dec. 31, 2019

Dec. 31, 2019

Hi Jacek, Trying to build 2.47.1 on Fedora Rawhide (32) results in failures for both Python 3 and Python 2. Python 3: ... File "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/testing/mozbase/mozinfo/mozinfo/mozinfo.py", line 93, in <module> (distro, os_version, codename) = platform.dist() AttributeError: module 'platform' has no attribute 'dist' Python 2: ... File "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/build/mach_bootstrap.py", line 331 print(NO_MERCURIAL_SETUP.format(mach=sys.argv[0]), file=sys.stderr) ^ SyntaxError: invalid syntax Am I missing something? Thanks, Michael

2 10

[PATCH] kernel32: Exclude IsBadStringPtrA() from relay traces.
by Zebediah Figura Dec. 30, 2019

Dec. 30, 2019

It messes up 16-bit relay traces due to krnl386's use of debugstr_a(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a87747bf61..c115fd3d75 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -971,7 +971,7 @@ @ stdcall IsBadHugeReadPtr(ptr long) @ stdcall IsBadHugeWritePtr(ptr long) @ stdcall IsBadReadPtr(ptr long) -@ stdcall IsBadStringPtrA(ptr long) +@ stdcall -norelay IsBadStringPtrA(ptr long) @ stdcall IsBadStringPtrW(ptr long) @ stdcall IsBadWritePtr(ptr long) # @ stub IsCalendarLeapDay -- 2.24.1

2 1

[PATCH v2 1/3] ntdll: Handle unaligned condition variables when using futexes.
by Zebediah Figura Dec. 30, 2019

Dec. 30, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48389 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/sync.c | 76 ++++++++++++++++----------- dlls/ntdll/sync.c | 105 ++++++++++++++++++++++++++++++------- 2 files changed, 132 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40cad1c4c5..477a35287d 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1718,10 +1718,18 @@ static void test_condvars_consumer_producer(void) /* Sample test for some sequence of events happening, sequenced using "condvar_seq" */ static DWORD condvar_seq = 0; -static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; +static CONDITION_VARIABLE aligned_cv; static CRITICAL_SECTION condvar_crit; static SRWLOCK condvar_srwlock; +#include "pshpack1.h" +static struct +{ + char c; + CONDITION_VARIABLE cv; +} unaligned_cv; +#include "poppack.h" + /* Sequence of wake/sleep to check boundary conditions: * 0: init * 1: producer emits a WakeConditionVariable without consumer waiting. @@ -1741,28 +1749,31 @@ static SRWLOCK condvar_srwlock; * 12: producer (shared) wakes up consumer (shared) * 13: end */ -static DWORD WINAPI condvar_base_producer(LPVOID x) { +static DWORD WINAPI condvar_base_producer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; + while (condvar_seq < 1) Sleep(1); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); condvar_seq = 2; while (condvar_seq < 3) Sleep(1); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); condvar_seq = 4; while (condvar_seq < 5) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 6) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 8) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); Sleep(50); LeaveCriticalSection (&condvar_crit); @@ -1772,36 +1783,38 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 9) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 10) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 11) Sleep(1); pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); while (condvar_seq < 12) Sleep(1); Sleep(50); /* ensure that consumer waits for cond variable */ pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); return 0; } -static DWORD WINAPI condvar_base_consumer(LPVOID x) { +static DWORD WINAPI condvar_base_consumer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; BOOL ret; while (condvar_seq < 2) Sleep(1); /* wake was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); @@ -1811,33 +1824,33 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { /* wake all was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 5; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wake\n"); EnterCriticalSection (&condvar_crit); condvar_seq = 6; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wakeall\n"); condvar_seq = 7; EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 8; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); @@ -1851,25 +1864,25 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 9; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 10; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 11; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 12; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); @@ -1877,12 +1890,12 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { return 0; } -static void test_condvars_base(void) { +static void test_condvars_base(RTL_CONDITION_VARIABLE *cv) +{ HANDLE hp, hc; DWORD dummy; BOOL ret; - if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ win_skip("no condition variable support.\n"); @@ -1895,7 +1908,7 @@ static void test_condvars_base(void) { pInitializeSRWLock(&condvar_srwlock); EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); @@ -1904,23 +1917,23 @@ static void test_condvars_base(void) { if (pInitializeSRWLock) { pAcquireSRWLockExclusive(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); pAcquireSRWLockShared(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); } - - hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); - hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); + condvar_seq = 0; + hp = CreateThread(NULL, 0, condvar_base_producer, cv, 0, &dummy); + hc = CreateThread(NULL, 0, condvar_base_consumer, cv, 0, &dummy); condvar_seq = 1; /* go */ @@ -2728,7 +2741,8 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); - test_condvars_base(); + test_condvars_base(&aligned_cv); + test_condvars_base(&unaligned_cv.cv); test_condvars_consumer_producer(); test_srwlock_base(); test_srwlock_example(); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0dc6fc3390..302b4cc7e0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -115,6 +115,16 @@ static inline int use_futexes(void) return supported; } +static int *get_futex(void **ptr) +{ + if (sizeof(void *) == 8) + return (int *)((((ULONG_PTR)ptr) + 3) & ~3); + else if (!(((ULONG_PTR)ptr) & 3)) + return (int *)ptr; + else + return NULL; +} + static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2179,32 +2189,83 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) } #ifdef __linux__ -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +static NTSTATUS fast_wait_cv( int *futex, int val, const LARGE_INTEGER *timeout ) { struct timespec timespec; int ret; - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) { timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + ret = futex_wait( futex, val, &timespec ); } else - ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + ret = futex_wait( futex, val, NULL ); if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; return STATUS_WAIT_0; } +static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + RtlLeaveCriticalSection( cs ); + status = fast_wait_cv( futex, val, timeout ); + RtlEnterCriticalSection( cs ); + return status; +} + +static NTSTATUS fast_sleep_srw_cv( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = fast_wait_cv( futex, val, timeout ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} + static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { + int *futex; + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - futex_wake( (int *)&variable->Ptr, count ); + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + interlocked_xchg_add( futex, 1 ); + futex_wake( futex, count ); return STATUS_SUCCESS; } #else @@ -2252,9 +2313,11 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressSingle( variable ); + } } /*********************************************************************** @@ -2264,9 +2327,11 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressAll( variable ); + } } /*********************************************************************** @@ -2288,15 +2353,15 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; - - RtlLeaveCriticalSection( crit ); + int val; - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_sleep_cs_cv( variable, crit, timeout )) != STATUS_NOT_IMPLEMENTED) + return status; + val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); - return status; } @@ -2323,15 +2388,19 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; + int val; + + if ((status = fast_sleep_srw_cv( variable, lock, timeout, flags )) != STATUS_NOT_IMPLEMENTED) + return status; + + val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); -- 2.24.1

1 2

[PATCH 1/2] ntdll: Handle unaligned condition variables when using futexes.
by Zebediah Figura Dec. 30, 2019

Dec. 30, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48389 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/sync.c | 76 ++++++++++++++++----------- dlls/ntdll/sync.c | 105 ++++++++++++++++++++++++++++++------- 2 files changed, 132 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40cad1c4c5..477a35287d 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1718,10 +1718,18 @@ static void test_condvars_consumer_producer(void) /* Sample test for some sequence of events happening, sequenced using "condvar_seq" */ static DWORD condvar_seq = 0; -static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; +static CONDITION_VARIABLE aligned_cv; static CRITICAL_SECTION condvar_crit; static SRWLOCK condvar_srwlock; +#include "pshpack1.h" +static struct +{ + char c; + CONDITION_VARIABLE cv; +} unaligned_cv; +#include "poppack.h" + /* Sequence of wake/sleep to check boundary conditions: * 0: init * 1: producer emits a WakeConditionVariable without consumer waiting. @@ -1741,28 +1749,31 @@ static SRWLOCK condvar_srwlock; * 12: producer (shared) wakes up consumer (shared) * 13: end */ -static DWORD WINAPI condvar_base_producer(LPVOID x) { +static DWORD WINAPI condvar_base_producer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; + while (condvar_seq < 1) Sleep(1); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); condvar_seq = 2; while (condvar_seq < 3) Sleep(1); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); condvar_seq = 4; while (condvar_seq < 5) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 6) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 8) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); Sleep(50); LeaveCriticalSection (&condvar_crit); @@ -1772,36 +1783,38 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 9) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 10) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 11) Sleep(1); pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); while (condvar_seq < 12) Sleep(1); Sleep(50); /* ensure that consumer waits for cond variable */ pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); return 0; } -static DWORD WINAPI condvar_base_consumer(LPVOID x) { +static DWORD WINAPI condvar_base_consumer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; BOOL ret; while (condvar_seq < 2) Sleep(1); /* wake was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); @@ -1811,33 +1824,33 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { /* wake all was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 5; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wake\n"); EnterCriticalSection (&condvar_crit); condvar_seq = 6; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wakeall\n"); condvar_seq = 7; EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 8; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); @@ -1851,25 +1864,25 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 9; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 10; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 11; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 12; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); @@ -1877,12 +1890,12 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { return 0; } -static void test_condvars_base(void) { +static void test_condvars_base(RTL_CONDITION_VARIABLE *cv) +{ HANDLE hp, hc; DWORD dummy; BOOL ret; - if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ win_skip("no condition variable support.\n"); @@ -1895,7 +1908,7 @@ static void test_condvars_base(void) { pInitializeSRWLock(&condvar_srwlock); EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); @@ -1904,23 +1917,23 @@ static void test_condvars_base(void) { if (pInitializeSRWLock) { pAcquireSRWLockExclusive(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); pAcquireSRWLockShared(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); } - - hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); - hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); + condvar_seq = 0; + hp = CreateThread(NULL, 0, condvar_base_producer, cv, 0, &dummy); + hc = CreateThread(NULL, 0, condvar_base_consumer, cv, 0, &dummy); condvar_seq = 1; /* go */ @@ -2728,7 +2741,8 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); - test_condvars_base(); + test_condvars_base(&aligned_cv); + test_condvars_base(&unaligned_cv.cv); test_condvars_consumer_producer(); test_srwlock_base(); test_srwlock_example(); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0dc6fc3390..302b4cc7e0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -115,6 +115,16 @@ static inline int use_futexes(void) return supported; } +static int *get_futex(void **ptr) +{ + if (sizeof(void *) == 8) + return (int *)((((ULONG_PTR)ptr) + 3) & ~3); + else if (!(((ULONG_PTR)ptr) & 3)) + return (int *)ptr; + else + return NULL; +} + static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2179,32 +2189,83 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) } #ifdef __linux__ -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +static NTSTATUS fast_wait_cv( int *futex, int val, const LARGE_INTEGER *timeout ) { struct timespec timespec; int ret; - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) { timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + ret = futex_wait( futex, val, &timespec ); } else - ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + ret = futex_wait( futex, val, NULL ); if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; return STATUS_WAIT_0; } +static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + RtlLeaveCriticalSection( cs ); + status = fast_wait_cv( futex, val, timeout ); + RtlEnterCriticalSection( cs ); + return status; +} + +static NTSTATUS fast_sleep_srw_cv( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = fast_wait_cv( futex, val, timeout ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} + static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { + int *futex; + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - futex_wake( (int *)&variable->Ptr, count ); + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + interlocked_xchg_add( futex, 1 ); + futex_wake( futex, count ); return STATUS_SUCCESS; } #else @@ -2252,9 +2313,11 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressSingle( variable ); + } } /*********************************************************************** @@ -2264,9 +2327,11 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressAll( variable ); + } } /*********************************************************************** @@ -2288,15 +2353,15 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; - - RtlLeaveCriticalSection( crit ); + int val; - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_sleep_cs_cv( variable, crit, timeout )) != STATUS_NOT_IMPLEMENTED) + return status; + val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); - return status; } @@ -2323,15 +2388,19 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; + int val; + + if ((status = fast_sleep_srw_cv( variable, lock, timeout, flags )) != STATUS_NOT_IMPLEMENTED) + return status; + + val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); -- 2.24.1

2 2

[PATCH] msvcp140/tests: Don't trace the current time.
by Francois Gouget Dec. 30, 2019

Dec. 30, 2019

This causes the failure to always look new and the last_write_time value does not really seem useful. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This also only fails on my box, but it does not change the fact that a failure will always look new. dlls/msvcp140/tests/msvcp140.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 751b1beed86..35a650ddbae 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1239,8 +1239,7 @@ static void test_Last_write_time(void) newtime = last_write_time + 222222; p_Set_last_write_time(f1W, newtime); ok(last_write_time != p_Last_write_time(f1W), - "last_write_time should have changed: %s\n", - wine_dbgstr_longlong(last_write_time)); + "last_write_time should have changed\n"); /* test the formula */ file = CreateFileW(f1W, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, -- 2.20.1

2 2

[PATCH] user32/tests: Don't trace the test_topmost() window handles.
by Francois Gouget Dec. 30, 2019

Dec. 30, 2019

They change from one run to the next, causing the failures to always look new. Also for the topmost failures the window handle is irrelevant: all that matters is which window got the wrong results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See the Windows XP failures: https://test.winehq.org/data/fa97cbdf14883fb301dcc0a5264369f8ed184182/xp_fg… For instance: win.c:10896: Test failed: hwnd 02B4007C topmost state is wrong win.c:10899: Test failed: 02B4007C: expected NOT topmost win.c:11126: Test failed: hwnd 00180266 topmost state is wrong dlls/user32/tests/win.c | 278 ++++++++++++++++++++-------------------- 1 file changed, 139 insertions(+), 139 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index bb4eebfd0fa..46784cec43f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10809,99 +10809,99 @@ static void test_topmost(void) state[1] = hwnd; state[2] = hwnd2; - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, 0, hwnd2, owner, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd2, hwnd); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, hwnd2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd2, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(owner, HWND_TOPMOST); todo_wine - ok(is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(owner), "owner should be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(is_topmost(hwnd2), "hwnd2 should be topmost\n"); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd2 should NOT be topmost\n"); if (0) /*win7 64-bit is broken*/ check_z_order(hwnd, hwnd2, 0, owner, FALSE); swp_after(hwnd2, HWND_NOTOPMOST); - ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_BOTTOM); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, hwnd2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); /* FIXME: compensate todo_wine above */ swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); @@ -10921,161 +10921,161 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ state[4] = hwnd_child; state[5] = hwnd_grandchild; - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_grandchild, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_grandchild, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); swp_after(hwnd_child2, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ @@ -11083,23 +11083,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_BOTTOM); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ @@ -11107,23 +11107,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, hwnd_child2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ -- 2.20.1

2 1

[PATCH] msvcrt: Improve strtod precision.
by Piotr Caban Dec. 30, 2019

Dec. 30, 2019

This patch fixes strtod precision regression. It also removes floating points operations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 157 ++++++++++++++++++++++++----------- dlls/ucrtbase/tests/string.c | 20 +++-- 3 files changed, 123 insertions(+), 55 deletions(-)

1 0