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

Hans Leidekker : webservices: Implement WsCreateListener and WsFreeListener.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 83a2c56fc07ff50793169a59dab5abfc5adcb186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a2c56fc07ff50793169a59d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 5 11:40:25 2017 +0200 webservices: Implement WsCreateListener and WsFreeListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/listener.c | 174 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 3 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index fa79a68..70ca1fc 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ channel.c \ error.c \ heap.c \ + listener.c \ msg.c \ proxy.c \ reader.c \ diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c new file mode 100644 index 0000000..205f7bc --- /dev/null +++ b/dlls/webservices/listener.c @@ -0,0 +1,174 @@ +/* + * Copyright 2017 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "webservices.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" +#include "webservices_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +static const struct prop_desc listener_props[] = +{ + { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_LISTEN_BACKLOG */ + { sizeof(WS_IP_VERSION), FALSE }, /* WS_LISTENER_PROPERTY_IP_VERSION */ + { sizeof(WS_LISTENER_STATE), TRUE }, /* WS_LISTENER_PROPERTY_STATE */ + { sizeof(WS_CALLBACK_MODEL), FALSE }, /* WS_LISTENER_PROPERTY_ASYNC_CALLBACK_MODEL */ + { sizeof(WS_CHANNEL_TYPE), TRUE }, /* WS_LISTENER_PROPERTY_CHANNEL_TYPE */ + { sizeof(WS_CHANNEL_BINDING), TRUE }, /* WS_LISTENER_PROPERTY_CHANNEL_BINDING */ + { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_CONNECT_TIMEOUT */ + { sizeof(BOOL), FALSE }, /* WS_LISTENER_PROPERTY_IS_MULTICAST */ + { 0, FALSE }, /* WS_LISTENER_PROPERTY_MULTICAST_INTERFACES */ + { sizeof(BOOL), FALSE }, /* WS_LISTENER_PROPERTY_MULTICAST_LOOPBACK */ + { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_CLOSE_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_TO_HEADER_MATCHING_OPTIONS */ + { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_TRANSPORT_URL_MATCHING_OPTIONS */ + { sizeof(WS_CUSTOM_LISTENER_CALLBACKS), FALSE }, /* WS_LISTENER_PROPERTY_CUSTOM_LISTENER_CALLBACKS */ + { 0, FALSE }, /* WS_LISTENER_PROPERTY_CUSTOM_LISTENER_PARAMETERS */ + { sizeof(void *), TRUE }, /* WS_LISTENER_PROPERTY_CUSTOM_LISTENER_INSTANCE */ + { sizeof(WS_DISALLOWED_USER_AGENT_SUBSTRINGS), FALSE } /* WS_LISTENER_PROPERTY_DISALLOWED_USER_AGENT */ +}; + +struct listener +{ + ULONG magic; + CRITICAL_SECTION cs; + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + WS_LISTENER_STATE state; + ULONG prop_count; + struct prop prop[sizeof(listener_props)/sizeof(listener_props[0])]; +}; + +#define LISTENER_MAGIC (('L' << 24) | ('I' << 16) | ('S' << 8) | 'T') + +static struct listener *alloc_listener(void) +{ + static const ULONG count = sizeof(listener_props)/sizeof(listener_props[0]); + struct listener *ret; + ULONG size = sizeof(*ret) + prop_size( listener_props, count ); + + if (!(ret = heap_alloc_zero( size ))) return NULL; + + ret->magic = LISTENER_MAGIC; + InitializeCriticalSection( &ret->cs ); + ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": listener.cs"); + + prop_init( listener_props, count, ret->prop, &ret[1] ); + ret->prop_count = count; + return ret; +} + +static void free_listener( struct listener *listener ) +{ + listener->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &listener->cs ); + heap_free( listener ); +} + +static HRESULT create_listener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, + const WS_LISTENER_PROPERTY *properties, ULONG count, struct listener **ret ) +{ + struct listener *listener; + HRESULT hr; + ULONG i; + + if (!(listener = alloc_listener())) return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + { + hr = prop_set( listener->prop, listener->prop_count, properties[i].id, properties[i].value, + properties[i].valueSize ); + if (hr != S_OK) + { + free_listener( listener ); + return hr; + } + } + + listener->type = type; + listener->binding = binding; + + *ret = listener; + return S_OK; +} + +/************************************************************************** + * WsCreateListener [webservices.@] + */ +HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, + const WS_LISTENER_PROPERTY *properties, ULONG count, + const WS_SECURITY_DESCRIPTION *desc, WS_LISTENER **handle, + WS_ERROR *error ) +{ + struct listener *listener; + HRESULT hr; + + TRACE( "%u %u %p %u %p %p %p\n", type, binding, properties, count, desc, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (desc) FIXME( "ignoring security description\n" ); + + if (!handle) return E_INVALIDARG; + + if (type != WS_CHANNEL_TYPE_DUPLEX_SESSION) + { + FIXME( "channel type %u not implemented\n", type ); + return E_NOTIMPL; + } + if (binding != WS_TCP_CHANNEL_BINDING) + { + FIXME( "channel binding %u not implemented\n", binding ); + return E_NOTIMPL; + } + + if ((hr = create_listener( type, binding, properties, count, &listener )) != S_OK) return hr; + + *handle = (WS_LISTENER *)listener; + return S_OK; +} + +/************************************************************************** + * WsFreeListener [webservices.@] + */ +void WINAPI WsFreeListener( WS_LISTENER *handle ) +{ + struct listener *listener = (struct listener *)handle; + + TRACE( "%p\n", handle ); + + if (!listener) return; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return; + } + + listener->magic = 0; + + LeaveCriticalSection( &listener->cs ); + free_listener( listener ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index def0cca..9f1fc3e 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -25,7 +25,7 @@ @ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError @ stdcall WsCreateHeap(long long ptr long ptr ptr) -@ stub WsCreateListener +@ stdcall WsCreateListener(long long ptr long ptr ptr ptr) @ stdcall WsCreateMessage(long long ptr long ptr ptr) @ stdcall WsCreateMessageForChannel(ptr ptr long ptr ptr) @ stub WsCreateMetadata @@ -51,7 +51,7 @@ @ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr) @ stdcall WsFreeHeap(ptr) -@ stub WsFreeListener +@ stdcall WsFreeListener(ptr) @ stdcall WsFreeMessage(ptr) @ stub WsFreeMetadata @ stdcall WsFreeReader(ptr)

1 0

Hans Leidekker : webservices: Implement WsGetListenerProperty and WsSetListenerProperty.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 92fdb3ffb55fd408c5590b75b2f2c41d73a26dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fdb3ffb55fd408c5590b75b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 5 11:40:26 2017 +0200 webservices: Implement WsGetListenerProperty and WsSetListenerProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 75 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +-- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 205f7bc..4adddf4 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -172,3 +172,78 @@ void WINAPI WsFreeListener( WS_LISTENER *handle ) LeaveCriticalSection( &listener->cs ); free_listener( listener ); } + +/************************************************************************** + * WsGetListenerProperty [webservices.@] + */ +HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ID id, void *buf, + ULONG size, WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + HRESULT hr = S_OK; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + switch (id) + { + case WS_LISTENER_PROPERTY_STATE: + if (!buf || size != sizeof(listener->state)) hr = E_INVALIDARG; + else *(WS_LISTENER_STATE *)buf = listener->state; + break; + + case WS_LISTENER_PROPERTY_CHANNEL_TYPE: + if (!buf || size != sizeof(listener->type)) hr = E_INVALIDARG; + else *(WS_CHANNEL_TYPE *)buf = listener->type; + break; + + case WS_LISTENER_PROPERTY_CHANNEL_BINDING: + if (!buf || size != sizeof(listener->binding)) hr = E_INVALIDARG; + else *(WS_CHANNEL_BINDING *)buf = listener->binding; + break; + + default: + hr = prop_get( listener->prop, listener->prop_count, id, buf, size ); + } + + LeaveCriticalSection( &listener->cs ); + return hr; +} + +/************************************************************************** + * WsSetListenerProperty [webservices.@] + */ +HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ID id, const void *value, + ULONG size, WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + HRESULT hr; + + TRACE( "%p %u %p %u\n", handle, id, value, size ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + hr = prop_set( listener->prop, listener->prop_count, id, value, size ); + + LeaveCriticalSection( &listener->cs ); + return hr; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 9f1fc3e..7e8dbee 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -69,7 +69,7 @@ @ stub WsGetHeader @ stub WsGetHeaderAttributes @ stdcall WsGetHeapProperty(ptr long ptr long ptr) -@ stub WsGetListenerProperty +@ stdcall WsGetListenerProperty(ptr long ptr long ptr) @ stub WsGetMappedHeader @ stdcall WsGetMessageProperty(ptr long ptr long ptr) @ stub WsGetMetadataEndpoints @@ -152,7 +152,7 @@ @ stdcall WsSetHeader(ptr long long long ptr long ptr) @ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stdcall WsSetInputToBuffer(ptr ptr ptr long ptr) -@ stub WsSetListenerProperty +@ stdcall WsSetListenerProperty(ptr long ptr long ptr) @ stdcall WsSetMessageProperty(ptr long ptr long ptr) @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr)

