July 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Try to compact the region.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 6526ac1999f99a9e24ee2002219b39a9a7e2126e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6526ac1999f99a9e24ee20022… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 09:05:45 2016 +0100 gdi32: Try to compact the region. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 834e6be..646512f 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1598,6 +1598,28 @@ static INT REGION_Coalesce ( return (curStart); } +/********************************************************************** + * REGION_compact + * + * To keep regions from growing without bound, shrink the array of rectangles + * to match the new number of rectangles in the region. + * + * Only do this if the number of rectangles allocated is more than + * twice the number of rectangles in the region. + */ +static void REGION_compact( WINEREGION *reg ) +{ + if ((reg->numRects < reg->size / 2) && (reg->numRects > 2)) + { + RECT *new_rects = HeapReAlloc( GetProcessHeap(), 0, reg->rects, reg->numRects * sizeof(RECT) ); + if (new_rects) + { + reg->rects = new_rects; + reg->size = reg->numRects; + } + } +} + /*********************************************************************** * REGION_RegionOp * @@ -1839,23 +1861,7 @@ static BOOL REGION_RegionOp( REGION_Coalesce (&newReg, prevBand, curBand); } - /* - * A bit of cleanup. To keep regions from growing without bound, - * we shrink the array of rectangles to match the new number of - * rectangles in the region. This never goes to 0, however... - * - * Only do this stuff if the number of rectangles allocated is more than - * twice the number of rectangles in the region (a simple optimization...). - */ - if ((newReg.numRects < (newReg.size >> 1)) && (newReg.numRects > 2)) - { - RECT *new_rects = HeapReAlloc( GetProcessHeap(), 0, newReg.rects, newReg.numRects * sizeof(RECT) ); - if (new_rects) - { - newReg.rects = new_rects; - newReg.size = newReg.numRects; - } - } + REGION_compact( &newReg ); HeapFree( GetProcessHeap(), 0, destReg->rects ); destReg->rects = newReg.rects; destReg->size = newReg.size; @@ -2633,8 +2639,9 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re extents->right = 0; extents->bottom = 0; } + REGION_compact( reg ); - return(TRUE); + return TRUE; } /***********************************************************************

1 0

Piotr Caban : msvcr120: Add fegetenv implementation.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 1150c0454d1b93fd30bdee552ea8e82d35eda51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1150c0454d1b93fd30bdee552… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 4 11:04:23 2016 +0200 msvcr120: Add fegetenv implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 25 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 11 ++++++++++ dlls/msvcrt/msvcrt.h | 6 ++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 8d96f98..17b9861 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -88,7 +88,7 @@ @ cdecl abort() ucrtbase.abort @ cdecl exit(long) ucrtbase.exit @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) ucrtbase.fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 86f466b..a2e7832 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2144,7 +2144,7 @@ @ stub fdimf @ stub fdiml @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 6ee659f..25330f1 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -147,6 +147,12 @@ struct MSVCRT_lconv wchar_t* _W_negative_sign; }; +typedef struct +{ + unsigned int control; + unsigned int status; +} fenv_t; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -162,6 +168,8 @@ static int (CDECL *p__finite)(double); static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); +static int (CDECL *p_fegetenv)(fenv_t*); +static int (CDECL *p__clearfp)(void); /* make sure we use the correct errno */ #undef errno @@ -207,6 +215,8 @@ static BOOL init(void) p_wcstof = (void*)GetProcAddress(module, "wcstof"); p_remainder = (void*)GetProcAddress(module, "remainder"); p_errno = (void*)GetProcAddress(module, "_errno"); + SET(p_fegetenv, "fegetenv"); + SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -686,6 +696,20 @@ static void test_critical_section(void) call_func1(p_critical_section_dtor, &cs); } +static void test_fegetenv(void) +{ + int ret; + fenv_t env; + + p__clearfp(); + + ret = p_fegetenv(&env); + ok(!ret, "fegetenv returned %x\n", ret); + ok(env.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), + "env.control = %x\n", env.control); + ok(!env.status, "env.status = %x\n", env.status); +} + START_TEST(msvcr120) { if (!init()) return; @@ -699,4 +723,5 @@ START_TEST(msvcr120) test__strtof(); test_remainder(); test_critical_section(); + test_fegetenv(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e498fc7..94c0e08 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1810,7 +1810,7 @@ @ stub fdimf @ stub fdiml @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) msvcr120.fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3d2104b..e9d594c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1199,6 +1199,17 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask } /********************************************************************* + * fegetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fegetenv(fenv_t *env) +{ + env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | + MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); + env->status = _statusfp(); + return 0; +} + +/********************************************************************* * __fpe_flt_rounds (UCRTBASE.@) */ int CDECL __fpe_flt_rounds(void) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c2ab42..958ca4e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -910,6 +910,12 @@ struct MSVCRT__stat64 { #define MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS 0x03000000 #define MSVCRT__EM_AMBIGUOUS 0x80000000 +typedef struct +{ + unsigned int control; + unsigned int status; +} fenv_t; + #define MSVCRT_CLOCKS_PER_SEC 1000 /* signals */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c03a434..0d6b397 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2286,7 +2286,7 @@ @ stub fdimf @ stub fdiml @ stub feclearexcept -@ stub fegetenv +@ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept

1 0

Nikolay Sivov : dwrite: Return some of font properties from IDWriteFontFace3 methods.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 90bcff0eae717138bc7da6256c8ce61d0e1a13a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bcff0eae717138bc7da6256… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:53 2016 +0300 dwrite: Return some of font properties from IDWriteFontFace3 methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 1 - dlls/dwrite/dwrite_private.h | 17 ++++- dlls/dwrite/font.c | 144 +++++++++++++++++++++++++++++++------------ dlls/dwrite/layout.c | 1 - dlls/dwrite/main.c | 142 ++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 63 +++++++++++++++++-- 6 files changed, 264 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90bcff0eae717138bc7da…

1 0

Frédéric Delanoy : Fix French translation for releases 1.8.[1, 2]
by Jeremy Newman 05 Jul '16

05 Jul '16

Module: website Branch: master Commit: e9b338bac9c726f6514fc9983a0b3f34f76312d6 URL: http://source.winehq.org/git/website.git/?a=commit;h=e9b338bac9c726f6514fc9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 10:12:37 2016 +0200 Fix French translation for releases 1.8.[1,2] Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016020301.xml | 2 +- news/fr/2016041201.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/news/fr/2016020301.xml b/news/fr/2016020301.xml index c344fc6..e96c628 100644 --- a/news/fr/2016020301.xml +++ b/news/fr/2016020301.xml @@ -2,7 +2,7 @@ <date>3 février 2016</date> <title>Sortie de Wine 1.8.1</title> <body> - La version de maintenance 1.8.1 est disponible. + La version de maintenance 1.8.1 de Wine est disponible. <a href="{$root}/announce/1.8.1">Nouveautés</a> de cette version : <ul> <li>Diverses corrections de bugs.</li> diff --git a/news/fr/2016041201.xml b/news/fr/2016041201.xml index d5cb69a..2b153ba 100644 --- a/news/fr/2016041201.xml +++ b/news/fr/2016041201.xml @@ -2,7 +2,7 @@ <date>12 avril 2016</date> <title>Sortie de Wine 1.8.2</title> <body> - La version de maintenance 1.8.2 est disponible. + La version de maintenance 1.8.2 de Wine est disponible. <a href="{$root}/announce/1.8.2">Nouveautés</a> de cette version : <ul> <li>Diverses corrections de bugs.</li>

1 0

Frédéric Delanoy : French translation for release 1.8.3
by Jeremy Newman 05 Jul '16

05 Jul '16

Module: website Branch: master Commit: 383bb9c1a6f2660054f856cc7b3295af9d4ddbe8 URL: http://source.winehq.org/git/website.git/?a=commit;h=383bb9c1a6f2660054f856… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 10:12:36 2016 +0200 French translation for release 1.8.3 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016061601.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/fr/2016061601.xml b/news/fr/2016061601.xml new file mode 100644 index 0000000..d613a77 --- /dev/null +++ b/news/fr/2016061601.xml @@ -0,0 +1,13 @@ +<news> +<date>16 juin 2016</date> +<title>Sortie de Wine 1.8.3</title> +<body> + La version de maintenance 1.8.3 de Wine est disponible. + <a href="{$root}/announce/1.8.3">Nouveautés</a> de cette version : +<ul> + <li>Diverses corrections de bugs.</li> + <li>Beaucoup de cartes NVidia ajoutées dans la table de description de GPU.</li> + <li>Mises à jour des fichiers de prise en charge des langues nationales (NLS).</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.3.tar.bz3">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.9.13
by Jeremy Newman 05 Jul '16

05 Jul '16

Module: website Branch: master Commit: 4a6b692020b272790ef023c28a28c1988cecfece URL: http://source.winehq.org/git/website.git/?a=commit;h=4a6b692020b272790ef023… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 10:12:38 2016 +0200 French translation for release 1.9.13 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016062401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/fr/2016062401.xml b/news/fr/2016062401.xml new file mode 100644 index 0000000..1be14c9 --- /dev/null +++ b/news/fr/2016062401.xml @@ -0,0 +1,17 @@ +<news> +<date>24 juin 2016</date> +<title>Sortie de Wine 1.9.13</title> +<body> +La version de développement 1.9.13 de Wine est disponible. +<a href="{$root}/announce/1.9.13">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Gecko basée sur Firefox 47.</li> + <li>Meilleure prise en charge de Shader Model 5 dans Direct3D.</li> + <li>Données Unicode mises à jour vers Unicode 9.0.0.</li> + <li>Améliorations dans les métafichiers et chemins GDI.</li> + <li>Progrès en vue du flux de commandes Direct3D.</li> + <li>Améliorations dans la prise en charge des joysticks sous Mac OS X.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Hans Leidekker : webservices: Insert start/ end element nodes at the same time in the reader.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: e74502b8370199173496ca390fa5d366f6d60578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74502b8370199173496ca390… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:43 2016 +0200 webservices: Insert start/end element nodes at the same time in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 81 ++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8283e7a..ed59404 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -556,12 +556,7 @@ static void read_insert_bof( struct reader *reader, struct node *bof ) static void read_insert_node( struct reader *reader, struct node *parent, struct node *node ) { node->parent = parent; - if (node->parent == reader->root) - { - struct list *eof = list_tail( &reader->root->children ); - list_add_before( eof, &node->entry ); - } - else list_add_tail( &parent->children, &node->entry ); + list_add_before( list_tail( &parent->children ), &node->entry ); reader->current = reader->last = node; } @@ -1227,13 +1222,8 @@ static inline BOOL is_valid_parent( const struct node *node ) struct node *find_parent( struct node *node ) { - if (node_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT) - { - if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL; - return node->parent->parent; - } - else if (is_valid_parent( node )) return node; - else if (is_valid_parent( node->parent )) return node->parent; + if (is_valid_parent( node )) return node; + if (is_valid_parent( node->parent )) return node->parent; return NULL; } @@ -1261,15 +1251,15 @@ static HRESULT read_element( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; - struct node *node = NULL, *parent; + struct node *node = NULL, *endnode, *parent; WS_XML_ELEMENT_NODE *elem; WS_XML_ATTRIBUTE *attr = NULL; HRESULT hr = WS_E_INVALID_FORMAT; if (read_end_of_data( reader )) { - struct list *eof = list_tail( &reader->root->children ); - reader->current = LIST_ENTRY( eof, struct node, entry ); + reader->current = LIST_ENTRY( list_tail( &reader->root->children ), struct node, entry ); + reader->last = reader->current; reader->state = READER_STATE_EOF; return S_OK; } @@ -1296,6 +1286,10 @@ static HRESULT read_element( struct reader *reader ) hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; + if (!(endnode = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) goto error; + list_add_tail( &node->children, &endnode->entry ); + endnode->parent = node; + elem = (WS_XML_ELEMENT_NODE *)node; if ((hr = parse_name( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; @@ -1319,7 +1313,7 @@ static HRESULT read_element( struct reader *reader ) return S_OK; error: - free_node( node ); + destroy_nodes( node ); return hr; } @@ -1368,15 +1362,13 @@ static HRESULT read_node( struct reader * ); static HRESULT read_startelement( struct reader *reader ) { - struct node *node; - read_skip_whitespace( reader ); if (!read_cmp( reader, "/>", 2 )) { read_skip( reader, 2 ); - if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; - read_insert_node( reader, reader->current, node ); - reader->state = READER_STATE_ENDELEMENT; + reader->current = LIST_ENTRY( list_tail( &reader->current->children ), struct node, entry ); + reader->last = reader->current; + reader->state = READER_STATE_ENDELEMENT; return S_OK; } else if (!read_cmp( reader, ">", 1 )) @@ -1425,15 +1417,14 @@ static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char return 0; } -static struct node *read_find_start_element( struct reader *reader, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname ) +static struct node *read_find_startelement( struct reader *reader, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) { struct node *parent; const WS_XML_STRING *str; for (parent = reader->current; parent; parent = parent->parent) { - if (node_type( parent ) == WS_XML_NODE_TYPE_BOF) return NULL; if (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) { str = parent->hdr.prefix; @@ -1443,13 +1434,12 @@ static struct node *read_find_start_element( struct reader *reader, const WS_XML return parent; } } - return NULL; } static HRESULT read_endelement( struct reader *reader ) { - struct node *node, *parent; + struct node *parent; unsigned int len = 0, ch, skip; const unsigned char *start; WS_XML_STRING *prefix, *localname; @@ -1459,8 +1449,8 @@ static HRESULT read_endelement( struct reader *reader ) if (read_end_of_data( reader )) { - struct list *eof = list_tail( &reader->root->children ); - reader->current = LIST_ENTRY( eof, struct node, entry ); + reader->current = LIST_ENTRY( list_tail( &reader->root->children ), struct node, entry ); + reader->last = reader->current; reader->state = READER_STATE_EOF; return S_OK; } @@ -1483,14 +1473,14 @@ static HRESULT read_endelement( struct reader *reader ) } if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) return hr; - parent = read_find_start_element( reader, prefix, localname ); + parent = read_find_startelement( reader, prefix, localname ); heap_free( prefix ); heap_free( localname ); if (!parent) return WS_E_INVALID_FORMAT; - if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; - read_insert_node( reader, parent, node ); - reader->state = READER_STATE_ENDELEMENT; + reader->current = LIST_ENTRY( list_tail( &parent->children ), struct node, entry ); + reader->last = reader->current; + reader->state = READER_STATE_ENDELEMENT; return S_OK; } @@ -1536,7 +1526,7 @@ static HRESULT read_comment( struct reader *reader ) static HRESULT read_startcdata( struct reader *reader ) { - struct node *node, *parent; + struct node *node, *endnode, *parent; if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); @@ -1544,6 +1534,14 @@ static HRESULT read_startcdata( struct reader *reader ) if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; + if (!(endnode = alloc_node( WS_XML_NODE_TYPE_END_CDATA ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + list_add_tail( &node->children, &endnode->entry ); + endnode->parent = node; + read_insert_node( reader, parent, node ); reader->state = READER_STATE_STARTCDATA; return S_OK; @@ -1582,14 +1580,17 @@ static HRESULT read_cdata( struct reader *reader ) static HRESULT read_endcdata( struct reader *reader ) { - struct node *node; + struct node *parent; if (read_cmp( reader, "]]>", 3 )) return WS_E_INVALID_FORMAT; read_skip( reader, 3 ); - if (!(node = alloc_node( WS_XML_NODE_TYPE_END_CDATA ))) return E_OUTOFMEMORY; - read_insert_node( reader, reader->current->parent, node ); - reader->state = READER_STATE_ENDCDATA; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT) parent = reader->current->parent; + else parent = reader->current; + + reader->current = LIST_ENTRY( list_tail( &parent->children ), struct node, entry ); + reader->last = reader->current; + reader->state = READER_STATE_ENDCDATA; return S_OK; } @@ -1601,8 +1602,8 @@ static HRESULT read_node( struct reader *reader ) { if (read_end_of_data( reader )) { - struct list *eof = list_tail( &reader->root->children ); - reader->current = LIST_ENTRY( eof, struct node, entry ); + reader->current = LIST_ENTRY( list_tail( &reader->root->children ), struct node, entry ); + reader->last = reader->current; reader->state = READER_STATE_EOF; return S_OK; }

