October 2019 - Wine-Commits

Ken Thomases : winemac: Fix redirection of OpenGL extension functions.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 6c6afb2ce9517d0d10ad0feb369d34f1ee2fa369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6afb2ce9517d0d10ad0feb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 17:53:45 2019 -0500 winemac: Fix redirection of OpenGL extension functions. This never worked. opengl_funcs.ext.p_<func> would always be NULL at the time it was checked, so nothing would be changed. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 8625350b2c..5197e15fbb 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4277,6 +4277,9 @@ static BOOL init_opengl(void) } } + if (!init_gl_info()) + goto failed; + /* redirect some standard OpenGL functions */ #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) @@ -4292,13 +4295,10 @@ static BOOL init_opengl(void) /* redirect some OpenGL extension functions */ #define REDIRECT(func) \ - do { if (opengl_funcs.ext.p_##func) { p##func = opengl_funcs.ext.p_##func; opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) + do { if ((p##func = wine_dlsym(opengl_handle, #func, NULL, 0))) { opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) REDIRECT(glCopyColorTable); #undef REDIRECT - if (!init_gl_info()) - goto failed; - if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions)) pglFlushRenderAPPLE = wine_dlsym(opengl_handle, "glFlushRenderAPPLE", NULL, 0);

1 0

Rémi Bernon : vkd3d: Introduce vkd3d_format_copy_data().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: vkd3d Branch: master Commit: 7ec32ebfc59073b1f3df5b7a7a18bb51993a5efc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7ec32ebfc59073b1f3df5b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 18 17:46:55 2019 +0330 vkd3d: Introduce vkd3d_format_copy_data(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 45 ++++++++++++++------------------------------- libs/vkd3d/utils.c | 24 ++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 4 ++++ 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 27d6a02..db5e991 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1306,11 +1306,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc const struct vkd3d_format *format; VkSubresourceLayout vk_layout; struct d3d12_device *device; - BYTE *dst_data, *dst; - BYTE const *src; - unsigned int y, z; + uint8_t *dst_data; D3D12_BOX box; - size_t size; HRESULT hr; TRACE("iface %p, src_data %p, src_row_pitch %u, src_slice_pitch %u, " @@ -1381,18 +1378,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc dst_data += vk_layout.offset; dst_data += dst_box->left / format->block_width * format->byte_count * format->block_byte_count; - size = (dst_box->right - dst_box->left) / format->block_width * format->byte_count * format->block_byte_count; - for (z = dst_box->front; z < dst_box->back; ++z) - { - src = (uint8_t *)src_data + (z - dst_box->front) * src_slice_pitch; - dst = dst_data + z * vk_layout.depthPitch + dst_box->top / format->block_height * vk_layout.rowPitch; - for (y = dst_box->top; y < dst_box->bottom; y += format->block_height) - { - memcpy(dst, src, size); - src += src_row_pitch; - dst += vk_layout.rowPitch; - } - } + dst_data += dst_box->top / format->block_height * vk_layout.rowPitch; + dst_data += dst_box->front * vk_layout.depthPitch; + + vkd3d_format_copy_data(format, src_data, src_row_pitch, src_slice_pitch, + dst_data, vk_layout.rowPitch, vk_layout.depthPitch, dst_box->right - dst_box->left, + dst_box->bottom - dst_box->top, dst_box->back - dst_box->front); d3d12_heap_unmap(resource->heap, resource); @@ -1409,10 +1400,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour const struct vkd3d_format *format; VkSubresourceLayout vk_layout; struct d3d12_device *device; - BYTE *src_data, *src, *dst; - unsigned int y, z; + uint8_t *src_data; D3D12_BOX box; - size_t size; HRESULT hr; TRACE("iface %p, dst_data %p, dst_row_pitch %u, dst_slice_pitch %u, " @@ -1483,18 +1472,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour src_data += vk_layout.offset; src_data += src_box->left / format->block_width * format->byte_count * format->block_byte_count; - size = (src_box->right - src_box->left) / format->block_width * format->byte_count * format->block_byte_count; - for (z = src_box->front; z < src_box->back; ++z) - { - dst = (uint8_t *)dst_data + (z - src_box->front) * dst_slice_pitch; - src = src_data + z * vk_layout.depthPitch + src_box->top / format->block_height * vk_layout.rowPitch; - for (y = src_box->top; y < src_box->bottom; y += format->block_height) - { - memcpy(dst, src, size); - dst += dst_row_pitch; - src += vk_layout.rowPitch; - } - } + src_data += src_box->top / format->block_height * vk_layout.rowPitch; + src_data += src_box->front * vk_layout.depthPitch; + + vkd3d_format_copy_data(format, src_data, vk_layout.rowPitch, vk_layout.depthPitch, + dst_data, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, + src_box->bottom - src_box->top, src_box->back - src_box->front); d3d12_heap_unmap(resource->heap, resource); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 6a910a7..1fc0e9d 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -451,6 +451,30 @@ const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, return NULL; } +void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *src, + unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, + unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) +{ + unsigned int row_block_count, row_count, row_size, slice, row; + unsigned int slice_count = d; + const uint8_t *src_row; + uint8_t *dst_row; + + row_block_count = (w + format->block_width - 1) / format->block_width; + row_count = (h + format->block_height - 1) / format->block_height; + row_size = row_block_count * format->byte_count * format->block_byte_count; + + for (slice = 0; slice < slice_count; ++slice) + { + for (row = 0; row < row_count; ++row) + { + src_row = &src[slice * src_slice_pitch + row * src_row_pitch]; + dst_row = &dst[slice * dst_slice_pitch + row * dst_row_pitch]; + memcpy(dst_row, src_row, row_size); + } + } +} + VkFormat vkd3d_get_vk_format(DXGI_FORMAT format) { const struct vkd3d_format *vkd3d_format; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ee1c463..fd98463 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1155,6 +1155,10 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) return format->block_byte_count != 1; } +void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *src, + unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, + unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN; + const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : vkd3d: Introduce d3d12_box_is_empty().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: vkd3d Branch: master Commit: 65417717ac10ee93ddb64dd432212bc2bc0e8322 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65417717ac10ee93ddb64dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 18 17:46:54 2019 +0330 vkd3d: Introduce d3d12_box_is_empty(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 69cf653..27d6a02 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1352,7 +1352,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc return E_INVALIDARG; } - if (dst_box->right <= dst_box->left || dst_box->bottom <= dst_box->top || dst_box->back <= dst_box->front) + if (d3d12_box_is_empty(dst_box)) { WARN("Empty box %s.\n", debug_d3d12_box(dst_box)); return S_OK; @@ -1454,7 +1454,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour return E_INVALIDARG; } - if (src_box->right <= src_box->left || src_box->bottom <= src_box->top || src_box->back <= src_box->front) + if (d3d12_box_is_empty(src_box)) { WARN("Empty box %s.\n", debug_d3d12_box(src_box)); return S_OK; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 59f0eac..ee1c463 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1168,6 +1168,11 @@ static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL); } +static inline bool d3d12_box_is_empty(const D3D12_BOX *box) +{ + return box->right <= box->left || box->bottom <= box->top || box->back <= box->front; +} + static inline unsigned int d3d12_resource_desc_get_width(const D3D12_RESOURCE_DESC *desc, unsigned int miplevel_idx) {

1 0

Henri Verbeet : vkd3d: Introduce d3d12_resource_get_level_box().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: vkd3d Branch: master Commit: 6259f10c4d0d28c801f4862d6605e958acf5b56e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6259f10c4d0d28c801f4862… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 18 17:46:53 2019 +0330 vkd3d: Introduce d3d12_resource_get_level_box(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 83 ++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ccd1230..69cf653 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1072,6 +1072,17 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, && !(box->bottom & height_mask); } +static void d3d12_resource_get_level_box(const struct d3d12_resource *resource, + unsigned int level, D3D12_BOX *box) +{ + box->left = 0; + box->top = 0; + box->front = 0; + box->right = d3d12_resource_desc_get_width(&resource->desc, level); + box->bottom = d3d12_resource_desc_get_height(&resource->desc, level); + box->back = d3d12_resource_desc_get_depth(&resource->desc, level); +} + /* ID3D12Resource */ static inline struct d3d12_resource *impl_from_ID3D12Resource(ID3D12Resource *iface) { @@ -1330,26 +1341,18 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc vk_sub_resource.mipLevel = dst_sub_resource % resource->desc.MipLevels; vk_sub_resource.aspectMask = format->vk_aspect_mask; - if (dst_box) + if (!dst_box) { - if (!d3d12_resource_validate_box(resource, dst_sub_resource, dst_box)) - { - WARN("Invalid box %s.\n", debug_d3d12_box(dst_box)); - return E_INVALIDARG; - } - - box = *dst_box; + d3d12_resource_get_level_box(resource, vk_sub_resource.mipLevel, &box); + dst_box = &box; } - else + else if (!d3d12_resource_validate_box(resource, dst_sub_resource, dst_box)) { - box.left = 0; - box.top = 0; - box.front = 0; - box.right = d3d12_resource_desc_get_width(&resource->desc, vk_sub_resource.mipLevel); - box.bottom = d3d12_resource_desc_get_height(&resource->desc, vk_sub_resource.mipLevel); - box.back = d3d12_resource_desc_get_depth(&resource->desc, vk_sub_resource.mipLevel); + WARN("Invalid box %s.\n", debug_d3d12_box(dst_box)); + return E_INVALIDARG; } - if (box.right <= box.left || box.bottom <= box.top || box.back <= box.front) + + if (dst_box->right <= dst_box->left || dst_box->bottom <= dst_box->top || dst_box->back <= dst_box->front) { WARN("Empty box %s.\n", debug_d3d12_box(dst_box)); return S_OK; @@ -1377,13 +1380,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc } dst_data += vk_layout.offset; - dst_data += box.left / format->block_width * format->byte_count * format->block_byte_count; - size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; - for (z = box.front; z < box.back; ++z) + dst_data += dst_box->left / format->block_width * format->byte_count * format->block_byte_count; + size = (dst_box->right - dst_box->left) / format->block_width * format->byte_count * format->block_byte_count; + for (z = dst_box->front; z < dst_box->back; ++z) { - src = (uint8_t *)src_data + (z - box.front) * src_slice_pitch; - dst = dst_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; - for (y = box.top; y < box.bottom; y += format->block_height) + src = (uint8_t *)src_data + (z - dst_box->front) * src_slice_pitch; + dst = dst_data + z * vk_layout.depthPitch + dst_box->top / format->block_height * vk_layout.rowPitch; + for (y = dst_box->top; y < dst_box->bottom; y += format->block_height) { memcpy(dst, src, size); src += src_row_pitch; @@ -1440,26 +1443,18 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour vk_sub_resource.mipLevel = src_sub_resource % resource->desc.MipLevels; vk_sub_resource.aspectMask = format->vk_aspect_mask; - if (src_box) + if (!src_box) { - if (!d3d12_resource_validate_box(resource, src_sub_resource, src_box)) - { - WARN("Invalid box %s.\n", debug_d3d12_box(src_box)); - return E_INVALIDARG; - } - - box = *src_box; + d3d12_resource_get_level_box(resource, vk_sub_resource.mipLevel, &box); + src_box = &box; } - else + else if (!d3d12_resource_validate_box(resource, src_sub_resource, src_box)) { - box.left = 0; - box.top = 0; - box.front = 0; - box.right = d3d12_resource_desc_get_width(&resource->desc, vk_sub_resource.mipLevel); - box.bottom = d3d12_resource_desc_get_height(&resource->desc, vk_sub_resource.mipLevel); - box.back = d3d12_resource_desc_get_depth(&resource->desc, vk_sub_resource.mipLevel); + WARN("Invalid box %s.\n", debug_d3d12_box(src_box)); + return E_INVALIDARG; } - if (box.right <= box.left || box.bottom <= box.top || box.back <= box.front) + + if (src_box->right <= src_box->left || src_box->bottom <= src_box->top || src_box->back <= src_box->front) { WARN("Empty box %s.\n", debug_d3d12_box(src_box)); return S_OK; @@ -1487,13 +1482,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour } src_data += vk_layout.offset; - src_data += box.left / format->block_width * format->byte_count * format->block_byte_count; - size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; - for (z = box.front; z < box.back; ++z) + src_data += src_box->left / format->block_width * format->byte_count * format->block_byte_count; + size = (src_box->right - src_box->left) / format->block_width * format->byte_count * format->block_byte_count; + for (z = src_box->front; z < src_box->back; ++z) { - dst = (uint8_t *)dst_data + (z - box.front) * dst_slice_pitch; - src = src_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; - for (y = box.top; y < box.bottom; y += format->block_height) + dst = (uint8_t *)dst_data + (z - src_box->front) * dst_slice_pitch; + src = src_data + z * vk_layout.depthPitch + src_box->top / format->block_height * vk_layout.rowPitch; + for (y = src_box->top; y < src_box->bottom; y += format->block_height) { memcpy(dst, src, size); dst += dst_row_pitch;

1 0

Henri Verbeet : vkd3d: Introduce vkd3d_format_get_data_offset().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: vkd3d Branch: master Commit: 769dd2b68c813324a00af8e6b1f99159f403863a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=769dd2b68c813324a00af8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 18 17:46:56 2019 +0330 vkd3d: Introduce vkd3d_format_get_data_offset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 11 ++++------- libs/vkd3d/resource.c | 12 ++++-------- libs/vkd3d/vkd3d_private.h | 9 +++++++++ 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d420863..59ea482 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3065,9 +3065,8 @@ static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, if (src_box) { VkDeviceSize row_count = footprint->Footprint.Height / format->block_height; - copy->bufferOffset += src_box->left / format->block_width * format->byte_count * format->block_byte_count; - copy->bufferOffset += src_box->top / format->block_height * footprint->Footprint.RowPitch; - copy->bufferOffset += src_box->front * footprint->Footprint.RowPitch * row_count; + copy->bufferOffset += vkd3d_format_get_data_offset(format, footprint->Footprint.RowPitch, + row_count * footprint->Footprint.RowPitch, src_box->left, src_box->top, src_box->front); } copy->bufferRowLength = footprint->Footprint.RowPitch / (format->byte_count * format->block_byte_count) * format->block_width; @@ -3098,10 +3097,8 @@ static void vk_image_buffer_copy_from_d3d12(VkBufferImageCopy *copy, { VkDeviceSize row_count = footprint->Footprint.Height / format->block_height; - copy->bufferOffset = footprint->Offset; - copy->bufferOffset += dst_x / format->block_width * format->byte_count * format->block_byte_count; - copy->bufferOffset += dst_y / format->block_height * footprint->Footprint.RowPitch; - copy->bufferOffset += dst_z * footprint->Footprint.RowPitch * row_count; + copy->bufferOffset = footprint->Offset + vkd3d_format_get_data_offset(format, + footprint->Footprint.RowPitch, row_count * footprint->Footprint.RowPitch, dst_x, dst_y, dst_z); copy->bufferRowLength = footprint->Footprint.RowPitch / (format->byte_count * format->block_byte_count) * format->block_width; copy->bufferImageHeight = footprint->Footprint.Height; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index db5e991..626772e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1376,10 +1376,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc return hr; } - dst_data += vk_layout.offset; - dst_data += dst_box->left / format->block_width * format->byte_count * format->block_byte_count; - dst_data += dst_box->top / format->block_height * vk_layout.rowPitch; - dst_data += dst_box->front * vk_layout.depthPitch; + dst_data += vk_layout.offset + vkd3d_format_get_data_offset(format, vk_layout.rowPitch, + vk_layout.depthPitch, dst_box->left, dst_box->top, dst_box->front); vkd3d_format_copy_data(format, src_data, src_row_pitch, src_slice_pitch, dst_data, vk_layout.rowPitch, vk_layout.depthPitch, dst_box->right - dst_box->left, @@ -1470,10 +1468,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour return hr; } - src_data += vk_layout.offset; - src_data += src_box->left / format->block_width * format->byte_count * format->block_byte_count; - src_data += src_box->top / format->block_height * vk_layout.rowPitch; - src_data += src_box->front * vk_layout.depthPitch; + src_data += vk_layout.offset + vkd3d_format_get_data_offset(format, vk_layout.rowPitch, + vk_layout.depthPitch, src_box->left, src_box->top, src_box->front); vkd3d_format_copy_data(format, src_data, vk_layout.rowPitch, vk_layout.depthPitch, dst_data, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fd98463..69b08a2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1150,6 +1150,15 @@ struct vkd3d_format bool is_emulated; }; +static inline size_t vkd3d_format_get_data_offset(const struct vkd3d_format *format, + unsigned int row_pitch, unsigned int slice_pitch, + unsigned int x, unsigned int y, unsigned int z) +{ + return z * slice_pitch + + (y / format->block_height) * row_pitch + + (x / format->block_width) * format->byte_count * format->block_byte_count; +} + static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) { return format->block_byte_count != 1;

1 0

Jacek Caban : vbscript: Use separated IDispatch implementation for objects exposing builtin functions.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: d061ba0e35461fa81fe838cf84782cdb663a0f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d061ba0e35461fa81fe838cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:45 2019 +0200 vbscript: Use separated IDispatch implementation for objects exposing builtin functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 302 +++++++++++++++++++++++++++++++++++++++++------ dlls/vbscript/interp.c | 4 +- dlls/vbscript/vbdisp.c | 103 +--------------- dlls/vbscript/vbscript.h | 33 ++---- 4 files changed, 279 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d061ba0e35461fa81fe8…

1 0

Jacek Caban : vbscript: Introduce get_builtin_id.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 4c3e2f2b4fd3a9120c3fcfde66cfddca5b9f70a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c3e2f2b4fd3a9120c3fcfde… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:33 2019 +0200 vbscript: Introduce get_builtin_id. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 5 +++++ dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbscript.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f0bdfc4efa..61caf3e31b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -39,6 +39,11 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = static const WCHAR emptyW[] = {0}; static const WCHAR vbscriptW[] = {'V','B','S','c','r','i','p','t',0}; +HRESULT get_builtin_id(BuiltinDisp *disp, const WCHAR *name, DISPID *id) +{ + return ITypeInfo_GetIDsOfNames(disp->desc->typeinfo, (WCHAR**)&name, 1, id); +} + static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) { IInternetHostSecurityManager *secmgr; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8649164764..4d2df0bf79 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -181,7 +181,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - hres = vbdisp_get_id(ctx->script->global_obj, name, invoke_type, TRUE, &id); + hres = get_builtin_id(ctx->script->global_obj, name, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; ref->u.d.disp = (IDispatch*)&ctx->script->global_obj->IDispatchEx_iface; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 41e3b7983f..a0e2f99e16 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -364,6 +364,7 @@ IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDE void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Jacek Caban : vbscript: Factor out invoke_vbdisp.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 6d55197ee0bf0ac81fac1ea1dbffc44e62561b6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d55197ee0bf0ac81fac1ea1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:12 2019 +0200 vbscript: Factor out invoke_vbdisp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 164 ++++++++++++++++++++++++++----------------------- 1 file changed, 86 insertions(+), 78 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index fb646e7187..60ca5c8b0e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -248,6 +248,91 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return prop->proc(This, args, dp->cArgs, res); } +static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern_caller, DISPPARAMS *params, VARIANT *res) +{ + if(id < 0) + return DISP_E_MEMBERNOTFOUND; + + if(is_func_id(This, id)) { + function_t *func; + + TRACE("%p->%s\n", This, debugstr_w(This->desc->funcs[id].name)); + + switch(flags) { + case DISPATCH_PROPERTYGET: + func = This->desc->funcs[id].entries[VBDISP_CALLGET]; + if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + WARN("no getter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return exec_script(This->desc->ctx, FALSE, func, This, params, res); + + case DISPATCH_METHOD: + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + func = This->desc->funcs[id].entries[VBDISP_CALLGET]; + if(!func) { + FIXME("no invoke/getter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return exec_script(This->desc->ctx, FALSE, func, This, params, res); + case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { + DISPPARAMS dp = {NULL, NULL, 1, 0}; + BOOL needs_release; + VARIANT put_val; + HRESULT hres; + + if(arg_cnt(params)) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + + hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); + if(FAILED(hres)) + return hres; + + dp.rgvarg = &put_val; + func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + if(!func) { + FIXME("no letter/setter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + hres = exec_script(This->desc->ctx, FALSE, func, This, &dp, NULL); + if(needs_release) + VariantClear(&put_val); + return hres; + } + default: + FIXME("flags %x\n", flags); + return DISP_E_MEMBERNOTFOUND; + } + } + + if(id >= This->desc->prop_cnt + This->desc->func_cnt) { + if(This->desc->builtin_prop_cnt) { + unsigned min = 0, max = This->desc->builtin_prop_cnt-1, i; + + while(min <= max) { + i = (min+max)/2; + if(This->desc->builtin_props[i].id == id) + return invoke_builtin(This, This->desc->builtin_props+i, flags, params, res); + if(This->desc->builtin_props[i].id < id) + min = i+1; + else + max = i-1; + } + } + return DISP_E_MEMBERNOTFOUND; + } + + TRACE("%p->%s\n", This, debugstr_w(This->desc->props[id - This->desc->func_cnt].name)); + return invoke_variant_prop(This->desc->ctx, This->props+(id-This->desc->func_cnt), flags, params, res); +} + static BOOL run_terminator(vbdisp_t *This) { DISPPARAMS dp = {0}; @@ -412,84 +497,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(pvarRes) V_VT(pvarRes) = VT_EMPTY; - if(id < 0) - return DISP_E_MEMBERNOTFOUND; - - if(is_func_id(This, id)) { - function_t *func; - - switch(wFlags) { - case DISPATCH_PROPERTYGET: - func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { - WARN("no getter\n"); - return DISP_E_MEMBERNOTFOUND; - } - - return exec_script(This->desc->ctx, FALSE, func, This, pdp, pvarRes); - - case DISPATCH_METHOD: - case DISPATCH_METHOD|DISPATCH_PROPERTYGET: - func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func) { - FIXME("no invoke/getter\n"); - return DISP_E_MEMBERNOTFOUND; - } - - return exec_script(This->desc->ctx, FALSE, func, This, pdp, pvarRes); - case DISPATCH_PROPERTYPUT: - case DISPATCH_PROPERTYPUTREF: - case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { - DISPPARAMS dp = {NULL, NULL, 1, 0}; - BOOL needs_release; - VARIANT put_val; - HRESULT hres; - - if(arg_cnt(pdp)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; - } - - hres = get_propput_arg(This->desc->ctx, pdp, wFlags, &put_val, &needs_release); - if(FAILED(hres)) - return hres; - - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; - if(!func) { - FIXME("no letter/setter\n"); - return DISP_E_MEMBERNOTFOUND; - } - - hres = exec_script(This->desc->ctx, FALSE, func, This, &dp, NULL); - if(needs_release) - VariantClear(&put_val); - return hres; - } - default: - FIXME("flags %x\n", wFlags); - return DISP_E_MEMBERNOTFOUND; - } - } - - if(id < This->desc->prop_cnt + This->desc->func_cnt) - return invoke_variant_prop(This->desc->ctx, This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); - - if(This->desc->builtin_prop_cnt) { - unsigned min = 0, max = This->desc->builtin_prop_cnt-1, i; - - while(min <= max) { - i = (min+max)/2; - if(This->desc->builtin_props[i].id == id) - return invoke_builtin(This, This->desc->builtin_props+i, wFlags, pdp, pvarRes); - if(This->desc->builtin_props[i].id < id) - min = i+1; - else - max = i-1; - } - } - - return DISP_E_MEMBERNOTFOUND; + return invoke_vbdisp(This, id, wFlags, TRUE, pdp, pvarRes); } static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)

1 0

Jacek Caban : vbscript: Introduce new type for object with builtin functions.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: ace3279a26b6aa5d147f69dbc58a79935514d8c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace3279a26b6aa5d147f69db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:25 2019 +0200 vbscript: Introduce new type for object with builtin functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 232 +++++++++++++++++++++++------------------------ dlls/vbscript/vbscript.h | 6 +- 2 files changed, 120 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace3279a26b6aa5d147f…

1 0

Jacek Caban : vbscript: Create class description for procedure object in compiler.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 581a8adf1f6eeee9c92edfc7ee5143b99a69c2c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=581a8adf1f6eeee9c92edfc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:20 2019 +0200 vbscript: Create class description for procedure object in compiler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 26 ++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 39 --------------------------------------- dlls/vbscript/vbscript.c | 12 +++++++++--- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 36 insertions(+), 43 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index b2be38d71b..c129f3670d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1926,3 +1926,29 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli *ret = code; return S_OK; } + +HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, class_desc_t **ret) +{ + class_desc_t *desc; + vbscode_t *code; + HRESULT hres; + + hres = compile_script(script, src, delimiter, flags, &code); + if(FAILED(hres)) + return hres; + + if(!(desc = compiler_alloc_zero(code, sizeof(*desc)))) + return E_OUTOFMEMORY; + if(!(desc->funcs = compiler_alloc_zero(code, sizeof(*desc->funcs)))) + return E_OUTOFMEMORY; + + desc->ctx = script; + desc->func_cnt = 1; + desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; + + desc->next = script->procs; + script->procs = desc; + + *ret = desc; + return S_OK; +} diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1c0911a637..68af6233ed 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -627,45 +627,6 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } -static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - script_ctx_t *ctx = This->desc->ctx; - TRACE("\n"); - return exec_script(ctx, TRUE, This->desc->value_func, NULL, NULL, res); -} - -static const builtin_prop_t procedure_props[] = { - {DISPID_VALUE, Procedure_invoke, 0} -}; - -HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **ret) -{ - class_desc_t *desc; - vbdisp_t *vbdisp; - HRESULT hres; - - desc = heap_alloc_zero(sizeof(*desc)); - if(!desc) - return E_OUTOFMEMORY; - - desc->ctx = ctx; - desc->builtin_prop_cnt = ARRAY_SIZE(procedure_props); - desc->builtin_props = procedure_props; - desc->value_func = &code->main_code; - - hres = create_vbdisp(desc, &vbdisp); - if(FAILED(hres)) { - heap_free(desc); - return hres; - } - - desc->next = ctx->procs; - ctx->procs = desc; - - *ret = (IDispatch*)&vbdisp->IDispatchEx_iface; - return S_OK; -} - struct _ident_map_t { const WCHAR *name; BOOL is_var; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 3d76e5e6b9..98f28ca814 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -884,7 +884,8 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); - vbscode_t *code; + class_desc_t *desc; + vbdisp_t *vbdisp; HRESULT hres; TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), @@ -894,11 +895,16 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); + hres = compile_procedure(This->ctx, pstrCode, pstrDelimiter, dwFlags, &desc); + if(FAILED(hres)) + return hres; + + hres = create_vbdisp(desc, &vbdisp); if(FAILED(hres)) return hres; - return create_procedure_disp(This->ctx, code, ppdisp); + *ppdisp = (IDispatch*)&vbdisp->IDispatchEx_iface; + return S_OK; } static const IActiveScriptParseProcedure2Vtbl VBScriptParseProcedureVtbl = { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1d9353ac77..4c2a20aa66 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -154,7 +154,6 @@ HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT get_disp_value(script_ctx_t*,IDispatch*,VARIANT*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN; HRESULT to_int(VARIANT*,int*) DECLSPEC_HIDDEN; @@ -356,6 +355,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN;

1 0