June 2018 - Wine-commits - list.winehq.org

Matteo Bruni : dxgi: Get rid of DXGI_FRAME_LATENCY_DEFAULT.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 0171c581ec1ec16b412c474e64b95cb9703ea62c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0171c581ec1ec16b412c474e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 20:32:29 2018 +0200 dxgi: Get rid of DXGI_FRAME_LATENCY_DEFAULT. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index c8dc67f..c05a0e8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -44,7 +44,6 @@ enum dxgi_frame_latency { - DXGI_FRAME_LATENCY_DEFAULT = 3, DXGI_FRAME_LATENCY_MAX = 16, };

1 0

Matteo Bruni : wined3d: Initialize glMinSampleShading() function pointer.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 4c8127ef41ca8f48aab49c52e4b8d1a1901747c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c8127ef41ca8f48aab49c52… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 20:32:30 2018 +0200 wined3d: Initialize glMinSampleShading() function pointer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3ca389e..afb9718 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3279,6 +3279,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */ USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glMinSampleShading) /* OpenGL 4.0 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */

1 0

Matteo Bruni : wined3d: Compare interpolation mode VS compilation arguments.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 42ace9d445fb4054b91ca005092be7d379f6a528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ace9d445fb4054b91ca005… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 20:32:31 2018 +0200 wined3d: Compare interpolation mode VS compilation arguments. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 +++++++--- dlls/wined3d/shader.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d6615d7..a99762b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8537,8 +8537,10 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, const DWORD use_map) { - if((stored->swizzle_map & use_map) != new->swizzle_map) return FALSE; - if((stored->clip_enabled) != new->clip_enabled) return FALSE; + if ((stored->swizzle_map & use_map) != new->swizzle_map) + return FALSE; + if ((stored->clip_enabled) != new->clip_enabled) + return FALSE; if (stored->point_size != new->point_size) return FALSE; if (stored->per_vertex_point_size != new->per_vertex_point_size) @@ -8549,7 +8551,9 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str return FALSE; if (stored->next_shader_input_count != new->next_shader_input_count) return FALSE; - return stored->fog_src == new->fog_src; + if (stored->fog_src != new->fog_src) + return FALSE; + return !memcmp(stored->interpolation_mode, new->interpolation_mode, sizeof(new->interpolation_mode)); } static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8a6307a..20d4f07 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3532,7 +3532,7 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; args->point_size = state->gl_primitive_type == GL_POINTS; args->per_vertex_point_size = shader->reg_maps.point_size; - args->next_shader_type = hull_shader? WINED3D_SHADER_TYPE_HULL + args->next_shader_type = hull_shader ? WINED3D_SHADER_TYPE_HULL : geometry_shader ? WINED3D_SHADER_TYPE_GEOMETRY : WINED3D_SHADER_TYPE_PIXEL; if (shader->reg_maps.shader_version.major >= 4) args->next_shader_input_count = hull_shader ? hull_shader->limits->packed_input

1 0

