July 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Don't use TIOCGICOUNT if we don't have linux/ serial.h to define the necessary struct.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: f7161ebe899c5f10098f87ce3c6be5219edbd78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7161ebe899c5f10098f87ce3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 29 21:08:02 2013 +0200 ntdll: Don't use TIOCGICOUNT if we don't have linux/serial.h to define the necessary struct. --- dlls/ntdll/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 3763959..f4ab212 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -804,7 +804,7 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { -#ifdef TIOCGICOUNT +#if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCGICOUNT) struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) {

1 0

Alexandre Julliard : ntdll: Add context definitions missing from the Android NDK.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: f8cdbecc25b589ce3e008f9d735fbd9df17ea58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8cdbecc25b589ce3e008f9d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 14:11:42 2013 +0200 ntdll: Add context definitions missing from the Android NDK. --- dlls/ntdll/signal_arm.c | 12 ++++++++++++ dlls/ntdll/signal_i386.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6334a6e..9b0f1eb 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -68,6 +68,18 @@ static pthread_key_t teb_key; */ #ifdef linux +#ifdef __ANDROID__ +typedef struct ucontext +{ + unsigned long uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; + struct sigcontext uc_mcontext; + sigset_t uc_sigmask; + unsigned long uc_regspace[128] __attribute__((__aligned__(8))); +} ucontext_t; +#endif + typedef ucontext_t SIGCONTEXT; /* All Registers access - only for local access */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0344a29..b29405b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -100,7 +100,42 @@ typedef struct * signal context platform-specific definitions */ -#if defined (__linux__) +#ifdef __ANDROID__ + +typedef struct ucontext +{ + unsigned long uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; + struct sigcontext uc_mcontext; + sigset_t uc_sigmask; +} SIGCONTEXT; + +#define EAX_sig(context) ((context)->uc_mcontext.eax) +#define EBX_sig(context) ((context)->uc_mcontext.ebx) +#define ECX_sig(context) ((context)->uc_mcontext.ecx) +#define EDX_sig(context) ((context)->uc_mcontext.edx) +#define ESI_sig(context) ((context)->uc_mcontext.esi) +#define EDI_sig(context) ((context)->uc_mcontext.edi) +#define EBP_sig(context) ((context)->uc_mcontext.ebp) +#define ESP_sig(context) ((context)->uc_mcontext.esp) + +#define CS_sig(context) ((context)->uc_mcontext.cs) +#define DS_sig(context) ((context)->uc_mcontext.ds) +#define ES_sig(context) ((context)->uc_mcontext.es) +#define SS_sig(context) ((context)->uc_mcontext.ss) +#define FS_sig(context) ((context)->uc_mcontext.fs) +#define GS_sig(context) ((context)->uc_mcontext.gs) + +#define EFL_sig(context) ((context)->uc_mcontext.eflags) +#define EIP_sig(context) ((context)->uc_mcontext.eip) +#define TRAP_sig(context) ((context)->uc_mcontext.trapno) +#define ERROR_sig(context) ((context)->uc_mcontext.err) + +#define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpstate)) +#define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpstate->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) + +#elif defined (__linux__) typedef ucontext_t SIGCONTEXT;

1 0

Alexandre Julliard : loader: ELF hash table entries are always 32-bit on Linux.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 1ecfff38bd0544beec0e34f58d098a74834684f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecfff38bd0544beec0e34f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 14:43:23 2013 +0200 loader: ELF hash table entries are always 32-bit on Linux. --- loader/preloader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e2f9c3f..f38e17a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -940,10 +940,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int const ElfW(Dyn) *dyn = NULL; const ElfW(Phdr) *ph; const ElfW(Sym) *symtab = NULL; - const Elf_Symndx *hashtab = NULL; + const Elf32_Word *hashtab = NULL; const Elf32_Word *gnu_hashtab = NULL; const char *strings = NULL; - Elf_Symndx idx; + Elf32_Word idx; /* check the values */ #ifdef DUMP_SYMS @@ -974,7 +974,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int if( dyn->d_tag == DT_SYMTAB ) symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr; if( dyn->d_tag == DT_HASH ) - hashtab = (const Elf_Symndx *)dyn->d_un.d_ptr; + hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; if( dyn->d_tag == DT_GNU_HASH ) gnu_hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; #ifdef DUMP_SYMS @@ -1007,9 +1007,9 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int else if (hashtab) /* old style hash table */ { const unsigned int hash = wld_elf_hash(var); - const Elf_Symndx nbuckets = hashtab[0]; - const Elf_Symndx *buckets = hashtab + 2; - const Elf_Symndx *chains = buckets + nbuckets; + const Elf32_Word nbuckets = hashtab[0]; + const Elf32_Word *buckets = hashtab + 2; + const Elf32_Word *chains = buckets + nbuckets; for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx]) {

1 0

Alexandre Julliard : include: Android supports sigsetjmp now.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 3dc0474cfc9318d9e89fd1d1da73cfaf1c7a61bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc0474cfc9318d9e89fd1d1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 29 21:16:07 2013 +0200 include: Android supports sigsetjmp now. --- include/wine/exception.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 9f9b339..8b807c1 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -88,7 +88,7 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__ANDROID__) +#if defined(__MINGW32__) || defined(__CYGWIN__) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf) #define siglongjmp(buf,val) longjmp(buf,val)

