February 2018 - Wine-Commits

Michael Stefaniuc : schedsvc: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: f3b18e68a52a0bd8f921cd4b7e3f259d1a693bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b18e68a52a0bd8f921cd4b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:53 2018 +0100 schedsvc: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index b426078..4404486 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -19,30 +19,11 @@ #ifndef __WINE_SCHEDSVC_PRIVATE_H__ #define __WINE_SCHEDSVC_PRIVATE_H__ +#include "wine/heap.h" #include "wine/unicode.h" void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW(const WCHAR *src) { WCHAR *dst;

1 0

Józef Kucia : libs/vkd3d-shader: Use vkd3d_dxbc_compiler_get_constant_float_vector() in more places.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: vkd3d Branch: master Commit: 8d2c59dd350e9ff2b8e93b2f85c3d7e59a5a965e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d2c59dd350e9ff2b8e93b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 4 23:58:28 2018 +0100 libs/vkd3d-shader: Use vkd3d_dxbc_compiler_get_constant_float_vector() in more places. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5d310bf..8a45676 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2614,17 +2614,12 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { - static const float zero[] = {0.0f, 0.0f, 0.0f, 0.0f}; - static const float one[] = {1.0f, 1.0f, 1.0f, 1.0f}; - unsigned int component_count = vkd3d_write_mask_component_count(write_mask); struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, one_id; - zero_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_FLOAT, component_count, (const uint32_t *)zero); - one_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_FLOAT, component_count, (const uint32_t *)one); + zero_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 0.0f, component_count); + one_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 1.0f, component_count); type_id = vkd3d_spirv_get_type_id(builder, vkd3d_component_type_from_data_type(reg->data_type), component_count);

1 0

Józef Kucia : libs/vkd3d-shader: Add initial support for arrayed shader inputs.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: vkd3d Branch: master Commit: 6f2ca74904d067001be1cef6c8189da1ee0130d7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6f2ca74904d067001be1cef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 4 23:58:26 2018 +0100 libs/vkd3d-shader: Add initial support for arrayed shader inputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 116 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 88 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6f2ca74904d067001be…

1 0

Józef Kucia : tests: Add test for geometry shaders.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: vkd3d Branch: master Commit: c634e8f56ab03fe7756bb5c8ac431adf0bfe9340 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c634e8f56ab03fe7756bb5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 4 23:58:27 2018 +0100 tests: Add test for geometry shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 2 +- tests/d3d12.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 271 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c634e8f56ab03fe7756…

1 0

