January 2011 - Wine-commits

Stefan Dösinger : wined3d: Don' t set cube and volume POW2 caps if np2 textures are supported.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: e98a0e5bb1d1d3cdd2ab76313726d2567f8a79b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98a0e5bb1d1d3cdd2ab76313… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 21 18:08:41 2010 +0100 wined3d: Don't set cube and volume POW2 caps if np2 textures are supported. --- dlls/wined3d/directx.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index da179a7..e39bd3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4343,16 +4343,21 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, if (gl_info->supported[EXT_TEXTURE3D]) { pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | - WINED3DPTEXTURECAPS_MIPVOLUMEMAP | - WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; + WINED3DPTEXTURECAPS_MIPVOLUMEMAP; + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + { + pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; + } } if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | - WINED3DPTEXTURECAPS_MIPCUBEMAP | - WINED3DPTEXTURECAPS_CUBEMAP_POW2; - + WINED3DPTEXTURECAPS_MIPCUBEMAP; + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + { + pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; + } } pCaps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR |

1 0

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

17 Jan '11

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/tests: Add more tests for GetCharABCWidthsA.
by Alexandre Julliard 17 Jan '11

17 Jan '11

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: Pass the byte count to FONT_mbtowc in GetCharABCWidthsA.
by Alexandre Julliard 17 Jan '11

17 Jan '11

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: Avoid an integer overflow in GetCharABCWidthsA.
by Alexandre Julliard 17 Jan '11

17 Jan '11

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: Add a helper function to get chars in the range.
by Alexandre Julliard 17 Jan '11

17 Jan '11

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: Use the helper function in GetCharWidth32A to support DBCS.
by Alexandre Julliard 17 Jan '11

17 Jan '11

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

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

17 Jan '11

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

Andrew Nguyen : gameux: Free the allocated GameStatisticsImpl object on failure in GameStatisticsMgrImpl ::GetGameStatistics.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: e6da2aec8f9e5bea9e0c857790c7dfaec4191fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6da2aec8f9e5bea9e0c85779… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 16 03:41:49 2011 -0600 gameux: Free the allocated GameStatisticsImpl object on failure in GameStatisticsMgrImpl::GetGameStatistics. Spotted with Valgrind. --- dlls/gameux/gamestatistics.c | 13 +++++++++++-- dlls/gameux/tests/gamestatistics.c | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index ecd518f..61df25e 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -1086,7 +1086,8 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( { HRESULT hr; WCHAR lpApplicationId[49]; - GameStatisticsImpl *statisticsImpl; + GameStatisticsImpl *statisticsImpl = NULL; + IGameStatistics *output_iface; TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); @@ -1097,13 +1098,21 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( if(SUCCEEDED(hr)) { - *ppiStats = IGameStatistics_from_impl(statisticsImpl); + output_iface = IGameStatistics_from_impl(statisticsImpl); hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, statisticsImpl->stats.sStatsFile); } if(SUCCEEDED(hr)) hr = GAMEUX_loadGameStatistics(&statisticsImpl->stats, lpApplicationId, openType, pOpenResult); + if(SUCCEEDED(hr)) + *ppiStats = output_iface; + else + { + HeapFree(GetProcessHeap(), 0, statisticsImpl); + *ppiStats = NULL; + } + return hr; } diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index c49e693..5bae4c8 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -225,7 +225,7 @@ static void test_gamestatisticsmgr( void ) WORD wMaxStatsPerCategory = 0, wMaxCategories = 0; IGameStatisticsMgr* gsm = NULL; - IGameStatistics* gs = NULL; + IGameStatistics* gs; hr = CoCreateInstance( &CLSID_GameStatistics, NULL, CLSCTX_INPROC_SERVER, &IID_IGameStatisticsMgr, (LPVOID*)&gsm); ok(hr == S_OK, "IGameStatisticsMgr creating failed (result false)\n"); @@ -233,8 +233,10 @@ static void test_gamestatisticsmgr( void ) /* test trying to create interface IGameStatistics using GetGameStatistics method */ /* this should fail, cause statistics doesn't yet exists */ + gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); + ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); /* now, allow to create */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs);

1 0

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

17 Jan '11

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