1 0

Alexandre Julliard : krnl386: Don't attempt direct I/ O port access on Android.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: fa0a73963f63eb7e7b9d85104ff346e2e0e492f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0a73963f63eb7e7b9d85104… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 29 22:45:00 2013 +0200 krnl386: Don't attempt direct I/O port access on Android. --- dlls/krnl386.exe16/ioports.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c index 457c64d..a3e7342 100644 --- a/dlls/krnl386.exe16/ioports.c +++ b/dlls/krnl386.exe16/ioports.c @@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); -#ifdef linux +#if defined(linux) && !defined(__ANDROID__) # define DIRECT_IO_ACCESS #else # undef DIRECT_IO_ACCESS

1 0

Hans Leidekker : server: The token user SID must be present in the default DACL.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 7dfdcf3034b2151b67c2a091decade2eb3fe1023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfdcf3034b2151b67c2a091d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 30 11:06:42 2013 +0200 server: The token user SID must be present in the default DACL. --- dlls/advapi32/tests/security.c | 59 ++++++++++++++++++++++++++++++++++++++++ server/token.c | 11 +++---- 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 30da864..c622bb2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4591,6 +4591,64 @@ static void test_TokenIntegrityLevel(void) CloseHandle(token); } +static void test_default_dacl_owner_sid(void) +{ + HANDLE handle; + BOOL ret, defaulted, present, found; + DWORD size, index; + SECURITY_DESCRIPTOR *sd; + SECURITY_ATTRIBUTES sa; + PSID owner; + ACL *dacl; + ACCESS_ALLOWED_ACE *ace; + + sd = HeapAlloc( GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH ); + ret = InitializeSecurityDescriptor( sd, SECURITY_DESCRIPTOR_REVISION ); + ok( ret, "error %u\n", GetLastError() ); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + handle = CreateEvent( &sa, TRUE, TRUE, "test_event" ); + ok( handle != NULL, "error %u\n", GetLastError() ); + + size = 0; + ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, NULL, 0, &size ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "error %u\n", GetLastError() ); + + sd = HeapAlloc( GetProcessHeap(), 0, size ); + ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, sd, size, &size ); + ok( ret, "error %u\n", GetLastError() ); + + owner = (void *)0xdeadbeef; + defaulted = TRUE; + ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted ); + ok( ret, "error %u\n", GetLastError() ); + ok( owner != (void *)0xdeadbeef, "owner not set\n" ); + todo_wine ok( !defaulted, "owner defaulted\n" ); + + dacl = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl( sd, &present, &dacl, &defaulted ); + ok( ret, "error %u\n", GetLastError() ); + ok( present, "dacl not present\n" ); + ok( dacl != (void *)0xdeadbeef, "dacl not set\n" ); + todo_wine ok( !defaulted, "dacl defaulted\n" ); + + index = 0; + found = FALSE; + while (pGetAce( dacl, index++, (void **)&ace )) + { + if (EqualSid( &ace->SidStart, owner )) found = TRUE; + } + ok( found, "owner sid not found in dacl\n" ); + + HeapFree( GetProcessHeap(), 0, sa.lpSecurityDescriptor ); + HeapFree( GetProcessHeap(), 0, sd ); + CloseHandle( handle ); +} + START_TEST(security) { init(); @@ -4629,4 +4687,5 @@ START_TEST(security) test_GetUserNameW(); test_CreateRestrictedToken(); test_TokenIntegrityLevel(); + test_default_dacl_owner_sid(); } diff --git a/server/token.c b/server/token.c index 6d8961a..cb81eec 100644 --- a/server/token.c +++ b/server/token.c @@ -640,8 +640,8 @@ struct token *token_create_admin( void ) PSID alias_admins_sid; PSID alias_users_sid; PSID logon_sid; - /* note: should be the owner specified in the token */ - ACL *default_dacl = create_default_dacl( &interactive_sid ); + const SID *user_sid = security_unix_uid_to_sid( getuid() ); + ACL *default_dacl = create_default_dacl( user_sid ); alias_admins_sid = security_sid_alloc( &nt_authority, sizeof(alias_admins_subauth)/sizeof(alias_admins_subauth[0]), alias_admins_subauth ); @@ -688,10 +688,9 @@ struct token *token_create_admin( void ) { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - token = create_token( TRUE, security_unix_uid_to_sid( getuid() ), - admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), - admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), - default_dacl, admin_source, NULL, -1 ); + token = create_token( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), + admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, + admin_source, NULL, -1 ); /* we really need a primary group */ assert( token->primary_group ); }

