wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Henri Verbeet : d3d12: Implement D3D12SerializeVersionedRootSignature() on top of vkd3d_serialize_versioned_root_signature().
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 681105fd482cb790568576c1d0a360288904ec82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=681105fd482cb790568576c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:23 2021 +0100 d3d12: Implement D3D12SerializeVersionedRootSignature() on top of vkd3d_serialize_versioned_root_signature(). This raises the required version of vkd3d to 1.2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- dlls/d3d12/d3d12_main.c | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure b/configure index ef09f65f11e..4cb23101f4c 100755 --- a/configure +++ b/configure @@ -16642,11 +16642,11 @@ LIBS="-lvkd3d $VKD3D_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char vkd3d_get_dxgi_format (); +char vkd3d_serialize_versioned_root_signature (); int main () { -return vkd3d_get_dxgi_format (); +return vkd3d_serialize_versioned_root_signature (); ; return 0; } diff --git a/configure.ac b/configure.ac index 1921307da31..0f8b9f6c080 100644 --- a/configure.ac +++ b/configure.ac @@ -1971,7 +1971,7 @@ dnl **** Check for vkd3d **** if test "x$with_vkd3d" != "xno" then WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, - [WINE_CHECK_SONAME(vkd3d,vkd3d_get_dxgi_format,,,[$VKD3D_LIBS])]) + [WINE_CHECK_SONAME(vkd3d,vkd3d_serialize_versioned_root_signature,,,[$VKD3D_LIBS])]) WINE_PACKAGE_FLAGS(VKD3D_SHADER,[libvkd3d-shader],,,, [WINE_CHECK_SONAME(vkd3d-shader,vkd3d_shader_compile,,,[$VKD3D_SHADER_LIBS])]) fi diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index bd680d8254d..9f0fa12ee82 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -420,9 +420,5 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_S { TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); - if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) - return vkd3d_serialize_root_signature(&desc->Desc_1_0, desc->Version, blob, error_blob); - - FIXME("Unsupported version %#x.\n", desc->Version); - return E_NOTIMPL; + return vkd3d_serialize_versioned_root_signature(desc, blob, error_blob); }

1 0

Henri Verbeet : wined3d: Implement NULL constant buffer views for the Vulkan backend.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 50a90dcb3230b65fefdbb8d9c5fff0d7968172e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50a90dcb3230b65fefdbb8d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:22 2021 +0100 wined3d: Implement NULL constant buffer views for the Vulkan backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 7 +++++-- dlls/wined3d/device.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b8414155dc0..841b3d742c6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2527,8 +2527,11 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: if (!(buffer = state->cb[binding->shader_type][binding->resource_idx])) { - FIXME("NULL constant buffer views not implemented.\n"); - return false; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, + &device_vk->null_resources_vk.buffer_info, NULL, NULL)) + return false; + break; } buffer_vk = wined3d_buffer_vk(buffer); buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cc40125ac95..3c16a3c691e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -717,11 +717,15 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk vk_info = context_vk->vk_info; - usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT + | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + r->buffer_info.buffer = r->bo.vk_buffer; + r->buffer_info.offset = r->bo.buffer_offset; + r->buffer_info.range = r->bo.size; if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07ddb57333c..b3934f0d8e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3875,6 +3875,8 @@ struct wined3d_null_image_vk struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; + VkDescriptorBufferInfo buffer_info; + struct wined3d_null_image_vk image_1d; struct wined3d_null_image_vk image_2d; struct wined3d_null_image_vk image_2dms;

1 0

