March 2011 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Reduce filename to the long name in ITERATE_RemoveFiles.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 3878c451caa53a276f96f605f352727100559b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3878c451caa53a276f96f605f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:39:53 2011 +0100 msi: Reduce filename to the long name in ITERATE_RemoveFiles. --- dlls/msi/files.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d024718..df765e5 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -915,14 +915,14 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) MSIPACKAGE *package = param; MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR component, filename, dirprop; + LPCWSTR component, dirprop; UINT install_mode; - LPWSTR dir = NULL, path = NULL; + LPWSTR dir = NULL, path = NULL, filename = NULL; DWORD size; UINT ret = ERROR_SUCCESS; component = MSI_RecordGetString(row, 2); - filename = MSI_RecordGetString(row, 3); + filename = strdupW( MSI_RecordGetString(row, 3) ); dirprop = MSI_RecordGetString(row, 4); install_mode = MSI_RecordGetInteger(row, 5); @@ -950,7 +950,12 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) if (!dir) return ERROR_OUTOFMEMORY; - size = (filename != NULL) ? lstrlenW(filename) : 0; + size = 0; + if (filename) + { + reduce_to_longfilename( filename ); + size = lstrlenW( filename ); + } size += lstrlenW(dir) + 2; path = msi_alloc(size * sizeof(WCHAR)); if (!path) @@ -981,6 +986,7 @@ done: ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); + msi_free(filename); msi_free(path); msi_free(dir); return ret;

1 0

