- wine-devel - winehq.org

[PATCH 1/5] mfplat/tests: Test rate support for media source.
by Giovanni Mascellani 14 May '21

14 May '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 45 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 65ab72bd57b..605fbc4fe27 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -654,12 +654,15 @@ static void test_source_resolver(void) IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; + IMFGetService *get_service; + IMFRateSupport *rate_support; WCHAR pathW[MAX_PATH]; int i, sample_count; WCHAR *filename; PROPVARIANT var; HRESULT hr; GUID guid; + float rate; if (!pMFCreateSourceResolver) { @@ -763,8 +766,44 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); - check_interface(mediasource, &IID_IMFGetService, TRUE); - check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + hr = IMFMediaSource_QueryInterface(mediasource, &IID_IMFGetService, (void**)&get_service); + ok(hr == S_OK, "Failed to get service interface, hr %#x.\n", hr); + + hr = IMFGetService_GetService(get_service, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void**)&rate_support); + ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); +todo_wine + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); +todo_wine { + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); +} + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); +todo_wine + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); +todo_wine { + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); +} + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); @@ -878,6 +917,8 @@ todo_wine hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFRateSupport_Release(rate_support); + IMFGetService_Release(get_service); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); -- 2.31.1

3 13

[PATCH] winegstreamer: Ensure that the source reports both PCM and floating point audio formats.
by Giovanni Mascellani 14 May '21

14 May '21