Henri Verbeet : wined3d: Require VK_KHR_sampler_mirror_clamp_to_edge for WINED3D_TADDRESS_MIRROR_ONCE.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: ff19c3e6fa154e4388cfc83d9a7b0603a5714533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff19c3e6fa154e4388cfc83d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:21 2021 +0100 wined3d: Require VK_KHR_sampler_mirror_clamp_to_edge for WINED3D_TADDRESS_MIRROR_ONCE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++------ dlls/wined3d/wined3d_vk.h | 3 +++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 09180e7fdb6..9a226edc65a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -560,7 +560,8 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; - BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; + bool sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER | WINEDDSCAPS_COMPLEX @@ -615,8 +616,9 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTADDRESSCAPS_CLAMP | WINED3DPTADDRESSCAPS_WRAP; caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER - | WINED3DPTADDRESSCAPS_MIRROR - | WINED3DPTADDRESSCAPS_MIRRORONCE; + | WINED3DPTADDRESSCAPS_MIRROR; + if (vk_info->supported[WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE]) + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; caps->MaxVolumeExtent = limits->maxImageDimension3D; @@ -643,8 +645,9 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s } caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER - | WINED3DPTADDRESSCAPS_MIRROR - | WINED3DPTADDRESSCAPS_MIRRORONCE; + | WINED3DPTADDRESSCAPS_MIRROR; + if (vk_info->supported[WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE]) + caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | WINED3DSTENCILCAPS_INCR @@ -2170,6 +2173,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, ~0u}, {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u, true}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,VK_API_VERSION_1_2}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1, true}, {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, }; @@ -2181,7 +2185,8 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk } map[] = { - {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, + {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, + {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE}, }; if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 0b6748ed0cf..a417a795901 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -207,7 +207,10 @@ struct vulkan_ops enum wined3d_vk_extension { WINED3D_VK_EXT_NONE, + WINED3D_VK_EXT_TRANSFORM_FEEDBACK, + WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, + WINED3D_VK_EXT_COUNT, };

1 0

Alexandre Julliard : ntdll: Add some more section information data.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 7250f9a95b864cd2cda5dda6ce19e370e93b82d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7250f9a95b864cd2cda5dda6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 17:21:13 2021 +0100 ntdll: Add some more section information data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 30 +++++++++++----- dlls/kernelbase/process.c | 2 +- dlls/ntdll/tests/info.c | 16 ++++++--- dlls/ntdll/unix/virtual.c | 33 +++++++++--------- include/wine/server_protocol.h | 10 +++--- include/winternl.h | 13 ++++--- server/mapping.c | 79 +++++++++++++++++++++++------------------- server/protocol.def | 8 +++-- server/trace.c | 12 ++++--- 9 files changed, 121 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7250f9a95b864cd2cda5…

1 0

Alexandre Julliard : winegcc: Pass the same winebuild args to all winebuild invocations.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 7c909489b4a0404d7a0f386bc11c7399ae59a84a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c909489b4a0404d7a0f386b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 13:59:48 2021 +0100 winegcc: Pass the same winebuild args to all winebuild invocations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0a45cb7a0d5..e72f234d94b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -986,8 +986,7 @@ static strarray *get_winebuild_args(struct options *opts) for (i = 0; i < opts->prefix->size; i++) strarray_add( spec_args, strmake( "-B%s", opts->prefix->base[i] )); } - if (opts->use_msvcrt) strarray_add( spec_args, "-mno-cygwin" ); - if (opts->unix_lib) strarray_add( spec_args, "-munix" ); + strarray_addall( spec_args, opts->winebuild_args ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; @@ -1266,8 +1265,6 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); - if(opts->unicode_app) - strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); @@ -1287,7 +1284,6 @@ static void build(struct options* opts) strarray_add(spec_args, "-E"); strarray_add(spec_args, spec_file); } - if (opts->win16_app) strarray_add(spec_args, "-m16"); if (!opts->shared) { @@ -1315,9 +1311,6 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); - for ( j = 0 ; j < opts->winebuild_args->size ; j++ ) - strarray_add(spec_args, opts->winebuild_args->base[j]); - if (!is_pe) { for (j = 0; j < opts->delayimports->size; j++) @@ -1485,7 +1478,6 @@ static void build(struct options* opts) strarray_add(implib_args, opts->out_implib); strarray_add(implib_args, "--export"); strarray_add(implib_args, spec_file); - strarray_addall(implib_args, opts->winebuild_args); spawn(opts->prefix, implib_args, 0); strarray_free (implib_args); @@ -1636,7 +1628,7 @@ static int is_option( struct options *opts, int i, const char *option, const cha int main(int argc, char **argv) { int i, c, next_is_arg = 0, linking = 1; - int raw_compiler_arg, raw_linker_arg; + int raw_compiler_arg, raw_linker_arg, raw_winebuild_arg; const char* option_arg; struct options opts; char* lang = 0; @@ -1782,6 +1774,7 @@ int main(int argc, char **argv) /* determine what options go 'as is' to the linker & the compiler */ raw_linker_arg = is_linker_arg(opts.args->base[i]); raw_compiler_arg = !raw_linker_arg; + raw_winebuild_arg = 0; /* do a bit of semantic analysis */ switch (opts.args->base[i][1]) @@ -1840,7 +1833,7 @@ int main(int argc, char **argv) { opts.use_msvcrt = 1; raw_compiler_arg = 0; - strarray_add( opts.winebuild_args, opts.args->base[i] ); + raw_winebuild_arg = 1; } else if (strcmp("-mwindows", opts.args->base[i]) == 0) { @@ -1856,6 +1849,7 @@ int main(int argc, char **argv) { opts.unicode_app = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-mthreads", opts.args->base[i]) == 0) { @@ -1865,11 +1859,13 @@ int main(int argc, char **argv) { opts.unix_lib = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-m16", opts.args->base[i]) == 0) { opts.win16_app = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-m32", opts.args->base[i]) == 0) { @@ -1891,14 +1887,14 @@ int main(int argc, char **argv) } else if (!strcmp("-marm", opts.args->base[i] ) || !strcmp("-mthumb", opts.args->base[i] )) { - strarray_add(opts.winebuild_args, opts.args->base[i]); raw_linker_arg = 1; + raw_winebuild_arg = 1; } else if (!strncmp("-mcpu=", opts.args->base[i], 6) || !strncmp("-mfpu=", opts.args->base[i], 6) || !strncmp("-march=", opts.args->base[i], 7) || !strncmp("-mfloat-abi=", opts.args->base[i], 12)) - strarray_add(opts.winebuild_args, opts.args->base[i]); + raw_winebuild_arg = 1; break; case 'n': if (strcmp("-nostdinc", opts.args->base[i]) == 0) @@ -2073,6 +2069,12 @@ int main(int argc, char **argv) if (next_is_arg && (i + 1 < opts.args->size)) strarray_add( opts.compiler_args, opts.args->base[i + 1] ); } + if (raw_winebuild_arg) + { + strarray_add( opts.winebuild_args, opts.args->base[i] ); + if (next_is_arg && (i + 1 < opts.args->size)) + strarray_add( opts.winebuild_args, opts.args->base[i + 1] ); + } /* skip the next token if it's an argument */ if (next_is_arg) i++;

1 0

Alexandre Julliard : d3dx9: Fix some spec file discrepancies.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 16c03e479774aa211beb35e4a2cb5a336490b688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c03e479774aa211beb35e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:47:43 2021 +0100 d3dx9: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index fe8140d1b49..d617d766f85 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -26,7 +26,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index cb40277ea04..f13923dcb3a 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -26,7 +26,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index bfad690a15a..286a9a094a0 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index bfad690a15a..286a9a094a0 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index 60228541015..06ced20df61 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index 60228541015..06ced20df61 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr)

1 0

Alexandre Julliard : msvcp: Fix some spec file discrepancies.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 2012d7ab6a67f909d3970a8880b5487820f3972d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2012d7ab6a67f909d3970a88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:46:46 2021 +0100 msvcp: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 20 +++++---- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 84 ++++++++++++++++++------------------- 5 files changed, 60 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2012d7ab6a67f909d397…

1 0

Alexandre Julliard : gdi32: Merge rectangles horizontally when possible in CreatePolyPolygonRgn.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: b67f39ccc6ea4b366e4a839f64d72d5200518a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67f39ccc6ea4b366e4a839f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:02:45 2021 +0100 gdi32: Merge rectangles horizontally when possible in CreatePolyPolygonRgn. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50539 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index fba2e125731..b3764b31442 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2613,12 +2613,15 @@ static void scan_convert( WINEREGION *obj, EdgeTable *ET, INT mode, const RECT * { obj->rects[obj->numRects].left = active->bres.minor_axis; obj->rects[obj->numRects].top = y; + obj->rects[obj->numRects].bottom = y + 1; } else if (obj->rects[obj->numRects].left != active->bres.minor_axis) { - obj->rects[obj->numRects].right = active->bres.minor_axis; - obj->rects[obj->numRects].bottom = y + 1; - obj->numRects++; + /* create new rect only if we can't merge with the previous one */ + if (!obj->numRects || obj->rects[obj->numRects-1].top != y || + obj->rects[obj->numRects-1].right < obj->rects[obj->numRects].left) + obj->numRects++; + obj->rects[obj->numRects-1].right = active->bres.minor_axis; } first = !first; }

1 0

Zebediah Figura : server: Use default_fd_get_poll_events() for file objects.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 70d12630716f1edf28f555abdd2ea306711140d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d12630716f1edf28f555ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 18:16:41 2021 -0600 server: Use default_fd_get_poll_events() for file objects. This avoids sending the server into a busy-loop when trying to perform an asynchronous read from a non-regular file (say, a FIFO). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/server/file.c b/server/file.c index 2cc4a9d978c..fd8e3f96033 100644 --- a/server/file.c +++ b/server/file.c @@ -75,7 +75,6 @@ static struct object *file_open_file( struct object *obj, unsigned int access, static struct list *file_get_kernel_obj_list( struct object *obj ); static void file_destroy( struct object *obj ); -static int file_get_poll_events( struct fd *fd ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -104,7 +103,7 @@ static const struct object_ops file_ops = static const struct fd_ops file_fd_ops = { - file_get_poll_events, /* get_poll_events */ + default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ file_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ @@ -287,16 +286,6 @@ struct object_type *file_get_type( struct object *obj ) return get_object_type( &str ); } -static int file_get_poll_events( struct fd *fd ) -{ - struct file *file = get_fd_user( fd ); - int events = 0; - assert( file->obj.ops == &file_ops ); - if (file->access & FILE_UNIX_READ_ACCESS) events |= POLLIN; - if (file->access & FILE_UNIX_WRITE_ACCESS) events |= POLLOUT; - return events; -} - static enum server_fd_type file_get_fd_type( struct fd *fd ) { struct file *file = get_fd_user( fd );

1 0

Zebediah Figura : server: Avoid leaking "acceptsock" on allocation failure.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: fe11ff87ac8918f5e5104cccccb5544d9c6c30c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe11ff87ac8918f5e5104ccc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 18:16:42 2021 -0600 server: Avoid leaking "acceptsock" on allocation failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 5f207e7f180..8c146a0a8f8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1473,7 +1473,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - if (!(req = alloc_accept_req( acceptsock, async, params ))) return 0; + if (!(req = alloc_accept_req( acceptsock, async, params ))) + { + release_object( acceptsock ); + return 0; + } list_add_tail( &sock->accept_list, &req->entry ); acceptsock->accept_recv_req = req; release_object( acceptsock );

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
48
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 January 2021