Hans Leidekker : msi: Compare keys only in compare_record.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 659db6e9024d60d997d065021b8ab46f765d0e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=659db6e9024d60d997d065021… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:06 2011 +0100 msi: Compare keys only in compare_record. --- dlls/msi/table.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index cdbdd58..bc05987 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1630,6 +1630,8 @@ static int compare_record( MSITABLEVIEW *tv, UINT row, MSIRECORD *rec ) for (i = 0; i < tv->num_cols; i++ ) { + if (!(tv->columns[i].type & MSITYPE_KEY)) continue; + r = get_table_value_from_record( tv, rec, i + 1, &ivalue ); if (r != ERROR_SUCCESS) return 1;

1 0

Hans Leidekker : msi: Avoid registering duplicate source list information.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 40ad619ac334732ea4dd5c073e2a13d5a899922d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ad619ac334732ea4dd5c073… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:20 2011 +0100 msi: Avoid registering duplicate source list information. --- dlls/msi/package.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5606d28..8d5fc18 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2567,6 +2567,11 @@ UINT msi_package_add_info(MSIPACKAGE *package, DWORD context, DWORD options, { MSISOURCELISTINFO *info; + LIST_FOR_EACH_ENTRY( info, &package->sourcelist_info, MSISOURCELISTINFO, entry ) + { + if (!strcmpW( info->value, value )) return ERROR_SUCCESS; + } + info = msi_alloc(sizeof(MSISOURCELISTINFO)); if (!info) return ERROR_OUTOFMEMORY; @@ -2585,6 +2590,11 @@ UINT msi_package_add_media_disk(MSIPACKAGE *package, DWORD context, DWORD option { MSIMEDIADISK *disk; + LIST_FOR_EACH_ENTRY( disk, &package->sourcelist_media, MSIMEDIADISK, entry ) + { + if (disk->disk_id == disk_id) return ERROR_SUCCESS; + } + disk = msi_alloc(sizeof(MSIMEDIADISK)); if (!disk) return ERROR_OUTOFMEMORY;

1 0

Hans Leidekker : msi: Manage one assembly cache per major version of the . NET runtime.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: f1e59351ded497a7f9cd7c27c0fdfcf6db3765c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e59351ded497a7f9cd7c27c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:39 2011 +0100 msi: Manage one assembly cache per major version of the .NET runtime. --- dlls/msi/assembly.c | 188 +++++++++++++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 10 +++- dlls/msi/package.c | 6 +- 3 files changed, 135 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1e59351ded497a7f9cd7…

1 0

Nikolay Sivov : msvcrt: Added _wcslwr_s implementation.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 27e18b3bbc9aaf2ecf4146262af39448083cf360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e18b3bbc9aaf2ecf4146262… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 01:59:08 2011 +0300 msvcrt: Added _wcslwr_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 90 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 28 +++++++++++++ 6 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 608bfc6..42d8310 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1293,7 +1293,7 @@ @ stub _wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l -@ stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ stub _wcsncoll @ stub _wcsncoll_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 58b855c..f9eaaf0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1146,7 +1146,7 @@ @ stub _wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l -@ stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ stub _wcsncoll @ stub _wcsncoll_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d76acc8..b7288da 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1133,7 +1133,7 @@ @ stub _wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l -@ stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ stub _wcsncoll @ stub _wcsncoll_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c7f2120..f75c0d9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1067,7 +1067,7 @@ # stub _wcsicoll_l @ cdecl _wcslwr(wstr) ntdll._wcslwr # stub _wcslwr_l -# stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s # stub _wcslwr_s_l @ stub _wcsncoll #(wstr wstr long) # stub _wcsncoll_l diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c532fce..dfa38e6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -75,6 +75,7 @@ static errno_t (__cdecl *p_ultoa_s)(__msvcrt_ulong,char*,size_t,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); +static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -731,6 +732,93 @@ static void test__wcsupr_s(void) ok(!wcscmp(testBuffer, expectedString), "Expected the string to be fully upper-case\n"); } +static void test__wcslwr_s(void) +{ + static const WCHAR mixedString[] = {'M', 'i', 'X', 'e', 'D', 'l', 'o', 'w', + 'e', 'r', 'U', 'P', 'P', 'E', 'R', 0}; + static const WCHAR expectedString[] = {'m', 'i', 'x', 'e', 'd', 'l', 'o', + 'w', 'e', 'r', 'u', 'p', 'p', 'e', + 'r', 0}; + WCHAR buffer[2*sizeof(mixedString)/sizeof(WCHAR)]; + int ret; + + if (!p_wcslwr_s) + { + win_skip("_wcslwr_s not found\n"); + return; + } + + /* Test NULL input string and invalid size. */ + errno = EBADF; + ret = p_wcslwr_s(NULL, 0); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno); + + /* Test NULL input string and valid size. */ + errno = EBADF; + ret = p_wcslwr_s(NULL, sizeof(buffer)/sizeof(wchar_t)); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno); + + /* Test empty string with zero size. */ + errno = EBADF; + buffer[0] = 'a'; + ret = p_wcslwr_s(buffer, 0); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno); + ok(buffer[0] == 0, "expected empty string\n"); + + /* Test empty string with size of one. */ + buffer[0] = 0; + ret = p_wcslwr_s(buffer, 1); + ok(ret == 0, "got %d\n", ret); + ok(buffer[0] == 0, "expected buffer to be unchanged\n"); + + /* Test one-byte buffer with zero size. */ + errno = EBADF; + buffer[0] = 'x'; + ret = p_wcslwr_s(buffer, 0); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test one-byte buffer with size of one. */ + errno = EBADF; + buffer[0] = 'x'; + ret = p_wcslwr_s(buffer, 1); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test invalid size. */ + wcscpy(buffer, mixedString); + errno = EBADF; + ret = p_wcslwr_s(buffer, 0); + ok(ret == EINVAL, "Expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test normal string uppercasing. */ + wcscpy(buffer, mixedString); + ret = p_wcslwr_s(buffer, sizeof(mixedString)/sizeof(WCHAR)); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(!wcscmp(buffer, expectedString), "expected lowercase\n"); + + /* Test uppercasing with a shorter buffer size count. */ + wcscpy(buffer, mixedString); + errno = EBADF; + ret = p_wcslwr_s(buffer, sizeof(mixedString)/sizeof(WCHAR) - 1); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test uppercasing with a longer buffer size count. */ + wcscpy(buffer, mixedString); + ret = p_wcslwr_s(buffer, sizeof(buffer)/sizeof(WCHAR)); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(!wcscmp(buffer, expectedString), "expected lowercase\n"); +} + static void test_mbcjisjms(void) { /* List of value-pairs to test. The test assumes the last pair to be {0, ..} */ @@ -1732,6 +1820,7 @@ START_TEST(string) p_strlwr_s = (void *)GetProcAddress(hMsvcrt, "_strlwr_s"); p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); + p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1771,4 +1860,5 @@ START_TEST(string) test_wcsncat_s(); test__mbsnbcat_s(); test__ultoa_s(); + test__wcslwr_s(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b01e60b..d45094a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -131,6 +131,34 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) return MSVCRT_EINVAL; } +/****************************************************************** + * _wcslwr_s (MSVCRT.@) + */ +int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +{ + MSVCRT_wchar_t* ptr = str; + + if (!str || !n) + { + if (str) *str = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (n--) + { + if (!*ptr) return 0; + *ptr = tolowerW(*ptr); + ptr++; + } + + /* MSDN claims that the function should return and set errno to + * ERANGE, which doesn't seem to be true based on the tests. */ + *str = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; +} + /********************************************************************* * _wcstod_l - not exported in native msvcrt */

1 0

Francois Gouget : wscript/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: bc6a7f40d5bb02483a166fe388e1cc81195cbcda URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6a7f40d5bb02483a166fe38… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:42 2011 +0100 wscript/tests: Add a '\n' to an ok() call. --- programs/wscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 7cb7bc8..405aae4 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -272,7 +272,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG script_size--; ext = strrchr(name, '.'); - ok(ext != NULL, "no script extension"); + ok(ext != NULL, "no script extension\n"); if(!ext) return TRUE;

1 0

Francois Gouget : mscoree: Add a '\n' to an ERR() trace.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: e0b2307f9c6208d7672a03338e6f84e8966fd2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b2307f9c6208d7672a03338… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:29 2011 +0100 mscoree: Add a '\n' to an ERR() trace. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 708f638..ca4795e 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -119,7 +119,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if ((*result)->is_shutdown) { - ERR("Cannot load Mono after it has been shut down."); + ERR("Cannot load Mono after it has been shut down.\n"); *result = NULL; return E_FAIL; }

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 41663974ad054e51117780a9bff70e928ea946f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41663974ad054e51117780a9b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:57 2011 +0100 d3dx9_36/tests: Add a trailing '\n' to ok() calls. --- dlls/d3dx9_36/tests/mesh.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a6ac4b3..f460c2d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1377,7 +1377,7 @@ static void D3DXCreateBoxTest(void) wnd = CreateWindow("d3dx9_test_wc", "d3dx9_test", WS_SYSMENU | WS_POPUP , 0, 0, 640, 480, 0, 0, 0, 0); - ok(wnd != NULL, "Expected to have a window, received NULL"); + ok(wnd != NULL, "Expected to have a window, received NULL\n"); if (!wnd) { skip("Couldn't create application window\n"); @@ -1405,26 +1405,26 @@ static void D3DXCreateBoxTest(void) } hr = D3DXCreateBuffer(36 * sizeof(DWORD), &ppBuffer); - ok(hr==D3D_OK, "Expected D3D_OK, received %#x", hr); + ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) goto end; hr = D3DXCreateBox(device,2.0f,20.0f,4.9f,NULL, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(NULL,22.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,-2.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,-20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3D_OK,"Expected D3D_OK, received %#x", hr); + todo_wine ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) {

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: bf75229a0402b8eca8e2f41ded1e69830b587eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf75229a0402b8eca8e2f41de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:15 2011 +0100 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/printf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index f05d124..ddf4801 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -859,7 +859,7 @@ static void test_xcvt(void) for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); - ok(err == 0, "_fcvt_s() failed with error code %d", err); + ok(err == 0, "_fcvt_s() failed with error code %d\n", err); ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), "_fcvt_s() bad return, got '%s' expected '%s'. test %d\n", str, test_cvt_testcases[i].expstr_f, i);

1 0

Francois Gouget : shell32/tests: Add a trailing '\n' to a skip().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b7b916b05f1e08b189cacbe5c205fd211e3c3b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b916b05f1e08b189cacbe5c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:37 2011 +0100 shell32/tests: Add a trailing '\n' to a skip(). --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bc3e426..c17694b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3696,7 +3696,7 @@ void test_ShellItemGetAttributes(void) } if(FAILED(hr)) { - skip("Skipping tests."); + skip("Skipping tests.\n"); return; }

1 0