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

Alexandre Julliard : winebuild: Add more checks to protect against corrupted resource files.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 58dddbed234a45e6888cd35d4104ee72948e11e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58dddbed234a45e6888cd35d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 16:04:51 2010 +0200 winebuild: Add more checks to protect against corrupted resource files. --- tools/winebuild/res32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 6320a2e..28b950c 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -220,8 +220,12 @@ static void load_next_resource( DLLSPEC *spec ) res->data_size = get_dword(); hdr_size = get_dword(); if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); + if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; + if ((const unsigned char *)res->data < input_buffer || + (const unsigned char *)res->data >= input_buffer + input_buffer_size) + fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); get_string( &res->type ); get_string( &res->name ); if (input_buffer_pos & 2) get_word(); /* align to dword boundary */

1 0

Hans Leidekker : shlwapi: Don't trace the contents of output buffers.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 7a2944d5adc5c4d572bc4215cf24d74993e56ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2944d5adc5c4d572bc4215c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 20 14:52:02 2010 +0200 shlwapi: Don't trace the contents of output buffers. --- dlls/shlwapi/shlwapi.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 8ad4373..a277f50 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -550,10 +550,10 @@ @ stdcall AssocIsDangerous(long) @ stdcall AssocQueryKeyA(long long str ptr ptr) @ stdcall AssocQueryKeyW(long long wstr ptr ptr) -@ stdcall AssocQueryStringA(long long ptr ptr str ptr) -@ stdcall AssocQueryStringByKeyA(long long ptr ptr str ptr) -@ stdcall AssocQueryStringByKeyW(long long ptr ptr wstr ptr) -@ stdcall AssocQueryStringW(long long ptr ptr wstr ptr) +@ stdcall AssocQueryStringA(long long ptr ptr ptr ptr) +@ stdcall AssocQueryStringByKeyA(long long ptr ptr ptr ptr) +@ stdcall AssocQueryStringByKeyW(long long ptr ptr ptr ptr) +@ stdcall AssocQueryStringW(long long ptr ptr ptr ptr) @ stdcall ChrCmpIA(long long) @ stdcall ChrCmpIW(long long) @ stdcall ColorAdjustLuma(long long long)

1 0

