September 2016 - Wine-Commits

Hans Leidekker : webservices: Implement WsSendMessage.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 1032b6856884f5b9ac41363e59c297f5f1567cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=1032b6856884f5b9ac41363e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:38:04 2016 +0200 webservices: Implement WsSendMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 2 +- dlls/webservices/channel.c | 208 +++++++++++++++++++++++++++++++++ dlls/webservices/msg.c | 122 +++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 8 ++ 5 files changed, 340 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1032b6856884f5b9ac413…

1 0

Hans Leidekker : webservices: Use public channel functions in the service proxy implementation.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: c8a1b56c47d79ef33d502192401daebd67845165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a1b56c47d79ef33d5021924… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:38:01 2016 +0200 webservices: Use public channel functions in the service proxy implementation. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 26 +++++++++++++++++++++----- dlls/webservices/proxy.c | 31 ++++++++++++++++--------------- dlls/webservices/webservices_private.h | 15 --------------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 0277d51..799c15a 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -84,6 +84,15 @@ static const struct prop_desc channel_props[] = { sizeof(ULONG), FALSE } /* WS_CHANNEL_PROPERTY_MAX_HTTP_REQUEST_HEADERS_BUFFER_SIZE */ }; +struct channel +{ + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + WS_CHANNEL_STATE state; + ULONG prop_count; + struct prop prop[sizeof(channel_props)/sizeof(channel_props[0])]; +}; + static struct channel *alloc_channel(void) { static const ULONG count = sizeof(channel_props)/sizeof(channel_props[0]); @@ -96,13 +105,14 @@ static struct channel *alloc_channel(void) return ret; } -void free_channel( struct channel *channel ) +static void free_channel( struct channel *channel ) { + if (!channel) return; heap_free( channel ); } -HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, - const WS_CHANNEL_PROPERTY *properties, ULONG count, struct channel **ret ) +static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, + const WS_CHANNEL_PROPERTY *properties, ULONG count, struct channel **ret ) { struct channel *channel; ULONG i, msg_size = 65536; @@ -207,8 +217,14 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID return prop_set( channel->prop, channel->prop_count, id, value, size ); } -HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint ) +static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint ) { + if (endpoint->headers || endpoint->extensions || endpoint->identity) + { + FIXME( "headers, extensions or identity not supported\n" ); + return E_NOTIMPL; + } + channel->state = WS_CHANNEL_STATE_OPEN; return S_OK; } @@ -231,7 +247,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return open_channel( channel, endpoint ); } -HRESULT close_channel( struct channel *channel ) +static HRESULT close_channel( struct channel *channel ) { channel->state = WS_CHANNEL_STATE_CLOSED; return S_OK; diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 5ff07f7..96ac1ad 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -43,7 +43,7 @@ static const struct prop_desc proxy_props[] = struct proxy { - struct channel *channel; + WS_CHANNEL *channel; ULONG prop_count; struct prop prop[sizeof(proxy_props)/sizeof(proxy_props[0])]; }; @@ -62,11 +62,12 @@ static struct proxy *alloc_proxy(void) static void free_proxy( struct proxy *proxy ) { - free_channel( proxy->channel ); + if (!proxy) return; + WsFreeChannel( proxy->channel ); heap_free( proxy ); } -static HRESULT create_proxy( struct channel *channel, const WS_PROXY_PROPERTY *properties, ULONG count, +static HRESULT create_proxy( WS_CHANNEL *channel, const WS_PROXY_PROPERTY *properties, ULONG count, WS_SERVICE_PROXY **handle ) { struct proxy *proxy; @@ -102,7 +103,7 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE const ULONG channel_props_count, WS_SERVICE_PROXY **handle, WS_ERROR *error ) { - struct channel *channel; + WS_CHANNEL *channel; HRESULT hr; TRACE( "%u %u %p %p %u %p %u %p %p\n", type, binding, desc, proxy_props, proxy_props_count, @@ -112,11 +113,11 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE if (!handle) return E_INVALIDARG; - if ((hr = create_channel( type, binding, channel_props, channel_props_count, &channel )) != S_OK) - return hr; + if ((hr = WsCreateChannel( type, binding, channel_props, channel_props_count, NULL, &channel, + NULL )) != S_OK) return hr; if ((hr = create_proxy( channel, proxy_props, proxy_props_count, handle )) != S_OK) - free_channel( channel ); + WsFreeChannel( channel ); return hr; } @@ -133,7 +134,7 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, const WS_CHANNEL_PROPERTY *channel_props = NULL; ULONG channel_props_count = 0; WS_CHANNEL_BINDING binding; - struct channel *channel; + WS_CHANNEL *channel; HRESULT hr; TRACE( "%u %p %u %u %p %u %p %u %p %p\n", channel_type, properties, count, type, value, size, desc, @@ -172,12 +173,10 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, return E_NOTIMPL; } - if ((hr = create_channel( channel_type, binding, channel_props, channel_props_count, &channel )) != S_OK) - return hr; - - if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) - free_channel( channel ); + if ((hr = WsCreateChannel( channel_type, binding, channel_props, channel_props_count, NULL, + &channel, NULL )) != S_OK) return hr; + if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) WsFreeChannel( channel ); return hr; } @@ -218,7 +217,8 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - return open_channel( proxy->channel, endpoint ); + if (!handle || !endpoint) return E_INVALIDARG; + return WsOpenChannel( proxy->channel, endpoint, NULL, NULL ); } /************************************************************************** @@ -232,7 +232,8 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - return close_channel( proxy->channel ); + if (!handle) return E_INVALIDARG; + return WsCloseChannel( proxy->channel, NULL, NULL ); } /************************************************************************** diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 9da0e1f..42cd67c 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -90,21 +90,6 @@ void prop_init( const struct prop_desc *, ULONG, struct prop *, void * ) DECLSPE HRESULT prop_set( const struct prop *, ULONG, ULONG, const void *, ULONG ) DECLSPEC_HIDDEN; HRESULT prop_get( const struct prop *, ULONG, ULONG, void *, ULONG ) DECLSPEC_HIDDEN; -struct channel -{ - WS_CHANNEL_TYPE type; - WS_CHANNEL_BINDING binding; - WS_CHANNEL_STATE state; - ULONG prop_count; - struct prop prop[50]; -}; - -HRESULT create_channel( WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY *, - ULONG, struct channel ** ) DECLSPEC_HIDDEN; -void free_channel( struct channel * ) DECLSPEC_HIDDEN; -HRESULT open_channel( struct channel *, const WS_ENDPOINT_ADDRESS * ) DECLSPEC_HIDDEN; -HRESULT close_channel( struct channel * ) DECLSPEC_HIDDEN; - static inline BOOL is_nil_value( const char *value, ULONG size ) { ULONG i;

1 0

Piotr Caban : msvcp140: Fix codecvt RTTI data.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 82448136944462edcdf052edafbb6df666e840a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82448136944462edcdf052eda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 28 07:24:38 2016 +0200 msvcp140: Fix codecvt RTTI data. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5c22577..b9abe8b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11196,9 +11196,15 @@ DEFINE_RTTI_DATA2(ctype_char, 0, &ctype_base_rtti_base_descriptor, &locale_facet DEFINE_RTTI_DATA2(ctype_wchar, 0, &ctype_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$ctype(a)_W@std@@") DEFINE_RTTI_DATA2(ctype_short, 0, &ctype_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$ctype(a)G@std@@") DEFINE_RTTI_DATA1(codecvt_base, 0, &locale_facet_rtti_base_descriptor, ".?AVcodecvt_base(a)std@@") +#if _MSVCP_VER >= 140 +DEFINE_RTTI_DATA2(codecvt_char, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt(a)DDU_Mbstatet@@@std@@") +DEFINE_RTTI_DATA2(codecvt_wchar, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt(a)_WDU_Mbstatet@@@std@@") +DEFINE_RTTI_DATA2(codecvt_short, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt(a)GDU_Mbstatet@@@std@@") +#else DEFINE_RTTI_DATA2(codecvt_char, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt(a)DDH@std@@") DEFINE_RTTI_DATA2(codecvt_wchar, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt(a)_WDH@std@@") DEFINE_RTTI_DATA2(codecvt_short, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt(a)GDH@std@@") +#endif DEFINE_RTTI_DATA1(numpunct_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$numpunct(a)D@std@@") DEFINE_RTTI_DATA1(numpunct_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$numpunct(a)_W@std@@") DEFINE_RTTI_DATA1(numpunct_short, 0, &locale_facet_rtti_base_descriptor, ".?AV?$numpunct(a)G@std@@")

1 0

Alexandre Julliard : winex11: Export the TIMESTAMP clipboard property.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 89f2dafe503d2f698327a9e2db87f38de90abff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f2dafe503d2f698327a9e2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 11:38:47 2016 +0900 winex11: Export the TIMESTAMP clipboard property. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 9c22f85..f56fd4f 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -131,6 +131,7 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL X11DRV_CLIPBOARD_ReadProperty( Display *display, Window w, Atom prop, Atom *type, unsigned char **data, unsigned long *datasize ); @@ -176,6 +177,7 @@ static const struct { HTMLFormatW, 0, XATOM_text_html, import_data, export_text_html }, { 0, 0, XATOM_TARGETS, import_targets, export_targets }, { 0, 0, XATOM_MULTIPLE, NULL, export_multiple }, + { 0, 0, XATOM_TIMESTAMP, NULL, export_timestamp }, }; static struct list format_list = LIST_INIT( format_list ); @@ -1552,6 +1554,19 @@ static BOOL export_multiple( Display *display, Window win, Atom prop, Atom targe } +/*********************************************************************** + * export_timestamp + * + * Export the timestamp that was used to acquire the selection + */ +static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +{ + Time time = CurrentTime; /* FIXME */ + put_property( display, win, prop, XA_INTEGER, 32, &time, 1 ); + return TRUE; +} + + /************************************************************************** * X11DRV_CLIPBOARD_GetProperty * Gets type, data and size. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 116e9ae..5e8d85f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -400,6 +400,7 @@ enum x11drv_atoms XATOM_SELECTION_DATA, XATOM_TARGETS, XATOM_TEXT, + XATOM_TIMESTAMP, XATOM_UTF8_STRING, XATOM_RAW_ASCENT, XATOM_RAW_DESCENT, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7e7835b..1c4ecfd 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -111,6 +111,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "SELECTION_DATA", "TARGETS", "TEXT", + "TIMESTAMP", "UTF8_STRING", "RAW_ASCENT", "RAW_DESCENT",

1 0

Alexandre Julliard : winex11: Add clipboard support for the polymorphic TEXT format.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: f59c076d13fe15d837e6a830f9f563624bc56a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59c076d13fe15d837e6a830f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 11:38:23 2016 +0900 winex11: Add clipboard support for the polymorphic TEXT format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 314b916..9c22f85 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -115,12 +115,14 @@ static HANDLE import_image_bmp( Atom type, const void *data, size_t size ); static HANDLE import_string( Atom type, const void *data, size_t size ); static HANDLE import_utf8_string( Atom type, const void *data, size_t size ); static HANDLE import_compound_text( Atom type, const void *data, size_t size ); +static HANDLE import_text( Atom type, const void *data, size_t size ); static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ); static HANDLE import_targets( Atom type, const void *data, size_t size ); static BOOL export_data( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +static BOOL export_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); @@ -154,6 +156,7 @@ static const struct { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text }, { 0, CF_UNICODETEXT, XA_STRING, import_string, export_string }, { 0, CF_UNICODETEXT, XATOM_text_plain, import_string, export_string }, + { 0, CF_UNICODETEXT, XATOM_TEXT, import_text, export_text }, { 0, CF_SYLK, XATOM_WCF_SYLK, import_data, export_data }, { 0, CF_DIF, XATOM_WCF_DIF, import_data, export_data }, { 0, CF_TIFF, XATOM_WCF_TIFF, import_data, export_data }, @@ -715,6 +718,21 @@ static HANDLE import_compound_text( Atom type, const void *data, size_t size ) /************************************************************************** + * import_text + * + * Import XA_TEXT, converting the string to CF_UNICODETEXT. + */ +static HANDLE import_text( Atom type, const void *data, size_t size ) +{ + if (type == XA_STRING) return import_string( type, data, size ); + if (type == x11drv_atom(UTF8_STRING)) return import_utf8_string( type, data, size ); + if (type == x11drv_atom(COMPOUND_TEXT)) return import_compound_text( type, data, size ); + FIXME( "unsupported TEXT type %s\n", debugstr_xatom( type )); + return 0; +} + + +/************************************************************************** * import_pixmap * * Import XA_PIXMAP, converting the image to CF_DIB. @@ -1112,6 +1130,17 @@ static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom ta /************************************************************************** + * export_text + * + * Export CF_UNICODE to the polymorphic TEXT type, using UTF8. + */ +static BOOL export_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +{ + return export_utf8_string( display, win, prop, x11drv_atom(UTF8_STRING), handle ); +} + + +/************************************************************************** * export_compound_text * * Export CF_UNICODE to COMPOUND_TEXT

1 0

Alexandre Julliard : user32: Fix METAFILEPICT marshalling for 64-bit.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: ab44b31287ee54d61d96bd892fa98a4ba10f2423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab44b31287ee54d61d96bd892… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 11:34:19 2016 +0900 user32: Fix METAFILEPICT marshalling for 64-bit. Spotted by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 04d062d..0d48984 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -74,6 +74,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION clipboard_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +/* platform-independent version of METAFILEPICT */ +struct metafile_pict +{ + LONG mm; + LONG xExt; + LONG yExt; + BYTE bits[1]; +}; + /* get a debug string for a format id */ static const char *debugstr_format( UINT id ) { @@ -155,21 +164,24 @@ static HANDLE marshal_data( UINT format, HANDLE handle, data_size_t *ret_size ) case CF_METAFILEPICT: case CF_DSPMETAFILEPICT: { - METAFILEPICT *mf, *mfbits; + METAFILEPICT *mf; + struct metafile_pict *mfbits; if (!(mf = GlobalLock( handle ))) return 0; if (!(size = GetMetaFileBitsEx( mf->hMF, 0, NULL ))) { GlobalUnlock( handle ); return 0; } - *ret_size = sizeof(*mf) + size; + *ret_size = offsetof( struct metafile_pict, bits[size] ); if (!(mfbits = GlobalAlloc( GMEM_FIXED, *ret_size ))) { GlobalUnlock( handle ); return 0; } - *mfbits = *mf; - GetMetaFileBitsEx( mf->hMF, size, mfbits + 1 ); + mfbits->mm = mf->mm; + mfbits->xExt = mf->xExt; + mfbits->yExt = mf->yExt; + GetMetaFileBitsEx( mf->hMF, size, mfbits->bits ); GlobalUnlock( handle ); return mfbits; } @@ -235,9 +247,14 @@ static HANDLE unmarshal_data( UINT format, void *data, data_size_t size ) case CF_METAFILEPICT: case CF_DSPMETAFILEPICT: { - METAFILEPICT *mf = handle; - if (size <= sizeof(*mf)) break; - mf->hMF = SetMetaFileBitsEx( size - sizeof(*mf), (BYTE *)(mf + 1) ); + METAFILEPICT mf; + struct metafile_pict *mfbits = handle; + if (size <= sizeof(*mfbits)) break; + mf.mm = mfbits->mm; + mf.xExt = mfbits->xExt; + mf.yExt = mfbits->yExt; + mf.hMF = SetMetaFileBitsEx( size - offsetof( struct metafile_pict, bits ), mfbits->bits ); + *(METAFILEPICT *)handle = mf; return handle; } }