Józef Kucia : libs/vkd3d-shader: Emit InvocationId for geometry and tessellation shaders.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: vkd3d Branch: master Commit: 0ecbdbe8230f52fc9893b60f067476213ba0d4f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0ecbdbe8230f52fc9893b60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 4 23:58:25 2018 +0100 libs/vkd3d-shader: Emit InvocationId for geometry and tessellation shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 331b619..8f6147a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1557,7 +1557,9 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re switch (reg->type) { case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_GSINSTID: case VKD3DSPR_LOCALTHREADINDEX: + case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: return true; default: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c0d1725..b2a9c98 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2779,6 +2779,9 @@ vkd3d_spirv_builtin_table[] = {VKD3D_SIV_NONE, VKD3DSPR_LOCALTHREADINDEX, VKD3D_TYPE_INT, 1, SpvBuiltInLocalInvocationIndex}, {VKD3D_SIV_NONE, VKD3DSPR_THREADGROUPID, VKD3D_TYPE_INT, 3, SpvBuiltInWorkgroupId}, + {VKD3D_SIV_NONE, VKD3DSPR_GSINSTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, + {VKD3D_SIV_NONE, VKD3DSPR_OUTPOINTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, + {VKD3D_SIV_NONE, VKD3DSPR_DEPTHOUT, VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}, {VKD3D_SIV_POSITION, ~0u, VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition},

1 0

Józef Kucia : libs/vkd3d-shader: Translate dcl_gs_instances instructions.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: vkd3d Branch: master Commit: f7cace8216a4657fd5b962317333c131fff37538 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f7cace8216a4657fd5b9623… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 4 23:58:24 2018 +0100 libs/vkd3d-shader: Translate dcl_gs_instances instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ac638e9..c0d1725 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3639,6 +3639,13 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_dcl_gs_instances(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + vkd3d_dxbc_compiler_emit_execution_mode1(compiler, + SpvExecutionModeInvocations, instruction->declaration.count); +} + static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5576,6 +5583,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DCL_OUTPUT_TOPOLOGY: vkd3d_dxbc_compiler_emit_dcl_output_topology(compiler, instruction); break; + case VKD3DSIH_DCL_GS_INSTANCES: + vkd3d_dxbc_compiler_emit_dcl_gs_instances(compiler, instruction); + break; case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break;

1 0

Józef Kucia : libs/vkd3d-shader: Translate geometry shader "cut" instructions.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: vkd3d Branch: master Commit: f6c708a3cc34b248e06d05ea8525244da8e6fc06 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f6c708a3cc34b248e06d05e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 4 23:58:23 2018 +0100 libs/vkd3d-shader: Translate geometry shader "cut" instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ca0beb8..ac638e9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1400,6 +1400,11 @@ static void vkd3d_spirv_build_op_emit_vertex(struct vkd3d_spirv_builder *builder return vkd3d_spirv_build_op(&builder->function_stream, SpvOpEmitVertex); } +static void vkd3d_spirv_build_op_end_primitive(struct vkd3d_spirv_builder *builder) +{ + return vkd3d_spirv_build_op(&builder->function_stream, SpvOpEndPrimitive); +} + static void vkd3d_spirv_build_op_control_barrier(struct vkd3d_spirv_builder *builder, uint32_t execution_id, uint32_t memory_id, uint32_t memory_semantics_id) { @@ -5458,6 +5463,26 @@ static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *com vkd3d_spirv_build_op_emit_vertex(builder); } +static void vkd3d_dxbc_compiler_emit_cut_stream(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int stream_idx; + + if (instruction->handler_idx == VKD3DSIH_CUT_STREAM) + stream_idx = instruction->src[0].reg.idx[0].offset; + else + stream_idx = 0; + + if (stream_idx) + { + FIXME("Multiple streams are not supported yet.\n"); + return; + } + + vkd3d_spirv_build_op_end_primitive(builder); +} + /* This function is called after declarations are processed. */ static void vkd3d_dxbc_compiler_emit_main_prolog(struct vkd3d_dxbc_compiler *compiler) { @@ -5720,6 +5745,10 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_EMIT_STREAM: vkd3d_dxbc_compiler_emit_emit_stream(compiler, instruction); break; + case VKD3DSIH_CUT: + case VKD3DSIH_CUT_STREAM: + vkd3d_dxbc_compiler_emit_cut_stream(compiler, instruction); + break; case VKD3DSIH_NOP: break; default:

1 0

Józef Kucia : libs/vkd3d-shader: Translate dcl_input_siv instructions.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: vkd3d Branch: master Commit: d97e32d035969a507fd007e86982c560c7e77bb7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d97e32d035969a507fd007e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 4 23:58:22 2018 +0100 libs/vkd3d-shader: Translate dcl_input_siv instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f984e62..ca0beb8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3542,7 +3542,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); } -static void vkd3d_dxbc_compiler_emit_dcl_input_sgv(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_dcl_input_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, @@ -5530,7 +5530,8 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(compiler, instruction); break; case VKD3DSIH_DCL_INPUT_SGV: - vkd3d_dxbc_compiler_emit_dcl_input_sgv(compiler, instruction); + case VKD3DSIH_DCL_INPUT_SIV: + vkd3d_dxbc_compiler_emit_dcl_input_sysval(compiler, instruction); break; case VKD3DSIH_DCL_OUTPUT: vkd3d_dxbc_compiler_emit_dcl_output(compiler, instruction);

1 0

Francois Gouget : testbot: Better handle the database connections in case of a fork().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: tools Branch: master Commit: e50547eedef1906bd1959ec6e01b88ab16f52513 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e50547eedef1906bd1959ec… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 5 01:31:24 2018 +0100 testbot: Better handle the database connections in case of a fork(). Make sure AutoInactiveDestroy is set. This will prevent a mere stray fork()+exit() from breaking the parent's DBI connection. Also stop using DBI::disconnect() as this bypasses the InactiveDestroy setting, such that calling it in a child process will break the parent's DBI connection. DBI connections are automatically closed in the appropriate way their destructor when they get out of scope. These two changes allow us to close the DBI connections in the child process (which don't need them anyway), rather than breaking the connections before the fork() and thus forcing the parent to reconnect. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 +++--- testbot/lib/ObjectModel/DBIBackEnd.pm | 21 ++++++++++----------- testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index d637564..7e278ba 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,9 +309,6 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connections - CloseAllDBBackEnds(); - my $Pid = fork; if (!defined $Pid) { @@ -319,7 +316,10 @@ sub HandleJobStatusChange($$$) } elsif (!$Pid) { + # Clean up the child environment + CloseAllDBBackEnds(); WineTestBot::Log::SetupRedirects(); + exec("$BinDir/${ProjectName}SendLog.pl $JobKey") or LogMsg "Unable to exec ${ProjectName}SendLog.pl: $!\n"; exit(1); diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 5567203..60e68d8 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -45,14 +45,11 @@ sub GetDb($) { my ($self) = @_; - if (defined $self->{Db} && !$self->{Db}->ping()) + if (!$self->{Db} or !$self->{Db}->ping()) { - # This connection no longer works, probably due to the database idle timeout - $self->{Db}->disconnect(); + # We don't have a connection yet, or it no longer works (probably due to + # the database idle timeout). $self->{Db} = undef; - } - if (!defined $self->{Db}) - { while (1) { # Protect this call so we can retry in case RaiseError is set @@ -597,11 +594,9 @@ sub Close($) { my ($self) = @_; - if (defined($self->{Db})) - { - $self->{Db}->disconnect(); - $self->{Db} = undef; - } + # The connection will be automatically closed. In a child process this + # will automatically do the right thing thanks to AutoInactiveDestroy. + $self->{Db} = undef; } sub UseDBIBackEnd($$$$$$) @@ -610,9 +605,13 @@ sub UseDBIBackEnd($$$$$$) # The implementation assumes AutoCommit is on. $DbArgs->{AutoCommit} = 1; + # Make sure AutoInactiveDestroy is set so the database connection is not + # broken if we fork() (including if it's behind our back). + $DbArgs->{AutoInactiveDestroy} = 1; my $BackEnd = $class->new(); $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; AddDBBackEnd($DbSelector, $BackEnd); } + 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index bb9a832..d893e49 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,9 +344,6 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connections - CloseAllDBBackEnds(); - use Fcntl; my ($fd_read, $fd_write); pipe($fd_read, $fd_write); # For synchronization @@ -378,6 +375,9 @@ sub Run($$$$$) return undef; } + # Close the database connections + CloseAllDBBackEnds(); + # Wait for the parent to set $VM->ChildPid close($fd_write); sysread($fd_read, $fd_write, 1); @@ -389,6 +389,7 @@ sub Run($$$$$) require WineTestBot::VMs; my $VM = WineTestBot::VMs::CreateVMs()->GetItem($self->GetKey()); exit 1 if (($VM->ChildPid || 0) != $$); + # Close the database connection we just opened $self->GetBackEnd()->Close(); require WineTestBot::Log;

1 0

Alexandre Julliard : Wine release 3.1
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: website Branch: master Commit: 6e98931ca5540a75c2ab3f9def98c378b33144b4 URL: https://source.winehq.org/git/website.git/?a=commit;h=6e98931ca5540a75c2ab3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 19:24:56 2018 +0100 Wine release 3.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018020201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018020201.xml b/news/en/2018020201.xml new file mode 100644 index 0000000..5b2edc8 --- /dev/null +++ b/news/en/2018020201.xml @@ -0,0 +1,16 @@ +<news> +<date>February 2, 2018</date> +<title>Wine 3.1 Released</title> +<body> + The Wine development release 3.1 is now available. + <a href="{$root}/announce/3.1">What's new</a> in this release: +<ul> + <li>Kerberos authentication support.</li> + <li>Window class redirection for Common Controls 6.</li> + <li>Support for X11 ARGB visuals.</li> + <li>DOSBox required for running DOS executables.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Józef Kucia : d3d11/tests: Cleanup viewport offsets in test_fractional_viewports().
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 6ae0756eba258277900a39d3839c30a20a87f313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ae0756eba258277900a39d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 14:35:17 2018 +0100 d3d11/tests: Cleanup viewport offsets in test_fractional_viewports(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 18b7f48..4fe8110 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -23010,8 +23010,8 @@ static void test_fractional_viewports(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float viewport_offsets[] = { - 0.0f, 0.5f, 0.25f, 0.125f, 0.0625f, 0.03125f, 0.015625f, 0.0078125f, 0.00390625f, - 1.0f / 128.0f, 63.0f / 128.0f, + 0.0f, 1.0f / 2.0f, 1.0f / 4.0f, 1.0f / 8.0f, 1.0f / 16.0f, 1.0f / 32.0f, + 1.0f / 64.0f, 1.0f / 128.0f, 1.0f / 256.0f, 63.0f / 128.0f, }; if (!init_test_context(&test_context, &feature_level))

1 0

Józef Kucia : d3d11/tests: Print adapter information.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: c7941b59330c2e70f081b60ab4c4d836d75e9029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7941b59330c2e70f081b60a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 14:35:19 2018 +0100 d3d11/tests: Print adapter information. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2b0a577..c0cb9a2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1109,6 +1109,20 @@ static void get_device_adapter_desc(ID3D11Device *device, DXGI_ADAPTER_DESC *ada IDXGIAdapter_Release(adapter); } +static void print_adapter_info(void) +{ + DXGI_ADAPTER_DESC adapter_desc; + ID3D11Device *device; + + if (!(device = create_device(NULL))) + return; + + get_device_adapter_desc(device, &adapter_desc); + trace("Adapter: %s, %04x:%04x.\n", wine_dbgstr_w(adapter_desc.Description), + adapter_desc.VendorId, adapter_desc.DeviceId); + ID3D11Device_Release(device); +} + static BOOL is_warp_device(ID3D11Device *device) { DXGI_ADAPTER_DESC adapter_desc; @@ -24802,6 +24816,8 @@ START_TEST(d3d11) use_adapter_idx = atoi(argv[++i]); } + print_adapter_info(); + test_create_device(); run_for_each_feature_level(test_device_interfaces); test_get_immediate_context();

1 0

Piotr Caban : msvcr100: Use scoped_lock internal buffer when locking critical_section.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: f042c4ea4a3bcf211288fe69ed6014687995e1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f042c4ea4a3bcf211288fe69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:18 2018 +0100 msvcr100: Use scoped_lock internal buffer when locking critical_section. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 4b862b6..6bcd66a 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -358,32 +358,38 @@ static inline void cs_set_head(critical_section *cs, cs_queue *q) cs->head = &cs->unk_active; } -/* ?lock(a)critical_section@Concurrency@@QAEXXZ */ -/* ?lock(a)critical_section@Concurrency@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) -void __thiscall critical_section_lock(critical_section *this) +static inline void cs_lock(critical_section *cs, cs_queue *q) { - cs_queue q, *last; - - TRACE("(%p)\n", this); + cs_queue *last; - if(this->unk_thread_id == GetCurrentThreadId()) + if(cs->unk_thread_id == GetCurrentThreadId()) throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); - memset(&q, 0, sizeof(q)); - last = InterlockedExchangePointer(&this->tail, &q); + memset(q, 0, sizeof(*q)); + last = InterlockedExchangePointer(&cs->tail, q); if(last) { - last->next = &q; - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + last->next = q; + NtWaitForKeyedEvent(keyed_event, q, 0, NULL); } - cs_set_head(this, &q); - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { - spin_wait_for_next_cs(&q); - this->unk_active.next = q.next; + cs_set_head(cs, q); + if(InterlockedCompareExchangePointer(&cs->tail, &cs->unk_active, q) != q) { + spin_wait_for_next_cs(q); + cs->unk_active.next = q->next; } } +/* ?lock(a)critical_section@Concurrency@@QAEXXZ */ +/* ?lock(a)critical_section@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) +void __thiscall critical_section_lock(critical_section *this) +{ + cs_queue q; + + TRACE("(%p)\n", this); + cs_lock(this, &q); +} + /* ?try_lock(a)critical_section@Concurrency@@QAE_NXZ */ /* ?try_lock(a)critical_section@Concurrency@@QEAA_NXZ */ DEFINE_THISCALL_WRAPPER(critical_section_try_lock, 4) @@ -503,8 +509,13 @@ MSVCRT_bool __thiscall critical_section_try_lock_for( typedef struct { critical_section *cs; - void *unknown[4]; - int unknown2[2]; + union { + cs_queue q; + struct { + void *unknown[4]; + int unknown2[2]; + } unknown; + } lock; } critical_section_scoped_lock; /* ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z */ @@ -515,7 +526,7 @@ critical_section_scoped_lock* __thiscall critical_section_scoped_lock_ctor( { TRACE("(%p %p)\n", this, cs); this->cs = cs; - critical_section_lock(this->cs); + cs_lock(this->cs, &this->lock.q); return this; }

1 0

Alexandre Julliard : comdlg32: Correctly initialize the item dialog structure.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 908fa3eb8d59af2249d144a7f1b8925f97ce8e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=908fa3eb8d59af2249d144a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 15:40:36 2018 +0100 comdlg32: Correctly initialize the item dialog structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 3096017..8aaaa21 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -4597,7 +4597,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p if(pUnkOuter) return CLASS_E_NOAGGREGATION; - fdimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(FileDialogImpl)); + fdimpl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FileDialogImpl)); if(!fdimpl) return E_OUTOFMEMORY; @@ -4628,27 +4628,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->custom_okbutton = StrDupW(buf); } - fdimpl->filterspecs = NULL; - fdimpl->filterspec_count = 0; - fdimpl->filetypeindex = 0; - - fdimpl->psia_selection = fdimpl->psia_results = NULL; - fdimpl->psi_setfolder = fdimpl->psi_folder = NULL; - list_init(&fdimpl->events_clients); - fdimpl->events_next_cookie = 0; - - fdimpl->dlg_hwnd = NULL; - fdimpl->peb = NULL; - - fdimpl->set_filename = NULL; - fdimpl->default_ext = NULL; - fdimpl->custom_cancelbutton = fdimpl->custom_filenamelabel = NULL; - - fdimpl->client_guid = GUID_NULL; - - fdimpl->hmenu_opendropdown = NULL; - fdimpl->hfont_opendropdown = NULL; /* FIXME: The default folder setting should be restored for the * application if it was previously set. */

1 0

Piotr Caban : msvcr100: Add _ReentrantPPLLock class implementation.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 7419eff0c21d912293e74aabbc87958a96e4f4ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7419eff0c21d912293e74aab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:26 2018 +0100 msvcr100: Add _ReentrantPPLLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 12 ++++----- dlls/msvcr100/msvcr100.spec | 12 ++++----- dlls/msvcr110/msvcr110.spec | 18 ++++++------- dlls/msvcr120/msvcr120.spec | 18 ++++++------- dlls/msvcr120_app/msvcr120_app.spec | 18 ++++++------- dlls/msvcrt/lock.c | 52 +++++++++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7419eff0c21d912293e7…

1 0

Zebediah Figura : user32: Kill focus before minimizing a window.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 9b2dd2db6ac44ed02cbe04673646ace15fda758a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b2dd2db6ac44ed02cbe0467… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 30 19:56:24 2018 -0600 user32: Kill focus before minimizing a window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9cf4ed3..7be83571 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10072,6 +10071,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10115,6 +10121,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10124,6 +10135,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 10f0fd0..c1b55b5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,6 +983,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition );

1 0

Andrey Gusev : api-ms-win-security-lsalookup-l2-1-0: Add dll.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 636d6a60e838ee190eeea9b63b081fedc66519ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=636d6a60e838ee190eeea9b6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 2 12:09:12 2018 +0200 api-ms-win-security-lsalookup-l2-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l2-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index b891454..3e7feec 100755 --- a/configure +++ b/configure @@ -1067,6 +1067,7 @@ enable_api_ms_win_security_credentials_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 +enable_api_ms_win_security_lsalookup_l2_1_0 enable_api_ms_win_security_lsalookup_l2_1_1 enable_api_ms_win_security_lsapolicy_l1_1_0 enable_api_ms_win_security_provider_l1_1_0 @@ -18497,6 +18498,7 @@ wine_fn_config_dll api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_secu wine_fn_config_dll api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 +wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-0 enable_api_ms_win_security_lsalookup_l2_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 wine_fn_config_dll api-ms-win-security-lsapolicy-l1-1-0 enable_api_ms_win_security_lsapolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-provider-l1-1-0 enable_api_ms_win_security_provider_l1_1_0 diff --git a/configure.ac b/configure.ac index 8b48d2e..23f297b 100644 --- a/configure.ac +++ b/configure.ac @@ -2980,6 +2980,7 @@ WINE_CONFIG_DLL(api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsapolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-provider-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in new file mode 100644 index 0000000..cf41467 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l2-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec new file mode 100644 index 0000000..25b2939 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW +@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW +@ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW +@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/tools/make_specfiles b/tools/make_specfiles index 4dae97f..e5b2617 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -129,6 +129,7 @@ my @dll_groups = "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", + "api-ms-win-security-lsalookup-l2-1-0", "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-lsapolicy-l1-1-0", "api-ms-win-security-provider-l1-1-0",

1 0

Alex Henrie : gameux/tests: Drop game stats test workarounds for Windows < = 2000.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: ef08793472b4889d539cc6147a46908c1ca4398e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef08793472b4889d539cc614… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 1 23:51:58 2018 -0700 gameux/tests: Drop game stats test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/Makefile.in | 2 +- dlls/gameux/tests/gamestatistics.c | 29 +---------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in index c90132d..7b3f2f9 100644 --- a/dlls/gameux/tests/Makefile.in +++ b/dlls/gameux/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gameux.dll -IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 +IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 shell32 C_SRCS = \ gameexplorer.c \ diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index dd9bd37..ff247fc 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -32,25 +32,6 @@ */ static WCHAR sExeName[MAX_PATH] = {0}; static GUID gameInstanceId; -static HRESULT WINAPI (*pSHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); -/******************************************************************************* - *_loadDynamicRoutines - * - * Helper function, prepares pointers to system procedures which may be not - * available on older operating systems. - * - * Returns: - * TRUE procedures were loaded successfully - * FALSE procedures were not loaded successfully - */ -static BOOL _loadDynamicRoutines(void) -{ - HMODULE hModule = LoadLibraryA( "shell32.dll" ); - - pSHGetFolderPathW = (LPVOID)GetProcAddress(hModule, "SHGetFolderPathW"); - if (!pSHGetFolderPathW) return FALSE; - return TRUE; -} /******************************************************************************* * Registers test suite executable as game in Games Explorer. Required to test @@ -117,7 +98,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta HRESULT hr; WCHAR sGuid[49], sPath[MAX_PATH]; - hr = pSHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); + hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); if(SUCCEEDED(hr)) hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); @@ -396,14 +377,6 @@ START_TEST(gamestatistics) IGameStatisticsMgr* gsm; IGameExplorer *ge; - if (!_loadDynamicRoutines()) - { - /* this is not a failure, because a procedure loaded by address - * is always available on systems which has gameux.dll */ - win_skip("too old system, cannot load required dynamic procedures\n"); - return; - } - hr = CoInitialize( NULL ); ok(hr == S_OK, "failed to init COM\n");

1 0

Andrey Gusev : api-ms-win-core-shutdown-l1-1-0: Add dll.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: b65ea16159cb1b6d5614d9e007bb7ad4d5d14248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65ea16159cb1b6d5614d9e0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 2 12:08:49 2018 +0200 api-ms-win-core-shutdown-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-shutdown-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 3818f68..b891454 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 +enable_api_ms_win_core_shutdown_l1_1_0 enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 @@ -18408,6 +18409,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-1-0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-2-0 enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 +wine_fn_config_dll api-ms-win-core-shutdown-l1-1-0 enable_api_ms_win_core_shutdown_l1_1_0 wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_sidebyside_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 diff --git a/configure.ac b/configure.ac index 2d2b7be..8b48d2e 100644 --- a/configure.ac +++ b/configure.ac @@ -2892,6 +2892,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-shutdown-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) diff --git a/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in b/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in new file mode 100644 index 0000000..f51a519 --- /dev/null +++ b/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-shutdown-l1-1-0.dll diff --git a/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec b/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec new file mode 100644 index 0000000..3f353e5 --- /dev/null +++ b/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall AbortSystemShutdownW(ptr) advapi32.AbortSystemShutdownW +@ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) advapi32.InitiateSystemShutdownExW diff --git a/tools/make_specfiles b/tools/make_specfiles index 417cf50..4dae97f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -116,6 +116,7 @@ my @dll_groups = "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", "api-ms-win-core-registry-l2-1-0", + "api-ms-win-core-shutdown-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0", "api-ms-win-eventing-controller-l1-1-0",

1 0

Piotr Caban : msvcr100: Add _NonReentrantPPLLock class implementation.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 8d105ac7c27428fe9f599711c7061e369f515d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d105ac7c27428fe9f599711… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:22 2018 +0100 msvcr100: Add _NonReentrantPPLLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 6bcd66a..03b9aee 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -549,7 +549,9 @@ typedef struct DEFINE_THISCALL_WRAPPER(_NonReentrantPPLLock_ctor, 4) _NonReentrantPPLLock* __thiscall _NonReentrantPPLLock_ctor(_NonReentrantPPLLock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + critical_section_ctor(&this->cs); return this; } @@ -558,7 +560,8 @@ _NonReentrantPPLLock* __thiscall _NonReentrantPPLLock_ctor(_NonReentrantPPLLock DEFINE_THISCALL_WRAPPER(_NonReentrantPPLLock__Acquire, 8) void __thiscall _NonReentrantPPLLock__Acquire(_NonReentrantPPLLock *this, cs_queue *q) { - FIXME("(%p %p) stub\n", this, q); + TRACE("(%p %p)\n", this, q); + cs_lock(&this->cs, q); } /* ?_Release(a)_NonReentrantPPLLock@details(a)Concurrency@@QAEXXZ */ @@ -566,7 +569,8 @@ void __thiscall _NonReentrantPPLLock__Acquire(_NonReentrantPPLLock *this, cs_que DEFINE_THISCALL_WRAPPER(_NonReentrantPPLLock__Release, 4) void __thiscall _NonReentrantPPLLock__Release(_NonReentrantPPLLock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + critical_section_unlock(&this->cs); } /* ?_GetConcurrency(a)details@Concurrency@@YAIXZ */

1 0

Piotr Caban : msvcr100: Add _NonReentrantPPLLock@details class stub.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: a672732476ad237b9967b8a61ffb735c8609baa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a672732476ad237b9967b8a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:12 2018 +0100 msvcr100: Add _NonReentrantPPLLock(a)details class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 18 +++++++++--------- dlls/msvcr120/msvcr120.spec | 18 +++++++++--------- dlls/msvcr120_app/msvcr120_app.spec | 18 +++++++++--------- dlls/msvcrt/lock.c | 30 ++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a672732476ad237b9967…

1 0

Józef Kucia : d3d11/tests: Add option to use selected adapter.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 5f46f8f05b59d29d764a7032d0d38e3e78d6f3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f46f8f05b59d29d764a7032… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 14:35:18 2018 +0100 d3d11/tests: Add option to use selected adapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/Makefile.in | 2 +- dlls/d3d11/tests/d3d11.c | 76 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/Makefile.in b/dlls/d3d11/tests/Makefile.in index ac95e2e..9612bb3 100644 --- a/dlls/d3d11/tests/Makefile.in +++ b/dlls/d3d11/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d11.dll -IMPORTS = d3d11 user32 gdi32 +IMPORTS = d3d11 dxgi user32 gdi32 C_SRCS = \ d3d11.c diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4fe8110..2b0a577 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1004,6 +1004,48 @@ static void check_texture_uvec4_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } +static BOOL use_warp_adapter; +static unsigned int use_adapter_idx; + +static IDXGIAdapter *create_adapter(void) +{ + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + if (!use_warp_adapter && !use_adapter_idx) + return NULL; + + if (FAILED(hr = CreateDXGIFactory1(&IID_IDXGIFactory, (void **)&factory))) + { + trace("Failed to create IDXGIFactory, hr %#x.\n", hr); + return NULL; + } + + adapter = NULL; + if (use_warp_adapter) + { + if (SUCCEEDED(hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4))) + { + hr = IDXGIFactory4_EnumWarpAdapter(factory4, &IID_IDXGIAdapter, (void **)&adapter); + IDXGIFactory4_Release(factory4); + } + else + { + trace("Failed to get IDXGIFactory4, hr %#x.\n", hr); + } + } + else + { + hr = IDXGIFactory_EnumAdapters(factory, use_adapter_idx, &adapter); + } + IDXGIFactory_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} + static ID3D11Device *create_device(const struct device_desc *desc) { static const D3D_FEATURE_LEVEL default_feature_level[] = @@ -1015,7 +1057,9 @@ static ID3D11Device *create_device(const struct device_desc *desc) const D3D_FEATURE_LEVEL *feature_level; UINT flags = desc ? desc->flags : 0; unsigned int feature_level_count; + IDXGIAdapter *adapter; ID3D11Device *device; + HRESULT hr; if (desc && desc->feature_level) { @@ -1028,14 +1072,22 @@ static ID3D11Device *create_device(const struct device_desc *desc) feature_level_count = ARRAY_SIZE(default_feature_level); } - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, - D3D11_SDK_VERSION, &device, NULL, NULL))) + if ((adapter = create_adapter())) + { + hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL); + IDXGIAdapter_Release(adapter); + return SUCCEEDED(hr) ? device : NULL; + } + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, - D3D11_SDK_VERSION, &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, - D3D11_SDK_VERSION, &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; return NULL; @@ -24738,6 +24790,18 @@ static void test_generate_mips(void) START_TEST(d3d11) { + unsigned int argc, i; + char **argv; + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_adapter = TRUE; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + test_create_device(); run_for_each_feature_level(test_device_interfaces); test_get_immediate_context();

1 0

Henri Verbeet : wined3d: Use the resource access flags in wined3d_texture_unload().
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 2420d37a9dea52c7605c2343f272995bc5d7f792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2420d37a9dea52c7605c2343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:51 2018 +0330 wined3d: Use the resource access flags in wined3d_texture_unload(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 03cf027..5007696 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1803,7 +1803,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; - if (resource->pool != WINED3D_POOL_DEFAULT + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU && wined3d_texture_load_location(texture, i, context, resource->map_binding)) { wined3d_texture_invalidate_location(texture, i, ~resource->map_binding); @@ -1812,9 +1812,11 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { /* We should only get here on device reset/teardown for implicit * resources. */ - if (resource->pool != WINED3D_POOL_DEFAULT || resource->type != WINED3D_RTYPE_TEXTURE_2D) - ERR("Discarding %s %p sub-resource %u in the %s pool.\n", debug_d3dresourcetype(resource->type), - resource, i, debug_d3dpool(resource->pool)); + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU + || resource->type != WINED3D_RTYPE_TEXTURE_2D) + ERR("Discarding %s %p sub-resource %u with resource access %s.\n", + debug_d3dresourcetype(resource->type), resource, i, + wined3d_debug_resource_access(resource->access)); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); }

1 0

Alexandre Julliard : Release 3.1.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: f9181daa1ddc2c10d3b6ddd4610bc1421cfd0f42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9181daa1ddc2c10d3b6ddd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 19:21:44 2018 +0100 Release 3.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 812 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 479 insertions(+), 355 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9181daa1ddc2c10d3b6…

1 0

Tag wine-3.1 : Alexandre Julliard : Release 3.1
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: refs/tags/wine-3.1 Tag: 2be61d81e0fd3f4f501ce1389e7155f5a300e9e1 URL: https://source.winehq.org/git/wine.git/?a=tag;h=2be61d81e0fd3f4f501ce1389e7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 19:21:44 2018 +0100 Release 3.1

1 0

Henri Verbeet : wined3d: Use the resource access flags in texture_resource_sub_resource_map().
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: def836347688e772baf52e2bc8b9930a2e38d078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=def836347688e772baf52e2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:52 2018 +0330 wined3d: Use the resource access flags in texture_resource_sub_resource_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5007696..e480a22 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1872,7 +1872,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour if (box && FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) { WARN("Map box is invalid.\n"); - if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && resource->pool == WINED3D_POOL_DEFAULT) + if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) || resource->type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : wined3d: Use the resource access flags in wined3d_texture_set_lod().
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: e6909c8f5008b16c7917dcac1c8be83b3fff6776 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6909c8f5008b16c7917dcac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:50 2018 +0330 wined3d: Use the resource access flags in wined3d_texture_set_lod(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f166c2a..03cf027 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1095,9 +1095,10 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) /* The d3d9:texture test shows that SetLOD is ignored on non-managed * textures. The call always returns 0, and GetLOD always returns 0. */ - if (texture->resource.pool != WINED3D_POOL_MANAGED) + if (!wined3d_resource_access_is_managed(texture->resource.access)) { - TRACE("Ignoring SetLOD on %s texture, returning 0.\n", debug_d3dpool(texture->resource.pool)); + TRACE("Ignoring LOD on texture with resource access %s.\n", + wined3d_debug_resource_access(texture->resource.access)); return 0; }