From: Derek Lesho <dlesho(a)codeweavers.com> The patch is originally by Derek Lesho, with some changes by Giovanni Mascellani and Nikolay Sivov. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 3 --- dlls/winegstreamer/media_source.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index ded45afe771..e3ff7f6e7aa 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -752,9 +752,6 @@ static void test_source_reader(void) if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); - hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 1, &mediatype); - ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); - /* Current media type. */ hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &mediatype); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..7f308973270 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -806,6 +806,31 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; } } + else if (format.major_type == WG_MAJOR_TYPE_AUDIO) + { + /* Expose at least one PCM and one floating point type for the + consumer to pick from. */ + static const enum wg_audio_format audio_types[] = + { + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_F32LE, + }; + + stream_types = malloc( sizeof(IMFMediaType *) * (ARRAY_SIZE(audio_types) + 1) ); + + stream_types[0] = mf_media_type_from_wg_format(&format); + type_count = 1; + + for (i = 0; i < ARRAY_SIZE(audio_types); i++) + { + struct wg_format new_format; + if (format.u.audio.format == audio_types[i]) + continue; + new_format = format; + new_format.u.audio.format = audio_types[i]; + stream_types[type_count++] = mf_media_type_from_wg_format(&new_format); + } + } else { stream_type = mf_media_type_from_wg_format(&format); -- 2.31.1

2 1

[PATCH v3 1/3] winevulkan: Add support for unwrapping handles in thunks.
by Derek Lesho 14 May '21

14 May '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v3: - Addressed comments - Added missing unhit function declaration preprocessor directive logic to _generate_free_func. --- dlls/winevulkan/make_vulkan | 633 ++++++++++++++++++++++++++++-------- dlls/winevulkan/vulkan.c | 57 +--- 2 files changed, 497 insertions(+), 193 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d5cc62d2097..7abe2740a6d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -204,14 +204,14 @@ FUNCTION_OVERRIDES = { # VK_KHR_get_surface_capabilities2 "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, - "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_win32_surface "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_swapchain - "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkQueuePresentKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, @@ -645,6 +645,18 @@ class VkFunction(object): return False + def needs_unwrapping(self): + """ Check if the function needs any input/output type unwrapping. + Functions need input/output unwrapping if struct parameters have + wrapped handles. + """ + + for p in self.params: + if p.needs_unwrapping(): + return True + + return False + def needs_dispatch(self): return self.dispatch @@ -739,7 +751,7 @@ class VkFunction(object): return body - def body_conversion(self): + def body_conversion(self, conv): body = "" # Declare a variable to hold the result for non-void functions. @@ -748,27 +760,28 @@ class VkFunction(object): # Declare any tmp parameters for conversion. for p in self.params: - if not p.needs_conversion(): - continue - - if p.is_dynamic_array(): - body += " {0}_host *{1}_host;\n".format(p.type, p.name) - else: - body += " {0}_host {1}_host;\n".format(p.type, p.name) + if p.needs_conversion() and conv: + if p.is_dynamic_array(): + body += " {0}_host *{1}_host;\n".format(p.type, p.name) + else: + body += " {0}_host {1}_host;\n".format(p.type, p.name) + elif p.needs_unwrapping(): + if p.is_dynamic_array(): + body += " {0} *{1}_host;\n".format(p.type, p.name) + else: + body += " {0} {1}_host;\n".format(p.type, p.name) if not self.needs_private_thunk(): body += " {0}\n".format(self.trace()) # Call any win_to_host conversion calls. for p in self.params: - if not p.needs_input_conversion(): - continue - - body += p.copy(Direction.INPUT) + if p.needs_input_conversion() and (p.needs_unwrapping() or conv): + body += p.copy(Direction.INPUT) # Build list of parameters containing converted and non-converted parameters. # The param itself knows if conversion is needed and applies it when we set conv=True. - params = ", ".join([p.variable(conv=True) for p in self.params]) + params = ", ".join([p.variable(conv=conv) for p in self.params]) # Call the native Vulkan function. if self.type == "void": @@ -787,10 +800,8 @@ class VkFunction(object): # Perform any required cleanups. Most of these are for array functions. for p in self.params: - if not p.needs_free(): - continue - - body += p.free() + if p.needs_free() and (p.needs_unwrapping() or conv): + body += p.free() # Finally return the result. if self.type != "void": @@ -840,10 +851,15 @@ class VkFunction(object): if self.needs_conversion(): thunk += "#if defined(USE_STRUCT_CONVERSION)\n" - thunk += self.body_conversion() + thunk += self.body_conversion(conv=True) thunk += "#else\n" - thunk += self.body() + if self.needs_unwrapping(): + thunk += self.body_conversion(conv=False) + else: + thunk += self.body() thunk += "#endif\n" + elif self.needs_unwrapping(): + thunk += self.body_conversion(conv=False) else: thunk += self.body() @@ -1063,6 +1079,12 @@ class VkHandle(object): def is_wrapped(self): return self.native_handle("test") is not None + def needs_conversion(self): + return False + + def needs_unwrapping(self): + return self.is_wrapped() + class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, values=None): @@ -1148,10 +1170,11 @@ class VkMember(object): return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values) - def copy(self, input, output, direction): - """ Helper method for use by conversion logic to generate a C-code statement to copy this member. """ + def copy(self, input, output, direction, conv): + """ Helper method for use by conversion logic to generate a C-code statement to copy this member. + - `conv` indicates whether the statement is in a struct alignment conversion path. """ - if self.needs_conversion(): + if (conv and self.needs_conversion()) or self.needs_unwrapping(): if self.is_dynamic_array(): if direction == Direction.OUTPUT: LOGGER.warn("TODO: implement copying of returnedonly dynamic array for {0}.{1}".format(self.type, self.name)) @@ -1167,6 +1190,12 @@ class VkMember(object): else: # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) + elif self.is_handle() and self.needs_unwrapping(): + if direction == Direction.OUTPUT: + LOGGER.err("OUTPUT parameter {0}.{1} cannot be unwrapped".format(self.type, self.name)) + else: + handle = self.type_info["data"] + return "{0}{1} = {2};\n".format(output, self.name, handle.driver_handle("{0}{1}".format(input, self.name))) else: if direction == Direction.OUTPUT: return "convert_{0}_host_to_win(&{2}{1}, &{3}{1});\n".format(self.type, self.name, input, output) @@ -1178,6 +1207,36 @@ class VkMember(object): else: return "{0}{1} = {2}{1};\n".format(output, self.name, input) + def free(self, location, conv): + """ Helper method for use by conversion logic to generate a C-code statement to free this member. """ + + if not self.needs_unwrapping() and not conv: + return "" + + # Add a cast to ignore const on conversion structs we allocated ourselves. + # sample expected output: (VkSparseMemoryBind_host *) + if self.is_const(): + cast = "(" + self.type + if self.needs_conversion() and conv: + cast += "_host" + cast += " *)" + else: + cast = "" + + if self.is_dynamic_array(): + count = self.dyn_array_len if isinstance(self.dyn_array_len, int) else "{0}{1}".format(location, self.dyn_array_len) + if self.is_struct() and self.type_info["data"].returnedonly: + # For returnedonly, counts is stored in a pointer. + return "free_{0}_array({1}{2}{3}, *{4});\n".format(self.type, cast, location, self.name, count) + else: + return "free_{0}_array({1}{2}{3}, {4});\n".format(self.type, cast, location, self.name, count) + else: + # We are operating on a single structure. Some structs (very rare) contain dynamic members, + # which would need freeing. + if self.needs_free(): + return "free_{0}({1}&{2}{3});\n".format(self.type, cast, location, self.name) + return "" + def definition(self, align=False, conv=False): """ Generate prototype for given function. @@ -1216,31 +1275,34 @@ class VkMember(object): # Check if we need conversion either for this member itself or for any child members # in case member represents a struct. - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return None conversions = [] # Collect any conversion for any member structs. - struct = self.type_info["data"] - for m in struct: - m.needs_struct_extensions_conversion() - if m.needs_conversion(): - conversions.extend(m.get_conversions()) + if self.is_struct(): + struct = self.type_info["data"] + for m in struct: + m.needs_struct_extensions_conversion() + if m.needs_conversion() or m.needs_unwrapping(): + conversions.extend(m.get_conversions()) - struct.needs_struct_extensions_conversion() + struct.needs_struct_extensions_conversion() + direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT + elif self.is_handle(): + direction = Direction.INPUT - struct = self.type_info["data"] - direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT + operand = self.type_info["data"] if self.is_dynamic_array(): - conversions.append(ConversionFunction(False, True, direction, struct)) + conversions.append(ConversionFunction(False, True, direction, operand)) elif self.is_static_array(): - conversions.append(ConversionFunction(True, False, direction, struct)) + conversions.append(ConversionFunction(True, False, direction, operand)) else: - conversions.append(ConversionFunction(False, False, direction, struct)) + conversions.append(ConversionFunction(False, False, direction, operand)) if self.needs_free(): - conversions.append(FreeFunction(self.is_dynamic_array(), struct)) + conversions.append(FreeFunction(self.is_dynamic_array(), operand)) return conversions @@ -1307,8 +1369,21 @@ class VkMember(object): struct = self.type_info["data"] return struct.needs_conversion() + def needs_unwrapping(self): + """ Structures with wrapped handles need unwrapping. """ + + if self.is_struct(): + struct = self.type_info["data"] + return struct.needs_unwrapping() + + if self.is_handle(): + handle = self.type_info["data"] + return handle.is_wrapped() + + return False + def needs_free(self): - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return False if self.is_dynamic_array(): @@ -1392,21 +1467,23 @@ class VkParam(object): self.free_func = None self.input_conv = None self.output_conv = None - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return + operand = self.struct if self.is_struct() else self.handle + # Input functions require win to host conversion. if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: - self.input_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.INPUT, self.struct) + self.input_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.INPUT, operand) # Output functions require host to win conversion. if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: - self.output_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.OUTPUT, self.struct) + self.output_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.OUTPUT, operand) # Dynamic arrays, but also some normal structs (e.g. VkCommandBufferBeginInfo) need memory # allocation and thus some cleanup. if self.is_dynamic_array() or self.struct.needs_free(): - self.free_func = FreeFunction(self.is_dynamic_array(), self.struct) + self.free_func = FreeFunction(self.is_dynamic_array(), operand) def _set_direction(self): """ Internal helper function to set parameter direction (input/output/input_output). """ @@ -1544,7 +1621,7 @@ class VkParam(object): def free(self): if self.is_dynamic_array(): - if self.struct.returnedonly: + if self.is_struct() and self.struct.returnedonly: # For returnedonly, counts is stored in a pointer. return " free_{0}_array({1}_host, *{2});\n".format(self.type, self.name, self.dyn_array_len) else: @@ -1552,7 +1629,7 @@ class VkParam(object): else: # We are operating on a single structure. Some structs (very rare) contain dynamic members, # which would need freeing. - if self.struct.needs_free(): + if self.is_struct() and self.struct.needs_free(): return " free_{0}(&{1}_host);\n".format(self.type, self.name) return "" @@ -1563,14 +1640,14 @@ class VkParam(object): required. """ - if not self.is_struct(): + if self.is_struct(): + self.struct.needs_struct_extensions_conversion() + for m in self.struct: + m.needs_struct_extensions_conversion() + elif not self.is_handle(): return None - self.struct.needs_struct_extensions_conversion() - for m in self.struct: - m.needs_struct_extensions_conversion() - - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return None conversions = [] @@ -1578,14 +1655,15 @@ class VkParam(object): # Collect any member conversions first, so we can guarantee # those functions will be defined prior to usage by the # 'parent' param requiring conversion. - for m in self.struct: - if not m.is_struct(): - continue + if self.is_struct(): + for m in self.struct: + if not m.is_struct(): + continue - if not m.needs_conversion(): - continue + if not m.needs_conversion() and not m.needs_unwrapping(): + continue - conversions.extend(m.get_conversions()) + conversions.extend(m.get_conversions()) # Conversion requirements for the 'parent' parameter. if self.input_conv is not None: @@ -1641,6 +1719,18 @@ class VkParam(object): return False + def needs_unwrapping(self): + """ Returns if parameter needs unwrapping of handle. """ + + # Wrapped handle parameters are handled seperately, only look for wrapped handles in structs + if self.is_struct(): + return self.struct.needs_unwrapping() + + if self.is_handle() and self.is_dynamic_array(): + return self.handle.needs_unwrapping() + + return False + def needs_free(self): return self.free_func is not None @@ -1691,7 +1781,7 @@ class VkParam(object): LOGGER.debug("TODO: setting NULL VkAllocationCallbacks for {0}".format(self.name)) return "NULL" - if conv and self.needs_conversion(): + if self.needs_unwrapping() or (conv and self.needs_conversion()): if self.is_dynamic_array(): return "{0}_host".format(self.name) else: @@ -1880,6 +1970,14 @@ class VkStruct(Sequence): return True return False + def needs_unwrapping(self): + """ Returns if struct members need unwrapping of handle. """ + + for m in self.members: + if m.needs_unwrapping(): + return True + return False + def needs_free(self): """ Check if any struct member needs some memory freeing.""" @@ -1897,7 +1995,10 @@ class VkStruct(Sequence): for e in self.struct_extensions: if e.required and e.needs_conversion(): - LOGGER.error("Unhandled pNext chain conversion for {0}".format(e.name)) + LOGGER.error("Unhandled pNext chain alignment conversion for {0}".format(e.name)) + ret = True + if e.required and e.needs_unwrapping(): + LOGGER.error("Unhandled pNext chain unwrapping conversion for {0}".format(e.name)) ret = True return ret @@ -1913,12 +2014,12 @@ class VkStruct(Sequence): class ConversionFunction(object): - def __init__(self, array, dyn_array, direction, struct): + def __init__(self, array, dyn_array, direction, operand): self.array = array self.direction = direction self.dyn_array = dyn_array - self.struct = struct - self.type = struct.name + self.operand = operand + self.type = operand.name self._set_name() @@ -1926,21 +2027,44 @@ class ConversionFunction(object): return self.name == other.name def _generate_array_conversion_func(self): - """ Helper function for generating a conversion function for array structs. """ + """ Helper function for generating a conversion function for array operands. """ + + body = "" + + if self.operand.needs_conversion(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "uint32_t count"] + return_type = self.type + else: + params = ["const {0} *in".format(self.type), "uint32_t count"] + return_type = "{0}_host".format(self.type) + + # Generate function prototype. + body += "static inline {0} *{1}(".format(return_type, self.name) + body += ", ".join(p for p in params) + body += ")\n{\n" + + body += " {0} *out;\n".format(return_type) + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "uint32_t count"] - return_type = self.type - else: params = ["const {0} *in".format(self.type), "uint32_t count"] - return_type = "{0}_host".format(self.type) + return_type = "{0}".format(self.type) - # Generate function prototype. - body = "static inline {0} *{1}(".format(return_type, self.name) - body += ", ".join(p for p in params) - body += ")\n{\n" + # Generate function prototype. + body += "static inline {0} *{1}(".format(return_type, self.name) + body += ", ".join(p for p in params) + body += ")\n{\n" + + body += " {0} *out;\n".format(return_type) + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" - body += " {0} *out;\n".format(return_type) body += " unsigned int i;\n\n" body += " if (!in) return NULL;\n\n" @@ -1949,33 +2073,82 @@ class ConversionFunction(object): body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - # TODO: support copying of pNext extension structures! - # Luckily though no extension struct at this point needs conversion. - body += " " + m.copy("in[i].", "out[i].", self.direction) + if isinstance(self.operand, VkStruct): + for m in self.operand: + # TODO: support copying of pNext extension structures! + # Luckily though no extension struct at this point needs conversion. + convert = m.copy("in[i].", "out[i].", self.direction, conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in[i].", "out[i].", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#else\n" + body += " " + unwrap + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: + body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" + else: + LOGGER.warn("Unhandled conversion operand type") + body += " out[i] = in[i];\n" body += " }\n\n" body += " return out;\n" - body += "}\n\n" + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "\n" + return body def _generate_conversion_func(self): - """ Helper function for generating a conversion function for non-array structs. """ + """ Helper function for generating a conversion function for non-array operands. """ - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type)] - else: - params = ["const {0} *in".format(self.type), "{0}_host *out".format(self.type)] + # It doesn't make sense to generate conversion functions for non-struct variables + # which aren't in arrays, as this should be handled by the copy() function + if not isinstance(self.operand, VkStruct): + return "" - body = "static inline void {0}(".format(self.name) + body = "" - # Generate parameter list - body += ", ".join(p for p in params) - body += ")\n{\n" + if self.operand.needs_conversion(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += "static inline void {0}(".format(self.name) - body += " if (!in) return;\n\n" + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type)] + else: + params = ["const {0} *in".format(self.type), "{0}_host *out".format(self.type)] + + # Generate parameter list + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + body += "static inline void {0}(".format(self.name) - if self.direction == Direction.INPUT and "pNext" in self.struct and self.struct.returnedonly: + params = ["const {0} *in".format(self.type), "{0} *out".format(self.type)] + + # Generate parameter list + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "{\n if (!in) return;\n\n" + + if self.direction == Direction.INPUT and "pNext" in self.operand and self.operand.returnedonly: # We are dealing with an input_output parameter. For these we only need to copy # pNext and sType as the other fields are filled in by the host. We do potentially # have to iterate over pNext and perform conversions based on switch(sType)! @@ -1984,36 +2157,96 @@ class ConversionFunction(object): body += " out->pNext = in->pNext;\n" body += " out->sType = in->sType;\n" else: - for m in self.struct: + for m in self.operand: # TODO: support copying of pNext extension structures! - body += " " + m.copy("in->", "out->", self.direction) + convert = m.copy("in->", "out->", self.direction, conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in->", "out->", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#else\n" + body += " " + unwrap + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "\n" - body += "}\n\n" return body def _generate_static_array_conversion_func(self): - """ Helper function for generating a conversion function for array structs. """ + """ Helper function for generating a conversion function for array operands. """ - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - else: - params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] + body = "" + + if self.operand.needs_conversion(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] + else: + params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] - # Generate function prototype. - body = "static inline void {0}(".format(self.name) - body += ", ".join(p for p in params) - body += ")\n{\n" + # Generate function prototype. + body += "static inline void {0}(".format(self.name) + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + params = ["const {0} *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] + + # Generate function prototype. + body += "static inline void {0}(".format(self.name) + body += ", ".join(p for p in params) + body += ")\n" + + body += "{\n" body += " unsigned int i;\n\n" body += " if (!in) return;\n\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - # TODO: support copying of pNext extension structures! - body += " " + m.copy("in[i].", "out[i].", self.direction) + if isinstance(self.operand, VkStruct): + for m in self.operand: + # TODO: support copying of pNext extension structures! + convert = m.copy("in[i].", "out[i].", self.direction, conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in[i].", "out[i].", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#else\n" + body += " " + unwrap + body += "#endif /* USE_STRUCT_CONVERSION */\n" + elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: + body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" + else: + LOGGER.warn("Unhandled conversion operand type") + body += " out[i] = in[i];\n" body += " }\n" - body += "}\n\n" + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION) */\n" + + body += "\n" + return body def _set_name(self): @@ -2044,10 +2277,10 @@ class ConversionFunction(object): class FreeFunction(object): - def __init__(self, dyn_array, struct): + def __init__(self, dyn_array, operand): self.dyn_array = dyn_array - self.struct = struct - self.type = struct.name + self.operand = operand + self.type = operand.name if dyn_array: self.name = "free_{0}_array".format(self.type) @@ -2060,52 +2293,120 @@ class FreeFunction(object): def _generate_array_free_func(self): """ Helper function for cleaning up temporary buffers required for array conversions. """ - # Generate function prototype. - body = "static inline void {0}({1}_host *in, uint32_t count)\n{{\n".format(self.name, self.type) + body = "" + + if self.operand.needs_conversion(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + # Generate function prototype. + body += "static inline void {0}({1}_host *in, uint32_t count)\n".format(self.name, self.type) + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + # Generate function prototype. + body += "static inline void {0}({1} *in, uint32_t count)\n".format(self.name, self.type) + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "{\n" # E.g. VkGraphicsPipelineCreateInfo_host needs freeing for pStages. - if self.struct.needs_free(): + if isinstance(self.operand, VkStruct) and self.operand.needs_free(): body += " unsigned int i;\n\n" body += " if (!in) return;\n\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) + for m in self.operand: + if m.needs_free(): + convert = m.free("in[i].", conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert else: - body += " free_{0}_array(in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) - elif m.needs_conversion(): - LOGGER.error("Unhandled conversion for {0}".format(m.name)) + unwrap = m.free("in[i].", conv=False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#endif /* USE_STRUCT_CONVERSION */\n" + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#else\n" + body += " " + unwrap + body += "#endif /* USE_STRUCT_CONVERSION */\n" body += " }\n" else: body += " if (!in) return;\n\n" body += " free(in);\n" - body += "}\n\n" + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "\n" + return body def _generate_free_func(self): # E.g. VkCommandBufferBeginInfo.pInheritanceInfo needs freeing. - if not self.struct.needs_free(): + if not self.operand.needs_free(): return "" - # Generate function prototype. - body = "static inline void {0}({1}_host *in)\n{{\n".format(self.name, self.type) + if not isinstance(self.operand, VkStruct): + return "" - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - count = m.dyn_array_len if isinstance(m.dyn_array_len, int) else "in->{0}".format(m.dyn_array_len) - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in->{1}, {2});\n".format(m.type, m.name, count) + body = "" + + if self.operand.needs_conversion(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + # Generate function prototype. + body += "static inline void {0}({1}_host *in)\n".format(self.name, self.type) + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + # Generate function prototype. + body += "static inline void {0}({1} *in)\n".format(self.name, self.type) + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "{\n" + + for m in self.operand: + if m.needs_free(): + convert = m.free("in->", conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert else: - body += " free_{0}_array(in->{1}, {2});\n".format(m.type, m.name, count) + unwrap = m.free("in->", conv=False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#endif /* USE_STRUCT_CONVERSION */\n" + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#else\n" + body += " " + unwrap + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "\n" - body += "}\n\n" return body def definition(self): @@ -2168,7 +2469,16 @@ class StructChainConversionFunction(object): if m.name == "pNext": body += " out->pNext = NULL;\n" else: - body += " " + m.copy("in->", "out->", self.direction) + convert = m.copy("in->", "out->", self.direction, conv=True) + unwrap = m.copy("in->", "out->", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#else\n" + body += " " + unwrap + body += "#endif /* USE_STRUCT_CONVERSION */\n" body += "\n out_header->pNext = (VkBaseOutStructure *)out;\n" body += " out_header = out_header->pNext;\n" @@ -2212,7 +2522,47 @@ class FreeStructChainFunction(object): body += " while (header)\n" body += " {\n" - body += " void *prev = header;\n" + body += " void *prev = header;\n\n" + body += " switch (header->sType)\n" + body += " {\n" + + for e in self.struct.struct_extensions: + if not e.required: + continue + + if not any(m.needs_free() for m in e): + continue + + stype = next(x for x in e.members if x.name == "sType") + + body += " case {0}:\n".format(stype.values) + body += " {\n" + body += " {0} *structure = ({0} *) header;\n".format(e.name) + + for m in e: + if m.needs_free(): + convert = m.free("structure->", conv=True) + unwrap = m.free("structure->", conv=False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#endif /* USE_STRUCT_CONVERSION */\n" + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n" + body += " " + convert + body += "#else\n" + body += " " + unwrap + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += " break;\n" + body += " }\n" + + body += " default:\n" + body += " break;\n" + body += " }\n" + body += " header = header->pNext;\n" body += " free(prev);\n" body += " }\n\n" @@ -2235,7 +2585,7 @@ class VkGenerator(object): if not func.is_required(): continue - if not func.needs_conversion(): + if not func.needs_conversion() and not func.needs_unwrapping(): continue conversions = func.get_conversions() @@ -2246,15 +2596,26 @@ class VkGenerator(object): if not any(c == conv for c in self.conversions): self.conversions.append(conv) + if not isinstance(conv.operand, VkStruct): + continue + # Structs can be used in different ways by different conversions # e.g. array vs non-array. Just make sure we pull in each struct once. - if not any(s.name == conv.struct.name for s in self.host_structs): - self.host_structs.append(conv.struct) + if not any(s.name == conv.operand.name for s in self.host_structs): + self.host_structs.append(conv.operand) for struct in self.registry.structs: if struct.name in STRUCT_CHAIN_CONVERSIONS: self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct)) self.struct_chain_conversions.append(FreeStructChainFunction(struct)) + # Once we decide to support pNext chains conversion everywhere, move this under get_conversions + for e in struct.struct_extensions: + for m in e: + if m.needs_conversion() or m.needs_unwrapping(): + conversions = m.get_conversions() + for conv in conversions: + if not any(c == conv for c in self.conversions): + self.conversions.append(conv) def _generate_copyright(self, f, spec_file=False): f.write("# " if spec_file else "/* ") @@ -2281,10 +2642,8 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") # Generate any conversion helper functions. - f.write("#if defined(USE_STRUCT_CONVERSION)\n") for conv in self.conversions: f.write(conv.definition()) - f.write("#endif /* USE_STRUCT_CONVERSION */\n\n") for conv in self.struct_chain_conversions: f.write(conv.definition()) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 45eda78e997..69440c7a374 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -360,20 +360,12 @@ static void wine_vk_device_get_queues(struct VkDevice_T *device, static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) { - VkDeviceGroupDeviceCreateInfo *group_info; - - if ((group_info = wine_vk_find_struct(create_info, DEVICE_GROUP_DEVICE_CREATE_INFO))) - { - free((void *)group_info->pPhysicalDevices); - } - free_VkDeviceCreateInfo_struct_chain(create_info); } static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, VkDeviceCreateInfo *dst) { - VkDeviceGroupDeviceCreateInfo *group_info; unsigned int i; VkResult res; @@ -385,23 +377,6 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src return res; } - /* FIXME: convert_VkDeviceCreateInfo_struct_chain() should unwrap handles for us. */ - if ((group_info = wine_vk_find_struct(dst, DEVICE_GROUP_DEVICE_CREATE_INFO))) - { - VkPhysicalDevice *physical_devices; - - if (!(physical_devices = calloc(group_info->physicalDeviceCount, sizeof(*physical_devices)))) - { - free_VkDeviceCreateInfo_struct_chain(dst); - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - for (i = 0; i < group_info->physicalDeviceCount; ++i) - { - physical_devices[i] = group_info->pPhysicalDevices[i]->phys_dev; - } - group_info->pPhysicalDevices = physical_devices; - } - /* Should be filtered out by loader as ICDs don't support layers. */ dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; @@ -1540,19 +1515,6 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } -VkResult WINAPI wine_vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *create_info, - const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain) -{ - VkSwapchainCreateInfoKHR native_info; - - TRACE("%p, %p, %p, %p\n", device, create_info, allocator, swapchain); - - native_info = *create_info; - native_info.surface = wine_surface_from_handle(create_info->surface)->driver_surface; - - return thunk_vkCreateSwapchainKHR(device, &native_info, allocator, swapchain); -} - VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *createInfo, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { @@ -1601,19 +1563,6 @@ void WINAPI wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, free(object); } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice phys_dev, - const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, uint32_t *formats_count, VkSurfaceFormat2KHR *formats) -{ - VkPhysicalDeviceSurfaceInfo2KHR native_info; - - TRACE("%p, %p, %p, %p\n", phys_dev, surface_info, formats_count, formats); - - native_info = *surface_info; - native_info.surface = wine_surface_from_handle(surface_info->surface)->driver_surface; - - return thunk_vkGetPhysicalDeviceSurfaceFormats2KHR(phys_dev, &native_info, formats_count, formats); -} - static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile @@ -1647,15 +1596,11 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) { - VkPhysicalDeviceSurfaceInfo2KHR native_info; VkResult res; TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); - native_info = *surface_info; - native_info.surface = wine_surface_from_handle(surface_info->surface)->driver_surface; - - res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &native_info, capabilities); + res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, surface_info, capabilities); if (res == VK_SUCCESS) adjust_max_image_count(phys_dev, &capabilities->surfaceCapabilities); -- 2.31.1

3 8

[PATCH] kernel32/tests: Fix the spelling of a comment.
by Francois Gouget 14 May '21

14 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/debugger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 55f92a5acd3..467aec11105 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1868,7 +1868,7 @@ static void test_debugger(const char *argv0) next_event(&ctx, POLL_EVENT_TIMEOUT); - /* try single step while debugee is in a syscall */ + /* try single step while debuggee is in a syscall */ fetch_thread_context(ctx.main_thread); orig_context = ctx.main_thread->ctx; ip = get_ip(&ctx.main_thread->ctx); -- 2.20.1

2 1

[PATCH] urlmon/tests: Fix the spelling of a comment.
by Francois Gouget 14 May '21

14 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2142e4a79e7..eb58bb54550 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1569,7 +1569,7 @@ static void test_user_agent(void) todo_wine #endif /* This assumes that either p points at some property before - * '; .NET', or that there is more than one such occurence. + * '; .NET', or that there is more than one such occurrence. */ ok(strstr(p, "; .NET") != NULL, "no '; .NET' in %s\n", wine_dbgstr_a(p)); p = strchr(p, ')'); -- 2.20.1

1 0

[PATCH] winegcc: Use msvcrt by default for PE targets.
by Jacek Caban 14 May '21

14 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It's still not the default when wine objdir is specified to allow using mingw CRT in Wine PE-only builds. tools/winegcc/winegcc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0

[PATCH 6/6] msvcrt: Import nexttowardf implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 41 ++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 36 insertions(+), 21 deletions(-)

1 0

[PATCH 5/6] msvcrt: Call nextafter in nexttoward implementation.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 8 +------- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 1 insertion(+), 23 deletions(-)

1 0

[PATCH 4/6] msvcrt: Import nextafterf implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 37 insertions(+), 13 deletions(-)

1 0

[PATCH 3/6] msvcrt: Import nextafter implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 45 ++++++++++++++++++++++++++++++++++++------- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 38 insertions(+), 17 deletions(-)

1 0

[PATCH 2/6] msvcrt: Import neabyint implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 1/6] msvcrt: Import neabyintf implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 1/4] user32/tests: Recreate the window to make it more likely to have focus.
by Rémi Bernon 14 May '21

