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

Alexandre Julliard : kernel32: Move fiber functions to kernelbase.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: c168fd066d3ef8f909090eca8056d63f5f410485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c168fd066d3ef8f909090eca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 14:32:20 2019 +0200 kernel32: Move fiber functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/fiber.c | 438 ---------------------------------------- dlls/kernel32/kernel32.spec | 24 +-- dlls/kernelbase/kernelbase.spec | 24 +-- dlls/kernelbase/thread.c | 419 +++++++++++++++++++++++++++++++++++++- 5 files changed, 442 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c168fd066d3ef8f90909…

1 0

Alexandre Julliard : kernel32: Move thread pool functions to kernelbase.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 296da1fbb1f691f917fd6f228c84992d92006fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=296da1fbb1f691f917fd6f22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 14:25:58 2019 +0200 kernel32: Move thread pool functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 ++--- dlls/kernel32/thread.c | 174 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 14 ++-- dlls/kernelbase/thread.c | 89 ++++++++++++++++++++ 4 files changed, 105 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=296da1fbb1f691f917fd…

1 0

Alexandre Julliard : kernel32: Move thread functions to kernelbase.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 0116660dd80b38da8201e2156adade67fc2ae823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0116660dd80b38da8201e215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 14:25:50 2019 +0200 kernel32: Move thread functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 60 ++-- dlls/kernel32/sync.c | 9 - dlls/kernel32/thread.c | 664 ---------------------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 64 ++-- dlls/kernelbase/thread.c | 495 ++++++++++++++++++++++++++++++ 6 files changed, 558 insertions(+), 735 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0116660dd80b38da8201…

1 0

