January 2010 - Wine-Commits

Paul Vriens : widl: Fix size parameter for xrealloc (Coccinelle).
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: caaf027e554295a320f7841f433375ddad344aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=caaf027e554295a320f7841f4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 11 08:59:11 2010 +0100 widl: Fix size parameter for xrealloc (Coccinelle). --- tools/widl/proxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index de8e466..30feca8 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -754,7 +754,7 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], type_t *iface = stmt->u.type; if (type_iface_get_inherit(iface) && need_proxy(iface)) { - *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(*ifaces) ); + *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); (*ifaces)[(*count)++] = iface; } }

1 0

Paul Vriens : msvidc32: Fix size parameter for memset (Coccinelle).
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: b543c40de4d09d2ea196c48ed1d8ee2a0e5aa6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b543c40de4d09d2ea196c48ed… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 11 08:54:26 2010 +0100 msvidc32: Fix size parameter for memset (Coccinelle). --- dlls/msvidc32/msvideo1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 3052964..19784eb 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -508,7 +508,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, info = HeapAlloc( GetProcessHeap(), 0, sizeof (Msvideo1Context) ); if( info ) { - memset( info, 0, sizeof info ); + memset( info, 0, sizeof *info ); info->dwMagic = CRAM_MAGIC; } r = (LRESULT) info;

1 0

Paul Vriens : winedump: Pass the correct size to the helper (Coccinelle).
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 133ed6bac127a73075620c2c5962abd231ac9b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=133ed6bac127a73075620c2c5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 11 09:01:56 2010 +0100 winedump: Pass the correct size to the helper (Coccinelle). --- tools/winedump/pe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 2732662..728253e 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1095,7 +1095,7 @@ void dbg_dump(void) unsigned i; const IMAGE_DEBUG_DIRECTORY* debugDir; - separateDebugHead = PRD(0, sizeof(separateDebugHead)); + separateDebugHead = PRD(0, sizeof(*separateDebugHead)); if (!separateDebugHead) {printf("Can't grab the separate header, aborting\n"); return;} printf ("Signature: %.2s (0x%4X)\n",

1 0

Paul Vriens : d3d9/tests: Correct the size of a memcmp.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: e0405286bc9f3de2a1e78c880f31ced5c50ec758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0405286bc9f3de2a1e78c880… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 11 09:47:19 2010 +0100 d3d9/tests: Correct the size of a memcmp. --- dlls/d3d9/tests/vertexdeclaration.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 72b8f9f..9d507a1 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -214,7 +214,7 @@ static void test_get_declaration(IDirect3DVertexDeclaration9 *decl_ptr, D3DVERTE ok(hret == D3D_OK && num_elements == expected_num_elements, "GetDeclaration returned: hret 0x%x, num_elements %d. " "Expected hret 0x%x, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); - i = memcmp(decl, vertex_decl, sizeof(*vertex_decl)); + i = memcmp(decl, vertex_decl, num_elements * sizeof(*vertex_decl)); ok (!i, "Original and returned vertexdeclarations are not the same\n"); ZeroMemory(decl, sizeof(D3DVERTEXELEMENT9) * expected_num_elements); @@ -223,7 +223,7 @@ static void test_get_declaration(IDirect3DVertexDeclaration9 *decl_ptr, D3DVERTE ok(hret == D3D_OK && num_elements == expected_num_elements, "GetDeclaration returned: hret 0x%x, num_elements %d. " "Expected hret 0x%x, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); - i = memcmp(decl, vertex_decl, sizeof(*vertex_decl)); + i = memcmp(decl, vertex_decl, num_elements * sizeof(*vertex_decl)); ok (!i, "Original and returned vertexdeclarations are not the same\n"); HeapFree(GetProcessHeap(), 0, decl);

1 0

Julius Schwartzenberg : avifil32/tests: Test corrupt avi list magic.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: ef19d85229c746f6fc7df3fc2ccd7bf0df89bcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef19d85229c746f6fc7df3fc2… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun Jan 10 01:54:19 2010 +0100 avifil32/tests: Test corrupt avi list magic. --- dlls/avifil32/tests/api.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 13c06db..7cc0c1b 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -354,6 +354,27 @@ static void test_default_data(void) ok(DeleteFile(filename) !=0, "Deleting file %s failed", filename); } +static void test_amh_corruption(void) +{ + COMMON_AVI_HEADERS cah; + char filename[MAX_PATH]; + PAVIFILE pFile; + int res; + + GetTempPath(MAX_PATH, filename); + strcpy(filename+strlen(filename), testfilename); + + /* Make sure only AVI files with the proper headers will be loaded */ + init_test_struct(&cah); + cah.fh[3] = mmioFOURCC('A', 'V', 'i', ' '); + + create_avi_file(&cah, filename); + res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + ok(res != 0, "Able to open file: error=%u\n", res); + + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); +} + /* ########################### */ START_TEST(api) @@ -362,6 +383,7 @@ START_TEST(api) AVIFileInit(); test_AVISaveOptions(); test_default_data(); + test_amh_corruption(); AVIFileExit(); }

1 0

Jason Edmeades : msvcrt: Add support for vsprintf_s.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: a2d4e5cb5da8d6ecef4427b860fcde1b8f47efad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d4e5cb5da8d6ecef4427b86… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jan 10 13:37:31 2010 -0800 msvcrt: Add support for vsprintf_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c6c749d..819ccb3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -791,6 +791,7 @@ @ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf @ cdecl vprintf(str ptr) MSVCRT_vprintf @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf +@ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6e08822..88fae62 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -830,6 +830,14 @@ int CDECL MSVCRT_vsprintf( char *str, const char *format, __ms_va_list valist) } /********************************************************************* + * vsprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_s( char *str, MSVCRT_size_t num, const char *format, __ms_va_list valist) +{ + return MSVCRT_vsnprintf(str, num, format, valist); +} + +/********************************************************************* * _vscprintf (MSVCRT.@) */ int CDECL _vscprintf( const char *format, __ms_va_list valist )