14 May '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- * PATCH 1/4 should help with these spurious failures: input.c:2789: Test failed: 15: expected WM_INPUT message input.c:2792: Test failed: 15: expected RIM_INPUT message The root cause is the desktop window getting foreground when we try to change focus from the thread window back to the main window that is created topmost. X11 focus out / focus in events receiving order sometimes make winex11.drv decide to give the desktop window focus and this ends up with the WM_INPUT messages not being delivered. * PATCH 2/4 just skips the recurrent failure on Chinese:China locale. * PATCH 3/4 and PATCH 4/4 which also (Superseding 205693) are trying to fix the following spurious failures: input.c:2162: Test failed: GetRawInputBuffer returned 4 input.c:2157: Test failed: GetRawInputBuffer returned unexpected size: 0 input.c:2162: Test failed: GetRawInputBuffer returned 0 input.c:2163: Test failed: GetRawInputBuffer returned unexpected size: 0 input.c:2164: Test failed: Unexpected rawinput data: 0 input.c:2165: Test failed: Unexpected rawinput data: 0 input.c:2166: Test failed: Unexpected rawinput data: 0 input.c:2224: Test failed: GetRawInputData succeeded input.c:2225: Test failed: GetRawInputData returned deadbeef input.c:2338: Test failed: Spurious WM_INPUT messages I've got no idea if they really do, as I'm not yet able to reproduce them consistently when submitting the patches manually. Submitting patches from the M-L seem to trigger the failures more reliably. So if they don't I guess they could just be ignored. dlls/user32/tests/input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3d4f0d03d0d..8c67fc67cb3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2758,6 +2758,10 @@ static void test_rawinput(const char* argv0) { case 14: case 15: + DestroyWindow(hwnd); + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); SetForegroundWindow(hwnd); empty_message_queue(); -- 2.31.0

2 9

[PATCH 1/3] reg/tests: Add missing return code checks
by Hugh McMaster 14 May '21

14 May '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/export.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 27d70b6a663..d2598dd8d48 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -335,6 +335,7 @@ static void test_export(void) "\"Wine2a\"=hex(1):\n" "\"Wine2b\"=hex(3):\n" "\"Wine2c\"=hex(4):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine2a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine2b", REG_BINARY, NULL, 0, 0); @@ -351,6 +352,7 @@ static void test_export(void) "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" "\"Wine3b\"=hex(3):12,34,56,78\n" "\"Wine3c\"=hex(4):40,30,20,10\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); memcpy(hex, "\x12\x34\x56\x78", 4); -- 2.31.1

1 2

[PATCH] include: Add more PROPERTYKEY declarations in propkey.h.
by Biswapriyo Nath 14 May '21

14 May '21

1 0

[tools] winetest/build-patterns: Add a testdesc CSS class.
by Francois Gouget 14 May '21

14 May '21

It is needed to maintain a 4 pixel space between the description and the englobing testfile box. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 2 +- winetest/report.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index c9fcb6638..06d527f50 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1074,7 +1074,7 @@ sub write_pattern($$$) compute_set_colors($test->{colors}); - print $html $test->{desc} if (defined $test->{desc}); + print $html "<div class='testtext'>$test->{desc}</div>\n" if (defined $test->{desc}); print $html "<div class='test'>\n"; write_newmodes_line($html, $test) if (%{$test->{newmodes}}); diff --git a/winetest/report.css b/winetest/report.css index 4c9197250..f78980830 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -28,6 +28,12 @@ div.output, div.test { margin: 0; } +div.testtext { + text-align: left; + padding: 0 0 0 4px; + margin: 0; +} + div.updownbar { padding: 4px; margin-bottom: 5px; -- 2.20.1

1 0

[PATCH 1/6] server: Poll for FD_CLOSE even if we cannot receive more data.
by Zebediah Figura 14 May '21

14 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 6 +++--- server/sock.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 266ddc14451..9116c2b169d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4455,12 +4455,12 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); ret = recv(server, buffer, 5, 0); @@ -4553,7 +4553,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_event(ctx, FD_CLOSE, 0, 200); + check_events_todo(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index c8cd603149b..92202d317c4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -786,8 +786,7 @@ static int sock_get_poll_events( struct fd *fd ) else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - else if (sock->type == WS_SOCK_STREAM && (sock->state & FD_READ) && (mask & FD_CLOSE) && - !(sock->reported_events & FD_READ)) + else if (sock->type == WS_SOCK_STREAM && (mask & FD_CLOSE) && !(sock->reported_events & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q )) -- 2.30.2

1 5

[PATCH] kernel32/tests: Use sizeof(STARTUPINFOEX) for STARTUPINFOEX.STARTUPINFO.cb in process tests.
by Paul Gofman 13 May '21

13 May '21

Fixes some test failures on a few Testbot machines when the process attributes are just ignored. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..7d5d2ead75b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4073,7 +4073,7 @@ static void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); if (level) { @@ -4221,7 +4221,7 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); si.lpAttributeList = heap_alloc(size); ret = pInitializeProcThreadAttributeList(si.lpAttributeList, 1, 0, &size); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); -- 2.31.1

1 0

[PATCH 1/4] slc: Return a non-zero handle from SLOpen.
by Esme Povirk 13 May '21

13 May '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/slc/slc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index b246a7dfc1a..d36ce88c4fd 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -74,5 +74,10 @@ HRESULT WINAPI SLOpen(HSLC *handle) { FIXME("(%p) stub\n", handle ); + if (!handle) + return E_INVALIDARG; + + *handle = (HSLC)0xdeadbeef; + return S_OK; } -- 2.25.1

3 6

[PATCH] include: Fix denormals handling in _fpclassf inline implementation.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- include/msvcrt/math.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

1 0

[PATCH 9/9] ucrtbase: Copy fenv tests from msvcr120.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 162 +++++++++++++++++++++++++++++++++++++ include/msvcrt/fenv.h | 1 + 2 files changed, 163 insertions(+)

3 2

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 13 May '21

13 May '21

1 0

[PATCH 8/9] ucrtbase: Store sse and x87 exception in fexcept_t.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH 7/9] ucrtbase: Store sse and x87 status in fegetenv function family.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 220 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 191 insertions(+), 29 deletions(-)

1 0

[PATCH 6/9] msvcr120: Don't modify fenv_t members in _except1.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)

1 0

[PATCH 5/9] msvcr120: Don't modify fenv_t members in math functions.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-)

1 0

[PATCH 4/9] msvcr120: Add feraiseexcept implementation.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 3/9] msvcr120: Add feupdateenv tests.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

1 0

[PATCH 2/9] msvcr120: Add feupdateenv implementation.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH 1/9] msvcr120: Fix setting status word in fesetenv.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)

1 0

[PATCH] ws2_32: Add support for hints in GetAddrInfoExW.
by Hans Leidekker 13 May '21

13 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/protocol.c | 18 +++++++++++++----- dlls/ws2_32/tests/protocol.c | 24 +++++++++++++++++++++++- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 64af105f0b9..15616fdaf34 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -568,6 +568,7 @@ struct getaddrinfo_args ADDRINFOEXW **result; char *nodename; char *servname; + struct WS_addrinfo *hints; }; static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *context) @@ -579,7 +580,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co struct WS_addrinfo *res; int ret; - ret = WS_getaddrinfo( args->nodename, args->servname, NULL, &res ); + ret = WS_getaddrinfo( args->nodename, args->servname, args->hints, &res ); if (res) { *args->result = addrinfo_list_AtoW(res); @@ -660,12 +661,21 @@ static int WS_getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, goto end; } - if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) ))) goto end; + if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) + sizeof(*args->hints) ))) goto end; args->overlapped = overlapped; args->completion_routine = completion_routine; args->result = res; args->nodename = nodenameA; args->servname = servnameA; + if (hints) + { + args->hints = (struct WS_addrinfo *)(args + 1); + args->hints->ai_flags = hints->ai_flags; + args->hints->ai_family = hints->ai_family; + args->hints->ai_socktype = hints->ai_socktype; + args->hints->ai_protocol = hints->ai_protocol; + } + else args->hints = NULL; overlapped->Internal = WSAEINPROGRESS; if (!TrySubmitThreadpoolCallback( getaddrinfo_callback, args, NULL )) @@ -714,14 +724,12 @@ int WINAPI GetAddrInfoExW( const WCHAR *name, const WCHAR *servname, DWORD names FIXME( "Unsupported namespace %u\n", namespace ); if (namespace_id) FIXME( "Unsupported namespace_id %s\n", debugstr_guid(namespace_id) ); - if (hints) - FIXME( "Unsupported hints\n" ); if (timeout) FIXME( "Unsupported timeout\n" ); if (handle) FIXME( "Unsupported cancel handle\n" ); - ret = WS_getaddrinfoW( name, servname, NULL, result, overlapped, completion_routine ); + ret = WS_getaddrinfoW( name, servname, (struct WS_addrinfo *)hints, result, overlapped, completion_routine ); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 8937e84d63f..27ef6ff92aa 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1599,7 +1599,7 @@ static void test_GetAddrInfoExW(void) static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR nxdomain[] = {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; - ADDRINFOEXW *result; + ADDRINFOEXW *result, hints; OVERLAPPED overlapped; HANDLE event; int ret; @@ -1666,6 +1666,28 @@ static void test_GetAddrInfoExW(void) ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); pFreeAddrInfoExW(result); + /* hints */ + result = (void *)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_ALL | AI_V4MAPPED; + hints.ai_family = AF_INET6; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_protocol = IPPROTO_UDP; + ret = pGetAddrInfoExW(winehq, NULL, NS_ALL, NULL, &hints, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(result != NULL, "result == NULL\n"); + pFreeAddrInfoExW(result); + result = (void *)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); ResetEvent(event); -- 2.30.2

2 1

[PATCH v3 1/2] server: Support nested jobs.
by Paul Gofman 13 May '21

13 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - remove a spurious line break. v3: - fix compiler warnings in test messages on 32 bit. dlls/kernel32/tests/process.c | 181 +++++++++++++++++++++++++++++++++- server/process.c | 148 ++++++++++++++++++++------- 2 files changed, 289 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..5622a854608 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -71,6 +71,7 @@ static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFla static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); +static HANDLE (WINAPI *pOpenJobObjectA)(DWORD access, BOOL inherit, LPCSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); @@ -257,6 +258,8 @@ static BOOL init(void) pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pOpenJobObjectA = (void *)GetProcAddress(hkernel32, "OpenJobObjectA"); + pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); @@ -2976,13 +2979,14 @@ static void test_jobInheritance(HANDLE job) wait_and_close_child_process(&pi); } -static void test_BreakawayOk(HANDLE job) +static void test_BreakawayOk(HANDLE parent_job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; char buffer[MAX_PATH + 23]; - BOOL ret, out; + BOOL ret, out, nested_jobs; + HANDLE job; if (!pIsProcessInJob) { @@ -2990,6 +2994,16 @@ static void test_BreakawayOk(HANDLE job) return; } + job = pCreateJobObjectW(NULL, NULL); + ok(!!job, "CreateJobObjectW error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* before Win 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + nested_jobs = ret; + if (!ret) + win_skip("Nested jobs are not supported.\n"); + sprintf(buffer, "\"%s\" process exit", selfname); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); @@ -3001,8 +3015,30 @@ static void test_BreakawayOk(HANDLE job) wait_and_close_child_process(&pi); } + if (nested_jobs) + { + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + sprintf(buffer, "\"%s\" process exit", selfname); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA error %u\n", GetLastError()); + + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + wait_and_close_child_process(&pi); + } + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; - ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ret = pSetInformationJobObject(parent_job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); ok(ret, "SetInformationJobObject error %u\n", GetLastError()); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); @@ -3012,6 +3048,10 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + wait_and_close_child_process(&pi); limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; @@ -4309,6 +4349,135 @@ static void test_dead_process(void) CloseHandle(pi.hThread); } +static void test_nested_jobs_child(unsigned int index) +{ + HANDLE job, job_parent, job_other; + PROCESS_INFORMATION pi; + char job_name[32]; + BOOL ret, out; + + sprintf(job_name, "test_nested_jobs_%u", index); + job = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job, "OpenJobObjectA error %u\n", GetLastError()); + + sprintf(job_name, "test_nested_jobs_%u", !index); + job_other = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job_other, "OpenJobObjectA error %u\n", GetLastError()); + + job_parent = pCreateJobObjectW(NULL, NULL); + ok(!!job_parent, "CreateJobObjectA error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job_parent, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job_parent, pi.hProcess); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* Supported since Windows 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + if (!ret) + { + win_skip("Nested jobs are not supported.\n"); + goto done; + } + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(GetCurrentProcess(), job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + create_process("wait", &pi); + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job_parent, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + if (index) + { + ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); + ok(!ret, "AssignProcessToJobObject succeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } +done: + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job_parent); + CloseHandle(job); + CloseHandle(job_other); +} + +static void test_nested_jobs(void) +{ + PROCESS_INFORMATION info[2]; + char buffer[MAX_PATH + 26]; + STARTUPINFOA si = {0}; + HANDLE job1, job2; + unsigned int i; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + sprintf(buffer, "\"%s\" process nested_jobs 0", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[0]), + "CreateProcess failed\n"); + wait_child_process(info[0].hProcess); + sprintf(buffer, "\"%s\" process nested_jobs 1", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[1]), + "CreateProcess failed\n"); + wait_child_process(info[1].hProcess); + for (i = 0; i < 2; ++i) + { + CloseHandle(info[i].hProcess); + CloseHandle(info[i].hThread); + } + + CloseHandle(job1); + CloseHandle(job2); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4384,6 +4553,11 @@ START_TEST(process) test_handle_list_attribute(TRUE, h, h2); return; } + else if (!strcmp(myARGV[2], "nested_jobs") && myARGC >= 4) + { + test_nested_jobs_child(atoi(myARGV[3])); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -4452,6 +4626,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); test_WaitForJobObject(); + test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job); diff --git a/server/process.c b/server/process.c index 17abd9800d2..8ff4fc51558 100644 --- a/server/process.c +++ b/server/process.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/time.h> +#include <stdint.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -182,7 +183,7 @@ static void job_destroy( struct object *obj ); struct job { struct object obj; /* object header */ - struct list process_list; /* list of all processes */ + struct list process_list; /* list of processes */ int num_processes; /* count of running processes */ int total_processes; /* count of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ @@ -190,6 +191,9 @@ struct job int signaled; /* job is signaled */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ + struct job *parent; + struct list parent_job_entry; /* list entry for parent job */ + struct list child_job_list; /* list of child jobs */ }; static const struct object_ops job_ops = @@ -227,6 +231,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ { /* initialize it if it didn't already exist */ list_init( &job->process_list ); + list_init( &job->child_job_list ); job->num_processes = 0; job->total_processes = 0; job->limit_flags = 0; @@ -234,6 +239,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ job->signaled = 0; job->completion_port = NULL; job->completion_key = 0; + job->parent = NULL; } } return job; @@ -250,14 +256,68 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi add_completion( job->completion_port, job->completion_key, pid, STATUS_SUCCESS, msg ); } +static int walk_job( struct job *job, void *param, int (*callback)( struct job *, void * )) +{ + struct job *j, *next; + + LIST_FOR_EACH_ENTRY_SAFE( j, next, &job->child_job_list, struct job, parent_job_entry ) + { + assert( j->parent == job ); + if (walk_job( j, param, callback )) return 1; + } + return callback( job, param ); +} + +static int process_in_job( struct job *job, void *param ) +{ + struct process *process = param; + + assert( process->obj.ops == &process_ops ); + return process->job == job; +} + static void add_job_process( struct job *job, struct process *process ) { + process_id_t pid; + struct job *j; + + if (job == process->job) return; + + if (process->job) + { + list_remove( &process->job_entry ); + if (job->parent) + { + j = job->parent; + while (j && j != process->job) + j = j->parent; + + if (!j) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + release_object( process->job ); + } + else + { + job->parent = process->job; + list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); + } + } + + pid = get_process_id( process ); + j = job; + while (j != process->job) + { + j->num_processes++; + j->total_processes++; + add_job_completion( j, JOB_OBJECT_MSG_NEW_PROCESS, pid ); + j = j->parent; + } + process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); - job->num_processes++; - job->total_processes++; - - add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); } /* called when a process has terminated, allow one additional process */ @@ -265,40 +325,42 @@ static void release_job_process( struct process *process ) { struct job *job = process->job; - if (!job) return; + while (job) + { + assert( job->num_processes ); + job->num_processes--; - assert( job->num_processes ); - job->num_processes--; + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); - if (!job->terminating) - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->num_processes) + add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); - if (!job->num_processes) - add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); + job = job->parent; + } } -static void terminate_job( struct job *job, int exit_code ) +static int terminate_job_processes( struct job *job, void *exit_code ) { + struct process *process, *next; + /* don't report completion events for terminated processes */ job->terminating = 1; - for (;;) /* restart from the beginning of the list every time */ + LIST_FOR_EACH_ENTRY_SAFE( process, next, &job->process_list, struct process, job_entry ) { - struct process *process; - - /* find the first process associated with this job and still running */ - LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) - { - if (process->running_threads) break; - } - if (&process->job_entry == &job->process_list) break; /* no process found */ assert( process->job == job ); - terminate_process( process, NULL, exit_code ); + if (process->running_threads) terminate_process( process, NULL, (uintptr_t)exit_code ); } - job->terminating = 0; job->signaled = 1; wake_up( &job->obj, 0 ); + return 0; +} + +static void terminate_job( struct job *job, int exit_code ) +{ + walk_job( job, (void *)(uintptr_t)exit_code, terminate_job_processes ); } static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) @@ -320,16 +382,23 @@ static void job_destroy( struct object *obj ) assert( obj->ops == &job_ops ); assert( !job->num_processes ); - assert( list_empty(&job->process_list) ); + assert( list_empty( &job->process_list )); + assert( list_empty( &job->child_job_list )); if (job->completion_port) release_object( job->completion_port ); + if (job->parent) + { + list_remove( &job->parent_job_entry ); + release_object( job->parent ); + } } static void job_dump( struct object *obj, int verbose ) { struct job *job = (struct job *)obj; assert( obj->ops == &job_ops ); - fprintf( stderr, "Job processes=%d\n", list_count(&job->process_list) ); + fprintf( stderr, "Job processes=%d child_jobs=%d parent=%p\n", + list_count(&job->process_list), list_count(&job->child_job_list), job->parent ); } static int job_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -1021,6 +1090,7 @@ DECL_HANDLER(new_process) struct thread *parent_thread = current; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); const obj_handle_t *handles = NULL; + struct job *job; if (socket_fd == -1) { @@ -1057,6 +1127,8 @@ DECL_HANDLER(new_process) } else parent = (struct process *)grab_object( current->process ); + /* If a job further in the job chain does not permit breakaway process creation + * succeeds and the process which is trying to breakaway is assigned to that job. */ if (parent->job && (req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) && !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) { @@ -1147,11 +1219,17 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (parent->job - && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) - && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + job = parent->job; + while (job) { - add_job_process( parent->job, process ); + if (!(job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK) + && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY + && job->limit_flags & JOB_OBJECT_LIMIT_BREAKAWAY_OK)) + { + add_job_process( job, process ); + break; + } + job = job->parent; } /* connect to the window station */ @@ -1561,12 +1639,8 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - if (!process->running_threads) - set_error( STATUS_PROCESS_IS_TERMINATING ); - else if (process->job) - set_error( STATUS_ACCESS_DENIED ); - else - add_job_process( job, process ); + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else add_job_process( job, process ); release_object( process ); } release_object( job ); @@ -1588,7 +1662,7 @@ DECL_HANDLER(process_in_job) } else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) { - set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + set_error( walk_job( job, process, process_in_job ) ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); release_object( job ); } release_object( process ); -- 2.31.1

