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

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable vector test.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 89ecbde31d434bb1f0520a8f665e06abca002d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ecbde31d434bb1f0520a8f6… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 23:24:51 2013 +0200 d3dx9/tests: Add ID3DXConstantTable vector test. --- dlls/d3dx9_36/tests/shader.c | 226 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 226 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89ecbde31d434bb1f0520…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable vector array test.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 787707025f65aab96433762d3183020911e56e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=787707025f65aab96433762d3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 23:24:56 2013 +0200 d3dx9/tests: Add ID3DXConstantTable vector array test. --- dlls/d3dx9_36/tests/shader.c | 322 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 322 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=787707025f65aab964337…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix column test.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 2bfd3e9867c2f1a65f3efae6ae9f680ab52d4e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfd3e9867c2f1a65f3efae6a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 23:25:02 2013 +0200 d3dx9/tests: Add ID3DXConstantTable matrix column test. --- dlls/d3dx9_36/tests/shader.c | 287 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 287 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bfd3e9867c2f1a65f3ef…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix column array test.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: b7702177bc5b0cd22bf44994b1777540ef1b27eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7702177bc5b0cd22bf44994b… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 23:25:09 2013 +0200 d3dx9/tests: Add ID3DXConstantTable matrix column array test. --- dlls/d3dx9_36/tests/shader.c | 437 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 437 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7702177bc5b0cd22bf44…

1 0

Nikolay Sivov : xmllite: Clear attributes on node change, improve tracing.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 40c72e47ab3c2e36bcfbe85ec93ec08025808157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c72e47ab3c2e36bcfbe85ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 18 15:53:11 2013 +0400 xmllite: Clear attributes on node change, improve tracing. --- dlls/xmllite/reader.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0b587ff..e2f79a1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -20,6 +20,7 @@ #define COBJMACROS +#include <stdio.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -98,6 +99,62 @@ static const WCHAR gtW[] = {'>',0}; static const WCHAR commentW[] = {'<','!','-','-',0}; static const WCHAR piW[] = {'<','?',0}; +static const char *debugstr_nodetype(XmlNodeType nodetype) +{ + static const char* type_names[] = + { + "None", + "Element", + "Attribute", + "Text", + "CDATA", + "", + "", + "ProcessingInstruction", + "Comment", + "", + "DocumentType", + "", + "", + "Whitespace", + "", + "EndElement", + "", + "XmlDeclaration" + }; + + if (nodetype > _XmlNodeType_Last) + { + static char buf[25]; + sprintf(buf, "unknown type=%d", nodetype); + return buf; + } + return type_names[nodetype]; +} + +static const char *debugstr_prop(XmlReaderProperty prop) +{ + static const char* prop_names[] = + { + "MultiLanguage", + "ConformanceLevel", + "RandomAccess", + "XmlResolver", + "DtdProcessing", + "ReadState", + "MaxElementDepth", + "MaxEntityExpansion" + }; + + if (prop > _XmlReaderProperty_Last) + { + static char buf[25]; + sprintf(buf, "unknown property=%d", prop); + return buf; + } + return prop_names[prop]; +} + struct xml_encoding_data { const WCHAR *name; @@ -1983,6 +2040,9 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) { HRESULT hr; + if (!is_reader_pending(reader)) + reader_clear_attrs(reader); + while (1) { switch (reader->instate) @@ -2184,7 +2244,7 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p %u %p)\n", This, property, value); + TRACE("(%p)->(%s %p)\n", This, debugstr_prop(property), value); if (!value) return E_INVALIDARG; @@ -2208,7 +2268,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p %u %lu)\n", iface, property, value); + TRACE("(%p)->(%s %lu)\n", This, debugstr_prop(property), value); switch (property) { @@ -2237,7 +2297,11 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) hr = reader_parse_nextnode(This); if (oldtype == XmlNodeType_None && This->nodetype != oldtype) This->state = XmlReadState_Interactive; - if (hr == S_OK) *nodetype = This->nodetype; + if (hr == S_OK) + { + TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); + *nodetype = This->nodetype; + } return hr; }

1 0

Nikolay Sivov : xmllite: Handle nesting depth limit better.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 80e70a827172e37ac84ed279e580591fc09f68be URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e70a827172e37ac84ed279e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 18 16:31:01 2013 +0400 xmllite: Handle nesting depth limit better. --- dlls/xmllite/reader.c | 12 ++++++++++-- dlls/xmllite/tests/reader.c | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e2f79a1..b556d7d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -246,6 +246,7 @@ typedef struct struct list elements; strval strvalues[StringValue_Last]; UINT depth; + UINT max_depth; BOOL empty_element; WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; @@ -427,11 +428,15 @@ static void reader_clear_elements(xmlreader *reader) static HRESULT reader_inc_depth(xmlreader *reader) { - /* FIXME: handle XmlReaderProperty_MaxElementDepth property */ - reader->depth++; + if (++reader->depth > reader->max_depth) return SC_E_MAXELEMENTDEPTH; return S_OK; } +static void reader_dec_depth(xmlreader *reader) +{ + if (reader->depth > 1) reader->depth--; +} + static HRESULT reader_push_element(xmlreader *reader, strval *qname) { struct element *elem; @@ -469,6 +474,7 @@ static void reader_pop_element(xmlreader *reader) list_remove(&elem->entry); reader_free_strvalued(reader, &elem->qname); reader_free(reader, elem); + reader_dec_depth(reader); } } @@ -1137,6 +1143,7 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; reader_skipn(reader, 2); + reader_inc_depth(reader); reader->nodetype = XmlNodeType_XmlDeclaration; reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); @@ -2659,6 +2666,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr = NULL; list_init(&reader->elements); reader->depth = 0; + reader->max_depth = 256; reader->empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9be5125..86bdf69 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -742,7 +742,6 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_GetDepth(reader, &count); 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); @@ -1166,16 +1165,20 @@ static void test_read_element(void) ok(hr == S_OK, "got %08x\n", hr); ok(depth == 0, "got %d\n", depth); + type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); depth = 1; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr); ok(depth == 0, "got %d\n", depth); + type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); depth = 0; hr = IXmlReader_GetDepth(reader, &depth);

