January 2011 - Wine-Commits

Greg Geldorp : winhttp/tests: Fix tests when connecting via proxy.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 4745c567f5fb2c7c830760b54e8d232873416cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4745c567f5fb2c7c830760b54… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 17 12:37:23 2011 +0100 winhttp/tests: Fix tests when connecting via proxy. --- dlls/winhttp/tests/winhttp.c | 62 +++++++++++++++++++++++++++++------------- 1 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3c725cf..37d71b8 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -34,6 +34,25 @@ static const WCHAR test_useragent[] = static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; +static BOOL proxy_active(void) +{ + WINHTTP_PROXY_INFO proxy_info; + BOOL active = FALSE; + + if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) + { + active = (proxy_info.lpszProxy != NULL); + if (active) + GlobalFree((HGLOBAL) proxy_info.lpszProxy); + if (proxy_info.lpszProxyBypass != NULL) + GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + } + else + active = FALSE; + + return active; +} + static void test_QueryOption(void) { BOOL ret; @@ -796,7 +815,7 @@ static void test_secure_connection(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret, "succeeded unexpectedly\n"); + ok(!ret || proxy_active(), "succeeded unexpectedly\n"); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); @@ -1668,28 +1687,33 @@ static void test_resolve_timeout(void) DWORD timeout; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); - - timeout = 10000; - ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); - ok(ret, "failed to set resolve timeout %u\n", GetLastError()); + if (! proxy_active()) + { + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, nxdomain, 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + timeout = 10000; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); + ok(ret, "failed to set resolve timeout %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + con = WinHttpConnect(ses, nxdomain, 0, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(!ret, "sent request\n"); - ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, - "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); - WinHttpCloseHandle(req); - WinHttpCloseHandle(con); - WinHttpCloseHandle(ses); + SetLastError(0xdeadbeef); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(!ret, "sent request\n"); + ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, + "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); + } + else + skip("Skipping host resolution tests, host resolution preformed by proxy\n"); ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError());

1 0