Roderick Colenbrander : winevulkan: Fix parsing of const function pointer members.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 04951e78117eb18585e35bcc33c946e9810a1430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04951e78117eb18585e35bcc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 3 15:52:10 2018 -0700 winevulkan: Fix parsing of const function pointer members. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +++++---- include/wine/vulkan.h | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2265ddc..81148ef 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -670,7 +670,8 @@ class VkFunctionPointer(object): # <type>void</type>* pUserData, # Parsing of the tail (anything past </type>) is tricky since there # can be other data on the next line like: const <type>int</type>.. - const = begin + + const = True if begin and "const" in begin else False _type = t.text lines = t.tail.split(",\n") if lines[0][0] == "*": @@ -779,7 +780,7 @@ class VkHandle(object): class VkMember(object): - def __init__(self, const=None, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, + def __init__(self, const=False, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, extension_structs=None): self.const = const self.name = name @@ -814,7 +815,7 @@ class VkMember(object): name_elem = member.find("name") type_elem = member.find("type") - const = member.text.strip() if member.text else None + const = True if member.text and "const" in member.text else False member_type = None pointer = None array_len = None @@ -948,7 +949,7 @@ class VkMember(object): return conversions def is_const(self): - return self.const is not None + return self.const def is_dynamic_array(self): """ Returns if the member is an array element. diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index d44687f..24b0ef9 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -1251,28 +1251,28 @@ typedef enum VkVertexInputRate typedef void* (VKAPI_PTR * PFN_vkAllocationFunction)( void *pUserData, - const size_t size, - const size_t alignment, - const VkSystemAllocationScope allocationScope); + size_t size, + size_t alignment, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkFreeFunction)( void *pUserData, - const void *pMemory); + void *pMemory); typedef void (VKAPI_PTR * PFN_vkInternalAllocationNotification)( void *pUserData, - const size_t size, - const VkInternalAllocationType allocationType, - const VkSystemAllocationScope allocationScope); + size_t size, + VkInternalAllocationType allocationType, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkInternalFreeNotification)( void *pUserData, - const size_t size, - const VkInternalAllocationType allocationType, - const VkSystemAllocationScope allocationScope); + size_t size, + VkInternalAllocationType allocationType, + VkSystemAllocationScope allocationScope); typedef void* (VKAPI_PTR * PFN_vkReallocationFunction)( void *pUserData, - const void *pOriginal, - const size_t size, - const size_t alignment, - const VkSystemAllocationScope allocationScope); + void *pOriginal, + size_t size, + size_t alignment, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkVoidFunction)( void);

1 0

Roderick Colenbrander : winevulkan: Parse forward declared struct members.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 69ca5159155de674a7ee379c0aa9a787d97a8e83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ca5159155de674a7ee379c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 3 15:52:11 2018 -0700 winevulkan: Parse forward declared struct members. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 81148ef..5fae8dc 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -780,9 +780,10 @@ class VkHandle(object): class VkMember(object): - def __init__(self, const=False, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, - extension_structs=None): + def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, + dyn_array_len=None, optional=False, extension_structs=None): self.const = const + self.struct_fwd_decl = struct_fwd_decl self.name = name self.pointer = pointer self.type = _type @@ -805,8 +806,8 @@ class VkMember(object): return False def __repr__(self): - return "{0} {1} {2} {3} {4} {5}".format(self.const, self.type, self.pointer, self.name, self.array_len, - self.dyn_array_len) + return "{0} {1} {2} {3} {4} {5} {6}".format(self.const, self.struct_fwd_decl, self.type, self.pointer, + self.name, self.array_len, self.dyn_array_len) @staticmethod def from_xml(member): @@ -815,11 +816,22 @@ class VkMember(object): name_elem = member.find("name") type_elem = member.find("type") - const = True if member.text and "const" in member.text else False + const = False + struct_fwd_decl = False member_type = None pointer = None array_len = None + if member.text: + if "const" in member.text: + const = True + + # Some members contain forward declarations: + # - VkBaseInstructure has a member "const struct VkBaseInStructure *pNext" + # - VkWaylandSurfaceCreateInfoKHR has a member "struct wl_display *display" + if "struct" in member.text: + struct_fwd_decl = True + if type_elem is not None: member_type = type_elem.text if type_elem.tail is not None: @@ -855,8 +867,8 @@ class VkMember(object): # Remove brackets around length array_len = name_elem.tail.strip("[]") - return VkMember(const=const, _type=member_type, pointer=pointer, name=name_elem.text, array_len=array_len, - dyn_array_len=dyn_array_len, optional=optional, extension_structs=extension_structs) + 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, extension_structs=extension_structs) def copy(self, input, output, direction): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. """ @@ -900,6 +912,9 @@ class VkMember(object): if self.is_const(): text += "const " + if self.is_struct_forward_declaration(): + text += "struct " + if conv and self.is_struct(): text += "{0}_host".format(self.type) else: @@ -974,6 +989,9 @@ class VkMember(object): def is_struct(self): return self.type_info["category"] == "struct" + def is_struct_forward_declaration(self): + return self.struct_fwd_decl + def is_union(self): return self.type_info["category"] == "union"

1 0

