wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Nikolay Sivov : ntdll: Implement RtlHashUnicodeString().
by Alexandre Julliard 24 Jul '13

24 Jul '13

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 24 Jul '13

24 Jul '13

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 : scrrun: Add IFileSystem3::GetFileName implementation.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: fab963cdcc6e8250bd4693c0c574521dd1923258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab963cdcc6e8250bd4693c0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 23 18:50:57 2013 +0200 scrrun: Add IFileSystem3::GetFileName implementation. --- dlls/scrrun/filesystem.c | 31 ++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 6af8123..9099951 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -780,9 +780,36 @@ static HRESULT WINAPI filesys_GetParentFolderName(IFileSystem3 *iface, BSTR Path static HRESULT WINAPI filesys_GetFileName(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[i]=='\\') + break; + i++; + + if(i>end || (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_GetBaseName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3f0f959..940356f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -302,6 +302,49 @@ static void test_GetParentFolderName(void) } } +static void test_GetFileName(void) +{ + static const WCHAR path1[] = {'a',0}; + static const WCHAR path2[] = {'a','/','a','.','b',0}; + static const WCHAR path3[] = {'a','\\',0}; + static const WCHAR path4[] = {'c',':',0}; + static const WCHAR path5[] = {'/','\\',0}; + static const WCHAR result2[] = {'a','.','b',0}; + static const WCHAR result3[] = {'a',0}; + + static const struct { + const WCHAR *path; + const WCHAR *result; + } tests[] = { + {NULL, NULL}, + {path1, path1}, + {path2, result2}, + {path3, result3}, + {path4, NULL}, + {path5, NULL} + }; + + BSTR path, result; + HRESULT hr; + int i; + + hr = IFileSystem3_GetFileName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetFileName 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_GetFileName(fs3, path, &result); + ok(hr == S_OK, "%d) GetFileName 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; @@ -320,6 +363,7 @@ START_TEST(filesystem) test_textstream(); test_GetFileVersion(); test_GetParentFolderName(); + test_GetFileName(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetParentFolderName implementation.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: d51a35c565ca4e39faa4eb2999d7c54878a43405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51a35c565ca4e39faa4eb299… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 23 18:50:46 2013 +0200 scrrun: Add IFileSystem3::GetParentFolderName implementation. --- dlls/scrrun/filesystem.c | 45 +++++++++++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4f0b163..6af8123 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -728,12 +728,53 @@ static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path, return E_NOTIMPL; } +static inline DWORD get_parent_folder_name(const WCHAR *path, DWORD len) +{ + int i; + + if(!path) + return 0; + + for(i=len-1; i>=0; i--) + if(path[i]!='/' && path[i]!='\\') + break; + + for(; i>=0; i--) + if(path[i]=='/' || path[i]=='\\') + break; + + for(; i>=0; i--) + if(path[i]!='/' && path[i]!='\\') + break; + + if(i < 0) + return 0; + + if(path[i]==':' && i==1) + i++; + return i+1; +} + static HRESULT WINAPI filesys_GetParentFolderName(IFileSystem3 *iface, BSTR Path, BSTR *pbstrResult) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + DWORD len; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + len = get_parent_folder_name(Path, SysStringLen(Path)); + if(!len) { + *pbstrResult = NULL; + return S_OK; + } + + *pbstrResult = SysAllocStringLen(Path, len); + if(!*pbstrResult) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI filesys_GetFileName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b93927c..3f0f959 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -254,6 +254,54 @@ static void test_GetFileVersion(void) SysFreeString(path); } +static void test_GetParentFolderName(void) +{ + static const WCHAR path1[] = {'a',0}; + static const WCHAR path2[] = {'a','/','a','/','a',0}; + static const WCHAR path3[] = {'a','\\','a','\\','a',0}; + static const WCHAR path4[] = {'a','/','a','/','/','\\','\\',0}; + static const WCHAR path5[] = {'c',':','\\','\\','a',0}; + static const WCHAR path6[] = {'a','c',':','\\','a',0}; + static const WCHAR result2[] = {'a','/','a',0}; + static const WCHAR result3[] = {'a','\\','a',0}; + static const WCHAR result4[] = {'a',0}; + static const WCHAR result5[] = {'c',':','\\',0}; + static const WCHAR result6[] = {'a','c',':',0}; + + static const struct { + const WCHAR *path; + const WCHAR *result; + } tests[] = { + {NULL, NULL}, + {path1, NULL}, + {path2, result2}, + {path3, result3}, + {path4, result4}, + {path5, result5}, + {path6, result6} + }; + + BSTR path, result; + HRESULT hr; + int i; + + hr = IFileSystem3_GetParentFolderName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetParentFolderName 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_GetParentFolderName(fs3, path, &result); + ok(hr == S_OK, "%d) GetParentFolderName 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; @@ -271,6 +319,7 @@ START_TEST(filesystem) test_createfolder(); test_textstream(); test_GetFileVersion(); + test_GetParentFolderName(); IFileSystem3_Release(fs3);

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

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

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

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

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

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

← Newer
1
...
11
12
13
14
15
16
17
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013