January 2013 - Wine-commits

Henri Verbeet : wined3d: Get rid of the select_shader_mode() call in wined3d_get_device_caps().
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 75a38fa2fad5ea2652351be0006f1ab60b0dffde URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a38fa2fad5ea2652351be00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:35 2013 +0100 wined3d: Get rid of the select_shader_mode() call in wined3d_get_device_caps(). The shader backend already returns the correct caps. --- dlls/wined3d/directx.c | 35 ++++------------------------------- 1 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b388af..e442734 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4528,8 +4528,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode; - int ps_selected_mode; struct shader_caps shader_caps; struct fragment_caps fragment_caps; DWORD ckey_caps, blit_caps, fx_caps, pal_caps; @@ -4540,12 +4538,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - - /* ------------------------------------------------ - The following fields apply to both d3d8 and d3d9 - ------------------------------------------------ */ - /* Not quite true, but use h/w supported by opengl I suppose */ caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; caps->AdapterOrdinal = adapter_idx; @@ -4929,30 +4921,11 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ caps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; - /* This takes care for disabling vertex shader or pixel shader caps while leaving the other one enabled. - * Ignore shader model capabilities if disabled in config - */ - if (vs_selected_mode == SHADER_NONE) - { - TRACE("Vertex shader disabled in config, reporting version 0.0.\n"); - caps->VertexShaderVersion = 0; - caps->MaxVertexShaderConst = 0; - } - else - { - caps->VertexShaderVersion = shader_caps.vs_version; - caps->MaxVertexShaderConst = shader_caps.vs_uniform_count; - } + caps->VertexShaderVersion = shader_caps.vs_version; + caps->MaxVertexShaderConst = shader_caps.vs_uniform_count; - if (ps_selected_mode == SHADER_NONE) - { - TRACE("Pixel shader disabled in config, reporting version 0.0.\n"); - caps->PixelShaderVersion = 0; - caps->PixelShader1xMaxValue = 0.0f; - } else { - caps->PixelShaderVersion = shader_caps.ps_version; - caps->PixelShader1xMaxValue = shader_caps.ps_1x_max_value; - } + caps->PixelShaderVersion = shader_caps.ps_version; + caps->PixelShader1xMaxValue = shader_caps.ps_1x_max_value; caps->TextureOpCaps = fragment_caps.TextureOpCaps; caps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages;

1 0

Henri Verbeet : wined3d: Move "ffp_proj_control" to the fragment caps.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 0e0e3b76f5af48e4f67870fa1035537bf20964af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0e3b76f5af48e4f67870fa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:36 2013 +0100 wined3d: Move "ffp_proj_control" to the fragment caps. --- dlls/wined3d/arb_program_shader.c | 11 ++++++++--- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 8 ++++++-- dlls/wined3d/nvidia_texture_shader.c | 3 +-- dlls/wined3d/shader.c | 6 +++++- dlls/wined3d/state.c | 3 +-- dlls/wined3d/wined3d_private.h | 4 +++- 7 files changed, 25 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e0e3b76f5af48e4f6787…

1 0

Henri Verbeet : wined3d: Move "vs_clipping" to the shader caps.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: c525cf381d9bb54454e04df24fde3bf5447cb537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c525cf381d9bb54454e04df24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:37 2013 +0100 wined3d: Move "vs_clipping" to the shader caps. --- dlls/wined3d/arb_program_shader.c | 4 +++- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f502260..0d0db64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5062,7 +5062,9 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh caps->ps_1x_max_value = 0.0f; } - caps->vs_clipping = use_nv_clip(gl_info); + caps->wined3d_caps = 0; + if (use_nv_clip(gl_info)) + caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; } static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 984fa3b..cedb39e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5659,7 +5659,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->ps_version = shader_caps.ps_version; device->d3d_vshader_constantF = shader_caps.vs_uniform_count; device->d3d_pshader_constantF = shader_caps.ps_uniform_count; - device->vs_clipping = shader_caps.vs_clipping; + device->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; fragment_pipeline = adapter->fragment_pipe; fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3b47358..a9ca2cd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6205,7 +6205,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s */ caps->ps_1x_max_value = 8.0; - caps->vs_clipping = TRUE; + caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 596066f..2bb5f21 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1549,7 +1549,7 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = 0; caps->ps_uniform_count = 0; caps->ps_1x_max_value = 0.0f; - caps->vs_clipping = FALSE; + caps->wined3d_caps = 0; } static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b1688d1..f59a736 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -714,6 +714,8 @@ extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); +#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 + struct shader_caps { UINT vs_version; @@ -724,7 +726,7 @@ struct shader_caps DWORD ps_uniform_count; float ps_1x_max_value; - BOOL vs_clipping; + DWORD wined3d_caps; }; enum tex_types