1 0

Hans Leidekker : webservices: Implement WsCopyNode.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 46821e27abcc42307ceca797250a90e6fefb80e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46821e27abcc42307ceca7972… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:44 2016 +0200 webservices: Implement WsCopyNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 163 ++++++++++++++++++++++++++++++++- dlls/webservices/tests/writer.c | 83 +++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + dlls/webservices/writer.c | 114 +++++++++++++++++++++++ 5 files changed, 362 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46821e27abcc42307ceca…

1 0

Hans Leidekker : webservices: Support more text value types in the writer.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: b1930ee4b8a0f77654bbab65c3bc30d721bf5d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1930ee4b8a0f77654bbab65c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:45 2016 +0200 webservices: Support more text value types in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 57 ++++++++++++++ dlls/webservices/writer.c | 166 +++++++++++++++++++++++++++------------- include/webservices.h | 30 ++++++++ 3 files changed, 201 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1930ee4b8a0f77654bba…

1 0

Michael Stefaniuc : user32: Use InflateRect() too when stretching the RECT in just one axis.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 488562904ffe5f05592da37fe9d6bd2b83548224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488562904ffe5f05592da37fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 4 09:47:27 2016 +0200 user32: Use InflateRect() too when stretching the RECT in just one axis. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 179d44a..23139e9 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2376,14 +2376,9 @@ static void EDIT_SetRectNP(EDITSTATE *es, const RECT *rc) else if (es->style & WS_BORDER) { bw = GetSystemMetrics(SM_CXBORDER) + 1; bh = GetSystemMetrics(SM_CYBORDER) + 1; - es->format_rect.left += bw; - es->format_rect.right -= bw; - if (es->format_rect.bottom - es->format_rect.top - >= es->line_height + 2 * bh) - { - es->format_rect.top += bh; - es->format_rect.bottom -= bh; - } + InflateRect(&es->format_rect, -bw, 0); + if (es->format_rect.bottom - es->format_rect.top >= es->line_height + 2 * bh) + InflateRect(&es->format_rect, 0, -bh); } es->format_rect.left += es->left_margin;

1 0