Andrew Nguyen : shlwapi/tests: Skip SHUnicodeToUnicode tests on Win98.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: bfcf59631ec35635cc1d7891ccfb5dad89ec3fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcf59631ec35635cc1d7891c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jul 19 23:14:20 2010 -0500 shlwapi/tests: Skip SHUnicodeToUnicode tests on Win98. --- dlls/shlwapi/tests/string.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 356616a..8daf87d 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -56,6 +56,7 @@ static LPWSTR (WINAPI *pStrFormatKBSizeW)(LONGLONG,LPWSTR,UINT); static BOOL (WINAPI *pStrIsIntlEqualA)(BOOL,LPCSTR,LPCSTR,int); static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int); static LPWSTR (WINAPI *pStrPBrkW)(LPCWSTR,LPCWSTR); +static LPSTR (WINAPI *pStrRChrA)(LPCSTR,LPCSTR,WORD); static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*); static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); @@ -843,6 +844,12 @@ static void test_SHUnicodeToUnicode(void) return; } + if (pSHUnicodeToUnicode == (void *)pStrRChrA) + { + win_skip("Ordinal 346 corresponds to StrRChrA, skipping SHUnicodeToUnicode tests\n"); + return; + } + memcpy(dest, lpInit, sizeof(lpInit)); dwRet = pSHUnicodeToUnicode(lpSrc, dest, sizeof(dest)/sizeof(dest[0])); ok(dwRet == 6 && !memcmp(dest, lpRes, sizeof(dest)), @@ -1378,6 +1385,7 @@ START_TEST(string) pStrIsIntlEqualA = (void *)GetProcAddress(hShlwapi, "StrIsIntlEqualA"); pStrIsIntlEqualW = (void *)GetProcAddress(hShlwapi, "StrIsIntlEqualW"); pStrPBrkW = (void *)GetProcAddress(hShlwapi, "StrPBrkW"); + pStrRChrA = (void *)GetProcAddress(hShlwapi, "StrRChrA"); pStrRetToBSTR = (void *)GetProcAddress(hShlwapi, "StrRetToBSTR"); pStrRetToBufA = (void *)GetProcAddress(hShlwapi, "StrRetToBufA"); pStrRetToBufW = (void *)GetProcAddress(hShlwapi, "StrRetToBufW");

1 0

Andrew Nguyen : shlwapi/tests: Skip StrRStrI tests on older Win9x platforms .
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: fd9b8c4ac57148a2af7fbfdf88cc03ccd5399fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9b8c4ac57148a2af7fbfdf8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jul 19 23:14:30 2010 -0500 shlwapi/tests: Skip StrRStrI tests on older Win9x platforms. --- dlls/shlwapi/tests/string.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 8daf87d..ec695b5 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -785,7 +785,16 @@ static void test_StrRStrI(void) static const WCHAR wszPattern4[] = {'a','b',0}; LPWSTR retW; LPSTR retA; - + + /* StrCpyNXA was chosen simply because it doesn't appear to be available on + * Win9x machines where StrRStrI crashes. Despite StrRStrI being exported + * by name, all StrRStrI tests appear to crash for unknown reasons. */ + if (!pStrCpyNXA) + { + win_skip("StrRStrI crashes on older Win9x platforms\n"); + return; + } + check_strrstri(A, szTest, 4, "A", szTest+1); check_strrstri(A, szTest, 4, "aX", szTest+1); check_strrstri(A, szTest, 4, "Ay", NULL);

1 0

Andrew Nguyen : shlwapi/tests: Skip SHAnsiToAnsi tests on Win98.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: d3e083643548b6cd161dac1c8039d69af115083d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e083643548b6cd161dac1c8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jul 19 23:14:11 2010 -0500 shlwapi/tests: Skip SHAnsiToAnsi tests on Win98. --- dlls/shlwapi/tests/string.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index e0d4910..356616a 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -55,6 +55,7 @@ static LPSTR (WINAPI *pStrFormatKBSizeA)(LONGLONG,LPSTR,UINT); static LPWSTR (WINAPI *pStrFormatKBSizeW)(LONGLONG,LPWSTR,UINT); static BOOL (WINAPI *pStrIsIntlEqualA)(BOOL,LPCSTR,LPCSTR,int); static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int); +static LPWSTR (WINAPI *pStrPBrkW)(LPCWSTR,LPCWSTR); static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*); static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); @@ -815,6 +816,12 @@ static void test_SHAnsiToAnsi(void) return; } + if (pSHAnsiToAnsi == (void *)pStrPBrkW) + { + win_skip("Ordinal 345 corresponds to StrPBrkW, skipping SHAnsiToAnsi tests\n"); + return; + } + memset(dest, '\n', sizeof(dest)); dwRet = pSHAnsiToAnsi("hello", dest, sizeof(dest)/sizeof(dest[0])); ok(dwRet == 6 && !memcmp(dest, "hello\0\n\n", sizeof(dest)), @@ -1370,6 +1377,7 @@ START_TEST(string) pStrFormatKBSizeW = (void *)GetProcAddress(hShlwapi, "StrFormatKBSizeW"); pStrIsIntlEqualA = (void *)GetProcAddress(hShlwapi, "StrIsIntlEqualA"); pStrIsIntlEqualW = (void *)GetProcAddress(hShlwapi, "StrIsIntlEqualW"); + pStrPBrkW = (void *)GetProcAddress(hShlwapi, "StrPBrkW"); pStrRetToBSTR = (void *)GetProcAddress(hShlwapi, "StrRetToBSTR"); pStrRetToBufA = (void *)GetProcAddress(hShlwapi, "StrRetToBufA"); pStrRetToBufW = (void *)GetProcAddress(hShlwapi, "StrRetToBufW");

1 0

Andrew Nguyen : shlwapi/tests: Correct the prototype of the StrRetToBSTR function pointer.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: fdabf10a97eee15ec2fab6cfd51f1fb644275c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdabf10a97eee15ec2fab6cfd… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jul 19 23:14:48 2010 -0500 shlwapi/tests: Correct the prototype of the StrRetToBSTR function pointer. --- dlls/shlwapi/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 8353794..aa97088 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -57,7 +57,7 @@ static BOOL (WINAPI *pStrIsIntlEqualA)(BOOL,LPCSTR,LPCSTR,int); static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int); static LPWSTR (WINAPI *pStrPBrkW)(LPCWSTR,LPCWSTR); static LPSTR (WINAPI *pStrRChrA)(LPCSTR,LPCSTR,WORD); -static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*); +static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,LPCITEMIDLIST,BSTR*); static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static LPWSTR (WINAPI *pStrStrNW)(LPCWSTR,LPCWSTR,UINT);

1 0

Andrew Nguyen : shlwapi/tests: Skip a StrCpyNW test that crashes on older Win9x.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 5709ef1a2931425bf359ec23a42492d506925a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5709ef1a2931425bf359ec23a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jul 19 23:14:38 2010 -0500 shlwapi/tests: Skip a StrCpyNW test that crashes on older Win9x. --- dlls/shlwapi/tests/string.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index ec695b5..8353794 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -909,10 +909,15 @@ if (0) expect_eq(wbuf[0], 0, WCHAR, "%x"); expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); - memset(wbuf, 0xbf, sizeof(wbuf)); - expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p"); - expect_eq(wbuf[0], 0, WCHAR, "%x"); - expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); + if (pStrCpyNXA) + { + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[0], 0, WCHAR, "%x"); + expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); + } + else + win_skip("StrCpyNW test crashes on older Win9x platforms\n"); memset(wbuf, 0xbf, sizeof(wbuf)); expect_eq(StrCpyNW(wbuf, 0, 0), wbuf, PWCHAR, "%p");