1 0

Nikolay Sivov : xmllite: Add a name stack for elements.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 77735419eb58624eef936c536cd168d52197fa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77735419eb58624eef936c536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 20 23:46:25 2013 +0400 xmllite: Add a name stack for elements. --- dlls/xmllite/reader.c | 67 ++++++++++++++++++++++++++++++++++++++++-- dlls/xmllite/tests/reader.c | 5 +++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 058875a..c18dd41 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -124,6 +124,12 @@ struct attribute strval value; }; +struct element +{ + struct list entry; + strval qname; +}; + typedef struct { IXmlReader IXmlReader_iface; @@ -138,6 +144,7 @@ typedef struct struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list elements; strval strvalues[StringValue_Last]; } xmlreader; @@ -194,6 +201,21 @@ static inline void reader_free(xmlreader *reader, void *mem) m_free(reader->imalloc, mem); } +static HRESULT reader_strvaldup(xmlreader *reader, const strval *src, strval *dest) +{ + *dest = *src; + + if (src->str != strval_empty.str) + { + dest->str = reader_alloc(reader, (dest->len+1)*sizeof(WCHAR)); + if (!dest->str) return E_OUTOFMEMORY; + memcpy(dest->str, src->str, dest->len*sizeof(WCHAR)); + dest->str[dest->len] = 0; + } + + return S_OK; +} + /* reader input memory allocation functions */ static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) { @@ -253,10 +275,9 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *val return S_OK; } -static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) +/* This one frees stored string value if needed */ +static void reader_free_strvalued(xmlreader *reader, strval *v) { - strval *v = &reader->strvalues[type]; - if (v->str != strval_empty.str) { reader_free(reader, v->str); @@ -264,6 +285,11 @@ static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) } } +static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) +{ + reader_free_strvalued(reader, &reader->strvalues[type]); +} + static void reader_free_strvalues(xmlreader *reader) { int type; @@ -271,6 +297,32 @@ static void reader_free_strvalues(xmlreader *reader) reader_free_strvalue(reader, type); } +static void reader_clear_elements(xmlreader *reader) +{ + struct element *elem, *elem2; + LIST_FOR_EACH_ENTRY_SAFE(elem, elem2, &reader->elements, struct element, entry) + { + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + } + list_init(&reader->elements); +} + +static HRESULT reader_push_element(xmlreader *reader, strval *qname) +{ + struct element *elem; + HRESULT hr; + + elem = reader_alloc(reader, sizeof(*elem)); + if (!elem) return E_OUTOFMEMORY; + + hr = reader_strvaldup(reader, qname, &elem->qname); + if (FAILED(hr)) return hr; + + list_add_head(&reader->elements, &elem->entry); + return hr; +} + /* always make a copy, cause strings are supposed to be null terminated */ static void reader_set_strvalue(xmlreader *reader, XmlReaderStringValue type, const strval *value) { @@ -1398,6 +1450,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) { static const WCHAR endW[] = {'/','>',0}; + static const WCHAR gtW[] = {'>',0}; HRESULT hr; /* skip '<' */ @@ -1410,7 +1463,11 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca if (!reader_cmp(reader, endW)) return S_OK; - FIXME("only empty elements without attributes supported\n"); + /* got a start tag */ + if (!reader_cmp(reader, gtW)) + return reader_push_element(reader, qname); + + FIXME("only empty elements/start tags without attribute list supported\n"); return E_NOTIMPL; } @@ -1561,6 +1618,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); reader_clear_attrs(This); + reader_clear_elements(This); reader_free_strvalues(This); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -1985,6 +2043,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->elements); for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7394564..2ef9b6a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -888,6 +888,7 @@ static const char misc_test_xml[] = "" " \t \r \n" "" + "<a>" ; static struct nodes_test misc_test = { @@ -899,6 +900,7 @@ static struct nodes_test misc_test = { XmlNodeType_Comment, XmlNodeType_Whitespace, XmlNodeType_Comment, + XmlNodeType_Element, XmlNodeType_None } }; @@ -1028,6 +1030,9 @@ static struct test_entry element_tests[] = { { "<a:b/>", "a:b", "", NC_E_UNDECLAREDPREFIX }, { "<:a/>", NULL, NULL, NC_E_QNAMECHARACTER }, { "< a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "<a>", "a", "", S_OK }, + { "<a >", "a", "", S_OK }, + { "<a \r \t\n>", "a", "", S_OK }, { NULL } };

1 0

Nikolay Sivov : xmllite: Handle empty elements and transition to content/ misc part, update depth on push.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 1ae300d75303b3b1a496bf97c116abbb92f6044f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae300d75303b3b1a496bf97c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 21 01:03:23 2013 +0400 xmllite: Handle empty elements and transition to content/misc part, update depth on push. --- dlls/xmllite/reader.c | 75 ++++++++++++++++++++++++++++++++++++------- dlls/xmllite/tests/reader.c | 37 ++++++++++++++++++--- 2 files changed, 95 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c18dd41..e0e6542 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -52,7 +52,8 @@ typedef enum XmlReadInState_DTD, XmlReadInState_DTD_Misc, XmlReadInState_Element, - XmlReadInState_Content + XmlReadInState_Content, + XmlReadInState_MiscEnd } XmlReaderInternalState; typedef enum @@ -146,6 +147,7 @@ typedef struct UINT attr_count; struct list elements; strval strvalues[StringValue_Last]; + UINT depth; } xmlreader; struct input_buffer @@ -308,6 +310,13 @@ static void reader_clear_elements(xmlreader *reader) list_init(&reader->elements); } +static HRESULT reader_inc_depth(xmlreader *reader) +{ + /* FIXME: handle XmlReaderProperty_MaxElementDepth property */ + reader->depth++; + return S_OK; +} + static HRESULT reader_push_element(xmlreader *reader, strval *qname) { struct element *elem; @@ -319,6 +328,12 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) hr = reader_strvaldup(reader, qname, &elem->qname); if (FAILED(hr)) return hr; + if (!list_empty(&reader->elements)) + { + hr = reader_inc_depth(reader); + if (FAILED(hr)) return hr; + } + list_add_head(&reader->elements, &elem->entry); return hr; } @@ -1447,7 +1462,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ -static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) { static const WCHAR endW[] = {'/','>',0}; static const WCHAR gtW[] = {'>',0}; @@ -1461,11 +1476,16 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca reader_skipspaces(reader); - if (!reader_cmp(reader, endW)) return S_OK; + /* empty element */ + if ((*empty = !reader_cmp(reader, endW))) return S_OK; /* got a start tag */ if (!reader_cmp(reader, gtW)) + { + /* skip '>' */ + reader_skipn(reader, 1); return reader_push_element(reader, qname); + } FIXME("only empty elements/start tags without attribute list supported\n"); return E_NOTIMPL; @@ -1477,27 +1497,55 @@ static HRESULT reader_parse_element(xmlreader *reader) static const WCHAR ltW[] = {'<',0}; strval qname, prefix, local; HRESULT hr; + int empty; /* check if we are really on element */ if (reader_cmp(reader, ltW)) return S_FALSE; reader_shrink(reader); /* this handles empty elements too */ - hr = reader_parse_stag(reader, &prefix, &local, &qname); + empty = 0; + hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); if (FAILED(hr)) return hr; /* FIXME: need to check for defined namespace to reject invalid prefix, currently reject all prefixes */ if (prefix.len) return NC_E_UNDECLAREDPREFIX; + /* if we got empty element and stack is empty go straight to Misc */ + if (empty && list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + else + reader->instate = XmlReadInState_Content; + reader->nodetype = XmlNodeType_Element; reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); - FIXME("element content parsing not implemented\n"); return hr; } +/* [13 NS] ETag ::= '</' QName S? '>' */ +static HRESULT reader_parse_endtag(xmlreader *reader) +{ + FIXME("ETag parsing not implemented\n"); + return E_NOTIMPL; +} + +/* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ +static HRESULT reader_parse_content(xmlreader *reader) +{ + static const WCHAR etagW[] = {'<','/',0}; + reader_shrink(reader); + + /* handle end tag */ + if (!reader_cmp(reader, etagW)) + return reader_parse_endtag(reader); + + /* FIXME: handle the rest of possible content nodes */ + return reader_parse_element(reader); +} + static HRESULT reader_parse_nextnode(xmlreader *reader) { HRESULT hr; @@ -1562,11 +1610,9 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) return hr; break; case XmlReadInState_Element: - hr = reader_parse_element(reader); - if (FAILED(hr)) return hr; - - reader->instate = XmlReadInState_Content; - return hr; + return reader_parse_element(reader); + case XmlReadInState_Content: + return reader_parse_content(reader); default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL; @@ -1642,6 +1688,8 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } This->line = This->pos = 0; + reader_clear_elements(This); + This->depth = 0; /* just reset current input */ if (!input) @@ -1912,8 +1960,10 @@ static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) { - FIXME("(%p %p): stub\n", iface, depth); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, depth); + *depth = This->depth; + return S_OK; } static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) @@ -2044,6 +2094,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr_count = 0; reader->attr = NULL; list_init(&reader->elements); + reader->depth = 0; for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 2ef9b6a..8a1f3f7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -687,10 +687,9 @@ static void test_read_xmldeclaration(void) ok(count == 3, "Expected 3, got %d\n", count); hr = IXmlReader_GetDepth(reader, &count); -todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); +todo_wine ok(count == 1, "Expected 1, got %d\n", count); -} hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); @@ -1039,7 +1038,11 @@ static struct test_entry element_tests[] = { static void test_read_element(void) { struct test_entry *test = element_tests; + static const char stag[] = "<a><b>"; IXmlReader *reader; + XmlNodeType type; + IStream *stream; + UINT depth; HRESULT hr; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -1047,9 +1050,6 @@ static void test_read_element(void) while (test->xml) { - XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); @@ -1090,6 +1090,33 @@ static void test_read_element(void) test++; } + stream = create_stream_on_data(stag, strlen(stag)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + IStream_Release(stream); + IXmlReader_Release(reader); }

1 0

Alexandre Julliard : loader: Hardcode Linux syscall numbers.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 6f1932dbca5ad0d6c00cfda8907a487cd3371215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1932dbca5ad0d6c00cfda89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 16:00:07 2013 +0100 loader: Hardcode Linux syscall numbers. --- loader/main.c | 2 +- loader/preloader.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/loader/main.c b/loader/main.c index 74a8eb8..ac67290 100644 --- a/loader/main.c +++ b/loader/main.c @@ -114,7 +114,7 @@ static void check_command_line( int argc, char *argv[] ) /* separate thread to check for NPTL and TLS features */ static void *needs_pthread( void *arg ) { - pid_t tid = syscall( SYS_gettid ); + pid_t tid = syscall( 224 /* SYS_gettid */ ); /* check for NPTL */ if (tid != -1 && tid != getpid()) return (void *)1; /* check for TLS glibc */ diff --git a/loader/preloader.c b/loader/preloader.c index a94c52c..ba43f0a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -236,14 +236,14 @@ static inline __attribute__((noreturn)) void wld_exit( int code ) { for (;;) /* avoid warning */ __asm__ __volatile__( "pushl %%ebx; movl %1,%%ebx; int $0x80; popl %%ebx" - : : "a" (SYS_exit), "r" (code) ); + : : "a" (1 /* SYS_exit */), "r" (code) ); } static inline int wld_open( const char *name, int flags ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_open), "r" (name), "c" (flags) ); + : "=a" (ret) : "0" (5 /* SYS_open */), "r" (name), "c" (flags) ); return SYSCALL_RET(ret); } @@ -251,7 +251,7 @@ static inline int wld_close( int fd ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_close), "r" (fd) ); + : "=a" (ret) : "0" (6 /* SYS_close */), "r" (fd) ); return SYSCALL_RET(ret); } @@ -260,7 +260,7 @@ static inline ssize_t wld_read( int fd, void *buffer, size_t len ) int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) - : "0" (SYS_read), "r" (fd), "c" (buffer), "d" (len) + : "0" (3 /* SYS_read */), "r" (fd), "c" (buffer), "d" (len) : "memory" ); return SYSCALL_RET(ret); } @@ -269,7 +269,7 @@ static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_write), "r" (fd), "c" (buffer), "d" (len) ); + : "=a" (ret) : "0" (4 /* SYS_write */), "r" (fd), "c" (buffer), "d" (len) ); return SYSCALL_RET(ret); } @@ -277,7 +277,7 @@ static inline int wld_mprotect( const void *addr, size_t len, int prot ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_mprotect), "r" (addr), "c" (len), "d" (prot) ); + : "=a" (ret) : "0" (125 /* SYS_mprotect */), "r" (addr), "c" (len), "d" (prot) ); return SYSCALL_RET(ret); } @@ -302,35 +302,35 @@ static void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off args.fd = fd; args.offset = offset; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_mmap), "q" (&args) : "memory" ); + : "=a" (ret) : "0" (90 /* SYS_mmap */), "q" (&args) : "memory" ); return (void *)SYSCALL_RET(ret); } static inline uid_t wld_getuid(void) { uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_getuid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (24 /* SYS_getuid */) ); return ret; } static inline uid_t wld_geteuid(void) { uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_geteuid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (49 /* SYS_geteuid */) ); return ret; } static inline gid_t wld_getgid(void) { gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_getgid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (47 /* SYS_getgid */) ); return ret; } static inline gid_t wld_getegid(void) { gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_getegid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (50 /* SYS_getegid */) ); return ret; } @@ -338,7 +338,7 @@ static inline int wld_prctl( int code, long arg ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_prctl), "r" (code), "c" (arg) ); + : "=a" (ret) : "0" (172 /* SYS_prctl */), "r" (code), "c" (arg) ); return SYSCALL_RET(ret); }