1 0

Henri Verbeet : wined3d: Replace the pool in struct wined3d_resource_desc with resource access flags.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 9275b06cc00fbef1016f8c65be21f8d059d31fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=9275b06cc00fbef1016f8c65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:54 2018 +0330 wined3d: Replace the pool in struct wined3d_resource_desc with resource access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 6 ++++-- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 17 ++++++++++++---- dlls/d3d8/device.c | 12 ++++-------- dlls/d3d8/texture.c | 30 +++++++++------------------- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 17 ++++++++++++---- dlls/d3d9/device.c | 12 ++++-------- dlls/d3d9/texture.c | 30 +++++++++------------------- dlls/ddraw/surface.c | 11 ++++++----- dlls/dxgi/device.c | 2 +- dlls/wined3d/buffer.c | 44 ++++++++++++++++++++++++++++-------------- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/resource.c | 29 ++++------------------------ dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 23 +++++++++++----------- dlls/wined3d/utils.c | 15 -------------- dlls/wined3d/wined3d_private.h | 8 +++----- include/wine/wined3d.h | 14 +++++++------- 20 files changed, 128 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9275b06cc00fbef1016f…

1 0

Henri Verbeet : wined3d: Replace the pool in struct wined3d_sub_resource_desc with resource access flags.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 916c13c6c132edbcfc4558a779813a263d0c4e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=916c13c6c132edbcfc4558a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:53 2018 +0330 wined3d: Replace the pool in struct wined3d_sub_resource_desc with resource access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 16 ++++++++++++++++ dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 6 +++--- dlls/d3d8/volume.c | 2 +- dlls/d3d9/d3d9_private.h | 16 ++++++++++++++++ dlls/d3d9/device.c | 4 ++-- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 6 +++--- dlls/d3d9/volume.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ---- include/wine/wined3d.h | 18 +++++++++++------- 12 files changed, 56 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=916c13c6c132edbcfc45…

1 0

Nikolay Sivov : user32/tests: Add some tests for GetClassName() and versioned classes.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: be8534d3879de918f7297335ea66f5719dac00f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8534d3879de918f7297335… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 14:31:40 2018 +0300 user32/tests: Add some tests for GetClassName() and versioned classes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 88e4bfc..13d7b9d 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1211,12 +1211,15 @@ static void test_actctx_classes(void) "<windowClass>MyTestClass</windowClass>" "</file>" "</assembly>"; + static const char *testclass = "MyTestClass"; WNDCLASSA wc; ULONG_PTR cookie; HANDLE context; BOOL ret; ATOM class; HINSTANCE hinst; + char buff[64]; + HWND hwnd; create_manifest_file("main.manifest", main_manifest); context = create_test_actctx("main.manifest"); @@ -1228,29 +1231,56 @@ static void test_actctx_classes(void) memset(&wc, 0, sizeof(wc)); wc.lpfnWndProc = ClassTest_WndProc; wc.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); - wc.lpszClassName = "MyTestClass"; + wc.lpszClassName = testclass; hinst = GetModuleHandleW(0); - ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ret = GetClassInfoA(hinst, testclass, &wc); ok(!ret, "Expected failure.\n"); class = RegisterClassA(&wc); ok(class != 0, "Failed to register class.\n"); /* Class info is available by versioned and regular names. */ - ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ret = GetClassInfoA(hinst, testclass, &wc); ok(ret, "Failed to get class info.\n"); + hwnd = CreateWindowExA(0, testclass, "test", 0, 0, 0, 0, 0, 0, 0, hinst, 0); + ok(hwnd != NULL, "Failed to create a window.\n"); + + ret = GetClassNameA(hwnd, buff, sizeof(buff)); + ok(ret, "Failed to get class name.\n"); +todo_wine + ok(!strcmp(buff, testclass), "Unexpected class name.\n"); + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); ok(ret, "Failed to get class info.\n"); - ret = UnregisterClassA("MyTestClass", hinst); - ok(ret, "Failed to unregister class.\n"); + ret = UnregisterClassA(testclass, hinst); + ok(!ret, "Failed to unregister class.\n"); ret = DeactivateActCtx(0, cookie); ok(ret, "Failed to deactivate context.\n"); + ret = GetClassInfoA(hinst, testclass, &wc); + ok(!ret, "Unexpected ret val %d.\n", ret); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); + ok(ret, "Failed to get class info.\n"); + + ret = GetClassNameA(hwnd, buff, sizeof(buff)); + ok(ret, "Failed to get class name.\n"); +todo_wine + ok(!strcmp(buff, testclass), "Unexpected class name.\n"); + + DestroyWindow(hwnd); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(!ret, "Unexpected ret value %d.\n", ret); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + /* Register versioned class without active context. */ wc.lpszClassName = "4.3.2.1!MyTestClass"; class = RegisterClassA(&wc);

1 0