1 0

Jacek Caban : userenv: Added a few more stubs.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 1c721e7164afb7a5dacb6e569bc513122abd142d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c721e7164afb7a5dacb6e569… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 23 11:06:31 2013 +0200 userenv: Added a few more stubs. --- dlls/userenv/userenv.spec | 3 +++ dlls/userenv/userenv_main.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 6b1e8a7..4d8bc4e 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -2,10 +2,12 @@ @ stdcall CreateEnvironmentBlock(ptr ptr long) @ stdcall DestroyEnvironmentBlock(ptr) +@ stdcall EnterCriticalPolicySection(long) @ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) @ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) @ stdcall GetAllUsersProfileDirectoryA(ptr ptr) @ stdcall GetAllUsersProfileDirectoryW(ptr ptr) +@ stdcall GetAppliedGPOListW(long wstr ptr ptr ptr) @ stdcall GetDefaultUserProfileDirectoryA(ptr ptr) @ stdcall GetDefaultUserProfileDirectoryW(ptr ptr) @ stdcall GetProfilesDirectoryA(ptr ptr) @@ -13,6 +15,7 @@ @ stdcall GetProfileType(ptr) @ stdcall GetUserProfileDirectoryA(ptr ptr ptr) @ stdcall GetUserProfileDirectoryW(ptr ptr ptr) +@ stdcall LeaveCriticalPolicySection(ptr) @ stdcall LoadUserProfileA(ptr ptr) @ stdcall LoadUserProfileW(ptr ptr) @ stdcall RegisterGPNotification(long long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index ae5c590..d2adad4 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -732,6 +732,26 @@ BOOL WINAPI UnloadUserProfile( HANDLE hToken, HANDLE hProfile ) return FALSE; } +HANDLE WINAPI EnterCriticalPolicySection(BOOL bMachine) +{ + FIXME("(%x)\n", bMachine); + SetLastError(ERROR_ACCESS_DENIED); + return NULL; +} + +BOOL WINAPI LeaveCriticalPolicySection(HANDLE hSection) +{ + FIXME("(%p)\n", hSection); + return TRUE; +} + +DWORD WINAPI GetAppliedGPOListW(DWORD dwFlags, LPCWSTR pMachineName, PSID pSidUser, GUID *pGuidExtension, + PGROUP_POLICY_OBJECTW *ppGPOList) +{ + FIXME("(%x %s %p %s %p)\n", dwFlags, debugstr_w(pMachineName), pSidUser, debugstr_guid(pGuidExtension), ppGPOList); + return ERROR_ACCESS_DENIED; +} + /****************************************************************************** * USERENV.138 *

1 0

Rico Schüller : wined3d: Fix typo.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 55c190d396df51cd0e209e0ca304df96932e1dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c190d396df51cd0e209e0ca… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 23 14:07:08 2013 +0200 wined3d: Fix typo. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 07bb130..de36741 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4252,18 +4252,18 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device if (state->sampler_states[i][WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_POINT) { - WARN("Non-filterable texture and mag filter enabled on samper %u, returning E_FAIL\n", i); + WARN("Non-filterable texture and mag filter enabled on sampler %u, returning E_FAIL\n", i); return E_FAIL; } if (state->sampler_states[i][WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_POINT) { - WARN("Non-filterable texture and min filter enabled on samper %u, returning E_FAIL\n", i); + WARN("Non-filterable texture and min filter enabled on sampler %u, returning E_FAIL\n", i); return E_FAIL; } if (state->sampler_states[i][WINED3D_SAMP_MIP_FILTER] != WINED3D_TEXF_NONE && state->sampler_states[i][WINED3D_SAMP_MIP_FILTER] != WINED3D_TEXF_POINT) { - WARN("Non-filterable texture and mip filter enabled on samper %u, returning E_FAIL\n", i); + WARN("Non-filterable texture and mip filter enabled on sampler %u, returning E_FAIL\n", i); return E_FAIL; } }

1 0

Frédéric Delanoy : Link to translated wiki homepage in French main help page
by Jeremy Newman 23 Jul '13

23 Jul '13

Module: website Branch: master Commit: 2e9f7c6c08e4e01b5d1738f28a0504e6dc71534d URL: http://source.winehq.org/git/website.git/?a=commit;h=2e9f7c6c08e4e01b5d1738… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:13:43 2013 +0200 Link to translated wiki homepage in French main help page --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index aa18446..493213e 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -50,7 +50,7 @@ payant pour Wine. <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> </td> <td valign="top"> - Notre <a href="http://wiki.winehq.org/">wiki</a> peut aussi vous aider. + Notre <a href="http://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. </td> </tr> @@ -93,7 +93,7 @@ intéressante. <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"><br>Bugzilla</a> </td> <td valign="top"> - Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bogues</a> + Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bugs</a> présente tous les problèmes sur lesquels nous avons travaillé ou travaillons actuellement. </td> </tr>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 23 Jul '13

23 Jul '13

Module: website Branch: master Commit: 32a20333b42941a55ce83ba56f2b754156df489d URL: http://source.winehq.org/git/website.git/?a=commit;h=32a20333b42941a55ce83b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 23 15:08:20 2013 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0