2 4

[PATCH] reg/tests: Add data tests for the 'copy' command
by Hugh McMaster 13 May '21

13 May '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/copy.c | 136 ++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 30 ++++---- programs/reg/tests/reg_test.h | 7 ++ 3 files changed, 158 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 0d245dae4da..7126b00d50e 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -122,6 +122,140 @@ static void test_command_syntax(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_copy_empty_key(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, NULL); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); +} + +static void test_copy_simple_data(void) +{ + HKEY hkey; + DWORD r, dword; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + close_key(hkey); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); +} + START_TEST(copy) { DWORD r; @@ -132,4 +266,6 @@ START_TEST(copy) } test_command_syntax(); + test_copy_empty_key(); + test_copy_simple_data(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index daf42f66e3e..27d70b6a663 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -18,9 +18,8 @@ #include "reg_test.h" -#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) -static BOOL compare_export_(const char *file, unsigned line, const char *filename, - const char *expected, DWORD todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo) { FILE *fp; long file_size; @@ -64,6 +63,17 @@ error: return FALSE; } +const char *empty_key_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + +const char *simple_data_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; + + /* Unit tests */ static void test_export(void) @@ -73,16 +83,6 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - const char *empty_key_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; - - const char *simple_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"DWORD\"=dword:00000100\r\n" - "\"String\"=\"Your text here...\"\r\n\r\n"; - const char *complex_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" @@ -243,12 +243,12 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); /* Test whether a .reg file extension is required when exporting */ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " foo /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("foo", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("foo", simple_data_test, 0), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 6718e91096f..3f4677a7a69 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -74,6 +74,13 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, #define delete_value(k,n) delete_value_(__FILE__,__LINE__,k,n) void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name); +/* export.c */ +#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo); +extern const char *empty_key_test; +extern const char *simple_data_test; + /* import.c */ #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) #define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r) -- 2.31.1

1 0

Announcing OSPP Summer Code 2021
by litimetal＠gmail.com 13 May '21

13 May '21

Hi All, I'm glad to announce that OSPP Summer Code 2021 has selected Wine. I've created a wiki page for it: https://wiki.winehq.org/index.php?title=Ospp_Summer_Code We have a tight schedule[1]. Please don't hesitate to share your proposals. I also created a brainstorming section https://wiki.winehq.org/Ospp_Summer_Code#Brain_Storming Note, easy projects and doc-related proposals are acceptable in OSPP Summer. [1]: https://summer.iscas.ac.cn/help/en/timeline/ Sincerely,Zhenbo Li

2 1

[PATCH v2 1/2] server: Support nested jobs.
by Paul Gofman 13 May '21

13 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - remove a spurious line break. dlls/kernel32/tests/process.c | 181 +++++++++++++++++++++++++++++++++- server/process.c | 148 ++++++++++++++++++++------- 2 files changed, 289 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..1063b153a3d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -71,6 +71,7 @@ static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFla static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); +static HANDLE (WINAPI *pOpenJobObjectA)(DWORD access, BOOL inherit, LPCSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); @@ -257,6 +258,8 @@ static BOOL init(void) pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pOpenJobObjectA = (void *)GetProcAddress(hkernel32, "OpenJobObjectA"); + pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); @@ -2976,13 +2979,14 @@ static void test_jobInheritance(HANDLE job) wait_and_close_child_process(&pi); } -static void test_BreakawayOk(HANDLE job) +static void test_BreakawayOk(HANDLE parent_job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; char buffer[MAX_PATH + 23]; - BOOL ret, out; + BOOL ret, out, nested_jobs; + HANDLE job; if (!pIsProcessInJob) { @@ -2990,6 +2994,16 @@ static void test_BreakawayOk(HANDLE job) return; } + job = pCreateJobObjectW(NULL, NULL); + ok(!!job, "CreateJobObjectW error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* before Win 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + nested_jobs = ret; + if (!ret) + win_skip("Nested jobs are not supported.\n"); + sprintf(buffer, "\"%s\" process exit", selfname); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); @@ -3001,8 +3015,30 @@ static void test_BreakawayOk(HANDLE job) wait_and_close_child_process(&pi); } + if (nested_jobs) + { + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + sprintf(buffer, "\"%s\" process exit", selfname); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA error %u\n", GetLastError()); + + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + wait_and_close_child_process(&pi); + } + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; - ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ret = pSetInformationJobObject(parent_job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); ok(ret, "SetInformationJobObject error %u\n", GetLastError()); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); @@ -3012,6 +3048,10 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + wait_and_close_child_process(&pi); limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; @@ -4309,6 +4349,135 @@ static void test_dead_process(void) CloseHandle(pi.hThread); } +static void test_nested_jobs_child(unsigned int index) +{ + HANDLE job, job_parent, job_other; + PROCESS_INFORMATION pi; + char job_name[32]; + BOOL ret, out; + + sprintf(job_name, "test_nested_jobs_%u", index); + job = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job, "OpenJobObjectA error %u\n", GetLastError()); + + sprintf(job_name, "test_nested_jobs_%u", !index); + job_other = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job_other, "OpenJobObjectA error %u\n", GetLastError()); + + job_parent = pCreateJobObjectW(NULL, NULL); + ok(!!job_parent, "CreateJobObjectA error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job_parent, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job_parent, pi.hProcess); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* Supported since Windows 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + if (!ret) + { + win_skip("Nested jobs are not supported.\n"); + goto done; + } + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(GetCurrentProcess(), job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + create_process("wait", &pi); + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job_parent, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + if (index) + { + ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); + ok(!ret, "AssignProcessToJobObject succeded\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } +done: + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job_parent); + CloseHandle(job); + CloseHandle(job_other); +} + +static void test_nested_jobs(void) +{ + PROCESS_INFORMATION info[2]; + char buffer[MAX_PATH + 26]; + STARTUPINFOA si = {0}; + HANDLE job1, job2; + unsigned int i; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + sprintf(buffer, "\"%s\" process nested_jobs 0", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[0]), + "CreateProcess failed\n"); + wait_child_process(info[0].hProcess); + sprintf(buffer, "\"%s\" process nested_jobs 1", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[1]), + "CreateProcess failed\n"); + wait_child_process(info[1].hProcess); + for (i = 0; i < 2; ++i) + { + CloseHandle(info[i].hProcess); + CloseHandle(info[i].hThread); + } + + CloseHandle(job1); + CloseHandle(job2); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4384,6 +4553,11 @@ START_TEST(process) test_handle_list_attribute(TRUE, h, h2); return; } + else if (!strcmp(myARGV[2], "nested_jobs") && myARGC >= 4) + { + test_nested_jobs_child(atoi(myARGV[3])); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -4452,6 +4626,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); test_WaitForJobObject(); + test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job); diff --git a/server/process.c b/server/process.c index 17abd9800d2..8ff4fc51558 100644 --- a/server/process.c +++ b/server/process.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/time.h> +#include <stdint.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -182,7 +183,7 @@ static void job_destroy( struct object *obj ); struct job { struct object obj; /* object header */ - struct list process_list; /* list of all processes */ + struct list process_list; /* list of processes */ int num_processes; /* count of running processes */ int total_processes; /* count of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ @@ -190,6 +191,9 @@ struct job int signaled; /* job is signaled */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ + struct job *parent; + struct list parent_job_entry; /* list entry for parent job */ + struct list child_job_list; /* list of child jobs */ }; static const struct object_ops job_ops = @@ -227,6 +231,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ { /* initialize it if it didn't already exist */ list_init( &job->process_list ); + list_init( &job->child_job_list ); job->num_processes = 0; job->total_processes = 0; job->limit_flags = 0; @@ -234,6 +239,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ job->signaled = 0; job->completion_port = NULL; job->completion_key = 0; + job->parent = NULL; } } return job; @@ -250,14 +256,68 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi add_completion( job->completion_port, job->completion_key, pid, STATUS_SUCCESS, msg ); } +static int walk_job( struct job *job, void *param, int (*callback)( struct job *, void * )) +{ + struct job *j, *next; + + LIST_FOR_EACH_ENTRY_SAFE( j, next, &job->child_job_list, struct job, parent_job_entry ) + { + assert( j->parent == job ); + if (walk_job( j, param, callback )) return 1; + } + return callback( job, param ); +} + +static int process_in_job( struct job *job, void *param ) +{ + struct process *process = param; + + assert( process->obj.ops == &process_ops ); + return process->job == job; +} + static void add_job_process( struct job *job, struct process *process ) { + process_id_t pid; + struct job *j; + + if (job == process->job) return; + + if (process->job) + { + list_remove( &process->job_entry ); + if (job->parent) + { + j = job->parent; + while (j && j != process->job) + j = j->parent; + + if (!j) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + release_object( process->job ); + } + else + { + job->parent = process->job; + list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); + } + } + + pid = get_process_id( process ); + j = job; + while (j != process->job) + { + j->num_processes++; + j->total_processes++; + add_job_completion( j, JOB_OBJECT_MSG_NEW_PROCESS, pid ); + j = j->parent; + } + process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); - job->num_processes++; - job->total_processes++; - - add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); } /* called when a process has terminated, allow one additional process */ @@ -265,40 +325,42 @@ static void release_job_process( struct process *process ) { struct job *job = process->job; - if (!job) return; + while (job) + { + assert( job->num_processes ); + job->num_processes--; - assert( job->num_processes ); - job->num_processes--; + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); - if (!job->terminating) - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->num_processes) + add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); - if (!job->num_processes) - add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); + job = job->parent; + } } -static void terminate_job( struct job *job, int exit_code ) +static int terminate_job_processes( struct job *job, void *exit_code ) { + struct process *process, *next; + /* don't report completion events for terminated processes */ job->terminating = 1; - for (;;) /* restart from the beginning of the list every time */ + LIST_FOR_EACH_ENTRY_SAFE( process, next, &job->process_list, struct process, job_entry ) { - struct process *process; - - /* find the first process associated with this job and still running */ - LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) - { - if (process->running_threads) break; - } - if (&process->job_entry == &job->process_list) break; /* no process found */ assert( process->job == job ); - terminate_process( process, NULL, exit_code ); + if (process->running_threads) terminate_process( process, NULL, (uintptr_t)exit_code ); } - job->terminating = 0; job->signaled = 1; wake_up( &job->obj, 0 ); + return 0; +} + +static void terminate_job( struct job *job, int exit_code ) +{ + walk_job( job, (void *)(uintptr_t)exit_code, terminate_job_processes ); } static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) @@ -320,16 +382,23 @@ static void job_destroy( struct object *obj ) assert( obj->ops == &job_ops ); assert( !job->num_processes ); - assert( list_empty(&job->process_list) ); + assert( list_empty( &job->process_list )); + assert( list_empty( &job->child_job_list )); if (job->completion_port) release_object( job->completion_port ); + if (job->parent) + { + list_remove( &job->parent_job_entry ); + release_object( job->parent ); + } } static void job_dump( struct object *obj, int verbose ) { struct job *job = (struct job *)obj; assert( obj->ops == &job_ops ); - fprintf( stderr, "Job processes=%d\n", list_count(&job->process_list) ); + fprintf( stderr, "Job processes=%d child_jobs=%d parent=%p\n", + list_count(&job->process_list), list_count(&job->child_job_list), job->parent ); } static int job_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -1021,6 +1090,7 @@ DECL_HANDLER(new_process) struct thread *parent_thread = current; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); const obj_handle_t *handles = NULL; + struct job *job; if (socket_fd == -1) { @@ -1057,6 +1127,8 @@ DECL_HANDLER(new_process) } else parent = (struct process *)grab_object( current->process ); + /* If a job further in the job chain does not permit breakaway process creation + * succeeds and the process which is trying to breakaway is assigned to that job. */ if (parent->job && (req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) && !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) { @@ -1147,11 +1219,17 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (parent->job - && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) - && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + job = parent->job; + while (job) { - add_job_process( parent->job, process ); + if (!(job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK) + && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY + && job->limit_flags & JOB_OBJECT_LIMIT_BREAKAWAY_OK)) + { + add_job_process( job, process ); + break; + } + job = job->parent; } /* connect to the window station */ @@ -1561,12 +1639,8 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - if (!process->running_threads) - set_error( STATUS_PROCESS_IS_TERMINATING ); - else if (process->job) - set_error( STATUS_ACCESS_DENIED ); - else - add_job_process( job, process ); + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else add_job_process( job, process ); release_object( process ); } release_object( job ); @@ -1588,7 +1662,7 @@ DECL_HANDLER(process_in_job) } else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) { - set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + set_error( walk_job( job, process, process_in_job ) ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); release_object( job ); } release_object( process ); -- 2.31.1

2 3

[PATCH 2/5] user32: Use wait_graphics_driver_ready() in load_desktop_driver().
by Zhiyi Zhang 13 May '21

13 May '21

So that Wine doesn't have to send an extra WM_NULL message when wait_graphics_driver_ready() is later called in EnumDisplayDevicesW(). Also, it avoids a deadlock when wait_graphics_driver_ready() is used in later patches. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/user_private.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1c3b62eff2b..87c8cd621b3 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -55,7 +55,7 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ - SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ + wait_graphics_driver_ready(); guid_atom = HandleToULong( GetPropW( hwnd, L"__wine_display_device_guid" )); lstrcpyW( key, L"System\\CurrentControlSet\\Control\\Video\\{" ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 55d6d7e53a7..0b4dbfc2d78 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -583,7 +583,7 @@ static void release_display_device_init_mutex( HANDLE mutex ) } /* Wait until graphics driver is loaded by explorer */ -static void wait_graphics_driver_ready(void) +void wait_graphics_driver_ready(void) { static BOOL ready = FALSE; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index db082462f1b..974d18be482 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -258,6 +258,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; +extern void wait_graphics_driver_ready(void) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 1/5] user32/tests: Test only part of the available modes.
by Zhiyi Zhang 13 May '21