1 0

Alexandre Julliard : libwine: Hardcode Linux syscall numbers.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: ef4981bd5b2d33c7f9be28ce00c0002b37980a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4981bd5b2d33c7f9be28ce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 16:00:16 2013 +0100 libwine: Hardcode Linux syscall numbers. --- libs/wine/ldt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 85a835b..5175e9c 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -70,7 +70,7 @@ static inline void fill_modify_ldt_struct( struct modify_ldt_s *ptr, const LDT_E static inline int modify_ldt( int func, struct modify_ldt_s *ptr, unsigned long count ) { - return syscall( SYS_modify_ldt, func, ptr, count ); + return syscall( 123 /* SYS_modify_ldt */, func, ptr, count ); } static inline int set_thread_area( struct modify_ldt_s *ptr )

1 0

Jacek Caban : secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT GnuTLS implementation .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 5c5d12c8bc400c8a57771defa4bc5c0523b0a4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5d12c8bc400c8a57771defa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 21 15:03:36 2013 +0100 secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT GnuTLS implementation. --- dlls/secur32/schannel.c | 13 ++++++++++++- dlls/secur32/schannel_gnutls.c | 30 ++++++++++++++++++------------ dlls/secur32/schannel_macosx.c | 2 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index cc287dc..37af15e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -60,6 +60,7 @@ struct schan_context { schan_imp_session session; ULONG req_ctx_attr; + HCERTSTORE cert_store; }; static struct schan_handle *schan_handle_table; @@ -696,6 +697,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(*ctx)); if (!ctx) return SEC_E_INSUFFICIENT_MEMORY; + ctx->cert_store = NULL; handle = schan_alloc_handle(ctx, SCHAN_HANDLE_CTX); if (handle == SCHAN_INVALID_HANDLE) { @@ -859,7 +861,14 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( case SECPKG_ATTR_REMOTE_CERT_CONTEXT: { PCCERT_CONTEXT *cert = buffer; - return schan_imp_get_session_peer_certificate(ctx->session, cert); + + if (!ctx->cert_store) { + ctx->cert_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + if(!ctx->cert_store) + return GetLastError(); + } + + return schan_imp_get_session_peer_certificate(ctx->session, ctx->cert_store, cert); } case SECPKG_ATTR_CONNECTION_INFO: { @@ -1167,6 +1176,8 @@ static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context ctx = schan_free_handle(context_handle->dwLower, SCHAN_HANDLE_CTX); if (!ctx) return SEC_E_INVALID_HANDLE; + if (ctx->cert_store) + CertCloseStore(ctx->cert_store, 0); schan_imp_dispose_session(ctx->session); HeapFree(GetProcessHeap(), 0, ctx); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bb481b7..fa68591 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -318,25 +318,31 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } -SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, - PCCERT_CONTEXT *cert) +SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE store, + PCCERT_CONTEXT *ret) { gnutls_session_t s = (gnutls_session_t)session; - unsigned int list_size; + PCCERT_CONTEXT cert = NULL; const gnutls_datum_t *datum; + unsigned list_size, i; + BOOL res; datum = pgnutls_certificate_get_peers(s, &list_size); - if (datum) - { - *cert = CertCreateCertificateContext(X509_ASN_ENCODING, datum->data, - datum->size); - if (!*cert) + if(!datum) + return SEC_E_INTERNAL_ERROR; + + for(i = 0; i < list_size; i++) { + res = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, datum[i].data, datum[i].size, + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert); + if(!res) { + if(i) + CertFreeCertificateContext(cert); return GetLastError(); - else - return SEC_E_OK; + } } - else - return SEC_E_INTERNAL_ERROR; + + *ret = cert; + return SEC_E_OK; } SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 75fe9a0..2d03d2a 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -706,7 +706,7 @@ static void schan_imp_cf_release(const void *arg, void *ctx) } #endif -SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, +SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE cert_store, PCCERT_CONTEXT *cert) { struct mac_session* s = (struct mac_session*)session; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 3254e0b..164a2eb 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -247,7 +247,7 @@ extern unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session se extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) DECLSPEC_HIDDEN; -extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, +extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE, PCCERT_CONTEXT *cert) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) DECLSPEC_HIDDEN;

