wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Henri Verbeet : wined3d: Implement timestamp queries for the Vulkan adapter.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 7101af57bfd49fd111aa3d9412d05f5f6f5d4e98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7101af57bfd49fd111aa3d94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:12 2020 +0430 wined3d: Implement timestamp queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 7 +++-- dlls/wined3d/context_vk.c | 6 ++++ dlls/wined3d/query.c | 66 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 84eda1e551..3cccda3b2c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -292,7 +292,7 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) } static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_vk *adapter_vk, - uint32_t *queue_family_index) + uint32_t *queue_family_index, uint32_t *timestamp_bits) { VkPhysicalDevice physical_device = adapter_vk->physical_device; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; @@ -311,6 +311,7 @@ static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_v if (queue_properties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) { *queue_family_index = i; + *timestamp_bits = queue_properties[i].timestampValidBits; heap_free(queue_properties); return WINED3D_OK; } @@ -496,13 +497,14 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_index; + uint32_t timestamp_bits; VkResult vr; HRESULT hr; if (!(device_vk = heap_alloc_zero(sizeof(*device_vk)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_select_vulkan_queue_family(adapter_vk, &queue_family_index))) + if (FAILED(hr = wined3d_select_vulkan_queue_family(adapter_vk, &queue_family_index, &timestamp_bits))) goto fail; physical_device = adapter_vk->physical_device; @@ -564,6 +566,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_vk->vk_device = vk_device; VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); device_vk->vk_queue_family_index = queue_family_index; + device_vk->timestamp_bits = timestamp_bits; device_vk->vk_info = *vk_info; #define LOAD_DEVICE_PFN(name) \ diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 2964eb30cc..af29ef7e7a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1227,6 +1227,10 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, free_pools = &context_vk->free_occlusion_query_pools; break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + free_pools = &context_vk->free_timestamp_query_pools; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1286,6 +1290,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); wined3d_context_vk_cleanup_resources(context_vk); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); + wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->pending_queries.queries); heap_free(context_vk->submitted.buffers); @@ -3057,6 +3062,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi list_init(&context_vk->active_queries); list_init(&context_vk->free_occlusion_query_pools); + list_init(&context_vk->free_timestamp_query_pools); wine_rb_init(&context_vk->render_passes, wined3d_render_pass_vk_compare); wine_rb_init(&context_vk->pipeline_layouts, wined3d_pipeline_layout_vk_compare); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b72ffd633c..3b6f442f4a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1403,6 +1403,11 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, pool_info.pipelineStatistics = 0; break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + pool_info.queryType = VK_QUERY_TYPE_TIMESTAMP; + pool_info.pipelineStatistics = 0; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1428,6 +1433,7 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, union { uint64_t occlusion; + uint64_t timestamp; } tmp, *result; if ((vr = VK_CALL(vkGetQueryPoolResults(device_vk->vk_device, pool_idx->pool_vk->vk_query_pool, @@ -1447,6 +1453,10 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, result->occlusion += tmp.occlusion; break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + result->timestamp = tmp.timestamp; + break; + default: FIXME("Unhandled query type %#x.\n", query_vk->q.type); return false; @@ -1607,9 +1617,53 @@ static const struct wined3d_query_ops wined3d_query_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; +static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); + struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + const struct wined3d_vk_info *vk_info; + struct wined3d_context_vk *context_vk; + VkCommandBuffer command_buffer; + + TRACE("query %p, flags %#x.\n", query, flags); + + if (flags & WINED3DISSUE_BEGIN) + TRACE("Ignoring WINED3DISSUE_BEGIN.\n"); + + if (flags & WINED3DISSUE_END) + { + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + vk_info = context_vk->vk_info; + + wined3d_context_vk_end_current_render_pass(context_vk); + command_buffer = wined3d_context_vk_get_command_buffer(context_vk); + if (!query_vk->pool_idx.pool_vk) + wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx); + VK_CALL(vkCmdResetQueryPool(command_buffer, query_vk->pool_idx.pool_vk->vk_query_pool, + query_vk->pool_idx.idx, 1)); + VK_CALL(vkCmdWriteTimestamp(command_buffer, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, + query_vk->pool_idx.pool_vk->vk_query_pool, query_vk->pool_idx.idx)); + wined3d_context_vk_reference_query(context_vk, query_vk); + + context_release(&context_vk->c); + + return TRUE; + } + + return FALSE; +} + +static const struct wined3d_query_ops wined3d_query_timestamp_vk_ops = +{ + .query_poll = wined3d_query_vk_poll, + .query_issue = wined3d_query_timestamp_vk_issue, + .query_destroy = wined3d_query_vk_destroy, +}; + HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { + const struct wined3d_query_ops *ops = &wined3d_query_vk_ops; struct wined3d_query_vk *query_vk; unsigned int data_size; @@ -1622,6 +1676,16 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(uint64_t); break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + if (!wined3d_device_vk(device)->timestamp_bits) + { + WARN("Timestamp queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; + } + ops = &wined3d_query_timestamp_vk_ops; + data_size = sizeof(uint64_t); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; @@ -1630,7 +1694,7 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer if (!(query_vk = heap_alloc_zero(sizeof(*query_vk) + data_size))) return E_OUTOFMEMORY; - wined3d_query_init(&query_vk->q, device, type, query_vk + 1, data_size, &wined3d_query_vk_ops, parent, parent_ops); + wined3d_query_init(&query_vk->q, device, type, query_vk + 1, data_size, ops, parent, parent_ops); list_init(&query_vk->entry); if (type == WINED3D_QUERY_TYPE_OCCLUSION) query_vk->control_flags = VK_QUERY_CONTROL_PRECISE_BIT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5c92eecbf3..9f8c212fbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2495,6 +2495,7 @@ struct wined3d_context_vk struct list active_queries; struct wined3d_pending_queries_vk pending_queries; struct list free_occlusion_query_pools; + struct list free_timestamp_query_pools; struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes; @@ -3857,6 +3858,7 @@ struct wined3d_device_vk VkDevice vk_device; VkQueue vk_queue; uint32_t vk_queue_family_index; + uint32_t timestamp_bits; struct wined3d_vk_info vk_info;

1 0

Henri Verbeet : wined3d: Implement occlusion queries for the Vulkan adapter.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 8cb3d29cf0a3a15ff2b7203ac20ede26f3daae7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cb3d29cf0a3a15ff2b7203a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:11 2020 +0430 wined3d: Implement occlusion queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 15 ++- dlls/wined3d/context_vk.c | 157 +++++++++++++++++++++- dlls/wined3d/query.c | 287 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 86 ++++++++++++ 4 files changed, 539 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cb3d29cf0a3a15ff2b7…

1 0

Henri Verbeet : wined3d: Move the swapchain cursor texture blit to wined3d_cs_exec_present().
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: c1f09c2461e6dfcf7baff03e70000a9d70e50fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f09c2461e6dfcf7baff03e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:10 2020 +0430 wined3d: Move the swapchain cursor texture blit to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 26 -------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b5a34a6ab6..ffd00c9b95 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -521,7 +521,7 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { - struct wined3d_texture *logo_texture, *back_buffer; + struct wined3d_texture *logo_texture, *cursor_texture, *back_buffer; const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; unsigned int i; @@ -539,6 +539,31 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) &rect, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } + if ((cursor_texture = swapchain->device->cursor_texture) + && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) + { + RECT dst_rect = + { + swapchain->device->xScreenSpace - swapchain->device->xHotSpot, + swapchain->device->yScreenSpace - swapchain->device->yHotSpot, + swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, + swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, + }; + RECT src_rect = + { + 0, 0, cursor_texture->resource.width, cursor_texture->resource.height + }; + const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; + + TRACE("Rendering the software cursor.\n"); + + if (swapchain->state.desc.windowed) + MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); + if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) + wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, + &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + } + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); if (TRACE_ON(fps)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a48b98aac3..289013f4e9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,7 +469,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_texture *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -488,31 +487,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - if ((cursor_texture = swapchain->device->cursor_texture) - && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) - { - RECT dst_rect = - { - swapchain->device->xScreenSpace - swapchain->device->xHotSpot, - swapchain->device->yScreenSpace - swapchain->device->yHotSpot, - swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, - swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, - }; - RECT src_rect = - { - 0, 0, cursor_texture->resource.width, cursor_texture->resource.height - }; - const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; - - TRACE("Rendering the software cursor.\n"); - - if (desc->windowed) - MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); - if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, - &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); - } - TRACE("Presenting DC %p.\n", context_gl->dc); if (!(render_to_fbo = swapchain->render_to_fbo)

1 0

Henri Verbeet : wined3d: Move the swapchain logo texture blit to wined3d_cs_exec_present().
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 4bae47cf17269479d70f4fe28e4c389fea0ee561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bae47cf17269479d70f4fe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:09 2020 +0430 wined3d: Move the swapchain logo texture blit to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 11 +++++++++++ dlls/wined3d/swapchain.c | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 89e59b5373..b5a34a6ab6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -521,13 +521,24 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { + struct wined3d_texture *logo_texture, *back_buffer; const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; unsigned int i; swapchain = op->swapchain; + back_buffer = swapchain->back_buffers[0]; wined3d_swapchain_set_window(swapchain, op->dst_window_override); + if ((logo_texture = swapchain->device->logo_texture)) + { + RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; + + /* Blit the logo into the upper left corner of the back-buffer. */ + wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, + &rect, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); + } + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); if (TRACE_ON(fps)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9020a99520..a48b98aac3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,7 +469,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_texture *logo_texture, *cursor_texture; + struct wined3d_texture *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -488,15 +488,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - if ((logo_texture = swapchain->device->logo_texture)) - { - RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; - - /* Blit the logo into the upper left corner of the drawable. */ - wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, &rect, - WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); - } - if ((cursor_texture = swapchain->device->cursor_texture) && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) {

1 0

Hans Leidekker : wbemprox: Get the disk drive serial number from mountmgr.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 84857d27067afaa1ae5774afe27086332263bfb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84857d27067afaa1ae5774af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 26 10:18:43 2020 +0200 wbemprox: Get the disk drive serial number from mountmgr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49160 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ddd12d6ebc..466611721a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -44,6 +44,7 @@ #include "ntsecapi.h" #include "winspool.h" #include "setupapi.h" +#include "ntddstor.h" #include "wine/asm.h" #include "wine/debug.h" @@ -140,7 +141,7 @@ static const struct column col_diskdrive[] = { L"MediaType", CIM_STRING }, { L"Model", CIM_STRING }, { L"PNPDeviceID", CIM_STRING }, - { L"SerialNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Size", CIM_UINT64 }, }; static const struct column col_diskdrivetodiskpartition[] = @@ -2081,6 +2082,42 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) } return free.QuadPart; } +static WCHAR *get_diskdrive_serialnumber( WCHAR letter ) +{ + WCHAR *ret = NULL; + STORAGE_DEVICE_DESCRIPTOR *desc; + HANDLE handle = INVALID_HANDLE_VALUE; + STORAGE_PROPERTY_QUERY query = {0}; + WCHAR drive[7]; + DWORD size; + + swprintf( drive, ARRAY_SIZE(drive), L"\\\\.\\%c:", letter ); + handle = CreateFileW( drive, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) goto done; + + query.PropertyId = StorageDeviceProperty; + query.QueryType = PropertyStandardQuery; + + size = sizeof(*desc) + 256; + for (;;) + { + if (!(desc = heap_alloc( size ))) break; + if (DeviceIoControl( handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), desc, size, NULL, NULL )) + { + if (desc->SerialNumberOffset) ret = heap_strdupAW( (const char *)desc + desc->SerialNumberOffset ); + heap_free( desc ); + break; + } + heap_free( desc ); + if (GetLastError() == ERROR_MORE_DATA) size = desc->Size; + else break; + } + +done: + if (handle != INVALID_HANDLE_VALUE) CloseHandle( handle ); + if (!ret) ret = heap_strdupW( L"WINEHDISK" ); + return ret; +} static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { @@ -2114,7 +2151,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * rec->mediatype = (type == DRIVE_FIXED) ? L"Fixed hard disk" : L"Removable media"; rec->model = L"Wine Disk Drive"; rec->pnpdevice_id = L"IDE\\Disk\\VEN_WINE"; - rec->serialnumber = L"WINEHDISK"; + rec->serialnumber = get_diskdrive_serialnumber( root[0] ); get_freespace( root, &size ); rec->size = size; if (!match_row( table, row, cond, &status )) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a9b4910ebf..578e9308df 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1456,6 +1456,31 @@ static void test_Win32_DesktopMonitor( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DiskDrive( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DiskDrive" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ); @@ -1561,6 +1586,7 @@ START_TEST(query) test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); test_Win32_DesktopMonitor( services ); + test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services );

1 0

Hans Leidekker : mountmgr: Return the disk serial from IOCTL_STORAGE_QUERY_PROPERTY(StorageDeviceProperty).
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 4ed26b63ca0305ba750c4f38002cf1eb674f688c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed26b63ca0305ba750c4f38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 26 10:18:42 2020 +0200 mountmgr: Return the disk serial from IOCTL_STORAGE_QUERY_PROPERTY(StorageDeviceProperty). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 13 +++++---- dlls/mountmgr.sys/device.c | 69 +++++++++++++++++++++++++++++++++++--------- dlls/mountmgr.sys/diskarb.c | 2 +- dlls/mountmgr.sys/mountmgr.h | 2 +- 4 files changed, 66 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ed26b63ca0305ba750c…

1 0

Huw Davies : ntdll: Remove unnecessary page variable.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 51c9db55e6091985a4913bbd4512855d4bc08885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c9db55e6091985a4913bbd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 26 10:57:24 2020 +0100 ntdll: Remove unnecessary page variable. get_page_vprot() doesn't require the base address. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 005c3ee441..3468b6f5be 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2624,9 +2624,7 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T { if (!(view->protect & VPROT_SYSTEM)) { - char *page = ROUND_ADDR( addr, page_mask ); - - while (bytes_read < size && (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_READ)) + while (bytes_read < size && (VIRTUAL_GetUnixProt( get_page_vprot( addr )) & PROT_READ)) { SIZE_T block_size = min( size - bytes_read, page_size - ((UINT_PTR)addr & page_mask) ); memcpy( buffer, addr, block_size ); @@ -2634,7 +2632,6 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T addr = (const void *)((const char *)addr + block_size); buffer = (void *)((char *)buffer + block_size); bytes_read += block_size; - page += page_size; } } }

1 0

Huw Davies : ntdll: Use the correct size when the read spans a page boundary.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: a98dd5a63eb1f2c86f140c2639a70f865ee99c32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a98dd5a63eb1f2c86f140c26… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 26 10:57:23 2020 +0100 ntdll: Use the correct size when the read spans a page boundary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f678b2387a..005c3ee441 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2628,7 +2628,7 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T while (bytes_read < size && (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_READ)) { - SIZE_T block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); + SIZE_T block_size = min( size - bytes_read, page_size - ((UINT_PTR)addr & page_mask) ); memcpy( buffer, addr, block_size ); addr = (const void *)((const char *)addr + block_size);

1 0

Paul Gofman : ntoskrnl.exe: Implement KeRevertToUserAffinityThread() function.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: cda4fa293e26e788e95dc5d4656c15fb41cf6350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda4fa293e26e788e95dc5d4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:10 2020 +0300 ntoskrnl.exe: Implement KeRevertToUserAffinityThread() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fc7828cf15..c4f2180c4c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2485,7 +2485,7 @@ KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) */ void WINAPI KeRevertToUserAffinityThread(void) { - FIXME("() stub\n"); + KeRevertToUserAffinityThreadEx(0); } void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 458815a0f2..356c60a2e7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1766,7 +1766,17 @@ static void test_affinity(void) mask = pKeSetSystemAffinityThreadEx(0x1); ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); - pKeRevertToUserAffinityThreadEx(mask_all_cpus); + pKeRevertToUserAffinityThreadEx(0); + + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(!mask, "Got unexpected mask %#lx.\n", mask); + + KeRevertToUserAffinityThread(); + + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(!mask, "Got unexpected mask %#lx.\n", mask); + + KeRevertToUserAffinityThread(); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)