1 0

Piotr Caban : wininet: Don' t report error in read_gzip_data when to much data was cached.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 0736ca71e72429d48b91936331c88844276eed96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0736ca71e72429d48b9193633… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 00:32:59 2010 +0200 wininet: Don't report error in read_gzip_data when to much data was cached. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9bbde2..a32be25 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2083,6 +2083,9 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, break; } + if(req->dwContentRead == req->dwContentLength) + break; + buf_avail = req->dwContentLength == ~0 ? req->read_size : min(req->read_size, req->dwContentLength-req->dwContentRead); zstream->next_in = req->read_buf+req->read_pos;

1 0

Owen Rudge : fusion: Install assemblies into correct directory for architecture.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: c6d34d7b05aec8dae05c2db7093af43cd085a3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d34d7b05aec8dae05c2db70… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jul 19 19:33:19 2010 +0100 fusion: Install assemblies into correct directory for architecture. --- dlls/fusion/asmcache.c | 27 ++++++++++++++++++++++----- dlls/fusion/assembly.c | 14 ++++++++++++++ dlls/fusion/fusionpriv.h | 1 + 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index f35de7f..7334e5d 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -91,15 +91,32 @@ static BOOL create_full_path(LPCWSTR path) return ret; } -static BOOL get_assembly_directory(LPWSTR dir, DWORD size) +static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) { - static const WCHAR gac[] = - {'\\','a','s','s','e','m','b','l','y','\\','G','A','C','_','M','S','I','L',0}; + static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; - FIXME("Ignoring assembly architecture\n"); + static const WCHAR msil[] = {'_','M','S','I','L',0}; + static const WCHAR x86[] = {'_','3','2',0}; + static const WCHAR amd64[] = {'_','6','4',0}; GetWindowsDirectoryW(dir, size); strcatW(dir, gac); + + switch (architecture) + { + case peMSIL: + strcatW(dir, msil); + break; + + case peI386: + strcatW(dir, x86); + break; + + case peAMD64: + strcatW(dir, amd64); + break; + } + return TRUE; } @@ -291,7 +308,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (FAILED(hr)) goto done; - get_assembly_directory(asmdir, MAX_PATH); + get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); sprintfW(path, format, asmdir, name, version, token); diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index bc187ac..328b279 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -811,6 +811,20 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) return S_OK; } +BYTE assembly_get_architecture(ASSEMBLY *assembly) +{ + if ((assembly->corhdr->MajorRuntimeVersion == 2) && (assembly->corhdr->MinorRuntimeVersion == 0)) + return 0; /* .NET 1.x assembly */ + + if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + return peAMD64; /* AMD64/IA64 assembly */ + + if ((assembly->corhdr->Flags & COMIMAGE_FLAGS_ILONLY) && !(assembly->corhdr->Flags & COMIMAGE_FLAGS_32BITREQUIRED)) + return peMSIL; /* MSIL assembly */ + + return peI386; /* x86 assembly */ +} + static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) { return GetData(&assembly->blobs[index], size); diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 4b9bd57..6f4b28d 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -433,6 +433,7 @@ HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path); HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); +BYTE assembly_get_architecture(ASSEMBLY *assembly); HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token); static inline LPWSTR strdupW(LPCWSTR src)

1 0

Austin English : rpcrt4/tests: Improve failure messages.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: eb7c2061143f675fbc26b39c0cec5cb5df33abf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7c2061143f675fbc26b39c0… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 19 12:16:59 2010 -0500 rpcrt4/tests: Improve failure messages. --- dlls/rpcrt4/tests/rpc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index bb480e1..684b47e 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -283,11 +283,11 @@ todo_wine { &identity, &authzsvc); ok(status == RPC_S_OK, "RpcBindingInqAuthInfo failed (%u)\n", status); - ok(identity == NULL, "expected NULL identity\n"); - ok(principal != (unsigned char *)0xdeadbeef, "expected valid principal\n"); - ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY\n"); - ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT\n"); - todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME\n"); + ok(identity == NULL, "expected NULL identity, got %p\n", identity); + ok(principal != (unsigned char *)0xdeadbeef, "expected valid principal, got %p\n", principal); + ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY, got %d\n", level); + ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT, got %d\n", authnsvc); + todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME, got %d\n", authzsvc); RpcStringFree(&principal);

1 0