1 0

Hans Leidekker : msi: Fix integer conversion in get_table_value_from_record .
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 1257db2109ccd81295997d1bf02d80b80944ca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1257db2109ccd81295997d1bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 30 11:09:54 2013 +0200 msi: Fix integer conversion in get_table_value_from_record. --- dlls/msi/table.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e2186fc..16e3144 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1259,6 +1259,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT { MSICOLUMNINFO columninfo; UINT r; + int ival; if ( (iField <= 0) || (iField > tv->num_cols) || @@ -1285,16 +1286,21 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT } else if ( bytes_per_column( tv->db, &columninfo, LONG_STR_BYTES ) == 2 ) { - *pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField ); - if ( *pvalue & 0xffff0000 ) + ival = MSI_RecordGetInteger( rec, iField ); + if (ival == 0x80000000) *pvalue = 0x8000; + else { - ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000); - return ERROR_FUNCTION_FAILED; + *pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField ); + if (*pvalue & 0xffff0000) + { + ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000); + return ERROR_FUNCTION_FAILED; + } } } else { - INT ival = MSI_RecordGetInteger( rec, iField ); + ival = MSI_RecordGetInteger( rec, iField ); *pvalue = ival ^ 0x80000000; }

1 0

Piotr Caban : scrrun: Add IFile::get_Attributes implementation.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 4135874f0f2d72d62298eac4ad725eb629d33286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4135874f0f2d72d62298eac4a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:31:07 2013 +0200 scrrun: Add IFile::get_Attributes implementation. --- dlls/scrrun/filesystem.c | 15 +++++++++++++-- dlls/scrrun/tests/filesystem.c | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 3c9e1d2..1074ea5 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -778,8 +778,19 @@ static HRESULT WINAPI file_get_ParentFolder(IFile *iface, IFolder **ppfolder) static HRESULT WINAPI file_get_Attributes(IFile *iface, FileAttribute *pfa) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pfa); - return E_NOTIMPL; + DWORD fa; + + TRACE("(%p)->(%p)\n", This, pfa); + + if(!pfa) + return E_POINTER; + + fa = GetFileAttributesW(This->path); + if(fa == INVALID_FILE_ATTRIBUTES) + return create_error(GetLastError()); + + *pfa = fa & ~FILE_ATTRIBUTE_NORMAL; + return S_OK; } static HRESULT WINAPI file_put_Attributes(IFile *iface, FileAttribute pfa) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 101c396..cc94a82 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -466,6 +466,8 @@ static void test_GetFile(void) static const WCHAR get_file[] = {'g','e','t','_','f','i','l','e','.','t','s','t',0}; BSTR path = SysAllocString(get_file); + FileAttribute fa; + DWORD gfa; IFile *file; HRESULT hr; HANDLE hf; @@ -498,6 +500,11 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + + hr = IFile_get_Attributes(file, &fa); + gfa = GetFileAttributesW(get_file) & ~FILE_ATTRIBUTE_NORMAL; + ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); + ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa); IFile_Release(file); DeleteFileW(path);

1 0

