April 2017 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSSetConstantBuffers().
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 970f759679557a7e7c27d06906bf6ac11fbfe9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970f759679557a7e7c27d0690… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:44 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetConstantBuffers(). 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/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c26c930..1c38733 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1210,8 +1210,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_ds_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSSetConstantBuffers().
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: b3353d54976c5d73f95fcff9dc016a5770f7d84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3353d54976c5d73f95fcff9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:43 2017 +0200 d3d11: Implement d3d11_immediate_context_HSSetConstantBuffers(). 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/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7df59e1..c26c930 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1159,8 +1159,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_hs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_hs_cb().
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: bfca7dad7cc49154ca38c1de92b337209d52c4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfca7dad7cc49154ca38c1de9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:41 2017 +0200 wined3d: Introduce wined3d_device_set_hs_cb(). 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/wined3d/device.c | 7 +++++++ dlls/wined3d/state.c | 3 +++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 12 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 645272d..dfd15d4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2678,6 +2678,13 @@ struct wined3d_shader * CDECL wined3d_device_get_hull_shader(const struct wined3 return device->state.shader[WINED3D_SHADER_TYPE_HULL]; } +void CDECL wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer) +{ + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_HULL, idx, buffer); +} + void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 06e2fbb..389d777 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5004,6 +5004,8 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_warn, }, WINED3D_GL_EXT_NONE }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL), state_cb_warn, }, WINED3D_GL_EXT_NONE }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_warn, }, WINED3D_GL_EXT_NONE }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, @@ -5996,6 +5998,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), + STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE), diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 074d02c..02dee0b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -133,6 +133,7 @@ @ cdecl wined3d_device_set_gs_cb(ptr long ptr) @ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) +@ cdecl wined3d_device_set_hs_cb(ptr long ptr) @ cdecl wined3d_device_set_hull_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_set_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e1d7702..1c9f854 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2326,6 +2326,7 @@ void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, s void __cdecl wined3d_device_set_gs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); +void __cdecl wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset);

1 0

Alexandre Julliard : dbghelp: Use the main module load address from the PEB.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 74f05b8660627c46536013ab433400e4e6d630eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f05b8660627c46536013ab4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 25 16:40:08 2017 +0200 dbghelp: Use the main module load address from the PEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 6428955..e841b1b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -44,6 +44,7 @@ #endif #include "dbghelp_private.h" +#include "winternl.h" #include "image_private.h" @@ -1200,6 +1201,8 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, char* ptr = (char*)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; unsigned long len; + if (load_offset) ptr += load_offset - fmap->u.elf.elf_start; + do { if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || @@ -1565,7 +1568,13 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, */ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) { - return elf_search_and_load_file(pcs, get_wine_loader_name(), 0, 0, elf_info); + PROCESS_BASIC_INFORMATION pbi; + ULONG_PTR base = 0; + + if (!NtQueryInformationProcess( pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL )) + ReadProcessMemory( pcs->handle, &pbi.PebBaseAddress->Reserved[0], &base, sizeof(base), NULL ); + + return elf_search_and_load_file(pcs, get_wine_loader_name(), base, 0, elf_info); } /******************************************************************

1 0

Hans Leidekker : webservices: Implement WsReadMessageEnd.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 84dcb316b97a9f956d5b7694b5089ec1c149807b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84dcb316b97a9f956d5b7694b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 25 11:31:27 2017 +0200 webservices: Implement WsReadMessageEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 29 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 523c247..0d8f78a 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1078,6 +1078,35 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return hr; } +/************************************************************************** + * WsReadMessageEnd [webservices.@] + */ +HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + HRESULT hr; + + TRACE( "%p %p %p %p\n", handle, msg, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!channel || !msg) return E_INVALIDARG; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + hr = WsReadEnvelopeEnd( msg, NULL ); + + LeaveCriticalSection( &channel->cs ); + return hr; +} + HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) { struct channel *channel = (struct channel *)handle; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 7f23e73..5c9beba 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -113,7 +113,7 @@ @ stub WsReadEndpointAddressExtension @ stdcall WsReadEnvelopeEnd(ptr ptr) @ stdcall WsReadEnvelopeStart(ptr ptr ptr ptr ptr) -@ stub WsReadMessageEnd +@ stdcall WsReadMessageEnd(ptr ptr ptr ptr) @ stdcall WsReadMessageStart(ptr ptr ptr ptr) @ stub WsReadMetadata @ stdcall WsReadNode(ptr ptr)

1 0

Huw Davies : comdlg32: Don't ask for icon information since it's unused.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 6891b5a044211610bb6cac4fa70198983cea1405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6891b5a044211610bb6cac4fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 25 09:04:57 2017 +0100 comdlg32: Don't ask for icon information since it's unused. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 305ac62..da85260 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3389,8 +3389,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) 0, &sfi, sizeof(sfi), - SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX - | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED); + SHGFI_DISPLAYNAME | SHGFI_PIDL | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED); TRACE("-- Add %s attr=%08x\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes);

1 0

Józef Kucia : wined3d: Add ARB_tessellation_shader extension.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 4db17152f5249237c91ee8ed13a6610bde9f6601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db17152f5249237c91ee8ed1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:40 2017 +0200 wined3d: Add ARB_tessellation_shader extension. 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/wined3d/directx.c | 23 +++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 25 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0a925f0..d9a9c6f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -161,6 +161,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shadow", ARB_SHADOW }, {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, + {"GL_ARB_tessellation_shader", ARB_TESSELLATION_SHADER }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, {"GL_ARB_texture_buffer_object", ARB_TEXTURE_BUFFER_OBJECT }, {"GL_ARB_texture_buffer_range", ARB_TEXTURE_BUFFER_RANGE }, @@ -2846,6 +2847,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetSynciv) USE_GL_FUNC(glIsSync) USE_GL_FUNC(glWaitSync) + /* GL_ARB_tessellation_shader */ + USE_GL_FUNC(glPatchParameteri) + USE_GL_FUNC(glPatchParameterfv) /* GL_ARB_texture_buffer_object */ USE_GL_FUNC(glTexBufferARB) /* GL_ARB_texture_buffer_range */ @@ -3633,6 +3637,24 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_VERTEX], gl_max); } } + if (gl_info->supported[ARB_TESSELLATION_SHADER]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS, &gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_HULL] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max hull uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_HULL], gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS, &gl_max); + gl_info->limits.samplers[WINED3D_SHADER_TYPE_HULL] = gl_max; + TRACE("Max hull samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_HULL]); + + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS, &gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_DOMAIN] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max domain uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_DOMAIN], gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS, &gl_max); + gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN] = gl_max; + TRACE("Max domain samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN]); + } if ((!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] || gl_info->supported[ARB_GEOMETRY_SHADER4]) && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { @@ -3831,6 +3853,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, + {ARB_TESSELLATION_SHADER, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_GATHER, MAKEDWORD_VERSION(4, 0)}, {ARB_TRANSFORM_FEEDBACK2, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4d585aa..e6cbf1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9917,6 +9917,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] + && gl_info->supported[ARB_TESSELLATION_SHADER] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) shader_model = 5; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 6e92552..41cd74c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -94,6 +94,7 @@ enum wined3d_gl_extension ARB_SHADOW, ARB_STENCIL_TEXTURING, ARB_SYNC, + ARB_TESSELLATION_SHADER, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_BUFFER_OBJECT, ARB_TEXTURE_BUFFER_RANGE,

1 0

Alexandre Julliard : ntdll: Also store dynamic loader information in the PEB on Linux.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: d3bbd03c8f398a2242d97fb3d1e8f503f8bfc750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bbd03c8f398a2242d97fb3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 25 16:38:23 2017 +0200 ntdll: Also store dynamic loader information in the PEB on Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ dlls/ntdll/thread.c | 75 ++++++++++++++++++++++++++++++++++++++--------------- include/config.h.in | 6 +++++ 4 files changed, 64 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 81df494..dee9369 100755 --- a/configure +++ b/configure @@ -6888,6 +6888,7 @@ for ac_header in \ stropts.h \ sys/asoundlib.h \ sys/attr.h \ + sys/auxv.h \ sys/cdio.h \ sys/elf32.h \ sys/epoll.h \ @@ -15302,6 +15303,7 @@ for ac_func in \ futimes \ futimesat \ getattrlist \ + getauxval \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/configure.ac b/configure.ac index f5b587c..0a3b3b1 100644 --- a/configure.ac +++ b/configure.ac @@ -465,6 +465,7 @@ AC_CHECK_HEADERS(\ stropts.h \ sys/asoundlib.h \ sys/attr.h \ + sys/auxv.h \ sys/cdio.h \ sys/elf32.h \ sys/epoll.h \ @@ -2012,6 +2013,7 @@ AC_CHECK_FUNCS(\ futimes \ futimesat \ getattrlist \ + getauxval \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0506f6b..830dd3a 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -185,13 +185,56 @@ done: return status; } -#ifdef __APPLE__ +#ifdef __linux__ + +#ifdef HAVE_ELF_H +# include <elf.h> +#endif +#ifdef HAVE_LINK_H +# include <link.h> +#endif +#ifdef HAVE_SYS_AUXV_H +# include <sys/auxv.h> +#endif +#ifndef HAVE_GETAUXVAL +static unsigned long getauxval( unsigned long id ) +{ + extern char **__wine_main_environ; + char **ptr = __wine_main_environ; + ElfW(auxv_t) *auxv; + + while (*ptr) ptr++; + while (!*ptr) ptr++; + for (auxv = (ElfW(auxv_t) *)ptr; auxv->a_type; auxv++) + if (auxv->a_type == id) return auxv->a_un.a_val; + return 0; +} +#endif + +static ULONG_PTR get_image_addr(void) +{ + ULONG_PTR size, num, phdr_addr = getauxval( AT_PHDR ); + ElfW(Phdr) *phdr; + + if (!phdr_addr) return 0; + phdr = (ElfW(Phdr) *)phdr_addr; + size = getauxval( AT_PHENT ); + num = getauxval( AT_PHNUM ); + while (num--) + { + if (phdr->p_type == PT_PHDR) return phdr_addr - phdr->p_offset; + phdr = (ElfW(Phdr) *)((char *)phdr + size); + } + return 0; +} + +#elif defined(__APPLE__) #include <mach/mach.h> #include <mach/mach_error.h> -static ULONG64 get_dyld_image_info_addr(void) +static ULONG_PTR get_image_addr(void) { - ULONG64 ret = 0; + ULONG_PTR ret = 0; #ifdef TASK_DYLD_INFO struct task_dyld_info dyld_info; mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; @@ -200,7 +243,13 @@ static ULONG64 get_dyld_image_info_addr(void) #endif return ret; } -#endif /* __APPLE__ */ + +#else +static ULONG_PTR get_image_addr(void) +{ + return 0; +} +#endif /*********************************************************************** * thread_init @@ -219,9 +268,6 @@ HANDLE thread_init(void) NTSTATUS status; struct ntdll_thread_data *thread_data; static struct debug_info debug_info; /* debug info for initial thread */ -#ifdef __APPLE__ - ULONG64 dyld_image_info; -#endif virtual_init(); @@ -270,20 +316,7 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); -#ifdef __APPLE__ - dyld_image_info = get_dyld_image_info_addr(); -#ifdef __LP64__ -#ifdef WORDS_BIGENDIAN - peb->Reserved[1] = dyld_image_info & 0xFFFFFFFF; - peb->Reserved[0] = dyld_image_info >> 32; -#else - peb->Reserved[0] = dyld_image_info & 0xFFFFFFFF; - peb->Reserved[1] = dyld_image_info >> 32; -#endif -#else - peb->Reserved[0] = dyld_image_info & 0xFFFFFFFF; -#endif -#endif + *(ULONG_PTR *)peb->Reserved = get_image_addr(); /* * Starting with Vista, the first user to log on has session id 1. diff --git a/include/config.h.in b/include/config.h.in index 9706e14..1d4d6fa 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -201,6 +201,9 @@ /* Define to 1 if you have the `getattrlist' function. */ #undef HAVE_GETATTRLIST +/* Define to 1 if you have the `getauxval' function. */ +#undef HAVE_GETAUXVAL + /* Define to 1 if you have the `getnameinfo' function. */ #undef HAVE_GETNAMEINFO @@ -1035,6 +1038,9 @@ /* Define to 1 if you have the <sys/attr.h> header file. */ #undef HAVE_SYS_ATTR_H +/* Define to 1 if you have the <sys/auxv.h> header file. */ +#undef HAVE_SYS_AUXV_H + /* Define to 1 if you have the <sys/cdio.h> header file. */ #undef HAVE_SYS_CDIO_H

1 0

Akihiro Sagawa : secur32: Add support for SECPKG_ATTR_KEY_INFO.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: b6d32239d6b84f6aec15b2b5691d8791f33dabd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d32239d6b84f6aec15b2b56… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 24 17:31:44 2017 +0200 secur32: Add support for SECPKG_ATTR_KEY_INFO. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 53 ++++++++++++++++++++++++++++++++++++++++++ dlls/secur32/schannel_gnutls.c | 21 +++++++++++++++++ dlls/secur32/schannel_macosx.c | 6 +++++ dlls/secur32/secur32_priv.h | 1 + dlls/secur32/tests/schannel.c | 2 +- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6914837..82374ef 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -962,6 +962,33 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( return ret; } +static void *get_alg_name(ALG_ID id, BOOL wide) +{ + static const struct { + ALG_ID alg_id; + const char* name; + const WCHAR nameW[8]; + } alg_name_map[] = { + { CALG_ECDSA, "ECDSA", {'E','C','D','S','A',0} }, + { CALG_RSA_SIGN, "RSA", {'R','S','A',0} }, + { CALG_DES, "DES", {'D','E','S',0} }, + { CALG_RC2, "RC2", {'R','C','2',0} }, + { CALG_3DES, "3DES", {'3','D','E','S',0} }, + { CALG_AES_128, "AES", {'A','E','S',0} }, + { CALG_AES_192, "AES", {'A','E','S',0} }, + { CALG_AES_256, "AES", {'A','E','S',0} }, + { CALG_RC4, "RC4", {'R','C','4',0} }, + }; + unsigned i; + + for (i = 0; i < sizeof(alg_name_map)/sizeof(alg_name_map[0]); i++) + if (alg_name_map[i].alg_id == id) + return wide ? (void*)alg_name_map[i].nameW : (void*)alg_name_map[i].name; + + FIXME("Unknown ALG_ID %04x\n", id); + return NULL; +} + static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) { HCERTSTORE cert_store; @@ -1016,6 +1043,21 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( return status; } + case SECPKG_ATTR_KEY_INFO: + { + SecPkgContext_ConnectionInfo conn_info; + SECURITY_STATUS status = schan_imp_get_connection_info(ctx->session, &conn_info); + if (status == SEC_E_OK) + { + SecPkgContext_KeyInfoW *info = buffer; + info->KeySize = conn_info.dwCipherStrength; + info->SignatureAlgorithm = schan_imp_get_key_signature_algorithm(ctx->session); + info->EncryptAlgorithm = conn_info.aiCipher; + info->sSignatureAlgorithmName = get_alg_name(info->SignatureAlgorithm, TRUE); + info->sEncryptAlgorithmName = get_alg_name(info->EncryptAlgorithm, TRUE); + } + return status; + } case SECPKG_ATTR_REMOTE_CERT_CONTEXT: { PCCERT_CONTEXT *cert = buffer; @@ -1091,6 +1133,17 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( { case SECPKG_ATTR_STREAM_SIZES: return schan_QueryContextAttributesW(context_handle, attribute, buffer); + case SECPKG_ATTR_KEY_INFO: + { + SECURITY_STATUS status = schan_QueryContextAttributesW(context_handle, attribute, buffer); + if (status == SEC_E_OK) + { + SecPkgContext_KeyInfoA *info = buffer; + info->sSignatureAlgorithmName = get_alg_name(info->SignatureAlgorithm, FALSE); + info->sEncryptAlgorithmName = get_alg_name(info->EncryptAlgorithm, FALSE); + } + return status; + } case SECPKG_ATTR_REMOTE_CERT_CONTEXT: return schan_QueryContextAttributesW(context_handle, attribute, buffer); case SECPKG_ATTR_CONNECTION_INFO: diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 33686bc..a028176 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -383,6 +383,27 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } +ALG_ID schan_imp_get_key_signature_algorithm(schan_imp_session session) +{ + gnutls_session_t s = (gnutls_session_t)session; + gnutls_kx_algorithm_t kx = pgnutls_kx_get(s); + + TRACE("(%p)\n", session); + + switch (kx) + { + case GNUTLS_KX_UNKNOWN: return 0; + case GNUTLS_KX_RSA: + case GNUTLS_KX_RSA_EXPORT: + case GNUTLS_KX_DHE_RSA: + case GNUTLS_KX_ECDHE_RSA: return CALG_RSA_SIGN; + case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA; + default: + FIXME("unknown algorithm %d\n", kx); + return 0; + } +} + SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE store, PCCERT_CONTEXT *ret) { diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2c5896a..f397291 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -914,6 +914,12 @@ unsigned int schan_imp_get_max_message_size(schan_imp_session session) return 1 << 14; } +ALG_ID schan_imp_get_key_signature_algorithm(schan_imp_session session) +{ + FIXME("(%p)\n", session); + return 0; +} + SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 1baa543..9a60d65 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -252,6 +252,7 @@ extern void schan_imp_set_session_target(schan_imp_session session, const char * extern SECURITY_STATUS schan_imp_handshake(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DECLSPEC_HIDDEN; +extern ALG_ID schan_imp_get_key_signature_algorithm(schan_imp_session session) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE, diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b12a739..b5ed169 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -925,7 +925,7 @@ todo_wine } status = pQueryContextAttributesA(&context, SECPKG_ATTR_KEY_INFO, &key_info); - todo_wine ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_KEY_INFO) failed: %08x\n", status); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_KEY_INFO) failed: %08x\n", status); if(status == SEC_E_OK) { ok(broken(key_info.SignatureAlgorithm == 0 /* WinXP,2003 */) || key_info.SignatureAlgorithm == CALG_RSA_SIGN,

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: c305b21be38d572c3be3cf47f9559d1734bb761d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c305b21be38d572c3be3cf47f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 25 11:31:30 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 165 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 159 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 74cef3b..16f3ccf 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -77,11 +77,9 @@ static void test_WsOpenChannel(void) hr = WsOpenChannel( channel, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = sizeof(url)/sizeof(url[0]); addr.url.chars = url; - addr.headers = NULL; - addr.extensions = NULL; - addr.identity = NULL; hr = WsOpenChannel( NULL, &addr, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -124,11 +122,9 @@ static void test_WsResetChannel(void) hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT, &timeout, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = sizeof(url)/sizeof(url[0]); addr.url.chars = url; - addr.headers = NULL; - addr.extensions = NULL; - addr.identity = NULL; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -162,9 +158,166 @@ static void test_WsResetChannel(void) WsFreeChannel( channel ); } +struct listener_info +{ + int port; + HANDLE wait; +}; + +static DWORD CALLBACK listener_proc( void *arg ) +{ + static const WCHAR fmt[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + struct listener_info *info = arg; + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WCHAR buf[64]; + WS_STRING url; + HRESULT hr; + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX, WS_UDP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + url.length = wsprintfW( buf, fmt, info->port ); + url.chars = buf; + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + SetEvent( info->wait ); + + hr = WsAcceptChannel( listener, channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadMessageStart( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageStart( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageStart( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageStart( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadMessageEnd( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageEnd( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageEnd( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageEnd( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeMessage( msg ); + + SetEvent( info->wait ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeChannel( channel ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeListener( listener ); + + return 0; +} + +static void test_message_read_write( const struct listener_info *info ) +{ + static const WCHAR fmt[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + WS_ENDPOINT_ADDRESS addr; + WCHAR buf[64]; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + HRESULT hr; + DWORD err; + + hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX, WS_UDP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, fmt, info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteMessageStart( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageStart( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageStart( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageStart( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); + WsFreeChannel( channel ); +} + +static HANDLE start_listener( struct listener_info *info ) +{ + DWORD err; + HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); + ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "failed to start listener %u\n", err ); + return thread; +} + START_TEST(channel) { + struct listener_info info; + HANDLE thread; + test_WsCreateChannel(); test_WsOpenChannel(); test_WsResetChannel(); + + info.port = 7533; + info.wait = CreateEventW( NULL, 0, 0, NULL ); + thread = start_listener( &info ); + + test_message_read_write( &info ); + + WaitForSingleObject( thread, 3000 ); }

1 0