Hans Leidekker : kerberos: Don' t check for GSS_S_CONTINUE_NEEDED from gss_acquire_cred.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 1195f586435229ba47c73de5a5fed9758ff04412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1195f586435229ba47c73de5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 2 12:20:23 2018 +0100 kerberos: Don't check for GSS_S_CONTINUE_NEEDED from gss_acquire_cred. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 78e4e93..0345469 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -860,7 +860,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( &cred_handle, NULL, &expiry_time ); TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + if (ret == GSS_S_COMPLETE) { credhandle_gss_to_sspi( cred_handle, credential ); expirytime_gss_to_sspi( expiry_time, ts_expiry );

1 0

Dmitry Timoshkov : secur32: Print contents of LSA_STRING in traces.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: d2c22ab58e47c80c529268748709b03032b635ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c22ab58e47c80c52926874… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 2 18:22:29 2018 +0800 secur32: Print contents of LSA_STRING in traces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 3a99135..511e24a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -58,6 +58,12 @@ struct lsa_connection DWORD magic; }; +static const char *debugstr_as(const LSA_STRING *str) +{ + if (!str) return "<null>"; + return debugstr_an(str->Buffer, str->Length); +} + NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id, PVOID in_buffer, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) @@ -135,8 +141,8 @@ NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName, PVOID* ProfileBuffer, PULONG ProfileBufferLength, PLUID LogonId, PHANDLE Token, PQUOTA_LIMITS Quotas, PNTSTATUS SubStatus) { - FIXME("%p %p %d %d %p %d %p %p %p %p %p %p %p %p stub\n", LsaHandle, - OriginName, LogonType, AuthenticationPackage, + FIXME("%p %s %d %d %p %d %p %p %p %p %p %p %p %p stub\n", LsaHandle, + debugstr_as(OriginName), LogonType, AuthenticationPackage, AuthenticationInformation, AuthenticationInformationLength, LocalGroups, SourceContext, ProfileBuffer, ProfileBufferLength, LogonId, Token, Quotas, SubStatus); @@ -158,7 +164,8 @@ static NTSTATUS NTAPI lsa_DeleteLogonSession(LUID *logon_id) static NTSTATUS NTAPI lsa_AddCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key, LSA_STRING *credentials) { - FIXME("%p,%u,%p,%p: stub\n", logon_id, package_id, primary_key, credentials); + FIXME("%p,%u,%s,%s: stub\n", logon_id, package_id, + debugstr_as(primary_key), debugstr_as(credentials)); return STATUS_NOT_IMPLEMENTED; } @@ -172,7 +179,7 @@ static NTSTATUS NTAPI lsa_GetCredentials(LUID *logon_id, ULONG package_id, ULONG static NTSTATUS NTAPI lsa_DeleteCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key) { - FIXME("%p,%#x,%p: stub\n", logon_id, package_id, primary_key); + FIXME("%p,%#x,%s: stub\n", logon_id, package_id, debugstr_as(primary_key)); return STATUS_NOT_IMPLEMENTED; } @@ -859,7 +866,7 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, { ULONG i; - TRACE("%p %p %p\n", lsa_handle, package_name, package_id); + TRACE("%p %s %p\n", lsa_handle, debugstr_as(package_name), package_id); for (i = 0; i < loaded_packages_count; i++) {

1 0

Alexandre Julliard : kernel32: Remove support for vm86 exceptions.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: d8454f9231116f10b4e969d052c6ae6049b5c762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8454f9231116f10b4e969d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:53:21 2018 +0100 kernel32: Remove support for vm86 exceptions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/except.c | 10 ---------- include/wine/exception.h | 7 ------- 2 files changed, 17 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 1a1521a..2a9f0f1 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -143,16 +143,6 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in case EXCEPTION_WINE_ASSERTION: len = snprintf( buffer, size, "Assertion failed" ); break; - case EXCEPTION_VM86_INTx: - len = snprintf( buffer, size, "Unhandled interrupt %02lx in vm86 mode", - rec->ExceptionInformation[0]); - break; - case EXCEPTION_VM86_STI: - len = snprintf( buffer, size, "Unhandled sti in vm86 mode"); - break; - case EXCEPTION_VM86_PICRETURN: - len = snprintf( buffer, size, "Unhandled PIC return in vm86 mode"); - break; default: len = snprintf( buffer, size, "Unhandled exception 0x%08x in thread %x", rec->ExceptionCode, GetCurrentThreadId()); break; diff --git a/include/wine/exception.h b/include/wine/exception.h index 3b1a3cf..e93968f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -303,13 +303,6 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ #define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ -/* unhandled return status from vm86 mode */ -#define EXCEPTION_VM86_INTx 0x80000110 -#define EXCEPTION_VM86_STI 0x80000111 -#define EXCEPTION_VM86_PICRETURN 0x80000112 - -extern void __wine_enter_vm86( CONTEXT *context ); - #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : comctl32/imagelist: Use HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 3b3c25e17d9bc04adec7a7db5800a4532f42bc3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3c25e17d9bc04adec7a7db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:42 2018 +0300 comctl32/imagelist: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 53 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 71145ed..608d853 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -54,6 +54,7 @@ #include "commoncontrols.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(imagelist); @@ -274,7 +275,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = bm.bmWidth; info->bmiHeader.biHeight = -height; @@ -286,17 +287,17 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - if (!(bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!(bits = heap_alloc( info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmImage, 0, height, bits, info, DIB_RGB_COLORS )) goto done; if (hbmMask) { - if (!(mask_info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) + if (!(mask_info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) goto done; mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mask_info->bmiHeader.biSizeImage ))) + if (!(mask_bits = heap_alloc_zero( mask_info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; } @@ -305,10 +306,10 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, ret = TRUE; done: - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, mask_info ); - HeapFree( GetProcessHeap(), 0, bits ); - HeapFree( GetProcessHeap(), 0, mask_bits ); + heap_free( info ); + heap_free( mask_info ); + heap_free( bits ); + heap_free( mask_bits ); return ret; } @@ -391,7 +392,7 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) if (new_alpha) himl->has_alpha = new_alpha; else { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + heap_free( himl->has_alpha ); himl->has_alpha = NULL; } } @@ -862,7 +863,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, himl->hbmMask = 0; if (ilc == ILC_COLOR32) - himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); else himl->has_alpha = NULL; @@ -1270,7 +1271,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des int i, j; if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = cx; info->bmiHeader.biHeight = cy; @@ -1353,7 +1354,7 @@ done: DeleteDC( hdc ); if (bmp) DeleteObject( bmp ); if (mask) DeleteObject( mask ); - HeapFree( GetProcessHeap(), 0, info ); + heap_free( info ); return ret; } @@ -1971,11 +1972,11 @@ ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow, uType, uFlags); len = MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, NULL, 0); - lpbmpW = Alloc(len * sizeof(WCHAR)); + lpbmpW = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, lpbmpW, len); himl = ImageList_LoadImageW(hi, lpbmpW, cx, cGrow, clrMask, uType, uFlags); - Free (lpbmpW); + heap_free (lpbmpW); return himl; } @@ -2216,12 +2217,12 @@ static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi) if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) return NULL; - bits = Alloc(bmi->bmiHeader.biSizeImage); + bits = heap_alloc_zero(bmi->bmiHeader.biSizeImage); if (!bits) return NULL; if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) { - Free(bits); + heap_free(bits); return NULL; } return bits; @@ -2333,8 +2334,8 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) 0, 0, mask_info->bmiHeader.biWidth, mask_info->bmiHeader.biHeight, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY); } - Free( image_bits ); - Free( mask_bits ); + heap_free( image_bits ); + heap_free( mask_bits ); himl->cCurImage = ilHead.cCurImage; himl->cMaxImage = ilHead.cMaxImage; @@ -2398,8 +2399,8 @@ ImageList_Remove (HIMAGELIST himl, INT i) if (himl->has_alpha) { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); - himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + heap_free( himl->has_alpha ); + himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); } hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); @@ -2946,7 +2947,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) if (new_alpha) himl->has_alpha = new_alpha; else { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + heap_free( himl->has_alpha ); himl->has_alpha = NULL; } } @@ -3014,7 +3015,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) offBits = totalSize; totalSize += sizeImage; - data = Alloc(totalSize); + data = heap_alloc_zero(totalSize); bmfh = (LPBITMAPFILEHEADER)data; bmih = (LPBITMAPINFOHEADER)(data + sizeof(BITMAPFILEHEADER)); lpBits = data + offBits; @@ -3055,7 +3056,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) result = TRUE; failed: - Free(data); + heap_free(data); return result; } @@ -3292,8 +3293,8 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) if (This->hbrBlend50) DeleteObject (This->hbrBlend50); This->IImageList2_iface.lpVtbl = NULL; - HeapFree(GetProcessHeap(), 0, This->has_alpha); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->has_alpha); + heap_free(This); } return ref; @@ -3822,7 +3823,7 @@ static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID ii if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct _IMAGELIST)); + This = heap_alloc_zero(sizeof(struct _IMAGELIST)); if (!This) return E_OUTOFMEMORY; This->IImageList2_iface.lpVtbl = &ImageListImpl_Vtbl;

1 0

Nikolay Sivov : comctl32/header: Use HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: ff1cd359f7150146babcc2e01704095d6832e0ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff1cd359f7150146babcc2e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:40 2018 +0300 comctl32/header: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fcba262..a48530d 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -42,6 +42,7 @@ #include "vssym32.h" #include "uxtheme.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(header); @@ -141,7 +142,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (mask & HDI_TEXT) { - Free(lpItem->pszText); + heap_free(lpItem->pszText); lpItem->pszText = NULL; if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ @@ -338,7 +339,7 @@ static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) if (size > sizeof(buffer)) { - data = HeapAlloc( GetProcessHeap(), 0, size ); + data = heap_alloc( size ); if (!data) return NULL; } data->rdh.dwSize = sizeof(data->rdh); @@ -364,7 +365,7 @@ static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) data->rdh.nCount++; } rgn = ExtCreateRegion( NULL, size, data ); - if (data != (RGNDATA *)buffer) HeapFree( GetProcessHeap(), 0, data ); + if (data != (RGNDATA *)buffer) heap_free( data ); return rgn; } @@ -985,7 +986,7 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) if (mask&HDI_TEXT && lpItem->pszText != NULL) { ERR("(): function called without a call to FreeCallbackItems\n"); - Free(lpItem->pszText); + heap_free(lpItem->pszText); lpItem->pszText = NULL; } @@ -996,13 +997,13 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) { dispInfo.hdr.code = HDN_GETDISPINFOW; if (mask & HDI_TEXT) - pvBuffer = Alloc(MAX_HEADER_TEXT_LEN * sizeof(WCHAR)); + pvBuffer = heap_alloc_zero(MAX_HEADER_TEXT_LEN * sizeof(WCHAR)); } else { dispInfo.hdr.code = HDN_GETDISPINFOA; if (mask & HDI_TEXT) - pvBuffer = Alloc(MAX_HEADER_TEXT_LEN * sizeof(CHAR)); + pvBuffer = heap_alloc_zero(MAX_HEADER_TEXT_LEN * sizeof(CHAR)); } dispInfo.pszText = pvBuffer; dispInfo.cchTextMax = (pvBuffer!=NULL?MAX_HEADER_TEXT_LEN:0); @@ -1033,7 +1034,7 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) else { Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)dispInfo.pszText); - Free(pvBuffer); + heap_free(pvBuffer); } } @@ -1059,7 +1060,7 @@ HEADER_FreeCallbackItems(HEADER_ITEM *lpItem) { if (lpItem->callbackMask&HDI_TEXT) { - Free(lpItem->pszText); + heap_free(lpItem->pszText); lpItem->pszText = NULL; } @@ -1181,15 +1182,15 @@ HEADER_DeleteItem (HEADER_INFO *infoPtr, INT iItem) TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); iOrder = infoPtr->items[iItem].iOrder; - Free(infoPtr->items[iItem].pszText); + heap_free(infoPtr->items[iItem].pszText); infoPtr->uNumItem--; memmove(&infoPtr->items[iItem], &infoPtr->items[iItem + 1], (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], (infoPtr->uNumItem - iOrder) * sizeof(INT)); - infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); - infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + infoPtr->items = heap_realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = heap_realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); /* Correct the orders */ for (i = 0; i < infoPtr->uNumItem; i++) @@ -1419,8 +1420,8 @@ HEADER_InsertItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL b iOrder = infoPtr->uNumItem; infoPtr->uNumItem++; - infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); - infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + infoPtr->items = heap_realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = heap_realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); /* make space for the new item */ memmove(&infoPtr->items[nItem + 1], &infoPtr->items[nItem], @@ -1539,8 +1540,8 @@ HEADER_SetItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL bUni HEADER_CopyHDItemForNotify(infoPtr, &hdNotify, phdi, bUnicode, &pvScratch); if (HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCHANGINGW, nItem, &hdNotify)) { - Free(pvScratch); - return FALSE; + heap_free(pvScratch); + return FALSE; } lpItem = &infoPtr->items[nItem]; @@ -1556,7 +1557,7 @@ HEADER_SetItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL bUni InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - Free(pvScratch); + heap_free(pvScratch); return TRUE; } @@ -1579,7 +1580,7 @@ HEADER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) HFONT hOldFont; HDC hdc; - infoPtr = Alloc (sizeof(HEADER_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwndSelf = hwnd; @@ -1633,16 +1634,15 @@ HEADER_NCDestroy (HEADER_INFO *infoPtr) if (infoPtr->items) { lpItem = infoPtr->items; - for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) { - Free(lpItem->pszText); - } - Free (infoPtr->items); + for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) + heap_free(lpItem->pszText); + heap_free(infoPtr->items); } - Free(infoPtr->order); + heap_free(infoPtr->order); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - Free (infoPtr); + heap_free(infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/treeview: Use HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: d886eda2e8d6f202622e8da0004669ca3eaa0714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d886eda2e8d6f202622e8da0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:39 2018 +0300 comctl32/treeview: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 7713efb..56c53fc 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -64,6 +64,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(treeview); @@ -552,7 +553,7 @@ TREEVIEW_TVItemFromItem(const TREEVIEW_INFO *infoPtr, UINT mask, TVITEMW *tvItem if (!infoPtr->bNtfUnicode) { tvItem->cchTextMax = WideCharToMultiByte( CP_ACP, 0, item->pszText, -1, NULL, 0, NULL, NULL ); - tvItem->pszText = Alloc (tvItem->cchTextMax); + tvItem->pszText = heap_alloc (tvItem->cchTextMax); WideCharToMultiByte( CP_ACP, 0, item->pszText, -1, (LPSTR)tvItem->pszText, tvItem->cchTextMax, 0, 0 ); } else @@ -593,8 +594,8 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { - Free(nmhdr.itemOld.pszText); - Free(nmhdr.itemNew.pszText); + heap_free(nmhdr.itemOld.pszText); + heap_free(nmhdr.itemNew.pszText); } return ret; } @@ -693,7 +694,7 @@ TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editI ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr); if (!infoPtr->bNtfUnicode) - Free(tvdi.item.pszText); + heap_free(tvdi.item.pszText); return ret; } @@ -739,7 +740,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, (LPSTR)callback.item.pszText, -1, NULL, 0); buflen = max((len)*sizeof(WCHAR), TEXT_CALLBACK_SIZE); - newText = ReAlloc(item->pszText, buflen); + newText = heap_realloc(item->pszText, buflen); TRACE("returned str %s, len=%d, buflen=%d\n", debugstr_a((LPSTR)callback.item.pszText), len, buflen); @@ -752,12 +753,12 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, item->pszText, buflen/sizeof(WCHAR)); item->cchTextMax = buflen/sizeof(WCHAR); } - /* If ReAlloc fails we have nothing to do, but keep original text */ + /* If realloc fails we have nothing to do, but keep original text */ } else { int len = max(lstrlenW(callback.item.pszText) + 1, TEXT_CALLBACK_SIZE); - LPWSTR newText = ReAlloc(item->pszText, len); + LPWSTR newText = heap_realloc(item->pszText, len); TRACE("returned wstr %s, len=%d\n", debugstr_w(callback.item.pszText), len); @@ -768,7 +769,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, strcpyW(item->pszText, callback.item.pszText); item->cchTextMax = len; } - /* If ReAlloc fails we have nothing to do, but keep original text */ + /* If realloc fails we have nothing to do, but keep original text */ } } else if (mask & TVIF_TEXT) { @@ -780,7 +781,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, (LPSTR)callback.item.pszText, -1, NULL, 0); buflen = max((len)*sizeof(WCHAR), TEXT_CALLBACK_SIZE); - newText = Alloc(buflen); + newText = heap_alloc(buflen); TRACE("same buffer str %s, len=%d, buflen=%d\n", debugstr_a((LPSTR)callback.item.pszText), len, buflen); @@ -793,7 +794,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, (LPSTR)callback.item.pszText, -1, item->pszText, buflen/sizeof(WCHAR)); item->cchTextMax = buflen/sizeof(WCHAR); - Free(oldText); + heap_free(oldText); } } } @@ -1001,7 +1002,7 @@ TREEVIEW_UpdateSubTree(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *root) static TREEVIEW_ITEM * TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) { - TREEVIEW_ITEM *newItem = Alloc(sizeof(TREEVIEW_ITEM)); + TREEVIEW_ITEM *newItem = heap_alloc_zero(sizeof(*newItem)); if (!newItem) return NULL; @@ -1017,8 +1018,8 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { - Free(newItem); - return NULL; + heap_free(newItem); + return NULL; } return newItem; @@ -1042,7 +1043,7 @@ TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->dropItem = NULL; if (infoPtr->insertMarkItem == item) infoPtr->insertMarkItem = NULL; - Free(item); + heap_free(item); } @@ -1133,7 +1134,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)tvItem->pszText, -1, NULL, 0); - newText = ReAlloc(item->pszText, len * sizeof(WCHAR)); + newText = heap_realloc(item->pszText, len * sizeof(WCHAR)); if (newText == NULL) return FALSE; @@ -1151,10 +1152,8 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, } else { - callbackSet |= TVIF_TEXT; - - item->pszText = ReAlloc(item->pszText, - TEXT_CALLBACK_SIZE * sizeof(WCHAR)); + callbackSet |= TVIF_TEXT; + item->pszText = heap_realloc(item->pszText, TEXT_CALLBACK_SIZE * sizeof(WCHAR)); item->cchTextMax = TEXT_CALLBACK_SIZE; TRACE("setting callback, item %p\n", item); } @@ -1499,7 +1498,7 @@ TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->uNumItems--; if (item->pszText != LPSTR_TEXTCALLBACKW) - Free(item->pszText); + heap_free(item->pszText); TREEVIEW_FreeItem(infoPtr, item); } @@ -4031,18 +4030,18 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!infoPtr->bNtfUnicode) { DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, NULL, 0 ); - newText = Alloc(len * sizeof(WCHAR)); + newText = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, newText, len ); iLength = len - 1; } if (strcmpW(newText, editedItem->pszText) != 0) { - WCHAR *ptr = ReAlloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); + WCHAR *ptr = heap_realloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); if (ptr == NULL) { ERR("OutOfMemory, cannot allocate space for label\n"); - if(newText != tmpText) Free(newText); + if (newText != tmpText) heap_free(newText); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; infoPtr->editItem = NULL; @@ -4056,7 +4055,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) TREEVIEW_ComputeTextWidth(infoPtr, editedItem, 0); } } - if(newText != tmpText) Free(newText); + if (newText != tmpText) heap_free(newText); } ShowWindow(infoPtr->hwndEdit, SW_HIDE); @@ -5078,7 +5077,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); - infoPtr = Alloc(sizeof(TREEVIEW_INFO)); + infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO)); if (infoPtr == NULL) { @@ -5203,7 +5202,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) DeleteObject(infoPtr->hUnderlineFont); DeleteObject(infoPtr->hBoldUnderlineFont); DestroyWindow(infoPtr->hwndToolTip); - Free(infoPtr); + heap_free(infoPtr); return 0; }

1 0

Hans Leidekker : kerberos: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 51a0b4ebb110645a9bd578c04dd574f87f56ccc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a0b4ebb110645a9bd578c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 2 12:20:25 2018 +0100 kerberos: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index d2280e5..8b5b612 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -43,6 +43,7 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" +#include "wine/heap.h" #include "wine/library.h" #include "wine/debug.h" @@ -106,21 +107,6 @@ MAKE_FUNCPTR(krb5_free_unparsed_name); MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR -static inline void *heap_alloc(SIZE_T size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void *heap_realloc(void *p, SIZE_T size) -{ - return HeapReAlloc(GetProcessHeap(), 0, p, size); -} - -static inline void heap_free(void *p) -{ - HeapFree(GetProcessHeap(), 0, p); -} - static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -757,7 +743,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam gss_buffer_desc buf; buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; - if (!(buf.value = HeapAlloc( GetProcessHeap(), 0, buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(buf.value = heap_alloc( buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); buf.length--; @@ -765,7 +751,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - HeapFree( GetProcessHeap(), 0, buf.value ); + heap_free( buf.value ); return status_gss_to_sspi( ret ); }

1 0

Zebediah Figura : user32/tests: Flush events after test_ShowWindow().
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 0741d193ffef9e05668dd4a3eedcf55f063b7c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0741d193ffef9e05668dd4a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 1 18:36:54 2018 -0600 user32/tests: Flush events after test_ShowWindow(). The test minimizes windows, which triggers most window managers to generate focus events on other windows. These events aren't processed until halfway through the next test, test_EnableWindow(), when a message loop is run, and as a result an unexpected window (usually hwndMain) is activated, causing the test to fail. The testbot uses focus-follows-mouse mode, so these focus events were not triggered, thereby causing a success inside the todo block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f492ecc..9cf4ed3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6780,6 +6780,8 @@ static void test_ShowWindow(void) ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); + + flush_events(TRUE); } static DWORD CALLBACK enablewindow_thread(LPVOID arg) @@ -6834,8 +6836,7 @@ static void test_EnableWindow(void) } ok(!IsWindowEnabled(hwnd), "window should not be enabled\n"); - todo_wine - check_active_state(hwnd, hwnd, hwnd); + check_active_state(hwnd, hwnd, hwnd); ok(0 == GetCapture(), "GetCapture() = %p\n", GetCapture()); CloseHandle(hthread);

1 0

Nikolay Sivov : comctl32/hotkey: Use HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: fee6ec8cf3d2cad4d8d0896256794056e37379f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee6ec8cf3d2cad4d8d08962… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:41 2018 +0300 comctl32/hotkey: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/hotkey.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index a6b3486..7c3bff7 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -38,6 +38,7 @@ #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(hotkey); @@ -241,7 +242,7 @@ HOTKEY_Destroy (HOTKEY_INFO *infoPtr) { /* free hotkey info data */ SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - Free (infoPtr); + heap_free (infoPtr); return 0; } @@ -410,7 +411,7 @@ HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) dwExStyle | WS_EX_CLIENTEDGE); /* allocate memory for info structure */ - infoPtr = Alloc (sizeof(HOTKEY_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */

1 0

Nikolay Sivov : comctl32/updown: Use HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: db261c31cec141be51826f4c4a9fdfe1a4499664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db261c31cec141be51826f4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:38 2018 +0300 comctl32/updown: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/updown.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 67b646d..b75df4f 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -42,6 +42,7 @@ #include "comctl32.h" #include "uxtheme.h" #include "vssym32.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -920,7 +921,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L { CREATESTRUCTW *pcs = (CREATESTRUCTW*)lParam; - infoPtr = Alloc (sizeof(UPDOWN_INFO)); + infoPtr = heap_alloc_zero(sizeof(*infoPtr)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize the info struct */ @@ -953,9 +954,9 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case WM_DESTROY: - Free (infoPtr->AccelVect); + heap_free (infoPtr->AccelVect); UPDOWN_ResetSubclass (infoPtr); - Free (infoPtr); + heap_free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme); @@ -1080,13 +1081,13 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L TRACE("UDM_SETACCEL\n"); if(infoPtr->AccelVect) { - Free (infoPtr->AccelVect); + heap_free (infoPtr->AccelVect); infoPtr->AccelCount = 0; infoPtr->AccelVect = 0; } if(wParam==0) return TRUE; - infoPtr->AccelVect = Alloc (wParam*sizeof(UDACCEL)); - if(infoPtr->AccelVect == 0) return FALSE; + infoPtr->AccelVect = heap_alloc(wParam*sizeof(UDACCEL)); + if(!infoPtr->AccelVect) return FALSE; memcpy(infoPtr->AccelVect, (void*)lParam, wParam*sizeof(UDACCEL)); infoPtr->AccelCount = wParam;

1 0

Alexandre Julliard : krnl386: Remove support for DOS devices and event handling.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 5ec544959632d63ad50175885503cc78f6ed6c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec544959632d63ad5017588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 10:50:48 2018 +0100 krnl386: Remove support for DOS devices and event handling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 5 - dlls/krnl386.exe16/dosdev.c | 489 -------------------------------------- dlls/krnl386.exe16/dosexe.h | 126 ---------- dlls/krnl386.exe16/dosvm.c | 221 ----------------- dlls/krnl386.exe16/instr.c | 6 - dlls/krnl386.exe16/int09.c | 244 ------------------- dlls/krnl386.exe16/int16.c | 215 ----------------- dlls/krnl386.exe16/int21.c | 184 ++------------ dlls/krnl386.exe16/int2f.c | 57 ----- dlls/krnl386.exe16/int31.c | 119 +--------- dlls/krnl386.exe16/int33.c | 367 ---------------------------- dlls/krnl386.exe16/interrupts.c | 112 +-------- dlls/krnl386.exe16/ioports.c | 3 - dlls/krnl386.exe16/soundblaster.c | 6 +- dlls/krnl386.exe16/timer.c | 74 ------ dlls/krnl386.exe16/wowthunk.c | 113 --------- 16 files changed, 30 insertions(+), 2311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ec544959632d63ad501…

1 0

Alexandre Julliard : krnl386: Remove support for VGA emulation.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 33b2d8521c916e1d5c9201adc8e52507bedb7d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33b2d8521c916e1d5c9201ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:43:25 2018 +0100 krnl386: Remove support for VGA emulation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 4 +- dlls/krnl386.exe16/dosexe.h | 4 - dlls/krnl386.exe16/int10.c | 1462 ---------------------------- dlls/krnl386.exe16/int21.c | 2 - dlls/krnl386.exe16/interrupts.c | 17 +- dlls/krnl386.exe16/ioports.c | 86 -- dlls/krnl386.exe16/vga.c | 1999 --------------------------------------- dlls/krnl386.exe16/vga.h | 97 -- 8 files changed, 3 insertions(+), 3668 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33b2d8521c916e1d5c92…

1 0

Hans Leidekker : kerberos: Fix parameter check in kerberos_SpUnsealMessage.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: e1bef53ebb7f82364aaf1eeb3345fad3dc195703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bef53ebb7f82364aaf1eeb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 2 12:20:24 2018 +0100 kerberos: Fix parameter check in kerberos_SpUnsealMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0345469..d2280e5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1339,7 +1339,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); - if (context) return SEC_E_INVALID_HANDLE; + if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN;

1 0

Nikolay Sivov : comctl32/edit: Fix replacement text trace.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: e0883d8f3f5518e7fe2bd3216e978ab0488d6360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0883d8f3f5518e7fe2bd321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:41:15 2018 +0300 comctl32/edit: Fix replacement text trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 5b6773e..a01b75b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2434,7 +2434,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", - debugstr_w(lpsz_replace), can_undo, send_update); + debugstr_wn(lpsz_replace, strl), can_undo, send_update); s = es->selection_start; e = es->selection_end;

1 0

Alexandre Julliard : winedbg: Remove support for vm86 exceptions.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 39b1384e78e24d39e750ae74bee9e255a45633c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b1384e78e24d39e750ae74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:53:09 2018 +0100 winedbg: Remove support for vm86 exceptions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c1de158..83341c0 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -930,15 +930,6 @@ void info_win32_exception(void) case EXCEPTION_WINE_ASSERTION: dbg_printf("assertion failed"); break; - case EXCEPTION_VM86_INTx: - dbg_printf("interrupt %02lx in vm86 mode", rec->ExceptionInformation[0]); - break; - case EXCEPTION_VM86_STI: - dbg_printf("sti in vm86 mode"); - break; - case EXCEPTION_VM86_PICRETURN: - dbg_printf("PIC return in vm86 mode"); - break; case EXCEPTION_FLT_DENORMAL_OPERAND: dbg_printf("denormal float operand"); break;

1 0

Michael Stefaniuc : oleacc: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: f9e47ff5e03ae568dea436f4c3305e6bc301d271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e47ff5e03ae568dea436f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:57 2018 +0100 oleacc: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 1 + dlls/oleacc/oleacc_private.h | 10 ---------- dlls/oleacc/window.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index ddaa89d..5b1f0ee 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -22,6 +22,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc); diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 06e3ba6..32561ef 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -23,13 +23,3 @@ HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 64d7167..32c19fd 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -22,6 +22,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc);

1 0

Nikolay Sivov : comctl32/edit: Merge theming logic.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: a9d4b9870d4ff9d446ceba7f3fc1aedbefbe37e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9d4b9870d4ff9d446ceba7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:41:14 2018 +0300 comctl32/edit: Merge theming logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/edit.c | 170 ++++++++++++++++++++++++++++++++------------- dlls/comctl32/theme_edit.c | 134 ----------------------------------- dlls/comctl32/theming.c | 3 - 4 files changed, 121 insertions(+), 187 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9d4b9870d4ff9d446ce…

1 0

Michael Stefaniuc : odbccp32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 0c7863d9e985df1cacebce6de26dd53fed5f8f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7863d9e985df1cacebce6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:55 2018 +0100 odbccp32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index fce3fcd..f9a2269 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -31,6 +31,7 @@ #include "winnls.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "odbcinst.h" @@ -84,16 +85,6 @@ static void clear_errors(void) num_errors = 0; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupAtoW(const char *str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : ole32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: f38ddaec6fa9b5258a8dde5869893dfc6b7f4edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38ddaec6fa9b5258a8dde58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:56 2018 +0100 ole32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0f10a7c..9e65c3e 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -30,6 +30,7 @@ #include <stdarg.h> #include "wine/list.h" +#include "wine/heap.h" #include "windef.h" #include "winbase.h" @@ -259,7 +260,7 @@ void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; static inline struct oletls *COM_CurrentInfo(void) { if (!NtCurrentTeb()->ReservedForOle) - NtCurrentTeb()->ReservedForOle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct oletls)); + NtCurrentTeb()->ReservedForOle = heap_alloc_zero(sizeof(struct oletls)); return NtCurrentTeb()->ReservedForOle; } @@ -323,16 +324,6 @@ extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) { *dst = *src;

1 0

Michael Stefaniuc : msvcrt: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: caf0d0f5fd09280711fd2367d849d88f2585839d URL: https://source.winehq.org/git/wine.git/?a=commit;h=caf0d0f5fd09280711fd2367… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:52 2018 +0100 msvcrt: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 1 + dlls/msvcrt/msvcrt.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index b8b8672..583e429 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "wine/heap.h" #include "msvcrt.h" #include "cppexcept.h" #include "mtdll.h" diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a380613..65ced6d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1429,20 +1429,5 @@ typedef struct { _FPIEEE_VALUE Result; } _FPIEEE_RECORD, *_PFPIEEE_RECORD; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #define INHERIT_THREAD_PRIORITY 0xF000 #endif /* __WINE_MSVCRT_H */

1 0

Michael Stefaniuc : netprofm: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: ffb80476499123c6c66c25454dc14de0bb755faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb80476499123c6c66c2545… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:54 2018 +0100 netprofm: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index e28be12..f6823f0 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -38,21 +38,12 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "netprofm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(netprofm); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - struct network { INetwork INetwork_iface;

1 0

Józef Kucia : libs/vkd3d-shader: Use our own SPIR-V generator ID.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: vkd3d Branch: master Commit: be8e10e12e3333b493b44f8216ea2c7b2ed1b75a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be8e10e12e3333b493b44f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 15:39:22 2018 +0100 libs/vkd3d-shader: Use our own SPIR-V generator ID. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d92b7b1..6eb1537 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -87,6 +87,10 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} #endif /* HAVE_SPIRV_TOOLS */ +#define VKD3D_SPIRV_GENERATOR_ID 18 +#define VKD3D_SPIRV_GENERATOR_VERSION 0 +#define VKD3D_SPIRV_GENERATOR_MAGIC ((VKD3D_SPIRV_GENERATOR_ID << 16) | VKD3D_SPIRV_GENERATOR_VERSION) + struct vkd3d_spirv_stream { uint32_t *words; @@ -1535,7 +1539,7 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_word(&stream, SpvMagicNumber); vkd3d_spirv_build_word(&stream, SpvVersion); - vkd3d_spirv_build_word(&stream, 0); /* generator */ + vkd3d_spirv_build_word(&stream, VKD3D_SPIRV_GENERATOR_MAGIC); vkd3d_spirv_build_word(&stream, builder->current_id); /* bound */ vkd3d_spirv_build_word(&stream, 0); /* schema, reserved */

1 0

Józef Kucia : libs/vkd3d: Add support for device parent.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: vkd3d Branch: master Commit: 372bd56ade17481e6b169154335292fc7e1ce821 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=372bd56ade17481e6b16915… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 15:39:21 2018 +0100 libs/vkd3d: Add support for device parent. In order to hold a reference to IDXGIAdapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 2 ++ libs/vkd3d/device.c | 12 +++++++ libs/vkd3d/vkd3d.map | 1 + libs/vkd3d/vkd3d_private.h | 1 + tests/vkd3d_api.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index 8f2c9b5..32e8123 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -69,6 +69,7 @@ struct vkd3d_device_create_info const char * const *device_extensions; uint32_t device_extension_count; + IUnknown *parent; LUID adapter_luid; }; @@ -84,6 +85,7 @@ ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device); +IUnknown *vkd3d_get_device_parent(ID3D12Device *device); VkDevice vkd3d_get_vk_device(ID3D12Device *device); VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8658014..c59ba87 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1216,6 +1216,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); d3d12_device_destroy_vkd3d_queues(device); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); + if (device->parent) + IUnknown_Release(device->parent); vkd3d_instance_decref(device->vkd3d_instance); vkd3d_free(device); @@ -2174,6 +2176,9 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, d3d12_device_init_pipeline_cache(device); + if ((device->parent = create_info->parent)) + IUnknown_AddRef(device->parent); + return S_OK; } @@ -2199,6 +2204,13 @@ HRESULT d3d12_device_create(struct vkd3d_instance *instance, return S_OK; } +IUnknown *vkd3d_get_device_parent(ID3D12Device *device) +{ + struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); + + return d3d12_device->parent; +} + VkDevice vkd3d_get_vk_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 246275b..7d0f838 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -6,6 +6,7 @@ global: vkd3d_create_image_resource; vkd3d_create_instance; vkd3d_create_root_signature_deserializer; + vkd3d_get_device_parent; vkd3d_get_vk_device; vkd3d_get_vk_format; vkd3d_get_vk_physical_device; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6913051..acf7824 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -666,6 +666,7 @@ struct d3d12_device vkd3d_create_thread_pfn create_thread; vkd3d_join_thread_pfn join_thread; + IUnknown *parent; LUID adapter_luid; }; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index fc8d985..7135737 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -24,6 +24,13 @@ #include "vkd3d_test.h" #include <vkd3d.h> +static ULONG get_refcount(void *iface) +{ + IUnknown *unk = iface; + IUnknown_AddRef(unk); + return IUnknown_Release(unk); +} + static ULONG resource_get_internal_refcount(ID3D12Resource *resource) { vkd3d_resource_incref(resource); @@ -561,6 +568,87 @@ static void test_adapter_luid(void) ok(!refcount, "Device has %u references left.\n", refcount); } +struct parent +{ + IUnknown IUnknown_iface; + LONG refcount; +}; + +static struct parent *parent_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct parent, IUnknown_iface); +} + +static HRESULT STDMETHODCALLTYPE parent_QueryInterface(IUnknown *iface, + REFIID iid, void **object) +{ + if (IsEqualGUID(iid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + ok(false, "Unexpected QueryInterface() call.\n"); + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE parent_AddRef(IUnknown *iface) +{ + struct parent *parent = parent_from_IUnknown(iface); + + return InterlockedIncrement(&parent->refcount); +} + +static ULONG STDMETHODCALLTYPE parent_Release(IUnknown *iface) +{ + struct parent *parent = parent_from_IUnknown(iface); + + return InterlockedDecrement(&parent->refcount); +} + +static const struct IUnknownVtbl parent_vtbl = +{ + parent_QueryInterface, + parent_AddRef, + parent_Release, +}; + +static void test_device_parent(void) +{ + struct vkd3d_device_create_info create_info; + struct parent parent_impl; + ID3D12Device *device; + IUnknown *unknown; + IUnknown *parent; + ULONG refcount; + HRESULT hr; + + parent_impl.IUnknown_iface.lpVtbl = &parent_vtbl; + parent_impl.refcount = 1; + parent = &parent_impl.IUnknown_iface; + + refcount = get_refcount(parent); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + create_info = device_default_create_info; + create_info.parent = parent; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + + refcount = get_refcount(parent); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + + unknown = vkd3d_get_device_parent(device); + ok(unknown == parent, "Got device parent %p, expected %p.\n", unknown, parent); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + refcount = get_refcount(parent); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); +} + static void test_vkd3d_queue(void) { ID3D12CommandQueue *direct_queue, *compute_queue, *copy_queue; @@ -666,6 +754,7 @@ START_TEST(vkd3d_api) run_test(test_additional_device_extensions); run_test(test_physical_device); run_test(test_adapter_luid); + run_test(test_device_parent); run_test(test_vkd3d_queue); run_test(test_resource_internal_refcount); }

1 0

Józef Kucia : libs/vkd3d-shader: Force public enums to 32-bit values.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: vkd3d Branch: master Commit: 367e55cd597a108ca14761ab54b20275a183fa68 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=367e55cd597a108ca14761a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 15:39:23 2018 +0100 libs/vkd3d-shader: Force public enums to 32-bit values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 26 +++++++++++++++++++------- libs/vkd3d-shader/spirv.c | 6 +++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 52b1b9e..48b5189 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -25,21 +25,25 @@ extern "C" { #endif /* __cplusplus */ +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + enum vkd3d_shader_compiler_option { VKD3D_SHADER_STRIP_DEBUG = 0x00000001, - VKD3D_SHADER_COMPILER_OPTIONS_FORCE_32_BIT = 0x7fffffff, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILER_OPTION), }; enum vkd3d_shader_visibility { - VKD3D_SHADER_VISIBILITY_ALL, - VKD3D_SHADER_VISIBILITY_VERTEX, - VKD3D_SHADER_VISIBILITY_HULL, - VKD3D_SHADER_VISIBILITY_DOMAIN, - VKD3D_SHADER_VISIBILITY_GEOMETRY, - VKD3D_SHADER_VISIBILITY_PIXEL, + VKD3D_SHADER_VISIBILITY_ALL = 0, + VKD3D_SHADER_VISIBILITY_VERTEX = 1, + VKD3D_SHADER_VISIBILITY_HULL = 2, + VKD3D_SHADER_VISIBILITY_DOMAIN = 3, + VKD3D_SHADER_VISIBILITY_GEOMETRY = 4, + VKD3D_SHADER_VISIBILITY_PIXEL = 5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), }; struct vkd3d_shader_code @@ -55,6 +59,8 @@ enum vkd3d_shader_descriptor_type VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, /* t# */ VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, /* u# */ VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, /* s# */ + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_TYPE), }; struct vkd3d_shader_descriptor_binding @@ -119,6 +125,8 @@ void vkd3d_shader_free_root_signature(D3D12_ROOT_SIGNATURE_DESC *root_signature) enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; HRESULT vkd3d_shader_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature, @@ -143,6 +151,8 @@ enum vkd3d_component_type VKD3D_TYPE_FLOAT = 3, VKD3D_TYPE_BOOL, VKD3D_TYPE_COUNT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_COMPONENT_TYPE), }; enum vkd3d_sysval_semantic @@ -163,6 +173,8 @@ enum vkd3d_sysval_semantic VKD3D_SV_TESS_FACTOR_TRIINT = 14, VKD3D_SV_TESS_FACTOR_LINEDET = 15, VKD3D_SV_TESS_FACTOR_LINEDEN = 16, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SYSVAL_SEMANTIC), }; struct vkd3d_shader_signature_element diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6eb1537..f984e62 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1919,10 +1919,10 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compil return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY; case VKD3D_SHADER_VISIBILITY_PIXEL: return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL; + default: + ERR("Invalid shader visibility %#x.\n", visibility); + return false; } - - ERR("Invalid shader visibility %#x.\n", visibility); - return false; } static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer(

1 0

Francois Gouget : testbot: Don't rely on the DBI defaults.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: tools Branch: master Commit: b8437d575fde8ad84f48bcabfbc034f7e321e2e9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b8437d575fde8ad84f48bca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 2 02:43:58 2018 +0100 testbot: Don't rely on the DBI defaults. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 3 +++ testbot/lib/WineTestBot/Config.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index b5bb485..5567203 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -608,6 +608,9 @@ sub UseDBIBackEnd($$$$$$) { my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; + # The implementation assumes AutoCommit is on. + $DbArgs->{AutoCommit} = 1; + my $BackEnd = $class->new(); $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; AddDBBackEnd($DbSelector, $BackEnd); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b1024b5..9d7e200 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -122,7 +122,7 @@ if (!$::BuildEnv) require ObjectModel::DBIBackEnd; ObjectModel::DBIBackEnd->UseDBIBackEnd('WineTestBot', $DbDataSource, $DbUsername, $DbPassword, - { RaiseError => 1 }); + { PrintError => 1, RaiseError => 1}); } umask 002;

1 0

Alexandre Julliard : wineandroid: Force non-zero state on ACTION_BUTTON_RELEASE to avoid duplicate events.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 6a4fa30e4cbb714814ae1d1941004730646b1a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a4fa30e4cbb714814ae1d19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 16:06:13 2018 +0100 wineandroid: Force non-zero state on ACTION_BUTTON_RELEASE to avoid duplicate events. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 7d2049d..aff687b 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -293,6 +293,9 @@ jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, mask == AMOTION_EVENT_ACTION_BUTTON_RELEASE )) return JNI_FALSE; + /* make sure a subsequent AMOTION_EVENT_ACTION_UP is not treated as a touch event */ + if (mask == AMOTION_EVENT_ACTION_BUTTON_RELEASE) state |= 0x80000000; + prev_state = InterlockedExchange( &button_state, state ); data.type = MOTION_EVENT;

1 0

Francois Gouget : dxgi: Fix a trailing '\n' in a FIXME().
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 3000ac56edbe6dd945fd69515d69ad009bd2f76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3000ac56edbe6dd945fd6951… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 31 03:41:20 2018 +0100 dxgi: Fix a trailing '\n' in a FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 267b11b..832e2cb 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -379,7 +379,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusEvent(IDXGIFac static void STDMETHODCALLTYPE dxgi_factory_UnregisterStereoStatus(IDXGIFactory4 *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!n", iface, cookie); + FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusWindow(IDXGIFactory4 *iface,

1 0

Paul Graham : kernel32: Fix failure reporting in WritePrivateProfile* and add tests.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 39899fd11a8ff9228a587adf5e9aeaf2ded93c5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=39899fd11a8ff9228a587adf… Author: Paul Graham <development(a)omega-software.com> Date: Sat Jan 27 21:11:10 2018 +0100 kernel32: Fix failure reporting in WritePrivateProfile* and add tests. Conformance tests based on work by Fabian Maurer, with some adaptations. Signed-off-by: Paul Graham <development(a)omega-software.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 9 ++++----- dlls/kernel32/tests/profile.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index aad3ba3..721808c 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1391,7 +1391,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, SetLastError(ERROR_FILE_NOT_FOUND); } else { ret = PROFILE_SetString( section, entry, string, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } } @@ -1447,11 +1447,10 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, else if (PROFILE_Open( filename, TRUE )) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); - PROFILE_FlushFile(); } else { PROFILE_DeleteAllKeys(section); ret = TRUE; - while(*string) { + while(*string && ret) { LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (strlenW(string)+1) * sizeof(WCHAR) ); strcpyW( buf, string ); if((p = strchrW( buf, '='))) { @@ -1461,8 +1460,8 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, HeapFree( GetProcessHeap(), 0, buf ); string += strlenW(string)+1; } - PROFILE_FlushFile(); } + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1744,7 +1743,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, if (PROFILE_Open( filename, TRUE )) { ret = PROFILE_SetString( section, key, outstring, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2eb90a8..17ba124 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "windows.h" +#include "sddl.h" #define KEY "ProfileInt" #define SECTION "Test" @@ -534,6 +535,41 @@ static BOOL emptystr_ok(CHAR emptystr[MAX_PATH]) return TRUE; } +static void test_profile_directory_readonly(void) +{ + BOOL ret; + CHAR path_folder[MAX_PATH]; + CHAR path_file[MAX_PATH]; + const char *sddl_string_everyone_readonly = "D:PAI(A;;0x1200a9;;;WD)"; + SECURITY_ATTRIBUTES attributes = {0}; + char lpStruct[] = { 's', 't', 'r', 'i', 'n', 'g' }; + + attributes.nLength = sizeof(attributes); + ret = ConvertStringSecurityDescriptorToSecurityDescriptorA(sddl_string_everyone_readonly, SDDL_REVISION_1, &attributes.lpSecurityDescriptor, NULL); + ok(ret == TRUE, "ConvertStringSecurityDescriptorToSecurityDescriptor failed: %d\n", GetLastError()); + + GetTempPathA(MAX_PATH, path_folder); + lstrcatA(path_folder, "wine-test"); + + strcpy(path_file, path_folder); + lstrcatA(path_file, "\\tmp.ini"); + + ret = CreateDirectoryA(path_folder, &attributes); + ok(ret == TRUE, "CreateDirectoryA failed: %d\n", GetLastError()); + + ret = WritePrivateProfileStringA("App", "key", "string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileSectionA("App", "key=string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileStructA("App", "key", lpStruct, sizeof(lpStruct), path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = RemoveDirectoryA(path_folder); + ok(ret == TRUE, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_GetPrivateProfileString(const char *content, const char *descript) { DWORD ret, len; @@ -1132,6 +1168,7 @@ START_TEST(profile) test_profile_existing(); test_profile_delete_on_close(); test_profile_refresh(); + test_profile_directory_readonly(); test_GetPrivateProfileString( "[section1]\r\n" "name1=val1\r\n"

1 0

Józef Kucia : d3d11: Validate resource access flags for buffers and 2D textures.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: a2fe3ff066e50e8f173544ad689ec342e127f482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fe3ff066e50e8f173544ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 1 09:50:31 2018 +0100 d3d11: Validate resource access flags for buffers and 2D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 8 +++-- dlls/d3d11/d3d11_private.h | 4 +++ dlls/d3d11/texture.c | 8 +++-- dlls/d3d11/utils.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 3ccccc8..ffa95a1 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -387,8 +387,12 @@ static const struct wined3d_parent_ops d3d_buffer_wined3d_parent_ops = d3d_buffer_wined3d_object_released, }; -static BOOL validate_buffer_desc(D3D11_BUFFER_DESC *desc) +static BOOL validate_buffer_desc(D3D11_BUFFER_DESC *desc, D3D_FEATURE_LEVEL feature_level) { + if (!validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION_BUFFER, + desc->Usage, desc->BindFlags, desc->CPUAccessFlags, feature_level)) + return FALSE; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS) { if (desc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) @@ -442,7 +446,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev buffer->refcount = 1; buffer->desc = *desc; - if (!validate_buffer_desc(&buffer->desc)) + if (!validate_buffer_desc(&buffer->desc, device->feature_level)) return E_INVALIDARG; wined3d_desc.byte_width = buffer->desc.ByteWidth; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c286e76..6702248 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -83,6 +83,10 @@ UINT d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(UINT cpu_access_flags) D UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; +BOOL validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION resource_dimension, + D3D11_USAGE usage, UINT bind_flags, UINT cpu_access_flags, + D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; + HRESULT d3d_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; HRESULT d3d_set_private_data(struct wined3d_private_store *store, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 2644b52..a35a9ac 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -456,8 +456,12 @@ static BOOL is_gdi_compatible_texture(const D3D11_TEXTURE2D_DESC *desc) return TRUE; } -static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc) +static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc, D3D_FEATURE_LEVEL feature_level) { + if (!validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION_TEXTURE2D, + desc->Usage, desc->BindFlags, desc->CPUAccessFlags, feature_level)) + return FALSE; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE && desc->ArraySize < 6) { @@ -492,7 +496,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE DWORD flags = 0; HRESULT hr; - if (!validate_texture2d_desc(desc)) + if (!validate_texture2d_desc(desc, device->feature_level)) { WARN("Failed to validate texture desc.\n"); return E_INVALIDARG; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index ae761f4..b3894bb 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -610,6 +610,94 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc return d3d10_resource_misc_flags; } +static BOOL d3d11_bind_flags_are_gpu_read_only(UINT bind_flags) +{ + static const BOOL read_only_bind_flags = D3D11_BIND_VERTEX_BUFFER + | D3D11_BIND_INDEX_BUFFER | D3D11_BIND_CONSTANT_BUFFER + | D3D11_BIND_SHADER_RESOURCE; + + return !(bind_flags & ~read_only_bind_flags); +} + +BOOL validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION resource_dimension, + D3D11_USAGE usage, UINT bind_flags, UINT cpu_access_flags, D3D_FEATURE_LEVEL feature_level) +{ + const BOOL is_texture = resource_dimension != D3D11_RESOURCE_DIMENSION_BUFFER; + + switch (usage) + { + case D3D11_USAGE_DEFAULT: + if ((bind_flags == D3D11_BIND_SHADER_RESOURCE && feature_level >= D3D_FEATURE_LEVEL_11_0) + || (is_texture && bind_flags == D3D11_BIND_RENDER_TARGET) + || bind_flags == D3D11_BIND_UNORDERED_ACCESS) + break; + if (cpu_access_flags) + { + WARN("Default resources are not CPU accessible.\n"); + return FALSE; + } + break; + + case D3D11_USAGE_IMMUTABLE: + if (!bind_flags) + { + WARN("Bind flags must be non-zero for immutable resources.\n"); + return FALSE; + } + if (!d3d11_bind_flags_are_gpu_read_only(bind_flags)) + { + WARN("Immutable resources cannot be writable by GPU.\n"); + return FALSE; + } + + if (cpu_access_flags) + { + WARN("Immutable resources are not CPU accessible.\n"); + return FALSE; + } + break; + + case D3D11_USAGE_DYNAMIC: + if (!bind_flags) + { + WARN("Bind flags must be non-zero for dynamic resources.\n"); + return FALSE; + } + if (!d3d11_bind_flags_are_gpu_read_only(bind_flags)) + { + WARN("Dynamic resources cannot be writable by GPU.\n"); + return FALSE; + } + + if (cpu_access_flags != D3D11_CPU_ACCESS_WRITE) + { + WARN("CPU access must be D3D11_CPU_ACCESS_WRITE for dynamic resources.\n"); + return FALSE; + } + break; + + case D3D11_USAGE_STAGING: + if (bind_flags) + { + WARN("Invalid bind flags %#x for staging resources.\n", bind_flags); + return FALSE; + } + + if (!cpu_access_flags) + { + WARN("CPU access must be non-zero for staging resources.\n"); + return FALSE; + } + break; + + default: + WARN("Invalid usage %#x.\n", usage); + return FALSE; + } + + return TRUE; +} + struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension;

1 0

Józef Kucia : d3d11/tests: Add test for resource access flags.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 34edee9039ab48b044bc20a5e55a415762cddd57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34edee9039ab48b044bc20a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 1 09:50:32 2018 +0100 d3d11/tests: Add test for resource access flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 357 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 356 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34edee9039ab48b044bc…

1 0

Józef Kucia : d3d10core/tests: Add test for resource access flags.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 6801cc140f776ea08f3a62680bc0d4f257626346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6801cc140f776ea08f3a6268… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 1 09:50:33 2018 +0100 d3d10core/tests: Add test for resource access flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 330 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 330 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6801cc140f776ea08f3a…

1 0

Michael Stefaniuc : mshtml: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 11e706785e9dd5870e9cb892265b87382b172cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e706785e9dd5870e9cb892… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:04 2018 +0100 mshtml: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51a1add..ea38a66 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -30,6 +30,7 @@ #include "tlogstg.h" #include "shdeprecated.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/unicode.h" @@ -1176,31 +1177,11 @@ DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Alex Henrie : crypt32/tests: Drop store test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 030e4db2e459365e7c179281d9f1fb9758351123 URL: https://source.winehq.org/git/wine.git/?a=commit;h=030e4db2e459365e7c179281… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 30 11:08:15 2018 -0700 crypt32/tests: Drop store test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 340 +++++++++++++++------------------------------ 1 file changed, 111 insertions(+), 229 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=030e4db2e459365e7c17…

1 0

Zebediah Figura : dbghelp: Avoid an infinite loop.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5d740ddcfed5da981e2741610937e879b184004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d740ddcfed5da981e274161… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 31 22:03:12 2018 -0600 dbghelp: Avoid an infinite loop. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 99b5c17..67b710c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -712,6 +712,7 @@ static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr while (rtf->UnwindData & 1) /* follow chained entry */ { FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); + return NULL; /* we need to read into the other process */ /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ }

1 0

Fabian Maurer : kernel32: Add stub for ReOpenFile.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5eb13b24137d02f44cb1ef43804cb7a343340079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb13b24137d02f44cb1ef43… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jan 24 21:51:42 2018 +0100 kernel32: Add stub for ReOpenFile. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-file-l2-1-0.spec | 2 +- .../api-ms-win-core-file-l2-1-1.spec | 2 +- .../api-ms-win-core-file-l2-1-2.spec | 2 +- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec index 3c1e59c..5272d4c 100644 --- a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec +++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec @@ -6,6 +6,6 @@ @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec index 6bfcb08..9cd8689 100644 --- a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec +++ b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec @@ -7,6 +7,6 @@ @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec index bee3c05..ab6f303 100644 --- a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec +++ b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec @@ -10,5 +10,5 @@ @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 7196aff..1e5b9fe 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2820,6 +2820,16 @@ HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access return result; } +/*********************************************************************** + * ReOpenFile (KERNEL32.@) + */ +HANDLE WINAPI ReOpenFile(HANDLE handle_original, DWORD access, DWORD sharing, DWORD flags) +{ + FIXME("(%p, %d, %d, %d): stub\n", handle_original, access, sharing, flags); + + return INVALID_HANDLE_VALUE; +} + /*********************************************************************** * K32EnumDeviceDrivers (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5ce6372..1137920 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1267,7 +1267,7 @@ # @ stub RemoveLocalAlternateComputerNameW @ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) ReOpenFile @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ca33bfd..eb6edbe 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1233,7 +1233,7 @@ # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) kernel32.RaiseException # @ stub RaiseFailFastException -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA @ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA @ stub ReadConsoleInputExA

1 0

Austin English : kernel32: Add QueryProcessCycleTime stub.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: db5a57c5f203aefad7c72ed49c96875bff1a1fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=db5a57c5f203aefad7c72ed4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 30 16:29:44 2018 -0600 kernel32: Add QueryProcessCycleTime stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-realtime-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec index 9c70db1..0def2d7 100644 --- a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub QueryIdleProcessorCycleTime @ stub QueryIdleProcessorCycleTimeEx -@ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime @ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime @ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d4..5ce6372 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1171,7 +1171,7 @@ @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index fbe5811..b0b8669 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1408,6 +1408,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo } /*********************************************************************** + * QueryProcessCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryProcessCycleTime(HANDLE process, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p): stub!\n", process, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryThreadCycleTime (KERNEL32.@) */ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fc..ca33bfd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1206,7 +1206,7 @@ @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy @ stub QuerySecurityAccessMask # @ stub QueryStateAtomValueInfo

1 0

Alexandre Julliard : krnl386: Remove support for running DOS executables.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5e0fd3403e57b5f53513fc2e14a2a5b934dc8066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e0fd3403e57b5f53513fc2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 13:50:20 2018 +0100 krnl386: Remove support for running DOS executables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosexe.c | 796 ---------------------------------- dlls/krnl386.exe16/dosexe.h | 24 +- dlls/krnl386.exe16/dosvm.c | 423 +----------------- dlls/krnl386.exe16/int21.c | 104 ++--- dlls/krnl386.exe16/int31.c | 8 +- dlls/krnl386.exe16/interrupts.c | 71 +-- dlls/krnl386.exe16/krnl386.exe16.spec | 1 - dlls/krnl386.exe16/timer.c | 122 ------ dlls/krnl386.exe16/vga.c | 14 +- dlls/krnl386.exe16/wowthunk.c | 96 ++-- 11 files changed, 73 insertions(+), 1587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e0fd3403e57b5f53513…

1 0

Alexandre Julliard : ntdll: Remove support for vm86 mode.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: e7202687fc9cd0dedf65ac7a4bf0446c308f7e9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7202687fc9cd0dedf65ac7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 13:50:46 2018 +0100 ntdll: Remove support for vm86 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ntdll/ntdll.spec | 3 - dlls/ntdll/signal_arm.c | 9 -- dlls/ntdll/signal_arm64.c | 8 -- dlls/ntdll/signal_i386.c | 321 -------------------------------------------- dlls/ntdll/signal_powerpc.c | 8 -- dlls/ntdll/signal_x86_64.c | 8 -- include/config.h.in | 3 - 9 files changed, 362 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7202687fc9cd0dedf65…

1 0

Alex Henrie : include: Add CertRegisterSystemStore and CertUnregisterSystemStore.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: f0da42f7f622958b6954a1d94bcab9f30847383a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0da42f7f622958b6954a1d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 30 11:08:14 2018 -0700 include: Add CertRegisterSystemStore and CertUnregisterSystemStore. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/store.c | 2 +- include/wincrypt.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 91a3cbc..bc4ebde 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1414,7 +1414,7 @@ BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } -BOOL WINAPI CertUnregisterSystemStore(void *pvSystemStore, DWORD dwFlags) +BOOL WINAPI CertUnregisterSystemStore(const void *pvSystemStore, DWORD dwFlags) { HCERTSTORE hstore; diff --git a/include/wincrypt.h b/include/wincrypt.h index d688567..6e71fb9 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4087,6 +4087,11 @@ BOOL WINAPI CertEnumSystemStoreLocation(DWORD dwFlags, void *pvArg, BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, void *pvArg, PFN_CERT_ENUM_SYSTEM_STORE pfnEnum); +BOOL WINAPI CertRegisterSystemStore(const void *store, DWORD flags, + CERT_SYSTEM_STORE_INFO *info, void *reserved); + +BOOL WINAPI CertUnregisterSystemStore(const void *store, DWORD flags); + BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum);

1 0

Dmitry Timoshkov : secur32: Remove Kerberos SSPI stubs.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: a87b55d92e07f4ebbeb21183d85fd7e06ded0f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87b55d92e07f4ebbeb21183… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:33 2018 +0800 secur32: Remove Kerberos SSPI stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a87b55d92e07f4ebbeb2…

1 0

Dmitry Timoshkov : secur32: Implement VerifySignature in the SSP/ AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: a13576eb4200e9665b3cdf18cd3de8ed9f3457b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13576eb4200e9665b3cdf18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:17 2018 +0800 secur32: Implement VerifySignature in the SSP/AP wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 832303f..8752ba1 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -601,6 +601,27 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->VerifySignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -618,7 +639,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ NULL, /* Reserved3 */ @@ -650,7 +671,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ NULL, /* Reserved3 */

1 0

Dmitry Timoshkov : secur32: Implement EncryptMessage in the SSP/ AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 67f0b15248263c78166e24d02487c5fe344b877c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f0b15248263c78166e24d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:22 2018 +0800 secur32: Implement EncryptMessage in the SSP/AP wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 8752ba1..b89052d 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -622,6 +622,27 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); } +static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->SealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -649,7 +670,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -681,7 +702,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ };

1 0

Dmitry Timoshkov : secur32: Implement DecryptMessage in the SSP/ AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 6932541ea682172b2d8c1975e52d91fec486be19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6932541ea682172b2d8c1975… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:28 2018 +0800 secur32: Implement DecryptMessage in the SSP/AP wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index b89052d..35df4ce 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -643,6 +643,27 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->UnsealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -671,7 +692,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -703,7 +724,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesA */ };

1 0

Dmitry Timoshkov : secur32: Implement LsaFreeReturnBuffer.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 9be9415576277a8134cbdb34bd6fb04fae3a8412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be9415576277a8134cbdb34… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 14:56:15 2018 +0800 secur32: Implement LsaFreeReturnBuffer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 35df4ce..3a99135 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -113,9 +113,10 @@ NTSTATUS WINAPI LsaEnumerateLogonSessions(PULONG LogonSessionCount, return STATUS_SUCCESS; } -NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID Buffer) +NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID buffer) { - FIXME("%p stub\n", Buffer); + TRACE("%p\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); return STATUS_SUCCESS; }

1 0

Michael Stefaniuc : ieframe: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: b662f0c2ec14e29767487d10acf5cdb9837a3e09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b662f0c2ec14e29767487d10… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:41:03 2018 +0100 ieframe: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 3e6ac6c..8adf47e 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -38,6 +38,7 @@ #include "docobjectservice.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" typedef struct ConnectionPoint ConnectionPoint; @@ -334,26 +335,6 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : jscript: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: eb168bcbbfbe6e1cb420bffb17856c160524bc90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb168bcbbfbe6e1cb420bffb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:02 2018 +0100 jscript: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 756d7cf..1a24751 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -31,6 +31,7 @@ #include "resource.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" typedef struct _jsval_t jsval_t; @@ -54,26 +55,6 @@ void heap_pool_clear(heap_pool_t*) DECLSPEC_HIDDEN; void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Dmitry Timoshkov : secur32: Implement MakeSignature in the SSP/AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5df33ec591604b56499a552de7c4538bc34497e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df33ec591604b56499a552d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:12 2018 +0800 secur32: Implement MakeSignature in the SSP/AP wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 479a2d2..832303f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -580,6 +580,27 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U return SEC_E_UNSUPPORTED_FUNCTION; } +static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->MakeSignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -596,7 +617,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ @@ -628,7 +649,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */

1 0

Dmitry Timoshkov : secur32: Implement QueryContextAttributes in the SSP/ AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5480171545048e6c9894deb897297c5393777e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5480171545048e6c9894deb8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:07 2018 +0800 secur32: Implement QueryContextAttributes in the SSP/AP wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index c4f408f..479a2d2 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -526,6 +526,60 @@ static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) return lsa_package->lsa_api->DeleteContext(lsa_context); } +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpQueryContextAttributes) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); +} + +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) +{ + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { + case SECPKG_ATTR_SIZES: + return lsa_QueryContextAttributesW( context, attribute, buffer ); + +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + X(SECPKG_ATTR_NEGOTIATION_INFO); +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -539,7 +593,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -571,7 +625,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */

1 0

Dmitry Timoshkov : secur32: Implement DeleteSecurityContext in the SSP/ AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 78b7f2cfd98450c6ca18990c63461ca5a1c7bca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78b7f2cfd98450c6ca18990c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:03:54 2018 +0800 secur32: Implement DeleteSecurityContext in the SSP/AP wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 8da3a61..43b69a5 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,26 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p\n", context); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->DeleteContext(lsa_context); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -477,7 +497,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesW */ NULL, /* ImpersonateSecurityContext */ @@ -509,7 +529,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesA */ NULL, /* ImpersonateSecurityContext */

1 0

Michael Stefaniuc : jsproxy: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 4d4cc0a0951c92a7f92166a011e3bd93c177d1d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d4cc0a0951c92a7f92166a0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:03 2018 +0100 jsproxy: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index a52fbb4..d1ac903 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -51,6 +51,7 @@ #include "dispex.h" #include "activscp.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" static HINSTANCE instance; @@ -87,16 +88,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src, int len ) { WCHAR *dst = NULL;

1 0

Michael Stefaniuc : inseng: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 91f7d91f17f190d18d5f71ad8198a0839d147b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91f7d91f17f190d18d5f71ad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:01 2018 +0100 inseng: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inseng/inseng_main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index c95d2c7..93649e2 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -33,19 +33,10 @@ #include "inseng.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE instance; struct InstallEngine {

1 0

Michael Stefaniuc : inetcpl.cpl: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 16c394faab5698926da26349c0a366fd101117cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c394faab5698926da26349… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:00 2018 +0100 inetcpl.cpl: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/inetcpl.h | 19 ------------------- dlls/inetcpl.cpl/security.c | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index 4aae292..50d4bd1 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -31,25 +31,6 @@ INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - -/* ######### */ - #define NUM_PROPERTY_PAGES 8 /* icons */ diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 6d79057..543ada4 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -37,6 +37,7 @@ #include "inetcpl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);

1 0

Jacek Caban : crypt32: Always set returned size in CRYPT_CopySignerInfo.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 39ba0bbe437498ee6252694f771e686e7e7b98af URL: https://source.winehq.org/git/wine.git/?a=commit;h=39ba0bbe437498ee6252694f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:28:02 2018 +0100 crypt32: Always set returned size in CRYPT_CopySignerInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 3 +-- dlls/crypt32/tests/msg.c | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 80b2de7..fd43a7b 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2727,12 +2727,10 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); if (!pvData) { - *pcbData = size; ret = TRUE; } else if (*pcbData < size) { - *pcbData = size; SetLastError(ERROR_MORE_DATA); ret = FALSE; } @@ -2765,6 +2763,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); } } + *pcbData = size; TRACE("returning %d\n", ret); return ret; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index e9887b0..c240533 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2857,7 +2857,7 @@ static void test_decode_msg_get_param(void) HCRYPTPROV hCryptProv; HCRYPTKEY key = 0; BOOL ret; - DWORD size = 0, value; + DWORD size = 0, value, req_size; LPBYTE buf; CMSG_CTRL_DECRYPT_PARA decryptPara = { sizeof(decryptPara), 0 }; @@ -2947,7 +2947,10 @@ static void test_decode_msg_get_param(void) signer.SerialNumber.cbData = sizeof(serialNum); signer.SerialNumber.pbData = serialNum; signer.HashAlgorithm.pszObjId = oid_rsa_md5; + req_size = size; + size += 10; CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, buf, &size); + ok(size == req_size, "size = %u, expected %u\n", size, req_size); compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); CryptMemFree(buf); }

1 0

Dmitry Timoshkov : secur32: Implement AcceptSecurityContext in the SSP/ AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 904c8eb16ddb88b92085afb8d0988840eafe347d URL: https://source.winehq.org/git/wine.git/?a=commit;h=904c8eb16ddb88b92085afb8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:00 2018 +0800 secur32: Implement AcceptSecurityContext in the SSP/AP wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 43b69a5..c4f408f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,46 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( + CredHandle *credential, CtxtHandle *context, SecBufferDesc *input, + ULONG context_req, ULONG target_data_rep, CtxtHandle *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + BOOLEAN mapped_context; + + TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, + context_req, target_data_rep, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, + input, context_req, target_data_rep, &new_lsa_context, output, context_attr, + ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { struct lsa_package *lsa_package; @@ -495,7 +535,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextW, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ @@ -527,7 +567,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextA, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */

1 0

Dmitry Timoshkov : secur32: Implement InitializeSecurityContext in the SSP /AP wrapper.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 689142dd9fb8633e13d870210e43f424e569a84f URL: https://source.winehq.org/git/wine.git/?a=commit;h=689142dd9fb8633e13d87021… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:03:48 2018 +0800 secur32: Implement InitializeSecurityContext in the SSP/AP wrapper. Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1916aa4..8da3a61 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (target_name) + RtlInitUnicodeString(&target_name_us, target_name); + + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */

1 0

Nikolay Sivov : winedbg: Use longer module names when printing module list.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 1afb6d3f9945e9742cc8f5dabaa99d054c4a3eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1afb6d3f9945e9742cc8f5da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 12:08:54 2018 +0300 winedbg: Use longer module names when printing module list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 69 ++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 89a2dc4..c1de158 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -147,50 +147,61 @@ static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi) struct info_module { - IMAGEHLP_MODULE64* mi; + IMAGEHLP_MODULE64 mi; + char name[64]; +}; + +struct info_modules +{ + struct info_module *modules; unsigned num_alloc; unsigned num_used; }; -static void module_print_info(const IMAGEHLP_MODULE64* mi, BOOL is_embedded) +static void module_print_info(const struct info_module *module, BOOL is_embedded) { dbg_printf("%*.*s-%*.*s\t%-16s%s\n", - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage), - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize), - is_embedded ? "\\" : get_symtype_str(mi), mi->ModuleName); + ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage), + ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage + module->mi.ImageSize), + is_embedded ? "\\" : get_symtype_str(&module->mi), module->name); } static int module_compare(const void* p1, const void* p2) { - LONGLONG val = ((const IMAGEHLP_MODULE64*)p1)->BaseOfImage - - ((const IMAGEHLP_MODULE64*)p2)->BaseOfImage; + struct info_module *left = (struct info_module *)p1; + struct info_module *right = (struct info_module *)p2; + LONGLONG val = left->mi.BaseOfImage - right->mi.BaseOfImage; + if (val < 0) return -1; else if (val > 0) return 1; else return 0; } -static inline BOOL module_is_container(const IMAGEHLP_MODULE64* wmod_cntnr, - const IMAGEHLP_MODULE64* wmod_child) +static inline BOOL module_is_container(const struct info_module *wmod_cntnr, + const struct info_module *wmod_child) { - return wmod_cntnr->BaseOfImage <= wmod_child->BaseOfImage && - wmod_cntnr->BaseOfImage + wmod_cntnr->ImageSize >= - wmod_child->BaseOfImage + wmod_child->ImageSize; + return wmod_cntnr->mi.BaseOfImage <= wmod_child->mi.BaseOfImage && + wmod_cntnr->mi.BaseOfImage + wmod_cntnr->mi.ImageSize >= + wmod_child->mi.BaseOfImage + wmod_child->mi.ImageSize; } static BOOL CALLBACK info_mod_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) { - struct info_module* im = ctx; + struct info_modules *im = ctx; if (im->num_used + 1 > im->num_alloc) { im->num_alloc += 16; - im->mi = dbg_heap_realloc(im->mi, im->num_alloc * sizeof(*im->mi)); + im->modules = dbg_heap_realloc(im->modules, im->num_alloc * sizeof(*im->modules)); } - im->mi[im->num_used].SizeOfStruct = sizeof(im->mi[im->num_used]); - if (SymGetModuleInfo64(dbg_curr_process->handle, base, &im->mi[im->num_used])) + im->modules[im->num_used].mi.SizeOfStruct = sizeof(im->modules[im->num_used].mi); + if (SymGetModuleInfo64(dbg_curr_process->handle, base, &im->modules[im->num_used].mi)) { + const int dst_len = sizeof(im->modules[im->num_used].name); + lstrcpynA(im->modules[im->num_used].name, mod_name, dst_len - 1); + im->modules[im->num_used].name[dst_len - 1] = 0; im->num_used++; - } + } return TRUE; } @@ -201,7 +212,7 @@ static BOOL CALLBACK info_mod_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) */ void info_win32_module(DWORD64 base) { - struct info_module im; + struct info_modules im; UINT i, j, num_printed = 0; DWORD opt; @@ -211,7 +222,7 @@ void info_win32_module(DWORD64 base) return; } - im.mi = NULL; + im.modules = NULL; im.num_alloc = im.num_used = 0; /* this is a wine specific options to return also ELF modules in the @@ -221,7 +232,7 @@ void info_win32_module(DWORD64 base) SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); - qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); + qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare); dbg_printf("Module\tAddress\t\t\t%sDebug info\tName (%d modules)\n", ADDRWIDTH == 16 ? "\t\t" : "", im.num_used); @@ -229,19 +240,19 @@ void info_win32_module(DWORD64 base) for (i = 0; i < im.num_used; i++) { if (base && - (base < im.mi[i].BaseOfImage || base >= im.mi[i].BaseOfImage + im.mi[i].ImageSize)) + (base < im.modules[i].mi.BaseOfImage || base >= im.modules[i].mi.BaseOfImage + im.modules[i].mi.ImageSize)) continue; - if (strstr(im.mi[i].ModuleName, "<elf>")) + if (strstr(im.modules[i].name, "<elf>")) { dbg_printf("ELF\t"); - module_print_info(&im.mi[i], FALSE); + module_print_info(&im.modules[i], FALSE); /* print all modules embedded in this one */ for (j = 0; j < im.num_used; j++) { - if (!strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[i], &im.mi[j])) + if (!strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[i], &im.modules[j])) { dbg_printf(" \\-PE\t"); - module_print_info(&im.mi[j], TRUE); + module_print_info(&im.modules[j], TRUE); } } } @@ -250,19 +261,19 @@ void info_win32_module(DWORD64 base) /* check module is not embedded in another module */ for (j = 0; j < im.num_used; j++) { - if (strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[j], &im.mi[i])) + if (strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[j], &im.modules[i])) break; } if (j < im.num_used) continue; - if (strstr(im.mi[i].ModuleName, ".so") || strchr(im.mi[i].ModuleName, '<')) + if (strstr(im.modules[i].name, ".so") || strchr(im.modules[i].name, '<')) dbg_printf("ELF\t"); else dbg_printf("PE\t"); - module_print_info(&im.mi[i], FALSE); + module_print_info(&im.modules[i], FALSE); } num_printed++; } - HeapFree(GetProcessHeap(), 0, im.mi); + HeapFree(GetProcessHeap(), 0, im.modules); if (base && !num_printed) dbg_printf("'0x%x%08x' is not a valid module address\n", (DWORD)(base >> 32), (DWORD)base);

