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

Piotr Caban : msvcrt: Fix _mktemp implementation.
by Alexandre Julliard July 24, 2013

July 24, 2013

Module: wine Branch: master Commit: ce9d4b807e6608c284778f9b524a4071035959d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9d4b807e6608c284778f9b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 24 12:20:29 2013 +0200 msvcrt: Fix _mktemp implementation. --- dlls/msvcrt/file.c | 16 ++++++++++------ dlls/msvcrt/tests/file.c | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1f17a93..a07e940 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1691,9 +1691,12 @@ char * CDECL MSVCRT__mktemp(char *pattern) int id; char letter = 'a'; + if(!pattern) + return NULL; + while(*pattern) numX = (*pattern++ == 'X')? numX + 1 : 0; - if (numX < 5) + if (numX < 6) return NULL; pattern--; id = GetCurrentProcessId(); @@ -1708,8 +1711,7 @@ char * CDECL MSVCRT__mktemp(char *pattern) do { *pattern = letter++; - if (GetFileAttributesA(retVal) == INVALID_FILE_ATTRIBUTES && - GetLastError() == ERROR_FILE_NOT_FOUND) + if (GetFileAttributesA(retVal) == INVALID_FILE_ATTRIBUTES) return retVal; } while(letter <= 'z'); return NULL; @@ -1725,9 +1727,12 @@ MSVCRT_wchar_t * CDECL MSVCRT__wmktemp(MSVCRT_wchar_t *pattern) int id; MSVCRT_wchar_t letter = 'a'; + if(!pattern) + return NULL; + while(*pattern) numX = (*pattern++ == 'X')? numX + 1 : 0; - if (numX < 5) + if (numX < 6) return NULL; pattern--; id = GetCurrentProcessId(); @@ -1741,8 +1746,7 @@ MSVCRT_wchar_t * CDECL MSVCRT__wmktemp(MSVCRT_wchar_t *pattern) pattern++; do { - if (GetFileAttributesW(retVal) == INVALID_FILE_ATTRIBUTES && - GetLastError() == ERROR_FILE_NOT_FOUND) + if (GetFileAttributesW(retVal) == INVALID_FILE_ATTRIBUTES) return retVal; *pattern = letter++; } while(letter != '|'); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 5731437..fc92272 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2130,6 +2130,26 @@ static void test_stdin(void) ok(h != NULL, "h == NULL\n"); } +static void test_mktemp(void) +{ + char buf[16]; + + strcpy(buf, "a"); + ok(!_mktemp(buf), "_mktemp(\"a\") != NULL\n"); + + strcpy(buf, "testXXXXX"); + ok(!_mktemp(buf), "_mktemp(\"testXXXXX\") != NULL\n"); + + strcpy(buf, "testXXXXXX"); + ok(_mktemp(buf) != NULL, "_mktemp(\"testXXXXXX\") == NULL\n"); + + strcpy(buf, "testXXXXXXa"); + ok(!_mktemp(buf), "_mktemp(\"testXXXXXXa\") != NULL\n"); + + strcpy(buf, "**XXXXXX"); + ok(_mktemp(buf) != NULL, "_mktemp(\"**XXXXXX\") == NULL\n"); +} + START_TEST(file) { int arg_c; @@ -2193,6 +2213,7 @@ START_TEST(file) test_setmaxstdio(); test_pipes(arg_v[0]); test_stdin(); + test_mktemp(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Nikolay Sivov : ntdll: Implement RtlHashUnicodeString().
by Alexandre Julliard July 24, 2013

July 24, 2013

Module: wine Branch: master Commit: 9e5097187ed85289162227e11306baadda548ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5097187ed85289162227e11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 20 09:15:34 2013 +0400 ntdll: Implement RtlHashUnicodeString(). --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/ntdll_misc.h | 4 ++++ dlls/ntdll/rtlstr.c | 25 +++++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0d4d62d..910ded5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -651,7 +651,7 @@ @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @ stub RtlGuidToPropertySetName -# @ stub RtlHashUnicodeString +@ stdcall RtlHashUnicodeString(ptr long long ptr) @ stdcall RtlIdentifierAuthoritySid(ptr) @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @ stdcall RtlImageNtHeader(long) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 146ce50..d2d0764 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -257,4 +257,8 @@ extern mode_t FILE_umask DECLSPEC_HIDDEN; "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */ #endif +#define HASH_STRING_ALGORITHM_DEFAULT 0 +#define HASH_STRING_ALGORITHM_X65599 1 +#define HASH_STRING_ALGORITHM_INVALID 0xffffffff + #endif diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 4e9614c..b092772 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -2138,3 +2138,28 @@ NTSTATUS WINAPI RtlStringFromGUID(const GUID* guid, UNICODE_STRING *str) return STATUS_SUCCESS; } + +/****************************************************************************** + * RtlHashUnicodeString [NTDLL.@] + */ +NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING string, BOOLEAN case_insensitive, ULONG alg, ULONG *hash) +{ + unsigned int i; + + if (!string || !hash) return STATUS_INVALID_PARAMETER; + + switch (alg) + { + case HASH_STRING_ALGORITHM_DEFAULT: + case HASH_STRING_ALGORITHM_X65599: + break; + default: + return STATUS_INVALID_PARAMETER; + } + + *hash = 0; + for (i = 0; i < string->Length/sizeof(WCHAR); i++) + *hash = *hash*65599 + (case_insensitive ? toupperW(string->Buffer[i]) : string->Buffer[i]); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index e8524da..240fe61 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1935,7 +1935,7 @@ static void test_RtlHashUnicodeString(void) if (!pRtlHashUnicodeString) { - skip("RtlHashUnicodeString is not available\n"); + win_skip("RtlHashUnicodeString is not available\n"); return; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 10ff0ab..2d221ef 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1046,7 +1046,7 @@ @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) ntdll.RtlGetSaclSecurityDescriptor @ stub RtlGetSetBootStatusData @ stdcall RtlGetVersion(ptr) ntdll.RtlGetVersion -@ stub RtlHashUnicodeString +@ stdcall RtlHashUnicodeString(ptr long long ptr) ntdll.RtlHashUnicodeString @ stdcall RtlImageDirectoryEntryToData(long long long ptr) ntdll.RtlImageDirectoryEntryToData @ stdcall RtlImageNtHeader(long) ntdll.RtlImageNtHeader @ stdcall RtlInitAnsiString(ptr str) ntdll.RtlInitAnsiString

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetBaseName implementation.
by Alexandre Julliard July 24, 2013

July 24, 2013

Module: wine Branch: master Commit: dd64952040b64293103f44f068026455c972fa42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd64952040b64293103f44f06… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 23 18:51:05 2013 +0200 scrrun: Add IFileSystem3::GetBaseName implementation. --- dlls/scrrun/filesystem.c | 34 +++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 9099951..62bc676 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -815,9 +815,39 @@ static HRESULT WINAPI filesys_GetFileName(IFileSystem3 *iface, BSTR Path, static HRESULT WINAPI filesys_GetBaseName(IFileSystem3 *iface, BSTR Path, BSTR *pbstrResult) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + int i, end; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + if(!Path) { + *pbstrResult = NULL; + return S_OK; + } + + for(end=strlenW(Path)-1; end>=0; end--) + if(Path[end]!='/' && Path[end]!='\\') + break; + + for(i=end; i>=0; i--) { + if(Path[i]=='.' && Path[end+1]!='.') + end = i-1; + if(Path[i]=='/' || Path[i]=='\\') + break; + } + i++; + + if((i>end && Path[end+1]!='.') || (i==0 && end==1 && Path[1]==':')) { + *pbstrResult = NULL; + return S_OK; + } + + *pbstrResult = SysAllocStringLen(Path+i, end-i+1); + if(!*pbstrResult) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 940356f..4cd4e2d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -345,6 +345,52 @@ static void test_GetFileName(void) } } +static void test_GetBaseName(void) +{ + static const WCHAR path1[] = {'a',0}; + static const WCHAR path2[] = {'a','/','a','.','b','.','c',0}; + static const WCHAR path3[] = {'a','.','b','\\',0}; + static const WCHAR path4[] = {'c',':',0}; + static const WCHAR path5[] = {'/','\\',0}; + static const WCHAR path6[] = {'.','a',0}; + static const WCHAR result1[] = {'a',0}; + static const WCHAR result2[] = {'a','.','b',0}; + static const WCHAR result6[] = {0}; + + static const struct { + const WCHAR *path; + const WCHAR *result; + } tests[] = { + {NULL, NULL}, + {path1, result1}, + {path2, result2}, + {path3, result1}, + {path4, NULL}, + {path5, NULL}, + {path6, result6} + }; + + BSTR path, result; + HRESULT hr; + int i; + + hr = IFileSystem3_GetBaseName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetBaseName returned %x, expected E_POINTER\n", hr); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + result = (BSTR)0xdeadbeef; + path = tests[i].path ? SysAllocString(tests[i].path) : NULL; + hr = IFileSystem3_GetBaseName(fs3, path, &result); + ok(hr == S_OK, "%d) GetBaseName returned %x, expected S_OK\n", i, hr); + if(!tests[i].result) + ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result)); + else + ok(!lstrcmpW(result, tests[i].result), "%d) result = %s\n", i, wine_dbgstr_w(result)); + SysFreeString(path); + SysFreeString(result); + } +} + START_TEST(filesystem) { HRESULT hr; @@ -364,6 +410,7 @@ START_TEST(filesystem) test_GetFileVersion(); test_GetParentFolderName(); test_GetFileName(); + test_GetBaseName(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : msvcrt: Add _wmktemp_s implementation.
by Alexandre Julliard July 24, 2013