13 May '21

Test only 1/10 of the all modes and at most 10 modes because TestBots have a 2 minutes timeout. This reduce the time to run the monitor test from 6 minutes to 25 seconds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50086 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b233970ace..c4416a47259 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -741,6 +741,12 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) { + /* Test 1/10 of all modes and at most 10 modes because TestBots have a 2 mins timeout */ + if (mode >= 10) + break; + if (mode && rand() % 10) + continue; + dm.dmPosition = position; dm.dmFields |= DM_POSITION; /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ -- 2.30.2

1 1

[PATCH] include: Add fUseStandardBidi field in SCRIPT_CONTROL.
by Zhiyi Zhang 13 May '21

13 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/usp10.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/usp10.h b/include/usp10.h index 09416aefe06..b1ff458b598 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -98,7 +98,8 @@ typedef struct tag_SCRIPT_CONTROL { DWORD fNumericOverride :1; DWORD fLegacyBidiClass :1; DWORD fMergeNeutralItems :1; - DWORD fReserved :7; + DWORD fUseStandardBidi :1; + DWORD fReserved :6; } SCRIPT_CONTROL; typedef struct { -- 2.30.2

1 0

[PATCH 5/5] gdi32: Return correct color depth for display DCs in GetDeviceCaps().
by Zhiyi Zhang 13 May '21

13 May '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29184 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 19 ++++++++++++++++++- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/init.c | 2 -- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2ebd018bca..2042701dd45 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -460,7 +460,24 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; } - case BITSPIXEL: return 32; + case BITSPIXEL: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + display = dc->display[0] ? dc->display : NULL; + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode ) + && devmode.dmFields & DM_BITSPERPEL && devmode.dmBitsPerPel) + return devmode.dmBitsPerPel; + } + return 32; + } case PLANES: return 1; case NUMBRUSHES: return -1; case NUMPENS: return -1; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index a232241a1fc..98c4033f762 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2037,7 +2037,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmDisplayFrequency, value); value = GetDeviceCaps(hdc, BITSPIXEL); - todo_wine_if(dm->dmBitsPerPel != 32) ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", dm->dmBitsPerPel, value); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d070c0f1171..ff3d5317697 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,8 +162,6 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case BITSPIXEL: - return screen_bpp; case SIZEPALETTE: return palette_size; default: -- 2.30.2

1 0

[PATCH 4/5] user32/tests: Add display DC color depth tests.
by Zhiyi Zhang 13 May '21

13 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 94 ++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 4940847409d..a232241a1fc 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -1999,7 +2004,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2027,6 +2035,35 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + value = GetDeviceCaps(hdc, BITSPIXEL); + todo_wine_if(dm->dmBitsPerPel != 32) + ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", + dm->dmBitsPerPel, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + /* GetObjectA fails on Win7 and older */ + ok_(__FILE__, line)(ret || broken(!ret), "GetObjectA failed, error %d.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == 32, "Expected bmBitsPixel %d, got %d.\n", 32, + bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) @@ -2050,7 +2087,7 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); - /* Tests after mode changes */ + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) @@ -2072,6 +2109,33 @@ static void test_display_dc(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); } + /* Tests after mode changes to a different color depth */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + break; + } + if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) + { + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + } + else + { + win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); + } + DeleteDC(hdc); /* Test DCs covering a specific monitor */ @@ -2091,7 +2155,7 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); - /* Tests after mode changes */ + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) @@ -2114,7 +2178,33 @@ static void test_display_dc(void) check_display_dc(hdc, &dm2, FALSE); + /* Tests after mode changes to a different color depth */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + break; + } + if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) + { + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + else + { + win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); + } + /* Tests after monitor detach */ + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm2); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) { old_count = GetSystemMetrics(SM_CMONITORS); -- 2.30.2

1 0

[PATCH 3/5] winex11.drv: Support reporting emulated display depth.
by Zhiyi Zhang 13 May '21

13 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 6 ++-- dlls/user32/tests/monitor.c | 3 -- dlls/winex11.drv/settings.c | 64 +++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d854ebcc56d..f1d48639c14 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4061,7 +4061,7 @@ static void test_create_device_from_clipper1(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4240,7 +4240,7 @@ static void test_create_device_from_clipper2(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4418,7 +4418,7 @@ static void test_create_device_from_clipper3(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c4416a47259..4940847409d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -297,8 +297,6 @@ static void _expect_dm(INT line, const DEVMODEA *expected, const CHAR *device, D ok_(__FILE__, line)((dm.dmFields & expected->dmFields) == expected->dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected->dmFields, dm.dmFields); - /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected->dmFields & DM_BITSPERPEL && expected->dmBitsPerPel != 32 && expected->dmBitsPerPel != 24) ok_(__FILE__, line)(!(expected->dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected->dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected->dmBitsPerPel, dm.dmBitsPerPel); ok_(__FILE__, line)(!(expected->dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected->dmPelsWidth, @@ -695,7 +693,6 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); ok(res, "Device %s EnumDisplaySettingsA failed, error %#x.\n", devices[device].name, GetLastError()); - todo_wine_if(depths[test] != 32) ok(dm.dmBitsPerPel == depths[test], "Device %s expect dmBitsPerPel %u, got %u.\n", devices[device].name, depths[test], dm.dmBitsPerPel); /* 2008 resets to the resolution in the registry. Newer versions of Windows doesn't diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 9a43231f34d..cea7ebbc6b7 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -45,6 +45,16 @@ struct x11drv_display_setting DEVMODEW desired_mode; }; +struct x11drv_display_depth +{ + struct list entry; + ULONG_PTR display_id; + DWORD depth; +}; + +/* Display device emulated depth list, protected by modes_section */ +static struct list x11drv_display_depth_list = LIST_INIT(x11drv_display_depth_list); + /* All Windows drivers seen so far either support 32 bit depths, or 24 bit depths, but never both. So if we have * a 32 bit framebuffer, report 32 bit bpps, otherwise 24 bit ones. */ @@ -405,6 +415,54 @@ static int mode_compare(const void *p1, const void *p2) return a->u1.s2.dmDisplayOrientation - b->u1.s2.dmDisplayOrientation; } +static void set_display_depth(ULONG_PTR display_id, DWORD depth) +{ + struct x11drv_display_depth *display_depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + display_depth->depth = depth; + LeaveCriticalSection(&modes_section); + return; + } + } + + display_depth = heap_alloc(sizeof(*display_depth)); + if (!display_depth) + { + ERR("Failed to allocate memory.\n"); + LeaveCriticalSection(&modes_section); + return; + } + + display_depth->display_id = display_id; + display_depth->depth = depth; + list_add_head(&x11drv_display_depth_list, &display_depth->entry); + LeaveCriticalSection(&modes_section); +} + +static DWORD get_display_depth(ULONG_PTR display_id) +{ + struct x11drv_display_depth *display_depth; + DWORD depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + depth = display_depth->depth; + LeaveCriticalSection(&modes_section); + return depth; + } + } + LeaveCriticalSection(&modes_section); + return screen_bpp; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -434,6 +492,10 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; } + + if (!is_detached_mode(devmode)) + devmode->dmBitsPerPel = get_display_depth(id); + goto done; } @@ -842,6 +904,8 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); + if (attached_mode && ret == DISP_CHANGE_SUCCESSFUL) + set_display_depth(displays[display_idx].id, full_mode->dmBitsPerPel); free_full_mode(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; -- 2.30.2

1 0

[tools] winetest/build-patterns: Add a failed test units pattern.
by Francois Gouget 13 May '21

13 May '21

This pattern shows the number of failed test units for each test configuration. This allows detecting when results get worse after a VM update, or when a test configuration gets worse results than its peers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 121 +++++++++++++++++++++++++++------------- 1 file changed, 83 insertions(+), 38 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index f6704bd00..c9fcb6638 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -31,12 +31,19 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb $patternbuilds $fixed_threshold/; +use vars qw/$workdir $gitdir $gitweb @groups $patternbuilds $fixed_threshold/; require "winetest.conf"; my $name0=$0; $name0 =~ s+^.*/++; +# Map dissect's IDs to the platform groups +my %idmap; +foreach my $group (@groups) +{ + map { $idmap{$_} = $group } @{$group->{ids}}; +} + # # Common helpers @@ -249,6 +256,16 @@ my %reports; # - name # The uniquely identifying test name in the form 'module:unit'. # +# - id +# The HTML id for linking to this test. +# +# - title +# The test's HTML title. +# +# - desc +# An optional chunk of HTML shown above the test pattern which can be used +# to provide additional information about the test. +# # - source # The source file for that test unit. # @@ -310,7 +327,7 @@ my %reports; # - commits # A hashtable of the commit objects, indexed first buy build name and then # by commit id. -my %tests; +my %tests = ( 0 => { name => "0", id => "summary", newmodes => {} } ); # A set containing the test units source files. my %testsources; @@ -360,7 +377,9 @@ foreach my $build (@sortedbuilds) if (!$test) { $tests{$testname} = $test = { + id => $testname, name => $testname, + title => "<a href='tests/$testname.html'>$testname</a>", source => $source, }; $testsources{$source} = 1; @@ -377,6 +396,10 @@ foreach my $build (@sortedbuilds) next; } $test->{testreports}->{$reportdir}->{status}->{$build->{name}} = $status; + + # Count failed test units + next if ($status =~ /^(?:missing.|skipped|stub)/); + $tests{0}->{testreports}->{$reportdir}->{status}->{$build->{name}}++; } } } @@ -882,7 +905,15 @@ sub write_pattern_line($$$) else { ($symbol, $class, $title, my $link, $attrs) = get_status_html($status, $test->{colors}); - if ($link eq "t") + if ($test->{name} eq "0") + { + $tag = "a"; + my $platform = $reports{$reportdir}->{platform}; + my $group = $idmap{$platform} || $idmap{unknown}; + $attrs .= sprintf " href='%s/index_%s.html'", + $build->{name}, $group->{name}; + } + elsif ($link eq "t") { $tag = "a"; $attrs .= sprintf " href='%s/%s/%s.html'", @@ -1042,8 +1073,11 @@ sub write_pattern($$$) my ($html, $test, $pagereports) = @_; compute_set_colors($test->{colors}); - write_newmodes_line($html, $test) if (%{$test->{newmodes}}); + print $html $test->{desc} if (defined $test->{desc}); + + print $html "<div class='test'>\n"; + write_newmodes_line($html, $test) if (%{$test->{newmodes}}); foreach my $reportdir (@sortedreports) { next if (!$pagereports->{$reportdir}); @@ -1051,6 +1085,7 @@ sub write_pattern($$$) write_pattern_line($html, $test, $reportdir); } write_commits($html, $test) if (%{$test->{commits}}); + print $html "</div>\n"; } sub write_patterns_list($$$$) @@ -1063,8 +1098,8 @@ sub write_patterns_list($$$$) my $testname = $testnames->[$i]; my $test = $tests{$testname}; - print $html "<div class='testfile' id='$testname'>\n"; - print $html "<div class='updownbar'><a href='tests/$testname.html'>$testname</a>"; + print $html "<div class='testfile' id='$test->{id}'>\n"; + print $html "<div class='updownbar'>$test->{title}"; print $html "<div class='ralign'>"; if ($mainpage) { @@ -1078,9 +1113,8 @@ sub write_patterns_list($$$$) print $html "</div></div>\n"; - print $html "<div class='test'>\n"; write_pattern($html, $test, $pagereports); - print $html "</div></div>\n"; + print $html "</div>\n"; } } @@ -1114,30 +1148,12 @@ sub write_patterns_page($$$) </head> <body> <div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> - -<div class='testfile' id='summary'> -<div class='updownbar'>$title</div> -<p>The purpose of this page is to:</p> -<ul> - <li>Help detect new test failures, that is test / Wine regressions.</li> - <li>Help diagnose failures by showing when they are specific to a set of Windows versions, a locale, a day of the week, etc.</li> -</ul> -<p>The patterns on this page read as follows:</p> -<ul> - <li>Each line corresponds to a test configuration sorted by platform and tag name.</li> - <li>Test configurations with no failure for a given test are omitted from that test's pattern.</li> - <li>Each column corresponds to a WineTest build from oldest to newest.</li> - <li>Lines with a _N suffix are when WineTest was run more than once for a test configuration + build combination. They are rare and thus hang at the bottom of the pattern to not disrupt it.</li> - <li>Each cell is a single letter describing the result for that test. See the tooltips for a description. Click on the letter to go to that result page.</li> - <li>Each result is also color coded to make the patterns pop out. There is one color per type of result (crash , timeout, etc.), and one per number of failures (to help detect changes).</li> - <li>Failure modes that have not been seen before (test that newly crashes, new failure count, etc.) are highlighted, as well as the configuration names in which it appears.</li> - <li>Below the patterns is a line showing which builds have potentially related commits if any. -</ul> EOF # Show the test units with recent failures first. # Also use these lists to link the test units to each other. my %lists = ( + summary => {testnames => [ 0 ]}, recent => {title => "Recent failures", desc => "recently started failing (the $patternbuilds oldest builds had no failure).", testnames => []}, @@ -1194,6 +1210,7 @@ EOF } } next if ($last == -1); # no report had a pattern of interest + next if ($testname eq "0"); $test->{newmodes} = {}; foreach my $status (keys %$newfailures) @@ -1221,23 +1238,51 @@ EOF } # Generate the lists index (and up test unit links) - print $html "<p>The patterns are grouped according to the likelyhood that they contain new failures:</p>\n"; - print $html "<ul>\n"; - my @listids = ("recent", "newmode", "regular", "old"); + $tests{0}->{title} = $title; + $tests{0}->{desc} = " +<p>The purpose of this page is to:</p> +<ul> + <li>Help detect new test failures, that is test / Wine regressions.</li> + <li>Help diagnose failures by showing when they are specific to a set of Windows versions, a locale, a day of the week, etc.</li> + <li>Help detect test configuration changes that increase the number of failed test units.</li> + <li>Help identify test configurations that get worse results than their peers.</li> +</ul> + +<p>The patterns on this page read as follows:</p> +<ul> + <li>Each line corresponds to a test configuration sorted by platform and tag name.</li> + <li>Test configurations with no failure for a given test are omitted from that test's pattern.</li> + <li>Each column corresponds to a WineTest build from oldest to newest.</li> + <li>Lines with a _N suffix are when WineTest was run more than once for a test configuration + build combination. They are rare and thus hang at the bottom of the pattern to not disrupt it.</li> + <li>Each cell is a single letter describing the result for that test. See the tooltips for a description. Click on the letter to go to that result page.</li> + <li>Each result is also color coded to make the patterns pop out. There is one color per type of result (crash , timeout, etc.), and one per number of failures (to help detect changes).</li> + <li>Failure modes that have not been seen before (test that newly crashes, new failure count, etc.) are highlighted, as well as the configuration names in which it appears.</li> + <li>Below the patterns is a line showing which builds have potentially related commits if any. +</ul> + +<p>The patterns are grouped according to the likelyhood that they contain new failures:</p> +<ul>"; + + my @listids = ("summary", "recent", "newmode", "regular", "old"); my ($prevunit, $nolist) = ("", 1); foreach my $listid (@listids) { my $list = $lists{$listid}; my $count = @{$list->{testnames}}; next if (!$count); - print $html "<li><a href='#$listid'>$count tests</a> $list->{desc}</li>\n"; - $nolist = 0; $list->{prevunit} = $prevunit; - $prevunit = $list->{testnames}->[-1]; + $prevunit = $tests{$list->{testnames}->[-1]}->{id}; + + next if (!$list->{desc}); + $tests{0}->{desc} .= "<li><a href='#$listid'>$count tests</a> $list->{desc}</li>\n"; + $nolist = 0; + } + $tests{0}->{desc} .= "<p>No failures. Don't change anything!</p>\n" if ($nolist); + $tests{0}->{desc} .= "</ul>"; + if (!$nolist) + { + $tests{0}->{desc} .= "<p>Unlike the other patterns on this page, the one below shows the number of failed test units for each configuration.</p>"; } - print $html "<p>No failures. Don't change anything!</p>\n" if ($nolist); - print $html "</ul>\n"; - print $html "</div>\n"; # Link the last test unit of each list to the first one of the next list my $nextunit; @@ -1247,7 +1292,7 @@ EOF my $count = @{$list->{testnames}}; next if (!$count); $list->{nextunit} = $nextunit; - $nextunit = $list->{testnames}->[0]; + $nextunit = $tests{$list->{testnames}->[0]}->{id}; } # Generate the test unit lists themselves @@ -1257,7 +1302,7 @@ EOF my $list = $lists{$listid}; my $count = @{$list->{testnames}}; next if (!$count); - print $html "<h2 id='$listid'>$list->{title}</h2>\n"; + print $html "<h2 id='$listid'>$list->{title}</h2>\n" if ($list->{title}); write_patterns_list($html, $pagereports, $mainpage, $list); } -- 2.20.1

1 0

[PATCH v2] winevulkan: Add support for unwrapping handles in thunks.
by Derek Lesho 13 May '21

13 May '21

--- v2: - Addressed comments - Explicitely named conv parameters for `VkMember.copy` and `VkMember.free` methods --- dlls/winevulkan/make_vulkan | 568 +++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan.c | 142 +-------- 2 files changed, 433 insertions(+), 277 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d5cc62d2097..02a0e4bfac7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -185,7 +185,6 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkCmdExecuteCommands" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -193,7 +192,6 @@ FUNCTION_OVERRIDES = { "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, @@ -204,14 +202,14 @@ FUNCTION_OVERRIDES = { # VK_KHR_get_surface_capabilities2 "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, - "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_win32_surface "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_swapchain - "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkQueuePresentKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, @@ -645,6 +643,18 @@ class VkFunction(object): return False + def needs_unwrapping(self): + """ Check if the function needs any input/output type unwrapping. + Functions need input/output unwrapping if struct parameters have + wrapped dispatchable handles. + """ + + for p in self.params: + if p.needs_unwrapping(): + return True + + return False + def needs_dispatch(self): return self.dispatch @@ -739,7 +749,7 @@ class VkFunction(object): return body - def body_conversion(self): + def body_conversion(self, conv): body = "" # Declare a variable to hold the result for non-void functions. @@ -748,27 +758,28 @@ class VkFunction(object): # Declare any tmp parameters for conversion. for p in self.params: - if not p.needs_conversion(): - continue - - if p.is_dynamic_array(): - body += " {0}_host *{1}_host;\n".format(p.type, p.name) - else: - body += " {0}_host {1}_host;\n".format(p.type, p.name) + if p.needs_conversion() and conv: + if p.is_dynamic_array(): + body += " {0}_host *{1}_host;\n".format(p.type, p.name) + else: + body += " {0}_host {1}_host;\n".format(p.type, p.name) + elif p.needs_unwrapping(): + if p.is_dynamic_array(): + body += " {0} *{1}_host;\n".format(p.type, p.name) + else: + body += " {0} {1}_host;\n".format(p.type, p.name) if not self.needs_private_thunk(): body += " {0}\n".format(self.trace()) # Call any win_to_host conversion calls. for p in self.params: - if not p.needs_input_conversion(): - continue - - body += p.copy(Direction.INPUT) + if p.needs_input_conversion() and (p.needs_unwrapping() or conv): + body += p.copy(Direction.INPUT) # Build list of parameters containing converted and non-converted parameters. # The param itself knows if conversion is needed and applies it when we set conv=True. - params = ", ".join([p.variable(conv=True) for p in self.params]) + params = ", ".join([p.variable(conv=conv) for p in self.params]) # Call the native Vulkan function. if self.type == "void": @@ -787,10 +798,8 @@ class VkFunction(object): # Perform any required cleanups. Most of these are for array functions. for p in self.params: - if not p.needs_free(): - continue - - body += p.free() + if p.needs_free() and (p.needs_unwrapping() or conv): + body += p.free() # Finally return the result. if self.type != "void": @@ -840,10 +849,15 @@ class VkFunction(object): if self.needs_conversion(): thunk += "#if defined(USE_STRUCT_CONVERSION)\n" - thunk += self.body_conversion() + thunk += self.body_conversion(conv=True) thunk += "#else\n" - thunk += self.body() + if self.needs_unwrapping(): + thunk += self.body_conversion(conv=False) + else: + thunk += self.body() thunk += "#endif\n" + elif self.needs_unwrapping(): + thunk += self.body_conversion(conv=False) else: thunk += self.body() @@ -1063,6 +1077,12 @@ class VkHandle(object): def is_wrapped(self): return self.native_handle("test") is not None + def needs_conversion(self): + return False + + def needs_unwrapping(self): + return self.is_wrapped() + class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, values=None): @@ -1148,10 +1168,11 @@ class VkMember(object): return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values) - def copy(self, input, output, direction): - """ Helper method for use by conversion logic to generate a C-code statement to copy this member. """ + def copy(self, input, output, direction, conv): + """ Helper method for use by conversion logic to generate a C-code statement to copy this member. + - `conv` indicates whether the statement is in a struct alignment conversion path. """ - if self.needs_conversion(): + if (conv and self.needs_conversion()) or self.needs_unwrapping(): if self.is_dynamic_array(): if direction == Direction.OUTPUT: LOGGER.warn("TODO: implement copying of returnedonly dynamic array for {0}.{1}".format(self.type, self.name)) @@ -1167,6 +1188,12 @@ class VkMember(object): else: # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) + elif self.is_handle() and self.needs_unwrapping(): + if direction == Direction.OUTPUT: + LOGGER.err("Only INPUT parameters can be unwrapped") + else: + handle = self.type_info["data"] + return "{0}{1} = {2};\n".format(output, self.name, handle.driver_handle("{0}{1}".format(input, self.name))) else: if direction == Direction.OUTPUT: return "convert_{0}_host_to_win(&{2}{1}, &{3}{1});\n".format(self.type, self.name, input, output) @@ -1178,6 +1205,27 @@ class VkMember(object): else: return "{0}{1} = {2}{1};\n".format(output, self.name, input) + def free(self, location, conv): + """ Helper method for use by conversion logic to generate a C-code statement to free this member. """ + + if not self.needs_unwrapping() and not conv: + return "" + + cast = ("(" + self.type + ("_host" if conv and self.needs_conversion() else "") + " *)") if self.is_const() else "" + if self.is_dynamic_array(): + count = self.dyn_array_len if isinstance(self.dyn_array_len, int) else "{0}{1}".format(location, self.dyn_array_len) + if self.is_struct() and self.type_info["data"].returnedonly: + # For returnedonly, counts is stored in a pointer. + return "free_{0}_array({1}{2}{3}, *{4});\n".format(self.type, cast, location, self.name, count) + else: + return "free_{0}_array({1}{2}{3}, {4});\n".format(self.type, cast, location, self.name, count) + else: + # We are operating on a single structure. Some structs (very rare) contain dynamic members, + # which would need freeing. + if self.needs_free(): + return "free_{0}({1}&{2}{3});\n".format(self.type, cast, location, self.name) + return "" + def definition(self, align=False, conv=False): """ Generate prototype for given function. @@ -1216,31 +1264,34 @@ class VkMember(object): # Check if we need conversion either for this member itself or for any child members # in case member represents a struct. - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return None conversions = [] # Collect any conversion for any member structs. - struct = self.type_info["data"] - for m in struct: - m.needs_struct_extensions_conversion() - if m.needs_conversion(): - conversions.extend(m.get_conversions()) + if self.is_struct(): + struct = self.type_info["data"] + for m in struct: + m.needs_struct_extensions_conversion() + if m.needs_conversion() or m.needs_unwrapping(): + conversions.extend(m.get_conversions()) - struct.needs_struct_extensions_conversion() + struct.needs_struct_extensions_conversion() + direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT + elif self.is_handle(): + direction = Direction.INPUT - struct = self.type_info["data"] - direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT + operand = self.type_info["data"] if self.is_dynamic_array(): - conversions.append(ConversionFunction(False, True, direction, struct)) + conversions.append(ConversionFunction(False, True, direction, operand)) elif self.is_static_array(): - conversions.append(ConversionFunction(True, False, direction, struct)) + conversions.append(ConversionFunction(True, False, direction, operand)) else: - conversions.append(ConversionFunction(False, False, direction, struct)) + conversions.append(ConversionFunction(False, False, direction, operand)) if self.needs_free(): - conversions.append(FreeFunction(self.is_dynamic_array(), struct)) + conversions.append(FreeFunction(self.is_dynamic_array(), operand)) return conversions @@ -1307,8 +1358,21 @@ class VkMember(object): struct = self.type_info["data"] return struct.needs_conversion() + def needs_unwrapping(self): + """ Structures with wrapped dispatchable handles, need unwrapping. """ + + if self.is_struct(): + struct = self.type_info["data"] + return struct.needs_unwrapping() + + if self.is_handle(): + handle = self.type_info["data"] + return handle.is_wrapped() + + return False + def needs_free(self): - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return False if self.is_dynamic_array(): @@ -1392,21 +1456,23 @@ class VkParam(object): self.free_func = None self.input_conv = None self.output_conv = None - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return + operand = self.struct if self.is_struct() else self.handle + # Input functions require win to host conversion. if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: - self.input_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.INPUT, self.struct) + self.input_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.INPUT, operand) # Output functions require host to win conversion. if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: - self.output_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.OUTPUT, self.struct) + self.output_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.OUTPUT, operand) # Dynamic arrays, but also some normal structs (e.g. VkCommandBufferBeginInfo) need memory # allocation and thus some cleanup. if self.is_dynamic_array() or self.struct.needs_free(): - self.free_func = FreeFunction(self.is_dynamic_array(), self.struct) + self.free_func = FreeFunction(self.is_dynamic_array(), operand) def _set_direction(self): """ Internal helper function to set parameter direction (input/output/input_output). """ @@ -1544,7 +1610,7 @@ class VkParam(object): def free(self): if self.is_dynamic_array(): - if self.struct.returnedonly: + if self.is_struct() and self.struct.returnedonly: # For returnedonly, counts is stored in a pointer. return " free_{0}_array({1}_host, *{2});\n".format(self.type, self.name, self.dyn_array_len) else: @@ -1552,7 +1618,7 @@ class VkParam(object): else: # We are operating on a single structure. Some structs (very rare) contain dynamic members, # which would need freeing. - if self.struct.needs_free(): + if self.is_struct() and self.struct.needs_free(): return " free_{0}(&{1}_host);\n".format(self.type, self.name) return "" @@ -1563,14 +1629,14 @@ class VkParam(object): required. """ - if not self.is_struct(): + if self.is_struct(): + self.struct.needs_struct_extensions_conversion() + for m in self.struct: + m.needs_struct_extensions_conversion() + elif not self.is_handle(): return None - self.struct.needs_struct_extensions_conversion() - for m in self.struct: - m.needs_struct_extensions_conversion() - - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return None conversions = [] @@ -1578,14 +1644,15 @@ class VkParam(object): # Collect any member conversions first, so we can guarantee # those functions will be defined prior to usage by the # 'parent' param requiring conversion. - for m in self.struct: - if not m.is_struct(): - continue + if self.is_struct(): + for m in self.struct: + if not m.is_struct(): + continue - if not m.needs_conversion(): - continue + if not m.needs_conversion() and not m.needs_unwrapping(): + continue - conversions.extend(m.get_conversions()) + conversions.extend(m.get_conversions()) # Conversion requirements for the 'parent' parameter. if self.input_conv is not None: @@ -1641,6 +1708,18 @@ class VkParam(object): return False + def needs_unwrapping(self): + """ Returns if parameter needs unwrapping of dispatchable handle. """ + + # Wrapped handle parameters are handled seperately, only look for wrapped handles in structs + if self.is_struct(): + return self.struct.needs_unwrapping() + + if self.is_handle() and self.is_dynamic_array(): + return self.handle.needs_unwrapping() + + return False + def needs_free(self): return self.free_func is not None @@ -1691,7 +1770,7 @@ class VkParam(object): LOGGER.debug("TODO: setting NULL VkAllocationCallbacks for {0}".format(self.name)) return "NULL" - if conv and self.needs_conversion(): + if self.needs_unwrapping() or (conv and self.needs_conversion()): if self.is_dynamic_array(): return "{0}_host".format(self.name) else: @@ -1880,6 +1959,14 @@ class VkStruct(Sequence): return True return False + def needs_unwrapping(self): + """ Returns if struct members need unwrapping of a dispatchable handle. """ + + for m in self.members: + if m.needs_unwrapping(): + return True + return False + def needs_free(self): """ Check if any struct member needs some memory freeing.""" @@ -1897,7 +1984,10 @@ class VkStruct(Sequence): for e in self.struct_extensions: if e.required and e.needs_conversion(): - LOGGER.error("Unhandled pNext chain conversion for {0}".format(e.name)) + LOGGER.error("Unhandled pNext chain alignment conversion for {0}".format(e.name)) + ret = True + if e.required and e.needs_unwrapping(): + LOGGER.error("Unhandled pNext chain unwrapping conversion for {0}".format(e.name)) ret = True return ret @@ -1913,12 +2003,12 @@ class VkStruct(Sequence): class ConversionFunction(object): - def __init__(self, array, dyn_array, direction, struct): + def __init__(self, array, dyn_array, direction, operand): self.array = array self.direction = direction self.dyn_array = dyn_array - self.struct = struct - self.type = struct.name + self.operand = operand + self.type = operand.name self._set_name() @@ -1926,21 +2016,44 @@ class ConversionFunction(object): return self.name == other.name def _generate_array_conversion_func(self): - """ Helper function for generating a conversion function for array structs. """ + """ Helper function for generating a conversion function for array operands. """ + + body = "" + + if self.operand.needs_conversion(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "uint32_t count"] + return_type = self.type + else: + params = ["const {0} *in".format(self.type), "uint32_t count"] + return_type = "{0}_host".format(self.type) + + # Generate function prototype. + body += "static inline {0} *{1}(".format(return_type, self.name) + body += ", ".join(p for p in params) + body += ")\n{\n" + + body += " {0} *out;\n".format(return_type) + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "uint32_t count"] - return_type = self.type - else: params = ["const {0} *in".format(self.type), "uint32_t count"] - return_type = "{0}_host".format(self.type) + return_type = "{0}".format(self.type) - # Generate function prototype. - body = "static inline {0} *{1}(".format(return_type, self.name) - body += ", ".join(p for p in params) - body += ")\n{\n" + # Generate function prototype. + body += "static inline {0} *{1}(".format(return_type, self.name) + body += ", ".join(p for p in params) + body += ")\n{\n" + + body += " {0} *out;\n".format(return_type) + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" - body += " {0} *out;\n".format(return_type) body += " unsigned int i;\n\n" body += " if (!in) return NULL;\n\n" @@ -1949,33 +2062,74 @@ class ConversionFunction(object): body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - # TODO: support copying of pNext extension structures! - # Luckily though no extension struct at this point needs conversion. - body += " " + m.copy("in[i].", "out[i].", self.direction) + if isinstance(self.operand, VkStruct): + for m in self.operand: + # TODO: support copying of pNext extension structures! + # Luckily though no extension struct at this point needs conversion. + convert = m.copy("in[i].", "out[i].", self.direction, conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in[i].", "out[i].", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + + elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: + body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" + else: + LOGGER.warn("Unhandled conversion operand type") + body += " out[i] = in[i];\n" body += " }\n\n" body += " return out;\n" body += "}\n\n" + # endif is appended by FreeFunction + return body def _generate_conversion_func(self): - """ Helper function for generating a conversion function for non-array structs. """ + """ Helper function for generating a conversion function for non-array operands. """ - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type)] - else: - params = ["const {0} *in".format(self.type), "{0}_host *out".format(self.type)] + # It doesn't make sense to generate conversion functions for non-struct variables + # which aren't in arrays, as this should be handled by the copy() function + if not isinstance(self.operand, VkStruct): + return "" - body = "static inline void {0}(".format(self.name) + body = "" - # Generate parameter list - body += ", ".join(p for p in params) - body += ")\n{\n" + if self.operand.needs_conversion(): + body += "#if defined (USE_STRUCT_CONVERSION)\n" + body += "static inline void {0}(".format(self.name) - body += " if (!in) return;\n\n" + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type)] + else: + params = ["const {0} *in".format(self.type), "{0}_host *out".format(self.type)] + + # Generate parameter list + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + body += "static inline void {0}(".format(self.name) - if self.direction == Direction.INPUT and "pNext" in self.struct and self.struct.returnedonly: + params = ["const {0} *in".format(self.type), "{0} *out".format(self.type)] + + # Generate parameter list + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "{\n if (!in) return;\n\n" + + if self.direction == Direction.INPUT and "pNext" in self.operand and self.operand.returnedonly: # We are dealing with an input_output parameter. For these we only need to copy # pNext and sType as the other fields are filled in by the host. We do potentially # have to iterate over pNext and perform conversions based on switch(sType)! @@ -1984,36 +2138,88 @@ class ConversionFunction(object): body += " out->pNext = in->pNext;\n" body += " out->sType = in->sType;\n" else: - for m in self.struct: + for m in self.operand: # TODO: support copying of pNext extension structures! - body += " " + m.copy("in->", "out->", self.direction) + convert = m.copy("in->", "out->", self.direction, conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in->", "out->", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + + body += "}\n" + + if not self.operand.needs_unwrapping() and not self.operand.needs_free(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "\n" - body += "}\n\n" return body def _generate_static_array_conversion_func(self): - """ Helper function for generating a conversion function for array structs. """ + """ Helper function for generating a conversion function for array operands. """ - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - else: - params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] + body = "" - # Generate function prototype. - body = "static inline void {0}(".format(self.name) - body += ", ".join(p for p in params) - body += ")\n{\n" + if self.operand.needs_conversion(): + body += "#if defined (USE_STRUCT_CONVERSION)\n" + + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] + else: + params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] + + # Generate function prototype. + body += "static inline void {0}(".format(self.name) + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + params = ["const {0} *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] + + # Generate function prototype. + body += "static inline void {0}(".format(self.name) + body += ", ".join(p for p in params) + body += ")\n" + + body += "{\n" body += " unsigned int i;\n\n" body += " if (!in) return;\n\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - # TODO: support copying of pNext extension structures! - body += " " + m.copy("in[i].", "out[i].", self.direction) + if isinstance(self.operand, VkStruct): + for m in self.operand: + # TODO: support copying of pNext extension structures! + convert = m.copy("in[i].", "out[i].", self.direction, conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in[i].", "out[i].", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: + body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" + else: + LOGGER.warn("Unhandled conversion operand type") + body += " out[i] = in[i];\n" body += " }\n" - body += "}\n\n" + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION) */\n" + + body += "\n" + return body def _set_name(self): @@ -2044,10 +2250,10 @@ class ConversionFunction(object): class FreeFunction(object): - def __init__(self, dyn_array, struct): + def __init__(self, dyn_array, operand): self.dyn_array = dyn_array - self.struct = struct - self.type = struct.name + self.operand = operand + self.type = operand.name if dyn_array: self.name = "free_{0}_array".format(self.type) @@ -2060,52 +2266,94 @@ class FreeFunction(object): def _generate_array_free_func(self): """ Helper function for cleaning up temporary buffers required for array conversions. """ - # Generate function prototype. - body = "static inline void {0}({1}_host *in, uint32_t count)\n{{\n".format(self.name, self.type) + body = "" + + if self.operand.needs_conversion(): + if self.operand.needs_unwrapping(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + + # Generate function prototype. + body += "static inline void {0}({1}_host *in, uint32_t count)\n".format(self.name, self.type) + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + # Generate function prototype. + body += "static inline void {0}({1} *in, uint32_t count)\n".format(self.name, self.type) + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "{\n" # E.g. VkGraphicsPipelineCreateInfo_host needs freeing for pStages. - if self.struct.needs_free(): + if isinstance(self.operand, VkStruct) and self.operand.needs_free(): body += " unsigned int i;\n\n" body += " if (!in) return;\n\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) + for m in self.operand: + if m.needs_free(): + convert = m.free("in[i].", conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert else: - body += " free_{0}_array(in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) - elif m.needs_conversion(): - LOGGER.error("Unhandled conversion for {0}".format(m.name)) + unwrap = m.free("in[i].", conv=False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#endif /* USE_STRUCT_CONVERSION */\n".format(convert) + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) body += " }\n" else: body += " if (!in) return;\n\n" body += " free(in);\n" - body += "}\n\n" + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "\n" + return body def _generate_free_func(self): # E.g. VkCommandBufferBeginInfo.pInheritanceInfo needs freeing. - if not self.struct.needs_free(): + if not self.operand.needs_free(): + return "" + + if not isinstance(self.operand, VkStruct): return "" # Generate function prototype. body = "static inline void {0}({1}_host *in)\n{{\n".format(self.name, self.type) - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - count = m.dyn_array_len if isinstance(m.dyn_array_len, int) else "in->{0}".format(m.dyn_array_len) - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in->{1}, {2});\n".format(m.type, m.name, count) + for m in self.operand: + if m.needs_free(): + convert = m.free("in->", conv=True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert else: - body += " free_{0}_array(in->{1}, {2});\n".format(m.type, m.name, count) + unwrap = m.free("in->", conv=False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#endif /* USE_STRUCT_CONVERSION */\n".format(convert) + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + + body += "}\n" + + if not self.operand.needs_unwrapping(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "\n" - body += "}\n\n" return body def definition(self): @@ -2168,7 +2416,12 @@ class StructChainConversionFunction(object): if m.name == "pNext": body += " out->pNext = NULL;\n" else: - body += " " + m.copy("in->", "out->", self.direction) + convert = m.copy("in->", "out->", self.direction, conv=True) + unwrap = m.copy("in->", "out->", self.direction, conv=False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) body += "\n out_header->pNext = (VkBaseOutStructure *)out;\n" body += " out_header = out_header->pNext;\n" @@ -2212,7 +2465,41 @@ class FreeStructChainFunction(object): body += " while (header)\n" body += " {\n" - body += " void *prev = header;\n" + body += " void *prev = header;\n\n" + body += " switch (header->sType)\n" + body += " {\n" + + for e in self.struct.struct_extensions: + if not e.required: + continue + + if not any(m.needs_free() for m in e): + continue + + stype = next(x for x in e.members if x.name == "sType") + + body += " case {0}:\n".format(stype.values) + body += " {\n" + body += " {0} *structure = ({0} *) header;\n".format(e.name) + + for m in e: + if m.needs_free(): + convert = m.free("structure->", conv=True) + unwrap = m.free("structure->", conv=False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#endif /* USE_STRUCT_CONVERSION */\n".format(convert) + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + + body += " break;\n" + body += " }\n" + + body += " default:\n" + body += " break;\n" + body += " }\n" + body += " header = header->pNext;\n" body += " free(prev);\n" body += " }\n\n" @@ -2235,7 +2522,7 @@ class VkGenerator(object): if not func.is_required(): continue - if not func.needs_conversion(): + if not func.needs_conversion() and not func.needs_unwrapping(): continue conversions = func.get_conversions() @@ -2246,15 +2533,26 @@ class VkGenerator(object): if not any(c == conv for c in self.conversions): self.conversions.append(conv) + if not isinstance(conv.operand, VkStruct): + continue + # Structs can be used in different ways by different conversions # e.g. array vs non-array. Just make sure we pull in each struct once. - if not any(s.name == conv.struct.name for s in self.host_structs): - self.host_structs.append(conv.struct) + if not any(s.name == conv.operand.name for s in self.host_structs): + self.host_structs.append(conv.operand) for struct in self.registry.structs: if struct.name in STRUCT_CHAIN_CONVERSIONS: self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct)) self.struct_chain_conversions.append(FreeStructChainFunction(struct)) + # Once we decide to support pNext chains conversion everywhere, move this under get_conversions + for e in struct.struct_extensions: + for m in e: + if m.needs_conversion() or m.needs_unwrapping(): + conversions = m.get_conversions() + for conv in conversions: + if not any(c == conv for c in self.conversions): + self.conversions.append(conv) def _generate_copyright(self, f, spec_file=False): f.write("# " if spec_file else "/* ") @@ -2281,10 +2579,8 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") # Generate any conversion helper functions. - f.write("#if defined(USE_STRUCT_CONVERSION)\n") for conv in self.conversions: f.write(conv.definition()) - f.write("#endif /* USE_STRUCT_CONVERSION */\n\n") for conv in self.struct_chain_conversions: f.write(conv.definition()) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 45eda78e997..9f181d92bc5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -360,20 +360,12 @@ static void wine_vk_device_get_queues(struct VkDevice_T *device, static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) { - VkDeviceGroupDeviceCreateInfo *group_info; - - if ((group_info = wine_vk_find_struct(create_info, DEVICE_GROUP_DEVICE_CREATE_INFO))) - { - free((void *)group_info->pPhysicalDevices); - } - free_VkDeviceCreateInfo_struct_chain(create_info); } static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, VkDeviceCreateInfo *dst) { - VkDeviceGroupDeviceCreateInfo *group_info; unsigned int i; VkResult res; @@ -385,23 +377,6 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src return res; } - /* FIXME: convert_VkDeviceCreateInfo_struct_chain() should unwrap handles for us. */ - if ((group_info = wine_vk_find_struct(dst, DEVICE_GROUP_DEVICE_CREATE_INFO))) - { - VkPhysicalDevice *physical_devices; - - if (!(physical_devices = calloc(group_info->physicalDeviceCount, sizeof(*physical_devices)))) - { - free_VkDeviceCreateInfo_struct_chain(dst); - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - for (i = 0; i < group_info->physicalDeviceCount; ++i) - { - physical_devices[i] = group_info->pPhysicalDevices[i]->phys_dev; - } - group_info->pPhysicalDevices = physical_devices; - } - /* Should be filtered out by loader as ICDs don't support layers. */ dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; @@ -709,36 +684,6 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, return res; } -void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count, - const VkCommandBuffer *buffers) -{ - VkCommandBuffer *tmp_buffers; - unsigned int i; - - TRACE("%p %u %p\n", buffer, count, buffers); - - if (!buffers || !count) - return; - - /* Unfortunately we need a temporary buffer as our command buffers are wrapped. - * This call is called often and if a performance concern, we may want to use - * alloca as we shouldn't need much memory and it needs to be cleaned up after - * the call anyway. - */ - if (!(tmp_buffers = malloc(count * sizeof(*tmp_buffers)))) - { - ERR("Failed to allocate memory for temporary command buffers\n"); - return; - } - - for (i = 0; i < count; i++) - tmp_buffers[i] = buffers[i]->command_buffer; - - buffer->device->funcs.p_vkCmdExecuteCommands(buffer->command_buffer, count, tmp_buffers); - - free(tmp_buffers); -} - VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkDevice *device) @@ -1122,61 +1067,6 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in *queue = wine_vk_device_find_queue(device, info); } -VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, - const VkSubmitInfo *submits, VkFence fence) -{ - VkSubmitInfo *submits_host; - VkResult res; - VkCommandBuffer *command_buffers; - unsigned int i, j, num_command_buffers; - - TRACE("%p %u %p 0x%s\n", queue, count, submits, wine_dbgstr_longlong(fence)); - - if (count == 0) - { - return queue->device->funcs.p_vkQueueSubmit(queue->queue, 0, NULL, fence); - } - - submits_host = calloc(count, sizeof(*submits_host)); - if (!submits_host) - { - ERR("Unable to allocate memory for submit buffers!\n"); - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - - for (i = 0; i < count; i++) - { - memcpy(&submits_host[i], &submits[i], sizeof(*submits_host)); - - num_command_buffers = submits[i].commandBufferCount; - command_buffers = calloc(num_command_buffers, sizeof(*command_buffers)); - if (!command_buffers) - { - ERR("Unable to allocate memory for command buffers!\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto done; - } - - for (j = 0; j < num_command_buffers; j++) - { - command_buffers[j] = submits[i].pCommandBuffers[j]->command_buffer; - } - submits_host[i].pCommandBuffers = command_buffers; - } - - res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence); - -done: - for (i = 0; i < count; i++) - { - free((void *)submits_host[i].pCommandBuffers); - } - free(submits_host); - - TRACE("Returning %d\n", res); - return res; -} - VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *info, const VkAllocationCallbacks *allocator, VkCommandPool *command_pool) { @@ -1540,19 +1430,6 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } -VkResult WINAPI wine_vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *create_info, - const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain) -{ - VkSwapchainCreateInfoKHR native_info; - - TRACE("%p, %p, %p, %p\n", device, create_info, allocator, swapchain); - - native_info = *create_info; - native_info.surface = wine_surface_from_handle(create_info->surface)->driver_surface; - - return thunk_vkCreateSwapchainKHR(device, &native_info, allocator, swapchain); -} - VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *createInfo, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { @@ -1601,19 +1478,6 @@ void WINAPI wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, free(object); } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice phys_dev, - const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, uint32_t *formats_count, VkSurfaceFormat2KHR *formats) -{ - VkPhysicalDeviceSurfaceInfo2KHR native_info; - - TRACE("%p, %p, %p, %p\n", phys_dev, surface_info, formats_count, formats); - - native_info = *surface_info; - native_info.surface = wine_surface_from_handle(surface_info->surface)->driver_surface; - - return thunk_vkGetPhysicalDeviceSurfaceFormats2KHR(phys_dev, &native_info, formats_count, formats); -} - static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile @@ -1647,15 +1511,11 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) { - VkPhysicalDeviceSurfaceInfo2KHR native_info; VkResult res; TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); - native_info = *surface_info; - native_info.surface = wine_surface_from_handle(surface_info->surface)->driver_surface; - - res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &native_info, capabilities); + res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, surface_info, capabilities); if (res == VK_SUCCESS) adjust_max_image_count(phys_dev, &capabilities->surfaceCapabilities); -- 2.31.1

2 2

[PATCH 1/5] user32: Update keyboard / mouse rawinput device paths.
by Rémi Bernon 13 May '21

13 May '21

Instead of just updating the info. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/rawinput.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index d95d29d7656..e4e7bad508f 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -98,7 +98,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { SP_DEVINFO_DATA device_data = {sizeof(device_data)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct device *device; + struct device *device = NULL; UINT32 handle; HANDLE file; DWORD i, size, type; @@ -117,15 +117,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - for (i = 0; i < rawinput_devices_count; ++i) - { - if (rawinput_devices[i].handle == UlongToHandle(handle)) - { - TRACE("Updating device %x / %s\n", handle, debugstr_w(rawinput_devices[i].detail->DevicePath)); - return rawinput_devices + i; - } - } - if (!(detail = malloc(size))) { ERR("Failed to allocate memory.\n"); @@ -134,8 +125,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); - TRACE("Found device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); - file = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) @@ -145,8 +134,24 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - if (!array_reserve((void **)&rawinput_devices, &rawinput_devices_max, - rawinput_devices_count + 1, sizeof(*rawinput_devices))) + for (i = 0; i < rawinput_devices_count && !device; ++i) + if (rawinput_devices[i].handle == UlongToHandle(handle)) + device = rawinput_devices + i; + + if (device) + { + TRACE("Updating device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); + HidD_FreePreparsedData(device->data); + CloseHandle(device->file); + free(device->detail); + } + else if (array_reserve((void **)&rawinput_devices, &rawinput_devices_max, + rawinput_devices_count + 1, sizeof(*rawinput_devices))) + { + device = &rawinput_devices[rawinput_devices_count++]; + TRACE("Adding device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); + } + else { ERR("Failed to allocate memory.\n"); CloseHandle(file); @@ -154,7 +159,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - device = &rawinput_devices[rawinput_devices_count++]; device->detail = detail; device->file = file; device->handle = ULongToHandle(handle); @@ -226,8 +230,6 @@ static void find_devices(void) device->info.dwType = RIM_TYPEMOUSE; device->info.u.mouse = mouse_info; - HidD_FreePreparsedData(device->data); - device->data = NULL; } SetupDiDestroyDeviceInfoList(set); @@ -243,8 +245,6 @@ static void find_devices(void) device->info.dwType = RIM_TYPEKEYBOARD; device->info.u.keyboard = keyboard_info; - HidD_FreePreparsedData(device->data); - device->data = NULL; } SetupDiDestroyDeviceInfoList(set); -- 2.31.0

3 9

[PATCH v2] winegstreamer: Ensure that the source reports both PCM and floating point audio formats.
by Giovanni Mascellani 13 May '21

13 May '21

From: Derek Lesho <dlesho(a)codeweavers.com> The patch is originally by Derek Lesho, with some changes by Giovanni Mascellani and Nikolay Sivov. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 3 --- dlls/winegstreamer/media_source.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index ded45afe771..e3ff7f6e7aa 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -752,9 +752,6 @@ static void test_source_reader(void) if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); - hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 1, &mediatype); - ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); - /* Current media type. */ hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &mediatype); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..5249bc9c41d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -806,6 +806,31 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; } } + else if (format.major_type == WG_MAJOR_TYPE_AUDIO) + { + /* Expose at least one PCM and one floating point type for the + consumer to pick from. */ + static const enum wg_audio_format audio_types[] = + { + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_F64LE, + }; + + stream_types = malloc( sizeof(IMFMediaType *) * (ARRAY_SIZE(audio_types) + 1) ); + + stream_types[0] = mf_media_type_from_wg_format(&format); + type_count = 1; + + for (i = 0; i < ARRAY_SIZE(audio_types); i++) + { + struct wg_format new_format; + if (format.u.audio.format == audio_types[i]) + continue; + new_format = format; + new_format.u.audio.format = audio_types[i]; + stream_types[type_count++] = mf_media_type_from_wg_format(&new_format); + } + } else { stream_type = mf_media_type_from_wg_format(&format); -- 2.31.1

2 1

[PATCH] gdi32: Fix a memory leak.
by Haoyang Chen 13 May '21

13 May '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/gdi32/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 456eb245700..6af76d6f81b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1540,9 +1540,10 @@ static UINT parse_aa_pattern( FcPattern *pattern ) static FcPattern *create_family_pattern( const char *name, FcPattern **cached ) { - FcPattern *ret = NULL, *tmp, *pattern = pFcPatternCreate(); + FcPattern *ret = NULL, *tmp, *pattern; FcResult result; if (*cached) return *cached; + pattern = pFcPatternCreate(); pFcPatternAddString( pattern, FC_FAMILY, (const FcChar8 *)name ); pFcPatternAddString( pattern, FC_NAMELANG, (const FcChar8 *)"en-us" ); pFcPatternAddString( pattern, FC_PRGNAME, (const FcChar8 *)"wine" ); -- 2.20.1

1 0

[PATCH 1/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_feature_level().
by Zebediah Figura 13 May '21

13 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5d9d19a85af..36bf39cf789 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2055,15 +2055,16 @@ static void wined3d_cs_exec_set_feature_level(struct wined3d_cs *cs, const void cs->state.feature_level = op->level; } -void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) +void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context *context, + enum wined3d_feature_level level) { struct wined3d_cs_set_feature_level *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_FEATURE_LEVEL; op->level = level; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static const struct diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 38ab2aed900..ff1d03de0f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1748,7 +1748,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 TRACE("device %p, state %p.\n", device, state); device->cs->c.state = state; - wined3d_cs_emit_set_feature_level(device->cs, state->feature_level); + wined3d_device_context_emit_set_feature_level(context, state->feature_level); for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6565b2044df..3babb23f75a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4750,7 +4750,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; @@ -4805,6 +4804,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context *context, + enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context, -- 2.30.2

3 12

[PATCH 1/5] server: Reset the reported event mask in set_socket_event only when using window messages.
by Zebediah Figura 13 May '21

13 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 21 ++++++++++----------- server/sock.c | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ec78e62969e..7611b934c3a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2641,9 +2641,8 @@ static void test_WSAEnumNetworkEvents(void) } else { - todo_wine_if (i != 0) /* Remove when fixed */ - ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", - i, net_events.lNetworkEvents); + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); } for (k = 0; k < FD_MAX_EVENTS; k++) { @@ -3990,12 +3989,12 @@ static void test_accept_events(struct event_test_ctx *ctx) select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); if (ctx->is_message) check_events(ctx, FD_ACCEPT, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); select_events(ctx, listener, 0); select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); if (ctx->is_message) check_events(ctx, FD_ACCEPT, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); client2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(client2 != -1, "failed to create socket, error %u\n", WSAGetLastError()); @@ -4134,7 +4133,7 @@ static void test_connect_events(struct event_test_ctx *ctx) select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); @@ -4235,12 +4234,12 @@ static void test_write_events(struct event_test_ctx *ctx) select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret); @@ -4268,7 +4267,7 @@ static void test_write_events(struct event_test_ctx *ctx) select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); } closesocket(server); @@ -4313,12 +4312,12 @@ static void test_read_events(struct event_test_ctx *ctx) select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) check_events(ctx, FD_READ, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) check_events(ctx, FD_READ, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); ret = send(client, "data", 5, 0); ok(ret == 5, "got %d\n", ret); diff --git a/server/sock.c b/server/sock.c index bd65cfc68c3..ad80b897365 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1780,7 +1780,8 @@ DECL_HANDLER(set_socket_event) if (get_unix_fd( sock->fd ) == -1) return; old_event = sock->event; sock->mask = req->mask; - sock->reported_events &= ~req->mask; /* re-enable held events */ + if (req->window) + sock->reported_events &= ~req->mask; /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg; -- 2.30.2

1 4

[PATCH 1/2] server: Support nested jobs.
by Paul Gofman 13 May '21

13 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 182 +++++++++++++++++++++++++++++++++- server/process.c | 148 ++++++++++++++++++++------- 2 files changed, 290 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..18f0415cb04 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -71,6 +71,7 @@ static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFla static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); +static HANDLE (WINAPI *pOpenJobObjectA)(DWORD access, BOOL inherit, LPCSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); @@ -257,6 +258,8 @@ static BOOL init(void) pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pOpenJobObjectA = (void *)GetProcAddress(hkernel32, "OpenJobObjectA"); + pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); @@ -2810,6 +2813,7 @@ static void test_CompletionPort(void) wait_child_process(pi.hProcess); test_completion(port, JOB_OBJECT_MSG_EXIT_PROCESS, (DWORD_PTR)job, pi.dwProcessId, 0); + test_completion(port, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, (DWORD_PTR)job, 0, 100); CloseHandle(pi.hProcess); @@ -2976,13 +2980,14 @@ static void test_jobInheritance(HANDLE job) wait_and_close_child_process(&pi); } -static void test_BreakawayOk(HANDLE job) +static void test_BreakawayOk(HANDLE parent_job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; char buffer[MAX_PATH + 23]; - BOOL ret, out; + BOOL ret, out, nested_jobs; + HANDLE job; if (!pIsProcessInJob) { @@ -2990,6 +2995,16 @@ static void test_BreakawayOk(HANDLE job) return; } + job = pCreateJobObjectW(NULL, NULL); + ok(!!job, "CreateJobObjectW error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* before Win 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + nested_jobs = ret; + if (!ret) + win_skip("Nested jobs are not supported.\n"); + sprintf(buffer, "\"%s\" process exit", selfname); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); @@ -3001,8 +3016,30 @@ static void test_BreakawayOk(HANDLE job) wait_and_close_child_process(&pi); } + if (nested_jobs) + { + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + sprintf(buffer, "\"%s\" process exit", selfname); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA error %u\n", GetLastError()); + + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + wait_and_close_child_process(&pi); + } + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; - ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ret = pSetInformationJobObject(parent_job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); ok(ret, "SetInformationJobObject error %u\n", GetLastError()); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); @@ -3012,6 +3049,10 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + wait_and_close_child_process(&pi); limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; @@ -4309,6 +4350,135 @@ static void test_dead_process(void) CloseHandle(pi.hThread); } +static void test_nested_jobs_child(unsigned int index) +{ + HANDLE job, job_parent, job_other; + PROCESS_INFORMATION pi; + char job_name[32]; + BOOL ret, out; + + sprintf(job_name, "test_nested_jobs_%u", index); + job = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job, "OpenJobObjectA error %u\n", GetLastError()); + + sprintf(job_name, "test_nested_jobs_%u", !index); + job_other = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job_other, "OpenJobObjectA error %u\n", GetLastError()); + + job_parent = pCreateJobObjectW(NULL, NULL); + ok(!!job_parent, "CreateJobObjectA error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job_parent, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job_parent, pi.hProcess); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* Supported since Windows 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + if (!ret) + { + win_skip("Nested jobs are not supported.\n"); + goto done; + } + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(GetCurrentProcess(), job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + create_process("wait", &pi); + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job_parent, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + if (index) + { + ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); + ok(!ret, "AssignProcessToJobObject succeded\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } +done: + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job_parent); + CloseHandle(job); + CloseHandle(job_other); +} + +static void test_nested_jobs(void) +{ + PROCESS_INFORMATION info[2]; + char buffer[MAX_PATH + 26]; + STARTUPINFOA si = {0}; + HANDLE job1, job2; + unsigned int i; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + sprintf(buffer, "\"%s\" process nested_jobs 0", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[0]), + "CreateProcess failed\n"); + wait_child_process(info[0].hProcess); + sprintf(buffer, "\"%s\" process nested_jobs 1", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[1]), + "CreateProcess failed\n"); + wait_child_process(info[1].hProcess); + for (i = 0; i < 2; ++i) + { + CloseHandle(info[i].hProcess); + CloseHandle(info[i].hThread); + } + + CloseHandle(job1); + CloseHandle(job2); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4384,6 +4554,11 @@ START_TEST(process) test_handle_list_attribute(TRUE, h, h2); return; } + else if (!strcmp(myARGV[2], "nested_jobs") && myARGC >= 4) + { + test_nested_jobs_child(atoi(myARGV[3])); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -4452,6 +4627,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); test_WaitForJobObject(); + test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job); diff --git a/server/process.c b/server/process.c index 5ef7596733f..8b6d6fd3e9b 100644 --- a/server/process.c +++ b/server/process.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/time.h> +#include <stdint.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -183,7 +184,7 @@ static void job_destroy( struct object *obj ); struct job { struct object obj; /* object header */ - struct list process_list; /* list of all processes */ + struct list process_list; /* list of processes */ int num_processes; /* count of running processes */ int total_processes; /* count of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ @@ -191,6 +192,9 @@ struct job int signaled; /* job is signaled */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ + struct job *parent; + struct list parent_job_entry; /* list entry for parent job */ + struct list child_job_list; /* list of child jobs */ }; static const struct object_ops job_ops = @@ -228,6 +232,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ { /* initialize it if it didn't already exist */ list_init( &job->process_list ); + list_init( &job->child_job_list ); job->num_processes = 0; job->total_processes = 0; job->limit_flags = 0; @@ -235,6 +240,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ job->signaled = 0; job->completion_port = NULL; job->completion_key = 0; + job->parent = NULL; } } return job; @@ -251,14 +257,68 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi add_completion( job->completion_port, job->completion_key, pid, STATUS_SUCCESS, msg ); } +static int walk_job( struct job *job, void *param, int (*callback)( struct job *, void * )) +{ + struct job *j, *next; + + LIST_FOR_EACH_ENTRY_SAFE( j, next, &job->child_job_list, struct job, parent_job_entry ) + { + assert( j->parent == job ); + if (walk_job( j, param, callback )) return 1; + } + return callback( job, param ); +} + +static int process_in_job( struct job *job, void *param ) +{ + struct process *process = param; + + assert( process->obj.ops == &process_ops ); + return process->job == job; +} + static void add_job_process( struct job *job, struct process *process ) { + process_id_t pid; + struct job *j; + + if (job == process->job) return; + + if (process->job) + { + list_remove( &process->job_entry ); + if (job->parent) + { + j = job->parent; + while (j && j != process->job) + j = j->parent; + + if (!j) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + release_object( process->job ); + } + else + { + job->parent = process->job; + list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); + } + } + + pid = get_process_id( process ); + j = job; + while (j != process->job) + { + j->num_processes++; + j->total_processes++; + add_job_completion( j, JOB_OBJECT_MSG_NEW_PROCESS, pid ); + j = j->parent; + } + process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); - job->num_processes++; - job->total_processes++; - - add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); } /* called when a process has terminated, allow one additional process */ @@ -266,40 +326,42 @@ static void release_job_process( struct process *process ) { struct job *job = process->job; - if (!job) return; + while (job) + { + assert( job->num_processes ); + job->num_processes--; - assert( job->num_processes ); - job->num_processes--; + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); - if (!job->terminating) - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->num_processes) + add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); - if (!job->num_processes) - add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); + job = job->parent; + } } -static void terminate_job( struct job *job, int exit_code ) +static int terminate_job_processes( struct job *job, void *exit_code ) { + struct process *process, *next; + /* don't report completion events for terminated processes */ job->terminating = 1; - for (;;) /* restart from the beginning of the list every time */ + LIST_FOR_EACH_ENTRY_SAFE( process, next, &job->process_list, struct process, job_entry ) { - struct process *process; - - /* find the first process associated with this job and still running */ - LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) - { - if (process->running_threads) break; - } - if (&process->job_entry == &job->process_list) break; /* no process found */ assert( process->job == job ); - terminate_process( process, NULL, exit_code ); + if (process->running_threads) terminate_process( process, NULL, (uintptr_t)exit_code ); } - job->terminating = 0; job->signaled = 1; wake_up( &job->obj, 0 ); + return 0; +} + +static void terminate_job( struct job *job, int exit_code ) +{ + walk_job( job, (void *)(uintptr_t)exit_code, terminate_job_processes ); } static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) @@ -321,16 +383,23 @@ static void job_destroy( struct object *obj ) assert( obj->ops == &job_ops ); assert( !job->num_processes ); - assert( list_empty(&job->process_list) ); + assert( list_empty( &job->process_list )); + assert( list_empty( &job->child_job_list )); if (job->completion_port) release_object( job->completion_port ); + if (job->parent) + { + list_remove( &job->parent_job_entry ); + release_object( job->parent ); + } } static void job_dump( struct object *obj, int verbose ) { struct job *job = (struct job *)obj; assert( obj->ops == &job_ops ); - fprintf( stderr, "Job processes=%d\n", list_count(&job->process_list) ); + fprintf( stderr, "Job processes=%d child_jobs=%d parent=%p\n", + list_count(&job->process_list), list_count(&job->child_job_list), job->parent ); } static int job_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -1025,6 +1094,7 @@ DECL_HANDLER(new_process) struct thread *parent_thread = current; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); const obj_handle_t *handles = NULL; + struct job *job; if (socket_fd == -1) { @@ -1061,6 +1131,8 @@ DECL_HANDLER(new_process) } else parent = (struct process *)grab_object( current->process ); + /* If a job further in the job chain does not permit breakaway process creation + * succeeds and the process which is trying to breakaway is assigned to that job. */ if (parent->job && (req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) && !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) { @@ -1151,11 +1223,17 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (parent->job - && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) - && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + job = parent->job; + while (job) { - add_job_process( parent->job, process ); + if (!(job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK) + && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY + && job->limit_flags & JOB_OBJECT_LIMIT_BREAKAWAY_OK)) + { + add_job_process( job, process ); + break; + } + job = job->parent; } /* connect to the window station */ @@ -1570,12 +1648,8 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - if (!process->running_threads) - set_error( STATUS_PROCESS_IS_TERMINATING ); - else if (process->job) - set_error( STATUS_ACCESS_DENIED ); - else - add_job_process( job, process ); + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else add_job_process( job, process ); release_object( process ); } release_object( job ); @@ -1597,7 +1671,7 @@ DECL_HANDLER(process_in_job) } else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) { - set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + set_error( walk_job( job, process, process_in_job ) ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); release_object( job ); } release_object( process ); -- 2.31.1

2 3

[PATCH] ntdll: Use %I64x instead of %lx to trace 64-bit values.
by Zebediah Figura 13 May '21

13 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c5a6666f4d2..0396433cb32 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -525,7 +525,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) - TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); + TRACE( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) { @@ -534,7 +534,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], (char*)rec->ExceptionInformation[1] ); else - MESSAGE( "wine: Call from %p to unimplemented function %s.%ld, aborting\n", + MESSAGE( "wine: Call from %p to unimplemented function %s.%I64d, aborting\n", rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } @@ -557,13 +557,13 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) else WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", context->R12, context->R13, context->R14, context->R15 ); } @@ -1247,17 +1247,17 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND); - TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016lx\n", + TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016I64x\n", rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, context->Rip ); for (i = 0; i < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); i++) - TRACE( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + TRACE( " info[%d]=%016I64x\n", i, rec->ExceptionInformation[i] ); + TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", context->R12, context->R13, context->R14, context->R15 ); dispatch.EstablisherFrame = context->Rsp; -- 2.30.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel