December 2018 - Wine-commits

Alex Henrie : windowscodecs: Make constant 'valuename_format' static.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 5b9dbd92424865a57b9d5e6cd8de69e9a8a0c512 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b9dbd92424865a57b9d5e6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:06:08 2018 -0700 windowscodecs: Make constant 'valuename_format' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b011d71..3f53591 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1032,10 +1032,10 @@ static HRESULT register_pixelformats(struct regsvr_pixelformat const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->channelmasks) { + static const WCHAR valuename_format[] = {'%','d',0}; HKEY masks_key; UINT i, mask_size; WCHAR mask_valuename[11]; - const WCHAR valuename_format[] = {'%','d',0}; mask_size = (list->bitsperpixel + 7)/8;

1 0

Matteo Bruni : d3dcompiler: Add an assert checking for writemask sanity in debug_writemask().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: e9231beb865da13941d19eca016a6ccac07cb3f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9231beb865da13941d19eca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 4 21:42:34 2018 +0100 d3dcompiler: Add an assert checking for writemask sanity in debug_writemask(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5499b8c..b872e34 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2142,6 +2142,8 @@ static const char *debug_writemask(DWORD writemask) char string[5]; unsigned int i = 0, pos = 0; + assert(!(writemask & ~BWRITERSP_WRITEMASK_ALL)); + while (writemask) { if (writemask & 1)

1 0

Hans Leidekker : webservices: Add support for stream output.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 3e326c9a193645e0ef471b6a043d64aab88a9e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e326c9a193645e0ef471b6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:28 2018 +0100 webservices: Add support for stream output. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 1 - dlls/webservices/tests/writer.c | 71 ++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + dlls/webservices/writer.c | 98 ++++++++++++++++++++++++++++++---- include/webservices.h | 14 +++-- 6 files changed, 172 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e326c9a193645e0ef47…

1 0

Hans Leidekker : webservices: Use stream I/ O for UDP and session-less TCP channel bindings.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 63b8da2ba2048e9c3653652595f04bed0e2e9354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b8da2ba2048e9c36536525… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:29 2018 +0100 webservices: Use stream I/O for UDP and session-less TCP channel bindings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 167 ++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63b8da2ba2048e9c3653…

1 0

Hans Leidekker : webservices: Allow calling WsAcceptChannel again with the same channel handle.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 953eea35cb5968ff520453f3dc3e3266cf26c56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=953eea35cb5968ff520453f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:30 2018 +0100 webservices: Allow calling WsAcceptChannel again with the same channel handle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index e06b394..de1abb5 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -644,7 +644,10 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, return E_INVALIDARG; } - if (listener->state != WS_LISTENER_STATE_OPEN || listener->channel) hr = WS_E_INVALID_OPERATION; + if (listener->state != WS_LISTENER_STATE_OPEN || (listener->channel && listener->channel != channel_handle)) + { + hr = WS_E_INVALID_OPERATION; + } else { wait = listener->wait;

1 0

Hans Leidekker : webservices: Implement WsFlushBody.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 5f7372afbdcf9ad6dbae5543ae9c44486333a4a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f7372afbdcf9ad6dbae5543… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:31 2018 +0100 webservices: Implement WsFlushBody. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ada549c..31c424b 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -831,6 +831,33 @@ done: return hr; } +/************************************************************************** + * WsFlushBody [webservices.@] + */ +HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFlushWriter( msg->writer_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *localname ) { const WS_XML_NODE *node; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index bd152b1..c8db3a0 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -46,7 +46,7 @@ @ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) -@ stub WsFlushBody +@ stdcall WsFlushBody(ptr long ptr ptr) @ stdcall WsFlushWriter(ptr long ptr ptr) @ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr)

1 0

Hans Leidekker : webservices: Maximize the amount of data read with each recv call.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 6ff78d1f82216f6b8b7134957d931af662e88097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff78d1f82216f6b8b713495… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:32 2018 +0100 webservices: Maximize the amount of data read with each recv call. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 270aecc..53448c1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -628,7 +628,7 @@ static HRESULT read_more_data( struct reader *reader, ULONG min_size, const WS_A if (reader->input_type != WS_XML_READER_INPUT_TYPE_STREAM) return WS_E_INVALID_FORMAT; if (min_size > reader->input_size) return WS_E_QUOTA_EXCEEDED; - if (min_size > reader->input_size - reader->read_pos) + if (reader->read_pos) { memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); reader->read_size -= reader->read_pos;

1 0

Michael Stefaniuc : ddraw: Drop redundant memset() before memcpy().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 7d1c67948d94ca8bc5dd9b1f8efb3982d76e12c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d1c67948d94ca8bc5dd9b1f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 3 21:40:30 2018 +0100 ddraw: Drop redundant memset() before memcpy(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e6f8621..78a2fde 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -274,7 +274,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE wined3d_mutex_lock(); size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_1) { memcpy(vp, &viewport->viewports.vp1, size); @@ -927,7 +926,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI wined3d_mutex_lock(); size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_2) { memcpy(vp, &viewport->viewports.vp2, size);

1 0

Henri Verbeet : dxgi: Introduce the IWineDXGISwapChainFactory interface.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 8ba075a0592e776b3f4502fce09af207651e8c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba075a0592e776b3f4502fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 18:10:00 2018 +0330 dxgi: Introduce the IWineDXGISwapChainFactory interface. The basic idea is that a project like vkd3d could provide its own implementation of the IWineDXGISwapChainFactory interface, and so wouldn't need specific handling in dxgi_factory_CreateSwapChainForHwnd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 3 +- dlls/dxgi/factory.c | 9 ++-- dlls/dxgi/swapchain.c | 63 ------------------------- include/wine/winedxgi.idl | 17 +++++++ 5 files changed, 141 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ba075a0592e776b3f45…

1 0

Henri Verbeet : wined3d: Get rid of the "colRGBA" variable in light().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 3a386645c2e30904d777a3e92408c8ec385f7e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a386645c2e30904d777a3e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 18:54:12 2018 +0330 wined3d: Get rid of the "colRGBA" variable in light(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 42c109d..8708aa09 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4152,35 +4152,15 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s else { float quad_att; - float colRGBA[] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Light settings are affected by the model view in OpenGL, the View transform in direct3d*/ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glPushMatrix(); gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); - /* Diffuse: */ - colRGBA[0] = lightInfo->OriginalParms.diffuse.r; - colRGBA[1] = lightInfo->OriginalParms.diffuse.g; - colRGBA[2] = lightInfo->OriginalParms.diffuse.b; - colRGBA[3] = lightInfo->OriginalParms.diffuse.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_DIFFUSE, colRGBA); - checkGLcall("glLightfv"); - - /* Specular */ - colRGBA[0] = lightInfo->OriginalParms.specular.r; - colRGBA[1] = lightInfo->OriginalParms.specular.g; - colRGBA[2] = lightInfo->OriginalParms.specular.b; - colRGBA[3] = lightInfo->OriginalParms.specular.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPECULAR, colRGBA); - checkGLcall("glLightfv"); - - /* Ambient */ - colRGBA[0] = lightInfo->OriginalParms.ambient.r; - colRGBA[1] = lightInfo->OriginalParms.ambient.g; - colRGBA[2] = lightInfo->OriginalParms.ambient.b; - colRGBA[3] = lightInfo->OriginalParms.ambient.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_AMBIENT, colRGBA); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_DIFFUSE, &lightInfo->OriginalParms.diffuse.r); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPECULAR, &lightInfo->OriginalParms.specular.r); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_AMBIENT, &lightInfo->OriginalParms.ambient.r); checkGLcall("glLightfv"); if ((lightInfo->OriginalParms.range * lightInfo->OriginalParms.range) >= FLT_MIN)

1 0