wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Jacek Caban : winevulkan: Pass direction to needs_conversion helpers.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: c13f91c7bfed3afc705b9cac3bf30f8dcb7783ab URL: https://gitlab.winehq.org/wine/wine/-/commit/c13f91c7bfed3afc705b9cac3bf30f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 2 23:51:50 2022 +0100 winevulkan: Pass direction to needs_conversion helpers. Instead of using pre-calculated heuristics. --- dlls/winevulkan/make_vulkan | 285 +++++++++++++++++++++------------------- dlls/winevulkan/vulkan_thunks.c | 42 ++++++ 2 files changed, 189 insertions(+), 138 deletions(-)

1 0

Jacek Caban : winevulkan: Store returnedonly attribute in VkVariable.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: f8ecbed38c1864cf14b0617c9121b7dd16f458ec URL: https://gitlab.winehq.org/wine/wine/-/commit/f8ecbed38c1864cf14b0617c9121b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 2 22:26:26 2022 +0100 winevulkan: Store returnedonly attribute in VkVariable. --- dlls/winevulkan/make_vulkan | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 10e5a03f11b..6eb73f6dc77 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1090,7 +1090,7 @@ class VkHandle(object): class VkVariable(object): def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_len=None, - dyn_array_len=None, object_type=None, optional=False): + dyn_array_len=None, object_type=None, optional=False, returnedonly=False): self.const = const self.type_info = type_info self.type = type @@ -1100,6 +1100,7 @@ class VkVariable(object): self.dyn_array_len = dyn_array_len self.object_type = object_type self.optional = optional + self.returnedonly = returnedonly if type_info: self.set_type_info(type_info) @@ -1196,9 +1197,11 @@ class VkVariable(object): class VkMember(VkVariable): 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, object_type=None, bit_width=None): + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None, + returnedonly=False): VkVariable.__init__(self, const=const, type=_type, name=name, pointer=pointer, array_len=array_len, - dyn_array_len=dyn_array_len, object_type=object_type, optional=optional) + dyn_array_len=dyn_array_len, object_type=object_type, optional=optional, + returnedonly=returnedonly) self.struct_fwd_decl = struct_fwd_decl self.values = values self.bit_width = bit_width @@ -1217,7 +1220,7 @@ class VkMember(VkVariable): self.name, self.array_len, self.dyn_array_len) @staticmethod - def from_xml(member): + def from_xml(member, returnedonly): """ Helper function for parsing a member tag within a struct or union. """ name_elem = member.find("name") @@ -1280,8 +1283,9 @@ class VkMember(VkVariable): LOGGER.debug("Found bit field") bit_width = int(name_elem.tail[1:]) - 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, object_type=object_type, bit_width=bit_width) + 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, object_type=object_type, bit_width=bit_width, returnedonly=returnedonly) def copy(self, input, output, direction, conv, unwrap): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1804,7 +1808,7 @@ class VkStruct(Sequence): members = [] for member in struct.findall("member"): - vk_member = VkMember.from_xml(member) + vk_member = VkMember.from_xml(member, returnedonly) members.append(vk_member) return VkStruct(name, members, returnedonly, structextends, union=union)

1 0