Francois Gouget : hidclass.sys: A spelling fix in an ERR() message.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 7c44f3dcd6d790cdcecc9e93c65dadc6aac93481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c44f3dcd6d790cdcecc9e93… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:19:52 2019 +0200 hidclass.sys: A spelling fix in an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 5e164f3..af1679d 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -631,7 +631,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l { case TAG_LOCAL_USAGE: if (usages_top == sizeof(usages)) - ERR("More then 256 individual usages defined\n"); + ERR("More than 256 individual usages defined\n"); else { usages[usages_top++] = getValue(bSize, itemVal, FALSE);

1 0

Francois Gouget : windowscodecs/tests: A couple of spelling fixes in comments.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: e9f5e26cc541a1203b651f017a66e100b782721b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f5e26cc541a1203b651f01… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:17:33 2019 +0200 windowscodecs/tests: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/palette.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 5bb25fa..583fa66 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -602,7 +602,7 @@ static void test_palette_from_bitmap(void) ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); - /* without trasparent color */ + /* without transparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, FALSE); ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); type = -1; @@ -619,7 +619,7 @@ static void test_palette_from_bitmap(void) ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[count - 1] != 0, "expected !0, got %08x\n", color[count - 1]); - /* with trasparent color */ + /* with transparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, TRUE); ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); type = -1;

1 0

Jacek Caban : jscript: Allow 0x strings with explicit radix 16 in parseInt.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 9dd50eae0669417e9f3c16cd4604f337e76db850 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd50eae0669417e9f3c16cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 8 15:26:06 2019 +0200 jscript: Allow 0x strings with explicit radix 16 in parseInt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 2 ++ dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 100cf40..33e6415 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -336,6 +336,8 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, }else { radix = 10; } + }else if(radix == 16 && *ptr == '0' && (ptr[1] == 'x' || ptr[1] == 'X')) { + ptr += 2; } i = char_to_int(*ptr++); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 40a1b2d..58a0cd3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -156,6 +156,12 @@ i = parseInt("1", 37); ok(isNaN(i), "parseInt('1', 37) = " + i); i = parseInt("1", 36); ok(i === 1, "parseInt('1', 36) = " + i); +i = parseInt("0x1f", 16); +ok(i === 31, "parseInt('0xf', 16) = " + i); +i = parseInt("0x", 16); +ok(isNaN(i), "parseInt('0x', 16) = " + i); +i = parseInt("0x1f", 17); +ok(i === 0, "parseInt('0xf', 16) = " + i); tmp = encodeURI("abc"); ok(tmp === "abc", "encodeURI('abc') = " + tmp);

1 0

Józef Kucia : winevulkan: Pull in bitmask dependencies for function parameters.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 3b1bf387eb9ab2aa32164e494dfcb51f6ac52969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1bf387eb9ab2aa32164e49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 8 11:51:37 2019 +0200 winevulkan: Pull in bitmask dependencies for function parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 ++ include/wine/vulkan.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2d872e2..4f1c03c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2608,6 +2608,8 @@ class VkRegistry(object): if type_info["category"] == "struct": struct = type_info["data"] mark_struct_dependencies(struct, self.types) + elif type_info["category"] == "bitmask": + mark_bitmask_dependencies(type_info["data"], self.types) if func.is_alias(): func.alias.required = True diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 407b7ef..66cbd99 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -754,6 +754,12 @@ typedef enum VkCommandBufferLevel VK_COMMAND_BUFFER_LEVEL_MAX_ENUM = 0x7fffffff, } VkCommandBufferLevel; +typedef enum VkCommandBufferResetFlagBits +{ + VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001, + VK_COMMAND_BUFFER_RESET_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkCommandBufferResetFlagBits; + typedef enum VkCommandBufferUsageFlagBits { VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT = 0x00000001, @@ -770,6 +776,12 @@ typedef enum VkCommandPoolCreateFlagBits VK_COMMAND_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkCommandPoolCreateFlagBits; +typedef enum VkCommandPoolResetFlagBits +{ + VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001, + VK_COMMAND_POOL_RESET_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkCommandPoolResetFlagBits; + typedef enum VkCompareOp { VK_COMPARE_OP_NEVER = 0, @@ -1670,6 +1682,15 @@ typedef enum VkQueryPipelineStatisticFlagBits VK_QUERY_PIPELINE_STATISTIC_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkQueryPipelineStatisticFlagBits; +typedef enum VkQueryResultFlagBits +{ + VK_QUERY_RESULT_64_BIT = 0x00000001, + VK_QUERY_RESULT_WAIT_BIT = 0x00000002, + VK_QUERY_RESULT_WITH_AVAILABILITY_BIT = 0x00000004, + VK_QUERY_RESULT_PARTIAL_BIT = 0x00000008, + VK_QUERY_RESULT_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkQueryResultFlagBits; + typedef enum VkQueryType { VK_QUERY_TYPE_OCCLUSION = 0, @@ -1900,6 +1921,14 @@ typedef enum VkSparseMemoryBindFlagBits VK_SPARSE_MEMORY_BIND_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSparseMemoryBindFlagBits; +typedef enum VkStencilFaceFlagBits +{ + VK_STENCIL_FACE_FRONT_BIT = 0x00000001, + VK_STENCIL_FACE_BACK_BIT = 0x00000002, + VK_STENCIL_FRONT_AND_BACK = 0x00000003, + VK_STENCIL_FACE_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkStencilFaceFlagBits; + typedef enum VkStencilOp { VK_STENCIL_OP_KEEP = 0,

1 0

Zebediah Figura : ntoskrnl.exe: Set the IRP output buffer unless the status has both high bits set.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: b9919c2e7f7ac92417cb2d8ed10414b318f03f1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9919c2e7f7ac92417cb2d8e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:12 2019 -0500 ntoskrnl.exe: Set the IRP output buffer unless the status has both high bits set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6488e52..ccc5fce 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -439,7 +439,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; req->size = irp->IoStatus.Information; - if (irp->IoStatus.u.Status >= 0) + if (!NT_ERROR(irp->IoStatus.u.Status)) { if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index e7a8cc9..86dce75 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -444,7 +444,7 @@ static void test_return_status(void) sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); ok(!ret, "ioctl succeeded\n"); ok(GetLastError() == ERROR_MR_MID_NOT_FOUND, "got error %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); ok(ret_size == 3, "got size %u\n", ret_size); strcpy(buffer, "abcdef");

1 0

Henri Verbeet : wined3d: Download buffer ranges through buffer ops.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: e1448751ead1259e3868658b76283540be2234a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1448751ead1259e3868658b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:08 2019 +0430 wined3d: Download buffer ranges through buffer ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 33 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a2908bf..65eff21 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -628,9 +628,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_map_range range; TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); @@ -664,10 +662,10 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, - buffer->resource.heap_memory)); - checkGLcall("buffer download"); + range.offset = 0; + range.size = buffer->resource.size; + buffer->buffer_ops->buffer_download_ranges(buffer, context, + buffer->resource.heap_memory, 0, 1, &range); break; case WINED3D_LOCATION_BUFFER: @@ -1463,9 +1461,30 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc checkGLcall("buffer upload"); } +/* Context activation is done by the caller. */ +static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + const struct wined3d_map_range *range; + + wined3d_buffer_gl_bind(buffer_gl, context_gl); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + } + checkGLcall("buffer download"); +} + static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_upload_ranges, + wined3d_buffer_gl_download_ranges, }; HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8dbf255..173f169 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4047,6 +4047,8 @@ struct wined3d_buffer_ops { void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); }; struct wined3d_buffer

1 0

Henri Verbeet : wined3d: Make the adapter responsible for swapchain creation and destruction.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 7170f67456c98f8ae62ec3ffb3c362d2896cea29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7170f67456c98f8ae62ec3ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:04 2019 +0430 wined3d: Make the adapter responsible for swapchain creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 33 ++++++++++++++++ dlls/wined3d/adapter_vk.c | 33 ++++++++++++++++ dlls/wined3d/directx.c | 33 ++++++++++++++++ dlls/wined3d/swapchain.c | 90 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 16 ++++++++ 5 files changed, 173 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7170f67456c98f8ae62e…

1 0