August 2018 - Wine-Commits - list.winehq.org

Józef Kucia : winevulkan: Trace properties for created devices.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: e3de7f777415579f485091933ba5042062a2d374 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3de7f777415579f48509193… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 28 10:27:12 2018 +0200 winevulkan: Trace properties for created devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a1e970d..89df838 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -60,6 +60,9 @@ static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); +void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties *properties); + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) @@ -600,6 +603,17 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); + if (TRACE_ON(vulkan)) + { + VkPhysicalDeviceProperties properties; + + wine_vkGetPhysicalDeviceProperties(phys_dev, &properties); + + TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); + TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID); + TRACE("Driver version: %#x.\n", properties.driverVersion); + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY;

1 0

Alex Henrie : shell32: Add text file icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: 8abd69dc973d0e03b5946eccad2b04648d12b0d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abd69dc973d0e03b5946ecc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:45 2018 -0600 shell32: Add text file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index dced971..38de421 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -647,6 +647,10 @@ IDI_SHELL_INSTALL ICON resources/update.ico /* @makedep: resources/document.ico */ IDI_SHELL_CONFIG_FILE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_TEXT_FILE ICON resources/document.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index f684a9b..0dc397f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -242,6 +242,7 @@ #define IDI_SHELL_INSTALL 148 /* 149 - 150 not used on Windows */ #define IDI_SHELL_CONFIG_FILE 151 +#define IDI_SHELL_TEXT_FILE 152 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add config file icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: f6695aea201ebc7aedd8cd68b97a675e5e71984a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6695aea201ebc7aedd8cd68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:44 2018 -0600 shell32: Add config file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index b876cf9..dced971 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -643,6 +643,10 @@ IDI_SHELL_RENAME_FOLDER ICON resources/rename.ico /* @makedep: resources/update.ico */ IDI_SHELL_INSTALL ICON resources/update.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_CONFIG_FILE ICON resources/document.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2dc0a0f..f684a9b 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -240,6 +240,8 @@ #define IDI_SHELL_FOLDER_OVERWRITE 146 #define IDI_SHELL_FOLDER_RENAME 147 #define IDI_SHELL_INSTALL 148 +/* 149 - 150 not used on Windows */ +#define IDI_SHELL_CONFIG_FILE 151 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Dmitry Timoshkov : schedsvc: In case it's an old Wine prefix create c: \windows\tasks automatically.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 4d44bc3715e2f4a5f9c027c023f6d83d58e0626a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d44bc3715e2f4a5f9c027c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 27 20:18:08 2018 +0800 schedsvc: In case it's an old Wine prefix create c:\windows\tasks automatically. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8830d59..a7af96e 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -74,14 +74,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); + /* Just in case it's an old Wine prefix with missing c:\windows\tasks */ + CreateDirectoryW(path, NULL); + htasks = CreateFileW(path, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); if (htasks == INVALID_HANDLE_VALUE) { ERR("Couldn't start monitoring %s for tasks, error %u\n", debugstr_w(path), GetLastError()); - /* Probably this is an old prefix with disabled updates */ - if (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND) - ERR("Please create the directory manually\n"); return -1; }

1 0

Józef Kucia : wined3d: Pass context to wined3d_texture_set_compatible_renderbuffer().
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: dfdecfc2eb030d29b04edc26365eaecc5c2b0650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfdecfc2eb030d29b04edc26… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 24 15:44:04 2018 +0200 wined3d: Pass context to wined3d_texture_set_compatible_renderbuffer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/texture.c | 7 +++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9d2236b..a4cfd66 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -608,7 +608,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { - wined3d_texture_set_compatible_renderbuffer(ds_texture, ds_level, &render_targets[0]); + wined3d_texture_set_compatible_renderbuffer(ds_texture, context, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7cc03fe..f72442d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1453,15 +1453,14 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, - unsigned int level, const struct wined3d_rendertarget_info *rt) + struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_renderbuffer_entry *entry; - const struct wined3d_gl_info *gl_info; unsigned int src_width, src_height; unsigned int width, height; GLuint renderbuffer = 0; - gl_info = &texture->resource.device->adapter->gl_info; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) return; @@ -1528,7 +1527,7 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture texture->current_renderbuffer = entry; } - checkGLcall("set_compatible_renderbuffer"); + checkGLcall("set compatible renderbuffer"); } HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc03189..8da12d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3366,7 +3366,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture,

1 0