July 24, 2013

Module: wine Branch: master Commit: b6fc57ec849504ec6e45b513431d669fde9c8029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fc57ec849504ec6e45b5134… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 24 12:20:52 2013 +0200 msvcrt: Add _wmktemp_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9012225..ef6d354 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1557,7 +1557,7 @@ @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) msvcrt._wmakepath_s @ cdecl _wmkdir(wstr) msvcrt._wmkdir @ cdecl _wmktemp(wstr) msvcrt._wmktemp -@ stub _wmktemp_s +@ cdecl _wmktemp_s(wstr long) msvcrt._wmktemp_s @ varargs _wopen(wstr long) msvcrt._wopen @ cdecl _wperror(wstr) msvcrt._wperror @ extern _wpgmptr msvcrt._wpgmptr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ad6d159..dd76878 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1919,7 +1919,7 @@ @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) msvcrt._wmakepath_s @ cdecl _wmkdir(wstr) msvcrt._wmkdir @ cdecl _wmktemp(wstr) msvcrt._wmktemp -@ stub _wmktemp_s +@ cdecl _wmktemp_s(wstr long) msvcrt._wmktemp_s @ varargs _wopen(wstr long) msvcrt._wopen @ cdecl _wperror(wstr) msvcrt._wperror @ extern _wpgmptr msvcrt._wpgmptr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 59ee88d..87fbc5d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1238,7 +1238,7 @@ @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) msvcrt._wmakepath_s @ cdecl _wmkdir(wstr) msvcrt._wmkdir @ cdecl _wmktemp(wstr) msvcrt._wmktemp -@ stub _wmktemp_s +@ cdecl _wmktemp_s(wstr long) msvcrt._wmktemp_s @ varargs _wopen(wstr long) msvcrt._wopen @ cdecl _wperror(wstr) msvcrt._wperror @ extern _wpgmptr msvcrt._wpgmptr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5d2ebf6..9800023 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1211,7 +1211,7 @@ @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) msvcrt._wmakepath_s @ cdecl _wmkdir(wstr) msvcrt._wmkdir @ cdecl _wmktemp(wstr) msvcrt._wmktemp -@ stub _wmktemp_s +@ cdecl _wmktemp_s(wstr long) msvcrt._wmktemp_s @ varargs _wopen(wstr long) msvcrt._wopen @ cdecl _wperror(wstr) msvcrt._wperror @ extern _wpgmptr msvcrt._wpgmptr diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 35e2c00..8403b4b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1757,6 +1757,45 @@ char * CDECL MSVCRT__mktemp(char *pattern) } /********************************************************************* + * _wmktemp_s (MSVCRT.@) + */ +int CDECL MSVCRT__wmktemp_s(MSVCRT_wchar_t *pattern, MSVCRT_size_t size) +{ + DWORD len, xno, id; + + if(!MSVCRT_CHECK_PMT(pattern!=NULL)) + return MSVCRT_EINVAL; + + for(len=0; len<size; len++) + if(!pattern[len]) + break; + if(!MSVCRT_CHECK_PMT(len!=size && len>=6)) { + if(size) + pattern[0] = 0; + return MSVCRT_EINVAL; + } + + for(xno=1; xno<=6; xno++) + if(!MSVCRT_CHECK_PMT(pattern[len-xno] == 'X')) + return MSVCRT_EINVAL; + + id = GetCurrentProcessId(); + for(xno=1; xno<6; xno++) { + pattern[len-xno] = id%10 + '0'; + id /= 10; + } + + for(pattern[len-6]='a'; pattern[len-6]<='z'; pattern[len-6]++) { + if(GetFileAttributesW(pattern) == INVALID_FILE_ATTRIBUTES) + return 0; + } + + pattern[0] = 0; + *MSVCRT__errno() = MSVCRT_EEXIST; + return MSVCRT_EEXIST; +} + +/********************************************************************* * _wmktemp (MSVCRT.@) */ MSVCRT_wchar_t * CDECL MSVCRT__wmktemp(MSVCRT_wchar_t *pattern) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e566440..e0e6287 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1180,7 +1180,7 @@ @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) @ cdecl _wmkdir(wstr) MSVCRT__wmkdir @ cdecl _wmktemp(wstr) MSVCRT__wmktemp -# stub _wmktemp_s(wstr long) +@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen # stub _woutput_s @ stub _wperror(wstr)

1 0

Rico Schüller : wined3d: Fix typo.
by Alexandre Julliard July 24, 2013

July 24, 2013

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

Nikolay Sivov : xmllite: Handle nesting depth limit better.
by Alexandre Julliard July 24, 2013

July 24, 2013

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

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix column array test.
by Alexandre Julliard July 24, 2013

July 24, 2013

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 July 24, 2013

July 24, 2013

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

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable vector test.
by Alexandre Julliard July 24, 2013

July 24, 2013

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 scalar array test.
by Alexandre Julliard July 24, 2013

July 24, 2013

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

1 0