Jacek Caban : winevulkan: Remove unneeded needs_conversion() calls.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: a6cd7ee257f7dfbbf499828e96e90db8dccb29c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6cd7ee257f7dfbbf499828e96e90d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 2 20:44:18 2022 +0100 winevulkan: Remove unneeded needs_conversion() calls. --- dlls/winevulkan/make_vulkan | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index dbe10a1b6d3..10e5a03f11b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -654,19 +654,6 @@ class VkFunction(object): def returns_longlong(self): return self.type in ["uint64_t", "VkDeviceAddress"] - def needs_conversion(self): - """ Check if the function needs any input/output type conversion. - Functions need input/output conversion if struct parameters have - alignment differences between Win32 and Linux 32-bit. - """ - - for p in self.params: - if p.needs_conversion(): - LOGGER.debug("Parameter {0} to {1} requires conversion".format(p.name, self.name)) - return True - - 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 @@ -1098,9 +1085,6 @@ 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() @@ -1384,20 +1368,17 @@ class VkMember(VkVariable): def get_conversions(self, func=None): """ Return any conversion description for this member and its children when conversion is needed. """ - # 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() and not self.needs_unwrapping(): - return None - conversions = [] # Collect any conversion for any member structs. if self.is_struct(): struct = self.type_info["data"] for m in struct: + if m.type == struct.name: + continue + m.needs_struct_extensions_conversion() - if m.needs_conversion() or m.needs_unwrapping(): - conversions.extend(m.get_conversions(func)) + conversions.extend(m.get_conversions(func)) struct.needs_struct_extensions_conversion() direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT @@ -1640,9 +1621,6 @@ class VkParam(VkVariable): elif not self.is_handle(): return None - if not self.needs_conversion() and not self.needs_unwrapping(): - return None - conversions = [] # Collect any member conversions first, so we can guarantee @@ -1653,9 +1631,6 @@ class VkParam(VkVariable): if not m.is_struct(): continue - if not m.needs_conversion() and not m.needs_unwrapping(): - continue - conversions.extend(m.get_conversions(func)) # Conversion requirements for the 'parent' parameter. @@ -2334,9 +2309,6 @@ class VkGenerator(object): if not func.is_required(): continue - if not func.needs_conversion() and not func.needs_unwrapping(): - continue - conversions = func.get_conversions() for conv in conversions: # Append if we don't already have this conversion.

1 0

Jacek Caban : winevulkan: Introduce needs_host_type helper function.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 844f1b1705fa5ba94772c90b08938e3a6ed0b869 URL: https://gitlab.winehq.org/wine/wine/-/commit/844f1b1705fa5ba94772c90b08938e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 2 19:58:27 2022 +0100 winevulkan: Introduce needs_host_type helper function. --- dlls/winevulkan/make_vulkan | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2a369f5b3c4..dbe10a1b6d3 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -711,7 +711,7 @@ class VkFunction(object): pfn += param.const + " " pfn += param.type - if conv and param.needs_conversion(): + if conv and param.needs_host_type(): pfn += "_host" if param.is_pointer(): @@ -780,7 +780,7 @@ class VkFunction(object): # Declare any tmp parameters for conversion. for p in self.params: - if p.needs_conversion() and conv: + if p.needs_host_type() and conv: if p.is_dynamic_array(): body += " {0}_host *{1}_host;\n".format(p.type, p.name) else: @@ -1206,6 +1206,10 @@ class VkVariable(object): return self.is_struct() and self.struct.needs_alloc(conv, unwrap) + def needs_host_type(self): + return self.is_struct() and self.struct.needs_host_type() + + class VkMember(VkVariable): 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, object_type=None, bit_width=None): @@ -1580,7 +1584,7 @@ class VkParam(VkVariable): proto += self.type name = self.name - if is_thunk and self.needs_conversion(): + if is_thunk and self.needs_host_type(): proto += "_host" if is_member and self.needs_alignment(): @@ -1687,13 +1691,6 @@ class VkParam(VkVariable): if not self.is_struct(): return False - # VkSparseImageMemoryRequirements(2) is used by vkGetImageSparseMemoryRequirements(2). - # This function is tricky to wrap, because how to wrap depends on whether - # pSparseMemoryRequirements is NULL or not. Luckily for VkSparseImageMemoryRequirements(2) - # the alignment works out in such a way that no conversion is needed between win32 and Linux. - if self.type in ["VkSparseImageMemoryRequirements", "VkSparseImageMemoryRequirements2"]: - return False - # If a structure needs alignment changes, it means we need to # perform parameter conversion between win32 and host. if self.struct.needs_conversion(): @@ -1956,6 +1953,13 @@ class VkStruct(Sequence): or if they include other structures which need alignment. """ + # VkSparseImageMemoryRequirements(2) is used by vkGetImageSparseMemoryRequirements(2). + # This function is tricky to wrap, because how to wrap depends on whether + # pSparseMemoryRequirements is NULL or not. Luckily for VkSparseImageMemoryRequirements(2) + # the alignment works out in such a way that no conversion is needed between win32 and Linux. + if self.name in ["VkSparseImageMemoryRequirements", "VkSparseImageMemoryRequirements2"]: + return False + if self.needs_alignment(): return True @@ -1987,6 +1991,19 @@ class VkStruct(Sequence): return False + def needs_host_type(self): + # FIXME: Remove once we don't need need it + if self.name in ["VkSparseImageMemoryRequirements", "VkSparseImageMemoryRequirements2"]: + return False + + for m in self.members: + if self.name == m.type: + continue + if m.needs_alignment(): + return True + if m.is_struct() and m.struct.needs_host_type(): + return True + def needs_struct_extensions_conversion(self): """ Checks if structure extensions in pNext chain need conversion. """ ret = False @@ -2037,7 +2054,7 @@ class ConversionFunction(object): else: body += "#if !defined(USE_STRUCT_CONVERSION)\n" - if self.conv and self.operand.needs_conversion(): + if self.conv and isinstance(self.operand, VkStruct) and self.operand.needs_host_type(): host_type = "{0}_host".format(self.type) else: host_type = self.type @@ -2549,7 +2566,7 @@ class VkGenerator(object): LOGGER.debug("skipping {0} in vulkan_device_funcs".format(vk_func.name)) continue - f.write(" {0};\n".format(vk_func.pfn(conv=vk_func.needs_conversion()))) + f.write(" {0};\n".format(vk_func.pfn(conv=True))) f.write("};\n\n") f.write("/* For use by vkInstance and children */\n") @@ -2562,7 +2579,7 @@ class VkGenerator(object): LOGGER.debug("skipping {0} in vulkan_instance_funcs".format(vk_func.name)) continue - f.write(" {0};\n".format(vk_func.pfn(conv=vk_func.needs_conversion()))) + f.write(" {0};\n".format(vk_func.pfn(conv=True))) f.write("};\n\n") f.write("#define ALL_VK_DEVICE_FUNCS() \\\n")

