November 2022 - Wine-Commits

Jacek Caban : winevulkan: Remove unneeded needs_conversion() calls.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

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: Move get_conversions implementation to VkVariable.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: a0e34f16b15ffd79a0a3a395545898ba3d358edd URL: https://gitlab.winehq.org/wine/wine/-/commit/a0e34f16b15ffd79a0a3a395545898… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 11:30:45 2022 +0100 winevulkan: Move get_conversions implementation to VkVariable. --- dlls/winevulkan/make_vulkan | 103 +++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 63 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index be8717aa02a..dcdf2c4ab10 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1173,6 +1173,46 @@ class VkVariable(object): def needs_host_type(self): return self.is_struct() and self.struct.needs_host_type() + def get_conversions(self, unwrap, parent_const=False): + """ Get a list of conversions required for this parameter if any. + Parameters which are structures may require conversion between win32 + and the host platform. This function returns a list of conversions + required. + """ + + if self.is_struct(): + self.struct.needs_struct_extensions_conversion() + for m in self.struct: + if m.type == self.struct.name: + continue + m.needs_struct_extensions_conversion() + elif not self.is_handle(): + return [] + + conversions = [] + + # Collect any member conversions first, so we can guarantee + # those functions will be defined prior to usage by the + # 'parent' param requiring conversion. + if self.is_struct(): + is_const = self.is_const() if self.is_pointer() else parent_const + for m in self.struct: + if m.type == self.struct.name: + continue + if not m.is_struct(): + continue + + conversions.extend(m.get_conversions(unwrap, is_const)) + + # Conversion requirements for the 'parent' parameter. + for conv in [False, True]: + if self.needs_conversion(conv, unwrap, Direction.INPUT, parent_const): + conversions.append(ConversionFunction(self, Direction.INPUT, conv, unwrap)) + if self.needs_conversion(conv, unwrap, Direction.OUTPUT, parent_const): + conversions.append(ConversionFunction(self, Direction.OUTPUT, conv, unwrap)) + + return conversions + class VkMember(VkVariable): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, @@ -1348,34 +1388,6 @@ class VkMember(VkVariable): return text - def get_conversions(self, unwrap, parent_const): - """ Return any conversion description for this member and its children when conversion is needed. """ - - 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() - conversions.extend(m.get_conversions(parent_const, unwrap)) - - struct.needs_struct_extensions_conversion() - direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT - elif self.is_handle() or self.is_generic_handle(): - direction = Direction.INPUT - else: - return [] - - for conv in [False, True]: - if self.needs_conversion(conv, unwrap, direction, parent_const): - conversions.append(ConversionFunction(self, direction, conv, unwrap)) - - return conversions - def is_struct_forward_declaration(self): return self.struct_fwd_decl @@ -1595,41 +1607,6 @@ class VkParam(VkVariable): def format_string(self): return self.format_str - def get_conversions(self, unwrap): - """ Get a list of conversions required for this parameter if any. - Parameters which are structures may require conversion between win32 - and the host platform. This function returns a list of conversions - required. - """ - - 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 [] - - conversions = [] - - # Collect any member conversions first, so we can guarantee - # those functions will be defined prior to usage by the - # 'parent' param requiring conversion. - if self.is_struct(): - for m in self.struct: - if not m.is_struct(): - continue - - conversions.extend(m.get_conversions(unwrap, False)) - - # Conversion requirements for the 'parent' parameter. - for conv in [False, True]: - if self.needs_conversion(conv, unwrap, Direction.INPUT): - conversions.append(ConversionFunction(self, Direction.INPUT, conv, unwrap)) - if self.needs_conversion(conv, unwrap, Direction.OUTPUT): - conversions.append(ConversionFunction(self, Direction.OUTPUT, conv, unwrap)) - - return conversions - def is_dispatchable(self): if not self.is_handle(): return False

1 0

Jacek Caban : winevulkan: Pass direction to needs_conversion helpers.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

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: Introduce needs_host_type helper function.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

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 Nov. 3, 2022

Nov. 3, 2022

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