1 0

Paul Vriens : oleview: Fix size parameter for memset (Coccinelle).
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: d38682816be22593131bd160ecbda884f020d1e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38682816be22593131bd160e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 11 08:57:18 2010 +0100 oleview: Fix size parameter for memset (Coccinelle). --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 92834aa..7e9e4a0 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -278,7 +278,7 @@ static void AddChildrenData(HTREEITEM hParent, TYPELIB_DATA *pData) HTREEITEM hCur; TVITEM tvi; - memset(&tvi, 0, sizeof(&tvi)); + memset(&tvi, 0, sizeof(tvi)); hCur = TreeView_GetChild(typelib.hTree, hParent); if(!hCur) return;

1 0

Julius Schwartzenberg : avifil32/tests: Test how avifile deals with audio stream and wave headers.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 9bcb143a4094ede8656bd6b37a318cf9dbf73f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcb143a4094ede8656bd6b37… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun Jan 10 01:57:33 2010 +0100 avifil32/tests: Test how avifile deals with audio stream and wave headers. --- dlls/avifil32/tests/api.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 7cc0c1b..28bae04 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -375,6 +375,76 @@ static void test_amh_corruption(void) ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); } +static void test_ash1_corruption(void) +{ + COMMON_AVI_HEADERS cah; + char filename[MAX_PATH]; + PAVIFILE pFile; + int res; + PAVISTREAM pStream1; + AVISTREAMINFO asi1; + + GetTempPath(MAX_PATH, filename); + strcpy(filename+strlen(filename), testfilename); + + /* Corrupt the sample size in the audio stream header */ + init_test_struct(&cah); + cah.ash1.dwSampleSize = 0xdeadbeef; + + create_avi_file(&cah, filename); + + res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + ok(res == 0, "Unable to open file: error=%u\n", res); + + res = AVIFileGetStream(pFile, &pStream1, 0, 1); + ok(res == 0, "Unable to open audio stream: error=%u\n", res); + + res = AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)); + ok(res == 0, "Unable to read stream info: error=%u\n", res); + + /* The result will still be 2, because the value is dynamically replaced with the nBlockAlign + value from the stream format header. The next test will prove this */ + todo_wine{ ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); } + + AVIStreamRelease(pStream1); + AVIFileRelease(pFile); + ok(DeleteFile(filename) !=0, "Deleting file %s failed", filename); +} + +static void test_ash1_corruption2(void) +{ + COMMON_AVI_HEADERS cah; + char filename[MAX_PATH]; + PAVIFILE pFile; + int res; + PAVISTREAM pStream1; + AVISTREAMINFO asi1; + + GetTempPath(MAX_PATH, filename); + strcpy(filename+strlen(filename), testfilename); + + /* Corrupt the block alignment in the audio format header */ + init_test_struct(&cah); + cah.pcmwf.wf.nBlockAlign = 0xdead; + + create_avi_file(&cah, filename); + + res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + ok(res == 0, "Unable to open file: error=%u\n", res); + + res = AVIFileGetStream(pFile, &pStream1, 0, 1); + ok(res == 0, "Unable to open audio stream: error=%u\n", res); + + ok(AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)) == 0, "Unable to read stream info\n"); + + /* The result will also be the corrupt value, as explained above. */ + todo_wine{ ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); } + + AVIStreamRelease(pStream1); + AVIFileRelease(pFile); + ok(DeleteFile(filename) !=0, "Deleting file %s failed", filename); +} + /* ########################### */ START_TEST(api) @@ -384,6 +454,8 @@ START_TEST(api) test_AVISaveOptions(); test_default_data(); test_amh_corruption(); + test_ash1_corruption(); + test_ash1_corruption2(); AVIFileExit(); }

1 0

Jason Edmeades : msvcrt: Add support for sprintf_s.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 97194ec07094957241a36cb15e97e6dfc3e38d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97194ec07094957241a36cb15… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jan 10 13:40:40 2010 -0800 msvcrt: Add support for sprintf_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/wcs.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 819ccb3..721bdbc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -747,6 +747,7 @@ @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh @ varargs sprintf(ptr str) MSVCRT_sprintf +@ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 88fae62..2a1dd25 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -902,6 +902,20 @@ int CDECL MSVCRT_sprintf( char *str, const char *format, ... ) } /********************************************************************* + * sprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start( ap, format ); + r = MSVCRT_vsnprintf( str, num, format, ap ); + __ms_va_end( ap ); + return r; +} + +/********************************************************************* * swprintf (MSVCRT.@) */ int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... )

1 0

Juan Lang : secur32: Report an error if libgnutls isn't found.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 7c3b9a1551e1876d42b8fa24a1a31b8696d593a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3b9a1551e1876d42b8fa24a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 11 10:43:34 2010 -0800 secur32: Report an error if libgnutls isn't found. --- dlls/secur32/schannel.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 27cb1b7..6205f1d 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1451,7 +1451,11 @@ void SECUR32_deinitSchannelSP(void) #else /* SONAME_LIBGNUTLS */ -void SECUR32_initSchannelSP(void) {} +void SECUR32_initSchannelSP(void) +{ + ERR("libgnutls not found, SSL connections will fail\n"); +} + void SECUR32_deinitSchannelSP(void) {} #endif /* SONAME_LIBGNUTLS */

1 0