1 0

Paul Gofman : ntoskrnl.exe: Implement KeRevertToUserAffinityThreadEx() function.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 7d4f4783a5d166b0d2987ca4c2b9188b405bdcbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4f4783a5d166b0d2987ca4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:09 2020 +0300 ntoskrnl.exe: Implement KeRevertToUserAffinityThreadEx() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 16 +++++++++++++++- include/ddk/wdm.h | 1 + 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a0657b52c5..fc7828cf15 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2267,6 +2267,7 @@ static void *create_thread_object( HANDLE handle ) thread->header.Type = 6; thread->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ + thread->user_affinity = 0; if (!NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) { @@ -2458,6 +2459,7 @@ VOID WINAPI KeSetSystemAffinityThread(KAFFINITY affinity) KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) { DWORD_PTR system_affinity = KeQueryActiveProcessors(); + PKTHREAD thread = KeGetCurrentThread(); GROUP_AFFINITY old, new; TRACE("affinity %#lx.\n", affinity); @@ -2467,11 +2469,14 @@ KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) NtQueryInformationThread(GetCurrentThread(), ThreadGroupInformation, &old, sizeof(old), NULL); + if (old.Mask != system_affinity) + thread->user_affinity = old.Mask; + memset(&new, 0, sizeof(new)); new.Mask = affinity; return NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)) - ? 0 : old.Mask; + ? 0 : thread->user_affinity; } @@ -2483,6 +2488,23 @@ void WINAPI KeRevertToUserAffinityThread(void) FIXME("() stub\n"); } +void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity) +{ + DWORD_PTR system_affinity = KeQueryActiveProcessors(); + PRKTHREAD thread = KeGetCurrentThread(); + GROUP_AFFINITY new; + + TRACE("affinity %#lx.\n", affinity); + + affinity &= system_affinity; + + memset(&new, 0, sizeof(new)); + new.Mask = affinity ? affinity + : (thread->user_affinity ? thread->user_affinity : system_affinity); + + NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)); + thread->user_affinity = affinity; +} /*********************************************************************** * IoRegisterFileSystem (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 01a8e67376..3c7a9d1950 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -619,6 +619,7 @@ @ stdcall KeResetEvent(ptr) @ stub KeRestoreFloatingPointState @ stdcall KeRevertToUserAffinityThread() +@ stdcall KeRevertToUserAffinityThreadEx(long) @ stub KeRundownQueue @ stub KeSaveFloatingPointState @ stub KeSaveStateForHibernate diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 23f03c336d..a1e1b892e8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -49,6 +49,7 @@ struct _KTHREAD PEPROCESS process; CLIENT_ID id; unsigned int critical_region; + KAFFINITY user_affinity; }; struct _ETHREAD diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c7b3c93f6d..458815a0f2 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1713,6 +1713,7 @@ static void test_executable_pool(void) static void test_affinity(void) { KAFFINITY (WINAPI *pKeSetSystemAffinityThreadEx)(KAFFINITY affinity); + void (WINAPI *pKeRevertToUserAffinityThreadEx)(KAFFINITY affinity); ULONG (WINAPI *pKeQueryActiveProcessorCountEx)(USHORT); KAFFINITY (WINAPI *pKeQueryActiveProcessors)(void); KAFFINITY mask, mask_all_cpus; @@ -1731,6 +1732,9 @@ static void test_affinity(void) pKeSetSystemAffinityThreadEx = get_proc_address("KeSetSystemAffinityThreadEx"); ok(!!pKeSetSystemAffinityThreadEx, "KeSetSystemAffinityThreadEx is not available.\n"); + pKeRevertToUserAffinityThreadEx = get_proc_address("KeRevertToUserAffinityThreadEx"); + ok(!!pKeRevertToUserAffinityThreadEx, "KeRevertToUserAffinityThreadEx is not available.\n"); + count = pKeQueryActiveProcessorCountEx(1); todo_wine ok(!count, "Got unexpected count %u.\n", count); @@ -1745,14 +1749,24 @@ static void test_affinity(void) mask = pKeQueryActiveProcessors(); ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + pKeRevertToUserAffinityThreadEx(0x2); + mask = pKeSetSystemAffinityThreadEx(0); ok(!mask, "Got unexpected mask %#lx.\n", mask); + pKeRevertToUserAffinityThreadEx(0x2); + mask = pKeSetSystemAffinityThreadEx(0x1); - ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + ok(mask == 0x2, "Got unexpected mask %#lx.\n", mask); mask = pKeSetSystemAffinityThreadEx(~(KAFFINITY)0); ok(mask == 0x1, "Got unexpected mask %#lx.\n", mask); + + pKeRevertToUserAffinityThreadEx(~(KAFFINITY)0); + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + + pKeRevertToUserAffinityThreadEx(mask_all_cpus); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 42ff0c72b1..b0ad0e70d3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1706,6 +1706,7 @@ void WINAPI KeReleaseSpinLock(KSPIN_LOCK*,KIRQL); void WINAPI KeReleaseSpinLockFromDpcLevel(KSPIN_LOCK*); LONG WINAPI KeResetEvent(PRKEVENT); void WINAPI KeRevertToUserAffinityThread(void); +void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
75
Older →

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 May 2020