1 0

Jacek Caban : secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT MacOSX implementation .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 303ec3ef91536baaab94501a2cd3db2bc666213e URL: http://source.winehq.org/git/wine.git/?a=commit;h=303ec3ef91536baaab94501a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 21 15:03:50 2013 +0100 secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT MacOSX implementation. --- dlls/secur32/schannel_macosx.c | 76 +++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2d03d2a..aaf2532 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -706,53 +706,67 @@ static void schan_imp_cf_release(const void *arg, void *ctx) } #endif -SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE cert_store, - PCCERT_CONTEXT *cert) +SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE store, + PCCERT_CONTEXT *ret_cert) { struct mac_session* s = (struct mac_session*)session; - SECURITY_STATUS ret = SEC_E_INTERNAL_ERROR; - CFArrayRef certs; + SECURITY_STATUS ret = SEC_E_OK; + PCCERT_CONTEXT cert = NULL; + SecCertificateRef mac_cert; + CFArrayRef cert_array; OSStatus status; + CFIndex cnt, i; + CFDataRef data; + BOOL res; TRACE("(%p/%p, %p)\n", s, s->context, cert); #ifdef HAVE_SSLCOPYPEERCERTIFICATES - status = SSLCopyPeerCertificates(s->context, &certs); + status = SSLCopyPeerCertificates(s->context, &cert_array); #else - status = SSLGetPeerCertificates(s->context, &certs); + status = SSLGetPeerCertificates(s->context, &cert_array); #endif - if (status == noErr && certs) + if (status != noErr || !cert_array) { - SecCertificateRef mac_cert; - CFDataRef data; - if (CFArrayGetCount(certs) && - (mac_cert = (SecCertificateRef)CFArrayGetValueAtIndex(certs, 0)) && - (SecKeychainItemExport(mac_cert, kSecFormatX509Cert, 0, NULL, &data) == noErr)) + WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); + return SEC_E_INTERNAL_ERROR; + } + + cnt = CFArrayGetCount(cert_array); + for (i=0; i < cnt; i++) { + if (!(mac_cert = (SecCertificateRef)CFArrayGetValueAtIndex(cert_array, i)) || + (SecKeychainItemExport(mac_cert, kSecFormatX509Cert, 0, NULL, &data) != noErr)) { - *cert = CertCreateCertificateContext(X509_ASN_ENCODING, - CFDataGetBytePtr(data), CFDataGetLength(data)); - if (*cert) - ret = SEC_E_OK; - else - { - ret = GetLastError(); - WARN("CertCreateCertificateContext failed: %x\n", ret); - } - CFRelease(data); - } - else WARN("Couldn't extract certificate data\n"); + ret = SEC_E_INTERNAL_ERROR; + break; + } + + res = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, CFDataGetBytePtr(data), CFDataGetLength(data), + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert); + CFRelease(data); + if (!res) + { + ret = GetLastError(); + WARN("CertAddEncodedCertificateToStore failed: %x\n", ret); + break; + } + } + #ifndef HAVE_SSLCOPYPEERCERTIFICATES - /* This is why SSLGetPeerCertificates was deprecated */ - CFArrayApplyFunction(certs, CFRangeMake(0, CFArrayGetCount(certs)), - schan_imp_cf_release, NULL); + /* This is why SSLGetPeerCertificates was deprecated */ + CFArrayApplyFunction(cert_array, CFRangeMake(0, CFArrayGetCount(cert_array)), + schan_imp_cf_release, NULL); #endif - CFRelease(certs); + CFRelease(cert_array); + if (ret != SEC_E_OK) { + if(cert) + CertFreeCertificateContext(cert); + return ret; } - else - WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); - return ret; + *ret_cert = cert; + return SEC_E_OK; } SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer,

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_REMOTE_CERT_CONTEXT tests.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 63c7f8d8ee2141614fa2e6788edcfa5199d3e90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c7f8d8ee2141614fa2e6788… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 21 15:04:05 2013 +0100 secur32: Added SECPKG_ATTR_REMOTE_CERT_CONTEXT tests. --- dlls/secur32/tests/schannel.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 99394c3..ddcc87d 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -45,6 +45,7 @@ static ENCRYPT_MESSAGE_FN pEncryptMessage; static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD); static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*); +static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_CONTEXT); static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); @@ -148,6 +149,7 @@ static void InitFunctionPtrs(void) GET_PROC(crypt32dll, CertFreeCertificateContext); GET_PROC(crypt32dll, CertSetCertificateContextProperty); GET_PROC(crypt32dll, CertCreateCertificateContext); + GET_PROC(crypt32dll, CertEnumCertificatesInStore); #undef GET_PROC } @@ -467,6 +469,24 @@ static void testAcquireSecurityContext(void) } } +static void test_remote_cert(PCCERT_CONTEXT remote_cert) +{ + PCCERT_CONTEXT iter = NULL; + BOOL incl_remote = FALSE; + unsigned cert_cnt = 0; + + ok(remote_cert->hCertStore != NULL, "hCertStore == NULL\n"); + + while((iter = pCertEnumCertificatesInStore(remote_cert->hCertStore, iter))) { + if(iter == remote_cert) + incl_remote = TRUE; + cert_cnt++; + } + + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(incl_remote, "context does not contain cert itself\n"); +} + static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.codeweavers.com\r\nConnection: close\r\n\r\n"; static void init_cred(SCHANNEL_CRED *cred) @@ -572,6 +592,7 @@ static void test_communication(void) CredHandle cred_handle; CtxtHandle context; SecPkgContext_StreamSizes sizes; + CERT_CONTEXT *cert; SecBufferDesc buffers[2]; SecBuffer *buf; @@ -726,6 +747,13 @@ static void test_communication(void) return; } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: %08x\n", status); + if(status == SEC_E_OK) { + test_remote_cert(cert); + pCertFreeCertificateContext(cert); + } + pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); reset_buffers(&buffers[0]);

1 0