Roderick Colenbrander : winevulkan: Parse extension require sections one by one.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 3bb4ecaf16af7a03dd5ddcf88ceea736f81e02b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb4ecaf16af7a03dd5ddcf8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 3 15:52:12 2018 -0700 winevulkan: Parse extension require sections one by one. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 78 +++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5fae8dc..594ebdd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2359,46 +2359,54 @@ class VkRegistry(object): LOGGER.debug("Loading extension: {0}".format(ext_name)) - # Extensions can add enum values to Core / extension enums, so add these. - enums = ext.findall("require/enum") - for enum_elem in enums: - if "bitpos" in enum_elem.keys(): - # We need to add an extra value to an existing enum type. - # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] - enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) - elif "offset" in enum_elem.keys(): - ext_number = int(ext.attrib["number"]) - offset = int(enum_elem.attrib["offset"]) - value = EXT_BASE + (ext_number - 1) * EXT_BLOCK_SIZE + offset - - # Deal with negative values. - direction = enum_elem.attrib.get("dir") - if direction is not None: - value = -value - - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] - enum.add(VkEnumValue(enum_elem.attrib["name"], value)) - - elif "value" in enum_elem.keys(): - self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) - continue - else: - # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX - continue + # Extensions can define one or more require sections each requiring + # different features (e.g. Vulkan 1.1). Parse each require section + # separately, so we can skip sections we don't want. + for require in ext.findall("require"): + # Extensions can add enum values to Core / extension enums, so add these. + for enum_elem in require.findall("enum"): + if "bitpos" in enum_elem.keys(): + # We need to add an extra value to an existing enum type. + # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. + type_name = enum_elem.attrib["extends"] + enum = self.types[type_name]["data"] + enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) + elif "offset" in enum_elem.keys(): + # Extensions promoted to Core, have the extension number as part + # of the enum value. Else retrieve from the extension tag. + if enum_elem.attrib.get("extnumber") is not None: + ext_number = int(enum_elem.attrib.get("extnumber")) + else: + ext_number = int(ext.attrib["number"]) + offset = int(enum_elem.attrib["offset"]) + value = EXT_BASE + (ext_number - 1) * EXT_BLOCK_SIZE + offset + + # Deal with negative values. + direction = enum_elem.attrib.get("dir") + if direction is not None: + value = -value + + type_name = enum_elem.attrib["extends"] + enum = self.types[type_name]["data"] + enum.add(VkEnumValue(enum_elem.attrib["name"], value)) + + elif "value" in enum_elem.keys(): + self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) + continue + else: + # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX + continue + + # Pull in any commands we need. We infer types to pull in from the command + # as well. + for command in require.findall("command"): + cmd_name = command.attrib["name"] + self._mark_command_required(cmd_name) # Store a list with extensions. ext_info = {"name" : ext_name, "type" : ext_type} extensions.append(ext_info) - # Pull in any commands we need. We infer types to pull in from the command - # as well. - for command in commands: - cmd_name = command.attrib["name"] - self._mark_command_required(cmd_name) - # Sort in alphabetical order. self.extensions = sorted(extensions, key=lambda ext: ext["name"])

1 0

