Module: wine Branch: master Commit: 63d77d07dc6ac904d3c1005ca36f36dac92378cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d77d07dc6ac904d3c1005ca3...
Author: Ge van Geldorp ggeldorp@vmware.com Date: Wed Oct 7 12:28:07 2009 +0200
kernel32/tests: Skip some resource tests on Win7.
---
dlls/kernel32/tests/resource.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 622f781..7410675 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -125,16 +125,21 @@ static void update_empty_exe( void ) CloseHandle( file );
res = BeginUpdateResource( filename, TRUE ); - ok( res != NULL, "BeginUpdateResource failed\n"); + if ( res != NULL || GetLastError() != ERROR_FILE_INVALID ) + { + ok( res != NULL, "BeginUpdateResource failed\n");
- /* check if it's possible to open the file now */ - test = CreateFile(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok (test != INVALID_HANDLE_VALUE, "failed to create file\n"); + /* check if it's possible to open the file now */ + test = CreateFile(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok (test != INVALID_HANDLE_VALUE, "failed to create file\n");
- CloseHandle( test ); + CloseHandle( test );
- r = EndUpdateResource( res, FALSE ); - ok( r == FALSE, "EndUpdateResource failed\n"); + r = EndUpdateResource( res, FALSE ); + ok( r == FALSE, "EndUpdateResource failed\n"); + } + else + skip( "Can't update resource in empty file\n" );
res = BeginUpdateResource( filename, FALSE ); ok( res == NULL, "BeginUpdateResource failed\n");