1 0

Austin English : wine.inf: Add HKLM\System\CurrentControlSet\Control\hivelist key.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: c2150301b30c13c425866b69fec1aa85a64a35eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2150301b30c13c425866b69f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 27 12:05:59 2016 -0500 wine.inf: Add HKLM\System\CurrentControlSet\Control\hivelist key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0c58d6a..a92a9fe 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -670,6 +670,7 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 +HKLM,System\CurrentControlSet\Control\hivelist,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI"

1 0

Piotr Caban : msvcp140: Add _Cnd_destroy_in_situ implementation.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 42cfb0ab0e42aeae3e55bb2d75e4fe9407584810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cfb0ab0e42aeae3e55bb2d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 28 07:24:00 2016 +0200 msvcp140: Add _Cnd_destroy_in_situ implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 14 +++++++------- dlls/msvcp90/misc.c | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c8e16fa..08f8960 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3621,17 +3621,17 @@ @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Chmod @ stub _Close_dir -@ cdecl _Cnd_broadcast(ptr) _Cnd_broadcast -@ cdecl _Cnd_destroy(ptr) _Cnd_destroy -@ stub _Cnd_destroy_in_situ +@ cdecl _Cnd_broadcast(ptr) +@ cdecl _Cnd_destroy(ptr) +@ cdecl _Cnd_destroy_in_situ(ptr) @ cdecl _Cnd_do_broadcast_at_thread_exit() -@ cdecl _Cnd_init(ptr) _Cnd_init +@ cdecl _Cnd_init(ptr) @ cdecl _Cnd_init_in_situ(ptr) @ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) -@ cdecl _Cnd_signal(ptr) _Cnd_signal -@ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait +@ cdecl _Cnd_signal(ptr) +@ cdecl _Cnd_timedwait(ptr ptr ptr) @ cdecl _Cnd_unregister_at_thread_exit(ptr) -@ cdecl _Cnd_wait(ptr ptr) _Cnd_wait +@ cdecl _Cnd_wait(ptr ptr) @ stub _Copy_file @ stub _Cosh @ stub _Current_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 885ec6f..f950bf5 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -655,6 +655,11 @@ int __cdecl _Cnd_signal(_Cnd_arg_t cnd) return 0; } +void __cdecl _Cnd_destroy_in_situ(_Cnd_t cnd) +{ + _Cnd_broadcast(CND_T_TO_ARG(cnd)); +} + void __cdecl _Cnd_destroy(_Cnd_arg_t cnd) { if(cnd) {

1 0

Andrew Eikum : wininet: Don't crash by debug printing too long URLs.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 7e841432ed54286a67566ab6eee86087f014527a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e841432ed54286a67566ab6e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 15:14:06 2016 -0500 wininet: Don't crash by debug printing too long URLs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/urlcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c6cc2ee..7db5eab 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2562,7 +2562,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(LPCSTR lpszUrlName, DWORD dwReserved) if (!urlcache_find_hash_entry(pHeader, lpszUrlName, &pHashEntry)) { cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", lpszUrlName); + TRACE("entry %s not found!\n", debugstr_a(lpszUrlName)); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -3309,7 +3309,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) if (!urlcache_find_hash_entry(pHeader, lpszUrlName, &pHashEntry)) { cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", lpszUrlName); + TRACE("entry %s not found!\n", debugstr_a(lpszUrlName)); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; }

1 0

Sebastian Lackner : user32: Call GlobalUnlock with the correct argument in SetClipboardData.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 0a1da6bce93cb13db0a4fb3fed708caa88046ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1da6bce93cb13db0a4fb3fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 27 19:01:48 2016 +0200 user32: Call GlobalUnlock with the correct argument in SetClipboardData. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 9d80813..04d062d 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -868,7 +868,7 @@ HANDLE WINAPI SetClipboardData( UINT format, HANDLE data ) void *ptr = NULL; data_size_t size = 0; HANDLE handle = data, retval = 0; - BOOL ret; + NTSTATUS status = STATUS_SUCCESS; TRACE( "%s %p\n", debugstr_format( format ), data ); @@ -888,14 +888,14 @@ HANDLE WINAPI SetClipboardData( UINT format, HANDLE data ) req->format = format; req->lcid = GetUserDefaultLCID(); wine_server_add_data( req, ptr, size ); - if ((ret = !wine_server_call_err( req ))) + if (!(status = wine_server_call( req ))) { if (cache) cache->seqno = reply->seqno; } } SERVER_END_REQ; - if (ret) + if (!status) { /* free the previous entry if any */ struct cached_format *prev; @@ -909,8 +909,9 @@ HANDLE WINAPI SetClipboardData( UINT format, HANDLE data ) LeaveCriticalSection( &clipboard_cs ); done: - if (ptr) GlobalUnlock( ptr ); + if (ptr) GlobalUnlock( handle ); if (handle != data) GlobalFree( handle ); + if (status) SetLastError( RtlNtStatusToDosError( status )); return retval; }

1 0