Piotr Caban : scrrun: Add IFile::get_Size implementation.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: c7abcd74fc9a1cbe56059a31b2af02106efefa6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7abcd74fc9a1cbe56059a31b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:31:19 2013 +0200 scrrun: Add IFile::get_Size implementation. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1074ea5..c4aa4b8 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -20,6 +20,7 @@ #include "config.h" #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -824,8 +825,27 @@ static HRESULT WINAPI file_get_DateLastAccessed(IFile *iface, DATE *pdate) static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pvarSize); - return E_NOTIMPL; + WIN32_FIND_DATAW fd; + HANDLE f; + + TRACE("(%p)->(%p)\n", This, pvarSize); + + if(!pvarSize) + return E_POINTER; + + f = FindFirstFileW(This->path, &fd); + if(f == INVALID_HANDLE_VALUE) + return create_error(GetLastError()); + FindClose(f); + + if(fd.nFileSizeHigh || fd.nFileSizeLow>INT_MAX) { + V_VT(pvarSize) = VT_R8; + V_R8(pvarSize) = ((ULONGLONG)fd.nFileSizeHigh<<32) + fd.nFileSizeLow; + }else { + V_VT(pvarSize) = VT_I4; + V_I4(pvarSize) = fd.nFileSizeLow; + } + return S_OK; } static HRESULT WINAPI file_get_Type(IFile *iface, BSTR *pbstrType) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index cc94a82..0a55736 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -467,6 +467,7 @@ static void test_GetFile(void) BSTR path = SysAllocString(get_file); FileAttribute fa; + VARIANT size; DWORD gfa; IFile *file; HRESULT hr; @@ -505,6 +506,11 @@ static void test_GetFile(void) gfa = GetFileAttributesW(get_file) & ~FILE_ATTRIBUTE_NORMAL; ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa); + + hr = IFile_get_Size(file, &size); + ok(hr == S_OK, "get_Size returned %x, expected S_OK\n", hr); + ok(V_VT(&size) == VT_I4, "V_VT(&size) = %d, expected VT_I4\n", V_VT(&size)); + ok(V_I4(&size) == 0, "V_I4(&size) = %d, expected 0\n", V_I4(&size)); IFile_Release(file); DeleteFileW(path);

1 0

Piotr Caban : scrrun: Add IFileSystem3::DeleteFile implementation.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 23e38d4dd80dfad92712e87c41ba6993e5ceb54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e38d4dd80dfad92712e87c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:31:32 2013 +0200 scrrun: Add IFileSystem3::DeleteFile implementation. --- dlls/scrrun/filesystem.c | 52 ++++++++++++++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 13 ++++++++- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c4aa4b8..2b84d96 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1360,12 +1360,60 @@ static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface, return E_NOTIMPL; } +static inline HRESULT delete_file(const WCHAR *file, DWORD file_len, VARIANT_BOOL force) +{ + WCHAR path[MAX_PATH]; + DWORD len, name_len; + WIN32_FIND_DATAW ffd; + HANDLE f; + + f = FindFirstFileW(file, &ffd); + if(f == INVALID_HANDLE_VALUE) + return create_error(GetLastError()); + + len = get_parent_folder_name(file, file_len); + if(len+1 >= MAX_PATH) + return E_FAIL; + if(len) { + memcpy(path, file, len*sizeof(WCHAR)); + path[len++] = '\\'; + } + + do { + if(ffd.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE)) + continue; + + name_len = strlenW(ffd.cFileName); + if(len+name_len+1 >= MAX_PATH) { + FindClose(f); + return E_FAIL; + } + memcpy(path+len, ffd.cFileName, (name_len+1)*sizeof(WCHAR)); + + TRACE("deleting %s\n", debugstr_w(path)); + + if(!DeleteFileW(path)) { + if(!force || !SetFileAttributesW(path, FILE_ATTRIBUTE_NORMAL) + || !DeleteFileW(path)) { + FindClose(f); + return create_error(GetLastError()); + } + } + } while(FindNextFileW(f, &ffd)); + FindClose(f); + + return S_OK; +} + static HRESULT WINAPI filesys_DeleteFile(IFileSystem3 *iface, BSTR FileSpec, VARIANT_BOOL Force) { - FIXME("%p %s %d\n", iface, debugstr_w(FileSpec), Force); + TRACE("%p %s %d\n", iface, debugstr_w(FileSpec), Force); - return E_NOTIMPL; + if(!FileSpec) + return E_POINTER; + + return delete_file(FileSpec, SysStringLen(FileSpec), Force); } static HRESULT WINAPI filesys_DeleteFolder(IFileSystem3 *iface, BSTR FolderSpec, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 0a55736..237c107 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -491,7 +491,7 @@ static void test_GetFile(void) ok(!file, "file != NULL\n"); ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); - hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); if(hf == INVALID_HANDLE_VALUE) { skip("Can't create temporary file\n"); SysFreeString(path); @@ -513,7 +513,16 @@ static void test_GetFile(void) ok(V_I4(&size) == 0, "V_I4(&size) = %d, expected 0\n", V_I4(&size)); IFile_Release(file); - DeleteFileW(path); + hr = IFileSystem3_DeleteFile(fs3, path, FALSE); + ok(hr==CTL_E_PERMISSIONDENIED || broken(hr==S_OK), + "DeleteFile returned %x, expected CTL_E_PERMISSIONDENIED\n", hr); + if(hr != S_OK) { + hr = IFileSystem3_DeleteFile(fs3, path, TRUE); + ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + } + hr = IFileSystem3_DeleteFile(fs3, path, TRUE); + ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + SysFreeString(path); }

1 0