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

Piotr Caban : msvcr120: Add fegetenv implementation.
by Alexandre Julliard July 5, 2016

July 5, 2016

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

Michael Stefaniuc : ole32: Standardize COM aggregation for the FreeThreadedMarshaler.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: a60b1897871ca895c6a8abb9294b7ea7f55818ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60b1897871ca895c6a8abb92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 09:54:38 2016 +0200 ole32: Standardize COM aggregation for the FreeThreadedMarshaler. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ftmarshal.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 21d9c9a..3eb7f87 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -39,16 +39,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef struct _FTMarshalImpl { - IUnknown IUnknown_iface; - LONG ref; + IUnknown IUnknown_inner; IMarshal IMarshal_iface; - - IUnknown *pUnkOuter; + IUnknown *outer_unk; + LONG ref; } FTMarshalImpl; static inline FTMarshalImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, FTMarshalImpl, IUnknown_iface); + return CONTAINING_RECORD(iface, FTMarshalImpl, IUnknown_inner); } static inline FTMarshalImpl *impl_from_IMarshal( IMarshal *iface ) @@ -67,7 +66,7 @@ IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv) *ppv = NULL; if (IsEqualIID (&IID_IUnknown, riid)) - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; else if (IsEqualIID (&IID_IMarshal, riid)) *ppv = &This->IMarshal_iface; else { @@ -113,7 +112,7 @@ FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppv); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI @@ -123,7 +122,7 @@ FTMarshalImpl_AddRef (LPMARSHAL iface) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("\n"); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI @@ -133,7 +132,7 @@ FTMarshalImpl_Release (LPMARSHAL iface) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("\n"); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI @@ -342,12 +341,12 @@ HRESULT WINAPI CoCreateFreeThreadedMarshaler (LPUNKNOWN punkOuter, LPUNKNOWN * p if (!ftm) return E_OUTOFMEMORY; - ftm->IUnknown_iface.lpVtbl = &iunkvt; + ftm->IUnknown_inner.lpVtbl = &iunkvt; ftm->IMarshal_iface.lpVtbl = &ftmvtbl; ftm->ref = 1; - ftm->pUnkOuter = punkOuter ? punkOuter : &ftm->IUnknown_iface; + ftm->outer_unk = punkOuter ? punkOuter : &ftm->IUnknown_inner; - *ppunkMarshal = &ftm->IUnknown_iface; + *ppunkMarshal = &ftm->IUnknown_inner; return S_OK; }

1 0

Huw Davies : gdi32: Use the add_rect() helper to add a rectangle.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 0e93387d9bc7cab85631efcc4dbc00c810c0221a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e93387d9bc7cab85631efcc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 09:05:43 2016 +0100 gdi32: Use the add_rect() helper to add a rectangle. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 47daab9..55bd04d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2592,18 +2592,15 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re RECT *rects; POINT *pts; struct point_block *pb; - int i; + int i, size; RECT *extents; - INT numRects; extents = &reg->extents; - for (pb = FirstPtBlock, numRects = 0; pb; pb = pb->next) numRects += pb->count; - if (!init_region( reg, numRects )) return FALSE; + for (pb = FirstPtBlock, size = 0; pb; pb = pb->next) size += pb->count; + if (!init_region( reg, size )) return FALSE; - reg->size = numRects; rects = reg->rects - 1; - numRects = 0; extents->left = LARGE_COORDINATE, extents->right = SMALL_COORDINATE; for (pb = FirstPtBlock; pb; pb = pb->next) @@ -2613,34 +2610,31 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re for (pts = pb->pts; i--; pts += 2) { if (pts->x == pts[1].x) continue; - if (numRects && pts->x == rects->left && pts->y == rects->bottom && + if (reg->numRects && pts->x == rects->left && pts->y == rects->bottom && pts[1].x == rects->right && - (numRects == 1 || rects[-1].top != rects->top) && + (reg->numRects == 1 || rects[-1].top != rects->top) && (i && pts[2].y > pts[1].y)) { rects->bottom = pts[1].y + 1; continue; } - numRects++; + add_rect( reg, pts[0].x, pts[0].y, pts[1].x, pts[1].y + 1 ); rects++; - rects->left = pts->x; rects->top = pts->y; - rects->right = pts[1].x; rects->bottom = pts[1].y + 1; - if (rects->left < extents->left) - extents->left = rects->left; - if (rects->right > extents->right) - extents->right = rects->right; + if (pts[0].x < extents->left) + extents->left = pts[0].x; + if (pts[1].x > extents->right) + extents->right = pts[1].x; } } - if (numRects) { - extents->top = reg->rects->top; - extents->bottom = rects->bottom; + if (reg->numRects) { + extents->top = reg->rects[0].top; + extents->bottom = reg->rects[reg->numRects-1].bottom; } else { extents->left = 0; extents->top = 0; extents->right = 0; extents->bottom = 0; } - reg->numRects = numRects; return(TRUE); }

1 0

Frédéric Delanoy : French translation for release 1.9.13
by Jeremy Newman July 5, 2016

July 5, 2016

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

Frédéric Delanoy : French translation for release 1.8.3
by Jeremy Newman July 5, 2016

July 5, 2016

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 : Fix French translation for releases 1.8.[1, 2]
by Jeremy Newman July 5, 2016

July 5, 2016

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

Hans Leidekker : webservices: Support more text value types in the writer.
by Alexandre Julliard July 4, 2016

July 4, 2016

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

Hans Leidekker : webservices: Insert start/ end element nodes at the same time in the reader.
by Alexandre Julliard July 4, 2016

July 4, 2016

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 July 4, 2016

July 4, 2016

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: Add support for UTF-16 text values in the writer.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 45824850a6d3d1189d78b0e7477836e8566fbff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45824850a6d3d1189d78b0e74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:42 2016 +0200 webservices: Add support for UTF-16 text values in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 305 ++++++++++++++++++++-------------------------- include/webservices.h | 6 + 2 files changed, 141 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45824850a6d3d1189d78b…

1 0