Nikolay Sivov : vbscript: Implement PRNG functions.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: d2307e415325227a061718fe89ed2df6d5cdab7f URL: https://gitlab.winehq.org/wine/wine/-/commit/d2307e415325227a061718fe89ed2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 3 19:09:12 2022 +0300 vbscript: Implement PRNG functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53676 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 80 +++++++++++++++++++++++++++++++++++++++++---- dlls/vbscript/tests/api.vbs | 42 ++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 1 + dlls/vbscript/vbscript.h | 2 ++ 4 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f35c4ac2fc4..669eae3b5c4 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -439,6 +439,20 @@ static HRESULT to_double(VARIANT *v, double *ret) return S_OK; } +static HRESULT to_float(VARIANT *v, float *ret) +{ + VARIANT dst; + HRESULT hres; + + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, 0, VT_R4); + if(FAILED(hres)) + return hres; + + *ret = V_R4(&dst); + return S_OK; +} + static HRESULT to_string(VARIANT *v, BSTR *ret) { VARIANT dst; @@ -1075,16 +1089,70 @@ static HRESULT Global_Sqr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA return return_double(res, sqrt(d)); } +static unsigned int get_next_rnd(int value) +{ + return (value * 0x43fd43fd + 0xc39ec3) & 0xffffff; +} + static HRESULT Global_Randomize(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + union + { + double d; + unsigned int i[2]; + } dtoi; + unsigned int seed; + HRESULT hres; + + assert(args_cnt == 0 || args_cnt == 1); + if (args_cnt == 1) { + hres = to_double(arg, &dtoi.d); + if (FAILED(hres)) + return hres; + } + else + dtoi.d = GetTickCount() * 0.001; + + seed = dtoi.i[1]; + seed ^= (seed >> 16); + seed = ((seed & 0xffff) << 8) | (This->ctx->script_obj->rnd & 0xff); + This->ctx->script_obj->rnd = seed; + + return res ? DISP_E_TYPEMISMATCH : S_OK; } static HRESULT Global_Rnd(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + static const float modulus = 16777216.0f; + unsigned int value; + HRESULT hres; + float f; + + assert(args_cnt == 0 || args_cnt == 1); + + value = This->ctx->script_obj->rnd; + if (args_cnt == 1) + { + hres = to_float(arg, &f); + if (FAILED(hres)) + return hres; + + if (f < 0.0f) + { + value = *(unsigned int *)&f; + This->ctx->script_obj->rnd = value = get_next_rnd(value + (value >> 24)); + } + else if (f == 0.0f) + value = This->ctx->script_obj->rnd; + else + This->ctx->script_obj->rnd = value = get_next_rnd(value); + } + else + { + This->ctx->script_obj->rnd = value = get_next_rnd(value); + } + + return return_float(res, (float)value / modulus); } static HRESULT Global_Timer(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -3092,12 +3160,12 @@ static const builtin_prop_t global_props[] = { {L"MsgBox", Global_MsgBox, 0, 1, 5}, {L"Now", Global_Now, 0, 0}, {L"Oct", Global_Oct, 0, 1}, - {L"Randomize", Global_Randomize, 0, 1}, + {L"Randomize", Global_Randomize, 0, 0, 1}, {L"Replace", Global_Replace, 0, 3, 6}, {L"RGB", Global_RGB, 0, 3}, {L"Right", Global_Right, 0, 2}, {L"RightB", Global_RightB, 0, 2}, - {L"Rnd", Global_Rnd, 0, 1}, + {L"Rnd", Global_Rnd, 0, 0, 1}, {L"Round", Global_Round, 0, 1, 2}, {L"RTrim", Global_RTrim, 0, 1}, {L"ScriptEngine", Global_ScriptEngine, 0, 0}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 000ae1b5167..21834cb8a03 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2221,4 +2221,46 @@ call testTimeSerial(10, 60, 2, 11, 0, 2, DateSerial(1899, 12, 30)) call testTimeSerial(10, 0, 60, 10, 1, 0, DateSerial(1899, 12, 30)) call testTimeSerialError() +sub testRnd(arg, expresult) + dim x + x = Rnd(arg) + call ok(x = expresult, "result = " & x & " expected " & expresult) + call ok(getVT(x) = "VT_R4*", "getVT = " & getVT(x)) +end sub + +' Initial seed value +call testRnd(0, 327680 / 16777216) +call testRnd(0, 327680 / 16777216) +' Negative argument is a seed, does not use current RNG state +call ok(Rnd(-2) = Rnd(-2), "Expected same result") +call ok(Rnd(-1) <> Rnd(-2), "Expected differing result") + +sub testRandomizeError() + on error resume next + dim x + call Err.clear() + x = Randomize(0) + call ok(Err.number = 13, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) +end sub + +' Randomize uses current RNG value, so it's reset using Rnd(-1) +sub testRandomize() + dim x, y + + Rnd(-1) + Randomize(123) + x = Rnd() + Randomize(123) + y = Rnd() + call ok(x <> y, "Expected differing result") + Rnd(-1) + Randomize(123) + y = Rnd() + call ok(x = y, "Expected same result") +end sub + +call testRandomize() +call testRandomizeError() + Call reportSuccess() diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 74da0a21fb0..21142d5dcaf 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1516,6 +1516,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) script_disp->ref = 1; script_disp->ctx = ctx; heap_pool_init(&script_disp->heap); + script_disp->rnd = 0x50000; *ret = script_disp; return S_OK; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 11564345aa3..d68056788c9 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -136,6 +136,8 @@ typedef struct { script_ctx_t *ctx; heap_pool_t heap; + + unsigned int rnd; } ScriptDisp; typedef struct _builtin_prop_t builtin_prop_t;

1 0

wuliande : msvcp90: Make _Condition_variable_* function pointers static.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

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 Nov. 3, 2022

Nov. 3, 2022

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 Nov. 3, 2022

Nov. 3, 2022

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 Nov. 3, 2022

Nov. 3, 2022

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