marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Stub FindFirstStreamW/FindNextStreamW. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46934
Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Fabian Maurer 2019-04-16 23:12:34 +02:00 committed by Alexandre Julliard
parent 63743c3984
commit 28e6fe3782
6 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec
View File

@ -1,8 +1,8 @@
@ stdcall AreFileApisANSI() kernel32.AreFileApisANSI
@ stub FindFirstFileNameW
@ stub FindFirstStreamW
@ stdcall FindFirstStreamW(wstr long ptr long) kernel32.FindFirstStreamW
@ stub FindNextFileNameW
@ stub FindNextStreamW
@ stdcall FindNextStreamW(long ptr) kernel32.FindNextStreamW
@ stdcall GetTempFileNameA(str str long ptr) kernel32.GetTempFileNameA
@ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA
@ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationA

22
dlls/kernel32/file.c
View File

@ -2363,6 +2363,28 @@ BOOL WINAPI FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *data )
return TRUE;
}
/**************************************************************************
* FindFirstStreamW (KERNEL32.@)
*/
HANDLE WINAPI FindFirstStreamW(LPCWSTR filename, STREAM_INFO_LEVELS infolevel, void *data, DWORD flags)
{
FIXME("(%s, %d, %p, %x): stub!\n", debugstr_w(filename), infolevel, data, flags);
SetLastError(ERROR_HANDLE_EOF);
return INVALID_HANDLE_VALUE;
}
/**************************************************************************
* FindNextStreamW (KERNEL32.@)
*/
BOOL WINAPI FindNextStreamW(HANDLE handle, void *data)
{
FIXME("(%p, %p): stub!\n", handle, data);
SetLastError(ERROR_HANDLE_EOF);
return FALSE;
}
/**************************************************************************
* GetFileAttributesW (KERNEL32.@)

4
dlls/kernel32/kernel32.spec
View File

@ -488,7 +488,7 @@
# @ stub FindFirstFileTransactedW
@ stdcall FindFirstFileW(wstr ptr)
# @ stub FindFirstStreamTransactedW
# @ stub FindFirstStreamW
@ stdcall FindFirstStreamW(wstr long ptr long)
@ stdcall FindFirstVolumeA(ptr long)
@ stdcall FindFirstVolumeMountPointA(str ptr long)
@ stdcall FindFirstVolumeMountPointW(wstr ptr long)
@ -497,7 +497,7 @@
@ stdcall FindNextFileA(long ptr)
# @ stub FindNextFileNameW
@ stdcall FindNextFileW(long ptr)
# @ stub FindNextStreamW
@ stdcall FindNextStreamW(long ptr)
@ stdcall FindNextVolumeA(long ptr long)
@ stub FindNextVolumeMountPointA
@ stub FindNextVolumeMountPointW

23
dlls/kernel32/tests/file.c
View File

@ -62,6 +62,7 @@ static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, UL
static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ);
static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING);
static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR);
static HANDLE (WINAPI *pFindFirstStreamW)(LPCWSTR filename, STREAM_INFO_LEVELS infolevel, void *data, DWORD flags);
static char filename[MAX_PATH];
static const char sillytext[] =
@ -111,6 +112,7 @@ static void InitFunctionPointers(void)
pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle");
pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx");
pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes");
pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW");
}
static void test__hread( void )
@ -5314,6 +5316,26 @@ static void test_file_readonly_access(void)
ok(ret, "DeleteFileA: error %d\n", GetLastError());
}
static void test_find_file_stream(void)
{
WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s',0};
HANDLE handle;
int error;
WIN32_FIND_STREAM_DATA data;
if (!pFindFirstStreamW)
{
win_skip("FindFirstStreamW is missing\n");
return;
}
SetLastError(0xdeadbeef);
handle = pFindFirstStreamW(path, FindStreamInfoStandard, &data, 0);
error = GetLastError();
ok(handle == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", handle);
ok(error == ERROR_HANDLE_EOF, "Expected ERROR_HANDLE_EOF, got %d\n", error);
}
START_TEST(file)
{
char temp_path[MAX_PATH];
@ -5385,4 +5407,5 @@ START_TEST(file)
test_post_completion();
test_overlapped_read();
test_file_readonly_access();
test_find_file_stream();
}

4
dlls/kernelbase/kernelbase.spec
View File

@ -360,7 +360,7 @@
# @ stub FindFirstFileNameW
@ stdcall FindFirstFileW(wstr ptr) kernel32.FindFirstFileW
@ stdcall FindFirstFreeAce(ptr ptr) advapi32.FindFirstFreeAce
# @ stub FindFirstStreamW
@ stdcall FindFirstStreamW(wstr long ptr long) kernel32.FindFirstStreamW
@ stdcall FindFirstVolumeW(ptr long) kernel32.FindFirstVolumeW
@ stub FindNLSString
@ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx
@ -368,7 +368,7 @@
@ stdcall FindNextFileA(long ptr) kernel32.FindNextFileA
# @ stub FindNextFileNameW
@ stdcall FindNextFileW(long ptr) kernel32.FindNextFileW
# @ stub FindNextStreamW
@ stdcall FindNextStreamW(long ptr) kernel32.FindNextStreamW
@ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW
# @ stub FindPackagesByPackageFamily
@ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW

13
include/winbase.h
View File

@ -1717,6 +1717,17 @@ typedef struct _UMS_SCHEDULER_STARTUP_INFO
typedef enum _RTL_UMS_SCHEDULER_REASON UMS_SCHEDULER_REASON;
typedef enum _RTL_UMS_THREAD_INFO_CLASS UMS_THREAD_INFO_CLASS, *PUMS_THREAD_INFO_CLASS;
typedef enum _STREAM_INFO_LEVELS
{
FindStreamInfoStandard,
FindStreamInfoMaxInfoLevel
} STREAM_INFO_LEVELS;
typedef struct _WIN32_FIND_STREAM_DATA {
LARGE_INTEGER StreamSize;
WCHAR cStreamName[MAX_PATH + 36];
} WIN32_FIND_STREAM_DATA,*PWIN32_FIND_STREAM_DATA;
WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *);
WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID);
WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
@ -2002,10 +2013,12 @@ WINBASEAPI HANDLE WINAPI FindFirstFileExA(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,
WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD);
#define FindFirstFileEx WINELIB_NAME_AW(FindFirstFileEx)
WINADVAPI BOOL WINAPI FindFirstFreeAce(PACL,LPVOID*);
WINBASEAPI HANDLE WINAPI FindFirstStreamW(LPCWSTR,STREAM_INFO_LEVELS,void*,DWORD);
WINBASEAPI BOOL WINAPI FindNextChangeNotification(HANDLE);
WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
#define FindNextFile WINELIB_NAME_AW(FindNextFile)
WINBASEAPI BOOL WINAPI FindNextStreamW(HANDLE,void*);
WINBASEAPI BOOL WINAPI FindCloseChangeNotification(HANDLE);
WINBASEAPI HRSRC WINAPI FindResourceA(HMODULE,LPCSTR,LPCSTR);
WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE,LPCWSTR,LPCWSTR);