1 0

Hans Leidekker : webservices/tests: Add listener tests.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 71cc41b9327b897343ed722834554932f1dcda51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cc41b9327b897343ed72283… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 5 11:40:27 2017 +0200 webservices/tests: Add listener tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/listener.c | 85 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index e63952c..1adfecc 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = webservices user32 ws2_32 C_SRCS = \ channel.c \ + listener.c \ msg.c \ proxy.c \ reader.c \ diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c new file mode 100644 index 0000000..901a9a0 --- /dev/null +++ b/dlls/webservices/tests/listener.c @@ -0,0 +1,85 @@ +/* + * Copyright 2017 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include "windows.h" +#include "webservices.h" +#include "wine/test.h" + +static void test_WsCreateListener(void) +{ + HRESULT hr; + WS_LISTENER *listener; + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + WS_LISTENER_STATE state; + WS_IP_VERSION version; + ULONG size, backlog; + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + listener = NULL; + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( listener != NULL, "listener not set\n" ); + + backlog = 1000; + size = sizeof(backlog); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_LISTEN_BACKLOG, &backlog, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + version = WS_IP_VERSION_4; + size = sizeof(version); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + type = 0xdeadbeef; + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + binding = 0xdeadbeef; + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, sizeof(binding), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( binding == WS_TCP_CHANNEL_BINDING, "got %u\n", binding ); + + version = 0; + size = sizeof(version); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( version == WS_IP_VERSION_AUTO, "got %u\n", version ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + state = WS_LISTENER_STATE_CREATED; + size = sizeof(state); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeListener( listener ); +} + +START_TEST(listener) +{ + test_WsCreateListener(); +}

1 0

Huw Davies : riched20: Don' t compare the colours if the old and new states are both auto.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 5f3772a730073b950ff42d43015a6d72608e3f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3772a730073b950ff42d430… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 5 14:02:08 2017 +0100 riched20: Don't compare the colours if the old and new states are both auto. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index d579084..6b654ca 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -769,14 +769,14 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) } if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOBACKCOLOR || - old_fmt->crBackColor != fmt->crBackColor) + (!(fmt->dwEffects & CFE_AUTOBACKCOLOR) && old_fmt->crBackColor != fmt->crBackColor)) { if (fmt->dwEffects & CFE_AUTOBACKCOLOR) i = 0; else find_color_in_colortbl( pStream, fmt->crBackColor, &i ); sprintf(props + strlen(props), "\\cb%u", i); } if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOCOLOR || - old_fmt->crTextColor != fmt->crTextColor) + (!(fmt->dwEffects & CFE_AUTOCOLOR) && old_fmt->crTextColor != fmt->crTextColor)) { if (fmt->dwEffects & CFE_AUTOCOLOR) i = 0; else find_color_in_colortbl( pStream, fmt->crTextColor, &i );

1 0

Michael Stefaniuc : comctl32/tests: Add an ImageList_Copy() test.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: a6a9ec4459d1ba912b4ce13671fe8ba0bfe531ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a9ec4459d1ba912b4ce1367… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 5 15:25:44 2017 +0200 comctl32/tests: Add an ImageList_Copy() test. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 2b68b63..8cdef18 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2216,6 +2216,29 @@ static void test_color_table(UINT ilc) ImageList_Destroy(himl); } +static void test_copy(void) +{ + HIMAGELIST dst, src; + BOOL ret; + int count; + + dst = ImageList_Create(5, 11, ILC_COLOR, 1, 1); + count = ImageList_GetImageCount(dst); + ok(!count, "ImageList not empty.\n"); + src = createImageList(7, 13); + count = ImageList_GetImageCount(src); + ok(count > 2, "Tests need an ImageList with more than 2 images\n"); + + /* ImageList_Copy() cannot copy between two ImageLists */ + ret = ImageList_Copy(dst, 0, src, 2, ILCF_MOVE); + ok(!ret, "ImageList_Copy() should have returned FALSE\n"); + count = ImageList_GetImageCount(dst); + ok(count == 0, "Expected no image in dst ImageList, got %d\n", count); + + ImageList_Destroy(dst); + ImageList_Destroy(src); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2366,6 +2389,7 @@ START_TEST(imagelist) test_iconsize(); test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); + test_copy(); FreeLibrary(hComCtl32);