1 0

Jacek Caban : winevulkan: Don't store conversion functions in VkParam.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: be28be1de7d57ef4e50d2d11730ac31d06bf5660 URL: https://gitlab.winehq.org/wine/wine/-/commit/be28be1de7d57ef4e50d2d11730ac3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 19:38:41 2022 +0200 winevulkan: Don't store conversion functions in VkParam. --- dlls/winevulkan/make_vulkan | 82 ++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 49 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1db4498abd9..2a369f5b3c4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -587,10 +587,7 @@ class VkFunction(object): vk_param = VkParam.from_xml(param, types) params.append(vk_param) - func = VkFunction(_type=func_type, name=func_name, params=params) - for param in params: - param.set_conversions(func) - return func + return VkFunction(_type=func_type, name=func_name, params=params) def get_conversions(self): """ Get a list of conversion functions required for this function if any. @@ -813,7 +810,7 @@ class VkFunction(object): # Call any win_to_host conversion calls. unwrap = self.thunk_type == ThunkType.PUBLIC for p in self.params: - if p.needs_input_conversion(conv) and (conv or (unwrap and p.needs_unwrapping())): + if p.needs_input_conversion(conv, unwrap): body += p.copy(Direction.INPUT, conv, unwrap, prefix=params_prefix) # Build list of parameters containing converted and non-converted parameters. @@ -834,11 +831,8 @@ class VkFunction(object): body += " {0}result = {1}{2}({3});\n".format(params_prefix, func_prefix, self.name, params) # Call any host_to_win conversion calls. - if conv: - for p in self.params: - if not p.needs_output_conversion(conv): - continue - + for p in self.params: + if p.needs_output_conversion(conv, unwrap): body += p.copy(Direction.OUTPUT, conv, unwrap, prefix=params_prefix) if needs_alloc: @@ -1483,33 +1477,6 @@ class VkParam(VkVariable): return VkParam(type_info, const=const, pointer=pointer, name=name, array_len=array_len, dyn_array_len=dyn_array_len, object_type=object_type, optional=optional) - def set_conversions(self, func): - """ Internal helper function to configure any needed conversion functions. """ - - self.func = func - self.input_conv = None - self.input_unwrap = None - self.output_conv = None - self.output_unwrap = None - - unwrap = func.thunk_type == ThunkType.PUBLIC; - - # Input functions require win to host conversion. - if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: - if unwrap and self.needs_unwrapping(): - self.input_unwrap = ConversionFunction(self, Direction.INPUT, False, True) - self.input_conv = ConversionFunction(self, Direction.INPUT, True, True) - elif self.needs_conversion(): - self.input_conv = ConversionFunction(self, Direction.INPUT, True, unwrap or not self.needs_unwrapping()) - - # Output functions require host to win conversion. - if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: - if unwrap and self.needs_unwrapping(): - self.output_conv = ConversionFunction(self, Direction.OUTPUT, False) - self.output_conv = ConversionFunction(self, Direction.OUTPUT, True) - elif self.needs_conversion(): - self.output_conv = ConversionFunction(self, Direction.OUTPUT, True, unwrap or not self.needs_unwrapping()) - def _set_direction(self): """ Internal helper function to set parameter direction (input/output/input_output). """ @@ -1688,14 +1655,23 @@ class VkParam(VkVariable): conversions.extend(m.get_conversions(func)) # Conversion requirements for the 'parent' parameter. - if self.input_unwrap is not None: - conversions.append(self.input_unwrap) - if self.input_conv is not None: - conversions.append(self.input_conv) - if self.output_unwrap is not None: - conversions.append(self.output_unwrap) - if self.output_conv is not None: - conversions.append(self.output_conv) + unwrap = func.thunk_type == ThunkType.PUBLIC; + + # Input functions require win to host conversion. + if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: + if unwrap and self.needs_unwrapping(): + conversions.append(ConversionFunction(self, Direction.INPUT, False, True)) + conversions.append(ConversionFunction(self, Direction.INPUT, True, True)) + elif self.needs_conversion(): + conversions.append(ConversionFunction(self, Direction.INPUT, True, unwrap or not self.needs_unwrapping())) + + # Output functions require host to win conversion. + if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: + if unwrap and self.needs_unwrapping(): + conversions.append(ConversionFunction(self, Direction.OUTPUT, False)) + conversions.append(ConversionFunction(self, Direction.OUTPUT, True)) + elif self.needs_conversion(): + conversions.append(ConversionFunction(self, Direction.OUTPUT, True, unwrap or not self.needs_unwrapping())) return conversions @@ -1737,11 +1713,19 @@ class VkParam(VkVariable): return False - def needs_input_conversion(self, conv): - return (self.input_conv if conv else self.input_unwrap) is not None + def needs_input_conversion(self, conv, unwrap): + if not self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: + return False + if unwrap and self.needs_unwrapping(): + return True + return conv and self.needs_conversion() - def needs_output_conversion(self, conv): - return (self.output_conv if conv else self.output_unwrap) is not None + def needs_output_conversion(self, conv, unwrap): + if not self._direction in [Direction.OUTPUT, Direction.INPUT_OUTPUT]: + return False + if unwrap and self.needs_unwrapping(): + return True + return conv and self.needs_conversion() def spec(self): """ Generate spec file entry for this parameter. """

1 0

Jacek Caban : winevulkan: Don't check thunk_type in VkParam.needs_unwrapping.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 67c9ff6f2e28b50d85fdd3bd8397341b719fb506 URL: https://gitlab.winehq.org/wine/wine/-/commit/67c9ff6f2e28b50d85fdd3bd839734… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 27 20:09:43 2022 +0200 winevulkan: Don't check thunk_type in VkParam.needs_unwrapping. --- dlls/winevulkan/make_vulkan | 3 --- dlls/winevulkan/vulkan_thunks.c | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6d5ead98833..1db4498abd9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1728,9 +1728,6 @@ class VkParam(VkVariable): def needs_unwrapping(self): """ Returns if parameter needs unwrapping of handle. """ - if self.func.needs_private_thunk(): - return False - # Wrapped handle parameters are handled separately, only look for wrapped handles in structs if self.is_struct(): return self.struct.needs_unwrapping() diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 65b4ab9b496..c4e42f3ce71 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2158,13 +2158,13 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy #endif /* USE_STRUCT_CONVERSION */ #if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out) +static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out) { if (!in) return; out->sType = in->sType; out->pNext = in->pNext; - out->surface = wine_surface_from_handle(in->surface)->driver_surface; + out->surface = in->surface; } #endif /* USE_STRUCT_CONVERSION */ @@ -2179,6 +2179,17 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_host(const V } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->surface = wine_surface_from_handle(in->surface)->driver_surface; +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPipelineExecutableInfoKHR *in, VkPipelineExecutableInfoKHR_host *out) { @@ -17227,7 +17238,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(params->pSurfaceInfo, &pSurfaceInfo_host); + convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(params->pSurfaceInfo, &pSurfaceInfo_host); params->result = wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(params->physicalDevice, &pSurfaceInfo_host, params->pSurfaceCapabilities); return STATUS_SUCCESS; }

1 0

wuliande : msvcp90: Make _Condition_variable_* function pointers static.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: ce125cc4f58a282b601af79c4a9e36b2dd4a307f URL: https://gitlab.winehq.org/wine/wine/-/commit/ce125cc4f58a282b601af79c4a9e36… Author: wuliande <m13552573542(a)163.com> Date: Wed Nov 2 21:51:30 2022 +0800 msvcp90: Make _Condition_variable_* function pointers static. --- dlls/msvcp90/msvcp_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 4c9faec9e26..8717384c2c6 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -88,10 +88,10 @@ static bool (__thiscall *critical_section_trylock)(critical_section*); static _Condition_variable* (__thiscall *_Condition_variable_ctor)(_Condition_variable*); static void (__thiscall *_Condition_variable_dtor)(_Condition_variable*); static void (__thiscall *_Condition_variable_wait)(_Condition_variable*, critical_section*); -bool (__thiscall *_Condition_variable_wait_for)(_Condition_variable*, +static bool (__thiscall *_Condition_variable_wait_for)(_Condition_variable*, critical_section*, unsigned int); -void (__thiscall *_Condition_variable_notify_one)(_Condition_variable*); -void (__thiscall *_Condition_variable_notify_all)(_Condition_variable*); +static void (__thiscall *_Condition_variable_notify_one)(_Condition_variable*); +static void (__thiscall *_Condition_variable_notify_all)(_Condition_variable*); void cs_init(cs *cs) {

1 0

Rémi Bernon : opengl32: Use the unixlib interface for WGL functions.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 28de0a56ae056f09ae4f7c05e5ee108be973daf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/28de0a56ae056f09ae4f7c05e5ee10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:31:48 2022 +0200 opengl32: Use the unixlib interface for WGL functions. --- dlls/opengl32/make_opengl | 29 ++++++++++++++ dlls/opengl32/opengl_ext.h | 2 + dlls/opengl32/thunks.c | 18 +++++++++ dlls/opengl32/unix_thunks.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 79 +++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 43 +++++++------------- 6 files changed, 238 insertions(+), 29 deletions(-)

1 0

Rémi Bernon : opengl32: Use the unixlib interface for EXT functions.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: dceaa225cd09c2a7b3cf8a139269729f86c46b19 URL: https://gitlab.winehq.org/wine/wine/-/commit/dceaa225cd09c2a7b3cf8a13926972… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 18 12:14:54 2022 +0200 opengl32: Use the unixlib interface for EXT functions. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/make_opengl | 154 +- dlls/opengl32/opengl_ext.c | 21484 ------------------------------------- dlls/opengl32/thunks.c | 24306 ++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unix_thunks.c | 24218 +++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 22763 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 71348 insertions(+), 21578 deletions(-)

1 0

Rémi Bernon : opengl32: Move the null functions to unix_thunks.c.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 30aada25da6c603f5ab8d9c8ab1441e0b3a1b025 URL: https://gitlab.winehq.org/wine/wine/-/commit/30aada25da6c603f5ab8d9c8ab1441… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:07:18 2022 +0200 opengl32: Move the null functions to unix_thunks.c. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/make_opengl | 102 +- dlls/opengl32/opengl_norm.c | 6098 ------------------------------------------- dlls/opengl32/unix_thunks.c | 6091 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 6137 insertions(+), 6155 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022