Andrew Nguyen : setupapi: Fix some memory leaks in SetupDiGetINFClassA.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: c66d27c55588b0ab3406ce4729348beec3aab536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66d27c55588b0ab3406ce472… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Jan 15 02:28:37 2011 -0600 setupapi: Fix some memory leaks in SetupDiGetINFClassA. Spotted with Valgrind. --- dlls/setupapi/devinst.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1d318fe..5b8fb3c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3998,10 +3998,26 @@ BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, PWSTR class_nameW = NULL; UNICODE_STRING infW; - if (inf) RtlCreateUnicodeStringFromAsciiz(&infW, inf); - else infW.Buffer = NULL; + if (inf) + { + if (!RtlCreateUnicodeStringFromAsciiz(&infW, inf)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + else + infW.Buffer = NULL; + if (class_name && size) - class_nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + { + if (!(class_nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) + { + RtlFreeUnicodeString(&infW); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } retval = SetupDiGetINFClassW(infW.Buffer, class_guid, class_nameW, size, &required_sizeW); @@ -4015,6 +4031,8 @@ BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, else if(required_size) *required_size = required_sizeW; + HeapFree(GetProcessHeap(), 0, class_nameW); + RtlFreeUnicodeString(&infW); return retval; }

1 0

Akihiro Sagawa : gdi32: Pass the byte count to FONT_mbtowc in GetCharABCWidthsA.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 62b59635070045d43df3b110d107c46e9f1c8e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b59635070045d43df3b110d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 16 23:00:18 2011 +0900 gdi32: Pass the byte count to FONT_mbtowc in GetCharABCWidthsA. --- dlls/gdi32/font.c | 2 +- dlls/gdi32/tests/font.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5d47ca6..75a714b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2317,7 +2317,7 @@ BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, } str[i] = '\0'; - wstr = FONT_mbtowc(hdc, str, -1, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, i, &wlen, NULL); if (wstr == NULL) { HeapFree(GetProcessHeap(), 0, str); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5f3ecc8..eda7056 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -988,7 +988,6 @@ static void test_GetCharABCWidths(void) memset(full, 0xcc, sizeof full); ret = pGetCharABCWidthsA(hdc, 0x00, code, full); ok(ret, "GetCharABCWidthsA should have succeeded\n"); - todo_wine ok(memcmp(&a[0], &full[code], sizeof(ABC)) == 0, "GetCharABCWidthsA info should match. codepage = %u\n", c[i].cs);

1 0

Akihiro Sagawa : gdi32: Use the helper function in GetCharABCWidthsFloatA to support DBCS.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: ac66c575238a9bcd3a0a0a6fc6679421f1ec2d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac66c575238a9bcd3a0a0a6fc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 16 23:00:29 2011 +0900 gdi32: Use the helper function in GetCharABCWidthsFloatA to support DBCS. --- dlls/gdi32/font.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 966d3dd..5dc2132 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3005,19 +3005,16 @@ GetCharacterPlacementW( */ BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) { - INT i, wlen, count = (INT)(last - first + 1); + INT i, wlen; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; - if (count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count); - - for(i = 0; i < count; i++) - str[i] = (BYTE)(first + i); + str = FONT_GetCharsByRangeA(first, last, &i); + if (str == NULL) + return FALSE; - wstr = FONT_mbtowc( hdc, str, count, &wlen, NULL ); + wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL ); for (i = 0; i < wlen; i++) {

1 0

Akihiro Sagawa : gdi32: Add a helper function to get chars in the range.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: b9c41636bb47e092ddc1ee34c5f050cb5a6d62c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c41636bb47e092ddc1ee34c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 16 23:00:25 2011 +0900 gdi32: Add a helper function to get chars in the range. --- dlls/gdi32/font.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cf29add..1489956 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1553,6 +1553,31 @@ UINT WINAPI GetOutlineTextMetricsW( return ret; } +static LPSTR FONT_GetCharsByRangeA(UINT firstChar, UINT lastChar, PINT pByteLen) +{ + INT i, count = lastChar - firstChar + 1; + UINT c; + LPSTR str; + + if (count <= 0) + return NULL; + + str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1); + if (str == NULL) + return NULL; + + for(i = 0, c = firstChar; c <= lastChar; i++, c++) + { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + str[i] = (BYTE)c; + } + str[i] = '\0'; + + *pByteLen = i; + + return str; +} /*********************************************************************** * GetCharWidthW (GDI32.@) @@ -2296,27 +2321,15 @@ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, LPABC abc ) { - INT i, wlen, count = (INT)(lastChar - firstChar + 1); - UINT c; + INT i, wlen; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; - if (count <= 0) - return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1); + str = FONT_GetCharsByRangeA(firstChar, lastChar, &i); if (str == NULL) return FALSE; - for(i = 0, c = firstChar; c <= lastChar; i++, c++) - { - if (c > 0xff) - str[i++] = (BYTE)(c >> 8); - str[i] = (BYTE)c; - } - str[i] = '\0'; - wstr = FONT_mbtowc(hdc, str, i, &wlen, NULL); if (wstr == NULL) {

1 0

Akihiro Sagawa : gdi32/tests: Add more tests for GetCharABCWidthsA.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: c05d8781ad6653d69162e5191618312cb459700f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05d8781ad6653d69162e5191… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 16 23:00:16 2011 +0900 gdi32/tests: Add more tests for GetCharABCWidthsA. --- dlls/gdi32/tests/font.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 14639da..5f3ecc8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -962,6 +962,8 @@ static void test_GetCharABCWidths(void) for (i = 0; i < sizeof c / sizeof c[0]; ++i) { ABC a[2], w[2]; + ABC full[256]; + UINT code = 0x41; lf.lfFaceName[0] = '\0'; lf.lfCharSet = c[i].cs; @@ -979,6 +981,17 @@ static void test_GetCharABCWidths(void) pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && memcmp(a, w, sizeof a) == 0, "GetCharABCWidthsA and GetCharABCWidthsW should return same widths. charset = %u\n", c[i].cs); + + memset(a, 0xbb, sizeof a); + ret = pGetCharABCWidthsA(hdc, code, code, a); + ok(ret, "GetCharABCWidthsA should have succeeded\n"); + memset(full, 0xcc, sizeof full); + ret = pGetCharABCWidthsA(hdc, 0x00, code, full); + ok(ret, "GetCharABCWidthsA should have succeeded\n"); + todo_wine + ok(memcmp(&a[0], &full[code], sizeof(ABC)) == 0, + "GetCharABCWidthsA info should match. codepage = %u\n", c[i].cs); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont); }

1 0

Akihiro Sagawa : gdi32: Avoid an integer overflow in GetCharABCWidthsA.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: d4924bf9a162a0045ac35e78b8a2785671137ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4924bf9a162a0045ac35e78b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 16 23:00:21 2011 +0900 gdi32: Avoid an integer overflow in GetCharABCWidthsA. --- dlls/gdi32/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 75a714b..cf29add 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2296,16 +2296,16 @@ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, LPABC abc ) { - INT i, wlen; + INT i, wlen, count = (INT)(lastChar - firstChar + 1); UINT c; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; - if (lastChar < firstChar) + if (count <= 0) return FALSE; - str = HeapAlloc(GetProcessHeap(), 0, (lastChar - firstChar + 1) * 2 + 1); + str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1); if (str == NULL) return FALSE;

1 0

Akihiro Sagawa : gdi32: Use the helper function in GetCharWidth32A to support DBCS.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: da76ffa90efa3f171dd5640c09d09d4d115c0fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da76ffa90efa3f171dd5640c0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 16 23:00:27 2011 +0900 gdi32: Use the helper function in GetCharWidth32A to support DBCS. --- dlls/gdi32/font.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1489956..966d3dd 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1615,18 +1615,16 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar, LPINT buffer ) { - INT i, wlen, count = (INT)(lastChar - firstChar + 1); + INT i, wlen; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; - if(count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count); - for(i = 0; i < count; i++) - str[i] = (BYTE)(firstChar + i); + str = FONT_GetCharsByRangeA(firstChar, lastChar, &i); + if(str == NULL) + return FALSE; - wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, i, &wlen, NULL); for(i = 0; i < wlen; i++) {

1 0

Andrew Nguyen : setupapi: Allocate the proper number of bytes for the drive spec.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: a91fd8fbb2e1f6980a259aad8217a5de363459ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91fd8fbb2e1f6980a259aad8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Jan 15 02:28:30 2011 -0600 setupapi: Allocate the proper number of bytes for the drive spec. Spotted with Valgrind. --- dlls/setupapi/diskspace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 89cac07..0a1a5ff 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -177,7 +177,7 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, return FALSE; } - driveW = HeapAlloc(GetProcessHeap(), 0, lstrlenW(DriveSpec) + 2); + driveW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(DriveSpec) + 2) * sizeof(WCHAR)); if (!driveW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY);

1 0

Andrew Nguyen : kernel32/tests: Free environment block in the child process when it is unused.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: ba7f7046ee9de1a3bb16c9910f8b8cf943d9107e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7f7046ee9de1a3bb16c9910… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 16 04:35:21 2011 -0600 kernel32/tests: Free environment block in the child process when it is unused. --- dlls/kernel32/tests/process.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e067471..a0ad79e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -249,8 +249,8 @@ static void doChild(const char* file, const char* option) STARTUPINFOA siA; STARTUPINFOW siW; int i; - char* ptrA; - WCHAR* ptrW; + char *ptrA, *ptrA_save; + WCHAR *ptrW, *ptrW_save; char bufA[MAX_PATH]; WCHAR bufW[MAX_PATH]; HANDLE hFile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); @@ -311,7 +311,7 @@ static void doChild(const char* file, const char* option) childPrintf(hFile, "CommandLineW=%s\n\n", encodeW(GetCommandLineW())); /* output of environment (Ansi) */ - ptrA = GetEnvironmentStringsA(); + ptrA_save = ptrA = GetEnvironmentStringsA(); if (ptrA) { char env_var[MAX_LISTED_ENV_VAR]; @@ -326,10 +326,11 @@ static void doChild(const char* file, const char* option) ptrA += strlen(ptrA) + 1; } childPrintf(hFile, "len=%d\n\n", i); + FreeEnvironmentStringsA(ptrA_save); } /* output of environment (Unicode) */ - ptrW = GetEnvironmentStringsW(); + ptrW_save = ptrW = GetEnvironmentStringsW(); if (ptrW) { WCHAR env_var[MAX_LISTED_ENV_VAR]; @@ -345,6 +346,7 @@ static void doChild(const char* file, const char* option) ptrW += lstrlenW(ptrW) + 1; } childPrintf(hFile, "len=%d\n\n", i); + FreeEnvironmentStringsW(ptrW_save); } childPrintf(hFile, "[Misc]\n");

1 0