Jacek Caban : wininet: Move WININETFTPFINDNEXTW declaration to ftp.c.
Alexandre Julliard
julliard at winehq.org
Thu Feb 28 06:21:19 CST 2008
Module: wine
Branch: master
Commit: 66259555ff6be4c50751b9d8b38e91ad775b561b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=66259555ff6be4c50751b9d8b38e91ad775b561b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Feb 27 18:55:28 2008 +0100
wininet: Move WININETFTPFINDNEXTW declaration to ftp.c.
---
dlls/wininet/ftp.c | 21 ++++++++++++++++++++-
dlls/wininet/internet.h | 20 --------------------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 8a8c484..76801c8 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -61,6 +61,24 @@
WINE_DEFAULT_DEBUG_CHANNEL(wininet);
+typedef struct
+{
+ BOOL bIsDirectory;
+ LPWSTR lpszName;
+ DWORD nSize;
+ struct tm tmLastModified;
+ unsigned short permissions;
+} FILEPROPERTIESW, *LPFILEPROPERTIESW;
+
+typedef struct
+{
+ WININETHANDLEHEADER hdr;
+ WININETFTPSESSIONW *lpFtpSession;
+ DWORD index;
+ DWORD size;
+ LPFILEPROPERTIESW lpafp;
+} WININETFTPFINDNEXTW, *LPWININETFTPFINDNEXTW;
+
#define DATA_PACKET_SIZE 0x2000
#define szCRLF "\r\n"
#define MAX_BACKLOG 5
@@ -145,6 +163,7 @@ static BOOL FTP_ParseDirectory(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR
static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR lpszSearchFile,
LPWIN32_FIND_DATAW lpFindFileData, DWORD_PTR dwContext);
static DWORD FTP_SetResponseError(DWORD dwResponse);
+static BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData);
/***********************************************************************
* FtpPutFileA (WININET.@)
@@ -3241,7 +3260,7 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP
* FALSE on failure
*
*/
-BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData)
+static BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData)
{
BOOL bSuccess = FALSE;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 6bda9ab..3e95334 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -246,25 +246,6 @@ typedef struct _WININETFTPSESSIONW
} WININETFTPSESSIONW, *LPWININETFTPSESSIONW;
-typedef struct
-{
- BOOL bIsDirectory;
- LPWSTR lpszName;
- DWORD nSize;
- struct tm tmLastModified;
- unsigned short permissions;
-} FILEPROPERTIESW, *LPFILEPROPERTIESW;
-
-
-typedef struct
-{
- WININETHANDLEHEADER hdr;
- WININETFTPSESSIONW *lpFtpSession;
- DWORD index;
- DWORD size;
- LPFILEPROPERTIESW lpafp;
-} WININETFTPFINDNEXTW, *LPWININETFTPFINDNEXTW;
-
struct WORKREQ_FTPPUTFILEW
{
LPWSTR lpszLocalFile;
@@ -432,7 +413,6 @@ INTERNETAPI HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs,
LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext);
BOOLAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory,
LPDWORD lpdwCurrentDirectory);
-BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData);
BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lpszDest);
BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory);
BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName);
More information about the wine-cvs
mailing list