Alexandre Julliard : user32: Rename rectClient to client_rect for consistency.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 0a75a1b62bc2b6762e30fba89793f857c5b88af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a75a1b62bc2b6762e30fba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:00:38 2018 +0200 user32: Rename rectClient to client_rect for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 4 ++-- dlls/user32/win.c | 16 ++++++++-------- dlls/user32/win.h | 2 +- dlls/user32/winpos.c | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index bf3f180..79db230 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -838,8 +838,8 @@ void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, c TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), parent, (POINT *)&src, 2 ); - OffsetRect( &src, win->rectClient.left - win->visible_rect.left, - win->rectClient.top - win->visible_rect.top ); + OffsetRect( &src, win->client_rect.left - win->visible_rect.left, + win->client_rect.top - win->visible_rect.top ); OffsetRect( &dst, -window_rect->left, -window_rect->top ); window_surface_add_ref( surface ); WIN_ReleasePtr( win ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7c12825..2435a6f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -856,15 +856,15 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } if (win != WND_OTHER_PROCESS) { - RECT window_rect = win->rectWindow, client_rect = win->rectClient; + RECT window_rect = win->rectWindow, client_rect = win->client_rect; switch (relative) { case COORDS_CLIENT: - OffsetRect( &window_rect, -win->rectClient.left, -win->rectClient.top ); - OffsetRect( &client_rect, -win->rectClient.left, -win->rectClient.top ); + OffsetRect( &window_rect, -win->client_rect.left, -win->client_rect.top ); + OffsetRect( &client_rect, -win->client_rect.left, -win->client_rect.top ); if (win->dwExStyle & WS_EX_LAYOUTRTL) - mirror_rect( &win->rectClient, &window_rect ); + mirror_rect( &win->client_rect, &window_rect ); break; case COORDS_WINDOW: OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top ); @@ -890,8 +890,8 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } if (parent->dwExStyle & WS_EX_LAYOUTRTL) { - mirror_rect( &parent->rectClient, &window_rect ); - mirror_rect( &parent->rectClient, &client_rect ); + mirror_rect( &parent->client_rect, &window_rect ); + mirror_rect( &parent->client_rect, &client_rect ); } WIN_ReleasePtr( parent ); } @@ -915,8 +915,8 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind win = parent; if (win->parent) { - OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); - OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + OffsetRect( &window_rect, win->client_rect.left, win->client_rect.top ); + OffsetRect( &client_rect, win->client_rect.left, win->client_rect.top ); } } break; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 41b6033..9f954dc 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -43,7 +43,7 @@ typedef struct tagWND WNDPROC winproc; /* Window procedure */ DWORD tid; /* Owner thread id */ HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */ - RECT rectClient; /* Client area rel. to parent client area */ + RECT client_rect; /* Client area rel. to parent client area */ RECT rectWindow; /* Whole window rel. to parent client area */ RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */ RECT normal_rect; /* Normal window rect saved when maximized/minimized */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 19ab297..a06ae7e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -428,12 +428,12 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) { mirror_from = TRUE; - offset.x += wndPtr->rectClient.right - wndPtr->rectClient.left; + offset.x += wndPtr->client_rect.right - wndPtr->client_rect.left; } while (wndPtr->parent) { - offset.x += wndPtr->rectClient.left; - offset.y += wndPtr->rectClient.top; + offset.x += wndPtr->client_rect.left; + offset.y += wndPtr->client_rect.top; hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; @@ -463,12 +463,12 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) { mirror_to = TRUE; - offset.x -= wndPtr->rectClient.right - wndPtr->rectClient.left; + offset.x -= wndPtr->client_rect.right - wndPtr->client_rect.left; } while (wndPtr->parent) { - offset.x -= wndPtr->rectClient.left; - offset.y -= wndPtr->rectClient.top; + offset.x -= wndPtr->client_rect.left; + offset.y -= wndPtr->client_rect.top; hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; @@ -2087,7 +2087,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, return FALSE; } old_visible_rect = win->visible_rect; - old_client_rect = win->rectClient; + old_client_rect = win->client_rect; old_surface = win->surface; if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ @@ -2118,7 +2118,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->dwStyle = reply->new_style; win->dwExStyle = reply->new_ex_style; win->rectWindow = *window_rect; - win->rectClient = *client_rect; + win->client_rect = *client_rect; win->visible_rect = visible_rect; win->surface = new_surface; surface_win = wine_server_ptr_handle( reply->surface_win ); @@ -2128,7 +2128,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, RECT client; GetClientRect( win->parent, &client ); mirror_rect( &client, &win->rectWindow ); - mirror_rect( &client, &win->rectClient ); + mirror_rect( &client, &win->client_rect ); mirror_rect( &client, &win->visible_rect ); } /* if an RTL window is resized the children have moved */

1 0

