August 2013 - Wine-commits - list.winehq.org

Nikolay Sivov : xmllite: Improve attribute value parsing.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: a04064b8868762ebd38aecaafd5d9f1e1a14844a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04064b8868762ebd38aecaaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 19 10:46:49 2013 +0400 xmllite: Improve attribute value parsing. --- dlls/xmllite/reader.c | 94 ++++++++++++++++++++++++++++++++++++++++++- dlls/xmllite/tests/reader.c | 10 +++++ 2 files changed, 102 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4dc8185..efdc6ff 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1766,12 +1766,99 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc return S_OK; } +/* Applies normalization rules to a single char, used for attribute values. + + Rules include 2 steps: + + 1) replacing \r\n with a single \n; + 2) replacing all whitespace chars with ' '. + + */ +static void reader_normalize_space(xmlreader *reader, WCHAR *ptr) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + if (!is_wchar_space(*ptr)) return; + + if (*ptr == '\r' && *(ptr+1) == '\n') + { + int len = buffer->written - ((char*)ptr - buffer->data) - 2*sizeof(WCHAR); + memmove(ptr+1, ptr+2, len); + } + *ptr = ' '; +} + /* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' [67] Reference ::= EntityRef | CharRef [68] EntityRef ::= '&' Name ';' */ static HRESULT reader_parse_reference(xmlreader *reader) { - FIXME("References not supported\n"); + WCHAR *start = reader_get_cur(reader), *ptr; + WCHAR ch = 0; + int len; + + /* skip '&' */ + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + if (*ptr == '#') + { + encoded_buffer *buffer = &reader->input->buffer->utf16; + + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + /* hex char or decimal */ + if (*ptr == 'x') + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + while (*ptr != ';') + { + if ((*ptr >= '0' && *ptr <= '9')) + ch = ch*16 + *ptr - '0'; + else if ((*ptr >= 'a' && *ptr <= 'f')) + ch = ch*16 + *ptr - 'a' + 10; + else if ((*ptr >= 'A' && *ptr <= 'F')) + ch = ch*16 + *ptr - 'A' + 10; + else + return ch ? WC_E_SEMICOLON : WC_E_HEXDIGIT; + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + else + { + while (*ptr != ';') + { + if ((*ptr >= '0' && *ptr <= '9')) + { + ch = ch*10 + *ptr - '0'; + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + else + return ch ? WC_E_SEMICOLON : WC_E_DIGIT; + } + } + + if (!is_char(ch)) return WC_E_XMLCHARACTER; + + /* normalize */ + if (is_wchar_space(ch)) ch = ' '; + + len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); + memmove(start+1, ptr+1, len); + buffer->cur = (char*)start; + + *start = ch; + + return S_OK; + } + else + FIXME("Entity references not supported\n"); + return E_NOTIMPL; } @@ -1806,7 +1893,10 @@ static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) if (FAILED(hr)) return hr; } else + { + reader_normalize_space(reader, ptr); reader_skipn(reader, 1); + } ptr = reader_get_cur(reader); } @@ -1848,7 +1938,7 @@ static HRESULT reader_parse_attribute(xmlreader *reader) hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; - TRACE("%s=\"%s\"\n", debugstr_wn(local.str, local.len), debugstr_wn(value.str, value.len)); + TRACE("%s=%s\n", debugstr_wn(local.str, local.len), debugstr_wn(value.str, value.len)); return reader_add_attr(reader, &local, &value); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 6d81482..b53c044 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1571,6 +1571,16 @@ static struct test_entry attributes_tests[] = { { "<a attr1=\'a\"ttrvalue\'/>", "attr1", "a\"ttrvalue", S_OK }, { "<a attr1=\' \'/>", "attr1", " ", S_OK }, { "<a attr1=\" \"/>", "attr1", " ", S_OK }, + { "<a attr1=\"\r\n \r \n \t\n\r\"/>", "attr1", " ", S_OK }, + { "<a attr1=\" val \"/>", "attr1", " val ", S_OK }, + { "<a attr1=\"\r\n\tval\n\"/>", "attr1", " val ", S_OK }, + { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, + { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, + { "<a attr1=\"val\"/>", NULL, NULL, WC_E_XMLCHARACTER }, + { "<a attr1=\"val &#a;\"/>", NULL, NULL, WC_E_DIGIT, WC_E_SEMICOLON }, + { "<a attr1=\"val &#12a;\"/>", NULL, NULL, WC_E_SEMICOLON }, + { "<a attr1=\"val &#x12g;\"/>", NULL, NULL, WC_E_SEMICOLON }, + { "<a attr1=\"val &#xg;\"/>", NULL, NULL, WC_E_HEXDIGIT, WC_E_SEMICOLON }, { "<a attr1=attrvalue/>", NULL, NULL, WC_E_QUOTE }, { "<a attr1=\"attr<value\"/>", NULL, NULL, WC_E_LESSTHAN }, { NULL }

1 0

Henri Verbeet : wined3d: Avoid some redundant state_pscale() calls.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: c1a7323fac49852010a690dc292c765b075ff350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a7323fac49852010a690dc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:50 2013 +0200 wined3d: Avoid some redundant state_pscale() calls. --- dlls/wined3d/state.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9fc7840..ffc3101 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4677,10 +4677,6 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), vp.width, vp.height); } - - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) - state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); - checkGLcall("glViewport"); } @@ -4688,7 +4684,8 @@ void viewport_vertexpart(struct wined3d_context *context, const struct wined3d_s { if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)) + && state->render_states[WINED3D_RS_POINTSCALEENABLE]) state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); /* Update the position fixup. */ context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POS_FIXUP;

1 0

Henri Verbeet : wined3d: Store the immediate mode fixed function attribute submission function pointers in struct wined3d_d3d_info .
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: b2721d5f9ce52c90bb25a090ddcddc48a8885a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2721d5f9ce52c90bb25a090d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:51 2013 +0200 wined3d: Store the immediate mode fixed function attribute submission function pointers in struct wined3d_d3d_info. --- dlls/wined3d/directx.c | 252 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 21 ++-- dlls/wined3d/wined3d_private.h | 23 +++-- 3 files changed, 145 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2721d5f9ce52c90bb25a…

1 0

Henri Verbeet : wined3d: Use the "adapter" local variable in swapchain_init ().
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 390543dd02c009960938464b934a1a811f1da399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390543dd02c009960938464b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:52 2013 +0200 wined3d: Use the "adapter" local variable in swapchain_init(). --- dlls/wined3d/swapchain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ce54aeb..f6cfc2e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -925,7 +925,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 mode.refresh_rate = desc->refresh_rate; mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, adapter->ordinal, &mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); goto err; @@ -944,7 +944,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 WINED3DFMT_S1_UINT_D15_UNORM }; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); if (!swapchain->context)

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTXFILE.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 34743e7044d845238451d4f150f3a0c1cf5aba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34743e7044d845238451d4f15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:53 2013 +0200 d3drm: Avoid LPDIRECTXFILE. --- dlls/d3drm/d3drm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3b653de..823d90a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1353,7 +1353,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame3 *parent_frame) { DXFILELOADOPTIONS load_options; - LPDIRECTXFILE pDXFile = NULL; + IDirectXFile *file = NULL; LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEDATA pData = NULL; HRESULT hr; @@ -1387,15 +1387,15 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v return E_NOTIMPL; } - hr = DirectXFileCreate(&pDXFile); + hr = DirectXFileCreate(&file); if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_RegisterTemplates(pDXFile, templates, strlen(templates)); + hr = IDirectXFile_RegisterTemplates(file, templates, strlen(templates)); if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_CreateEnumObject(pDXFile, source, load_options, &pEnumObject); + hr = IDirectXFile_CreateEnumObject(file, source, load_options, &pEnumObject); if (hr != DXFILE_OK) goto end; @@ -1460,8 +1460,8 @@ end: IDirectXFileData_Release(pData); if (pEnumObject) IDirectXFileEnumObject_Release(pEnumObject); - if (pDXFile) - IDirectXFile_Release(pDXFile); + if (file) + IDirectXFile_Release(file); return ret; }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTXFILEENUMOBJECT.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: db2d54ffd026d124d4ad3f59779c6d1e07cc8aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2d54ffd026d124d4ad3f597… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:54 2013 +0200 d3drm: Avoid LPDIRECTXFILEENUMOBJECT. --- dlls/d3drm/d3drm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 823d90a..097d141 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1354,7 +1354,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v { DXFILELOADOPTIONS load_options; IDirectXFile *file = NULL; - LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; + IDirectXFileEnumObject *enum_object = NULL; LPDIRECTXFILEDATA pData = NULL; HRESULT hr; const GUID* pGuid; @@ -1395,11 +1395,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_CreateEnumObject(file, source, load_options, &pEnumObject); + hr = IDirectXFile_CreateEnumObject(file, source, load_options, &enum_object); if (hr != DXFILE_OK) goto end; - hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); if (hr != DXFILE_OK) goto end; @@ -1433,7 +1433,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v while (1) { - hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); if (hr == DXFILEERR_NOMOREOBJECTS) { TRACE("No more object\n"); @@ -1458,8 +1458,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v end: if (pData) IDirectXFileData_Release(pData); - if (pEnumObject) - IDirectXFileEnumObject_Release(pEnumObject); + if (enum_object) + IDirectXFileEnumObject_Release(enum_object); if (file) IDirectXFile_Release(file);

1 0

Jactry Zeng : include: Add definition of ST_UNICODE.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: c9466dfea42cdae2b73c628b52e33c81d864b0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9466dfea42cdae2b73c628b5… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Mon Aug 19 09:24:13 2013 +0800 include: Add definition of ST_UNICODE. --- include/richedit.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/richedit.h b/include/richedit.h index 095cc8a..6b27fc9 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -1067,8 +1067,8 @@ typedef struct _settextex { #define ST_DEFAULT 0x00000000 #define ST_KEEPUNDO 0x00000001 #define ST_SELECTION 0x00000002 - #define ST_NEWCHARS 0x00000004 +#define ST_UNICODE 0x00000008 #ifdef __cplusplus }

1 0

Jacek Caban : winetest: Prevent caching winehq snapshot.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: tools Branch: master Commit: 08e0ef8907c9925bf9480ae1450adfd74507df42 URL: http://source.winehq.org/git/tools.git/?a=commit;h=08e0ef8907c9925bf9480ae1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 18 16:26:02 2013 +0200 winetest: Prevent caching winehq snapshot. --- winetest/tests/winehq_snapshot/.htaccess | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/winetest/tests/winehq_snapshot/.htaccess b/winetest/tests/winehq_snapshot/.htaccess new file mode 100644 index 0000000..44894fd --- /dev/null +++ b/winetest/tests/winehq_snapshot/.htaccess @@ -0,0 +1,9 @@ +<FilesMatch ".(html|htm|js|css)$"> +FileETag None +<ifModule mod_headers.c> +Header unset ETag +Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" +Header set Pragma "no-cache" +Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" +</ifModule> +</FilesMatch>

1 0

Alexandre Julliard : testbot: Enable storing result files for wine-patches tests.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: tools Branch: master Commit: f6052bbfaad14c80057ed7659caaa38b7ab5c307 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6052bbfaad14c80057ed765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 19:22:54 2013 +0200 testbot: Enable storing result files for wine-patches tests. --- testbot/bin/WineSendLog.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 87be910..3c3ff8c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -449,7 +449,7 @@ EOF } my $Patch = $Job->Patch; - if (0 and defined $Patch->WebPatchId and -d "$DataDir/webpatches") + if (defined $Patch->WebPatchId and -d "$DataDir/webpatches") { my $BaseName = "$DataDir/webpatches/" . $Patch->WebPatchId; if ($Messages)

1 0

Frédéric Delanoy : winedev: Use 'quote' tags instead of double quotes.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: docs Branch: master Commit: 362ce222bc2a9ad3f60dbd27dc95f06ffb9768c7 URL: http://source.winehq.org/git/docs.git/?a=commit;h=362ce222bc2a9ad3f60dbd27d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:38 2013 +0200 winedev: Use 'quote' tags instead of double quotes. This way they can be adapted e.g. for translations. Also use single quotes for individual characters --- en/winedev-architecture.sgml | 16 ++++++++-------- en/winedev-coding.sgml | 21 ++++++++++----------- en/winedev-debugger.sgml | 36 ++++++++++++++++++------------------ en/winedev-documentation.sgml | 34 ++++++++++++++++------------------ en/winedev-kernel.sgml | 14 +++++++------- en/winedev-ole.sgml | 32 ++++++++++++++++---------------- en/winedev-opengl.sgml | 16 ++++++++-------- en/winedev-otherdebug.sgml | 6 +++--- en/winedev-testing.sgml | 12 ++++++------ en/winedev-windowing.sgml | 8 ++++---- 10 files changed, 96 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=362ce222bc2a9ad3f60db…

1 0