ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cabinet: Make Extract overwrite existing files. 

Only read-only files must not be overwritten.

Signed-off-by: Lauri Kenttä <lauri.kentta@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Lauri Kenttä 2017-02-04 14:24:49 +02:00 committed by Alexandre Julliard
parent 7219c7cf5d
commit af86bdc31b
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/cabinet/cabinet_main.c
View File

@ -251,7 +251,7 @@ static INT_PTR CDECL fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICAT
} }
hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL,
CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
hFile = 0; hFile = 0;

24
dlls/cabinet/tests/extract.c
View File

@ -80,6 +80,18 @@ static void createTestFile(const CHAR *name)
CloseHandle(file); CloseHandle(file);
} }
static int getFileSize(const CHAR *name)
{
HANDLE file;
int size;
file = CreateFileA(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
if (file == INVALID_HANDLE_VALUE)
return -1;
size = GetFileSize(file, NULL);
CloseHandle(file);
return size;
}
static void create_test_files(void) static void create_test_files(void)
{ {
int len; int len;
@ -621,9 +633,10 @@ static void test_Extract(void)
ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n");
free_file_list(&session); free_file_list(&session);
/* first file exists */ /* first file exists but is read-only */
createTestFile("dest\\a.txt"); createTestFile("dest\\a.txt");
SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY);
ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n");
ZeroMemory(&session, sizeof(SESSION)); ZeroMemory(&session, sizeof(SESSION));
lstrcpyA(session.Destination, "dest"); lstrcpyA(session.Destination, "dest");
session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES;
@ -647,7 +660,8 @@ static void test_Extract(void)
ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination);
ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved);
ok(!session.FilterList, "Expected empty filter list\n"); ok(!session.FilterList, "Expected empty filter list\n");
ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n");
ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to be read-only\n");
todo_wine todo_wine
{ {
ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n");
@ -663,7 +677,8 @@ static void test_Extract(void)
SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL);
DeleteFileA("dest\\a.txt"); DeleteFileA("dest\\a.txt");
/* third file exists */ /* first file exists and is writable, third file exists but is read-only */
createTestFile("dest\\a.txt");
createTestFile("dest\\testdir\\c.txt"); createTestFile("dest\\testdir\\c.txt");
SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY);
ZeroMemory(&session, sizeof(SESSION)); ZeroMemory(&session, sizeof(SESSION));
@ -689,9 +704,10 @@ static void test_Extract(void)
ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination);
ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved);
ok(!session.FilterList, "Expected empty filter list\n"); ok(!session.FilterList, "Expected empty filter list\n");
ok(getFileSize("dest\\a.txt") == 6, "Expected dest\\a.txt to be 6 bytes\n");
ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n");
ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n");
ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to be read-only\n");
todo_wine todo_wine
{ {
ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n");