Alexandre Julliard : user32: Rename rectWindow to window_rect for consistency.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 52be6f0ecca20ad67ee1f9e3d97db98074ebe0ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=52be6f0ecca20ad67ee1f9e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:03:16 2018 +0200 user32: Rename rectWindow to window_rect for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 8 ++++---- dlls/user32/win.h | 2 +- dlls/user32/winpos.c | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2435a6f..1398458 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -856,7 +856,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } if (win != WND_OTHER_PROCESS) { - RECT window_rect = win->rectWindow, client_rect = win->client_rect; + RECT window_rect = win->window_rect, client_rect = win->client_rect; switch (relative) { @@ -867,10 +867,10 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind mirror_rect( &win->client_rect, &window_rect ); break; case COORDS_WINDOW: - OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top ); - OffsetRect( &client_rect, -win->rectWindow.left, -win->rectWindow.top ); + OffsetRect( &window_rect, -win->window_rect.left, -win->window_rect.top ); + OffsetRect( &client_rect, -win->window_rect.left, -win->window_rect.top ); if (win->dwExStyle & WS_EX_LAYOUTRTL) - mirror_rect( &win->rectWindow, &client_rect ); + mirror_rect( &win->window_rect, &client_rect ); break; case COORDS_PARENT: if (win->parent) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 9f954dc..9794aab 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -44,7 +44,7 @@ typedef struct tagWND DWORD tid; /* Owner thread id */ HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */ RECT client_rect; /* Client area rel. to parent client area */ - RECT rectWindow; /* Whole window rel. to parent client area */ + RECT window_rect; /* Whole window rel. to parent client area */ RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */ RECT normal_rect; /* Normal window rect saved when maximized/minimized */ POINT min_pos; /* Position for minimized window */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a06ae7e..d527409 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -704,7 +704,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) TRACE("%p %i\n", hwnd, (bShow != 0) ); if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return; - if (win->rectWindow.left == -32000 || win->rectWindow.top == -32000) + if (win->window_rect.left == -32000 || win->window_rect.top == -32000) { TRACE( "not showing title for hidden icon %p\n", hwnd ); bShow = FALSE; @@ -1318,17 +1318,17 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) /* update the placement according to the current style */ if (pWnd->dwStyle & WS_MINIMIZE) { - pWnd->min_pos.x = pWnd->rectWindow.left; - pWnd->min_pos.y = pWnd->rectWindow.top; + pWnd->min_pos.x = pWnd->window_rect.left; + pWnd->min_pos.y = pWnd->window_rect.top; } else if (pWnd->dwStyle & WS_MAXIMIZE) { - pWnd->max_pos.x = pWnd->rectWindow.left; - pWnd->max_pos.y = pWnd->rectWindow.top; + pWnd->max_pos.x = pWnd->window_rect.left; + pWnd->max_pos.y = pWnd->window_rect.top; } else { - pWnd->normal_rect = pWnd->rectWindow; + pWnd->normal_rect = pWnd->window_rect; } wndpl->length = sizeof(*wndpl); @@ -2117,7 +2117,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { win->dwStyle = reply->new_style; win->dwExStyle = reply->new_ex_style; - win->rectWindow = *window_rect; + win->window_rect = *window_rect; win->client_rect = *client_rect; win->visible_rect = visible_rect; win->surface = new_surface; @@ -2127,7 +2127,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { RECT client; GetClientRect( win->parent, &client ); - mirror_rect( &client, &win->rectWindow ); + mirror_rect( &client, &win->window_rect ); mirror_rect( &client, &win->client_rect ); mirror_rect( &client, &win->visible_rect ); }

1 0

Michael Stefaniuc : shdocvw/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 98db820f54dac29c98db91ec17d815b83d8ada5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=98db820f54dac29c98db91ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:44 2018 +0200 shdocvw/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/tests/shdocvw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index 7b4eccf..d54cf16 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -207,7 +207,7 @@ static void test_ParseURLFromOutsideSourceA(void) return; } - for(i = 0; i < sizeof(ParseURL_table)/sizeof(ParseURL_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ParseURL_table); i++) { memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; len = sizeof(buffer); @@ -306,7 +306,7 @@ static void test_ParseURLFromOutsideSourceW(void) MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, INTERNET_MAX_URL_LENGTH); /* len is in characters */ - len = sizeof(bufferW)/sizeof(bufferW[0]); + len = ARRAY_SIZE(bufferW); dummy = 0; res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL);

1 0

Thomas Faber : jscript: Fix MSVC build.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: 88a6936d408b8cd4d17a343d4647abc1c9ca16b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a6936d408b8cd4d17a343d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jun 4 18:11:08 2018 +0200 jscript: Fix MSVC build. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 9b47368..65ca47a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1793,6 +1793,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned flags, jsval_t value) { - property_desc_t prop_desc = { flags, flags, TRUE, value }; + property_desc_t prop_desc = { flags, flags, TRUE }; + prop_desc.value = value; return jsdisp_define_property(obj, name, &prop_desc); }

1 0