1 0

Nikolay Sivov : comctl32/edit: Get rid of ansi buffer.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: d16411633e8bde2c1c4b8b20439d27582be444e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d16411633e8bde2c1c4b8b20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 10:09:06 2018 +0300 comctl32/edit: Get rid of ansi buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 281 ++++++++++++++------------------------------------- 1 file changed, 78 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d16411633e8bde2c1c4b…

1 0

Michael Stefaniuc : msscript.ocx: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 9a58365c52c9796fd94d049e7c96f8828f154d2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a58365c52c9796fd94d049e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:06 2018 +0100 msscript.ocx: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b0ea1e5..1f706f5 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -28,6 +28,7 @@ #include "msscript.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msscript); @@ -103,16 +104,6 @@ struct ScriptControl { static HINSTANCE msscript_instance; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - typedef enum tid_t { IScriptControl_tid, LAST_tid

1 0

Michael Stefaniuc : msident: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 2689ecdf1d63c683caa737c0e8717a5ca302a836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2689ecdf1d63c683caa737c0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:05 2018 +0100 msident: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msident/msident.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 3efb190..8b9842f 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -24,19 +24,10 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msident); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE msident_instance; typedef struct {

1 0

Michael Stefaniuc : hlink: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: c3ddc115aa1580b436491204c8b97b3c39b4c54c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3ddc115aa1580b436491204… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:50:58 2018 +0100 hlink: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 33b58ac..1b7847b 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,26 +27,12 @@ #include "ole2.h" #include "hlink.h" +#include "wine/heap.h" #include "wine/unicode.h" extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR hlink_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Jacek Caban : crypt32: Fixed decoded size calculation in CRYPT_AsnDecodeSequence when indefinite length is used.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 2a2ecdd564609e8ae68d66ff598cd62e0551bc46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2ecdd564609e8ae68d66ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:27:53 2018 +0100 crypt32: Fixed decoded size calculation in CRYPT_AsnDecodeSequence when indefinite length is used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 1 + dlls/crypt32/tests/encode.c | 105 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7d65912..8b84388 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -479,6 +479,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], { dataLen = cbEncoded; indefinite = TRUE; + lenBytes += 2; } else if (cbEncoded < dataLen) { diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 53ec20b..a4daec0 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3368,18 +3368,76 @@ static const BYTE hash[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf }; static const BYTE signedBigCert[] = { - 0x30, 0x81, 0x93, 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, 0x00, 0x30, - 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, - 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x22, 0x18, 0x0f, - 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, - 0x30, 0x5a, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, - 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, - 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, - 0x6e, 0x67, 0x00, 0x30, 0x07, 0x30, 0x02, 0x06, 0x00, 0x03, 0x01, 0x00, 0xa3, - 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, - 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, - 0x00, 0x03, 0x11, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, - 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 }; + ASN_SEQUENCE,0x81,147, + ASN_SEQUENCE,122, + ASN_INTEGER,1, 0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,34, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,7, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,1, 0x00, + 0xa3,22, + ASN_SEQUENCE,20, + ASN_SEQUENCE,18, + ASN_OBJECTIDENTIFIER,3, 0x55,0x1d,0x13, + 0x01,1, 0xff, + ASN_OCTETSTRING,8, 0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,17, 0x00,0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08, + 0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00 +}; + +static const BYTE signedBigCertWithIndefiniteSeq[] = { + ASN_SEQUENCE,0x81,151, + ASN_SEQUENCE,126, + ASN_INTEGER,1, 0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,0x80, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + 0,0, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,0x80, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,1, 0x00, + 0,0, + 0xa3,22, + ASN_SEQUENCE,20, + ASN_SEQUENCE,18, + ASN_OBJECTIDENTIFIER,3, 0x55,0x1d,0x13, + 0x01,1, 0xff, + ASN_OCTETSTRING,8, 0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,17, 0x00,0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08, + 0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00 +}; static void test_encodeCert(DWORD dwEncoding) { @@ -3451,6 +3509,29 @@ static void test_decodeCert(DWORD dwEncoding) info->Subject.cbData), "Unexpected subject\n"); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, signedBigCertWithIndefiniteSeq, + sizeof(signedBigCertWithIndefiniteSeq), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + CERT_INFO *info = (CERT_INFO *)buf; + + ok(size >= sizeof(CERT_INFO), "Wrong size %d\n", size); + ok(info->SerialNumber.cbData == 1, + "Expected serial number size 1, got %d\n", info->SerialNumber.cbData); + ok(*info->SerialNumber.pbData == *serialNum, + "Expected serial number %d, got %d\n", *serialNum, + *info->SerialNumber.pbData); + ok(info->Issuer.cbData == sizeof(encodedCommonName), + "Wrong size %d\n", info->Issuer.cbData); + ok(!memcmp(info->Issuer.pbData, encodedCommonName, info->Issuer.cbData), + "Unexpected issuer\n"); + ok(info->Subject.cbData == sizeof(encodedCommonName), + "Wrong size %d\n", info->Subject.cbData); + ok(!memcmp(info->Subject.pbData, encodedCommonName, + info->Subject.cbData), "Unexpected subject\n"); + LocalFree(buf); + } } static const BYTE emptyDistPoint[] = { 0x30, 0x02, 0x30, 0x00 };

1 0

Jacek Caban : crypt32: Support constructed strings in octet strings decoder.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 7a5209c66e37f27f58dfe6042087810b912f9b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5209c66e37f27f58dfe604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:27:28 2018 +0100 crypt32: Support constructed strings in octet strings decoder. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 146 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 117 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a5209c66e37f27f58df…

1 0

Michael Stefaniuc : inetcomm: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: b54b07f1db9e98ca61f263037fc77efc497790e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b54b07f1db9e98ca61f26303… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:50:59 2018 +0100 inetcomm: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm_private.h | 10 ---------- dlls/inetcomm/mimeole.c | 1 + dlls/inetcomm/protocol.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 816493b..b27cbd7 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -83,13 +83,3 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDD HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f0e186c..681ca82 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -33,6 +33,7 @@ #include "mimeole.h" #include "propvarutil.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index b7b01d4..028463a 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -25,6 +25,7 @@ #include "inetcomm_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);

1 0

Nikolay Sivov : comctl32/treeview: Fix tooltip window leak.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: b413a937933027f3c87a3f2950762c2b44b41981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b413a937933027f3c87a3f29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 10:09:03 2018 +0300 comctl32/treeview: Fix tooltip window leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 114 +++++++++++++++++++++++++++++++++++++---- dlls/comctl32/treeview.c | 3 +- 2 files changed, 106 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 64fb1eb..45bcb74 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1069,9 +1069,101 @@ static void test_get_set_textcolor(void) static void test_get_set_tooltips(void) { - HWND hwndLastToolTip = NULL; - HWND hPopupTreeView; - HWND hTree; + HWND hTree, tooltips, hwnd; + DWORD style; + int i; + + /* TVS_NOTOOLTIPS */ + hTree = create_treeview_control(TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected ret value %p.\n", tooltips); + + /* Toggle style */ + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style & ~TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips), "Unexpected tooltip window %p.\n", tooltips); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + + DestroyWindow(hTree); + + /* Set some valid window, does not have to be tooltips class. */ + hTree = create_treeview_control(TVS_NOTOOLTIPS); + + hwnd = CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); + ok(hwnd != NULL, "Failed to create child window.\n"); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(tooltips == NULL, "Unexpected ret value %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == hwnd, "Unexpected tooltip window %p.\n", tooltips); + + /* Externally set tooltips window, disable style. */ + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style & ~TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips) && tooltips != hwnd, "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + ok(!IsWindow(tooltips), "Unexpected tooltip window %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + DestroyWindow(hTree); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + /* Set window, disable tooltips. */ + hTree = create_treeview_control(0); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + ok(!IsWindow(hwnd), "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(tooltips), "Expected valid window %p.\n", tooltips); + + DestroyWindow(hTree); + ok(IsWindow(tooltips), "Expected valid window %p.\n", tooltips); + DestroyWindow(tooltips); + DestroyWindow(hwnd); + + for (i = 0; i < 2; i++) + { + DWORD style = i == 0 ? 0 : TVS_NOTOOLTIPS; + + hwnd = CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); + ok(hwnd != NULL, "Failed to create child window.\n"); + + hTree = create_treeview_control(style); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(style & TVS_NOTOOLTIPS ? tooltips == NULL : IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + DestroyWindow(tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == hwnd, "Unexpected tooltip window %p.\n", tooltips); + + /* TreeView is destroyed, check if set window is still around. */ + DestroyWindow(hTree); + ok(!IsWindow(hwnd), "Unexpected window.\n"); + } hTree = create_treeview_control(0); fill_tree(hTree); @@ -1079,20 +1171,23 @@ static void test_get_set_tooltips(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* show even WS_POPUP treeview don't send NM_TOOLTIPSCREATED */ - hPopupTreeView = CreateWindowA(WC_TREEVIEWA, NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, + hwnd = CreateWindowA(WC_TREEVIEWA, NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, hMainWnd, NULL, NULL, NULL); - DestroyWindow(hPopupTreeView); + DestroyWindow(hwnd); /* Testing setting a NULL ToolTip */ - SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); - hwndLastToolTip = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); - ok(hwndLastToolTip == NULL, "NULL tool tip, reported as 0x%p, expected 0.\n", hwndLastToolTip); + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + + hwnd = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(hwnd == NULL, "Unexpected tooltip window %p.\n", hwnd); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_tooltips_seq, "test get set tooltips", TRUE); - /* TODO: Add a test of an actual tooltip */ DestroyWindow(hTree); + ok(IsWindow(tooltips), "Expected valid window.\n"); + DestroyWindow(tooltips); } static void test_get_set_unicodeformat(void) @@ -2754,6 +2849,7 @@ START_TEST(treeview) test_expandedimage(); test_htreeitem_layout(); test_WM_GETDLGCODE(); + test_get_set_tooltips(); unload_v6_module(ctx_cookie, hCtx); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 9a37cf3..7713efb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5188,8 +5188,6 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) TREEVIEW_FreeItem(infoPtr, infoPtr->root); DPA_Destroy(infoPtr->items); - /* tool tip is automatically destroyed: we are its owner */ - /* Restore original wndproc */ if (infoPtr->hwndEdit) SetWindowLongPtrW(infoPtr->hwndEdit, GWLP_WNDPROC, @@ -5204,6 +5202,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); DeleteObject(infoPtr->hBoldUnderlineFont); + DestroyWindow(infoPtr->hwndToolTip); Free(infoPtr); return 0;

1 0

Nikolay Sivov : user32/edit: Fix replacement text trace.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: f2b489591bc4f5f1cd89f84950c9bfefec1131ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b489591bc4f5f1cd89f849… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 10:06:56 2018 +0300 user32/edit: Fix replacement text trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 5e161c5..614a979 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2571,7 +2571,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", - debugstr_w(lpsz_replace), can_undo, send_update); + debugstr_wn(lpsz_replace, strl), can_undo, send_update); s = es->selection_start; e = es->selection_end;

1 0

Nikolay Sivov : comctl32/tests: Run more TreeView tests on version 6.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 486bec2d8648f17bbe3f03afa73f94c9080a1937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=486bec2d8648f17bbe3f03af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 10:09:04 2018 +0300 comctl32/tests: Run more TreeView tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 45bcb74..d38fad6 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2846,10 +2846,31 @@ START_TEST(treeview) /* comctl32 version 6 tests start here */ g_v6 = TRUE; + + test_fillroot(); + test_getitemtext(); + test_get_set_insertmark(); + test_get_set_item(); + test_get_set_scrolltime(); + test_get_set_textcolor(); + test_get_linecolor(); + test_get_insertmarkcolor(); test_expandedimage(); + test_get_set_tooltips(); + test_get_set_unicodeformat(); + test_expandinvisible(); + test_itemedit(); + test_treeview_classinfo(); + test_delete_items(); + test_cchildren(); test_htreeitem_layout(); + test_TVM_GETNEXTITEM(); + test_TVM_HITTEST(); test_WM_GETDLGCODE(); - test_get_set_tooltips(); + test_customdraw(); + test_WM_KEYDOWN(); + test_TVS_FULLROWSELECT(); + test_TVM_SORTCHILDREN(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Jacek Caban : crypt32/tests: Added more decoding tests.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: ced1b9ba600e18877a86d06cf31b075f4a87f5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced1b9ba600e18877a86d06c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:27:38 2018 +0100 crypt32/tests: Added more decoding tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 238 +++++++++++++++++++++++++++++--------------- 1 file changed, 157 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ced1b9ba600e18877a86…

1 0

Nikolay Sivov : comctl32: Introduce Edit control.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 662f727a7914fa1996c2fe19e2063a81fc079653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=662f727a7914fa1996c2fe19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 10:09:05 2018 +0300 comctl32: Introduce Edit control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 3 +- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 18 + dlls/comctl32/edit.c | 5075 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 7 - dlls/user32/class.c | 1 - 6 files changed, 5096 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=662f727a7914fa1996c2…

1 0

Henri Verbeet : wined3d: Use more resource access flags in wined3d_texture_use_pbo().
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: bfc0f3bdf12680ce498d30a10d27fc4c9a6b357e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc0f3bdf12680ce498d30a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 1 03:25:34 2018 +0330 wined3d: Use more resource access flags in wined3d_texture_use_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 101f9ad..f166c2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,8 +32,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { - return texture->resource.pool == WINED3D_POOL_DEFAULT - && texture->resource.access & WINED3D_RESOURCE_ACCESS_MAP + return (texture->resource.access & (WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP)) == WINED3D_RESOURCE_ACCESS_MAP && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED));

1 0

Henri Verbeet : wined3d: Use the resource access flags in wined3d_surface_blt().
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 74c97c9a56fe76e5452a37c7b2286ed7133d75f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c97c9a56fe76e5452a37c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 1 03:25:33 2018 +0330 wined3d: Use the resource access flags in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f34ad0..388b803 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3854,10 +3854,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { TRACE("Depth/stencil blit.\n"); - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, @@ -3959,10 +3959,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst blit_op = WINED3D_BLIT_OP_RAW_BLIT; } - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context,

1 0