Jacek Caban : mshtml: Pass style id instead of flags to var_to_styleval.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: a471f648ca3297e4a4f98438d7f24c24fb47f4d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a471f648ca3297e4a4f98438… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:50:16 2018 +0200 mshtml: Pass style id instead of flags to var_to_styleval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2437b75..272b644 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -437,7 +437,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ return S_OK; } -static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const WCHAR **ret) +static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) { switch(V_VT(v)) { case VT_NULL: @@ -453,6 +453,7 @@ static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const return S_OK; case VT_I4: { + unsigned flags = style_tbl[sid].flags; static const WCHAR formatW[] = {'%','d',0}; static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; @@ -481,7 +482,7 @@ static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT * HRESULT hres; flags = style_tbl[sid].flags; - hres = var_to_styleval(value, buf, flags, &val); + hres = var_to_styleval(value, sid, buf, &val); if(FAILED(hres)) return hres; @@ -1152,7 +1153,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, buf, ATTR_FIX_PX, &val); + hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_X, buf, &val); if(FAILED(hres)) return hres; @@ -1245,7 +1246,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, buf, ATTR_FIX_PX, &val); + hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_Y, buf, &val); if(FAILED(hres)) return hres;

1 0

Józef Kucia : wined3d: Add max_rt_count field to d3d_info.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 619c54f49a45596cdd8a91a860ea6084765cdd0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=619c54f49a45596cdd8a91a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 24 15:44:03 2018 +0200 wined3d: Add max_rt_count field to d3d_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/cs.c | 17 +++++++++-------- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8c1cce4..af17df8 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7bd51f4..ecfce41 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -588,7 +588,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; + unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; @@ -839,6 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_state *state = &cs->state; @@ -893,7 +894,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->textures[i]) wined3d_resource_release(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_release(state->fb->render_targets[i]->resource); @@ -906,7 +907,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, - BOOL indexed, const struct wined3d_gl_info *gl_info) + BOOL indexed, const struct wined3d_d3d_info *d3d_info) { unsigned int i; @@ -927,7 +928,7 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -943,7 +944,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -959,7 +960,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -967,7 +968,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -980,7 +981,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab67a96..96b8d3c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -970,7 +970,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -1240,7 +1240,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4380,11 +4380,14 @@ void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { + unsigned int max_rt_count; + TRACE("device %p, view_idx %u.\n", device, view_idx); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } @@ -4402,13 +4405,15 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) { struct wined3d_rendertarget_view *prev; + unsigned int max_rt_count; TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", device, view_idx, view, set_viewport); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return WINED3DERR_INVALIDCALL; } @@ -4706,6 +4711,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; @@ -4739,7 +4745,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -5038,7 +5044,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774cd48..8fa3a24 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2201,7 +2201,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->AdapterOrdinalInGroup = 0; caps->NumberOfAdaptersInGroup = 1; - caps->NumSimultaneousRTs = gl_info->limits.buffers; + caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; caps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de0b486..bc03189 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -164,6 +164,7 @@ struct wined3d_d3d_limits unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + unsigned int max_rt_count; float pointsize_max; };

1 0

Nikolay Sivov : d2d1: Implement matrix inversion functions.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: dcd530b422cf79089a59347b3a8de4f50d8e3d29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd530b422cf79089a59347b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 12:40:45 2018 +0300 d2d1: Implement matrix inversion functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 4 +-- dlls/d2d1/factory.c | 16 ++++++++++ dlls/d2d1/tests/d2d1.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/d2d1.idl | 2 ++ 4 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 26d17c6..3443b29 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -1,8 +1,8 @@ @ stdcall D2D1CreateFactory(long ptr ptr ptr) @ stdcall D2D1MakeRotateMatrix(float float float ptr) @ stub D2D1MakeSkewMatrix -@ stub D2D1IsMatrixInvertible -@ stub D2D1InvertMatrix +@ stdcall D2D1IsMatrixInvertible(ptr) +@ stdcall D2D1InvertMatrix(ptr) @ stub D2D1ConvertColorSpace @ stub D2D1CreateDevice @ stub D2D1CreateDeviceContext diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7810e95..d2e5387 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -554,6 +554,22 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } +BOOL WINAPI D2D1IsMatrixInvertible(const D2D1_MATRIX_3X2_F *matrix) +{ + TRACE("matrix %p.\n", matrix); + + return (matrix->_11 * matrix->_22 - matrix->_21 * matrix->_12) != 0.0f; +} + +BOOL WINAPI D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix) +{ + D2D1_MATRIX_3X2_F m = *matrix; + + TRACE("matrix %p.\n", matrix); + + return d2d_matrix_invert(matrix, &m); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8e58eef..eeae75f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6968,6 +6968,89 @@ if (SUCCEEDED(hr)) ID3D10Device1_Release(d3d_device); } +static void test_invert_matrix(void) +{ + static const struct + { + D2D1_MATRIX_3X2_F matrix; + D2D1_MATRIX_3X2_F inverse; + BOOL invertible; + } + invert_tests[] = + { + { { 0 }, { 0 }, FALSE }, + { + { + 1.0f, 2.0f, + 1.0f, 2.0f, + 4.0f, 8.0f + }, + { + 1.0f, 2.0f, + 1.0f, 2.0f, + 4.0f, 8.0f + }, + FALSE + }, + { + { + 2.0f, 0.0f, + 0.0f, 2.0f, + 4.0f, 8.0f + }, + { + 0.5f, -0.0f, + -0.0f, 0.5f, + -2.0f, -4.0f + }, + TRUE + }, + { + { + 2.0f, 1.0f, + 2.0f, 2.0f, + 4.0f, 8.0f + }, + { + 1.0f, -0.5f, + -1.0f, 1.0f, + 4.0f, -6.0f + }, + TRUE + }, + { + { + 2.0f, 1.0f, + 3.0f, 1.0f, + 4.0f, 8.0f + }, + { + -1.0f, 1.0f, + 3.0f, -2.0f, + -20.0f, 12.0f + }, + TRUE + }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(invert_tests); ++i) + { + D2D1_MATRIX_3X2_F m; + BOOL ret; + + m = invert_tests[i].matrix; + ret = D2D1InvertMatrix(&m); + ok(ret == invert_tests[i].invertible, "%u: unexpected return value %d.\n", i, ret); + ok(!memcmp(&m, &invert_tests[i].inverse, sizeof(m)), + "%u: unexpected matrix value {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", i, + m._11, m._12, m._21, m._22, m._31, m._32); + + ret = D2D1IsMatrixInvertible(&invert_tests[i].matrix); + ok(ret == invert_tests[i].invertible, "%u: unexpected return value %d.\n", i, ret); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -7009,6 +7092,7 @@ START_TEST(d2d1) queue_test(test_create_device); queue_test(test_bitmap_surface); queue_test(test_device_context); + queue_test(test_invert_matrix); run_queued_tests(); } diff --git a/include/d2d1.idl b/include/d2d1.idl index fbfb40d..ff2dc03 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1254,4 +1254,6 @@ interface ID2D1Factory : IUnknown [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); +[local] BOOL __stdcall D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix); +[local] BOOL __stdcall D2D1IsMatrixInvertible(const D2D1_MATRIX_3X2_F *matrix); [local] void __stdcall D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_3X2_F *matrix);