1 0

Michael Stefaniuc : dmsynth: Don' t store a SynthSink implementation in IDirectMusicSynth8Impl.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 44fd37a323e23c7a687dc96476edde8de4620307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fd37a323e23c7a687dc9647… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 5 15:25:45 2017 +0200 dmsynth: Don't store a SynthSink implementation in IDirectMusicSynth8Impl. Avoids an unsafe interface to object transition. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index ed86ce0..db61e46 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -66,7 +66,7 @@ struct IDirectMusicSynth8Impl { DMUS_PORTCAPS pCaps; BOOL fActive; IReferenceClock* pLatencyClock; - IDirectMusicSynthSinkImpl* pSynthSink; + IDirectMusicSynthSink *synth_sink; }; /***************************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 88ba53e..afeebda 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -310,7 +310,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(LPDIRECTMUSICSYNTH8 if (!clock) return E_POINTER; - if (!This->pSynthSink) + if (!This->synth_sink) return DMUS_E_NOSYNTHSINK; *clock = This->pLatencyClock; @@ -336,7 +336,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(LPDIRECTMUSICSYNTH8 if TRACE("(%p)->(%p)\n", iface, synth_sink); - This->pSynthSink = (IDirectMusicSynthSinkImpl*)synth_sink; + This->synth_sink = synth_sink; if (synth_sink) return IDirectMusicSynthSink_GetLatencyClock(synth_sink, &This->pLatencyClock);

1 0

Daniel Lehman : ucrtbase: Add _iswblank_l.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 111637a3c6905ccebdbbc97abbe335078348e587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111637a3c6905ccebdbbc97ab… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 3 13:25:26 2017 -0700 ucrtbase: Add _iswblank_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index fe3ae54..0f30b05 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -21,7 +21,7 @@ @ cdecl _isupper_l(long ptr) ucrtbase._isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) ucrtbase._iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) ucrtbase._iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -113,7 +113,7 @@ @ cdecl iswalnum(long) ucrtbase.iswalnum @ cdecl iswalpha(long) ucrtbase.iswalpha @ cdecl iswascii(long) ucrtbase.iswascii -@ stub iswblank +@ cdecl iswblank(long) ucrtbase.iswblank @ cdecl iswcntrl(long) ucrtbase.iswcntrl @ cdecl iswctype(long long) ucrtbase.iswctype @ cdecl iswdigit(long) ucrtbase.iswdigit diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1701c4a..d73a603 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1369,7 +1369,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -2228,7 +2228,7 @@ @ cdecl iswalnum(long) MSVCRT_iswalnum @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii -@ stub iswblank +@ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl @ cdecl iswctype(long long) ntdll.iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 023aa00..942d212 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1234,7 +1234,7 @@ @ cdecl _isupper_l(long ptr) msvcr120._isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) msvcr120._iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) msvcr120._iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -1891,7 +1891,7 @@ @ cdecl iswalnum(long) msvcr120.iswalnum @ cdecl iswalpha(long) msvcr120.iswalpha @ cdecl iswascii(long) msvcr120.iswascii -@ stub iswblank +@ cdecl iswblank(long) msvcr120.iswblank @ cdecl iswcntrl(long) msvcr120.iswcntrl @ cdecl iswctype(long long) msvcr120.iswctype @ cdecl iswdigit(long) msvcr120.iswdigit diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 89c4152..a3429ea 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1866,6 +1866,22 @@ INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__l } /********************************************************************* + * _iswblank_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswblank_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, locale ); +} + +/********************************************************************* + * iswblank (MSVCRT.@) + */ +INT CDECL MSVCRT_iswblank( MSVCRT_wchar_t wc ) +{ + return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, NULL ); +} + +/********************************************************************* * wcscpy_s (MSVCRT.@) */ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 5a1f8dc..213700f 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -90,6 +90,8 @@ static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); static int (CDECL *p__iswctype_l)(int,int,_locale_t); +static int (CDECL *p_iswblank)(int); +static int (CDECL *p__iswblank_l)(wint_t,_locale_t); static void test__initialize_onexit_table(void) { @@ -388,6 +390,8 @@ static BOOL init(void) p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); + p_iswblank = (void*)GetProcAddress(module, "iswblank"); + p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); return TRUE; } @@ -493,9 +497,13 @@ static void test_isblank(void) todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); + ok(p_iswblank(c), "%d should be blank\n", c); + ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { todo_wine_if(c == 0xa0) { ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!p_iswblank(c), "%d shouldn't be blank\n", c); + ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9c0b807..79ba494 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -508,7 +508,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -2362,7 +2362,7 @@ @ cdecl iswalnum(long) MSVCRT_iswalnum @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii -@ stub iswblank +@ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl @ cdecl iswctype(long long) ntdll.iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit

1 0

Nikolay Sivov : dwrite: Use transformed glyph origins in glyph run analysis.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: da697572dca0663fd010cc78db342328757f54ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=da697572dca0663fd010cc78d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:17 2017 +0300 dwrite: Use transformed glyph origins in glyph run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 207 +++++++++++++++++------------------------------------ 1 file changed, 64 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da697572dca0663fd010c…

1 0

Nikolay Sivov : dwrite: Use scaled font size in glyph run analysis.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: b66f187e2407151554d52abb753ae800bbc98d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66f187e2407151554d52abb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:18 2017 +0300 dwrite: Use scaled font size in glyph run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 27f5040..096c7f3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -170,7 +170,6 @@ struct dwrite_glyphrunanalysis { DWRITE_TEXTURE_TYPE texture_type; /* derived from rendering mode specified on creation */ DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */ DWRITE_MATRIX m; - FLOAT ppdip; UINT16 *glyphs; D2D_POINT_2F *origins; @@ -4820,7 +4819,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface; - glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; + glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -4912,7 +4911,7 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface; - glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; + glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); glyph_bitmap.type = analysis->texture_type; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) @@ -5140,9 +5139,9 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->flags = 0; analysis->bitmap = NULL; analysis->max_glyph_bitmap_size = 0; - analysis->ppdip = desc->ppdip; SetRectEmpty(&analysis->bounds); analysis->run = *desc->run; + analysis->run.fontEmSize *= desc->ppdip; IDWriteFontFace_AddRef(analysis->run.fontFace); analysis->glyphs = heap_alloc(desc->run->glyphCount * sizeof(*analysis->glyphs)); analysis->origins = heap_alloc(desc->run->glyphCount * sizeof(*analysis->origins));

1 0

Nikolay Sivov : dwrite: Use user transform when rendering individual glyphs.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 1809ff900486016fb6f99a4e12b8846a1024fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1809ff900486016fb6f99a4e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:19 2017 +0300 dwrite: Use user transform when rendering individual glyphs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 2c34851..2a926d7 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -691,9 +691,8 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) embolden_glyph(glyph_copy, bitmap->emsize); - if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) - pFT_Glyph_Transform(glyph_copy, &m, NULL); - + /* Includes oblique and user transform. */ + pFT_Glyph_Transform(glyph_copy, &m, NULL); pFT_Glyph_Get_CBox(glyph_copy, FT_GLYPH_BBOX_PIXELS, &bbox); pFT_Done_Glyph(glyph_copy); } @@ -851,8 +850,8 @@ BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) embolden_glyph(glyph_copy, bitmap->emsize); - if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) - pFT_Glyph_Transform(glyph_copy, &m, NULL); + /* Includes oblique and user transform. */ + pFT_Glyph_Transform(glyph_copy, &m, NULL); glyph = glyph_copy; } }

1 0