1 0

Józef Kucia : wined3d: Avoid accessing gl_info in vertexdeclaration_init().
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 25d55c42095e967ea5683664dd454cc6f67415f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25d55c42095e967ea5683664… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 24 15:44:05 2018 +0200 wined3d: Avoid accessing gl_info in vertexdeclaration_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/vertexdeclaration.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a4cfd66..83e3563 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3683,7 +3683,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (use_vs(state)) { - if (state->vertex_declaration->half_float_conv_needed) + if (state->vertex_declaration->have_half_floats && !gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { TRACE("Using immediate mode draw with vertex shaders for FLOAT16 conversion.\n"); context->use_immediate_mode_draw = TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 9098b32..c050a6d 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -174,7 +174,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; unsigned int i; if (TRACE_ON(d3d_decl)) @@ -218,7 +217,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tesselation pseudo streams. */ - if (e->input_slot >= MAX_STREAMS) continue; + if (e->input_slot >= MAX_STREAMS) + continue; if (!e->format->gl_vtx_format) { @@ -254,7 +254,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) { - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) declaration->half_float_conv_needed = TRUE; + declaration->have_half_floats = TRUE; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8da12d7..da3cd46 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3463,10 +3463,10 @@ struct wined3d_vertex_declaration struct wined3d_device *device; struct wined3d_vertex_declaration_element *elements; - UINT element_count; + unsigned int element_count; BOOL position_transformed; - BOOL half_float_conv_needed; + BOOL have_half_floats; }; struct wined3d_saved_states

1 0

Hans Leidekker : winhttp: Use winsock sockets.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: ca56f992803420ef37d7a87158e572f981005e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca56f992803420ef37d7a871… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 27 14:36:38 2018 +0200 winhttp: Use winsock sockets. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/handle.c | 5 +- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 328 ++++++++++------------------------------- dlls/winhttp/request.c | 13 +- dlls/winhttp/session.c | 63 +------- dlls/winhttp/url.c | 4 +- dlls/winhttp/winhttp_private.h | 19 +-- 9 files changed, 94 insertions(+), 349 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca56f992803420ef37d7…

1 0